Feature/protobuf output

CMakeLists.txt

@@ -11,6 +11,16 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 include(CheckCXXCompilerFlag)
 include(FindPackageHandleStandardArgs)
 
+find_package(Protobuf REQUIRED)
+if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND")
+  message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?")
+endif()
+
+include_directories(${PROTOBUF_INCLUDE_DIRS})
+file(GLOB ProtoFiles "${CMAKE_CURRENT_SOURCE_DIR}/descriptors/*.proto")
+PROTOBUF_GENERATE_CPP(ProtoSources ProtoHeaders ${ProtoFiles})
+add_library(PBFoutput OBJECT ${ProtoSources} ${ProtoHeaders})
+
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 include(GetGitRevisionDescription)
 git_describe(GIT_DESCRIPTION)
@@ -52,14 +62,16 @@ configure_file(
   ${CMAKE_SOURCE_DIR}/util/git_sha.cpp.in
   ${CMAKE_SOURCE_DIR}/util/git_sha.cpp
 )
+
 file(GLOB ExtractorGlob extractor/*.cpp)
 file(GLOB ImporterGlob data_structures/import_edge.cpp data_structures/external_memory_node.cpp)
-add_library(IMPORT OBJECT ${ImporterGlob})
+add_library(IMPORT OBJECT ${ImporterGlob} ${ProtoHeaders})
 add_library(LOGGER OBJECT util/simple_logger.cpp)
 add_library(PHANTOMNODE OBJECT data_structures/phantom_node.cpp)
 add_library(EXCEPTION OBJECT util/osrm_exception.cpp)
 add_library(MERCATOR OBJECT util/mercator.cpp)
 
+include_directories(${CMAKE_BINARY_DIR})
 set(ExtractorSources extract.cpp ${ExtractorGlob})
 add_executable(osrm-extract ${ExtractorSources} $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:IMPORT> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>)
 
@@ -93,7 +105,8 @@ set(
 add_library(COORDINATE OBJECT ${CoordinateGlob})
 add_library(FINGERPRINT OBJECT util/fingerprint.cpp)
 add_library(GITDESCRIPTION OBJECT util/git_sha.cpp)
-add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR>)
+
+add_library(OSRM ${OSRMSources} $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:FINGERPRINT> $<TARGET_OBJECTS:COORDINATE> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:PHANTOMNODE> $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:MERCATOR> $<TARGET_OBJECTS:PBFoutput>)
 add_dependencies(FINGERPRINT FingerPrintConfigure)
 
 add_executable(osrm-routed routed.cpp ${ServerGlob} $<TARGET_OBJECTS:EXCEPTION>)
@@ -220,8 +233,8 @@ target_link_libraries(osrm-extract ${Boost_LIBRARIES})
 target_link_libraries(osrm-prepare ${Boost_LIBRARIES})
 target_link_libraries(osrm-routed ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
 target_link_libraries(osrm-datastore ${Boost_LIBRARIES})
-target_link_libraries(datastructure-tests ${Boost_LIBRARIES})
 target_link_libraries(algorithm-tests ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
+target_link_libraries(datastructure-tests ${Boost_LIBRARIES})
 target_link_libraries(rtree-bench ${Boost_LIBRARIES})
 
 find_package(Threads REQUIRED)
@@ -262,6 +275,10 @@ else()
 endif()
 include_directories(${LUA_INCLUDE_DIR})
 
+target_link_libraries(osrm-extract ${PROTOBUF_LIBRARY})
+target_link_libraries(osrm-prepare ${PROTOBUF_LIBRARY})
+target_link_libraries(osrm-routed ${PROTOBUF_LIBRARY})
+
 find_package(EXPAT REQUIRED)
 include_directories(${EXPAT_INCLUDE_DIRS})
 target_link_libraries(osrm-extract ${EXPAT_LIBRARIES})
@@ -284,11 +301,6 @@ include_directories(${OSMPBF_INCLUDE_DIR})
 target_link_libraries(osrm-extract ${OSMPBF_LIBRARY})
 target_link_libraries(osrm-prepare ${OSMPBF_LIBRARY})
 
-find_package(Protobuf REQUIRED)
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-target_link_libraries(osrm-extract ${PROTOBUF_LIBRARY})
-target_link_libraries(osrm-prepare ${PROTOBUF_LIBRARY})
-
 find_package(BZip2 REQUIRED)
 include_directories(${BZIP_INCLUDE_DIRS})
 target_link_libraries(osrm-extract ${BZIP2_LIBRARIES})
@@ -314,7 +326,7 @@ if(WITH_TOOLS OR BUILD_TOOLS)
   endif()
   add_executable(osrm-cli tools/simpleclient.cpp $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:COORDINATE>)
   target_link_libraries(osrm-cli ${Boost_LIBRARIES} ${OPTIONAL_SOCKET_LIBS} OSRM)
-  target_link_libraries(osrm-cli ${TBB_LIBRARIES})
+  target_link_libraries(osrm-cli ${TBB_LIBRARIES} ${PROTOBUF_LIBRARY})
   add_executable(osrm-io-benchmark tools/io-benchmark.cpp $<TARGET_OBJECTS:EXCEPTION> $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER>)
   target_link_libraries(osrm-io-benchmark ${Boost_LIBRARIES})
   add_executable(osrm-unlock-all tools/unlock_all_mutexes.cpp $<TARGET_OBJECTS:GITDESCRIPTION> $<TARGET_OBJECTS:LOGGER> $<TARGET_OBJECTS:EXCEPTION>)

Gemfile

@@ -5,3 +5,4 @@ gem "rake"
 gem "osmlib-base"
 gem "sys-proctable"
 gem "rspec-expectations"
+gem "protobuf"

Gemfile.lock

@@ -1,6 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     builder (3.2.2)
     cucumber (1.3.8)
       builder (>= 2.1.2)
@@ -11,20 +17,34 @@ GEM
     diff-lcs (1.2.4)
     gherkin (2.12.1)
       multi_json (~> 1.3)
+    i18n (0.7.0)
+    json (1.8.2)
+    middleware (0.1.0)
+    minitest (5.5.1)
     multi_json (1.8.0)
     multi_test (0.0.2)
     osmlib-base (0.1.4)
+    protobuf (3.4.2)
+      activesupport (>= 3.2)
+      middleware
+      thor
+      thread_safe
     rake (10.1.0)
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     sys-proctable (0.9.3)
+    thor (0.19.1)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cucumber
   osmlib-base
+  protobuf
   rake
   rspec-expectations
   sys-proctable

Util/pbf_renderer.hpp

@@ -0,0 +1,67 @@
+/*
+
+Copyright (c) 2015, Project OSRM, Dennis Luxen, others
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list
+of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this
+list of conditions and the following disclaimer in the documentation and/or
+other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*/
+
+#ifndef PBF_RENDERER_HPP
+#define PBF_RENDERER_HPP
+
+#include "cast.hpp"
+
+#include <osrm/json_container.hpp>
+
+#include <type_traits>
+
+namespace JSON {
+
+struct PBFToArrayRenderer : mapbox::util::static_visitor<>
+{
+    explicit PBFToArrayRenderer(std::vector<char> &_out) : out(_out) {}
+
+    void operator()(const String &string) const
+    {
+        out.insert(out.end(), string.value.begin(), string.value.end());
+    }
+
+    template<class Other>
+    typename std::enable_if<!std::is_same<Other, String>::value, void>::type
+    operator()(const Other &other) const
+    {
+    }
+
+  private:
+    std::vector<char> &out;
+};
+
+template<class JSONObject>
+void pbf_render(std::vector<char> &out, const JSONObject &object)
+{
+    Value value = object;
+    mapbox::util::apply_visitor(PBFToArrayRenderer(out), value);
+}
+
+} // namespace JSON
+
+#endif // PBF_RENDERER_HPP

algorithms/douglas_peucker.cpp

@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "douglas_peucker.hpp"
 
 #include "../data_structures/segment_information.hpp"
+#include "../util/integer_range.hpp"
 
 #include <boost/assert.hpp>
 #include <osrm/coordinate.hpp>

algorithms/polyline_formatter.cpp

@@ -28,29 +28,29 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "polyline_formatter.hpp"
 
 #include "polyline_compressor.hpp"
+#include "../data_structures/coordinate_calculation.hpp"
 #include "../data_structures/segment_information.hpp"
 
-#include <osrm/coordinate.hpp>
 
-osrm::json::String
-PolylineFormatter::printEncodedString(const std::vector<SegmentInformation> &polyline) const
+std::string PolylineFormatter::printEncodedStr(const std::vector<SegmentInformation> &polyline) const
 {
-    return osrm::json::String(PolylineCompressor().get_encoded_string(polyline));
+    return PolylineCompressor().get_encoded_string(polyline);
 }
 
-osrm::json::Array
-PolylineFormatter::printUnencodedString(const std::vector<SegmentInformation> &polyline) const
+std::vector<std::string> PolylineFormatter::printUnencodedStr(const std::vector<SegmentInformation> &polyline) const
 {
-    osrm::json::Array json_geometry_array;
+    std::vector<std::string> output;
     for (const auto &segment : polyline)
     {
         if (segment.necessary)
         {
-            osrm::json::Array json_coordinate;
-            json_coordinate.values.push_back(segment.location.lat / COORDINATE_PRECISION);
-            json_coordinate.values.push_back(segment.location.lon / COORDINATE_PRECISION);
-            json_geometry_array.values.push_back(json_coordinate);
+            std::string tmp, res;
+            coordinate_calculation::lat_or_lon_to_string(segment.location.lat, tmp);
+            res += (tmp + ",");
+            coordinate_calculation::lat_or_lon_to_string(segment.location.lon, tmp);
+            res += tmp;
+            output.push_back(res);
         }
     }
-    return json_geometry_array;
+    return output;
 }

algorithms/polyline_formatter.hpp

@@ -30,16 +30,20 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct SegmentInformation;
 
-#include <osrm/json_container.hpp>
-
 #include <string>
 #include <vector>
 
 struct PolylineFormatter
 {
-    osrm::json::String printEncodedString(const std::vector<SegmentInformation> &polyline) const;
+  private:
+    void encodeVectorSignedNumber(std::vector<int> &numbers, std::string &output) const;
+
+    void encodeNumber(int number_to_encode, std::string &output) const;
+
+  public:
+    std::string printEncodedStr(const std::vector<SegmentInformation> &polyline) const;
 
-    osrm::json::Array printUnencodedString(const std::vector<SegmentInformation> &polyline) const;
+    std::vector<std::string> printUnencodedStr(const std::vector<SegmentInformation> &polyline) const;
 };
 
 #endif /* POLYLINE_FORMATTER_HPP */

descriptors/description_factory.cpp

@@ -98,13 +98,14 @@ void DescriptionFactory::AppendSegment(const FixedPointCoordinate &coordinate,
                                   turn, path_point.travel_mode);
 }
 
-osrm::json::Value DescriptionFactory::AppendGeometryString(const bool return_encoded)
+std::string DescriptionFactory::AppendEncodedPolylineStringEncoded()
 {
-    if (return_encoded)
-    {
-        return PolylineFormatter().printEncodedString(path_description);
-    }
-    return PolylineFormatter().printUnencodedString(path_description);
+    return PolylineFormatter().printEncodedStr(path_description);
+}
+
+std::vector<std::string> DescriptionFactory::AppendEncodedPolylineStringUnencoded()
+{
+    return PolylineFormatter().printUnencodedStr(path_description);
 }
 
 void DescriptionFactory::BuildRouteSummary(const double distance, const unsigned time)

descriptors/description_factory.hpp

@@ -85,10 +85,14 @@ class DescriptionFactory
     void SetEndSegment(const PhantomNode &start_phantom,
                        const bool traversed_in_reverse,
                        const bool is_via_location = false);
-    osrm::json::Value AppendGeometryString(const bool return_encoded);
     std::vector<unsigned> const &GetViaIndices() const;
 
-    double get_entire_length() const { return entire_length; }
+    double get_entire_length() const
+    {
+        return entire_length;
+    }
+    std::string AppendEncodedPolylineStringEncoded();
+    std::vector<std::string> AppendEncodedPolylineStringUnencoded();
 
     void Run(const unsigned zoom_level);
 };