diff options
| author | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2011-07-26 16:57:08 +0100 |
| commit | 54066cd1387643dd6c6cb3040c520bee66881fd7 (patch) | |
| tree | eda84b3f347220ed12de3aa690116148287891bd /perllib/FixMyStreet/Map/FMS.pm | |
| parent | 8146bad18eeaab658871dd28eb38199a5d068395 (diff) | |
| parent | 198fcef62892fe0b2fbb3ea8a080fca87843445e (diff) | |
Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses
Conflicts:
perllib/FixMyStreet/App/Controller/Admin.pm
perllib/FixMyStreet/App/Controller/JSON.pm
perllib/FixMyStreet/Map/Tilma/Original.pm
web/css/core.css
Diffstat (limited to 'perllib/FixMyStreet/Map/FMS.pm')
| -rw-r--r-- | perllib/FixMyStreet/Map/FMS.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm index c54ee8f3b..2e40bfde3 100644 --- a/perllib/FixMyStreet/Map/FMS.pm +++ b/perllib/FixMyStreet/Map/FMS.pm @@ -41,17 +41,17 @@ sub map_tiles { my ($self, $x, $y, $z) = @_; if ($z >= 16) { return [ - "http://a.os.openstreetmap.org/sv/$z/" . ($x-1) . "/" . ($y-1) . ".png", - "http://b.os.openstreetmap.org/sv/$z/$x/" . ($y-1) . ".png", - "http://c.os.openstreetmap.org/sv/$z/" . ($x-1) . "/$y.png", - "http://os.openstreetmap.org/sv/$z/$x/$y.png", + "http://a.tilma.mysociety.org/sv/$z/" . ($x-1) . "/" . ($y-1) . ".png", + "http://b.tilma.mysociety.org/sv/$z/$x/" . ($y-1) . ".png", + "http://c.tilma.mysociety.org/sv/$z/" . ($x-1) . "/$y.png", + "http://tilma.mysociety.org/sv/$z/$x/$y.png", ]; } else { return [ - "http://ecn.t0.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y-1, $z) . ".png?g=587&productSet=mmOS", - "http://ecn.t1.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y-1, $z) . ".png?g=587&productSet=mmOS", - "http://ecn.t2.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y, $z) . ".png?g=587&productSet=mmOS", - "http://ecn.t3.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y, $z) . ".png?g=587&productSet=mmOS", + "http://ecn.t0.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y-1, $z) . ".png?g=701&productSet=mmOS", + "http://ecn.t1.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y-1, $z) . ".png?g=701&productSet=mmOS", + "http://ecn.t2.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y, $z) . ".png?g=701&productSet=mmOS", + "http://ecn.t3.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y, $z) . ".png?g=701&productSet=mmOS", ]; } } |