From 41f3f535408603d3ea789afbac14abbcc305622c Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Fri, 20 Dec 2013 13:12:56 +0100 Subject: [PATCH] move includes to include/osrm --- Algorithms/DouglasPeucker.h | 2 +- Algorithms/StronglyConnectedComponents.h | 2 +- DataStructures/Coordinate.cpp | 2 +- DataStructures/EdgeBasedNode.h | 2 +- DataStructures/HilbertValue.h | 2 +- DataStructures/PhantomNodes.h | 2 +- DataStructures/QueryNode.h | 2 +- DataStructures/RawRouteData.h | 2 +- DataStructures/SearchEngine.h | 2 +- DataStructures/SegmentInformation.h | 2 +- DataStructures/StaticRTree.h | 2 +- Descriptors/BaseDescriptor.h | 2 +- Descriptors/DescriptionFactory.h | 2 +- Extractor/ExtractorCallbacks.cpp | 2 +- Extractor/ExtractorStructs.h | 2 +- Extractor/PBFParser.cpp | 2 +- Extractor/XMLParser.cpp | 2 +- Include/osrm/Coordinate.h | 84 ++++++++++++++ Include/osrm/Header.h | 45 ++++++++ Include/osrm/Reply.h | 71 ++++++++++++ Include/osrm/RouteParameters.h | 121 +++++++++++++++++++++ Include/osrm/ServerPaths.h | 41 +++++++ Library/OSRM.h | 6 +- Library/OSRM_impl.h | 6 +- Plugins/BasePlugin.h | 6 +- Server/Connection.h | 2 +- Server/DataStructures/BaseDataFacade.h | 2 +- Server/DataStructures/InternalDataFacade.h | 2 +- Server/DataStructures/SharedDataType.h | 2 +- Server/Http/Reply.cpp | 2 +- Server/RequestHandler.cpp | 2 +- Server/RequestHandler.h | 2 +- Server/RequestParser.h | 2 +- Util/ComputeAngle.h | 2 +- Util/ProgramOptions.h | 2 +- 35 files changed, 398 insertions(+), 36 deletions(-) create mode 100644 Include/osrm/Coordinate.h create mode 100644 Include/osrm/Header.h create mode 100644 Include/osrm/Reply.h create mode 100644 Include/osrm/RouteParameters.h create mode 100644 Include/osrm/ServerPaths.h diff --git a/Algorithms/DouglasPeucker.h b/Algorithms/DouglasPeucker.h index 0f314f200..0543cedfb 100644 --- a/Algorithms/DouglasPeucker.h +++ b/Algorithms/DouglasPeucker.h @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../DataStructures/SegmentInformation.h" -#include +#include #include diff --git a/Algorithms/StronglyConnectedComponents.h b/Algorithms/StronglyConnectedComponents.h index e7b8d33d9..e0245ef38 100644 --- a/Algorithms/StronglyConnectedComponents.h +++ b/Algorithms/StronglyConnectedComponents.h @@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/SimpleLogger.h" -#include +#include #include #include diff --git a/DataStructures/Coordinate.cpp b/DataStructures/Coordinate.cpp index 0a9663af6..58598b206 100644 --- a/DataStructures/Coordinate.cpp +++ b/DataStructures/Coordinate.cpp @@ -25,7 +25,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "../Util/StringUtil.h" #include diff --git a/DataStructures/EdgeBasedNode.h b/DataStructures/EdgeBasedNode.h index bf6c8c6fe..830b5c675 100644 --- a/DataStructures/EdgeBasedNode.h +++ b/DataStructures/EdgeBasedNode.h @@ -6,7 +6,7 @@ #include "../Util/MercatorUtil.h" #include "../typedefs.h" -#include +#include struct EdgeBasedNode { diff --git a/DataStructures/HilbertValue.h b/DataStructures/HilbertValue.h index 6608623cf..4890df4e2 100644 --- a/DataStructures/HilbertValue.h +++ b/DataStructures/HilbertValue.h @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef HILBERTVALUE_H_ #define HILBERTVALUE_H_ -#include +#include #include #include diff --git a/DataStructures/PhantomNodes.h b/DataStructures/PhantomNodes.h index 603c9e035..3a3fbbd93 100644 --- a/DataStructures/PhantomNodes.h +++ b/DataStructures/PhantomNodes.h @@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef PHANTOMNODES_H_ #define PHANTOMNODES_H_ -#include +#include #include "../typedefs.h" diff --git a/DataStructures/QueryNode.h b/DataStructures/QueryNode.h index c50a8d2c5..89dccb47a 100644 --- a/DataStructures/QueryNode.h +++ b/DataStructures/QueryNode.h @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../typedefs.h" -#include +#include #include diff --git a/DataStructures/RawRouteData.h b/DataStructures/RawRouteData.h index 8158dbc1b..509c4ca97 100644 --- a/DataStructures/RawRouteData.h +++ b/DataStructures/RawRouteData.h @@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../DataStructures/PhantomNodes.h" #include "../typedefs.h" -#include +#include #include diff --git a/DataStructures/SearchEngine.h b/DataStructures/SearchEngine.h index c00fa54ef..025805cc4 100644 --- a/DataStructures/SearchEngine.h +++ b/DataStructures/SearchEngine.h @@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/StringUtil.h" #include "../typedefs.h" -#include +#include #include diff --git a/DataStructures/SegmentInformation.h b/DataStructures/SegmentInformation.h index eb0ba0115..c17c788f9 100644 --- a/DataStructures/SegmentInformation.h +++ b/DataStructures/SegmentInformation.h @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../typedefs.h" -#include +#include // Struct fits everything in one cache line struct SegmentInformation { diff --git a/DataStructures/StaticRTree.h b/DataStructures/StaticRTree.h index 37053a766..02647c277 100644 --- a/DataStructures/StaticRTree.h +++ b/DataStructures/StaticRTree.h @@ -40,7 +40,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/TimingUtil.h" #include "../typedefs.h" -#include +#include #include #include diff --git a/Descriptors/BaseDescriptor.h b/Descriptors/BaseDescriptor.h index 99dad793f..a711d7f42 100644 --- a/Descriptors/BaseDescriptor.h +++ b/Descriptors/BaseDescriptor.h @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/StringUtil.h" #include "../typedefs.h" -#include +#include #include #include diff --git a/Descriptors/DescriptionFactory.h b/Descriptors/DescriptionFactory.h index 5be12456a..5d69b57a8 100644 --- a/Descriptors/DescriptionFactory.h +++ b/Descriptors/DescriptionFactory.h @@ -37,7 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/SimpleLogger.h" #include "../typedefs.h" -#include +#include #include #include diff --git a/Extractor/ExtractorCallbacks.cpp b/Extractor/ExtractorCallbacks.cpp index 0c1cb276f..423b7b22d 100644 --- a/Extractor/ExtractorCallbacks.cpp +++ b/Extractor/ExtractorCallbacks.cpp @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "ExtractionHelperFunctions.h" #include "ExtractorCallbacks.h" -#include +#include #include diff --git a/Extractor/ExtractorStructs.h b/Extractor/ExtractorStructs.h index 02c2cde5c..6ea0a915c 100644 --- a/Extractor/ExtractorStructs.h +++ b/Extractor/ExtractorStructs.h @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../DataStructures/Restriction.h" #include "../typedefs.h" -#include +#include #include #include diff --git a/Extractor/PBFParser.cpp b/Extractor/PBFParser.cpp index 73f53137e..c46b561b0 100644 --- a/Extractor/PBFParser.cpp +++ b/Extractor/PBFParser.cpp @@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/SimpleLogger.h" #include "../typedefs.h" -#include +#include #include #include diff --git a/Extractor/XMLParser.cpp b/Extractor/XMLParser.cpp index 9ce5e2a77..b54a64b30 100644 --- a/Extractor/XMLParser.cpp +++ b/Extractor/XMLParser.cpp @@ -34,7 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/StringUtil.h" #include "../typedefs.h" -#include +#include #include diff --git a/Include/osrm/Coordinate.h b/Include/osrm/Coordinate.h new file mode 100644 index 000000000..1f7a27a28 --- /dev/null +++ b/Include/osrm/Coordinate.h @@ -0,0 +1,84 @@ +/* + +Copyright (c) 2013, 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 FIXED_POINT_COORDINATE_H_ +#define FIXED_POINT_COORDINATE_H_ + +#include + +static const double COORDINATE_PRECISION = 1000000.; + +struct FixedPointCoordinate { + int lat; + int lon; + + FixedPointCoordinate(); + explicit FixedPointCoordinate (int lat, int lon); + void Reset(); + bool isSet() const; + bool isValid() const; + bool operator==(const FixedPointCoordinate & other) const; + + static double ApproximateDistance( + const int lat1, + const int lon1, + const int lat2, + const int lon2 + ); + + static double ApproximateDistance( + const FixedPointCoordinate & c1, + const FixedPointCoordinate & c2 + ); + + static double ApproximateEuclideanDistance( + const FixedPointCoordinate & c1, + const FixedPointCoordinate & c2 + ); + + static void convertInternalLatLonToString( + const int value, + std::string & output + ); + + static void convertInternalCoordinateToString( + const FixedPointCoordinate & coord, + std::string & output + ); + + static void convertInternalReversedCoordinateToString( + const FixedPointCoordinate & coord, + std::string & output + ); +}; + +inline std::ostream & operator<<(std::ostream & out, const FixedPointCoordinate & c){ + out << "(" << c.lat << "," << c.lon << ")"; + return out; +} + +#endif /* FIXED_POINT_COORDINATE_H_ */ diff --git a/Include/osrm/Header.h b/Include/osrm/Header.h new file mode 100644 index 000000000..29c300061 --- /dev/null +++ b/Include/osrm/Header.h @@ -0,0 +1,45 @@ +/* + +Copyright (c) 2013, 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 HTTP_HEADER_H +#define HTTP_HEADER_H + +#include + +namespace http { + + struct Header { + std::string name; + std::string value; + void Clear() { + name.clear(); + value.clear(); + } + }; +} + +#endif //HTTP_HEADER_H diff --git a/Include/osrm/Reply.h b/Include/osrm/Reply.h new file mode 100644 index 000000000..ce52ba5b1 --- /dev/null +++ b/Include/osrm/Reply.h @@ -0,0 +1,71 @@ +/* + +Copyright (c) 2013, 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 REPLY_H +#define REPLY_H + +#include "Header.h" + +#include + +#include + +namespace http { + +const char okHTML[] = ""; +const char badRequestHTML[] = "Bad Request

