Skip to content

Commit

Permalink
remove MapQuest
Browse files Browse the repository at this point in the history
  • Loading branch information
mirsch committed Jul 4, 2016
1 parent b9fc14e commit 03157df
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions htdocs/templates2/ocstyle/map2.tpl
Expand Up @@ -345,7 +345,7 @@ function mapLoad()
if (bFullscreen && msInitSiderbarDisplay == "block") if (bFullscreen && msInitSiderbarDisplay == "block")
toggle_sidebar(false); toggle_sidebar(false);
var maptypes = ['OSM', 'MQ', 'OCM', var maptypes = ['OSM', 'OCM',
google.maps.MapTypeId.ROADMAP, google.maps.MapTypeId.SATELLITE, google.maps.MapTypeId.ROADMAP, google.maps.MapTypeId.SATELLITE,
google.maps.MapTypeId.HYBRID, google.maps.MapTypeId.TERRAIN ]; google.maps.MapTypeId.HYBRID, google.maps.MapTypeId.TERRAIN ];
var initType = google.maps.MapTypeId.ROADMAP; var initType = google.maps.MapTypeId.ROADMAP;
Expand Down Expand Up @@ -395,7 +395,6 @@ function mapLoad()
{literal} {literal}
setMapType("OSM", "OpenStreetMap", "http://tile.openstreetmap.org/", 18); setMapType("OSM", "OpenStreetMap", "http://tile.openstreetmap.org/", 18);
setMapType("MQ"," MapQuest", "http://otile1.mqcdn.com/tiles/1.0.0/osm/", 19);
setMapType("OCM", "OpenCycleMap", "http://tile.opencyclemap.org/cycle/", 18); setMapType("OCM", "OpenCycleMap", "http://tile.opencyclemap.org/cycle/", 18);
moInfoWindow = new google.maps.InfoWindow(); moInfoWindow = new google.maps.InfoWindow();
Expand Down Expand Up @@ -511,15 +510,13 @@ function updateCopyrights()
var newMapType = moMap.getMapTypeId(); var newMapType = moMap.getMapTypeId();
var mapIcon = document.querySelector("#googlemap .gm-style div a div"); var mapIcon = document.querySelector("#googlemap .gm-style div a div");
if (newMapType == "OSM" || newMapType == "MQ" || newMapType == "OCM") if (newMapType == "OSM" || newMapType == "OCM")
{ {
{/literal} {/literal}
if (newMapType == "OCM") if (newMapType == "OCM")
copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> and <a href="http://www.thunderforest.com/opencyclemap/" target="_blank">OpenCycleMap</a> contributors{/t}'; copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> and <a href="http://www.thunderforest.com/opencyclemap/" target="_blank">OpenCycleMap</a> contributors{/t}';
else else
copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors{/t}'; copyrightDiv.innerHTML = '{t escape=js}Map data &copy; <a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a> contributors{/t}';
if (newMapType == "MQ")
copyrightDiv.innerHTML += ', ' + '{t escape=js}tiles provided by <a href="http://www.mapquest.com/" target="_blank">MapQuest</a>{/t}' + ' <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />';
{literal} {literal}
if (mapIcon != null) { if (mapIcon != null) {
mapIcon.style.display = "none"; mapIcon.style.display = "none";
Expand Down

0 comments on commit 03157df

Please sign in to comment.