diff --git a/Docs/SpecialRenderings.md b/Docs/SpecialRenderings.md index 22a362509..f104e8dac 100644 --- a/Docs/SpecialRenderings.md +++ b/Docs/SpecialRenderings.md @@ -165,6 +165,7 @@ name | default | description ------ | --------- | ------------- key | opening_hours | The tagkey from which the table is constructed. prefix | _empty string_ | Remove this string from the start of the value before parsing. __Note: use `&LPARENs` to + indicate `(` if needed__ postfix | _empty string_ | Remove this string from the end of the value before parsing. __Note: use `&RPARENs` to indicate `)` if needed__ @@ -492,7 +493,9 @@ tags_to_apply | _undefined_ | A specification of the tags to apply message | _undefined_ | The text to show to the contributor image | _undefined_ | An image to show to the contributor on the button id_of_object_to_apply_this_one | _undefined_ | If specified, applies the the tags onto _ -another_ object. The id will be read from properties[id_of_object_to_apply_this_one] of the selected object. The tags are still calculated based on the tags of the _ + +another_ object. The id will be read from properties[id_of_object_to_apply_this_one] of the selected object. The tags +are still calculated based on the tags of the _ selected_ element #### Example usage of tag_apply diff --git a/assets/layers/observation_tower/observation_tower.json b/assets/layers/observation_tower/observation_tower.json index 2e4e74184..d6bc801c2 100644 --- a/assets/layers/observation_tower/observation_tower.json +++ b/assets/layers/observation_tower/observation_tower.json @@ -77,22 +77,28 @@ "id": "Height" }, { + "id": "access", "question": { - "en": "Who maintains this tower?", - "nl": "Wie onderhoudt deze toren?", - "de": "Wer betreibt diesen Turm?" + "en": "Can this tower be visited?", + "nl": "Is deze toren publiek toegankelijk?" }, - "render": { - "nl": "Wordt onderhouden door {operator}", - "en": "Maintained by {operator}", - "de": "Betrieben von {operator}" - }, - "freeform": { - "key": "operator" - }, - "id": "Operator" + "mappings": [ + { + "if": "access=yes", + "then": { + "en": "This tower is publicly accessible", + "nl": "Deze toren is publiek toegankelijk" + } + }, + { + "if": "access=guided", + "then": { + "en": "This tower can only be visited with a guide", + "nl": "Deze toren can enkel bezocht worden met een gids" + } + } + ] }, - "website", { "question": { "en": "How much does one have to pay to enter this tower?", @@ -125,7 +131,13 @@ } } ], - "id": "Fee" + "id": "Fee", + "condition": { + "or": [ + "access=yes", + "access=guided" + ] + } }, { "builtin": "payment-options", @@ -139,6 +151,7 @@ }, "id": "Payment methods" }, + "website", { "id": "step_count", "question": { @@ -152,6 +165,12 @@ "render": { "en": "This tower has {step_count} steps to reach the top", "nl": "Deze toren heeft {step_count} traptredes" + }, + "condition": { + "or": [ + "access=yes", + "access=guided" + ] } }, { @@ -175,27 +194,47 @@ "nl": "Deze toren heeft geen lift" } } - ] - }, - "wheelchair-access", - "wikipedia" - ], - "presets": [ - { - "tags": [ - "man_made=tower", - "tower:type=observation" ], - "title": { - "en": "observation tower", - "nl": "Uitkijktoren", - "ru": "смотровая башня", - "de": "Beobachtungsturm" - }, - "description": { - "nl": "Een publiek toegankelijke uitkijktoren" + "condition": { + "or": [ + "access=yes", + "access=guided" + ] } - } + }, + { + "question": { + "en": "Who maintains this tower?", + "nl": "Wie onderhoudt deze toren?", + "de": "Wer betreibt diesen Turm?" + }, + "render": { + "nl": "Wordt onderhouden door {operator}", + "en": "Maintained by {operator}", + "de": "Betrieben von {operator}" + }, + "freeform": { + "key": "operator" + }, + "id": "Operator" + }, + { + "builtin": "wheelchair-access", + "override": { + "condition": { + "and": [ + "elevator=yes", + { + "or": [ + "access=yes", + "access=guided" + ] + } + ] + } + } + }, + "wikipedia" ], "source": { "osmTags": {