From 566facaa4ecd30d98d1e726a24ab19635b51481e Mon Sep 17 00:00:00 2001 From: pietervdvn Date: Sat, 30 Apr 2022 02:41:06 +0200 Subject: [PATCH] Fix build, translation sync --- .../pets => layers/dogpark}/dog-park.svg | 0 assets/layers/dogpark/dogpark.json | 2 +- assets/layers/dogpark/license_info.json | 13 ++++ assets/layers/veterinary/license_info.json | 13 ++++ .../pets => layers/veterinary}/vet.svg | 0 assets/layers/veterinary/veterinary.json | 2 +- .../mapcomplete-changes.json | 57 ++++++----------- assets/themes/pets/license_info.json | 24 +------- assets/themes/pets/pets.json | 8 +-- langs/layers/da.json | 59 ++++++++++++++++++ langs/layers/de.json | 14 +++++ langs/layers/en.json | 61 +++++++++++++++++++ langs/themes/da.json | 29 +++++++++ langs/themes/en.json | 29 +++++++++ 14 files changed, 243 insertions(+), 68 deletions(-) rename assets/{themes/pets => layers/dogpark}/dog-park.svg (100%) create mode 100644 assets/layers/dogpark/license_info.json create mode 100644 assets/layers/veterinary/license_info.json rename assets/{themes/pets => layers/veterinary}/vet.svg (100%) diff --git a/assets/themes/pets/dog-park.svg b/assets/layers/dogpark/dog-park.svg similarity index 100% rename from assets/themes/pets/dog-park.svg rename to assets/layers/dogpark/dog-park.svg diff --git a/assets/layers/dogpark/dogpark.json b/assets/layers/dogpark/dogpark.json index dacbfaede..35eaebe45 100644 --- a/assets/layers/dogpark/dogpark.json +++ b/assets/layers/dogpark/dogpark.json @@ -53,7 +53,7 @@ "point", "centroid" ], - "icon": "./assets/themes/dog/dog-park.svg", + "icon": "./assets/layers/dogpark/dog-park.svg", "iconSize": "40,40,center", "label": { "mappings": [ diff --git a/assets/layers/dogpark/license_info.json b/assets/layers/dogpark/license_info.json new file mode 100644 index 000000000..1a51abf46 --- /dev/null +++ b/assets/layers/dogpark/license_info.json @@ -0,0 +1,13 @@ +[ + { + "path": "dog-park.svg", + "license": "CC0 1.0", + "authors": [ + "Public Domain Symbols", + "Niels Elgaard Larsen" + ], + "sources": [ + "https://openclipart.org/detail/260714/dogpark15" + ] + } +] \ No newline at end of file diff --git a/assets/layers/veterinary/license_info.json b/assets/layers/veterinary/license_info.json new file mode 100644 index 000000000..0b9a7474d --- /dev/null +++ b/assets/layers/veterinary/license_info.json @@ -0,0 +1,13 @@ +[ + { + "path": "vet.svg", + "license": "PD", + "authors": [ + "Niels Elgaard Larsen", + "Tim Hitchins" + ], + "sources": [ + "https://openclipart.org/detail/216869/snake-pole-logo-for-healthse-no-background-white-snake" + ] + } +] \ No newline at end of file diff --git a/assets/themes/pets/vet.svg b/assets/layers/veterinary/vet.svg similarity index 100% rename from assets/themes/pets/vet.svg rename to assets/layers/veterinary/vet.svg diff --git a/assets/layers/veterinary/veterinary.json b/assets/layers/veterinary/veterinary.json index d9eb27b22..5c2ff6c89 100644 --- a/assets/layers/veterinary/veterinary.json +++ b/assets/layers/veterinary/veterinary.json @@ -48,7 +48,7 @@ "point", "centroid" ], - "icon": "./assets/themes/dog/vet.svg", + "icon": "./assets/layers/veterinary/vet.svg", "iconSize": "30,40,center", "label": { "mappings": [ diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json index 847f62fd6..0a04dea61 100644 --- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json +++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json @@ -1,19 +1,13 @@ { "id": "mapcomplete-changes", "title": { - "en": "Changes made with MapComplete", - "de": "Änderungen mit MapComplete", - "es": "Cambios hechos con MapComplete" + "en": "Changes made with MapComplete" }, "shortDescription": { - "en": "Shows changes made by MapComplete", - "de": "Zeigt Änderungen von MapComplete", - "es": "Muestra los cambios hechos por MapComplete" + "en": "Shows changes made by MapComplete" }, "description": { - "en": "This maps shows all the changes made with MapComplete", - "de": "Diese Karte zeigt alle Änderungen die mit MapComplete gemacht wurden", - "es": "Este mapa muestra todos los cambios hechos con MapComplete" + "en": "This maps shows all the changes made with MapComplete" }, "maintainer": "", "icon": "./assets/svg/logo.svg", @@ -28,9 +22,7 @@ { "id": "mapcomplete-changes", "name": { - "en": "Changeset centers", - "de": "Schwerpunkte von Änderungssätzen", - "es": "Centros de conjuntos de cambios" + "en": "Changeset centers" }, "minzoom": 0, "source": { @@ -44,45 +36,35 @@ ], "title": { "render": { - "en": "Changeset for {theme}", - "de": "Änderungen für {theme}", - "es": "Conjunto de cambios para {theme}" + "en": "Changeset for {theme}" } }, "description": { - "en": "Shows all MapComplete changes", - "de": "Zeigt alle MapComplete Änderungen", - "es": "Muestra todos los cambios de MapComplete" + "en": "Shows all MapComplete changes" }, "tagRenderings": [ { "id": "render_id", "render": { - "en": "Changeset {id}", - "de": "Änderung {id}", - "es": "Conjunto de cambios {id}" + "en": "Changeset {id}" } }, { "id": "contributor", "render": { - "en": "Change made by {_last_edit:contributor}", - "de": "Änderung wurde von {_last_edit:contributor} gemacht", - "es": "Cambio hecho por {_last_edit:contributor}" + "en": "Change made by {_last_edit:contributor}" } }, { "id": "theme", "render": { - "en": "Change with theme {theme}", - "de": "Änderung mit Thema {theme}" + "en": "Change with theme {theme}" }, "mappings": [ { "if": "theme~http.*", "then": { - "en": "Change with unofficial theme {theme}", - "de": "Änderung mit inoffiziellem Thema {theme}" + "en": "Change with unofficial theme {theme}" } } ] @@ -257,6 +239,10 @@ "if": "theme=personal", "then": "./assets/svg/addSmall.svg" }, + { + "if": "theme=pets", + "then": "./assets/layers/dogpark/dog-park.svg" + }, { "if": "theme=play_forests", "then": "./assets/layers/play_forest/icon.svg" @@ -346,8 +332,7 @@ } ], "question": { - "en": "Themename contains {search}", - "de": "Themenname enthält {search}" + "en": "Themename contains {search}" } } ] @@ -363,9 +348,7 @@ } ], "question": { - "en": "Made by contributor {search}", - "de": "Erstellt von {search}", - "es": "Hecho por contributor/a {search}" + "en": "Made by contributor {search}" } } ] @@ -381,9 +364,7 @@ } ], "question": { - "en": "Not made by contributor {search}", - "de": "Nicht erstellt von {search}", - "es": "No hecho por contributor/a {search}" + "en": "Not made by contributor {search}" } } ] @@ -398,9 +379,7 @@ { "id": "link_to_more", "render": { - "en": "More statistics can be found here", - "de": "Weitere Statistiken finden Sie hier", - "es": "Se pueden encontrar más estadísticas aquí" + "en": "More statistics can be found here" } }, { diff --git a/assets/themes/pets/license_info.json b/assets/themes/pets/license_info.json index 36b08f880..cbdbb93c7 100644 --- a/assets/themes/pets/license_info.json +++ b/assets/themes/pets/license_info.json @@ -1,15 +1,4 @@ [ - { - "path": "vet.svg", - "license": "PD", - "authors": [ - "Niels Elgaard Larsen", - "Tim Hitchins" - ], - "sources": [ - "https://openclipart.org/detail/216869/snake-pole-logo-for-healthse-no-background-white-snake" - ] - }, { "path": "dog-food.svg", "license": "PD", @@ -23,17 +12,6 @@ "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", @@ -56,4 +34,4 @@ "https://openclipart.org/detail/260857/veterinary15" ] } -] +] \ No newline at end of file diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json index deb72f47d..c0bb4b0f9 100644 --- a/assets/themes/pets/pets.json +++ b/assets/themes/pets/pets.json @@ -10,7 +10,7 @@ "en": "On this map, you'll find various interesting places for you pets: veterinarians, dog parks, pet shops, dog-friendly restaurants, ...", "da": "Hundsteder" }, - "icon": "./assets/themes/dog/dog-park.svg", + "icon": "./assets/layers/dogpark/dog-park.svg", "startZoom": 10, "startLat": 55, "startLon": 12, @@ -30,7 +30,7 @@ "point", "centroid" ], - "icon": "./assets/themes/dog/dog-food.svg", + "icon": "./assets/themes/pets/dog-food.svg", "iconSize": "30,30,center" } ], @@ -86,7 +86,7 @@ "centroid" ], "icon": { - "render": "./assets/themes/dog/dogshop.svg", + "render": "./assets/themes/pets/dogshop.svg", "mappings": [ { "if": { @@ -94,7 +94,7 @@ "shop=pet" ] }, - "then": "./assets/themes/dog/petshop.svg" + "then": "./assets/themes/pets/petshop.svg" } ] }, diff --git a/langs/layers/da.json b/langs/layers/da.json index 9860a1900..7b7bd47cb 100644 --- a/langs/layers/da.json +++ b/langs/layers/da.json @@ -1239,6 +1239,48 @@ } } }, + "dogpark": { + "name": "hundeskove", + "presets": { + "0": { + "description": "En hundeskov eller hundegård beregnet til hunde, hvor de kan løbe uden snor", + "title": "en hundeskov" + } + }, + "tagRenderings": { + "Name": { + "question": "Hvad hedder denne hundeskov?" + }, + "dogarea": { + "render": "Denne hundeskov er på {_surface:ha} hektar" + }, + "dogpark-fenced": { + "mappings": { + "0": { + "then": "Denne hundskov er indhegnet" + }, + "1": { + "then": "Denne hundskov er ikke indhegnet" + } + }, + "question": "Er denne hundeskov indhegnet?" + }, + "smalldogs": { + "mappings": { + "0": { + "then": "Har en indhegning til hvalpe og små hunde" + }, + "1": { + "then": "Har ikke en indhegning til hvalpe og små hunde" + } + }, + "question": "Har denne hundeskov et separat indhegnet område for små hunde og hvalpe (hvalpegård)?" + } + }, + "title": { + "render": "hundeskov" + } + }, "entrance": { "title": { "render": "Indgang" @@ -1289,5 +1331,22 @@ } }, "name": "Restauranter og fastfood" + }, + "veterinary": { + "name": "dyrlæge", + "presets": { + "0": { + "description": "En dyrlæge, der behandler hunde", + "title": "en dyrlæge" + } + }, + "tagRenderings": { + "vetName": { + "question": "Hvad hedder denne dyrlæ?" + } + }, + "title": { + "render": "dyrlæge" + } } } \ No newline at end of file diff --git a/langs/layers/de.json b/langs/layers/de.json index 8198d6398..fbc762d00 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -2494,6 +2494,13 @@ "description": "Diese Ebene visualisiert Richtungen", "name": "Aufnahmewinkel der Kamera anzeigen" }, + "dogpark": { + "tagRenderings": { + "Name": { + "render": "Denne hundeskov hedder {name}" + } + } + }, "drinking_water": { "name": "Trinkwasserstellen", "presets": { @@ -4592,6 +4599,13 @@ "render": "Baum" } }, + "veterinary": { + "tagRenderings": { + "vetName": { + "render": "Denne dyrlæ hedder {name}" + } + } + }, "viewpoint": { "description": "Ein schöner Aussichtspunkt oder eine schöne Aussicht. Ideal zum Hinzufügen eines Bildes, wenn keine andere Kategorie passt", "name": "Aussichtspunkt", diff --git a/langs/layers/en.json b/langs/layers/en.json index f92051ba1..0626505d0 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3230,6 +3230,49 @@ "description": "This layer visualizes directions", "name": "Direction visualization" }, + "dogpark": { + "name": "dog parks", + "presets": { + "0": { + "description": "A place for dogs, where they can run unleashed", + "title": "a dog park" + } + }, + "tagRenderings": { + "Name": { + "question": "What is the name of this dog park?", + "render": "The name of this dog park is {name}" + }, + "dogarea": { + "render": "This dogpark is {_surface:ha} ha big" + }, + "dogpark-fenced": { + "mappings": { + "0": { + "then": "This dogpark is fenced all around" + }, + "1": { + "then": "This dogpark is not fenced all around" + } + }, + "question": "It this dog park fenced in?" + }, + "smalldogs": { + "mappings": { + "0": { + "then": "Have separate area for puppies and small dogs" + }, + "1": { + "then": "Does not have a separate area for puppies and small dogs" + } + }, + "question": "Does this dog park have a separate fenced in area for small dogs and puppies?" + } + }, + "title": { + "render": "dog park" + } + }, "drinking_water": { "description": "A layer showing drinking water fountains", "name": "Drinking water", @@ -5619,6 +5662,24 @@ "render": "Tree" } }, + "veterinary": { + "name": "veterinary", + "presets": { + "0": { + "description": "a veterianarian, that treats dogs", + "title": "a veterianarian" + } + }, + "tagRenderings": { + "vetName": { + "question": "What is the name of this veterinarian?", + "render": "The name of this veterinarian is {name}" + } + }, + "title": { + "render": "Veterinary" + } + }, "viewpoint": { "description": "A nice viewpoint or nice view. Ideal to add an image if no other category fits", "name": "Viewpoint", diff --git a/langs/themes/da.json b/langs/themes/da.json index 462165b7e..240387b78 100644 --- a/langs/themes/da.json +++ b/langs/themes/da.json @@ -105,5 +105,34 @@ } } } + }, + "pets": { + "description": "Hundsteder", + "layers": { + "1": { + "override": { + "name": "Hundevenlige madsteder" + } + }, + "2": { + "override": { + "name": "hundevenlig butik", + "title": { + "render": "hundevenlig butik" + } + } + }, + "6": { + "override": { + "presets": { + "0": { + "description": "En butik hvor man kan tage en hund med næsten overalt", + "title": "EN hundevenlig butik" + } + } + } + } + }, + "title": "hundesteder" } } \ No newline at end of file diff --git a/langs/themes/en.json b/langs/themes/en.json index 2c2503832..225119a8f 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -734,6 +734,35 @@ "description": "Create a personal theme based on all the available layers of all themes. In order to show some data, open layer selection", "title": "Personal theme" }, + "pets": { + "description": "On this map, you'll find various interesting places for you pets: veterinarians, dog parks, pet shops, dog-friendly restaurants, ...", + "layers": { + "1": { + "override": { + "name": "Dog friendly eateries" + } + }, + "2": { + "override": { + "name": "dog-friendly shop", + "title": { + "render": "dog-friendly shop" + } + } + }, + "6": { + "override": { + "presets": { + "0": { + "description": "A shop whery you can bring a dog almost everywhere", + "title": "dog-friendly shop" + } + } + } + } + }, + "title": "Veterinarians, dog parks and other pet-amenities" + }, "playgrounds": { "description": "On this map, you find playgrounds and can add more information", "shortDescription": "A map with playgrounds",