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

allow reuse of filters, update to artwork theme

Browse source
This commit is contained in:
Pieter Vander Vennet 2022-09-14 16:29:41 +02:00
parent a1a12e6f38
commit 585dbb4587
8 changed files with 221 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

48
assets/layers/artwork/artwork.json
View file

@ -407,10 +407,38 @@
"es": "Cerámica",
"da": "flisebeklædning"
}
},
{
"if": "artwork_type=woodcarving",
"then": {
"nl": "Houtsculptuur",
"en": "Woodcarving"
}
}
],
"id": "artwork-artwork_type"
},
{
"id": "artwork-artist-wikidata",
"render": {
"en": "This artwork was made by <b>{wikidata_label(artist:wikidata)}</b>"
},
"question": {
"en": "Who made this artwork?"
},
"freeform": {
"key": "artist:wikidata",
"type": "wikidata",
"helperArgs": [
{
"key": "artist_name",
"instanceOf": [
"Q5"
]
}
]
}
},
{
"question": {
"en": "Which artist created this?",
@ -449,6 +477,7 @@
"freeform": {
"key": "artist_name"
},
"condition": "artist:wikidata=",
"id": "artwork-artist_name"
},
{
@ -491,7 +520,21 @@
},
"id": "artwork-website"
},
"wikipedia"
"wikipedia",
{
"id": "artwork_subject",
"condition": "subject:wikidata~*",
"question": {
"en": "What does this artwork depict?"
},
"freeform": {
"key": "subject:wikidata",
"type": "wikidata"
},
"render": {
"en": "This artwork depicts {wikidata_label(subject:wikidata)}{wikipedia(subject:wikidata)}"
}
}
],
"deletion": {
"softDeletionTags": {
@ -524,5 +567,6 @@
"render": "10"
}
}
]
],
"filter": ["has_image"]
}

23
assets/layers/cafe_pub/cafe_pub.json
View file

@ -277,24 +277,9 @@
"reviews"
],
"filter": [
{
"id": "opened-now",
"options": [
{
"question": {
"en": "Opened now",
"nl": "Nu geopend",
"de": "Derzeit geöffnet",
"fr": "Ouvert maintenant",
"hu": "Most nyitva van",
"ca": "Obert ara",
"es": "Abiert oahora",
"da": "Åbent nu"
},
"osmTags": "_isOpen=yes"
}
]
}
"open_now",
"accepts_cash",
"accepts_cards"
],
"deletion": {
"softDeletionTags": {
@ -362,4 +347,4 @@
"da": "Et lag med caféer og pubber, hvor man kan samles omkring en drink. Laget stiller nogle relevante spørgsmål",
"fr": "Une couche montrants les cafés et pubs où l’on peut prendre un verre. Cette couche pose des questions y afférentes."
}
}
}

95
assets/layers/filters/filters.json Normal file
View file

@ -0,0 +1,95 @@
{
"id": "filters",
"description": "This layer acts as library for common filters",
"mapRendering": [
],
"source": {
"osmTags": "id~*"
},
"filter": [
{
"id":"open_now",
"options": [
{
"question": {
"en": "Opened now",
"nl": "Nu geopened",
"de": "Aktuell geöffnet",
"ca": "Obert ara",
"es": "Abierta ahora",
"fr": "Ouvert maintenant",
"hu": "Most nyitva van",
"da": "Åbent nu"
},
"osmTags": "_isOpen=yes"
}
]
},
{
"id": "accepts_cash",
"options": [
{
"osmTags": "payment:cash=yes",
"question": {
"en": "Accepts cash",
"de": "Akzeptiert Bargeld",
"nl": "Accepteert cash",
"es": "Acepta efectivo",
"fr": "Accepte les espèces"
}
}
]
},
{
"id": "accepts_cards",
"options": [
{
"osmTags": "payment:cards=yes",
"question": {
"en": "Accepts payment cards",
"de": "Akzeptiert Kartenzahlung",
"nl": "Accepteert betaalkaarten",
"es": "Acepta el pago por tarjeta",
"fr": "Accepte les cartes de paiement"
}
}
]
},
{
"id": "has_image",
"options": [
{
"question": "With and without images"
},
{
"question": {
"en": "Has at least one image"
},
"osmTags": {
"or": [
"image~*",
"image:0~*",
"image:1~*",
"image:2~*",
"image:3~*"
]
}
},
{
"question": {
"en": "Probably does not have an image"
},
"osmTags": {
"and": [
"image=",
"image:0=",
"image:1=",
"image:2=",
"image:3="
]
}
}
]
}
]
}

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

@ -770,22 +770,7 @@
"reviews"
],
"filter": [
{
"id": "opened-now",
"options": [
{
"question": {
"en": "Opened now",
"nl": "Nu geopened",
"de": "Aktuell geöffnet",
"ca": "Obert ara",
"es": "Abierta ahora",
"fr": "Ouvert maintenant"
},
"osmTags": "_isOpen=yes"
}
]
},
"open_now",
{
"id": "vegetarian",
"options": [
@ -849,36 +834,8 @@
}
]
},
{
"id": "accepts-cash",
"options": [
{
"osmTags": "payment:cash=yes",
"question": {
"en": "Accepts cash",
"de": "Akzeptiert Bargeld",
"es": "Acepta efectivo",
"nl": "Accepteert cash",
"fr": "Accepte les paiements en espèces"
}
}
]
},
{
"id": "accepts-cards",
"options": [
{
"osmTags": "payment:cards=yes",
"question": {
"en": "Accepts payment cards",
"de": "Akzeptiert Kartenzahlung",
"es": "Acepta tarjetas de pago",
"nl": "Accepteert betaalkaarten",
"fr": "Accepte les cartes de paiement"
}
}
]
}
"accepts_cash",
"accepts_cards"
],
"deletion": {
"nonDeleteMappings": [
@ -979,4 +936,4 @@
"es": "Una capa que muestra restaurantes y facilidades de comida rápida",
"fr": "Un claque montrant les restaurants et les endroits de nourriture rapide (avec un rendu spécial pour les friteries)"
}
}
}

36
assets/layers/shops/shops.json
View file

@ -295,6 +295,7 @@
}
],
"filter": [
"open_now",
{
"id": "shop-type",
"options": [
@ -337,35 +338,8 @@
}
]
},
{
"id": "accepts-cash",
"options": [
{
"osmTags": "payment:cash=yes",
"question": {
"en": "Accepts cash",
"de": "Akzeptiert Bargeld",
"nl": "Accepteert cash",
"es": "Acepta efectivo",
"fr": "Accepte les espèces"
}
}
]
},
{
"id": "accepts-cards",
"options": [
{
"osmTags": "payment:cards=yes",
"question": {
"en": "Accepts payment cards",
"de": "Akzeptiert Kartenzahlung",
"nl": "Accepteert betaalkaarten",
"es": "Acepta el pago por tarjeta",
"fr": "Accepte les cartes de paiement"
}
}
]
}
"accepts_cash",
"accepts_cards"
]
}
}