aboutsummaryrefslogtreecommitdiffstats
path: root/web/js/map-google-ol.js
diff options
context:
space:
mode:
authorMarius Halden <marius.h@lden.org>2018-05-29 19:37:34 +0200
committerMarius Halden <marius.h@lden.org>2018-05-29 19:37:34 +0200
commit782457d016084c8de04989dbc824a71899f8b41b (patch)
tree56d14e1a988396e43c8693ff3486e40d16962add /web/js/map-google-ol.js
parent140d40e3eab4cb1e7aa9f95cbc24a0f13180b606 (diff)
parent6e2da95bc6a758c0cf070b9ddd51acc769f7acf1 (diff)
Merge tag 'v2.3.1' into fiksgatami-dev
Diffstat (limited to 'web/js/map-google-ol.js')
-rw-r--r--web/js/map-google-ol.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js
index 7369a8e9f..99670d4f2 100644
--- a/web/js/map-google-ol.js
+++ b/web/js/map-google-ol.js
@@ -10,6 +10,7 @@ $(function(){
fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]);
}
});
+ // jshint undef:false
if (typeof fixmystreet_google_default !== 'undefined' && fixmystreet_google_default == 'satellite') {
$('#map_layer_toggle').click();
}
@@ -36,7 +37,9 @@ fixmystreet.maps.config = function() {
var road_layer = {}; // Empty object defaults to standard road layer
function apply_map_styles() {
+ // jshint undef:false
var styledMapType = new google.maps.StyledMapType(fixmystreet_google_maps_custom_style);
+ // jshint undef:true
this.mapObject.mapTypes.set('styled', styledMapType);
this.mapObject.setMapTypeId('styled');
}