diff --git a/assets/layers/elongated_coin/elongated_coin.json b/assets/layers/elongated_coin/elongated_coin.json index 41e2e5b87..398b7921f 100644 --- a/assets/layers/elongated_coin/elongated_coin.json +++ b/assets/layers/elongated_coin/elongated_coin.json @@ -18,7 +18,7 @@ "osmTags": { "and": [ "amenity=vending_machine", - "vending=elongated_coin" + "vending~.*elongated_coin.*" ] } }, @@ -440,8 +440,5 @@ "accepts_credit_cards" ], "deletion": true, - "allowMove": { - "enableImproveAccuracy": true, - "enableRelocation": true - } -} + "allowMove": true +} \ No newline at end of file diff --git a/assets/layers/souvenir_coin/license_info.json b/assets/layers/souvenir_coin/license_info.json new file mode 100644 index 000000000..81c6e8d3e --- /dev/null +++ b/assets/layers/souvenir_coin/license_info.json @@ -0,0 +1,10 @@ +[ + { + "path": "souvenir_coin.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + } +] \ No newline at end of file diff --git a/assets/layers/souvenir_coin/souvenir_coin.json b/assets/layers/souvenir_coin/souvenir_coin.json new file mode 100644 index 000000000..ee5639039 --- /dev/null +++ b/assets/layers/souvenir_coin/souvenir_coin.json @@ -0,0 +1,160 @@ +{ + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "iconBadges": [ + { + "if": "opening_hours~*", + "then": "icons.isOpen" + } + ], + "marker": [ + { + "icon": "circle", + "color": "#FFFFFF00" + }, + { + "icon": "./assets/layers/souvenir_coin/souvenir_coin.svg" + } + ] + } + ], + "tagRenderings": [ + "images", + "opening_hours_24_7", + { + "builtin": "elongated_coin.designs", + "id": "designs", + "override": { + "render": { + "en": "This machine has {coin:design_count} designs available" + }, + "mappings": [ + { + "if": "coin:design_count=1", + "then": { + "en": "This machine has one design available" + } + }, + { + "if": "coin:design_count=2", + "then": { + "en": "This machine has two designs available" + } + }, + { + "if": "coin:design_count=3", + "then": { + "en": "This machine has three designs available" + } + }, + { + "if": "coin:design_count=4", + "then": { + "en": "This machine has four designs available" + } + } + ] + } + }, + "payment-options-split", + "website", + { + "question": { + "en": "How much does a souvenir coin cost?" + }, + "id": "charge", + "render": { + "en": "A souvenir coins costs {charge}" + }, + "freeform": { + "key": "charge", + "placeholder": { + "en": "Cost (e.g. 2 EUR)" + } + }, + "mappings": [ + { + "if": "charge=2 EUR", + "then": { + "en": "A souvenir coin costs 2 euro" + }, + "hideInAnswer": "_currency!~.*EUR.*" + } + ] + }, + "denominations-coins", + { + "question": { + "en": "Is this machine located indoors?" + }, + "id": "indoor", + "mappings": [ + { + "if": "indoor=yes", + "then": { + "en": "This machine is located indoors." + } + }, + { + "if": "indoor=no", + "then": { + "en": "This machine is located outdoors." + } + } + ] + }, + "level", + "check_date" + ], + "lineRendering": [ + { + "width": 1, + "color": "blue" + } + ], + "id": "souvenir_coin", + "name": { + "en": "Souvenir Coin Machines" + }, + "description": { + "en": "Layer showing machines selling souvenir coins" + }, + "source": { + "osmTags": { + "and": [ + "amenity=vending_machine", + "vending~.*souvenir_coins.*" + ] + } + }, + "title": { + "render": { + "en": "Souvenir Coin Machine" + } + }, + "presets": [ + { + "title": { + "en": "a souvenir coin machine" + }, + "description": { + "en": "Add a machine selling souvenir coins" + }, + "tags": [ + "amenity=vending_machine", + "vending=souvenir_coins" + ] + } + ], + "filter": [ + "open_now", + "accepts_debit_cards", + "accepts_credit_cards" + ], + "deletion": true, + "allowMove": true +} \ No newline at end of file diff --git a/assets/layers/souvenir_coin/souvenir_coin.svg b/assets/layers/souvenir_coin/souvenir_coin.svg new file mode 100644 index 000000000..9bf8075ee --- /dev/null +++ b/assets/layers/souvenir_coin/souvenir_coin.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/assets/layers/souvenir_coin/souvenir_coin.svg.license b/assets/layers/souvenir_coin/souvenir_coin.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/souvenir_coin/souvenir_coin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/souvenir_note/license_info.json b/assets/layers/souvenir_note/license_info.json new file mode 100644 index 000000000..4693f1204 --- /dev/null +++ b/assets/layers/souvenir_note/license_info.json @@ -0,0 +1,10 @@ +[ + { + "path": "souvenir_note.svg", + "license": "CC0-1.0", + "authors": [ + "Robin van der Linde" + ], + "sources": [] + } +] \ No newline at end of file diff --git a/assets/layers/souvenir_note/souvenir_note.json b/assets/layers/souvenir_note/souvenir_note.json new file mode 100644 index 000000000..c039cc754 --- /dev/null +++ b/assets/layers/souvenir_note/souvenir_note.json @@ -0,0 +1,171 @@ +{ + "pointRendering": [ + { + "location": [ + "point", + "centroid" + ], + "iconBadges": [ + { + "if": "opening_hours~*", + "then": "icons.isOpen" + } + ], + "marker": [ + { + "icon": "circle", + "color": "#FFFFFF00" + }, + { + "icon": "./assets/layers/souvenir_note/souvenir_note.svg" + } + ] + } + ], + "tagRenderings": [ + "images", + "opening_hours_24_7", + { + "id": "designs", + "question": { + "en": "How many designs are available?" + }, + "freeform": { + "key": "note:design_count", + "type": "pnat", + "placeholder": { + "en": "Number of designs (e.g. 5)", + "de": "Motivanzahl (z.B. 5)", + "es": "Número de diseños (por ejemplo, 5)", + "ca": "Nombre de dissenys (p. e. 5)", + "cs": "Počet vzorů (např. 5)" + } + }, + "render": { + "en": "This machine has {note:design_count} designs available." + }, + "mappings": [ + { + "if": "note:design_count=1", + "then": { + "en": "This machine has one design available." + } + }, + { + "if": "note:design_count=2", + "then": { + "en": "This machine has two designs available." + } + }, + { + "if": "note:design_count=3", + "then": { + "en": "This machine has three designs available." + } + }, + { + "if": "note:design_count=4", + "then": { + "en": "This machine has four designs available." + } + } + ] + }, + "payment-options-split", + "website", + { + "question": { + "en": "How much does a souvenir note cost?" + }, + "id": "charge", + "render": { + "en": "A souvenir note costs {charge}" + }, + "freeform": { + "key": "charge", + "placeholder": { + "en": "Cost (e.g. 2 EUR)" + } + }, + "mappings": [ + { + "if": "charge=2 EUR", + "then": { + "en": "A souvenir note costs 2 euro" + }, + "hideInAnswer": "_currency!~.*EUR.*" + } + ] + }, + "denominations-coins", + { + "question": { + "en": "Is this machine located indoors?" + }, + "id": "indoor", + "mappings": [ + { + "if": "indoor=yes", + "then": { + "en": "This machine is located indoors." + } + }, + { + "if": "indoor=no", + "then": { + "en": "This machine is located outdoors." + } + } + ] + }, + "level", + "check_date" + ], + "lineRendering": [ + { + "width": 1, + "color": "blue" + } + ], + "id": "souvenir_note", + "name": { + "en": "Souvenir Banknote Machines" + }, + "description": { + "en": "Layer showing machines selling souvenir banknotes" + }, + "source": { + "osmTags": { + "and": [ + "amenity=vending_machine", + "vending~.*souvenir_notes.*" + ] + } + }, + "title": { + "render": { + "en": "Souvenir Banknote Machine" + } + }, + "presets": [ + { + "title": { + "en": "a souvenir banknote machine" + }, + "description": { + "en": "Add a machine selling souvenir banknotes" + }, + "tags": [ + "amenity=vending_machine", + "vending=souvenir_notes" + ] + } + ], + "filter": [ + "open_now", + "accepts_debit_cards", + "accepts_credit_cards" + ], + "deletion": true, + "allowMove": true +} \ No newline at end of file diff --git a/assets/layers/souvenir_note/souvenir_note.svg b/assets/layers/souvenir_note/souvenir_note.svg new file mode 100644 index 000000000..a5f9ab9a1 --- /dev/null +++ b/assets/layers/souvenir_note/souvenir_note.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/assets/layers/souvenir_note/souvenir_note.svg.license b/assets/layers/souvenir_note/souvenir_note.svg.license new file mode 100644 index 000000000..75299f884 --- /dev/null +++ b/assets/layers/souvenir_note/souvenir_note.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Robin van der Linde +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/elongated_coin/elongated_coin.json b/assets/themes/elongated_coin/elongated_coin.json index d3e98e5d6..49afe2f65 100644 --- a/assets/themes/elongated_coin/elongated_coin.json +++ b/assets/themes/elongated_coin/elongated_coin.json @@ -21,6 +21,8 @@ "startLat": 53.0565, "startLon": 8.7492, "layers": [ - "elongated_coin" + "elongated_coin", + "souvenir_coin", + "souvenir_note" ] } \ No newline at end of file