diff options
| -rw-r--r-- | templates/web/base/maps/google-ol.html | 4 | ||||
| -rw-r--r-- | web/js/map-google-ol.js | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index 021570df1..7c83534a8 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -1,5 +1,5 @@ [% map_js = BLOCK %] -<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.20"></script> +<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?v=3.21"></script> <script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.google.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-google-ol.js') %]"></script> @@ -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 5a1aa3c57..9de479ce3 100644 --- a/web/js/map-google-ol.js +++ b/web/js/map-google-ol.js @@ -4,13 +4,13 @@ $(function(){ var $t = $(this), text = $t.text(); if (text == translation_strings.map_map) { $t.text(translation_strings.map_satellite); - fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]); + fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]); } else { $t.text(translation_strings.map_map); - fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]); + fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]); } }); - if (typeof fixmystreet_google_default !== 'undefined' && fixmystreet_google_default == 'satellite') { + if (typeof fixmystreet_google_default !== 'undefined' && fixmystreet_google_default == 'map') { $('#map_layer_toggle').click(); } }); @@ -34,8 +34,8 @@ function set_map_config(perm) { }; fixmystreet.layer_options = [ - {}, - { type: google.maps.MapTypeId.HYBRID } + { type: google.maps.MapTypeId.HYBRID }, + {} ]; } |