From 5a60187f21175801d146023d1e27016600d22498 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 18 Apr 2022 18:45:36 +0200 Subject: [PATCH 01/16] Dog resources --- assets/themes/dog/Veterinary-First-Aid.svg | 15 + assets/themes/dog/dog-food.svg | 66 ++++ assets/themes/dog/dog-park.svg | 60 ++++ assets/themes/dog/dog.json | 338 +++++++++++++++++++++ assets/themes/dog/dogshop.svg | 68 +++++ assets/themes/dog/license_info.json | 59 ++++ assets/themes/dog/petshop.svg | 93 ++++++ 7 files changed, 699 insertions(+) create mode 100644 assets/themes/dog/Veterinary-First-Aid.svg create mode 100644 assets/themes/dog/dog-food.svg create mode 100644 assets/themes/dog/dog-park.svg create mode 100644 assets/themes/dog/dog.json create mode 100644 assets/themes/dog/dogshop.svg create mode 100644 assets/themes/dog/license_info.json create mode 100644 assets/themes/dog/petshop.svg diff --git a/assets/themes/dog/Veterinary-First-Aid.svg b/assets/themes/dog/Veterinary-First-Aid.svg new file mode 100644 index 0000000000..c6e9a9a675 --- /dev/null +++ b/assets/themes/dog/Veterinary-First-Aid.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/assets/themes/dog/dog-food.svg b/assets/themes/dog/dog-food.svg new file mode 100644 index 0000000000..348f3cbafc --- /dev/null +++ b/assets/themes/dog/dog-food.svg @@ -0,0 +1,66 @@ + +image/svg+xml diff --git a/assets/themes/dog/dog-park.svg b/assets/themes/dog/dog-park.svg new file mode 100644 index 0000000000..4af873c799 --- /dev/null +++ b/assets/themes/dog/dog-park.svg @@ -0,0 +1,60 @@ + +image/svg+xml diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json new file mode 100644 index 0000000000..ec186f32ec --- /dev/null +++ b/assets/themes/dog/dog.json @@ -0,0 +1,338 @@ +{ + "id": "dog", + "maintainer": "Niels Elgaard Larsen", + "version": "1", + "title": { + "en": "dog POIs", + "da": "hundesteder" + }, + "description": { + "en": "Hundsteder", + "da": "Hundsteder" + }, + "icon": "./assets/themes/dog/dog-park.svg", + "startZoom": 10, + "startLat": 55, + "startLon": 12, + "layers": [ + { + "id": "dogpark", + "source": { + "osmTags": { + "#": "For a description on which tags are possible, see https://github.com/pietervdvn/MapComplete/blob/develop/Docs/Tags_format.md", + "or": [ + "leisure=dog_park", + { + "and": [ + "leisure=park", + "dog=unleashed" + ] + } + ] + } + }, + "#": "The tagrenderings are everything that must be shown and/or asked. Use a full tag-rendering section OR a single string to call a builtin tagrendering (see https://github.com/pietervdvn/MapComplete/blob/develop/Docs/BuiltinQuestions.md)", + "minzoom": 10, + "name": { + "en": "dog parks", + "da": "hundeskove" + }, + "title": { + "render": { + "en": "dog park", + "da": "hundeskov" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + }, + "mapRendering": [ + { + "#": "Rendering block of a mapping which is shown for points AND at the center point of a line/area", + "location": [ + "point", + "centroid" + ], + "iconx": "./assets/themes/dog/dog-park.svg", + "icon": "./assets/themes/dog/dog-park.svg", + "iconSize": "40,40,center", + "label": { + "render": { + "en": "dogpark", + "da": "hundeskov" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + } + }, + { + "#": "Rendering of a line", + "color": "#ff0", + "width": 5 + } + ], + "tagRenderings": [ + { + "id": "dogpark-fenced", + "mappings": [ + { + "if": "barrier=fence", + "then": { + "en": "fenced: Yes", + "da": "indhegnet: Ja" + } + }, + { + "if": "barrier=no", + "then": { + "en": "fenced: No", + "da": "indhegnet: Nej" + } + } + ], + "question": { + "en": "It this dog park fenced in?", + "da": "Er denne hundeskov indhegnet?" + } + }, + { + "id": "dogarea", + "render": { + "en": "areal: {_surface:ha} ha", + "da": "areal: {_surface:ha} ha" + }, + "condition": "_surface:ha!=0" + }, + "reviews", + "images" + ] + }, + { + "id": "dog_food", + "source": { + "osmTags": { + "and": [ + { + "or": [ + "amenity=restaurant", + "amenity=cafe" + ] + }, + { + "or": [ + "dog=unleashed", + "dog=leashed", + "dog=yes" + ] + } + ] + } + }, + "minzoom": 11, + "name": { + "en": "dogfriendly eateries", + "da": "hundevenlige madsteder" + }, + "title": { + "render": { + "en": "dog-friendly eatery", + "da": "hundevenligt spisested" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + }, + "mapRendering": [ + { + "location": [ + "point", + "centroid" + ], + "icon": "./assets/themes/dog/dog-food.svg", + "iconSize": "30,30,center", + "label": { + "render": { + "en": "dog-friendly food", + "da": "hundevenligt madsted" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + } + }, + { + "#": "Rendering of a line", + "color": "#ff0", + "width": 5 + } + ], + "tagRenderings": [ + "website", + "reviews", + "phone", + "images" + ] + }, + { + "id": "dogshop", + "source": { + "osmTags": { + "and": [ + "shop~*", + { + "or": [ + "dog=leashed", + "dog=yes", + "shop=pet" + ] + } + ] + } + }, + "minzoom": 12, + "name": { + "en": "dogfriendly shop", + "da": "hundevenlig butik" + }, + "title": { + "render": { + "en": "dog-friendly shop", + "da": "hundevenlig butik" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + }, + "mapRendering": [ + { + "location": [ + "point", + "centroid" + ], + "icon": { + "render": "./assets/themes/dog/dogshop.svg", + "mappings": [ + { + "if": { + "and": [ + "shop=pet" + ] + }, + "then": "./assets/themes/dog/petshop.svg" + } + ] + }, + "iconSize": "30,30,center", + "label": { + "render": { + "en": "dog friendly shop", + "da": "hundevenlig butik" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + } + }, + { + "#": "Rendering of a line", + "color": "#ff0", + "width": 5 + } + ], + "tagRenderings": [ + { + "id": "shoptype", + "render": { + "en": "sells {shop}", + "da": "sælger {shop}" + }, + "condition": "shop!=pet" + }, + "website", + "reviews", + "phone", + "images" + ] + }, + { + "id": "veterinary", + "source": { + "osmTags": { + "or": [ + "amenity=veterinary" + ] + } + }, + "minzoom": 10, + "name": { + "en": "veterinary", + "da": "dyrlæge" + }, + "title": { + "render": { + "en": "Veterinary", + "da": "dyrlæge" + }, + "mappings": [ + { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + }, + "mapRendering": [ + { + "location": [ + "point", + "centroid" + ], + "icon": "./assets/themes/dog/Veterinary-First-Aid.svg", + "iconSize": "30,30,center" + }, + { + "#": "Rendering of a line", + "color": "#ff0", + "width": 5 + } + ], + "tagRenderings": [ + "website", + "reviews", + "phone" + ] + } + ] +} \ No newline at end of file diff --git a/assets/themes/dog/dogshop.svg b/assets/themes/dog/dogshop.svg new file mode 100644 index 0000000000..2383aeb5bd --- /dev/null +++ b/assets/themes/dog/dogshop.svg @@ -0,0 +1,68 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/assets/themes/dog/license_info.json b/assets/themes/dog/license_info.json new file mode 100644 index 0000000000..b51791ea3b --- /dev/null +++ b/assets/themes/dog/license_info.json @@ -0,0 +1,59 @@ +[ + { + "path": "Veterinary-First-Aid.svg", + "license": "PD", + "authors": [ + "Niels Elgaard Larsen", + "Gordon Dylan Johnson" + ], + "sources": [ + "https://openclipart.org/detail/278711/veterinary-first-aid" + ] + }, + { + "path": "dog-food.svg", + "license": "PD", + "authors": [ + "Public Domain Symbols", + "Jean Victor Balin ", + "Niels Elgaard Larsen" + ], + "sources": [ + "https://openclipart.org/detail/260714/dogpark15", + "https://openclipart.org/detail/25719/aiga-restaurant" + ] + }, + { + "path": "dog-park.svg", + "license": "CC0 1.0", + "authors": [ + "Public Domain Symbols", + "Niels Elgaard Larsen" + ], + "sources": [ + "https://openclipart.org/detail/260714/dogpark15" + ] + }, + { + "path": "dogshop.svg", + "license": "CC0 1.0", + "authors": [ + "Public Domain Symbols", + "Niels Elgaard Larsen" + ], + "sources": [ + "https://openclipart.org/detail/260714/dogpark15" + ] + }, + { + "path": "petshop.svg", + "license": "CC0 1.0", + "authors": [ + "Niels Elgaard Larsen", + "Public Domain Symbols" + ], + "sources": [ + "https://openclipart.org/detail/260857/veterinary15" + ] + } +] \ No newline at end of file diff --git a/assets/themes/dog/petshop.svg b/assets/themes/dog/petshop.svg new file mode 100644 index 0000000000..22d104fd6f --- /dev/null +++ b/assets/themes/dog/petshop.svg @@ -0,0 +1,93 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + From fb122a4abcb618cc2dbe175cc34603d7b15976aa Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Sat, 23 Apr 2022 02:49:42 +0200 Subject: [PATCH 02/16] add presets --- assets/themes/dog/dog.json | 87 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index ec186f32ec..88a63eb38c 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -31,8 +31,22 @@ ] } }, - "#": "The tagrenderings are everything that must be shown and/or asked. Use a full tag-rendering section OR a single string to call a builtin tagrendering (see https://github.com/pietervdvn/MapComplete/blob/develop/Docs/BuiltinQuestions.md)", "minzoom": 10, + "presets": [ + { + "title": { + "en": "a dog park", + "da": "en hundeskov" + }, + "tags": [ + "leisure=dog_park" + ], + "description": { + "en": "A place for dogs, where they can run unleashed", + "da": "En hundeskov eller hundegård beregnet til hunde, hvor de kan løbe unden snor" + } + } + ], "name": { "en": "dog parks", "da": "hundeskove" @@ -106,6 +120,43 @@ "da": "Er denne hundeskov indhegnet?" } }, + { + "id": "smalldogs", + "mappings": [ + { + "if": "small_dog=separate", + "then": { + "en": "Have separate area for small dogs and puppies", + "da": "Har en indhegning til små hunde og hvalpe" + } + }, + { + "if": "small_dog=shared", + "then": { + "en": "fenced: No", + "da": "indhegnet: Nej" + } + } + ], + "question": { + "en": "Does this dog park have a separate fenced in area for small dogs and puppies?", + "da": "Har denne hundeskov et separat indhegnet område for små hunde og hvalpe (hvalpegård)?" + } + }, + { + "question": { + "en": "What is the name of this dog park?", + "da": "Hvad hedder denne hundeskov?" + }, + "render": { + "en": "The name of this dog park is {name}", + "de": "Denne hundeskov hedder {name}" + }, + "freeform": { + "key": "name" + }, + "id": "Name" + }, { "id": "dogarea", "render": { @@ -295,6 +346,22 @@ } }, "minzoom": 10, + "presets": [ + { + "title": { + "en": "a veterianarian", + "da": "en dyrlæge" + }, + "tags": [ + "amenity=veterinary", + "pet=dog" + ], + "description": { + "en": "a veterianarian, that treats dogs", + "da": "En dyrlæge, der behandler hunde" + } + } + ], "name": { "en": "veterinary", "da": "dyrlæge" @@ -331,8 +398,22 @@ "tagRenderings": [ "website", "reviews", - "phone" + "phone", + { + "question": { + "en": "What is the name of this veterinarian?", + "da": "Hvad hedder denne dyrlæ?" + }, + "render": { + "en": "The name of this veterinarian is {name}", + "de": "Denne dyrlæ hedder {name}" + }, + "freeform": { + "key": "name" + }, + "id": "Name" + } ] } ] -} \ No newline at end of file +} From 8092fcb2035f3b560a952930b0207a60af2cc17b Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 16:21:47 +0200 Subject: [PATCH 03/16] add presets reuse food layer --- assets/themes/dog/dog.json | 133 +++++++++++++++---------------------- 1 file changed, 54 insertions(+), 79 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 88a63eb38c..6f14a72a10 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -43,7 +43,7 @@ ], "description": { "en": "A place for dogs, where they can run unleashed", - "da": "En hundeskov eller hundegård beregnet til hunde, hvor de kan løbe unden snor" + "da": "En hundeskov eller hundegård beregnet til hunde, hvor de kan løbe uden snor" } } ], @@ -67,28 +67,12 @@ }, "mapRendering": [ { - "#": "Rendering block of a mapping which is shown for points AND at the center point of a line/area", "location": [ "point", "centroid" ], - "iconx": "./assets/themes/dog/dog-park.svg", "icon": "./assets/themes/dog/dog-park.svg", - "iconSize": "40,40,center", - "label": { - "render": { - "en": "dogpark", - "da": "hundeskov" - }, - "mappings": [ - { - "if": "name~*", - "then": { - "*": "{name}" - } - } - ] - } + "iconSize": "40,40,center" }, { "#": "Rendering of a line", @@ -120,14 +104,37 @@ "da": "Er denne hundeskov indhegnet?" } }, + { + "id": "bin", + "mappings": [ + { + "if": "bin=yes", + "then": { + "en": "waste bin: Yes", + "da": "skraldespand: Ja" + } + }, + { + "if": "bin=no", + "then": { + "en": "waste bin: No", + "da": "skraldespand: Nej" + } + } + ], + "question": { + "en": "Does this dog park have a waste bin?", + "da": "Har denne hundeskov en skraldespand?" + } + }, { "id": "smalldogs", "mappings": [ { "if": "small_dog=separate", "then": { - "en": "Have separate area for small dogs and puppies", - "da": "Har en indhegning til små hunde og hvalpe" + "en": "Have separate area for puppies and small dogs", + "da": "Har en indhegning til hvalpe og små hunde " } }, { @@ -170,9 +177,23 @@ ] }, { - "id": "dog_food", - "source": { - "osmTags": { + "builtin": "food", + "override": { + "id": "dogfoodb", + "name": { + "en": "Dog friendly eateries", + "da": "Hundevenlige madsteder" + }, + "icon": "./assets/themes/dog/dog-food.svg", + "=iconBadges": [ + { + "render": "circle:white;./assets/themes/dog/dog-food.svg" + } + ], + "iconSize": "30,30,center", + "=presets": [], + "source": { + "=osmTags": { "and": [ { "or": [ @@ -188,62 +209,9 @@ ] } ] - } - }, - "minzoom": 11, - "name": { - "en": "dogfriendly eateries", - "da": "hundevenlige madsteder" - }, - "title": { - "render": { - "en": "dog-friendly eatery", - "da": "hundevenligt spisested" - }, - "mappings": [ - { - "if": "name~*", - "then": { - "*": "{name}" - } } - ] - }, - "mapRendering": [ - { - "location": [ - "point", - "centroid" - ], - "icon": "./assets/themes/dog/dog-food.svg", - "iconSize": "30,30,center", - "label": { - "render": { - "en": "dog-friendly food", - "da": "hundevenligt madsted" - }, - "mappings": [ - { - "if": "name~*", - "then": { - "*": "{name}" - } - } - ] - } - }, - { - "#": "Rendering of a line", - "color": "#ff0", - "width": 5 } - ], - "tagRenderings": [ - "website", - "reviews", - "phone", - "images" - ] + } }, { "id": "dogshop", @@ -390,7 +358,6 @@ "iconSize": "30,30,center" }, { - "#": "Rendering of a line", "color": "#ff0", "width": 5 } @@ -411,9 +378,17 @@ "freeform": { "key": "name" }, - "id": "Name" + "id": "vetName" } ] + }, + { + "builtin": "food", + "override": { + "minzoom": 19, + "filter": null, + "name": null + } } ] } From f7176a0c06468199672462dbdb29739b1524616d Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 17:38:06 +0200 Subject: [PATCH 04/16] food dog icon with builtin --- assets/themes/dog/dog.json | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 6f14a72a10..2ea6b9a593 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -184,10 +184,13 @@ "en": "Dog friendly eateries", "da": "Hundevenlige madsteder" }, - "icon": "./assets/themes/dog/dog-food.svg", - "=iconBadges": [ + "=mapRendering": [ { - "render": "circle:white;./assets/themes/dog/dog-food.svg" + "location": [ + "point", + "centroid" + ], + "icon": "./assets/themes/dog/dog-food.svg" } ], "iconSize": "30,30,center", From 31f9950459445bb3698ec26b011454dc480501ed Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 17:47:14 +0200 Subject: [PATCH 05/16] shops for dogs, two levels --- assets/themes/dog/dog.json | 143 +++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 79 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 2ea6b9a593..83e0fff4b6 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -217,95 +217,72 @@ } }, { + "builtin": "shops", "id": "dogshop", - "source": { - "osmTags": { - "and": [ - "shop~*", + "override": { + "id": "dogshop", + "name": { + "en": "dog-friendly shop", + "da": "hundevenlig butik" + }, + "title": { + "render": { + "en": "dog-friendly shop", + "da": "hundevenlig butik" + }, + "mappings": [ { + "if": "name~*", + "then": { + "*": "{name}" + } + } + ] + }, + "mapRendering": [ + { + "location": [ + "point", + "centroid" + ], + "icon": { + "render": "./assets/themes/dog/dogshop.svg", + "mappings": [ + { + "if": { + "and": [ + "shop=pet" + ] + }, + "then": "./assets/themes/dog/petshop.svg" + } + ] + }, + "iconSize": "30,30,center" + + }, + { + "#": "Rendering of a line", + "color": "#ff0", + "width": 5 + } + ], + "=presets": [], + "source": { + "=osmTags": { + "and": [ + "shop~*", + { "or": [ "dog=leashed", "dog=yes", "shop=pet" ] - } + } ] - } - }, - "minzoom": 12, - "name": { - "en": "dogfriendly shop", - "da": "hundevenlig butik" - }, - "title": { - "render": { - "en": "dog-friendly shop", - "da": "hundevenlig butik" - }, - "mappings": [ - { - "if": "name~*", - "then": { - "*": "{name}" - } } - ] - }, - "mapRendering": [ - { - "location": [ - "point", - "centroid" - ], - "icon": { - "render": "./assets/themes/dog/dogshop.svg", - "mappings": [ - { - "if": { - "and": [ - "shop=pet" - ] - }, - "then": "./assets/themes/dog/petshop.svg" - } - ] - }, - "iconSize": "30,30,center", - "label": { - "render": { - "en": "dog friendly shop", - "da": "hundevenlig butik" - }, - "mappings": [ - { - "if": "name~*", - "then": { - "*": "{name}" - } - } - ] - } - }, - { - "#": "Rendering of a line", - "color": "#ff0", - "width": 5 } - ], - "tagRenderings": [ - { - "id": "shoptype", - "render": { - "en": "sells {shop}", - "da": "sælger {shop}" - }, - "condition": "shop!=pet" - }, - "website", - "reviews", - "phone", - "images" - ] + } }, { "id": "veterinary", @@ -392,6 +369,14 @@ "filter": null, "name": null } + }, + { + "builtin": "shops", + "override": { + "minzoom": 19, + "filter": null, + "name": null + } } ] } From deb048053dad0920e62f653dbb7f7b94486089ca Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 18:32:02 +0200 Subject: [PATCH 06/16] opening hours for vets --- assets/themes/dog/dog.json | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 83e0fff4b6..be9b11754b 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -184,7 +184,7 @@ "en": "Dog friendly eateries", "da": "Hundevenlige madsteder" }, - "=mapRendering": [ + "mapRendering": [ { "location": [ "point", @@ -259,7 +259,6 @@ ] }, "iconSize": "30,30,center" - }, { "#": "Rendering of a line", @@ -267,7 +266,6 @@ "width": 5 } ], - "=presets": [], "source": { "=osmTags": { "and": [ @@ -335,7 +333,13 @@ "centroid" ], "icon": "./assets/themes/dog/Veterinary-First-Aid.svg", - "iconSize": "30,30,center" + "iconSize": "30,30,center", + "iconBadges": [ + { + "if": "opening_hours~*", + "then": "isOpen" + } + ] }, { "color": "#ff0", @@ -346,6 +350,7 @@ "website", "reviews", "phone", + "opening_hours", { "question": { "en": "What is the name of this veterinarian?", @@ -375,6 +380,20 @@ "override": { "minzoom": 19, "filter": null, + "presets": [ + { + "title": { + "en": "dog-friendly shop", + "da": "EN hundevenlig butik" + }, + "tags": [ + "dog=yes" + ], + "description": { + "en": "A shop whery you can bring a dog almost everywhere", + "da": "En butik hvor man kan tage en hund med næsten overalt" + } + }], "name": null } } From fc9535216fab32fdeb2dc567c2f59eef293e91e2 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 18:38:34 +0200 Subject: [PATCH 07/16] label for dogpark --- assets/themes/dog/dog.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index be9b11754b..830d0f9786 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -72,7 +72,15 @@ "centroid" ], "icon": "./assets/themes/dog/dog-park.svg", - "iconSize": "40,40,center" + "iconSize": "40,40,center", + "label": { + "mappings": [ + { + "if": "name~*", + "then": "
{name}
" + } + ] + } }, { "#": "Rendering of a line", From 0e838a64f7ba23c229d8cf7e8626b43efdc1edcc Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 18:42:53 +0200 Subject: [PATCH 08/16] shop preset --- assets/themes/dog/dog.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 830d0f9786..f481992f1e 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -395,7 +395,8 @@ "da": "EN hundevenlig butik" }, "tags": [ - "dog=yes" + "dog=yes", + "shop=yes" ], "description": { "en": "A shop whery you can bring a dog almost everywhere", From 9462638fa7af3bce32552b1df1181126d62a13ff Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 22:15:54 +0200 Subject: [PATCH 09/16] vet labels --- assets/themes/dog/dog.json | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index f481992f1e..1a4abfd16b 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -198,10 +198,10 @@ "point", "centroid" ], - "icon": "./assets/themes/dog/dog-food.svg" + "icon": "./assets/themes/dog/dog-food.svg", + "iconSize": "30,30,center" } ], - "iconSize": "30,30,center", "=presets": [], "source": { "=osmTags": { @@ -342,6 +342,14 @@ ], "icon": "./assets/themes/dog/Veterinary-First-Aid.svg", "iconSize": "30,30,center", + "label": { + "mappings": [ + { + "if": "name~*", + "then": "
{name}
" + } + ] + }, "iconBadges": [ { "if": "opening_hours~*", From 5809a0957f933aad5f73f24fe0d4145eb6a018b7 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Mon, 25 Apr 2022 22:20:38 +0200 Subject: [PATCH 10/16] shop presets --- assets/themes/dog/dog.json | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 1a4abfd16b..ee67fcf012 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -274,6 +274,7 @@ "width": 5 } ], + "presets": [], "source": { "=osmTags": { "and": [ From 2d8f222d0d984bbe9da649f8cdc3ac58702bc9f2 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Tue, 26 Apr 2022 00:18:08 +0200 Subject: [PATCH 11/16] shop presets --- assets/themes/dog/dog.json | 86 +++++++++++++++++++++----------------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index ee67fcf012..446bc8c383 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -39,7 +39,7 @@ "da": "en hundeskov" }, "tags": [ - "leisure=dog_park" + "leisure=dog_park" ], "description": { "en": "A place for dogs, where they can run unleashed", @@ -205,21 +205,21 @@ "=presets": [], "source": { "=osmTags": { - "and": [ - { - "or": [ - "amenity=restaurant", - "amenity=cafe" - ] - }, - { - "or": [ - "dog=unleashed", - "dog=leashed", - "dog=yes" - ] - } - ] + "and": [ + { + "or": [ + "amenity=restaurant", + "amenity=cafe" + ] + }, + { + "or": [ + "dog=unleashed", + "dog=leashed", + "dog=yes" + ] + } + ] } } } @@ -242,7 +242,7 @@ { "if": "name~*", "then": { - "*": "{name}" + "*": "{name}" } } ] @@ -263,7 +263,7 @@ ] }, "then": "./assets/themes/dog/petshop.svg" - } + } ] }, "iconSize": "30,30,center" @@ -274,19 +274,26 @@ "width": 5 } ], - "presets": [], + "presets": [ + { + "tags": [ + "shop=yes", + "dog=yes" + ] + } + ], "source": { "=osmTags": { "and": [ "shop~*", { - "or": [ - "dog=leashed", - "dog=yes", - "shop=pet" - ] + "or": [ + "dog=leashed", + "dog=yes", + "shop=pet" + ] } - ] + ] } } } @@ -398,22 +405,23 @@ "minzoom": 19, "filter": null, "presets": [ - { - "title": { - "en": "dog-friendly shop", - "da": "EN hundevenlig butik" - }, - "tags": [ - "dog=yes", - "shop=yes" - ], - "description": { - "en": "A shop whery you can bring a dog almost everywhere", - "da": "En butik hvor man kan tage en hund med næsten overalt" + { + "title": { + "en": "dog-friendly shop", + "da": "EN hundevenlig butik" + }, + "tags": [ + "dog=yes", + "shop=yes" + ], + "description": { + "en": "A shop whery you can bring a dog almost everywhere", + "da": "En butik hvor man kan tage en hund med næsten overalt" + } } - }], + ], "name": null } } ] -} +} \ No newline at end of file From 1b52bdda7800bf69138de5522911e05d41a57b5f Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Tue, 26 Apr 2022 01:41:55 +0200 Subject: [PATCH 12/16] fix txt for question --- assets/themes/dog/dog.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 446bc8c383..53d9c1e336 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -142,14 +142,14 @@ "if": "small_dog=separate", "then": { "en": "Have separate area for puppies and small dogs", - "da": "Har en indhegning til hvalpe og små hunde " + "da": "Har en indhegning til hvalpe og små hunde" } }, { "if": "small_dog=shared", "then": { - "en": "fenced: No", - "da": "indhegnet: Nej" + "en": "Does not have a separate area for puppies and small dogs", + "da": "Har ikke en indhegning til hvalpe og små hunde" } } ], @@ -424,4 +424,4 @@ } } ] -} \ No newline at end of file +} From fdec6c70ea3591b5f0f460bd3af11919c8d78769 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Fri, 29 Apr 2022 19:47:31 +0200 Subject: [PATCH 13/16] rewording for ha --- assets/themes/dog/dog.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 53d9c1e336..644a048684 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -175,8 +175,8 @@ { "id": "dogarea", "render": { - "en": "areal: {_surface:ha} ha", - "da": "areal: {_surface:ha} ha" + "en": "This dogpark is {_surface:ha} ha big", + "da": "Denne hundeskov er på {_surface:ha} hektar" }, "condition": "_surface:ha!=0" }, From 669c124361181d15f434b4d64bcf842d885a5c27 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Fri, 29 Apr 2022 19:52:36 +0200 Subject: [PATCH 14/16] fenced rewording --- assets/themes/dog/dog.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 644a048684..d81c39f6ae 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -95,15 +95,15 @@ { "if": "barrier=fence", "then": { - "en": "fenced: Yes", - "da": "indhegnet: Ja" + "en": "This dogpark is fenced all around", + "da": "Denne hundskov er indhegnet" } }, { "if": "barrier=no", "then": { - "en": "fenced: No", - "da": "indhegnet: Nej" + "en": "This dogpark is not fenced all around", + "da": "Denne hundskov er ikke indhegnet" } } ], From 95db70e210163d3593fa7e7756c89d5187bad374 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Fri, 29 Apr 2022 20:10:25 +0200 Subject: [PATCH 15/16] dog waste baskets as separate layer --- assets/themes/dog/dog.json | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index d81c39f6ae..84c325c448 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -112,29 +112,6 @@ "da": "Er denne hundeskov indhegnet?" } }, - { - "id": "bin", - "mappings": [ - { - "if": "bin=yes", - "then": { - "en": "waste bin: Yes", - "da": "skraldespand: Ja" - } - }, - { - "if": "bin=no", - "then": { - "en": "waste bin: No", - "da": "skraldespand: Nej" - } - } - ], - "question": { - "en": "Does this dog park have a waste bin?", - "da": "Har denne hundeskov en skraldespand?" - } - }, { "id": "smalldogs", "mappings": [ @@ -399,6 +376,14 @@ "name": null } }, + { + "builtin": "waste_basket", + "override": { + "minzoom": 16, + "filter": null, + "name": null + } + }, { "builtin": "shops", "override": { From 433aff25db09607ed39f909f19817b0db20d10d7 Mon Sep 17 00:00:00 2001 From: Niels Elgaard Larsen Date: Fri, 29 Apr 2022 21:08:24 +0200 Subject: [PATCH 16/16] new vet logo --- assets/themes/dog/Veterinary-First-Aid.svg | 15 ---- assets/themes/dog/dog.json | 4 +- assets/themes/dog/license_info.json | 8 +- assets/themes/dog/vet.svg | 98 ++++++++++++++++++++++ 4 files changed, 104 insertions(+), 21 deletions(-) delete mode 100644 assets/themes/dog/Veterinary-First-Aid.svg create mode 100644 assets/themes/dog/vet.svg diff --git a/assets/themes/dog/Veterinary-First-Aid.svg b/assets/themes/dog/Veterinary-First-Aid.svg deleted file mode 100644 index c6e9a9a675..0000000000 --- a/assets/themes/dog/Veterinary-First-Aid.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/assets/themes/dog/dog.json b/assets/themes/dog/dog.json index 84c325c448..c29b167fdb 100644 --- a/assets/themes/dog/dog.json +++ b/assets/themes/dog/dog.json @@ -325,8 +325,8 @@ "point", "centroid" ], - "icon": "./assets/themes/dog/Veterinary-First-Aid.svg", - "iconSize": "30,30,center", + "icon": "./assets/themes/dog/vet.svg", + "iconSize": "30,40,center", "label": { "mappings": [ { diff --git a/assets/themes/dog/license_info.json b/assets/themes/dog/license_info.json index b51791ea3b..36b08f8809 100644 --- a/assets/themes/dog/license_info.json +++ b/assets/themes/dog/license_info.json @@ -1,13 +1,13 @@ [ { - "path": "Veterinary-First-Aid.svg", + "path": "vet.svg", "license": "PD", "authors": [ "Niels Elgaard Larsen", - "Gordon Dylan Johnson" + "Tim Hitchins" ], "sources": [ - "https://openclipart.org/detail/278711/veterinary-first-aid" + "https://openclipart.org/detail/216869/snake-pole-logo-for-healthse-no-background-white-snake" ] }, { @@ -56,4 +56,4 @@ "https://openclipart.org/detail/260857/veterinary15" ] } -] \ No newline at end of file +] diff --git a/assets/themes/dog/vet.svg b/assets/themes/dog/vet.svg new file mode 100644 index 0000000000..e430de13c3 --- /dev/null +++ b/assets/themes/dog/vet.svg @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + V +