construction: include railway, building, construction:*=*

construction.json

@@ -19,20 +19,36 @@
             "(",
             "nwr[landuse~\"^(construction)$\"];",
             "nwr[highway~\"^(construction)$\"];",
+            "nwr[railway~\"^(construction)$\"];",
+            "nwr[building~\"^(construction)$\"];",
+            "nwr[highway~\"^(construction)$\"];",
+            "nwr[~\"^construction:\"~\".\"];",
             ")"
         ]
     },
     "feature": {
         "pre": [
+            "{% set key = null %}{% set value = null %}",
             "{% if tags.highway == 'construction' %}",
             "{% set key = 'highway' %}",
-            "{% set value = tags.construction %}",
-            "{% elseif tags.landuse == 'construction' and tags.construction %}",
+            "{% set value = tags.construction|default('construction') %}",
+            "{% elseif tags.railway == 'construction' %}",
+            "{% set key = 'railway' %}",
+            "{% set value = tags.construction|default('construction') %}",
+            "{% elseif tags.building == 'construction' %}",
+            "{% set key = 'building' %}",
+            "{% set value = tags.construction|default('construction') %}",
+            "{% elseif tags.landuse == 'construction' %}",
             "{% set key = 'landuse' %}",
-            "{% set value = tags.construction %}",
+            "{% set value = tags.construction|default('construction') %}",
             "{% else %}",
-            "{% set key = 'landuse' %}",
-            "{% set value = tags.landuse %}",
+            "{% for k, v in tags %}",
+            "{% set m = k|matches('^construction:(.*)$') %}",
+            "{% if m %}",
+            "{% set key = m[1] %}",
+            "{% set value = v %}",
+            "{{ debug(key, value) }}",
+            "{% endif %}{% endfor %}",
             "{% endif %}"
         ],
         "description": "{{ tagTrans(key, value) }}"