diff --git a/Customizations/AllKnownLayers.ts b/Customizations/AllKnownLayers.ts index 4f9a7e2833..1ef497c78f 100644 --- a/Customizations/AllKnownLayers.ts +++ b/Customizations/AllKnownLayers.ts @@ -25,6 +25,7 @@ import * as picnic_tables from "../assets/layers/benches/picnic_tables.json" import * as play_forest from "../assets/layers/play_forest/play_forest.json" import * as playground from "../assets/layers/playground/playground.json" import * as sport_pitch from "../assets/layers/sport_pitch/sport_pitch.json" +import * as slow_roads from "../assets/layers/slow_roads/slow_roads.json" import LayerConfig from "./JSON/LayerConfig"; import {LayerConfigJson} from "./JSON/LayerConfigJson"; @@ -58,7 +59,8 @@ export default class AllKnownLayers { picnic_tables, play_forest, playground, - sport_pitch + sport_pitch, + slow_roads ]; // Must be below the list... diff --git a/Customizations/JSON/LayerConfigJson.ts b/Customizations/JSON/LayerConfigJson.ts index 537c5887b7..07f83c79c3 100644 --- a/Customizations/JSON/LayerConfigJson.ts +++ b/Customizations/JSON/LayerConfigJson.ts @@ -140,8 +140,20 @@ export interface LayerConfigJson { * NB: if no presets are defined, the popup to add new points doesn't show up at all */ presets?: { + /** + * The title - shown on the 'add-new'-button. + */ title: string | any, + /** + * The tags to add. It determines the icon too + */ tags: string[], + /** + * The _first sentence_ of the description is shown on the button of the `add` menu. + * The full description is shown in the confirmation dialog. + * + * (The first sentence is until the first '.'-character in the description) + */ description?: string | any, }[], diff --git a/Models/Constants.ts b/Models/Constants.ts index 4ab40728fc..0ad7e9b9e6 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.5.10"; + public static vNumber = "0.5.11"; // The user journey states thresholds when a new feature gets unlocked public static userJourney = { diff --git a/assets/layers/play_forest/play_forest.json b/assets/layers/play_forest/play_forest.json index ecb76d4984..4fd3eab254 100644 --- a/assets/layers/play_forest/play_forest.json +++ b/assets/layers/play_forest/play_forest.json @@ -107,7 +107,7 @@ "playground=forest", "fixme=Toegevoegd met MapComplete, geometry nog uit te tekenen" ], - "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de betreffende borden
" + "description": "Een zone in het bos, duidelijk gemarkeerd als speelzone met de overeenkomstige borden.
" } ], "wayHandling": 2 diff --git a/assets/layers/playground/playground.json b/assets/layers/playground/playground.json index 9d0ed6b3e7..06f26c9fbd 100644 --- a/assets/layers/playground/playground.json +++ b/assets/layers/playground/playground.json @@ -79,6 +79,22 @@ "nl": "De ondergrond is beton", "en": "The surface is concrete" } + }, + { + "if": "surface=unpaved", + "then": { + "nl": "De ondergrond is onverhard", + "en": "The surface is unpaved" + }, + "hideInAnswer": true + }, + { + "if": "surface=paved", + "then": { + "nl": "De ondergrond is verhard", + "en": "The surface is paved" + }, + "hideInAnswer": true } ] }, diff --git a/assets/layers/slow_roads/slow_roads.json b/assets/layers/slow_roads/slow_roads.json new file mode 100644 index 0000000000..6fab9b6ae7 --- /dev/null +++ b/assets/layers/slow_roads/slow_roads.json @@ -0,0 +1,178 @@ +{ + "id": "slow_roads", + "name": { + "nl": "Trage wegen" + }, + "minzoom": 14, + "overpassTags": { + "or": [ + "highway=pedestrian", + "highway=cycleway", + "highway=footway", + "highway=path", + "highway=bridleway", + "highway=living_street", + "highway=track" + ] + }, + "title": { + "render": { + "nl": "Trage weg" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "nl": "{name}" + } + }, + { + "if": "highway=footway", + "then": { + "nl": "Voetpad" + } + }, + { + "if": "highway=cycleway", + "then": { + "nl": "Fietspad" + } + }, + { + "if": "highway=pedestrian", + "then": { + "nl": "Voetgangersstraat" + } + }, + { + "if": "highway=living_street", + "then": { + "nl": "Woonerf" + } + } + ] + }, + "tagRenderings": [ + "images", + { + "question": { + "nl": "Wat is de wegverharding van dit pad?" + }, + "render": { + "nl": "De ondergrond is {surface}", + "en": "The surface is {surface}" + }, + "freeform": { + "key": "surface" + }, + "mappings": [ + { + "if": "surface=grass", + "then": { + "nl": "De ondergrond is gras", + "en": "The surface is grass" + } + }, + { + "if": "surface=ground", + "then": { + "nl": "De ondergrond is aarde", + "en": "The surface is ground" + } + }, + { + "if": "surface=unpaved", + "then": { + "nl": "De ondergrond is onverhard", + "en": "The surface is unpaved" + }, + "hideInAnswer": true + }, + { + "if": "surface=sand", + "then": { + "nl": "De ondergrond is zand", + "en": "The surface is sand" + } + }, + { + "if": "surface=paving_stones", + "then": { + "nl": "De ondergrond bestaat uit stoeptegels", + "en": "The surface is paving stones" + } + }, + { + "if": "surface=asphalt", + "then": { + "nl": "De ondergrond is asfalt", + "en": "The surface is asphalt" + } + }, + { + "if": "surface=concrete", + "then": { + "nl": "De ondergrond is beton", + "en": "The surface is concrete" + } + }, + { + "if": "surface=paved", + "then": { + "nl": "De ondergrond is verhard", + "en": "The surface is paved" + }, + "hideInAnswer": true + } + ] + }, + { + "question": "Is deze weg 's nachts verlicht?", + "mappings": [ + { + "if": "lit=yes", + "then": "'s nachts verlicht" + }, + { + "if": "lit=no", + "then": "Niet verlicht" + } + ] + } + ], + "hideUnderlayingFeaturesMinPercentage": 0, + "icon": { + "render": "./assets/svg/bug.svg", + "mappings": [] + }, + "width": { + "render": "4" + }, + "color": { + "render": "#bb2", + "mappings": [ + { + "if": "highway=cycleway", + "then": "#00c" + }, + { + "if": "highway=path", + "then": "#bb2" + }, + { + "if": "highway=footway", + "then": "#c30" + }, + { + "if": "highway=pedestrian", + "then": "#3c3" + }, + { + "if": "highway=living_street", + "then": "#ccc" + } + ] + }, + "presets": [ + ] +} \ No newline at end of file diff --git a/assets/layers/sport_pitch/sport_pitch.json b/assets/layers/sport_pitch/sport_pitch.json index eae8fc0116..f88ea75750 100644 --- a/assets/layers/sport_pitch/sport_pitch.json +++ b/assets/layers/sport_pitch/sport_pitch.json @@ -187,8 +187,22 @@ } ] }, - "phone", - "email", + { + "question": "Wat is het telefoonnummer van de bevoegde dienst of uitbater?", + "freeform": { + "key": "phone", + "type": "phone" + }, + "render": "{phone}" + }, + { + "question": "Wat is het email-adres van de bevoegde dienst of uitbater?", + "freeform": { + "key": "email", + "type": "email" + }, + "render": "{email}" + }, "questions", {"render":"{reviews(name, sportpitch)}"} ], diff --git a/assets/themes/play_forests/play_forests.json b/assets/themes/play_forests/play_forests.json index c5c8b7b3e0..1ceba5b7a3 100644 --- a/assets/themes/play_forests/play_forests.json +++ b/assets/themes/play_forests/play_forests.json @@ -18,6 +18,7 @@ "startLat": 0, "startLon": 0, "startZoom": 1, + "hideInOverview": true, "widenFactor": 0.05, "socialImage": "", "layers": [ diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json index 22ca55c8d8..3e5cac28ed 100644 --- a/assets/themes/speelplekken/speelplekken.json +++ b/assets/themes/speelplekken/speelplekken.json @@ -15,16 +15,18 @@ "maintainer": "MapComplete", "icon": "./assets/layers/play_forest/icon.svg", "hideInOverview": true, + "lockLocation": true, "version": "0", - "startLat": 51.16174, + "startLat": 51.17174, "startLon": 4.449462, - "startZoom": 13, + "startZoom": 12, "widenFactor": 0.05, "socialImage": "", "layers": [ "play_forest", "playground", - "sport_pitch" + "sport_pitch", + "slow_roads" ], "roamingRenderings": [] } \ No newline at end of file