aboutsummaryrefslogtreecommitdiffstats
path: root/web/js/map-google-ol.js
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2015-08-26 13:43:10 +0200
committerMarius Halden <marius.h@lden.org>2015-08-26 13:43:10 +0200
commitcc0acdd34052e79f3df368ac1f524de31df19a1b (patch)
tree505f561b5f16c5b78f07514e8c2b2bdc18fef51d /web/js/map-google-ol.js
parent1c5c685d0b0904e7ddc6e764e58e8fae08632d1d (diff)
parent6b84622fb7d58531baa7943abdcc7620999c34ee (diff)
Merge tag 'v1.6.1' into fiksgatami-dev
Diffstat (limited to 'web/js/map-google-ol.js')
-rw-r--r--web/js/map-google-ol.js8
1 files changed, 4 insertions, 4 deletions
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 },
+ {}
];
}