Update Bing Maps parameter ID.

[fixmystreet.com] Update to use OS OpenMap Local tiles.

4 files changed, 12 insertions, 12 deletions

diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm
index 68c9fea32..97a0d229f 100644
--- a/perllib/FixMyStreet/Map/Bing.pm
+++ b/perllib/FixMyStreet/Map/Bing.pm
@@ -30,7 +30,7 @@ sub get_quadkey {
 }
 
 sub map_tile_base {
-    '', "//ecn.%s.tiles.virtualearth.net/tiles/r%s.png?g=5941";
+    '', "//ecn.%s.tiles.virtualearth.net/tiles/r%s.png?g=6570";
 }
 
 sub map_tiles {
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 13c7f9d87..89f872297 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -19,7 +19,7 @@ sub map_javascript { [
 ] }
 
 sub map_tile_base {
-    '-', "//%stilma.mysociety.org/sv/%d/%d/%d.png";
+    '-', "//%stilma.mysociety.org/oml/%d/%d/%d.png";
 }
 
 sub map_tiles {
@@ -36,7 +36,7 @@ sub map_tiles {
         ];
     } else {
         my $key = FixMyStreet->config('BING_MAPS_API_KEY');
-        my $url = "g=5941";
+        my $url = "g=6570";
         $url .= "&productSet=mmOS&key=$key" if $z > 10 && !$ni;
         return [
             "//ecn.t0.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x-1, $y-1, $z) . ".png?$url",
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 6662bf91a..526ad2da9 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -95,10 +95,10 @@ OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, {
 
     get_urls: function(bounds, z) {
         return [
-            "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=5941",
-            "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=5941",
-            "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=5941",
-            "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=5941"
+            "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=6570",
+            "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=6570",
+            "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=6570",
+            "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=6570"
         ];
     },
 
diff --git a/web/js/map-fms.js b/web/js/map-fms.js
index 014bd58bb..37ef8dfa1 100644
--- a/web/js/map-fms.js
+++ b/web/js/map-fms.js
@@ -1,4 +1,4 @@
-fixmystreet.maps.tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/sv' ];
+fixmystreet.maps.tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/oml' ];
 
 fixmystreet.maps.config = (function(original) {
     return function(){
@@ -61,10 +61,10 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, {
                 type = '&productSet=mmOS&key=' + fixmystreet.key;
             }
             urls = [
-                "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type,
-                "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type,
-                "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type,
-                "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=5941" + type
+                "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type,
+                "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type,
+                "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type,
+                "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=6570" + type
             ];
         }
         return urls;