Merge branch 'osm-aerial-tiles'

2 files changed, 11 insertions, 0 deletions

diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 9ed3a2ee3..bd3497343 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)
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index b0e5dfc6a..179238633 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -25,6 +25,10 @@ fixmystreet.maps.config = function() {
                 fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]);
             }
         });
+        // If page loaded with Aerial as starting, rather than default road
+        if ($('#map_layer_toggle').text() == translation_strings.map_roads) {
+            fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
+        }
     });
 })();