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

Themes: improvements to BBQ, different icons, add some questions, remove 'unknown'-options

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-07-10 10:44:03 +02:00
parent 1f348c6d83
commit 2db0b1afcb
8 changed files with 109 additions and 163 deletions
Download patch file Download diff file Expand all files Collapse all files

30
assets/layers/bbq/bbq.json
View file

@ -11,16 +11,13 @@
"source": {
"osmTags": "amenity=bbq"
},
"minzoom": 12,
"minzoom": 8,
"title": {
"render": {
"en": "BBQ",
"de": "Grillstelle"
}
},
"titleIcons": [
"icons.defaults"
],
"pointRendering": [
{
"iconSize": "40,40",
@ -31,11 +28,11 @@
"anchor": "bottom",
"marker": [
{
"icon": "square_rounded",
"color": "#66332B"
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/assembly_point/fire.svg"
"icon": "./assets/layers/bbq/bbq.svg"
}
]
}
@ -103,14 +100,7 @@
"if": "access=permit",
"then": {
"de": "Zugang nur für Berechtigte",
"en": "Access only for authorized"
}
},
{
"if": "access=unknown",
"then": {
"de": "unbekannt",
"en": "Unknown"
"en": "Access only for authorized persons"
}
}
]
@ -135,13 +125,6 @@
"de": "Die Grillstelle ist überdacht",
"en": "The grill is covered"
}
},
{
"if": "covered=unknown",
"then": {
"de": "unbekannt",
"en": "Unknown"
}
}
]
},
@ -186,6 +169,5 @@
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
},
"passAllFeatures": false
}
}

4
assets/layers/bbq/bbq.svg Normal file
View file

@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="bbq" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
<path d="M9.32,7.655C10.8782,7.108,11.9471,5.6506,12,4H3c0.053,1.6299,1.0978,3.0728,2.63,3.631L4.923,9.044&#xA;&#x9;c-1.3571-0.2355-2.6482,0.6737-2.8837,2.0308s0.6737,2.6482,2.0308,2.8837C4.9927,14.1187,5.9273,13.7485,6.49,13h4.223l0.335,0.717&#xA;&#x9;c0.0836,0.1735,0.2594,0.2836,0.452,0.283c0.0733,0.0003,0.1457-0.0158,0.212-0.047c0.2497-0.117,0.3575-0.4141,0.241-0.664&#xA;&#x9;L9.32,7.655z M4.5,12.75c-0.6904,0-1.25-0.5596-1.25-1.25s0.5596-1.25,1.25-1.25s1.25,0.5596,1.25,1.25&#xA;&#x9;C5.7484,12.1897,5.1897,12.7484,4.5,12.75z M6.95,12c0.2066-1.007-0.2268-2.0374-1.091-2.594L6.6,7.923&#xA;&#x9;c0.577,0.1042,1.168,0.1042,1.745,0l1.9,4.07L6.95,12z M4.75,1C4.6119,1,4.5,1.1119,4.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1&#xA;&#x9;C3,2.8881,3.1119,3,3.25,3S3.5,2.8881,3.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C5,1.1119,4.8881,1,4.75,1z M6.75,1&#xA;&#x9;C6.6119,1,6.5,1.1119,6.5,1.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C5,2.8881,5.1119,3,5.25,3S5.5,2.8881,5.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C7,1.1119,6.8881,1,6.75,1z M8.75,1C8.6119,1,8.5,1.1119,8.5,1.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C7,2.8881,7.1119,3,7.25,3S7.5,2.8881,7.5,2.75c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C9,1.1119,8.8881,1,8.75,1z M10.75,1&#xA;&#x9;c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5c-1,0-1,1-1,1C9,2.8881,9.1119,3,9.25,3S9.5,2.8881,9.5,2.75&#xA;&#x9;c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C11,1.1119,10.8881,1,10.75,1z M12.75,1c-0.1381,0-0.25,0.1119-0.25,0.25c0,0.5-0.5,0.5-0.5,0.5&#xA;&#x9;c-1,0-1,1-1,1C11,2.8881,11.1119,3,11.25,3s0.25-0.1119,0.25-0.25c0-0.5,0.5-0.5,0.5-0.5c1,0,1-1,1-1C13,1.1119,12.8881,1,12.75,1z"/>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.7 KiB

2
assets/layers/bbq/bbq.svg.license Normal file
View file

@ -0,0 +1,2 @@
SPDX-FileCopyrightText: Maki
SPDX-License-Identifier: CC0-1.0

