From 108e3c53e8fc6a9e2a9d9c1151647f049225ed96 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 29 Feb 2012 09:22:42 +0000 Subject: Main part of mobile site full screen map for reporting a problem. --- web/js/map-OpenStreetMap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js/map-OpenStreetMap.js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 9d226f6a7..92d98ea4c 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -3,7 +3,7 @@ function set_map_config(perm) { new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - perm, + new OpenLayers.Control.Permalink(), new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), new OpenLayers.Control.PanZoomFMS() ]; -- cgit v1.2.3 From 355603aa8523ea76eff82ce58e962311a186a939 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Wed, 29 Feb 2012 09:26:16 +0000 Subject: Explicity function calls. --- web/js/map-OpenStreetMap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js/map-OpenStreetMap.js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 92d98ea4c..58117aabf 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -37,7 +37,7 @@ OpenLayers.Util.onImageLoadError = function() { } else if (this.src.match(/^http:\/\/[def]\.tah\.openstreetmap\.org\//)) { // do nothing - this layer is transparent } else { - OpenLayers.Util.OSM.originalOnImageLoadError; + OpenLayers.Util.OSM.originalOnImageLoadError(); } }; -- cgit v1.2.3 From b25fecb70f59e81fb72a4b884d9ebb9dbf52dc9d Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 09:51:31 +0000 Subject: Manipulate permalink only if container for it is there Signed-off-by: Josh Angell --- web/js/map-OpenStreetMap.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'web/js/map-OpenStreetMap.js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 58117aabf..7b44d8569 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -1,9 +1,12 @@ function set_map_config(perm) { + if ($('#map_permalink').length) { + permalink_id = 'map_permalink'; + } fixmystreet.controls = [ new OpenLayers.Control.ArgParser(), //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), - new OpenLayers.Control.Permalink(), + new OpenLayers.Control.Permalink(permalink_id), new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), new OpenLayers.Control.PanZoomFMS() ]; -- cgit v1.2.3 From 469dc03ec8ec63c5d924e629f2b4a0268bd626e4 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 09:56:10 +0000 Subject: Make permalink_id not global Signed-off-by: Josh Angell --- web/js/map-OpenStreetMap.js | 1 + 1 file changed, 1 insertion(+) (limited to 'web/js/map-OpenStreetMap.js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 7b44d8569..48d753fa7 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -1,4 +1,5 @@ function set_map_config(perm) { + var permalink_id; if ($('#map_permalink').length) { permalink_id = 'map_permalink'; } -- cgit v1.2.3 From 3ffef58745c4ce245953d32aeb618d9323fa6077 Mon Sep 17 00:00:00 2001 From: Josh Angell Date: Wed, 29 Feb 2012 12:58:09 +0000 Subject: Finished style and interaction for mobile map Signed-off-by: Josh Angell --- web/js/map-OpenStreetMap.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web/js/map-OpenStreetMap.js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 48d753fa7..50f159635 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -9,7 +9,7 @@ function set_map_config(perm) { new OpenLayers.Control.Navigation(), new OpenLayers.Control.Permalink(permalink_id), new OpenLayers.Control.PermalinkFMS('osm_link', 'http://www.openstreetmap.org/'), - new OpenLayers.Control.PanZoomFMS() + new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; } -- cgit v1.2.3 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/map-OpenStreetMap.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/map-OpenStreetMap.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