diff --git a/code/boot.js b/code/boot.js index 9265296b4..a65eeae57 100644 --- a/code/boot.js +++ b/code/boot.js @@ -124,7 +124,7 @@ function createDefaultBaseMapLayers() { // cartodb has some nice tiles too - both dark and light subtle maps - http://cartodb.com/basemaps/ // (not available over https though - not on the right domain name anyway) var cartoAttr = '© OpenStreetMap contributors, © CartoDB'; - var cartoUrl = 'http://{s}.basemaps.cartocdn.com/{theme}/{z}/{x}/{y}.png'; + var cartoUrl = 'https://{s}.basemaps.cartocdn.com/{theme}/{z}/{x}/{y}.png'; baseLayers['CartoDB Dark Matter'] = L.tileLayer(cartoUrl,{attribution:cartoAttr,theme:'dark_all'}); baseLayers['CartoDB Positron'] = L.tileLayer(cartoUrl,{attribution:cartoAttr,theme:'light_all'}); diff --git a/code/utils_misc.js b/code/utils_misc.js index 460ddee68..763a200c7 100644 --- a/code/utils_misc.js +++ b/code/utils_misc.js @@ -207,8 +207,8 @@ window.showPortalPosLinks = function(lat, lng, name) { var qrcode = '
'; var script = ''; var gmaps = 'Google Maps'; - var bingmaps = 'Bing Maps'; - var osm = 'OpenStreetMap'; + var bingmaps = 'Bing Maps'; + var osm = 'OpenStreetMap'; var latLng = '<' + lat + ',' + lng +'>'; dialog({ html: '
' + qrcode + script + gmaps + '; ' + bingmaps + '; ' + osm + '
' + latLng + '
', diff --git a/plugins/basemap-kartverket.user.js b/plugins/basemap-kartverket.user.js index f1daacde3..c966d55d9 100644 --- a/plugins/basemap-kartverket.user.js +++ b/plugins/basemap-kartverket.user.js @@ -1,35 +1,8 @@ // ==UserScript== // @id iitc-plugin-basemap-kartverket@sollie // @name IITC plugin: Kartverket.no map tiles -// @category Map Tiles +// @category Deleted // @version 0.1.0.@@DATETIMEVERSION@@ // @description [@@BUILDNAME@@-@@BUILDDATE@@] Add the color and grayscale map tiles from Kartverket.no as an optional layer. @@METAINFO@@ -// ==/UserScript== - -@@PLUGINSTART@@ - -// PLUGIN START //////////////////////////////////////////////////////// - - -// use own namespace for plugin -window.plugin.mapTileKartverketMap = function() {}; - -window.plugin.mapTileKartverketMap.addLayer = function() { - - // Map data from Kartverket (http://statkart.no/en/) - kartverketAttribution = 'Map data © Kartverket'; - var kartverketOpt = {attribution: kartverketAttribution, maxNativeZoom: 18, maxZoom: 21, subdomains: ['opencache', 'opencache2', 'opencache3']}; - var kartverketTopo2 = new L.TileLayer('http://{s}.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo2&zoom={z}&x={x}&y={y}', kartverketOpt); - var kartverketTopo2Grayscale = new L.TileLayer('http://{s}.statkart.no/gatekeeper/gk/gk.open_gmaps?layers=topo2graatone&zoom={z}&x={x}&y={y}', kartverketOpt); - - layerChooser.addBaseLayer(kartverketTopo2, "Norway Topo"); - layerChooser.addBaseLayer(kartverketTopo2Grayscale, "Norway Topo Grayscale"); -}; - -var setup = window.plugin.mapTileKartverketMap.addLayer; - -// PLUGIN END ////////////////////////////////////////////////////////// - -@@PLUGINEND@@ - +// ==/UserScript== \ No newline at end of file diff --git a/plugins/basemap-nokia-ovi.user.js b/plugins/basemap-nokia-ovi.user.js index b871f7229..462e863c6 100644 --- a/plugins/basemap-nokia-ovi.user.js +++ b/plugins/basemap-nokia-ovi.user.js @@ -1,43 +1,8 @@ // ==UserScript== // @id iitc-plugin-nokia-ovi-maps // @name IITC plugin: Nokia OVI maps -// @category Map Tiles +// @category Deleted // @version 0.1.3.@@DATETIMEVERSION@@ -// @description [@@BUILDNAME@@-@@BUILDDATE@@] Add various map layers from Nokia OVI Maps. +// @description [@@BUILDNAME@@-@@BUILDDATE@@] Nokia OVI Maps was closed. @@METAINFO@@ // ==/UserScript== - -@@PLUGINSTART@@ - -// PLUGIN START //////////////////////////////////////////////////////// - -window.plugin.mapNokiaOvi = function() {}; - -window.plugin.mapNokiaOvi.setup = function() { - //the list of styles you'd like to see - var oviStyles = { - 'normal.day': { name: "Normal", type: 'png8' }, - 'normal.day.grey': { name: "Normal (grey)", type: 'png8' }, - 'normal.day.transit': { name: "Normal (transit)", type: 'png8' }, - 'satellite.day': { name: "Satellite", type: 'jpg' }, - 'terrain.day': { name: "Terrain", type: 'png8' }, //would jpg be better? - 'normal.night.grey': { name: "Normal Night (grey)", type: 'png8' }, - }; - - - var oviOpt = {attribution: 'Imagery © Nokia OVI', maxNativeZoom: 20, maxZoom: 21}; - - $.each(oviStyles, function(style,data) { - oviOpt['style'] = style; - oviOpt['type'] = data.type; - var oviMap = new L.TileLayer('http://{s}.maptile.maps.svc.ovi.com/maptiler/maptile/newest/{style}/{z}/{x}/{y}/256/{type}', oviOpt); - layerChooser.addBaseLayer(oviMap, 'Nokia OVI '+data.name); - }); - -}; - -var setup = window.plugin.mapNokiaOvi.setup; - -// PLUGIN END ////////////////////////////////////////////////////////// - -@@PLUGINEND@@ diff --git a/plugins/basemap-opencyclemap.user.js b/plugins/basemap-opencyclemap.user.js index 5fd7b2a41..f4913041c 100644 --- a/plugins/basemap-opencyclemap.user.js +++ b/plugins/basemap-opencyclemap.user.js @@ -32,7 +32,7 @@ window.plugin.mapTileOpenCycleMap = { }; for(var i in layers) { - var layer = new L.TileLayer('http://{s}.tile.thunderforest.com/' + i + '/{z}/{x}/{y}.png', ocmOpt); + var layer = new L.TileLayer('https://{s}.tile.thunderforest.com/' + i + '/{z}/{x}/{y}.png', ocmOpt); layerChooser.addBaseLayer(layer, 'Thunderforest ' + layers[i]); } }, diff --git a/plugins/basemap-stamen.user.js b/plugins/basemap-stamen.user.js index 535908c16..fc9cd8d1c 100644 --- a/plugins/basemap-stamen.user.js +++ b/plugins/basemap-stamen.user.js @@ -28,7 +28,7 @@ window.plugin.mapTileStamen.addLayer = function() { 'watercolor': [ 'Watercolor', 'jpg', 1, 16 ], }; - var baseUrl = window.location.protocol == 'https:' ? 'https://stamen-tiles-{s}.a.ssl.fastly.net/' : 'http://{s}.tile.stamen.com/'; + var baseUrl = 'https://stamen-tiles-{s}.a.ssl.fastly.net/'; for (var layer in types) {