From c881534554d0281a6f81d404962d8b9a573153f9 Mon Sep 17 00:00:00 2001 From: pjsier Date: Thu, 12 Oct 2017 14:33:24 -0500 Subject: [PATCH 1/2] Fix insecure asset loading --- src/config/styles.json | 16 ++++++++-------- src/config/tilesets.json | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/config/styles.json b/src/config/styles.json index 4137da2..09c118d 100644 --- a/src/config/styles.json +++ b/src/config/styles.json @@ -3,25 +3,25 @@ "id": "klokantech-basic", "title": "Klokantech Basic", "url": "https://rawgit.com/openmaptiles/klokantech-basic-gl-style/master/style.json", - "thumbnail": "http://maputnik.com/thumbnails/klokantech-basic.png" + "thumbnail": "https://maputnik.github.io/thumbnails/klokantech-basic.png" }, { "id": "dark-matter", "title": "Dark Matter", "url": "https://rawgit.com/openmaptiles/dark-matter-gl-style/master/style.json", - "thumbnail": "http://maputnik.com/thumbnails/dark-matter.png" + "thumbnail": "https://maputnik.github.io/thumbnails/dark-matter.png" }, { "id": "positron", "title": "Positron", "url": "https://rawgit.com/openmaptiles/positron-gl-style/master/style.json", - "thumbnail": "http://maputnik.com/thumbnails/positron.png" + "thumbnail": "https://maputnik.github.io/thumbnails/positron.png" }, { "id": "osm-bright", "title": "OSM Bright", "url": "https://rawgit.com/openmaptiles/osm-bright-gl-style/master/style.json", - "thumbnail": "http://maputnik.com/thumbnails/osm-bright.png" + "thumbnail": "https://maputnik.github.io/thumbnails/osm-bright.png" }, { "id": "osm-liberty", @@ -39,24 +39,24 @@ "id": "mapbox-satellite", "title": "Mapbox Satellite", "url": "https://rawgit.com/mapbox/mapbox-gl-styles/master/styles/satellite-v9.json", - "thumbnail": "http://maputnik.com/thumbnails/mapbox-satellite.png" + "thumbnail": "https://maputnik.github.io/thumbnails/mapbox-satellite.png" }, { "id": "mapbox-bright", "title": "Mapbox Bright", "url": "https://rawgit.com/mapbox/mapbox-gl-styles/master/styles/bright-v9.json", - "thumbnail": "http://maputnik.com/thumbnails/mapbox-bright.png" + "thumbnail": "https://maputnik.github.io/thumbnails/mapbox-bright.png" }, { "id": "mapbox-basic", "title": "Mapbox Basic", "url": "https://rawgit.com/mapbox/mapbox-gl-styles/master/styles/basic-v9.json", - "thumbnail": "http://maputnik.com/thumbnails/mapbox-basic.png" + "thumbnail": "https://maputnik.github.io/thumbnails/mapbox-basic.png" }, { "id": "tilezen", "title": "Tilezen", "url": "https://rawgit.com/lukasmartinelli/tilezen-gl-style/master/style.json", - "thumbnail": "http://maputnik.com/thumbnails/tilezen.png" + "thumbnail": "https://maputnik.github.io/thumbnails/tilezen.png" } ] diff --git a/src/config/tilesets.json b/src/config/tilesets.json index bfc545f..4b336f6 100644 --- a/src/config/tilesets.json +++ b/src/config/tilesets.json @@ -12,7 +12,7 @@ "tilezen": { "type": "vector", "tiles": [ - "http://tile.mapzen.com/mapzen/vector/v1/{layers}/{z}/{x}/{y}.pbf?api_key=mapzen-RVcyVL7" + "https://tile.mapzen.com/mapzen/vector/v1/all/{z}/{x}/{y}.mvt?api_key=mapzen-RVcyVL7" ], "minZoom": 0, "maxZoom": 15, From 2e671250b94e004583cf7d4c1b725ce36961171f Mon Sep 17 00:00:00 2001 From: pjsier Date: Thu, 12 Oct 2017 15:13:57 -0500 Subject: [PATCH 2/2] Remove tilezen tileset and style --- src/config/styles.json | 6 ------ src/config/tilesets.json | 9 --------- 2 files changed, 15 deletions(-) diff --git a/src/config/styles.json b/src/config/styles.json index 09c118d..1359feb 100644 --- a/src/config/styles.json +++ b/src/config/styles.json @@ -52,11 +52,5 @@ "title": "Mapbox Basic", "url": "https://rawgit.com/mapbox/mapbox-gl-styles/master/styles/basic-v9.json", "thumbnail": "https://maputnik.github.io/thumbnails/mapbox-basic.png" - }, - { - "id": "tilezen", - "title": "Tilezen", - "url": "https://rawgit.com/lukasmartinelli/tilezen-gl-style/master/style.json", - "thumbnail": "https://maputnik.github.io/thumbnails/tilezen.png" } ] diff --git a/src/config/tilesets.json b/src/config/tilesets.json index 4b336f6..ee321ce 100644 --- a/src/config/tilesets.json +++ b/src/config/tilesets.json @@ -8,14 +8,5 @@ "type": "vector", "url": "https://free.tilehosting.com/data/v3.json?key={key}", "title": "OpenMapTiles" - }, - "tilezen": { - "type": "vector", - "tiles": [ - "https://tile.mapzen.com/mapzen/vector/v1/all/{z}/{x}/{y}.mvt?api_key=mapzen-RVcyVL7" - ], - "minZoom": 0, - "maxZoom": 15, - "title": "Mapzen Vector Tile Service" } }