From d358f7db12af65a724dcef79524586c1fff45f31 Mon Sep 17 00:00:00 2001 From: Guillaume Date: Tue, 20 Mar 2012 16:24:32 +0100 Subject: Removed obsolete Osmarender, added MapQuestOpen --- web/js/map-OpenStreetMap.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'web/js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 50f159635..d48877740 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -79,14 +79,14 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { }); /** - * Class: OpenLayers.Layer.OSM.Osmarender + * Class: OpenLayers.Layer.OSM.MapQuestOpen * * Inherits from: * - */ -OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { +OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, { /** - * Constructor: OpenLayers.Layer.OSM.Osmarender + * Constructor: OpenLayers.Layer.OSM.MapQuestOpen * * Parameters: * name - {String} @@ -94,16 +94,17 @@ OpenLayers.Layer.OSM.Osmarender = OpenLayers.Class(OpenLayers.Layer.OSM, { */ initialize: function(name, options) { var url = [ - "http://a.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://b.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png", - "http://c.tah.openstreetmap.org/Tiles/tile/${z}/${x}/${y}.png" + "http://otile1.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile2.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", + "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png" ]; - options = OpenLayers.Util.extend({ numZoomLevels: 18, buffer: 0 }, options); + options = OpenLayers.Util.extend({ numZoomLevels: 19, buffer: 0 }, options); var newArguments = [name, url, options]; OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); }, - CLASS_NAME: "OpenLayers.Layer.OSM.Osmarender" + CLASS_NAME: "OpenLayers.Layer.OSM.MapQuestOpen" }); /** -- cgit v1.2.3 From edc9d8fb84dbcbc68d7459e2c89b7d80a32099af Mon Sep 17 00:00:00 2001 From: Guillaume Date: Tue, 20 Mar 2012 15:22:03 +0100 Subject: Extra maxResolution option was needed for MapQuest tiles --- web/js/map-OpenStreetMap.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'web/js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index d48877740..54bf95964 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -99,7 +99,12 @@ OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, { "http://otile3.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png", "http://otile4.mqcdn.com/tiles/1.0.0/osm/${z}/${x}/${y}.png" ]; - options = OpenLayers.Util.extend({ numZoomLevels: 19, buffer: 0 }, options); + options = OpenLayers.Util.extend({ + /* Below line added to OSM's file in order to allow minimum zoom level */ + maxResolution: 156543.0339/Math.pow(2, options.zoomOffset || 0), + numZoomLevels: 19, + buffer: 0 + }, options); var newArguments = [name, url, options]; OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments); }, -- cgit v1.2.3