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

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-08-10 16:25:25 +02:00
commit 04ecdad1bb
61 changed files with 702 additions and 705 deletions
Download patch file Download diff file Expand all files Collapse all files

22
assets/layers/filters/filters.json
View file

@ -55,6 +55,28 @@
}
]
},
{
"id": "accepts_debit_cards",
"options": [
{
"osmTags": "payment:debit_cards=yes",
"question": {
"en": "Accepts debit cards"
}
}
]
},
{
"id": "accepts_credit_cards",
"options": [
{
"osmTags": "payment:credit_cards=yes",
"question": {
"en": "Accepts credit cards"
}
}
]
},
{
"id": "has_image",
"options": [

43
assets/layers/food/food.json
View file

@ -962,15 +962,41 @@
]
},
{
"id": "vegetarian",
"id": "food-category",
"options": [
{
"question": {
"en": "Has a vegetarian menu",
"nl": "Heeft een vegetarisch menu",
"de": "Vegetarische Gerichte im Angebot",
"es": "Tiene menú vegetariano",
"fr": "A un menu végétarien"
"fr": "A un menu végétarien",
"nl": "Heeft een vegetarisch menu"
}
},
{
"question": {
"en": "Only fastfood buisinesses"
},
"osmTags": "amenity=fast_food"
},
{
"question": {
"en": "Only restaurants"
},
"osmTags": "amenity=restaurant"
}
]
},
{
"id": "vegetarian",
"options": [
{
"question": {
"en": "Has a vegan menu",
"nl": "Heeft een veganistisch menu",
"de": "Vegane Gerichte im Angebot",
"es": "Tiene menú vegano",
"fr": "A un menu végétalien"
},
"osmTags": {
"or": [
@ -988,11 +1014,12 @@
"options": [
{
"question": {
"en": "Has a vegan menu",
"nl": "Heeft een veganistisch menu",
"de": "Vegane Gerichte im Angebot",
"es": "Tiene menú vegano",
"fr": "A un menu végétalien"
"en": "Has a halal menu",
"nl": "Heeft een halal menu",
"de": "Halal Gerichte im Angebot",
"es": "Tiene menú halah",
"fr": "A un menu halal",
"da": "Har en halalmenu"
},
"osmTags": {
"or": [

1
assets/layers/hackerspace/hackerspace.json
View file

@ -112,6 +112,7 @@
"website",
"email",
"phone",
"mastodon",
{
"builtin": "opening_hours_24_7",
"override": {

28
assets/layers/icons/icons.json
View file

@ -67,7 +67,19 @@
"defaults"
],
"render": "<a href='tel:{phone}'><img textmode='📞' alt='phone' src='./assets/layers/questions/phone.svg'/></a>",
"condition": "phone~*"
"mappings": [
{
"#": "ignore-image-in-then",
"if": "contact:phone~*",
"then": "<a href='tel:{contact:phone}'><img textmode='📞' alt='phone' src='./assets/layers/questions/phone.svg'/></a>"
}
],
"condition": {
"or": [
"phone~*",
"contact:phone~*"
]
}
},
{
"id": "emaillink",
@ -75,7 +87,19 @@
"defaults"
],
"render": "<a href='mailto:{email}'><img textmode='✉️' alt='email' src='./assets/layers/questions/send_email.svg'/></a>",
"condition": "email~*"
"mappings": [
{
"#": "ignore-image-in-then",
"if": "contact:email~*",
"then": "<a href='mailto:{contact:email}'><img textmode='✉️' alt='email' src='./assets/layers/questions/send_email.svg'/></a>"
}
],
"condition": {
"or": [
"email~*",
"contact:email~*"
]
}
},
{
"id": "websitelink",

21
assets/layers/maxspeed/maxspeed.json
View file

@ -79,24 +79,6 @@
"type": "pnat"
},
"mappings": [
{
"if": {
"and": [
"highway=living_street",
"_country!=be"
]
},
"then": {
"en": "This is a living street, which has a maxspeed of 20km/h",
"de": "Dies ist eine Wohnstraße, auf der eine Höchstgeschwindigkeit von 20 km/h gilt",
"nl": "Dit is een woonerf en heeft dus een maximale snelheid van 20km/h"
},
"icon": {
"path": "./assets/layers/maxspeed/living_street_be.svg",
"class": "large"
},
"hideInAnswer": true
},
{
"if": "highway=living_street",
"then": {
@ -108,6 +90,9 @@
"path": "./assets/layers/maxspeed/living_street_be.svg",
"class": "large"
},
"addExtraTags": [
"maxspeed=20"
],
"hideInAnswer": "_country!=be"
}
],

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

@ -173,11 +173,13 @@
"render": {
"*": "<a href='tel:{phone}'>{phone}</a>"
},
"icon": "./assets/layers/questions/phone.svg",
"mappings": [
{
"if": "contact:phone~*",
"then": "<a href='tel:{contact:phone}'>{contact:phone}</a>",
"hideInAnswer": true
"hideInAnswer": true,
"icon": "./assets/layers/questions/phone.svg"
}
],
"freeform": {
@ -188,6 +190,21 @@
]
}
},
{
"id": "mastodon",
"description": "Shows and asks for the mastodon handle",
"question": {
"en": "What is the Mastodon-handle of {title()}?"
},
"freeform": {
"key": "contact:mastodon",
"type": "fediverse"
},
"render": {
"*": "{fediverse_link(contact:mastodon)}"
},
"icon": "./assets/svg/mastodon.svg"
},
{
"id": "osmlink",
"render": {
@ -205,6 +222,7 @@
"render": {
"*": "<a href='mailto:{email}' target='_blank'>{email}</a>"
},
"icon": "./assets/svg/envelope.svg",
"labels": [
"contact"
],
@ -236,6 +254,7 @@
"mappings": [
{
"if": "contact:email~*",
"icon": "./assets/svg/envelope.svg",
"then": "<a href='mailto:{contact:email}' target='_blank'>{contact:email}</a>",
"hideInAnswer": true
}
@ -253,6 +272,7 @@
"labels": [
"contact"
],
"icon": "./assets/layers/icons/website.svg",
"question": {
"en": "What is the website of {title()}?",
"nl": "Wat is de website van {title()}?",
@ -292,7 +312,8 @@
{
"if": "contact:website~*",
"then": "<a href='{contact:website}' rel='nofollow noopener noreferrer' target='_blank'>{contact:website}</a>",
"hideInAnswer": true
"hideInAnswer": true,
"icon": "./assets/layers/icons/website.svg"
}
]
},
@ -2174,6 +2195,33 @@
}
}
]
},
{
"id": "check_date",
"question": {
"en": "When was this object last checked?",
"de": "Wann wurde dieses Objekt zuletzt kontrolliert?",
"nl": "Wanneer is dit object voor het laatst gecontroleerd?"
},
"freeform": {
"key": "check_date",
"type": "date"
},
"render": {
"en": "This object was last checked on <b>{check_date}</b>",
"de": "Dieses Objekt wurde zuletzt kontrolliert am <b>{check_date}</b>",
"nl": "Dit object is voor het laatst gecontroleerd op <b>{check_date}</b>"
},
"mappings": [
{
"if": "check_date:={_now:date}",
"then": {
"en": "This object was last checked today",
"de": "Dieses Objekt wurde heute zuletzt kontrolliert",
"nl": "Dit object is vandaag voor het laatst gecontroleerd"
}
}
]
}
]
}
}

3
assets/layers/waste_disposal/waste_disposal.json
View file

@ -39,7 +39,8 @@
"point",
"centroid"
],
"icon": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg"
"icon": "circle:white;./assets/layers/waste_disposal/waste_disposal.svg",
"iconSize": "20,20"
}
],
"presets": [

13
assets/themes/elongated_coin/elongated_coin.json
View file

@ -86,6 +86,7 @@
}
]
},
"payment-options-split",
{
"id": "coin",
"question": {
@ -205,7 +206,8 @@
}
]
},
"level"
"level",
"check_date"
],
"mapRendering": [
{
@ -235,8 +237,15 @@
]
}
],
"allowMove": {
"enableImproveAccuracy": true,
"enableRelocation": true
},
"deletion": true,
"filter": [
"open_now"
"open_now",
"accepts_debit_cards",
"accepts_credit_cards"
]
}
],

4
assets/themes/fritures/fritures.json
View file

@ -63,10 +63,10 @@
{
"builtin": "food",
"override": {
"minzoom": 19,
"minzoom": 18,
"filter": null,
"name": null
}
}
]
}
}