Fetch MapQuest images via HTTPS rather than HTTP

2 files changed, 9 insertions, 9 deletions

diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
index 4fc8ba57d..3b0df14b1 100644
--- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm
+++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm
@@ -22,10 +22,10 @@ sub map_tiles {
     my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} );
     my $tile_url = $self->base_tile_url();
     return [
-        "http://otile1.$tile_url/$z/" . ($x - 1) . "/" . ($y - 1) . ".png",
-        "http://otile2.$tile_url/$z/$x/" . ($y - 1) . ".png",
-        "http://otile3.$tile_url/$z/" . ($x - 1) . "/$y.png",
-        "http://otile4.$tile_url/$z/$x/$y.png",
+        "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",
     ];
 }
 
@@ -34,7 +34,7 @@ sub base_tile_url {
 }
 
 sub copyright {
-    'Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a>'
+    '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/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index b2d6a4f8b..a742e61ba 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -63,10 +63,10 @@ OpenLayers.Layer.OSM.MapQuestOpen = OpenLayers.Class(OpenLayers.Layer.OSM, {
      */
     initialize: function(name, options) {
         var url = [
-            "http://otile1.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "http://otile2.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "http://otile3.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png",
-            "http://otile4.mqcdn.com/tiles/1.0.0/map/${z}/${x}/${y}.png"
+            "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 */