fix changed include paths

DataStructures/coordinate.cpp

@@ -25,7 +25,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include <osrm/Coordinate.h>
 #include "../Util/MercatorUtil.h"
 #ifndef NDEBUG
 #include "../Util/simple_logger.hpp"
@@ -34,6 +33,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
+#include <osrm/coordinate.hpp>
+
 #ifndef NDEBUG
 #include <bitset>
 #endif

Include/osrm/coordinate.hpp

@@ -25,8 +25,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#ifndef FIXED_POINT_COORDINATE_H_
+#ifndef COORDINATE_HPP_
-#define FIXED_POINT_COORDINATE_H_
+#define COORDINATE_HPP_
 
 #include <iosfwd> //for std::ostream
 #include <string>
@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 namespace
 {
-constexpr float COORDINATE_PRECISION = 1000000.f;
+constexpr static const float COORDINATE_PRECISION = 1000000.f;
 }
 struct FixedPointCoordinate
 {
@@ -110,4 +110,4 @@ inline std::ostream &operator<<(std::ostream &out_stream, FixedPointCoordinate c
     return out_stream;
 }
 
-#endif /* FIXED_POINT_COORDINATE_H_ */
+#endif /* COORDINATE_HPP_ */

Include/osrm/route_parameters.hpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef ROUTE_PARAMETERS_H
 #define ROUTE_PARAMETERS_H
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <boost/fusion/container/vector/vector_fwd.hpp>
 

Library/OSRM.h

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef OSRM_H
 #define OSRM_H
 
-#include <osrm/ServerPaths.h>
+#include <osrm/server_paths.hpp>
 
 #include <memory>
 

Library/OSRM_impl.cpp

@@ -44,6 +44,8 @@ namespace boost { namespace interprocess { class named_mutex; } }
 #include "../Server/DataStructures/InternalDataFacade.h"
 #include "../Server/DataStructures/SharedBarriers.h"
 #include "../Server/DataStructures/SharedDataFacade.h"
+//TODO: remove
+#include "../Server/Http/Reply.h"
 #include "../Util/make_unique.hpp"
 #include "../Util/ProgramOptions.h"
 #include "../Util/simple_logger.hpp"
@@ -52,6 +54,9 @@ namespace boost { namespace interprocess { class named_mutex; } }
 #include <boost/interprocess/sync/named_condition.hpp>
 #include <boost/interprocess/sync/scoped_lock.hpp>
 
+#include <osrm/route_parameters.hpp>
+#include <osrm/server_paths.hpp>
+
 #include <algorithm>
 #include <fstream>
 #include <utility>

Library/OSRM_impl.h

@@ -32,7 +32,7 @@ class BasePlugin;
 namespace http { class Reply; }
 struct RouteParameters;
 
-#include <osrm/ServerPaths.h>
+#include <osrm/server_paths.hpp>
 
 #include "../data_structures/query_edge.hpp"
 

Server/Connection.h

@@ -30,10 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 // #include "RequestParser.h"
 #include "Http/CompressionType.h"
+#include "Http/Reply.h"
 #include "Http/Request.h"
 
-#include <osrm/Reply.h>
-
 #include <boost/array.hpp>
 #include <boost/asio.hpp>
 #include <boost/config.hpp>

Server/DataStructures/BaseDataFacade.h

@@ -39,7 +39,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../Util/string_util.hpp"
 #include "../../typedefs.h"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <string>
 

Server/DataStructures/InternalDataFacade.h

@@ -43,8 +43,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../Util/graph_loader.hpp"
 #include "../../Util/simple_logger.hpp"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
-#include <osrm/ServerPaths.h>
+#include <osrm/server_paths.hpp>
 
 template <class EdgeDataT> class InternalDataFacade : public BaseDataFacade<EdgeDataT>
 {

Server/Http/Reply.cpp

@@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include <osrm/Reply.h>
+#include "Reply.h"
 
 #include "../../Util/cast.hpp"
 

Server/RequestHandler.cpp

@@ -28,17 +28,17 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "RequestHandler.h"
 
 #include "APIGrammar.h"
+#include "Http/Reply.h"
 #include "Http/Request.h"
 
-#include "../data_structures/json_container.hpp"
 #include "../Library/OSRM.h"
 #include "../Util/json_renderer.hpp"
 #include "../Util/simple_logger.hpp"
 #include "../Util/string_util.hpp"
 #include "../typedefs.h"
 
-#include <osrm/Reply.h>
+#include <osrm/route_parameters.hpp>
-#include <osrm/RouteParameters.h>
+#include <osrm/json_container.hpp>
 
 #include <ctime>
 

Server/RequestParser.h

@@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define REQUEST_PARSER_H
 
 #include "Http/CompressionType.h"
-#include <osrm/Header.h>
+#include "Http/Header.h"
 
 #include <boost/logic/tribool.hpp>
 #include <boost/tuple/tuple.hpp>

UnitTests/Algorithms/DouglasPeuckerTest.cpp

@@ -27,12 +27,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../../algorithms/douglas_peucker.hpp"
 #include "../../data_structures/segment_information.hpp"
-#include "../../Include/osrm/Coordinate.h"
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
 #include <boost/mpl/list.hpp>
 
+#include <osrm/coordinate.hpp>
+
 #include <iostream>
 
 BOOST_AUTO_TEST_SUITE(douglas_peucker)

UnitTests/data_structures/StaticRTreeTest.cpp

@@ -31,12 +31,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../Util/floating_point.hpp"
 #include "../../typedefs.h"
 
-#include <osrm/Coordinate.h>
-
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
 #include <boost/mpl/list.hpp>
 
+#include <osrm/coordinate.hpp>
+
 #include <random>
 #include <unordered_set>
 

Util/DataStoreOptions.h

@@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "osrm_exception.hpp"
 #include "simple_logger.hpp"
 
-#include <osrm/ServerPaths.h>
+#include <osrm/server_paths.hpp>
 
 #include <boost/any.hpp>
 #include <boost/filesystem.hpp>

Util/ProgramOptions.h

@@ -33,11 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "osrm_exception.hpp"
 #include "simple_logger.hpp"
 
-#include <osrm/ServerPaths.h>
-
 #include <boost/any.hpp>
 #include <boost/program_options.hpp>
 
+#include <osrm/server_paths.hpp>
+
 #include <fstream>
 #include <string>
 

Util/compute_angle.cpp

@@ -29,7 +29,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "TrigonometryTables.h"
 #include "../Util/MercatorUtil.h"
-#include <osrm/Coordinate.h>
+
+#include <osrm/coordinate.hpp>
 
 #include <cmath>
 

Util/json_renderer.hpp

@@ -31,9 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef JSON_RENDERER_HPP
 #define JSON_RENDERER_HPP
 
-#include "../data_structures/json_container.hpp"
 #include "cast.hpp"
 
+#include <osrm/json_container.hpp>
+
 namespace JSON {
 
 struct Renderer : mapbox::util::static_visitor<>

Util/xml_renderer.hpp

@@ -28,9 +28,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef XML_RENDERER_HPP
 #define XML_RENDERER_HPP
 
-#include "../data_structures/json_container.hpp"
 #include "cast.hpp"
 
+#include <osrm/json_container.hpp>
+
 namespace JSON {
 
 struct XMLToArrayRenderer : mapbox::util::static_visitor<>

algorithms/douglas_peucker.cpp

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../data_structures/segment_information.hpp"
 #include "../Util/integer_range.hpp"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <boost/assert.hpp>
 

algorithms/polyline_compressor.cpp

@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "polyline_compressor.hpp"
 #include "../data_structures/segment_information.hpp"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 std::string PolylineCompressor::encode_vector(std::vector<int> &numbers) const
 {

algorithms/polyline_formatter.cpp

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "polyline_compressor.hpp"
 #include "../data_structures/segment_information.hpp"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 JSON::String
 PolylineFormatter::printEncodedString(const std::vector<SegmentInformation> &polyline) const

algorithms/polyline_formatter.hpp

@@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 struct SegmentInformation;
 
-#include "../data_structures/json_container.hpp"
+#include <osrm/json_container.hpp>
 
 #include <string>
 #include <vector>

algorithms/tiny_components.hpp

@@ -42,7 +42,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/std_hash.hpp"
 #include "../Util/timing_util.hpp"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <boost/assert.hpp>
 

benchmarks/static_rtree.cpp

@@ -25,14 +25,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include "../data_structures/original_edge_data.hpp"
+#include "../DataStructures/OriginalEdgeData.h"
-#include "../data_structures/query_node.hpp"
+#include "../DataStructures/QueryNode.h"
-#include "../data_structures/shared_memory_vector_wrapper.hpp"
+#include "../DataStructures/SharedMemoryVectorWrapper.h"
-#include "../data_structures/static_rtree.hpp"
+#include "../DataStructures/StaticRTree.h"
-#include "../data_structures/edge_based_node.hpp"
 #include "../Util/BoostFileSystemFix.h"
+#include "../DataStructures/EdgeBasedNode.h"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <random>
 

data_structures/edge_based_node.hpp

@@ -31,10 +31,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../data_structures/travel_mode.hpp"
 #include "../typedefs.h"
 
-#include <osrm/Coordinate.h>
-
 #include <boost/assert.hpp>
 
+#include <osrm/coordinate.hpp>
+
 #include <limits>
 
 struct EdgeBasedNode

data_structures/hilbert_value.cpp

@@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "hilbert_value.hpp"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 uint64_t HilbertCode::operator()(const FixedPointCoordinate &current_coordinate) const
 {

data_structures/phantom_node.hpp

@@ -28,10 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef PHANTOM_NODES_H
 #define PHANTOM_NODES_H
 
-#include <osrm/Coordinate.h>
+#include "../DataStructures/TravelMode.h"
-#include "../data_structures/travel_mode.hpp"
 #include "../typedefs.h"
 
+#include <osrm/coordinate.hpp>
+
 #include <iostream>
 #include <vector>
 

data_structures/query_node.hpp

@@ -30,10 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "../typedefs.h"
 
-#include <osrm/Coordinate.h>
-
 #include <boost/assert.hpp>
 
+#include <osrm/coordinate.hpp>
+
 #include <limits>
 
 struct QueryNode

data_structures/raw_route_data.hpp

@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../data_structures/turn_instructions.hpp"
 #include "../typedefs.h"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <vector>
 

data_structures/route_parameters.cpp

@@ -25,12 +25,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-#include <osrm/RouteParameters.h>
-
 #include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/include/at_c.hpp>
 
+#include <osrm/route_parameters.hpp>
+
 RouteParameters::RouteParameters()
     : zoom_level(18), print_instructions(false), alternate_route(true), geometry(true),
       compression(true), deprecatedAPI(false), uturn_default(false), check_sum(-1), num_results(1)

data_structures/segment_information.hpp

@@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../data_structures/travel_mode.hpp"
 #include "../typedefs.h"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 // Struct fits everything in one cache line
 struct SegmentInformation

data_structures/static_rtree.hpp

@@ -44,7 +44,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/timing_util.hpp"
 #include "../typedefs.h"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>

datastore.cpp

@@ -43,7 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "Util/FingerPrint.h"
 #include "typedefs.h"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 using RTreeLeaf = BaseDataFacade<QueryEdge::EdgeData>::RTreeLeaf;
 using RTreeNode = StaticRTree<RTreeLeaf, ShM<FixedPointCoordinate, true>::vector, true>::TreeNode;

descriptors/description_factory.cpp

@@ -27,8 +27,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "description_factory.hpp"
 
-#include <osrm/Coordinate.h>
-
 #include "../typedefs.h"
 #include "../algorithms/polyline_formatter.hpp"
 #include "../data_structures/raw_route_data.hpp"

descriptors/description_factory.hpp

@@ -33,11 +33,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../data_structures/json_container.hpp"
 #include "../data_structures/segment_information.hpp"
 #include "../data_structures/turn_instructions.hpp"
-#include "../typedefs.h"
 
 #include <boost/assert.hpp>
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
+#include <osrm/json_container.hpp>
 
 #include <cmath>
 

descriptors/descriptor_base.hpp

@@ -32,13 +32,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../data_structures/raw_route_data.hpp"
 #include "../typedefs.h"
 
-#include <osrm/Reply.h>
-
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-
 struct DescriptorTable : public std::unordered_map<std::string, unsigned>
 {
     unsigned get_id(const std::string &key)

descriptors/gpx_descriptor.hpp

@@ -29,9 +29,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GPX_DESCRIPTOR_HPP
 
 #include "descriptor_base.hpp"
-#include "../data_structures/json_container.hpp"
 #include "../Util/xml_renderer.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <iostream>
 
 template <class DataFacadeT> class GPXDescriptor final : public BaseDescriptor<DataFacadeT>

descriptors/json_descriptor.hpp

@@ -39,9 +39,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/simple_logger.hpp"
-#include "../Util/string_util.hpp"
+#include "../Util/StringUtil.h"
 #include "../Util/timing_util.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <algorithm>
 
 template <class DataFacadeT> class JSONDescriptor final : public BaseDescriptor<DataFacadeT>

extractor/extractor_callbacks.cpp

@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/container.hpp"
 #include "../Util/simple_logger.hpp"
 
-#include <osrm/Coordinate.h>
+#include <osrm/coordinate.hpp>
 
 #include <limits>
 #include <string>

extractor/internal_extractor_edge.hpp

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <boost/assert.hpp>
 
+#include <osrm/coordinate.hpp>
+
 struct InternalExtractorEdge
 {
     InternalExtractorEdge()

plugins/distance_table.hpp

@@ -31,7 +31,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "plugin_base.hpp"
 
 #include "../algorithms/object_encoder.hpp"
-#include "../data_structures/json_container.hpp"
 #include "../data_structures/query_edge.hpp"
 #include "../data_structures/search_engine.hpp"
 #include "../descriptors/descriptor_base.hpp"
@@ -40,6 +39,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/string_util.hpp"
 #include "../Util/timing_util.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <cstdlib>
 
 #include <algorithm>

plugins/hello_world.hpp

@@ -34,6 +34,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/cast.hpp"
 #include "../Util/json_renderer.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 class HelloWorldPlugin final : public BasePlugin

plugins/locate.hpp

@@ -30,10 +30,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "plugin_base.hpp"
 
-#include "../data_structures/json_container.hpp"
 #include "../Util/json_renderer.hpp"
 #include "../Util/string_util.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 // locates the nearest node in the road network for a given coordinate.

plugins/nearest.hpp

@@ -30,11 +30,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "plugin_base.hpp"
 
-#include "../data_structures/json_container.hpp"
 #include "../data_structures/phantom_node.hpp"
 #include "../Util/integer_range.hpp"
 #include "../Util/json_renderer.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 /*

plugins/plugin_base.hpp

@@ -28,9 +28,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef BASEPLUGIN_H_
 #define BASEPLUGIN_H_
 
-#include <osrm/Coordinate.h>
+// remove
-#include <osrm/Reply.h>
+#include "../Server/Http/Reply.h"
-#include <osrm/RouteParameters.h>
+
+#include <osrm/coordinate.hpp>
+#include <osrm/route_parameters.hpp>
 
 #include <string>
 #include <vector>

plugins/timestamp.hpp

@@ -30,9 +30,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "plugin_base.hpp"
 
-#include "../data_structures/json_container.hpp"
 #include "../Util/json_renderer.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <string>
 
 template <class DataFacadeT> class TimestampPlugin final : public BasePlugin

plugins/viaroute.hpp

@@ -40,6 +40,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../Util/make_unique.hpp"
 #include "../Util/simple_logger.hpp"
 
+#include <osrm/json_container.hpp>
+
 #include <cstdlib>
 
 #include <algorithm>