diff --git a/assets/layers/map/map.json b/assets/layers/map/map.json
index 47844271a..4cb7a9dda 100644
--- a/assets/layers/map/map.json
+++ b/assets/layers/map/map.json
@@ -44,6 +44,7 @@
"tagRenderings": [
"images",
{
+ "labels": ["map"],
"question": {
"en": "On which data is this map based?",
"nl": "Op welke data is deze kaart gebaseerd?",
@@ -87,6 +88,7 @@
},
{
"id": "map-attribution",
+ "labels": ["map"],
"question": {
"en": "Is the OpenStreetMap-attribution given?",
"nl": "Is de attributie voor OpenStreetMap aanwezig?",
@@ -272,4 +274,4 @@
}
}
]
-}
\ No newline at end of file
+}
diff --git a/assets/tagRenderings/questions.json b/assets/tagRenderings/questions.json
index df8fdf00c..9dea663b1 100644
--- a/assets/tagRenderings/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -1983,5 +1983,54 @@
"ca": "El nom de la xarxa és {internet_access:ssid}",
"pl": "Nazwa sieci to {internet_access:ssid}"
}
+ },
+ "luminous_or_lit": {
+ "question": {
+ "en": "Is this object lit or does it emit light?"
+ },
+ "mappings": [
+ {
+ "if": {
+ "and": [
+ "lit=yes",
+ "luminous=yes"
+ ]
+ },
+ "then": {
+ "en":"This object both emits light and is lighted by an external light source"
+ }
+ },
+ {
+ "if":
+ "luminous=yes"
+ ,
+ "then": {
+ "en": "This object emits light"
+ },
+ "addExtraTags": [
+ "lit=no"
+ ]
+ },
+ {
+ "if":
+ "lit=yes"
+ ,
+ "then":{"en": "This object is lit externally, e.g. by a spotlight or other lights"},
+ "addExtraTags": [
+ "luminous=no"
+ ]
+ },
+ {
+ "if": {
+ "and": [
+ "lit=no",
+ "luminous=no"
+ ]
+ },
+ "then": {
+ "en": "This object does not emit light and is not lighted by externally"
+ }
+ }
+ ]
}
-}
\ No newline at end of file
+}
diff --git a/assets/themes/advertising/advertising.json b/assets/themes/advertising/advertising.json
index ff1e2f46c..a80407fb9 100644
--- a/assets/themes/advertising/advertising.json
+++ b/assets/themes/advertising/advertising.json
@@ -334,10 +334,10 @@
"then": {
"ca": "Açò és una lona",
"es": "Esto es una lona",
- "en": "This is a tarp"
+ "en": "This is a tarp (a weatherproof piece of textile with an advertising message)"
},
"icon": {
- "path": "./assets/themes/advertising/icon.svg",
+ "path": "./assets/themes/advertising/tarp.svg",
"class": "medium"
}
},
@@ -369,66 +369,12 @@
"en": "This is a wall painting"
},
"icon": {
- "path": "./assets/themes/advertising/icon.svg",
+ "path": "./assets/themes/advertising/wall_painting.svg",
"class": "medium"
}
}
]
},
- {
- "id": "luminous_or_lit",
- "question": {
- "en": "Is this object lit or does it emit light?"
- },
- "mappings": [
- {
- "if": {
- "and": [
- "lit=yes",
- "luminous=yes"
- ]
- },
- "then": "This object emits light from both an internal and external light source"
- },
- {
- "if": {
- "and": [
- "luminous=yes"
- ]
- },
- "then": "This object emits light",
- "addExtraTags": [
- "lit=no"
- ]
- },
- {
- "if": {
- "and": [
- "lit=yes"
- ]
- },
- "then": "This object is lit externally, e.g. by a spotlight or other lights",
- "addExtraTags": [
- "luminous=no"
- ]
- },
- {
- "if": {
- "and": [
- "lit=no",
- "luminous=no"
- ]
- },
- "then": "This object does not emit light and is not lighted by externally"
- }
- ],
- "condition": {
- "#": "A screen is always luminous",
- "and": [
- "advertising!=screen"
- ]
- }
- },
{
"id": "animated",
"question": {
@@ -468,18 +414,6 @@
]
}
},
- {
- "if": {
- "and": [
- "animated=digital_message"
- ]
- },
- "then": {
- "ca": "un Missatge digital",
- "es": "un Mensaje digital",
- "en": "a Digital message"
- }
- },
{
"if": "animated=travision_blades",
"then": {
@@ -492,12 +426,8 @@
"path": "./assets/themes/advertising/trivision.svg"
},
"#": "Only applicable to billboards",
- "hideInAnswer": {
- "and": [
- "advertising!=billboard",
- "advertising!=poster_box"
- ]
- }
+ "hideInAnswer": "advertising!=billboard"
+
},
{
"if": "animated=winding_posters",
@@ -530,6 +460,26 @@
}
]
},
+ {
+ "builtin": "luminous_or_lit",
+ "override": {
+ "+mappings": [
+ {
+ "if": "luminous=neon",
+ "then": {
+ "en": "This is a neon-tube light"
+ },
+ "hideInAnswer": "advertising!=sign"
+ }
+ ],
+ "condition": {
+ "#": "A screen is always luminous",
+ "and": [
+ "advertising!=screen"
+ ]
+ }
+ }
+ },
{
"id": "operator",
"render": {
@@ -549,24 +499,15 @@
},
{
"id": "message_type",
- "render": {
- "*": " {message}"
- },
"question": {
"ca": "Quin tipus de missatge es mostra?",
"es": "Que tipo de mensaje se muestra?",
"en": "What kind of message is shown?"
},
- "freeform": {
- "key": "message"
- },
"mappings": [
{
- "if": {
- "and": [
- "message=commercial"
- ]
- },
+ "if": "message=commercial",
+ "ifnot": "message=",
"then": {
"ca": "Missatge comercial",
"es": "Mensaje comercial",
@@ -574,11 +515,8 @@
}
},
{
- "if": {
- "and": [
- "message=local"
- ]
- },
+ "if": "message=local",
+ "ifnot": "message=",
"then": {
"ca": "Informació municipal",
"es": "Información municipal",
@@ -586,11 +524,8 @@
}
},
{
- "if": {
- "and": [
- "message=safety"
- ]
- },
+ "if": "message=safety",
+ "ifnot": "message=",
"then": {
"ca": "Informació de seguretat",
"es": "Información de seguridad",
@@ -603,11 +538,8 @@
}
},
{
- "if": {
- "and": [
- "message=political"
- ]
- },
+ "if": "message=political",
+ "ifnot": "message=",
"then": {
"ca": "Publicitat electoral",
"es": "Publicidad electoral",
@@ -615,11 +547,8 @@
}
},
{
- "if": {
- "and": [
- "message=showbiz"
- ]
- },
+ "if": "message=showbiz",
+ "ifnot": "message=",
"then": {
"ca": "Informació sobre teatres, concerts, ...",
"es": "Información sobre teatros, conciertos, ...",
@@ -632,11 +561,8 @@
}
},
{
- "if": {
- "and": [
- "message=non_profit"
- ]
- },
+ "if": "message=non_profit",
+ "ifnot": "message=",
"then": {
"ca": "Missatge d'organitzacions sense ànim de lucre",
"es": "Mensaje de organizaciones sin ánimo de lucro",
@@ -644,11 +570,8 @@
}
},
{
- "if": {
- "and": [
- "message=opinion"
- ]
- },
+ "if": "message=opinion",
+ "ifnot": "message=",
"then": {
"ca": "Per a expressar la teua opinió",
"es": "Para expresar tu opinión",
@@ -662,11 +585,8 @@
}
},
{
- "if": {
- "and": [
- "message=religion"
- ]
- },
+ "if": "message=religion",
+ "ifnot": "message=",
"then": {
"ca": "Missatge religiós",
"es": "Mensaje religioso",
@@ -674,11 +594,8 @@
}
},
{
- "if": {
- "and": [
- "message=funding"
- ]
- },
+ "if": "message=funding",
+ "ifnot": "message=",
"then": {
"ca": "Cartell de financiació",
"es": "Cartel de financiación",
@@ -690,9 +607,18 @@
"advertising=column"
]
}
+ },
+ {
+ "if": "information=map",
+ "ifnot": "information=",
+ "then": {
+ "en": "A map"
+ }
}
- ]
+ ],
+ "multiAnswer": true
},
+ "map.map",
{
"id": "Sides",
"condition": {
@@ -821,7 +747,7 @@
},
{
"if": "advertising=tarp",
- "then": "./assets/themes/advertising/icon.svg"
+ "then": "./assets/themes/advertising/tarp.svg"
},
{
"if": "advertising=totem",
@@ -829,7 +755,7 @@
},
{
"if": "advertising=wall_painting",
- "then": "./assets/themes/advertising/icon.svg"
+ "then": "./assets/themes/advertising/wall_painting.svg"
}
]
},
@@ -886,6 +812,29 @@
"./assets/themes/advertising/Repsol_Billboard.jpg"
]
},
+ {
+ "tags": [
+ "advertising=poster_box"
+ ],
+ "title": {
+ "en": "a freestanding poster box"
+ },
+ "exampleImages": [
+ "./assets/themes/advertising/Mupi_spain.jpg",
+ "./assets/themes/advertising/Mupi_Alcoi.jpg"
+ ]
+ },
+ {
+ "tags": [
+ "advertising=poster_box"
+ ],
+ "title": {
+ "en": "a poster box mounted on a wall"
+ },
+ "preciseInput": {
+ "snapToLayer": "walls_and_buildings"
+ }
+ },
{
"tags": [
"advertising=board"
@@ -940,29 +889,6 @@
"./assets/themes/advertising/JR_Central.jpg"
]
},
- {
- "tags": [
- "advertising=poster_box"
- ],
- "title": {
- "en": "a freestanding poster box"
- },
- "exampleImages": [
- "./assets/themes/advertising/Mupi_spain.jpg",
- "./assets/themes/advertising/Mupi_Alcoi.jpg"
- ]
- },
- {
- "tags": [
- "advertising=poster_box"
- ],
- "title": {
- "en": "a poster box mounted on a wall"
- },
- "preciseInput": {
- "snapToLayer": "walls_and_buildings"
- }
- },
{
"tags": [
"advertising=screen"
@@ -997,19 +923,42 @@
"./assets/themes/advertising/Times square.jpg"
]
},
+
{
"tags": [
- "advertising=sculpture"
+ "advertising=tarp"
],
"title": {
- "ca": "una escupltura",
- "es": "una escultura",
- "en": "a sculpture"
+ "ca": "una lona",
+ "es": "una lona",
+ "en": "a tarp"
+ },
+ "description": {
+ "en": "A piece of waterproof textile with a printed message, permanently anchored on a wall"
+ },
+ "preciseInput": {
+ "preferredBackground": "map",
+ "snapToLayer": "walls_and_buildings",
+ "maxSnapDistance": 5
},
"exampleImages": [
- "./assets/themes/advertising/Aircraft_Sculpture.jpg",
- "./assets/themes/advertising/Mug.jpg",
- "./assets/themes/advertising/BS.JPG"
+ "./assets/themes/advertising/tarp_feder.jpg",
+ "./assets/themes/advertising/tarp_madrid.jpg"
+ ]
+ },
+ {
+ "tags": [
+ "advertising=totem"
+ ],
+ "title": {
+ "ca": "un tòtem",
+ "es": "un tótem",
+ "en": "a totem"
+ },
+ "exampleImages": [
+ "./assets/themes/advertising/AdvertisingTotem_004.jpg",
+ "./assets/themes/advertising/AdvertisingTotem_003.jpg",
+ "./assets/themes/advertising/Lidl_totem.jpg"
]
},
{
@@ -1039,36 +988,17 @@
},
{
"tags": [
- "advertising=tarp"
+ "advertising=sculpture"
],
"title": {
- "ca": "una lona",
- "es": "una lona",
- "en": "a tarp"
- },
- "preciseInput": {
- "preferredBackground": "map",
- "snapToLayer": "walls_and_buildings",
- "maxSnapDistance": 5
+ "ca": "una escupltura",
+ "es": "una escultura",
+ "en": "a sculpture"
},
"exampleImages": [
- "./assets/themes/advertising/tarp_feder.jpg",
- "./assets/themes/advertising/tarp_madrid.jpg"
- ]
- },
- {
- "tags": [
- "advertising=totem"
- ],
- "title": {
- "ca": "un tòtem",
- "es": "un tótem",
- "en": "a totem"
- },
- "exampleImages": [
- "./assets/themes/advertising/AdvertisingTotem_004.jpg",
- "./assets/themes/advertising/AdvertisingTotem_003.jpg",
- "./assets/themes/advertising/Lidl_totem.jpg"
+ "./assets/themes/advertising/Aircraft_Sculpture.jpg",
+ "./assets/themes/advertising/Mug.jpg",
+ "./assets/themes/advertising/BS.JPG"
]
},
{
diff --git a/assets/themes/advertising/license_info.json b/assets/themes/advertising/license_info.json
index 54e2119ce..bf4419e9d 100644
--- a/assets/themes/advertising/license_info.json
+++ b/assets/themes/advertising/license_info.json
@@ -408,6 +408,17 @@
"https://imgur.com/8D0BKNq"
]
},
+ {
+ "path": "tarp.svg",
+ "license": "CC BY-SA 3.0",
+ "authors": [
+ "Barnes38",
+ "Pietervdvn"
+ ],
+ "sources": [
+ "https://wiki.openstreetmap.org/wiki/File:Billboard_trunk.svg"
+ ]
+ },
{
"path": "tarp_feder.jpg",
"license": "CC-BY SA 4.0",
@@ -448,5 +459,16 @@
"sources": [
"https://thenounproject.com/icon/rotating-arrow-184486/"
]
+ },
+ {
+ "path": "wall_painting.svg",
+ "license": "CC BY-SA 3.0",
+ "authors": [
+ "Barnes38",
+ "Pietervdvn"
+ ],
+ "sources": [
+ "https://wiki.openstreetmap.org/wiki/File:Billboard_trunk.svg"
+ ]
}
]
\ No newline at end of file
diff --git a/assets/themes/advertising/tarp.svg b/assets/themes/advertising/tarp.svg
new file mode 100644
index 000000000..8349c1b59
--- /dev/null
+++ b/assets/themes/advertising/tarp.svg
@@ -0,0 +1,187 @@
+
+
+
+
diff --git a/assets/themes/advertising/wall_painting.svg b/assets/themes/advertising/wall_painting.svg
new file mode 100644
index 000000000..fbf462c64
--- /dev/null
+++ b/assets/themes/advertising/wall_painting.svg
@@ -0,0 +1,967 @@
+
+
+
+