midgard/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Themes(aed): un-differentiate icons, revise badges

Browse source 
After brainstorming with Pieter
This commit is contained in:
Midgard 2025-02-19 22:07:45 +01:00 • committed by Pieter Vander Vennet
parent 6a1e816b2e
commit 7c2ec46ca1
3 changed files with 88 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

162
assets/layers/defibrillator/defibrillator.json
View file

@ -50,102 +50,46 @@
{ {
"iconBadges": [ "iconBadges": [
{ {
"if": "opening_hours~*", "if": {
"and": [
"opening_hours~*",
"opening_hours!=unknown",
"opening_hours!=closed",
"opening_hours!=off",
{
"or": [
"access=yes",
"access=public",
"access=permissive"
]
}
]
},
"then": "icons.isOpen" "then": "icons.isOpen"
}, },
{ {
"if": { "if": {
"or": [ "or": [
"wheelchair=yes",
"wheelchair=designated"
]
},
"then": "circle:white;./assets/layers/toilet/wheelchair.svg"
}
],
"iconSize": {
"render": "20,20",
"mappings": [
{ {
"if": {
"and": [ "and": [
{ "access~*",
"#": "Keep these access conditions in sync with those further down in the marker's square icon", "access!=yes",
"or": [ "access!=public",
"access=yes", "access!=permissive"
"access=public",
"access=permissive"
] ]
}, },
"opening_hours!=", "opening_hours=unknown",
"opening_hours!=unknown",
"opening_hours!=closed",
"opening_hours!=off"
]
},
"then": "40,40"
}
]
},
"marker": [
{
"icon": "square",
"color": {
"render": "#878787",
"mappings": [
{
"if": {
"or": [
"access=private",
"access=no",
"opening_hours=closed", "opening_hours=closed",
"opening_hours=off" "opening_hours=off"
] ]
}, },
"then": "#cfc6c6" "then": "./assets/layers/barrier/barrier.svg"
}, }
{
"if": {
"or": [
"access=customers",
"opening_hours=unknown"
]
},
"then": "#d8c37f"
},
{
"if": "opening_hours=",
"then": "#878787"
},
{
"if": {
"and": [
"_recently_surveyed=true",
{
"or": [
"access=yes",
"access=public",
"access=permissive"
], ],
"#": "Keep these access conditions in sync with those below and with those in iconSize" "marker": [
}
]
},
"then": "#28ba3d"
},
{ {
"if": { "icon": "square",
"#": "Keep these access conditions in sync with those above", "color": "#008754"
"or": [
"access=yes",
"access=public",
"access=permissive"
]
},
"then": "#008754"
}
]
}
}, },
{ {
"icon": "./assets/layers/defibrillator/defibrillator.svg" "icon": "./assets/layers/defibrillator/defibrillator.svg"
@ -321,6 +265,7 @@
}, },
{ {
"if": "access=customers", "if": "access=customers",
"icon": "./assets/layers/barrier/barrier.svg",
"then": { "then": {
"en": "Only accessible to customers", "en": "Only accessible to customers",
"ca": "Només accessible a clients", "ca": "Només accessible a clients",
@ -337,6 +282,7 @@
}, },
{ {
"if": "access=private", "if": "access=private",
"icon": "./assets/layers/barrier/barrier.svg",
"then": { "then": {
"en": "Not accessible to the general public (e.g. only accesible to staff, the owners, …)", "en": "Not accessible to the general public (e.g. only accesible to staff, the owners, …)",
"ca": "No accessible al públic en general (ex. només accesible a treballadors, propietaris, ...)", "ca": "No accessible al públic en general (ex. només accesible a treballadors, propietaris, ...)",
@ -352,6 +298,7 @@
}, },
{ {
"if": "access=no", "if": "access=no",
"icon": "./assets/layers/barrier/barrier.svg",
"then": { "then": {
"en": "Not accessible, possibly only for professional use", "en": "Not accessible, possibly only for professional use",
"nl": "Niet toegankelijk, mogelijk enkel voor professionals", "nl": "Niet toegankelijk, mogelijk enkel voor professionals",
@ -641,7 +588,18 @@
"ca": "En quins horaris està disponible aquest desfibril·lador?", "ca": "En quins horaris està disponible aquest desfibril·lador?",
"pl": "W jakich godzinach dostępny jest ten defibrylator?", "pl": "W jakich godzinach dostępny jest ten defibrylator?",
"cs": "V jakých hodinách je tento defibrilátor k dispozici?" "cs": "V jakých hodinách je tento defibrilátor k dispozici?"
},
"mappings+": [
{
"if": "opening_hours=unknown",
"icon": "./assets/layers/barrier/barrier.svg",
"then": {
"en": "Not accessible 24/7, but the exact hours are unknown",
"nl": "Niet 24/7 bereikbaar, maar de exacte uren zijn niet bekend"
},
"hideInAnswer": true
} }
]
} }
}, },
{ {
@ -759,7 +717,47 @@
"has_image", "has_image",
"public_access", "public_access",
"open_now", "open_now",
"wheelchair_accessible" "wheelchair_accessible",
{
"id": "not_recently_surveyed",
"options": [
{
"osmTags": "_recently_surveyed=false",
"question": {
"en": "Only where survey was more than 90 days ago",
"nl": "Enkel die meer dan 90 dagen geleden ter plaatse zijn nagezien"
}
}
]
},
{
"id": "no_opening_hours",
"options": [
{
"osmTags": {
"or": [
"access=",
{
"and": [
"opening_hours=",
{
"or": [
"access=yes",
"access=public",
"access=permissive"
]
}
]
}
]
},
"question": {
"en": "Unknown access or times of accessibility",
"nl": "Onbekende toegang of onbekende tijden waarop toegankelijk"
}
}
]
}
], ],
"deletion": { "deletion": {
"softDeletionTags": { "softDeletionTags": {

2
assets/layers/defibrillator/defibrillator.svg.license
View file

@ -1,2 +1,2 @@
SPDX-FileCopyrightText: M!dgard SPDX-FileCopyrightText: MaxxL
SPDX-License-Identifier: CC0-1.0 SPDX-License-Identifier: CC0-1.0

2
assets/themes/aed/aed.svg.license
View file

@ -1,2 +1,2 @@
SPDX-FileCopyrightText: M!dgard SPDX-FileCopyrightText: MaxxL
SPDX-License-Identifier: CC0-1.0 SPDX-License-Identifier: CC0-1.0