From 70fb6f530362bc98ba9e57981a23d6eb0c681633 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Fri, 18 Dec 2020 02:10:26 +0100 Subject: [PATCH] Small fixes to climbing theme, wiki generation, version bump --- State.ts | 2 +- assets/themes/climbing/climbing.json | 18 ++++++++++++------ index.css | 2 ++ scripts/createLayouts.ts | 6 +++++- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/State.ts b/State.ts index 943974d6e..75ceacbe9 100644 --- a/State.ts +++ b/State.ts @@ -24,7 +24,7 @@ export default class State { // The singleton of the global state public static state: State; - public static vNumber = "0.2.5b"; + public static vNumber = "0.2.5d"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json index 5d8665d0f..314647d5a 100644 --- a/assets/themes/climbing/climbing.json +++ b/assets/themes/climbing/climbing.json @@ -149,7 +149,7 @@ "name": { "de": "Kletterhallen", "en": "Climbing gyms", - "nl": "Klimzaal" + "nl": "Klimzalen" }, "minzoom": 10, "overpassTags": { @@ -180,7 +180,9 @@ "en": "A climbing gym" }, "tagRenderings": [ - { + "images", + "questions", + {"#": "name", "render": { "en": "{name}", "nl": "{name}", @@ -198,7 +200,8 @@ "website", "phone", "email", - "opening_hours" + "opening_hours", + "reviews" ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { @@ -321,7 +324,7 @@ { "id": "climbing", "name": { - "nl": "Klimgelegenheiden", + "nl": "Klimgelegenheden", "de": "Klettermöglichkeiten", "en": "Climbing opportunities" }, @@ -348,7 +351,9 @@ "en": "A climbing opportunity" }, "tagRenderings": [ - { + "images", + "questions", + {"#": "name", "render": { "en": "{name}", "nl": "{name}", @@ -377,7 +382,8 @@ } } ] - } + }, + "reviews" ], "hideUnderlayingFeaturesMinPercentage": 0, "icon": { diff --git a/index.css b/index.css index 8f1cdc023..b7b7406c7 100644 --- a/index.css +++ b/index.css @@ -17,6 +17,8 @@ html, body { height: 100%; + min-height: 100vh; + min-height: -webkit-fill-available; margin: 0; padding: 0; background-color: var(--background-color); diff --git a/scripts/createLayouts.ts b/scripts/createLayouts.ts index f83da2a41..3e9926a6d 100644 --- a/scripts/createLayouts.ts +++ b/scripts/createLayouts.ts @@ -89,7 +89,11 @@ function generateWikiEntry(layout: LayoutConfig){ |name= [https://mapcomplete.osm.be/${layout.id}.html ${layout.id}] |region= Worldwide |lang= ${languages} -|descr= A MapComplete theme: ${Translations.W(layout.description).InnerRender()} +|descr= A MapComplete theme: ${Translations.W(layout.description) + .InnerRender() + .replace(".*<\/a>/, "]]") + } |material= {{yes|[https://mapcomplete.osm.be/ ${auth}]}} |image= MapComplete_Screenshot.png |genre= POI, editor, ${layout.id}