From 8334e3429fc24ac0a04e441450be6cb3f7fbbfac Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 3 Aug 2022 12:59:46 +0200 Subject: [PATCH 1/9] Pass all features from indoor layer, remove crest --- assets/themes/indoors/crest.svg | 11 ----------- assets/themes/indoors/indoors.json | 7 ++++++- assets/themes/indoors/license_info.json | 10 ---------- 3 files changed, 6 insertions(+), 22 deletions(-) delete mode 100644 assets/themes/indoors/crest.svg delete mode 100644 assets/themes/indoors/license_info.json diff --git a/assets/themes/indoors/crest.svg b/assets/themes/indoors/crest.svg deleted file mode 100644 index 383b543b1e..0000000000 --- a/assets/themes/indoors/crest.svg +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/assets/themes/indoors/indoors.json b/assets/themes/indoors/indoors.json index 55c07e56cb..8b03eaae76 100644 --- a/assets/themes/indoors/indoors.json +++ b/assets/themes/indoors/indoors.json @@ -17,7 +17,12 @@ "startZoom": 14, "widenFactor": 2, "layers": [ - "indoors", + { + "builtin": "indoors", + "override": { + "passAllFeatures": true + } + }, { "builtin": [ "walls_and_buildings" diff --git a/assets/themes/indoors/license_info.json b/assets/themes/indoors/license_info.json deleted file mode 100644 index 9f2dcf81aa..0000000000 --- a/assets/themes/indoors/license_info.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "path": "crest.svg", - "license": "CC0", - "authors": [ - "Free Wheelies" - ], - "sources": [] - } -] \ No newline at end of file From 2f92bba41a106776323ba989d0b13621383f4dfb Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 27 Jul 2022 14:57:35 +0200 Subject: [PATCH 2/9] Added icons for rooms --- assets/layers/indoors/indoors.json | 53 +++++++-- assets/layers/indoors/license_info.json | 52 ++++++++ assets/layers/indoors/room_auditorium.svg | 137 ++++++++++++++++++++++ assets/layers/indoors/room_conference.svg | 118 +++++++++++++++++++ assets/layers/indoors/room_storage.svg | 94 +++++++++++++++ assets/layers/indoors/room_toilet.svg | 132 +++++++++++++++++++++ assets/layers/indoors/room_toilets.svg | 132 +++++++++++++++++++++ 7 files changed, 711 insertions(+), 7 deletions(-) create mode 100644 assets/layers/indoors/license_info.json create mode 100644 assets/layers/indoors/room_auditorium.svg create mode 100644 assets/layers/indoors/room_conference.svg create mode 100644 assets/layers/indoors/room_storage.svg create mode 100644 assets/layers/indoors/room_toilet.svg create mode 100644 assets/layers/indoors/room_toilets.svg diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index 38b1cdd9b2..bae08331a6 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -30,27 +30,39 @@ "mappings": [ { "if": "indoor=room", - "then": "Indoor Room {name}" + "then": { + "en": "Indoor Room {name}" + } }, { "if": "indoor=area", - "then": "Indoor Area {name}" + "then": { + "en": "Indoor Area {name}" + } }, { "if": "indoor=wall", - "then": "Indoor Wall {name}" + "then": { + "en": "Indoor Wall {name}" + } }, { "if": "indoor=corridor", - "then": "Indoor Corridor {name}" + "then": { + "en": "Indoor Corridor {name}" + } }, { "if": "indoor=door", - "then": "Indoor Door {name}" + "then": { + "en": "Indoor Door {name}" + } }, { "if": "indoor=level", - "then": "Indoor Level {name}" + "then": { + "en": "Indoor Level {name}" + } } ] }, @@ -96,7 +108,34 @@ "location": [ "point", "centroid" - ] + ], + "icon": { + "render": null, + "condition": "indoor=room", + "mappings": [ + { + "if": "room=auditorium", + "then": "./assets/layers/indoors/room_auditorium.svg" + }, + { + "if": "room=conference", + "then": "./assets/layers/indoors/room_conference.svg" + }, + { + "if": "room=storage", + "then": "./assets/layers/indoors/room_storage.svg" + }, + { + "if": "room=toilet", + "then": "./assets/layers/indoors/room_toilet.svg" + }, + { + "if": "room=toilets", + "then": "./assets/layers/indoors/room_toilets.svg" + } + ] + }, + "iconSize": "15,15, center" } ] } \ No newline at end of file diff --git a/assets/layers/indoors/license_info.json b/assets/layers/indoors/license_info.json new file mode 100644 index 0000000000..ba436bce03 --- /dev/null +++ b/assets/layers/indoors/license_info.json @@ -0,0 +1,52 @@ +[ + { + "path": "room_auditorium.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_auditorium.svg" + ] + }, + { + "path": "room_conference.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_conference.svg" + ] + }, + { + "path": "room_storage.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_storage.svg" + ] + }, + { + "path": "room_toilet.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_toilet.svg" + ] + }, + { + "path": "room_toilets.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_toilets.svg" + ] + } +] \ No newline at end of file diff --git a/assets/layers/indoors/room_auditorium.svg b/assets/layers/indoors/room_auditorium.svg new file mode 100644 index 0000000000..7c08539433 --- /dev/null +++ b/assets/layers/indoors/room_auditorium.svg @@ -0,0 +1,137 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_conference.svg b/assets/layers/indoors/room_conference.svg new file mode 100644 index 0000000000..5ee49fb50e --- /dev/null +++ b/assets/layers/indoors/room_conference.svg @@ -0,0 +1,118 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_storage.svg b/assets/layers/indoors/room_storage.svg new file mode 100644 index 0000000000..2c6c28308b --- /dev/null +++ b/assets/layers/indoors/room_storage.svg @@ -0,0 +1,94 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_toilet.svg b/assets/layers/indoors/room_toilet.svg new file mode 100644 index 0000000000..e41fc9954c --- /dev/null +++ b/assets/layers/indoors/room_toilet.svg @@ -0,0 +1,132 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_toilets.svg b/assets/layers/indoors/room_toilets.svg new file mode 100644 index 0000000000..e41fc9954c --- /dev/null +++ b/assets/layers/indoors/room_toilets.svg @@ -0,0 +1,132 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + From d2901a8a041fa18eb7c54b70fbf947e7b0d7fd20 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 3 Aug 2022 13:03:04 +0200 Subject: [PATCH 3/9] Move title to render, add elevators to indoors --- assets/layers/elevator/elevator.json | 10 ++++++---- assets/themes/indoors/indoors.json | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index c63252b0e5..91ec21a84a 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -17,10 +17,12 @@ "nl": "Deze laag toont liften en vraagt praktische info over de grootte van de lift en ofdat deze werkt, vooral met het oog op of de lift werkt of niet." }, "title": { - "en": "Elevator", - "fr": "Ascenseur", - "de": "Aufzug", - "nl": "Lift" + "render": { + "en": "Elevator", + "fr": "Ascenseur", + "de": "Aufzug", + "nl": "Lift" + } }, "tagRenderings": [ "images", diff --git a/assets/themes/indoors/indoors.json b/assets/themes/indoors/indoors.json index 8b03eaae76..c539e02788 100644 --- a/assets/themes/indoors/indoors.json +++ b/assets/themes/indoors/indoors.json @@ -32,6 +32,7 @@ } }, "pedestrian_path", + "elevator", "entrance" ] } \ No newline at end of file From d8fc0c9b49815f9f6b06e885b802172832a4594e Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 3 Aug 2022 13:04:20 +0200 Subject: [PATCH 4/9] Switch to single toilets icon --- assets/layers/indoors/indoors.json | 2 +- assets/layers/indoors/license_info.json | 10 -- assets/layers/indoors/room_toilet.svg | 132 ------------------------ 3 files changed, 1 insertion(+), 143 deletions(-) delete mode 100644 assets/layers/indoors/room_toilet.svg diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index bae08331a6..8df4684fd9 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -127,7 +127,7 @@ }, { "if": "room=toilet", - "then": "./assets/layers/indoors/room_toilet.svg" + "then": "./assets/layers/indoors/room_toilets.svg" }, { "if": "room=toilets", diff --git a/assets/layers/indoors/license_info.json b/assets/layers/indoors/license_info.json index ba436bce03..5741b7097a 100644 --- a/assets/layers/indoors/license_info.json +++ b/assets/layers/indoors/license_info.json @@ -29,16 +29,6 @@ "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_storage.svg" ] }, - { - "path": "room_toilet.svg", - "license": "GNU", - "authors": [ - "Adrien Pavie" - ], - "sources": [ - "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_toilet.svg" - ] - }, { "path": "room_toilets.svg", "license": "GNU", diff --git a/assets/layers/indoors/room_toilet.svg b/assets/layers/indoors/room_toilet.svg deleted file mode 100644 index e41fc9954c..0000000000 --- a/assets/layers/indoors/room_toilet.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - - - - image/svg+xml - - - en - - - - - - - - - - - - - - - - - - - From a6a40d3ac72d475e093de25aa84600dba90f6ab5 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 3 Aug 2022 14:53:06 +0200 Subject: [PATCH 5/9] Move icon to center --- assets/layers/elevator/elevator.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json index 91ec21a84a..8db1b68100 100644 --- a/assets/layers/elevator/elevator.json +++ b/assets/layers/elevator/elevator.json @@ -141,7 +141,7 @@ "icon": { "render": "circle:white;./assets/layers/elevator/elevator_wheelchair.svg" }, - "iconSize": "40,40,bottom", + "iconSize": "40,40,center", "location": [ "point", "centroid" From e8fa6f3f30ed92f2a72e5d4af3c3b5734a2b1d7c Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 3 Aug 2022 14:53:26 +0200 Subject: [PATCH 6/9] Add more room icons --- assets/layers/indoors/indoors.json | 77 ++++++-- assets/layers/indoors/license_info.json | 180 +++++++++++++++++ assets/layers/indoors/room_administration.svg | 55 ++++++ assets/layers/indoors/room_bedroom.svg | 175 +++++++++++++++++ assets/layers/indoors/room_chapel.svg | 185 ++++++++++++++++++ assets/layers/indoors/room_class.svg | 115 +++++++++++ assets/layers/indoors/room_computer.svg | 55 ++++++ assets/layers/indoors/room_crypt.svg | 121 ++++++++++++ assets/layers/indoors/room_kitchen.svg | 113 +++++++++++ assets/layers/indoors/room_laboratory.svg | 78 ++++++++ assets/layers/indoors/room_library.svg | 115 +++++++++++ assets/layers/indoors/room_locker.svg | 74 +++++++ assets/layers/indoors/room_nursery.svg | 155 +++++++++++++++ assets/layers/indoors/room_office.svg | 117 +++++++++++ assets/layers/indoors/room_prison_cell.svg | 124 ++++++++++++ assets/layers/indoors/room_restaurant.svg | 71 +++++++ assets/layers/indoors/room_security_check.svg | 59 ++++++ assets/layers/indoors/room_sport.svg | 111 +++++++++++ assets/layers/indoors/room_technical.svg | 8 + assets/layers/indoors/room_waiting.svg | 108 ++++++++++ 20 files changed, 2081 insertions(+), 15 deletions(-) create mode 100644 assets/layers/indoors/room_administration.svg create mode 100644 assets/layers/indoors/room_bedroom.svg create mode 100644 assets/layers/indoors/room_chapel.svg create mode 100644 assets/layers/indoors/room_class.svg create mode 100644 assets/layers/indoors/room_computer.svg create mode 100644 assets/layers/indoors/room_crypt.svg create mode 100644 assets/layers/indoors/room_kitchen.svg create mode 100644 assets/layers/indoors/room_laboratory.svg create mode 100644 assets/layers/indoors/room_library.svg create mode 100644 assets/layers/indoors/room_locker.svg create mode 100644 assets/layers/indoors/room_nursery.svg create mode 100644 assets/layers/indoors/room_office.svg create mode 100644 assets/layers/indoors/room_prison_cell.svg create mode 100644 assets/layers/indoors/room_restaurant.svg create mode 100644 assets/layers/indoors/room_security_check.svg create mode 100644 assets/layers/indoors/room_sport.svg create mode 100644 assets/layers/indoors/room_technical.svg create mode 100644 assets/layers/indoors/room_waiting.svg diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index 8df4684fd9..833ba1b1f9 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -71,6 +71,29 @@ "images", { "id": "ref", + "question": { + "en": "What is the reference number of this room?" + }, + "render": { + "en": "This room has the reference number {ref}" + }, + "freeform": { + "key": "ref", + "type": "string", + "placeholder": { + "en": "Reference number of the room (e.g. '1.1' or 'A1')" + } + }, + "condition": { + "or": [ + "indoor=room", + "indoor=area", + "indoor=corridor" + ] + } + }, + { + "id": "name", "question": { "en": "What is the name of this room?" }, @@ -78,7 +101,18 @@ "en": "This room is named {name}" }, "freeform": { - "key": "name" + "key": "name", + "type": "string", + "placeholder": { + "en": "Name of the room" + } + }, + "condition": { + "or": [ + "indoor=room", + "indoor=area", + "indoor=corridor" + ] } } ], @@ -114,24 +148,37 @@ "condition": "indoor=room", "mappings": [ { - "if": "room=auditorium", - "then": "./assets/layers/indoors/room_auditorium.svg" - }, - { - "if": "room=conference", - "then": "./assets/layers/indoors/room_conference.svg" - }, - { - "if": "room=storage", - "then": "./assets/layers/indoors/room_storage.svg" + "if": { + "or": [ + "room=adminstration", + "room=auditorium", + "room=bedroom", + "room=chapel", + "room=class", + "room=computer", + "room=conference", + "room=crypt", + "room=kitchen", + "room=laboratory", + "room=library", + "room=locker", + "room=nursery", + "room=office", + "room=prison_cell", + "room=restaurant", + "room=security_check", + "room=sport", + "room=storage", + "room=technical", + "room=toilets", + "room=waiting" + ] + }, + "then": "./assets/layers/indoors/room_{room}.svg" }, { "if": "room=toilet", "then": "./assets/layers/indoors/room_toilets.svg" - }, - { - "if": "room=toilets", - "then": "./assets/layers/indoors/room_toilets.svg" } ] }, diff --git a/assets/layers/indoors/license_info.json b/assets/layers/indoors/license_info.json index 5741b7097a..858f28f2e0 100644 --- a/assets/layers/indoors/license_info.json +++ b/assets/layers/indoors/license_info.json @@ -1,4 +1,14 @@ [ + { + "path": "room_administration.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_administration.svg" + ] + }, { "path": "room_auditorium.svg", "license": "GNU", @@ -9,6 +19,46 @@ "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_auditorium.svg" ] }, + { + "path": "room_bedroom.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_bedroom.svg" + ] + }, + { + "path": "room_chapel.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_chapel.svg" + ] + }, + { + "path": "room_class.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_class.svg" + ] + }, + { + "path": "room_computer.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_computer.svg" + ] + }, { "path": "room_conference.svg", "license": "GNU", @@ -19,6 +69,116 @@ "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_conference.svg" ] }, + { + "path": "room_crypt.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_crypt.svg" + ] + }, + { + "path": "room_kitchen.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_kitchen.svg" + ] + }, + { + "path": "room_laboratory.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_laboratory.svg" + ] + }, + { + "path": "room_library.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_library.svg" + ] + }, + { + "path": "room_locker.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_locker.svg" + ] + }, + { + "path": "room_nursery.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_nursery.svg" + ] + }, + { + "path": "room_office.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_office.svg" + ] + }, + { + "path": "room_prison_cell.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_prison_cell.svg" + ] + }, + { + "path": "room_restaurant.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_restaurant.svg" + ] + }, + { + "path": "room_security_check.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_security_check.svg" + ] + }, + { + "path": "room_sport.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_sport.svg" + ] + }, { "path": "room_storage.svg", "license": "GNU", @@ -29,6 +189,16 @@ "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_storage.svg" ] }, + { + "path": "room_technical.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_technical.svg" + ] + }, { "path": "room_toilets.svg", "license": "GNU", @@ -38,5 +208,15 @@ "sources": [ "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_toilets.svg" ] + }, + { + "path": "room_waiting.svg", + "license": "GNU", + "authors": [ + "Adrien Pavie" + ], + "sources": [ + "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_waiting.svg" + ] } ] \ No newline at end of file diff --git a/assets/layers/indoors/room_administration.svg b/assets/layers/indoors/room_administration.svg new file mode 100644 index 0000000000..3bc7f7bba5 --- /dev/null +++ b/assets/layers/indoors/room_administration.svg @@ -0,0 +1,55 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/assets/layers/indoors/room_bedroom.svg b/assets/layers/indoors/room_bedroom.svg new file mode 100644 index 0000000000..183cd86661 --- /dev/null +++ b/assets/layers/indoors/room_bedroom.svg @@ -0,0 +1,175 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_chapel.svg b/assets/layers/indoors/room_chapel.svg new file mode 100644 index 0000000000..1dc57c0109 --- /dev/null +++ b/assets/layers/indoors/room_chapel.svg @@ -0,0 +1,185 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_class.svg b/assets/layers/indoors/room_class.svg new file mode 100644 index 0000000000..ea194e66d6 --- /dev/null +++ b/assets/layers/indoors/room_class.svg @@ -0,0 +1,115 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_computer.svg b/assets/layers/indoors/room_computer.svg new file mode 100644 index 0000000000..c5637733f3 --- /dev/null +++ b/assets/layers/indoors/room_computer.svg @@ -0,0 +1,55 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/assets/layers/indoors/room_crypt.svg b/assets/layers/indoors/room_crypt.svg new file mode 100644 index 0000000000..eae7a7ed11 --- /dev/null +++ b/assets/layers/indoors/room_crypt.svg @@ -0,0 +1,121 @@ + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_kitchen.svg b/assets/layers/indoors/room_kitchen.svg new file mode 100644 index 0000000000..fc666fc948 --- /dev/null +++ b/assets/layers/indoors/room_kitchen.svg @@ -0,0 +1,113 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_laboratory.svg b/assets/layers/indoors/room_laboratory.svg new file mode 100644 index 0000000000..04c740fe74 --- /dev/null +++ b/assets/layers/indoors/room_laboratory.svg @@ -0,0 +1,78 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/assets/layers/indoors/room_library.svg b/assets/layers/indoors/room_library.svg new file mode 100644 index 0000000000..31ae21fffe --- /dev/null +++ b/assets/layers/indoors/room_library.svg @@ -0,0 +1,115 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_locker.svg b/assets/layers/indoors/room_locker.svg new file mode 100644 index 0000000000..6826a50c0f --- /dev/null +++ b/assets/layers/indoors/room_locker.svg @@ -0,0 +1,74 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_nursery.svg b/assets/layers/indoors/room_nursery.svg new file mode 100644 index 0000000000..549839df01 --- /dev/null +++ b/assets/layers/indoors/room_nursery.svg @@ -0,0 +1,155 @@ + + + + + + + + image/svg+xml + + + en + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_office.svg b/assets/layers/indoors/room_office.svg new file mode 100644 index 0000000000..4e49e97f42 --- /dev/null +++ b/assets/layers/indoors/room_office.svg @@ -0,0 +1,117 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_prison_cell.svg b/assets/layers/indoors/room_prison_cell.svg new file mode 100644 index 0000000000..3fd3d21163 --- /dev/null +++ b/assets/layers/indoors/room_prison_cell.svg @@ -0,0 +1,124 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_restaurant.svg b/assets/layers/indoors/room_restaurant.svg new file mode 100644 index 0000000000..97b43c91a3 --- /dev/null +++ b/assets/layers/indoors/room_restaurant.svg @@ -0,0 +1,71 @@ + + + + + + + + + image/svg+xml + + + en + + + + + image/svg+xml + + + + + + + + diff --git a/assets/layers/indoors/room_security_check.svg b/assets/layers/indoors/room_security_check.svg new file mode 100644 index 0000000000..2cc0a3e053 --- /dev/null +++ b/assets/layers/indoors/room_security_check.svg @@ -0,0 +1,59 @@ + + + + + + image/svg+xml + + + + + + + + + + + diff --git a/assets/layers/indoors/room_sport.svg b/assets/layers/indoors/room_sport.svg new file mode 100644 index 0000000000..5a5949fe3e --- /dev/null +++ b/assets/layers/indoors/room_sport.svg @@ -0,0 +1,111 @@ + + + + + + + + + image/svg+xml + + + en + + + + + image/svg+xml + + + + + + + + + + + + + diff --git a/assets/layers/indoors/room_technical.svg b/assets/layers/indoors/room_technical.svg new file mode 100644 index 0000000000..b058c935c8 --- /dev/null +++ b/assets/layers/indoors/room_technical.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/assets/layers/indoors/room_waiting.svg b/assets/layers/indoors/room_waiting.svg new file mode 100644 index 0000000000..e3aacd19e0 --- /dev/null +++ b/assets/layers/indoors/room_waiting.svg @@ -0,0 +1,108 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + From 81e711d6c4e687465332d552a71fb12294a00764 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 3 Aug 2022 15:14:24 +0200 Subject: [PATCH 7/9] Move label if icon is rendered --- assets/layers/indoors/indoors.json | 36 ++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json index 833ba1b1f9..731f7c85be 100644 --- a/assets/layers/indoors/indoors.json +++ b/assets/layers/indoors/indoors.json @@ -137,7 +137,39 @@ { "label": { "render": "
{name}
", - "condition": "name~*" + "condition": "name~*", + "mappings": [ + { + "if": { + "or": [ + "room=administration", + "room=auditorium", + "room=bedroom", + "room=chapel", + "room=class", + "room=computer", + "room=conference", + "room=crypt", + "room=kitchen", + "room=laboratory", + "room=library", + "room=locker", + "room=nursery", + "room=office", + "room=prison_cell", + "room=restaurant", + "room=security_check", + "room=sport", + "room=storage", + "room=technical", + "room=toilet", + "room=toilets", + "room=waiting" + ] + }, + "then": "
{name}
" + } + ] }, "location": [ "point", @@ -182,7 +214,7 @@ } ] }, - "iconSize": "15,15, center" + "iconSize": "15,15, bottom" } ] } \ No newline at end of file From 6aef387bf7a78c3dc3533a3e75b0f1f5f74ae208 Mon Sep 17 00:00:00 2001 From: Robin van der Linde Date: Wed, 3 Aug 2022 15:26:20 +0200 Subject: [PATCH 8/9] Regenerate translations --- langs/layers/de.json | 4 +- langs/layers/en.json | 78 ++++++++++++++++++++++++++++++++++++++- langs/layers/fr.json | 4 +- langs/layers/nl.json | 14 ++++++- langs/themes/ca.json | 3 -- langs/themes/de.json | 9 ----- langs/themes/en.json | 9 ----- langs/themes/es.json | 5 --- langs/themes/fr.json | 5 --- langs/themes/hu.json | 5 --- langs/themes/nb_NO.json | 5 --- langs/themes/nl.json | 5 --- langs/themes/zh_Hant.json | 5 --- 13 files changed, 95 insertions(+), 56 deletions(-) diff --git a/langs/layers/de.json b/langs/layers/de.json index 480d199ffb..63e9b45071 100644 --- a/langs/layers/de.json +++ b/langs/layers/de.json @@ -3438,7 +3438,9 @@ "question": "Ist dieser Aufzug in Betrieb?" } }, - "title": "Aufzug", + "title": { + "render": "Aufzug" + }, "units": { "0": { "applicableUnits": { diff --git a/langs/layers/en.json b/langs/layers/en.json index 2babb45d4e..b898512ce8 100644 --- a/langs/layers/en.json +++ b/langs/layers/en.json @@ -3438,7 +3438,9 @@ "question": "Does this elevator work?" } }, - "title": "Elevator", + "title": { + "render": "Elevator" + }, "units": { "0": { "applicableUnits": { @@ -4213,6 +4215,38 @@ "question": "What color is the hydrant?", "render": "The hydrant color is {colour}" }, + "hydrant-couplings": { + "freeform": { + "placeholder": "Coupling type" + }, + "mappings": { + "0": { + "then": "Storz coupling" + }, + "1": { + "then": "UNI coupling" + }, + "2": { + "then": "Barcelona coupling" + } + }, + "question": "What kind of couplings does this hydrant have?", + "render": "Couplings: {couplings:type}" + }, + "hydrant-couplings-diameters": { + "freeform": { + "placeholder": "Coupling diameters" + }, + "question": "What diameter are the couplings of this hydrant?", + "render": "Coupling diameters: {couplings:diameters}" + }, + "hydrant-diameter": { + "freeform": { + "placeholder": "Pipe diameter" + }, + "question": "What is the pipe diameter of this hydrant?", + "render": "Pipe diameter: {canonical(fire_hydrant:diameter)}" + }, "hydrant-state": { "mappings": { "0": { @@ -4251,18 +4285,58 @@ }, "title": { "render": "Hydrant" + }, + "units": { + "0": { + "applicableUnits": { + "0": { + "human": "millimeters", + "humanSingular": "millimeter" + } + } + } } }, "indoors": { "description": "Basic indoor mapping: shows room outlines", "name": "indoors", "tagRenderings": { - "ref": { + "name": { + "freeform": { + "placeholder": "Name of the room" + }, "question": "What is the name of this room?", "render": "This room is named {name}" + }, + "ref": { + "freeform": { + "placeholder": "Reference number of the room (e.g. '1.1' or 'A1')" + }, + "question": "What is the reference number of this room?", + "render": "This room has the reference number {ref}" } }, "title": { + "mappings": { + "0": { + "then": "Indoor Room {name}" + }, + "1": { + "then": "Indoor Area {name}" + }, + "2": { + "then": "Indoor Wall {name}" + }, + "3": { + "then": "Indoor Corridor {name}" + }, + "4": { + "then": "Indoor Door {name}" + }, + "5": { + "then": "Indoor Level {name}" + } + }, "render": "Indoor area {name}" } }, diff --git a/langs/layers/fr.json b/langs/layers/fr.json index d712bc7462..dc80cbade5 100644 --- a/langs/layers/fr.json +++ b/langs/layers/fr.json @@ -2275,7 +2275,9 @@ "question": "Cet ascenseur fonctionne-t-il ?" } }, - "title": "Ascenseur", + "title": { + "render": "Ascenseur" + }, "units": { "0": { "applicableUnits": { diff --git a/langs/layers/nl.json b/langs/layers/nl.json index 878731683f..5332ba0c79 100644 --- a/langs/layers/nl.json +++ b/langs/layers/nl.json @@ -3384,7 +3384,9 @@ "question": "Werkt deze lift?" } }, - "title": "Lift", + "title": { + "render": "Lift" + }, "units": { "0": { "applicableUnits": { @@ -4203,6 +4205,16 @@ }, "title": { "render": "Brandkraan" + }, + "units": { + "0": { + "applicableUnits": { + "0": { + "human": "millimeter", + "humanSingular": "millimeter" + } + } + } } }, "indoors": { diff --git a/langs/themes/ca.json b/langs/themes/ca.json index 8c8f35cb66..5d76fd9dcc 100644 --- a/langs/themes/ca.json +++ b/langs/themes/ca.json @@ -300,9 +300,6 @@ "description": "En aquest mapa trobareu informació sobre tots els tipus d'escoles i educació i podreu afegir fàcilment més informació", "title": "Educació" }, - "entrances": { - "title": "Entrades" - }, "etymology": { "layers": { "1": { diff --git a/langs/themes/de.json b/langs/themes/de.json index 0131f15a46..9ce39ec3a6 100644 --- a/langs/themes/de.json +++ b/langs/themes/de.json @@ -447,11 +447,6 @@ "description": "Auf dieser Karte können Sie Informationen über Bildungseinrichtungen finden und hinzufügen", "title": "Bildung" }, - "entrances": { - "description": "Eine Karte mit allen Eingängen, die wichtige Aspekte für Rollstuhlfahrer erfasst", - "shortDescription": "Eingänge prüfen, um die Rollstuhlnavigation zu verbessern", - "title": "Eingänge" - }, "etymology": { "description": "Auf dieser Karte können Sie sehen, wonach ein Objekt benannt ist. Die Straßen, Gebäude, ... stammen von OpenStreetMap, und wurden mit Wikidata verknüpft. Im Popup sehen Sie den Wikipedia-Artikel (falls vorhanden) oder ein Wikidata-Feld, nach dem das Objekt benannt ist. Wenn das Objekt selbst eine Wikipedia-Seite hat, wird auch diese angezeigt.

Sie können auch einen Beitrag leisten! Wenn Sie weit genug hinein zoomen werden alle Straßen angezeigt. Wenn Sie auf eine Straße klicken, öffnet sich ein Wikidata-Suchfeld. Mit ein paar Klicks können Sie einen Etymologie-Link hinzufügen. Beachten Sie, dass Sie dazu ein kostenloses OpenStreetMap-Konto benötigen.", "layers": { @@ -600,10 +595,6 @@ "description": "Geisterräder sind weiße Fahrräder, die zum Gedenken tödlich verunglückter Radfahrer vor Ort aufgestellt wurden.

Auf dieser Karte sehen Sie alle Geisterräder, die in OpenStreetMap eingetragen sind. Fehlt ein Geisterrad? Jeder kann hier Informationen hinzufügen oder aktualisieren - Sie benötigen nur ein (kostenloses) OpenStreetMap-Konto.", "title": "Geisterräder" }, - "governments": { - "description": "Auf dieser Karte werden Büros der öffentlichen Verwaltung angezeigt und können leicht hinzugefügt werden", - "title": "Büros der öffentlichen Verwaltung" - }, "grb": { "description": "Dieses Thema ist ein Versuch, die Automatisierung des GRB-Imports zu unterstützen.", "layers": { diff --git a/langs/themes/en.json b/langs/themes/en.json index c9d3950301..eaa904bdf3 100644 --- a/langs/themes/en.json +++ b/langs/themes/en.json @@ -447,11 +447,6 @@ "description": "On this map, you'll find information about all types of schools and eduction and can easily add more information", "title": "Education" }, - "entrances": { - "description": "A map showing all entrances, which surveys for important aspects for wheelchair users", - "shortDescription": "Survey entrances to help wheelchair routing", - "title": "Entrances" - }, "etymology": { "description": "On this map, you can see what an object is named after. The streets, buildings, ... come from OpenStreetMap which got linked with Wikidata. In the popup, you'll see the Wikipedia article (if it exists) or a wikidata box of what the object is named after. If the object itself has a wikipedia page, that'll be shown too.

You can help contribute too!Zoom in enough and all streets will show up. You can click one and a Wikidata-search box will popup. With a few clicks, you can add an etymology link. Note that you need a free OpenStreetMap account to do this.", "layers": { @@ -600,10 +595,6 @@ "description": "A ghost bike is a memorial for a cyclist who died in a traffic accident, in the form of a white bicycle placed permanently near the accident location.

On this map, one can see all the ghost bikes which are known by OpenStreetMap. Is a ghost bike missing? Everyone can add or update information here - you only need to have a (free) OpenStreetMap account.", "title": "Ghost bikes" }, - "governments": { - "description": "On this map, Governmental offices are shown and can be easily added", - "title": "Governmental Offices" - }, "grb": { "description": "This theme is an attempt to help automating the GRB import.", "layers": { diff --git a/langs/themes/es.json b/langs/themes/es.json index 5720c927a4..8bdf326551 100644 --- a/langs/themes/es.json +++ b/langs/themes/es.json @@ -345,11 +345,6 @@ "description": "En este mapa, se muestran los puntos de agua potable accesibles públicamente y pueden añadirse fácilmente", "title": "Agua Potable" }, - "entrances": { - "description": "Un mapa que muestra todas las entradas, que sondea aspectos importantes para usuarios de sillas de ruedas", - "shortDescription": "Sondea entradas para ayudar el enrutado de sillas de ruedas", - "title": "Entradas" - }, "etymology": { "layers": { "1": { diff --git a/langs/themes/fr.json b/langs/themes/fr.json index 6f1bd83616..f6ca46600b 100644 --- a/langs/themes/fr.json +++ b/langs/themes/fr.json @@ -447,11 +447,6 @@ "description": "Sur cette carte, vous trouverez des informations concernant tous les types d'écoles et d'enseignement. Vous pouvez facilement ajouter plus d'informations", "title": "Enseignement" }, - "entrances": { - "description": "Une carte renseignant toutes les entrées (importante pour les utilisateurs de sièges roulants", - "shortDescription": "Vérifez les entrées pour faciliter le routage des utilisateurs de sièges roulants", - "title": "Entrées" - }, "etymology": { "description": "Retrouvez sur cette carte l’origine du nom d’un élément. Les rues, bâtiments, etc. proviennent d’OpenStreetMap et sont liés aux données venant de Wikidata. La fenêtre pop-up affiche l’article Wikipedia (s’il existe) ou l’infobox Wikidata de l’objet dont provient le nom. Si l’objet a sa propre page Wikipedia, elle sera aussi affichée.

Vous pouvez contribuer aussi !Zoomez suffisamment et toutes les rues seront affichées. Cliquez sur l'une d'elles et une boîte de recherche Wikidata apparaîtra. En quelques clics, vous pouvez ajouter un lien étymologique. Vous devez disposer d’un compte OpenStreetMap gratuit.", "layers": { diff --git a/langs/themes/hu.json b/langs/themes/hu.json index fdac6ab317..964fde035e 100644 --- a/langs/themes/hu.json +++ b/langs/themes/hu.json @@ -163,11 +163,6 @@ "description": "Ezen a térképen a nyilvánosan hozzáférhető ivóvíznyerő helyek láthatók, szerkeszthetők és rajzolhatók fel könnyedén", "title": "Ivóvíz" }, - "entrances": { - "description": "Épületek bejáratai mutató térkép, amely a kerekesszékkel közlekedőknek fontos szempontokat jeleníti meg", - "shortDescription": "Akadálymentes útvonaltervezést segítő bejáratok feltérképezése", - "title": "Épületek bejáratai" - }, "etymology": { "description": "Ezen a térképen az látható, hogy egy objektum milyen névre hallgat. Az utcák, épületek stb. az OpenStreetMapről származnak, amely össze van kapcsolva a Wikidata adatbázissal. A felugró ablakban megjelenik a megfelelő Wikipedia-szócikk (ha van) vagy egy Wikidata-doboz arról, amiről az objektumot elnevezték. Ha magának az objektumnak van Wikipédia-oldala, az is megjelenik.

A térképet Ön is szerkesztheti!nagyítson rá, és az összes utca megjelenik. Ha valamelyikre rákattint, megjelenik Wikidata-kereső doboz. Néhány kattintással hozzáadhat egy etimológiai linket. Ne feledje, hogy ehhez szüksége van egy ingyenes OpenStreetMap-fiókra.", "layers": { diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json index 496bf9d0e5..c1f49dafc1 100644 --- a/langs/themes/nb_NO.json +++ b/langs/themes/nb_NO.json @@ -288,11 +288,6 @@ "education": { "title": "Utdanning" }, - "entrances": { - "description": "Alle innganger, som er en viktig undersøkelse å gjøre for rullestolsbrukere", - "shortDescription": "Lag oversikt over innganger for å hjelpe rullestolsruteplanlegging", - "title": "Innganger" - }, "facadegardens": { "layers": { "0": { diff --git a/langs/themes/nl.json b/langs/themes/nl.json index 034bb55041..f35622a8a8 100644 --- a/langs/themes/nl.json +++ b/langs/themes/nl.json @@ -451,11 +451,6 @@ "description": "Deze kaart toont info over verschillende onderwijsinstellingen zoals kleuterscholen, middelbare scholen en tertiair onderwijs.", "title": "Onderwijs" }, - "entrances": { - "description": "Een kaart die alle toegangen toont,", - "shortDescription": "Breng ingangen in kaart om rolstoelnavigatie mogelijk te maken", - "title": "Toegangsdeuren" - }, "etymology": { "description": "Op deze kaart zie je waar een plaats naar is vernoemd. De straten, gebouwen, ... komen uit OpenStreetMap, waar een link naar Wikidata werd gelegd. In de popup zie je het Wikipedia-artikel van hetgeen naarwaar het vernoemd is of de Wikidata-box.

Je kan zelf ook meehelpen!Als je ver inzoomt, krijg je alle straten te zien. Klik je een straat aan, dan krijg je een zoekfunctie waarmee je snel een nieuwe link kan leggen. Je hebt hiervoor een gratis OpenStreetMap account nodig.", "layers": { diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json index a87f75a98c..dee090b865 100644 --- a/langs/themes/zh_Hant.json +++ b/langs/themes/zh_Hant.json @@ -280,11 +280,6 @@ "description": "在這份地圖上，公共可及的飲水點可以顯示出來，也能輕易的增加", "title": "飲用水" }, - "entrances": { - "description": "顯示所有出入口的地圖，勘查對輪椅使用者重要的資訊", - "shortDescription": "幫助輪椅導航來勘查出入口", - "title": "出入口" - }, "etymology": { "description": "在這份地圖，你可以看到物件是以何命名，道路、 建築等的命名由來連到 Wikidata。在跳出選單，你可以看到物件命名由來的維基條目 (如果有的話)，或是 Wikidata 框。如果物件本身有維基頁面，也會顯示。

你也可以貢獻！放大到夠大的層級，然後所有道路都會顯示。你可以點選一個之後 Wikidata 搜尋框會跳出來。只要點幾下，你可以新增詞源連結。注意你要有開放街圖帳號才能這麼做。", "layers": { From e4b9633908f3551a7adb100e98e3742fdb4c7e3a Mon Sep 17 00:00:00 2001 From: Arya Date: Thu, 4 Aug 2022 23:46:04 +0300 Subject: [PATCH 9/9] Update hackerspace.json --- assets/layers/hackerspace/hackerspace.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json index 5ff688966f..2c1d559e40 100644 --- a/assets/layers/hackerspace/hackerspace.json +++ b/assets/layers/hackerspace/hackerspace.json @@ -50,6 +50,7 @@ "nl": "Hackerspace" }, "tagRenderings": [ + "images", { "id": "is_makerspace", "question": { @@ -373,4 +374,4 @@ } } ] -} \ No newline at end of file +}