aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-07-10 12:49:29 +0100
committerMatthew Somerville <matthew@mysociety.org>2015-07-10 13:49:25 +0100
commitcc6a278898087665071cc68664622cf49b84f693 (patch)
treefaf84567f7ab3000bb2e6859c1b72ddb3cdcacc4
parent2ac123a2e0e4594099a11057647ffc190219993d (diff)
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.
-rw-r--r--templates/web/base/maps/google-ol.html2
-rw-r--r--web/js/map-google-ol.js8
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 },
+ {}
];
}