12
assets/layers/bbq/license_info.json Normal file
View file

@ -0,0 +1,12 @@
[
{
"path": "bbq.svg",
"license": "CC0-1.0",
"authors": [
"Maki"
],
"sources": [
"https://labs.mapbox.com/maki-icons/"
]
}
]

41
assets/layers/drinking_water/drinking_water.json
View file

@ -329,41 +329,16 @@
]
},
{
"id": "seasonal",
"question": {
"en": "Is this drinking water point available all year round?",
"nl": "Is dit drinkwaterpunt heel het jaar door beschikbaar?",
"de": "Ist die Trinkwasserstelle ganzjährig in Betrieb?"
},
"mappings": [
{
"if": "seasonal=no",
"then": {
"en": "This drinking water point is available all around the year",
"nl": "Dit drinkwaterpunt is heel het jaar door beschikbaar",
"de": "Die Trinkwasserstelle ist ganzjährig in Betrieb"
}
},
{
"if": "seasonal=summer",
"then": {
"en": "This drinking water point is only available in summer",
"nl": "Dit drinkwaterpunt is enkel in de zomer beschikbaar",
"de": "Die Trinkwasserstelle ist nur im Sommer in Betrieb"
}
},
{
"if": "seasonal=spring;summer;autumn",
"icon": "./assets/layers/drinking_water/no_winter.svg",
"then": {
"en": "This drinking water point is closed during the winter",
"nl": "Dit drinkwaterpunt is gesloten in de winter",
"de": "Die Trinkwasserstelle ist im Winter nicht in Betrieb"
}
"builtin": "seasonal",
"override": {
"question": {
"en": "Is this drinking water point available all year round?",
"nl": "Is dit drinkwaterpunt heel het jaar door beschikbaar?",
"de": "Ist die Trinkwasserstelle ganzjährig in Betrieb?"
}
]
}
},
{
{
"builtin": "opening_hours_24_7",
"override": {
"questionHint": {

42
assets/layers/firepit/firepit.json
View file

@ -11,7 +11,7 @@
"source": {
"osmTags": "leisure=firepit"
},
"minzoom": 12,
"minzoom": 8,
"title": {
"render": {
"en": "Firepit",
@ -31,8 +31,8 @@
"anchor": "bottom",
"marker": [
{
"icon": "square_rounded",
"color": "#f00000"
"icon": "circle",
"color": "white"
},
{
"icon": "./assets/layers/assembly_point/fire.svg"
@ -116,39 +116,17 @@
]
},
{
"id": "seasonal",
"question": {
"en": "Is the firepit seasonal?",
"de": "Ist die Feuerstelle saisonal?"
},
"mappings": [
{
"if": "seasonal=no",
"then": {
"de": "Die Feuerstelle ist nicht saisonal",
"en": "The firepit is not seasonal"
}
},
{
"if": "seasonal=yes",
"then": {
"de": "Die Feuerstelle ist saisonal",
"en": "The firepit is seasonal"
}
},
{
"if": "seasonal=unknown",
"then": {
"de": "unbekannt",
"en": "Unknown"
}
"builtin": "seasonal",
"override": {
"question": {
"en": "Is the firepit available all around the year?",
"nl": "Is deze kampvuurplaats heel het jaar door beschikbaar?"
}
]
}
}
],
"allowMove": {
"enableRelocation": false,
"enableImproveAccuracy": true
},
"passAllFeatures": false
}
}

34
assets/layers/questions/questions.json
View file

@ -2755,6 +2755,40 @@
"cssClasses": "subtle m-4 italic flex items-center justify-center"
}
}
},
{
"id": "seasonal",
"question": {
"en": "Is {title()} available all around the year?",
"nl": "Is {title()} heel het jaar beschikbaar?"
},
"mappings": [
{
"if": "seasonal=no",
"then": {
"en": "Available all around the year",
"nl": "Heel het jaar door beschikbaar",
"de": "Ganzjährig in Betrieb"
}
},
{
"if": "seasonal=summer",
"then": {
"en": "Only available in summer",
"nl": "Enkel in de zomer beschikbaar",
"de": "Nur im Sommer in Betrieb"
}
},
{
"if": "seasonal=spring;summer;autumn",
"icon": "./assets/layers/drinking_water/no_winter.svg",
"then": {
"en": "Closed during the winter",
"nl": "Gesloten in de winter",
"de": "Im Winter nicht in Betrieb"
}
}
]
}
]
}