Merge tag 'v1.6.1' into fiksgatami-dev

1 files changed, 9 insertions, 32 deletions

diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index 96e265a4d..50a21c125 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -5,35 +5,11 @@
 # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
 
 package FixMyStreet::Map::FMS;
-use base 'FixMyStreet::Map::OSM';
+use base 'FixMyStreet::Map::Bing';
 
 use strict;
 
-# Is set by the JavaScript
-sub map_type {
-    return '""';
-}
-
-sub map_template {
-    return 'fms';
-}
-
-sub copyright {
-    return '';
-}
-
-sub get_quadkey {
-    my ($x, $y, $z) = @_;
-    my $key = '';
-    for (my $i = $z; $i > 0; $i--) {
-        my $digit = 0;
-        my $mask = 1 << ($i - 1);
-        $digit++ if ($x & $mask) != 0;
-        $digit += 2 if ($y & $mask) != 0;
-        $key .= $digit;
-    }
-    return $key;
-}
+sub map_template { 'fms' }
 
 sub map_tile_base {
     '-', "//%stilma.mysociety.org/sv/%d/%d/%d.png";
@@ -52,13 +28,14 @@ sub map_tiles {
             sprintf($tile_base, '', $z, $x, $y),
         ];
     } else {
-        my $url = "g=701";
-        $url .= "&productSet=mmOS" if $z > 10 && !$ni;
+        my $key = FixMyStreet->config('BING_MAPS_API_KEY');
+        my $url = "g=3467";
+        $url .= "&productSet=mmOS&key=$key" if $z > 10 && !$ni;
         return [
-            "//ecn.t0.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y-1, $z) . ".png?$url",
-            "//ecn.t1.tiles.virtualearth.net/tiles/r" . get_quadkey($x,   $y-1, $z) . ".png?$url",
-            "//ecn.t2.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y,   $z) . ".png?$url",
-            "//ecn.t3.tiles.virtualearth.net/tiles/r" . get_quadkey($x,   $y,   $z) . ".png?$url",
+            "//ecn.t0.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x-1, $y-1, $z) . ".png?$url",
+            "//ecn.t1.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x,   $y-1, $z) . ".png?$url",
+            "//ecn.t2.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x-1, $y,   $z) . ".png?$url",
+            "//ecn.t3.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x,   $y,   $z) . ".png?$url",
         ];
     }
 }