Merge tag 'v3.1' into fiksgatami-devfiksgatami-dev

1 files changed, 9 insertions, 36 deletions

diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 9ed3a2ee3..46aba1c91 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -7,6 +7,13 @@ fixmystreet.maps.config = function() {
         new OpenLayers.Control.PermalinkFMS('map'),
         new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' })
     ];
+
+    if (OpenLayers.Layer.BingAerial) {
+        fixmystreet.layer_options = [
+          { map_type: fixmystreet.map_type },
+          { map_type: OpenLayers.Layer.BingAerial }
+        ];
+    }
 };
 
 // http://www.openstreetmap.org/openlayers/OpenStreetMap.js (added maxResolution)
@@ -34,7 +41,7 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, {
         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,
+            numZoomLevels: 20,
             buffer: 0
         }, options);
         var newArguments = [name, url, options];
@@ -45,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:
@@ -101,7 +74,7 @@ OpenLayers.Layer.OSM.CycleMap = OpenLayers.Class(OpenLayers.Layer.OSM, {
         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,
+            numZoomLevels: 20,
             buffer: 0
         }, options);
         var newArguments = [name, url, options];