From 8e023418e4453f1251203f1dffcf83b2520ea181 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Sun, 23 Dec 2012 20:03:12 +0100 Subject: [PATCH 1/3] Removing superflous file --- Util/ProjectionUtils.h | 55 ------------------------------------------ 1 file changed, 55 deletions(-) delete mode 100644 Util/ProjectionUtils.h diff --git a/Util/ProjectionUtils.h b/Util/ProjectionUtils.h deleted file mode 100644 index 272b1e10f..000000000 --- a/Util/ProjectionUtils.h +++ /dev/null @@ -1,55 +0,0 @@ -/* - open source routing machine - Copyright (C) Dennis Luxen, others 2010 - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU AFFERO General Public License as published by -the Free Software Foundation; either version 3 of the License, or -any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU Affero General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -or see http://www.gnu.org/licenses/agpl.txt. - */ - -#ifndef PROJECTIONUTILS_H_ -#define PROJECTIONUTILS_H_ - -#include - -namespace ProjectionUtils { - -inline long googleMaxTiles(int zoom) { return( 1L << (17 - zoom) ); } - -inline void googleX_to_lng(int zoom, double x, double& lng) { - long tilesAtThisZoom =googleMaxTiles(zoom); - lng = -180.0 + (x * 360.0 / double(tilesAtThisZoom)); -} - -inline void googleY_to_lat(int zoom, double y, double& lat) { - // This function is the inverse Mercator projection. - // Look up 'Mercator projection' on Wikipedia for details. - long pixels = googleMaxTiles(zoom) * 256L; - double pixelsPerLonRadian = pixels / (2.0 * M_PI); - double bitmapOrigo = pixels / 2; - - double Y = (bitmapOrigo - y*256) / pixelsPerLonRadian; - - double latRad = 2.0 * ::atan( ::exp(Y) ) - M_PI_2; - lat = latRad * 180.0 / M_PI; -} - -inline void googleXY_to_latlng( double x, double y, int zoom, double& lng, double& lat ) { - googleX_to_lng(zoom,x,lng); - googleY_to_lat(zoom,y,lat); -} - -} - -#endif /* PROJECTIONUTILS_H_ */ From 68e39b80533c352022ec18df7bd5f53008bbb725 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Wed, 26 Dec 2012 18:29:16 +0100 Subject: [PATCH 2/3] Removing Docs submodule --- .gitmodules | 3 --- Docs | 1 - 2 files changed, 4 deletions(-) delete mode 160000 Docs diff --git a/.gitmodules b/.gitmodules index 5bf44f703..e69de29bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule "Docs"] - path = Docs - url = https://github.com/DennisSchiefer/Project-OSRM-Web.git diff --git a/Docs b/Docs deleted file mode 160000 index f7150057d..000000000 --- a/Docs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f7150057d525de6246a4357f49d3319eba73e881 From b869184c109ef12316143d02cc10c430ba4068f1 Mon Sep 17 00:00:00 2001 From: DennisOSRM Date: Wed, 26 Dec 2012 18:32:57 +0100 Subject: [PATCH 3/3] Replaced submodule with a text referencing the subproject directly --- Docs/webclient.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 Docs/webclient.txt diff --git a/Docs/webclient.txt b/Docs/webclient.txt new file mode 100644 index 000000000..55fcd15b8 --- /dev/null +++ b/Docs/webclient.txt @@ -0,0 +1,3 @@ +The javascript based web client is a seperate project available at + +https://github.com/DennisSchiefer/Project-OSRM-Web \ No newline at end of file