Merge tag 'v1.8.1' into fiksgatami-dev

1 files changed, 5 insertions, 5 deletions

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 },
+        {}
     ];
 }