Merge pull request #1522 from pietervdvn/RobinLinde-patch-12

Changes to waste and kerbs/crossings theme

assets/layers/questions/questions.json

@@ -2150,6 +2150,27 @@
           }
         }
       ]
+    },
+    {
+      "id": "survey_date",
+      "question": {
+        "en": "When was this object last surveyed?"
+      },
+      "freeform": {
+        "key": "survey:date",
+        "type": "date"
+      },
+      "render": {
+        "en": "This object was last surveyed on <b>{survey:date}</b>"
+      },
+      "mappings": [
+        {
+          "if": "survey:date:={_now:date}",
+          "then": {
+            "en": "This object was last surveyed today"
+          }
+        }
+      ]
     }
   ]
 }

assets/layers/recycling/recycling.json

@@ -25,7 +25,7 @@
   "calculatedTags": [
     "_waste_amount=Object.values(Object.keys(feat.properties).filter((key) => key.startsWith('recycling:')).reduce((cur, key) => { return Object.assign(cur, { [key]: feat.properties[key] })}, {})).reduce((n, x) => n + (x == \"yes\"), 0);"
   ],
-  "minzoom": 11,
+  "minzoom": 10,
   "title": {
     "render": {
       "en": "Recycling facility",
@@ -1262,7 +1262,8 @@
         "ca": "Aquesta instal·lació de reciclatge la pot utilitzar {access}",
         "fr": "Ce point de recyclage peut être utilisé par {access}"
       }
-    }
+    },
+    "survey_date"
   ],
   "filter": [
     "open_now",
@@ -1566,4 +1567,4 @@
     "enableRelocation": true,
     "enableImproveAccuracy": true
   }
-}
+}