Merge branch 'develop' into feature/maproulette

assets/layers/school/school.json

@@ -21,17 +21,9 @@
     "_is_enclosed=feat.properties._enclosing != '[]'"
   ],
   "isShown": {
-    "render": "yes",
-    "mappings": [
-      {
-        "if": {
-          "and": [
-            "building~*",
-            "_is_enclosed=true"
-          ]
-        },
-        "then": "no"
-      }
+    "or": [
+      "building=",
+      "_is_enclosed!=true"
     ]
   },
   "tagRenderings": [
@@ -304,76 +296,25 @@
     "phone",
     "email",
     {
-      "id": "language",
-      "question": {
-        "en": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>",
-        "nl": "Wat is de voertaal van deze school?<div class='subtle'>Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?</div>",
-        "de": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>",
-        "fr": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>"
-      },
-      "render": {
-        "en": "{school:language} is the main language of {title()}",
-        "nl": "{school:language} is de voertaal van {title()}",
-        "de": "{school:language} ist die Hauptsprache von {title()}",
-        "fr": "{school:language} est la langue principale de {title()}"
-      },
-      "freeform": {
-        "key": "school:language",
-        "inline": true,
-        "placeholder": {
-          "en": "Language in lowercase English",
-          "nl": "Taal in lowercase Engel",
-          "de": "Sprache in Englisch in Kleinbuchstaben"
-        },
-        "addExtraTags": [
-          "fixme=Freeform tag `school:language` used, to be doublechecked"
-        ]
-      },
-      "mappings": [
-        {
-          "if": "school:language=english",
-          "then": {
-            "en": "The main language of this school is unknown",
-            "nl": "De voertaal van deze school is niet gekend",
-            "de": "Die Hauptsprache dieser Schule ist unbekannt",
-            "fr": "La langue principale de cette école est inconnue"
+      "builtin": "wikidata.school-language",
+      "override": {
+        "+mappings": [
+          {
+            "if": "school:language=",
+            "hideInAnswer": true,
+            "then": {
+              "en": "The main language of this school is unknown",
+              "nl": "De voertaal van deze school is niet gekend"
+            }
           }
-        },
-        {
-          "if": "school:language=french",
-          "then": {
-            "en": "French is the main language of {name}",
-            "nl": "Frans is de voertaal van {name}",
-            "de": "Französisch ist die Hauptsprache von {name}"
-          }
-        },
-        {
-          "if": "school:language=dutch",
-          "then": {
-            "en": "Dutch is the main language of {name}",
-            "nl": "Nederlands is de voertaal van {name}",
-            "de": "Niederländisch ist die Hauptsprache von {name}"
-          }
-        },
-        {
-          "if": "school:language=german",
-          "then": {
-            "en": "German is the main language of {name}",
-            "nl": "Duits is de voertaal van {name}",
-            "de": "Deutsch ist die Hauptsprache von {name}"
-          }
-        },
-        {
-          "if": "school:language=",
-          "then": {
-            "en": "The main language of this school is unknown",
-            "nl": "De voertaal van deze school is niet gekend",
-            "de": "Die Hauptsprache dieser Schule ist unbekannt",
-            "fr": "La langue principale de cette école est inconnue"
-          },
-          "hideInAnswer": true
+        ],
+        "question": {
+          "en": "What is the main language of this school?<div class='subtle'>What language is spoken with the students in non-language related courses and with the administration?</div>",
+          "nl": "Wat is de voertaal van deze school?<div class='subtle'>Welke taal wordt met de studenten gesproken in niet-taal-gerelateerde vakken en met de administratie?</div>",
+          "de": "Was ist die Hauptsprache dieser Schule?<div class='subtle'>Welche Sprache wird mit den Schülern in den nicht sprachbezogenen Kursen und mit der Verwaltung gesprochen?</div>",
+          "fr": "Quelle est la langue principale de cette école ?<div class='subtle'>Quelle langue est parlée avec les élèves des cours non linguistiques et avec l'administration ?</div>"
         }
-      ]
+      }
     }
   ],
   "presets": [

assets/layers/toilet/toilet.json

@@ -386,7 +386,8 @@
       },
       "condition": "changing_table=yes",
       "freeform": {
-        "key": "changing_table:location"
+        "key": "changing_table:location",
+        "inline": true
       },
       "mappings": [
         {