MapQuest tiles went away a long time ago.

3 files changed, 0 insertions, 69 deletions

diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
deleted file mode 100644
index 8b24e1ba2..000000000
--- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm
+++ /dev/null
@@ -1,34 +0,0 @@
-# FixMyStreet:Map::OSM::CycleMap
-# OSM CycleMap maps on FixMyStreet.
-#
-# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved.
-# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/
-
-package FixMyStreet::Map::OSM::MapQuest;
-use base 'FixMyStreet::Map::OSM';
-
-use strict;
-
-sub map_type { 'OpenLayers.Layer.OSM.MapQuestOpen' }
-
-sub map_tiles {
-    my ( $self, %params ) = @_;
-    my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
-    my $tile_url = $self->base_tile_url();
-    return [
-        "https://otile1-s.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png",
-        "https://otile2-s.$tile_url/$z/$x/" . ($y - 1) . ".png",
-        "https://otile3-s.$tile_url/$z/" . ($x - 1) . "/$y.png",
-        "https://otile4-s.$tile_url/$z/$x/$y.png",
-    ];
-}
-
-sub base_tile_url {
-    return 'mqcdn.com/tiles/1.0.0/map/';
-}
-
-sub copyright {
-    'Data, imagery and map information provided by <a href="https://www.mapquest.com/">MapQuest</a> <img src="https://developer.mapquest.com/sites/default/files/mapquest/osm/mq_logo.png" />, <a href="https://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="https://opendatacommons.org/licenses/odbl/">ODbL</a>'
-}
-
-1;
diff --git a/t/map/tests.t b/t/map/tests.t
index 7d7efab22..e6de55b8f 100644
--- a/t/map/tests.t
+++ b/t/map/tests.t
@@ -18,7 +18,6 @@ my $requires = {
     'MasterMap' => 'map-mastermap.js',
     'Northamptonshire' => 'map-wms-northamptonshire.js',
     'CycleMap' => 'OpenStreetMap.js',
-    'MapQuest' => 'OpenStreetMap.js',
     'StreetView' => 'map-streetview.js',
     'TonerLite' => 'map-toner-lite.js',
     'Zurich' => 'map-wmts-zurich.js',
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index bd3497343..4dc862be6 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -52,40 +52,6 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
 });
 
 /**
- * Class: OpenLayers.Layer.OSM.MapQuestOpen
- *
- * Inherits from:
- *  - <OpenLayers.Layer.OSM>
- */
-OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, {
-    /**
-     * Constructor: OpenLayers.Layer.OSM.MapQuestOpen
-     *
-     * Parameters:
-     * name - {String}
-     * options - {Object} Hashtable of extra options to tag onto the layer
-     */
-    initialize: function(name, options) {
-        var url = [
-            "https://otile1-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "https://otile2-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "https://otile3-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "https://otile4-s.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
-        ];
-        options = OpenLayers.Util.extend({
-            /* Below line added to OSM's file in order to allow minimum zoom level */
-            maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0),
-            numZoomLevels: 19,
-            buffer: 0
-        }, options);
-        var newArguments = [name, url, options];
-        OpenLayers.Layer.OSM.prototype.initialize.apply(this, newArguments);
-    },
-
-    CLASS_NAME: "OpenLayers.Layer.OSM.MapQuestOpen"
-});
-
-/**
  * Class: OpenLayers.Layer.OSM.CycleMap
  *
  * Inherits from: