From ea54e0f7334fd6ffcc033f1178efbba69f6a0638 Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Thu, 19 Aug 2021 18:08:39 +0200 Subject: [PATCH] Theme cleanup: removed some testing themes which should not be exposed to the public, fixed a few details in others --- Models/Constants.ts | 2 +- assets/themes/cycle_infra/cycle_infra.json | 1 + assets/themes/cyclestreets/cyclestreets.json | 2 +- assets/themes/natuurpunt/natuurpunt.json | 1 + assets/themes/trails/license_info.json | 12 ------ assets/themes/trails/trails.json | 31 ---------------- assets/themes/trails/trails.svg | 39 -------------------- assets/themes/waste_basket/waste_basket.json | 12 ++---- 8 files changed, 8 insertions(+), 92 deletions(-) delete mode 100644 assets/themes/trails/license_info.json delete mode 100644 assets/themes/trails/trails.json delete mode 100644 assets/themes/trails/trails.svg diff --git a/Models/Constants.ts b/Models/Constants.ts index 86a8da825..cf3901012 100644 --- a/Models/Constants.ts +++ b/Models/Constants.ts @@ -2,7 +2,7 @@ import { Utils } from "../Utils"; export default class Constants { - public static vNumber = "0.9.0-rc3"; + public static vNumber = "0.9.0"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { diff --git a/assets/themes/cycle_infra/cycle_infra.json b/assets/themes/cycle_infra/cycle_infra.json index cb3da7bd8..8f4887fb8 100644 --- a/assets/themes/cycle_infra/cycle_infra.json +++ b/assets/themes/cycle_infra/cycle_infra.json @@ -17,6 +17,7 @@ "nl" ], "maintainer": "MapComplete", + "hideFromOverview": true, "defaultBackgroundId": "CartoDB.Voyager", "icon": "./assets/themes/cycle_infra/cycle-infra.svg", "version": "0", diff --git a/assets/themes/cyclestreets/cyclestreets.json b/assets/themes/cyclestreets/cyclestreets.json index 04398254e..8dfd29fc1 100644 --- a/assets/themes/cyclestreets/cyclestreets.json +++ b/assets/themes/cyclestreets/cyclestreets.json @@ -277,7 +277,7 @@ "tagRenderings": [ "images" ], - "allowSplit": true + "allowSplit": false } ] } \ No newline at end of file diff --git a/assets/themes/natuurpunt/natuurpunt.json b/assets/themes/natuurpunt/natuurpunt.json index 66343837e..4b45e9899 100644 --- a/assets/themes/natuurpunt/natuurpunt.json +++ b/assets/themes/natuurpunt/natuurpunt.json @@ -28,6 +28,7 @@ "defaultBackgroundId": "CartoDB.Positron", "enablePdfDownload": true, "enableDownload": true, + "hideFromOverview": true, "layers": [ { "#": "Nature reserve with geometry, z>=13", diff --git a/assets/themes/trails/license_info.json b/assets/themes/trails/license_info.json deleted file mode 100644 index 90a51b9ed..000000000 --- a/assets/themes/trails/license_info.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "authors": [ - "Freepik" - ], - "path": "trails.svg", - "license": "CC-BY", - "sources": [ - "https://www.flaticon.com/free-icon/trail_3273172?term=trail&page=1&position=11&page=1&position=11&related_id=3273172&origin=search" - ] - } -] \ No newline at end of file diff --git a/assets/themes/trails/trails.json b/assets/themes/trails/trails.json deleted file mode 100644 index e52b6f22f..000000000 --- a/assets/themes/trails/trails.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "id": "trails", - "title": { - "nl": "Wandeltochten", - "en": "Trails" - }, - "shortDescription": { - "nl": "Deze kaart toont verschillende wandeltochten", - "en": "This map shows trails" - }, - "description": { - "nl": "Deze kaart toont alle verschillende wandeltochten", - "en": "This map shows trails" - }, - "language": [ - "nl", - "en" - ], - "maintainer": "", - "icon": "./assets/themes/trails/trails.svg", - "version": "0", - "startLat": 51.20875, - "startLon": 3.22435, - "startZoom": 8, - "widenFactor": 0.05, - "socialImage": "", - "layers": [ - "trail" - ], - "roamingRenderings": [] -} \ No newline at end of file diff --git a/assets/themes/trails/trails.svg b/assets/themes/trails/trails.svg deleted file mode 100644 index 62ec11778..000000000 --- a/assets/themes/trails/trails.svg +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/themes/waste_basket/waste_basket.json b/assets/themes/waste_basket/waste_basket.json index 1ddfa7ccc..ca235bcc5 100644 --- a/assets/themes/waste_basket/waste_basket.json +++ b/assets/themes/waste_basket/waste_basket.json @@ -5,12 +5,12 @@ "nl": "Vuilnisbak" }, "shortDescription": { - "en": "Throw away waste", - "nl": "Afval weggooien" + "en": "A map with waste baskets", + "nl": "Een kaart met vuilnisbakken" }, "description": { - "en": "This is a public waste basket, thrash can, where you can throw away your thrash.", - "nl": "Dit is een publieke vuilnisbak waar je je afval kan weggooien." + "en": "On this map, you'll find waste baskets near you. If a waste basket is missing on this map, you can add it yourself", + "nl": "Op deze kaart vind je vuilnisbakken waar je afval in kan smijten. Ontbreekt er een vuilnisbak? Dan kan je die zelf toevoegen" }, "language": [ "en", @@ -83,10 +83,6 @@ "title": { "en": "Waste Basket", "nl": "Vuilnisbak" - }, - "description": { - "en": "Throw away waste", - "nl": "Afval weggooien" } } ]