From d2ff7e525a7260b3b1ce85281200b8ac0196513b Mon Sep 17 00:00:00 2001 From: Marius Halden Date: Tue, 30 Dec 2014 15:47:58 +0100 Subject: Fixed show/hide pins and show/hide old for norwegian cobrand. --- web/js/map-OpenLayers.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'web/js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 63625efb8..facb9d3f2 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -211,7 +211,7 @@ function fixmystreet_onload() { var showhide = [ 'Show pins', 'Hide pins', 'Dangos pinnau', 'Cuddio pinnau', - "Vis nåler", "Gjem nåler", + "Vis nåler", "Skjul nåler", "Zeige Stecknadeln", "Stecknadeln ausblenden" ]; for (var i=0; i Date: Fri, 9 Jan 2015 17:40:53 +0000 Subject: Revert most of "Experiment, no pins by default." This reverts most of commit 71b400a1f5991b9a693095c417aa61e274a5215d, leaving the skip-this-step CSS changes and the tweaks to the /ajax JSON output. --- web/js/map-OpenLayers.js | 4 ---- 1 file changed, 4 deletions(-) (limited to 'web/js') diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 63625efb8..c7bfef2b0 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -227,10 +227,6 @@ function fixmystreet_onload() { } }); - if (fixmystreet.initial_hide_pins) { - $('#hide_pins_link').click(); - } - $('#all_pins_link').click(function(e) { e.preventDefault(); fixmystreet.markers.setVisibility(true); -- cgit v1.2.3 From 4ae8d597a80d91084dcdcd999d480f41a57c70d1 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 9 Jan 2015 17:58:43 +0000 Subject: Use HTTPS OpenStreetMap tiles. --- web/js/map-OpenStreetMap.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'web/js') diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index fc0afedc3..7ef222da7 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -8,7 +8,7 @@ function set_map_config(perm) { //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), new OpenLayers.Control.PermalinkFMS(permalink_id), - new OpenLayers.Control.PermalinkFMSz('osm_link', 'http://www.openstreetmap.org/'), + new OpenLayers.Control.PermalinkFMSz('osm_link', 'https://www.openstreetmap.org/'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; } @@ -31,9 +31,9 @@ OpenLayers.Layer.OSM.Mapnik = OpenLayers.Class(OpenLayers.Layer.OSM, { */ initialize: function(name, options) { var url = [ - "http://a.tile.openstreetmap.org/${z}/${x}/${y}.png", - "http://b.tile.openstreetmap.org/${z}/${x}/${y}.png", - "http://c.tile.openstreetmap.org/${z}/${x}/${y}.png" + "https://a.tile.openstreetmap.org/${z}/${x}/${y}.png", + "https://b.tile.openstreetmap.org/${z}/${x}/${y}.png", + "https://c.tile.openstreetmap.org/${z}/${x}/${y}.png" ]; options = OpenLayers.Util.extend({ /* Below line added to OSM's file in order to allow minimum zoom level */ -- cgit v1.2.3 From ec470c609e438892c28c69ba07cf81ea17c74f17 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Fri, 16 Jan 2015 17:19:17 +0000 Subject: Add Hybrid map toggle option to Google Maps view. --- web/js/map-google-ol.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'web/js') diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js index 953765068..5d128a7bd 100644 --- a/web/js/map-google-ol.js +++ b/web/js/map-google-ol.js @@ -1,3 +1,13 @@ +$(function(){ + $('#map_layer_toggle').toggle(function(){ + $(this).text(translation_strings.map_map); + fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]); + }, function(){ + $(this).text(translation_strings.map_satellite); + fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]); + }); +}); + function set_map_config(perm) { var permalink_id; if ($('#map_permalink').length) { @@ -15,5 +25,9 @@ function set_map_config(perm) { fixmystreet.map_options = { zoomDuration: 10 }; + fixmystreet.layer_options = [ + {}, + { type: google.maps.MapTypeId.HYBRID } + ]; } -- cgit v1.2.3