changed geocoder to official OSM geocoder,

switched default map style to osm.org
This commit is contained in:
DennisSchiefer 2012-03-13 14:31:23 +01:00
parent 0bc3e098ac
commit 784f417857
4 changed files with 11 additions and 11 deletions

View File

@ -26,7 +26,7 @@ OSRM.Localization["de"] = {
"GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Stra<72>en hervorheben", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Unbenannte Stra<72>en hervorheben",
"GUI_START_TOOLTIP": "Startposition eingeben", "GUI_START_TOOLTIP": "Startposition eingeben",
"GUI_END_TOOLTIP": "Zielposition eingeben", "GUI_END_TOOLTIP": "Zielposition eingeben",
"GUI_LEGAL_NOTICE": "GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.mapquest.com/'>MapQuest</a>", "GUI_LEGAL_NOTICE": "GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
// geocoder // geocoder
"SEARCH_RESULTS": "Suchergebnisse", "SEARCH_RESULTS": "Suchergebnisse",
"TIMED_OUT": "Zeit<69>berschreitung", "TIMED_OUT": "Zeit<69>berschreitung",
@ -55,7 +55,7 @@ OSRM.Localization["en"] = {
"GUI_HIGHLIGHT_UNNAMED_ROADS": "Highlight unnamed streets", "GUI_HIGHLIGHT_UNNAMED_ROADS": "Highlight unnamed streets",
"GUI_START_TOOLTIP": "Enter start", "GUI_START_TOOLTIP": "Enter start",
"GUI_END_TOOLTIP": "Enter destination", "GUI_END_TOOLTIP": "Enter destination",
"GUI_LEGAL_NOTICE": "GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.mapquest.com/'>MapQuest</a>", "GUI_LEGAL_NOTICE": "GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a>",
// geocoder // geocoder
"SEARCH_RESULTS": "Search Results", "SEARCH_RESULTS": "Search Results",
"TIMED_OUT": "Timed Out", "TIMED_OUT": "Timed Out",

View File

@ -1,5 +1,5 @@
// some constants // some constants
OSRM.GEOCODE_POST = 'http://open.mapquestapi.com/nominatim/v1/search?format=json'; OSRM.GEOCODE_POST = 'http://nominatim.openstreetmap.org/search?format=json';
OSRM.SOURCE_MARKER_LABEL = "source"; OSRM.SOURCE_MARKER_LABEL = "source";
OSRM.TARGET_MARKER_LABEL = "target"; OSRM.TARGET_MARKER_LABEL = "target";

View File

@ -102,7 +102,7 @@
<div class="gui-box not-selectable" id="main-output"> <div class="gui-box not-selectable" id="main-output">
<div id="information-box-headline"></div> <div id="information-box-headline"></div>
<div id="information-box"></div> <div id="information-box"></div>
<div id="legal-notice">GUI by Dennis Schieferdecker</div> <div id="legal-notice">GUI2 v0.1 120313 - OSRM hosting by <a href='http://algo2.iti.kit.edu/'>KIT</a> - Geocoder by <a href='http://www.osm.org/'>OSM</a></div>
</div> </div>
</div> </div>

View File

@ -76,10 +76,6 @@ function centerOnGeolocation() {
// init map // init map
function initMap() { function initMap() {
var mapquestURL = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
mapquestAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 MapQuest',
mapquestOptions = {maxZoom: 18, attribution: mapquestAttribution, subdomains: '1234'};
var osmorgURL = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', var osmorgURL = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
osmorgAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 Mapnik', osmorgAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 Mapnik',
osmorgOptions = {maxZoom: 18, attribution: osmorgAttribution}; osmorgOptions = {maxZoom: 18, attribution: osmorgAttribution};
@ -88,13 +84,17 @@ function initMap() {
osmdeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 Mapnik', osmdeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 Mapnik',
osmdeOptions = {maxZoom: 18, attribution: osmdeAttribution}; osmdeOptions = {maxZoom: 18, attribution: osmdeAttribution};
var mapquestURL = 'http://otile{s}.mqcdn.com/tiles/1.0.0/osm/{z}/{x}/{y}.png',
mapquestAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 MapQuest',
mapquestOptions = {maxZoom: 18, attribution: mapquestAttribution, subdomains: '1234'};
var cloudmadeURL = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png', var cloudmadeURL = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade', cloudmadeAttribution = 'Map data &copy; 2011 OpenStreetMap contributors, Imagery &copy; 2011 CloudMade',
cloudmadeOptions = {maxZoom: 18, attribution: cloudmadeAttribution}; cloudmadeOptions = {maxZoom: 18, attribution: cloudmadeAttribution};
var mapquest = new L.TileLayer(mapquestURL, mapquestOptions), var osmorg = new L.TileLayer(osmorgURL, osmorgOptions),
osmorg = new L.TileLayer(osmorgURL, osmorgOptions),
osmde = new L.TileLayer(osmdeURL, osmdeOptions), osmde = new L.TileLayer(osmdeURL, osmdeOptions),
mapquest = new L.TileLayer(mapquestURL, mapquestOptions),
cloudmade = new L.TileLayer(cloudmadeURL, cloudmadeOptions); cloudmade = new L.TileLayer(cloudmadeURL, cloudmadeOptions);
map = new L.Map('map', { map = new L.Map('map', {
@ -102,7 +102,7 @@ function initMap() {
zoom: 13, zoom: 13,
zoomAnimation: false, // uncomment to remove animations and hiding of routes during zoom zoomAnimation: false, // uncomment to remove animations and hiding of routes during zoom
fadeAnimation: false, fadeAnimation: false,
layers: [mapquest] layers: [osmorg]
}); });
var baseMaps = { var baseMaps = {