From 3968a1e841cef10e5fac08b7a2c8e6b685a4f07c Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Wed, 24 Apr 2024 00:05:31 +0200 Subject: [PATCH] Themes: add animal types to animal_shelter, include animal_shelter in pets, generate licenses, fix cycle_highways.json --- .../layers/aerialway/chair_lift.svg.license | 2 +- assets/layers/aerialway/license_info.json | 2 +- .../layers/animal_shelter/animal_shelter.json | 55 ++++++++++++++----- .../layers/animal_shelter/animal_shelter.svg | 1 + .../animal_shelter/animal_shelter.svg.license | 2 + .../layers/animal_shelter/license_info.json | 12 ++++ assets/layers/usersettings/license_info.json | 16 ++++++ .../question_multiple.svg.license | 2 + .../usersettings/question_single.svg.license | 2 + .../themes/cycle_highways/cycle_highways.json | 19 +------ assets/themes/pets/pets.json | 3 +- 11 files changed, 80 insertions(+), 36 deletions(-) create mode 100644 assets/layers/animal_shelter/animal_shelter.svg create mode 100644 assets/layers/animal_shelter/animal_shelter.svg.license create mode 100644 assets/layers/animal_shelter/license_info.json create mode 100644 assets/layers/usersettings/question_multiple.svg.license create mode 100644 assets/layers/usersettings/question_single.svg.license diff --git a/assets/layers/aerialway/chair_lift.svg.license b/assets/layers/aerialway/chair_lift.svg.license index 07a65ef1c..f7e8066c8 100644 --- a/assets/layers/aerialway/chair_lift.svg.license +++ b/assets/layers/aerialway/chair_lift.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: Gouvernement fran��ais, Roulex 45 +SPDX-FileCopyrightText: Gouvernement français, Roulex 45 SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/aerialway/license_info.json b/assets/layers/aerialway/license_info.json index 8485f2766..434574298 100644 --- a/assets/layers/aerialway/license_info.json +++ b/assets/layers/aerialway/license_info.json @@ -29,4 +29,4 @@ "https://commons.wikimedia.org/wiki/File:Pictogram_Gondola_Lift.svg" ] } -] +] \ No newline at end of file diff --git a/assets/layers/animal_shelter/animal_shelter.json b/assets/layers/animal_shelter/animal_shelter.json index 30b80d36e..eda0a1854 100644 --- a/assets/layers/animal_shelter/animal_shelter.json +++ b/assets/layers/animal_shelter/animal_shelter.json @@ -51,7 +51,7 @@ "color": "#ffffff" }, { - "icon": "https://upload.wikimedia.org/wikipedia/commons/7/7a/Animal_Shelter_%288670%29_-_The_Noun_Project.svg" + "icon": "./assets/layers/animal_shelter/animal_shelter.svg" } ] } @@ -146,26 +146,51 @@ ], "multiAnswer": true }, + "opening_hours_by_appointment", { "question": { - "en": "When is this animal shelter opened?", - "de": "Wann ist das Tierheim geöffnet?", - "es": "¿Cuándo se abre este refugio de animales?", - "zh_Hans": "这个动物收容所什么时候开放？", - "ca": "Quan està obert aquest refugi d'animals?" + "en": "Which animals are accepted here?" }, - "id": "7", + "id": "boarded_animals", + "mappings": [ + { + "if": "animal_shelter=dog", + "then": { + "en": "Dogs are kept here" + } + }, + { + "if": "animal_shelter=cat", + "then": { + "en": "Cats are kept here" + } + }, + { + "if": "animal_shelter=horse", + "then": { + "en": "Horses are kept here" + } + }, + { + "if": "animal_shelter=bird", + "then": { + "en": "Birds are kept here" + } + }, + { + "if": "animal_shelter=wildlife", + "then": { + "en": "Wild animals are kept here" + } + } + ], "render": { - "en": "{opening_hours_table()}", - "de": "{opening_hours_table()}", - "es": "{opening_hours_table()}", - "zh_Hans": "{opening_hours_table()}", - "ca": "{opening_hours_table()}" + "en": "{animal_shelter} is kept here" }, "freeform": { - "key": "opening_hours", - "type": "opening_hours" - } + "key": "animal_shelter" + }, + "multiAnswer": true } ], "deletion": true, diff --git a/assets/layers/animal_shelter/animal_shelter.svg b/assets/layers/animal_shelter/animal_shelter.svg new file mode 100644 index 000000000..0cfe2b65e --- /dev/null +++ b/assets/layers/animal_shelter/animal_shelter.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/layers/animal_shelter/animal_shelter.svg.license b/assets/layers/animal_shelter/animal_shelter.svg.license new file mode 100644 index 000000000..41f3384ab --- /dev/null +++ b/assets/layers/animal_shelter/animal_shelter.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Noun Project +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/animal_shelter/license_info.json b/assets/layers/animal_shelter/license_info.json new file mode 100644 index 000000000..d0ad8de38 --- /dev/null +++ b/assets/layers/animal_shelter/license_info.json @@ -0,0 +1,12 @@ +[ + { + "path": "animal_shelter.svg", + "license": "CC0-1.0", + "authors": [ + "Noun Project" + ], + "sources": [ + "https://commons.wikimedia.org/wiki/File:Animal_Shelter_(8670)_-_The_Noun_Project.svg" + ] + } +] \ No newline at end of file diff --git a/assets/layers/usersettings/license_info.json b/assets/layers/usersettings/license_info.json index b6eb34237..12e5f6143 100644 --- a/assets/layers/usersettings/license_info.json +++ b/assets/layers/usersettings/license_info.json @@ -1,4 +1,20 @@ [ + { + "path": "question_multiple.svg", + "license": "CC0-1.0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + }, + { + "path": "question_single.svg", + "license": "CC0-1.0", + "authors": [ + "Pieter Vander Vennet" + ], + "sources": [] + }, { "path": "translate_disabled.svg", "license": "CC-BY-SA-3.0", diff --git a/assets/layers/usersettings/question_multiple.svg.license b/assets/layers/usersettings/question_multiple.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/usersettings/question_multiple.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/layers/usersettings/question_single.svg.license b/assets/layers/usersettings/question_single.svg.license new file mode 100644 index 000000000..ed0288300 --- /dev/null +++ b/assets/layers/usersettings/question_single.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: Pieter Vander Vennet +SPDX-License-Identifier: CC0-1.0 \ No newline at end of file diff --git a/assets/themes/cycle_highways/cycle_highways.json b/assets/themes/cycle_highways/cycle_highways.json index 6afd7f3a5..f7997a176 100644 --- a/assets/themes/cycle_highways/cycle_highways.json +++ b/assets/themes/cycle_highways/cycle_highways.json @@ -244,24 +244,7 @@ } ] }, - "width": "4", - "dashArray": { - "render": "", - "mappings": [ - { - "if": "state=temporary", - "then": "12 10" - }, - { - "if": "note:state=has_highway_no", - "then": "0 8" - }, - { - "if": "note:state=has_highway_under_construction", - "then": "12 10" - } - ] - } + "width": "4" } ] } diff --git a/assets/themes/pets/pets.json b/assets/themes/pets/pets.json index b8c44b34b..dc3f34f68 100644 --- a/assets/themes/pets/pets.json +++ b/assets/themes/pets/pets.json @@ -237,6 +237,7 @@ ], "name": null } - } + }, + "animal_shelter" ] }