Merge master

assets/layers/address/address.json

@@ -118,7 +118,8 @@
             "id": "Bangunan ini tidak memiliki nomor rumah",
             "es": "Esta edificación no tiene número",
             "zh_Hans": "这个建筑物没有门牌号",
-            "da": "Denne bygning har intet husnummer"
+            "da": "Denne bygning har intet husnummer",
+            "zh_Hant": "這棟建築沒有門牌"
           }
         }
       ]

assets/layers/barrier/barrier.json

@@ -373,7 +373,7 @@
       },
       "freeform": {
         "key": "maxwidth:physical",
-        "type": "length",
+        "type": "distance",
         "helperArgs": [
           "20",
           "map"
@@ -406,7 +406,7 @@
       },
       "freeform": {
         "key": "width:separation",
-        "type": "length",
+        "type": "distance",
         "helperArgs": [
           "21",
           "map"
@@ -440,7 +440,7 @@
       },
       "freeform": {
         "key": "width:opening",
-        "type": "length",
+        "type": "distance",
         "helperArgs": [
           "21",
           "map"
@@ -474,7 +474,7 @@
       },
       "freeform": {
         "key": "overlap",
-        "type": "length",
+        "type": "distance",
         "helperArgs": [
           "21",
           "map"

assets/layers/cafe_pub/cafe_pub.json

@@ -16,7 +16,8 @@
         "amenity=bar",
         "amenity=pub",
         "amenity=cafe",
-        "amenity=biergarten"
+        "amenity=biergarten",
+        "amenity=nightclub"
       ]
     }
   },
@@ -94,6 +95,22 @@
       "preciseInput": {
         "preferredBackground": "map"
       }
+    },
+    {
+      "tags": [
+        "amenity=nightclub"
+      ],
+      "title": {
+        "en": "a nightclub or disco",
+        "nl": "een nachtclub of disco"
+      },
+      "description": {
+        "en": "A <b>nightclub</b> or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks",
+        "nl": "Een <b>nachtclub</b> met dansvloer, DJ met bijhorende lichteffecten en bar waar men (alcoholische) dranken kan nuttigen"
+      },
+      "preciseInput": {
+        "preferredBackground": "map"
+      }
     }
   ],
   "title": {
@@ -209,6 +226,13 @@
             "es": "Un espacio abierto donde se sirve cerveza, típico de Alemania"
           },
           "hideInAnswer": "_country!=de"
+        },
+        {
+          "if": "amenity=nightclub",
+          "then": {
+            "en": "This is a <b>nightclub</b> or disco with a focus on dancing, music by a DJ with accompanying light show and a bar to get (alcoholic) drinks",
+            "nl": "Dit is een <b>nachtclub</b> met dansvloer, DJ met bijhorende lichteffecten en bar waar men (alcoholische) dranken kan nuttigen"
+          }
         }
       ],
       "id": "Classification"
@@ -219,6 +243,7 @@
     "phone",
     "payment-options",
     "wheelchair-access",
+    "smoking",
     "service:electricity",
     "dog-access",
     "reviews"
@@ -272,6 +297,10 @@
           {
             "if": "amenity=cafe",
             "then": "circle:white;./assets/layers/cafe_pub/cafe.svg"
+          },
+          {
+            "if": "amenity=nightclub",
+            "then": "circle:white;./assets/layers/cafe_pub/nightclub.svg"
           }
         ]
       },

assets/layers/cafe_pub/license_info.json

@@ -9,6 +9,16 @@
       "https://wiki.openstreetmap.org/wiki/File:Cafe-16.svg"
     ]
   },
+  {
+    "path": "nightclub.svg",
+    "license": "CC0",
+    "authors": [
+      "Osm Carto"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Nightclub-16.svg"
+    ]
+  },
   {
     "path": "pub.svg",
     "license": "CC0",

assets/layers/cafe_pub/nightclub.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2">
+  <metadata id="metadata8">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 13.006803,0.00308957 3.0068028,2.0030896 l 0,8.5624994 c -0.385369,-0.06933 -0.787572,-0.07549 -1.1875,0.03125 -1.15478198,0.308194 -2.01331698,1.387352 -1.78124998,2.25 0.232067,0.862648 1.50146898,1.370694 2.65624998,1.0625 1.154781,-0.308194 1.8125,-1.336236 1.8125,-2.25 l 0,-6.9687494 7.0000002,-1.375 0,5.6249997 c -0.385334,-0.06124 -0.787622,-0.04422 -1.1875,0.0625 -1.1546372,0.308156 -2.0130612,1.3561497 -1.7812502,2.2187497 0.232265,0.862479 1.5016132,1.370655 2.6562502,1.0625 1.154637,-0.308156 1.8125,-1.28125 1.8125,-2.28125 z"
+  id="nightclub"
+  style="fill:#C77400;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(1,1)"/>
+</svg>

assets/layers/cycleways_and_roads/cycleways_and_roads.json

@@ -836,7 +836,7 @@
       },
       "freeform": {
         "key": "width:carriageway",
-        "type": "length",
+        "type": "distance",
         "helperArgs": [
           "20",
           "map"
@@ -1260,7 +1260,7 @@
       },
       "freeform": {
         "key": "cycleway:buffer",
-        "type": "length",
+        "type": "distance",
         "helperArgs": [
           "20",
           "map"

assets/layers/entrance/entrance.json

@@ -338,7 +338,7 @@
       },
       "freeform": {
         "key": "width",
-        "type": "length"
+        "type": "distance"
       }
     }
   ],