400 Bad Request

"; +const char internalServerErrorHTML[] = "Internal Server Error

500 Internal Server Error

"; +const char seperators[] = { ':', ' ' }; +const char crlf[] = { '\r', '\n' }; +const std::string okString = "HTTP/1.0 200 OK\r\n"; +const std::string badRequestString = "HTTP/1.0 400 Bad Request\r\n"; +const std::string internalServerErrorString = "HTTP/1.0 500 Internal Server Error\r\n"; + +class Reply { +public: + enum status_type { + ok = 200, + badRequest = 400, + internalServerError = 500 + } status; + + + std::vector
headers; + std::vector toBuffers(); + std::vector HeaderstoBuffers(); + std::vector content; + static Reply StockReply(status_type status); + void setSize(const unsigned size); + Reply(); +private: + static std::string ToString(Reply::status_type status); + boost::asio::const_buffer ToBuffer(Reply::status_type status); +}; + +} + +#endif //REPLY_H diff --git a/Include/osrm/RouteParameters.h b/Include/osrm/RouteParameters.h new file mode 100644 index 000000000..c64405a8e --- /dev/null +++ b/Include/osrm/RouteParameters.h @@ -0,0 +1,121 @@ +/* + +Copyright (c) 2013, 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 ROUTE_PARAMETERS_H +#define ROUTE_PARAMETERS_H + +#include + +#include +#include +#include + +#include +#include + +struct RouteParameters { + RouteParameters() : + zoomLevel(18), + printInstructions(false), + alternateRoute(true), + geometry(true), + compression(true), + deprecatedAPI(false), + checkSum(-1) {} + short zoomLevel; + bool printInstructions; + bool alternateRoute; + bool geometry; + bool compression; + bool deprecatedAPI; + unsigned checkSum; + std::string service; + std::string outputFormat; + std::string jsonpParameter; + std::string language; + std::vector hints; + std::vector coordinates; + + void setZoomLevel(const short i) { + if (18 > i && 0 < i) { + zoomLevel = i; + } + } + + void setAlternateRouteFlag(const bool b) { + alternateRoute = b; + } + + void setDeprecatedAPIFlag(const std::string &) { + deprecatedAPI = true; + } + + void setChecksum(const unsigned c) { + checkSum = c; + } + + void setInstructionFlag(const bool b) { + printInstructions = b; + } + + void setService( const std::string & s) { + service = s; + } + + void setOutputFormat(const std::string & s) { + outputFormat = s; + } + + void setJSONpParameter(const std::string & s) { + jsonpParameter = s; + } + + void addHint(const std::string & s) { + hints.resize(coordinates.size()); + hints.back() = s; + } + + void setLanguage(const std::string & s) { + language = s; + } + + void setGeometryFlag(const bool b) { + geometry = b; + } + + void setCompressionFlag(const bool b) { + compression = b; + } + + void addCoordinate(const boost::fusion::vector < double, double > & arg_) { + int lat = COORDINATE_PRECISION*boost::fusion::at_c < 0 > (arg_); + int lon = COORDINATE_PRECISION*boost::fusion::at_c < 1 > (arg_); + coordinates.push_back(FixedPointCoordinate(lat, lon)); + } +}; + +#endif /*ROUTE_PARAMETERS_H*/ diff --git a/Include/osrm/ServerPaths.h b/Include/osrm/ServerPaths.h new file mode 100644 index 000000000..23c2bb9af --- /dev/null +++ b/Include/osrm/ServerPaths.h @@ -0,0 +1,41 @@ +/* + +Copyright (c) 2013, 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 SERVER_PATH_H +#define SERVER_PATH_H + +#include +#include + +#include + +typedef boost::unordered_map< + const std::string, + boost::filesystem::path + > ServerPaths; + +#endif //SERVER_PATH_H diff --git a/Library/OSRM.h b/Library/OSRM.h index 2908bbed2..738c977a0 100644 --- a/Library/OSRM.h +++ b/Library/OSRM.h @@ -30,9 +30,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include -#include -#include +#include +#include +#include class OSRM_impl; diff --git a/Library/OSRM_impl.h b/Library/OSRM_impl.h index d8aaac9de..df09ad38f 100644 --- a/Library/OSRM_impl.h +++ b/Library/OSRM_impl.h @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef OSRM_IMPL_H #define OSRM_IMPL_H -#include -#include -#include +#include +#include +#include #include "../DataStructures/QueryEdge.h" #include "../Plugins/BasePlugin.h" diff --git a/Plugins/BasePlugin.h b/Plugins/BasePlugin.h index 125369a8c..bf1ecf90f 100644 --- a/Plugins/BasePlugin.h +++ b/Plugins/BasePlugin.h @@ -28,9 +28,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef BASEPLUGIN_H_ #define BASEPLUGIN_H_ -#include -#include -#include +#include +#include +#include #include #include diff --git a/Server/Connection.h b/Server/Connection.h index 68c7da6a8..1e484fd0e 100644 --- a/Server/Connection.h +++ b/Server/Connection.h @@ -31,7 +31,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Http/CompressionType.h" #include "Http/Request.h" -#include +#include #include #include diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h index 4de15eb42..e9a551c6e 100644 --- a/Server/DataStructures/BaseDataFacade.h +++ b/Server/DataStructures/BaseDataFacade.h @@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../../Util/StringUtil.h" #include "../../typedefs.h" -#include +#include #include diff --git a/Server/DataStructures/InternalDataFacade.h b/Server/DataStructures/InternalDataFacade.h index bc96d0127..c6ae80832 100644 --- a/Server/DataStructures/InternalDataFacade.h +++ b/Server/DataStructures/InternalDataFacade.h @@ -43,7 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../../Util/ProgramOptions.h" #include "../../Util/SimpleLogger.h" -#include +#include template class InternalDataFacade : public BaseDataFacade { diff --git a/Server/DataStructures/SharedDataType.h b/Server/DataStructures/SharedDataType.h index 9fe39e389..902eea986 100644 --- a/Server/DataStructures/SharedDataType.h +++ b/Server/DataStructures/SharedDataType.h @@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../../typedefs.h" -#include +#include #include diff --git a/Server/Http/Reply.cpp b/Server/Http/Reply.cpp index b45b50159..802fdfbf1 100644 --- a/Server/Http/Reply.cpp +++ b/Server/Http/Reply.cpp @@ -27,7 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include -#include +#include #include "../../Util/StringUtil.h" diff --git a/Server/RequestHandler.cpp b/Server/RequestHandler.cpp index 31e6072fe..11a82798c 100644 --- a/Server/RequestHandler.cpp +++ b/Server/RequestHandler.cpp @@ -33,7 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "../Util/StringUtil.h" #include "../typedefs.h" -#include +#include #include diff --git a/Server/RequestHandler.h b/Server/RequestHandler.h index 0c170d515..320c0b5b7 100644 --- a/Server/RequestHandler.h +++ b/Server/RequestHandler.h @@ -30,7 +30,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "Http/Request.h" -#include +#include #include diff --git a/Server/RequestParser.h b/Server/RequestParser.h index fbff7f5cd..b06c027f5 100644 --- a/Server/RequestParser.h +++ b/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 +#include #include #include diff --git a/Util/ComputeAngle.h b/Util/ComputeAngle.h index a85926820..ef5dad9f1 100644 --- a/Util/ComputeAngle.h +++ b/Util/ComputeAngle.h @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define COMPUTE_ANGLE_H #include "../Util/MercatorUtil.h" -#include +#include #include #include diff --git a/Util/ProgramOptions.h b/Util/ProgramOptions.h index f5d10af30..8a3cbd637 100644 --- a/Util/ProgramOptions.h +++ b/Util/ProgramOptions.h @@ -32,7 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "OSRMException.h" #include "SimpleLogger.h" -#include +#include #include #include