diff --git a/Library/include/Coordinate.h b/Library/include/Coordinate.h deleted file mode 100644 index 1f7a27a28..000000000 --- a/Library/include/Coordinate.h +++ /dev/null @@ -1,84 +0,0 @@ -/* - -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/Library/include/Header.h b/Library/include/Header.h deleted file mode 100644 index 29c300061..000000000 --- a/Library/include/Header.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - -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/Library/include/Reply.h b/Library/include/Reply.h deleted file mode 100644 index a04ccdc5a..000000000 --- a/Library/include/Reply.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - -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 - -#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/Library/include/RouteParameters.h b/Library/include/RouteParameters.h deleted file mode 100644 index 3a0ea3aaa..000000000 --- a/Library/include/RouteParameters.h +++ /dev/null @@ -1,121 +0,0 @@ -/* - -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/Library/include/ServerPaths.h b/Library/include/ServerPaths.h deleted file mode 100644 index 23c2bb9af..000000000 --- a/Library/include/ServerPaths.h +++ /dev/null @@ -1,41 +0,0 @@ -/* - -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