From cc6a278898087665071cc68664622cf49b84f693 Mon Sep 17 00:00:00 2001
From: Matthew Somerville <matthew@mysociety.org>
Date: Fri, 10 Jul 2015 12:49:29 +0100
Subject: Default the Google map view to Satellite.

Using Map by default doesn't work for an unknown reason, but is okay if
you switch to it. Fixes #1133.
---
 templates/web/base/maps/google-ol.html | 2 +-
 web/js/map-google-ol.js                | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html
index 919ae073f..ce22fc94c 100644
--- a/templates/web/base/maps/google-ol.html
+++ b/templates/web/base/maps/google-ol.html
@@ -10,7 +10,7 @@
 [% END %]
 
 [% map_sub_links = BLOCK %]
-<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a>
+<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Map') %]</a>
 [% END %]
 
 [% map_html = BLOCK %]
diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js
index 5d128a7bd..a0e58cdc2 100644
--- a/web/js/map-google-ol.js
+++ b/web/js/map-google-ol.js
@@ -1,9 +1,9 @@
 $(function(){
     $('#map_layer_toggle').toggle(function(){
-        $(this).text(translation_strings.map_map);
+        $(this).text(translation_strings.map_satellite);
         fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
     }, function(){
-        $(this).text(translation_strings.map_satellite);
+        $(this).text(translation_strings.map_map);
         fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]);
     });
 });
@@ -26,8 +26,8 @@ function set_map_config(perm) {
         zoomDuration: 10
     };
     fixmystreet.layer_options = [
-        {},
-        { type: google.maps.MapTypeId.HYBRID }
+        { type: google.maps.MapTypeId.HYBRID },
+        {}
     ];
 }
 
-- 
cgit v1.2.3