Fix bbox bug, add ids to filters, add filter state to the URL

2021-09-27 18:35:32 +02:00 · 2021-09-27 18:35:32 +02:00 · 0a9e7c0b36
commit 0a9e7c0b36
parent 38037014b0
23 changed files with 248 additions and 59 deletions
--- a/assets/layers/birdhide/birdhide.json
+++ b/assets/layers/birdhide/birdhide.json
@ -258,6 +258,7 @@
    "wayHandling": 1,
    "filter": [
        {
+            "id": "wheelchair",
            "options": [
                {
                    "question": {
@ -275,6 +276,7 @@
            ]
        },
        {
+            "id": "shelter",
            "options": [
                {
                    "question": {
--- a/assets/layers/cafe_pub/cafe_pub.json
+++ b/assets/layers/cafe_pub/cafe_pub.json
@ -170,6 +170,7 @@
    ],
    "filter": [
        {
+            "id": "opened-now",
            "options": [
                {
                    "question": {
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@ -2627,6 +2627,7 @@
    "wayHandling": 1,
    "filter": [
        {
+            "id": "vehicle-type",
            "options": [
                {
                    "question": {
@ -2656,6 +2657,7 @@
            ]
        },
        {
+            "id": "working",
            "options": [
                {
                    "question": {
@ -2671,6 +2673,7 @@
            ]
        },
        {
+            "id": "connection_type",
            "options": [
                {
                    "question": {
--- a/assets/layers/charging_station/charging_station.protojson
+++ b/assets/layers/charging_station/charging_station.protojson
@ -648,6 +648,7 @@
  "wayHandling": 1,
  "filter": [
    {
+      "id": "vehicle-type",
      "options": [
        {
          "question": {
@ -677,6 +678,7 @@
      ]
    },
    {
+      "id": "working",
      "options": [
        {
          "question": {
--- a/assets/layers/charging_station/csvToJson.ts
+++ b/assets/layers/charging_station/csvToJson.ts
@ -242,6 +242,7 @@ function run(file, protojson) {
    })
    
    proto["filter"].push({
+        id:"connection_type",
        options: filterOptions
    })

--- a/assets/layers/food/food.json
+++ b/assets/layers/food/food.json
@ -560,6 +560,7 @@
    ],
    "filter": [
        {
+            "id": "opened-now",
            "options": [
                {
                    "question": {
@ -571,6 +572,7 @@
            ]
        },
        {
+            "id": "vegetarian",
            "options": [
                {
                    "question": {
@ -589,6 +591,7 @@
            ]
        },
        {
+            "id": "vegan",
            "options": [
                {
                    "question": {
@ -605,6 +608,7 @@
            ]
        },
        {
+            "id": "halal",
            "options": [
                {
                    "question": {
--- a/assets/layers/nature_reserve/nature_reserve.json
+++ b/assets/layers/nature_reserve/nature_reserve.json
@ -423,6 +423,7 @@
    ],
    "filter": [
        {
+            "id": "access",
            "options": [
                {
                    "question": {
@ -433,6 +434,7 @@
            ]
        },
        {
+            "id": "dogs",
            "options": [
                {
                    "question": {
--- a/assets/layers/public_bookcase/public_bookcase.json
+++ b/assets/layers/public_bookcase/public_bookcase.json
@ -444,6 +444,7 @@
    },
    "filter": [
        {
+            "id": "kid-books",
            "options": [
                {
                    "question": "Kinderboeken aanwezig?",
@ -452,6 +453,7 @@
            ]
        },
        {
+            "id": "adult-books",
            "options": [
                {
                    "question": "Boeken voor volwassenen aanwezig?",
@ -460,6 +462,7 @@
            ]
        },
        {
+            "id": "inside",
            "options": [
                {
                    "question": "Binnen of buiten",
--- a/assets/layers/toilet/toilet.json
+++ b/assets/layers/toilet/toilet.json
@ -411,6 +411,7 @@
    ],
    "filter": [
        {
+            "id": "wheelchair",
            "options": [
                {
                    "question": {
@ -421,6 +422,7 @@
            ]
        },
        {
+            "id": "changing_table",
            "options": [
                {
                    "question": {
@ -431,6 +433,7 @@
            ]
        },
        {
+            "id": "free",
            "options": [
                {
                    "question": {
--- a/assets/themes/cycle_highways/cycle_highways.json
+++ b/assets/themes/cycle_highways/cycle_highways.json
@ -143,6 +143,7 @@
      },
      "filter": [
        {
+          "id": "name-alt",
          "options": [
            {
              "question": "Name contains 'alt'",
@ -151,6 +152,7 @@
          ]
        },
        {
+          "id": "name-wenslijn",
          "options": [
            {
              "question": "Name contains 'wenslijn'",
@ -159,6 +161,7 @@
          ]
        },
        {
+          "id": "name-omleiding",
          "options": [
            {
              "question": "Name contains 'omleiding'",
@ -167,6 +170,7 @@
          ]
        },
        {
+          "id":"ref-alt",
          "options": [
            {
              "question": "Reference contains 'alt'",
@ -175,6 +179,7 @@
          ]
        },
        {
+          "id": "missing_link",
          "options": [
            {
              "question": "No filter"
@ -194,6 +199,7 @@
          ]
        },
        {
+          "id": "proposed",
          "options": [
            {
              "question": "No filter"
--- a/assets/themes/uk_addresses/housenumber_unknown_small.svg
+++ b/assets/themes/uk_addresses/housenumber_unknown_small.svg
@ -0,0 +1,60 @@
+<?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"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   viewBox="0 0 87.992996 87.883003"
+   id="svg12"
+   sodipodi:docname="housenumber_unknown_small.svg"
+   inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
+   width="87.992996"
+   height="87.883003">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-1.3561062"
+     inkscape:cy="19.621117"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12" />
+  <path
+     d="m 42.372766,41.559418 h 3.247468 c 0.421762,0 0.76133,0.339541 0.76133,0.761329 v 3.241506 c 0,0.421761 -0.339541,0.761329 -0.76133,0.761329 h -3.247468 c -0.421762,0 -0.76133,-0.339541 -0.76133,-0.761329 v -3.241506 c 0,-0.421761 0.339541,-0.761329 0.76133,-0.761329 z"
+     style="fill:#495aad;stroke-width:0.0542103;paint-order:normal"
+     id="path6"
+     inkscape:connector-curvature="0" />
+  <path
+     d="m 42.085614,42.793949 v 2.289464 c 0.381581,0 0.763173,0.381581 0.763173,0.763173 h 2.289463 c 0,-0.381581 0.381581,-0.763173 0.763173,-0.763173 v -2.289464 c -0.381581,0 -0.763173,-0.381581 -0.763173,-0.763172 h -2.289463 c 0,0.38158 -0.381581,0.763172 -0.763173,0.763172 z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#ffffff;stroke-width:0.27187553" />
+</svg>
--- a/assets/themes/uk_addresses/license_info.json
+++ b/assets/themes/uk_addresses/license_info.json
@ -39,5 +39,13 @@
      "https://github.com/streetcomplete/StreetComplete/tree/master/res/graphics",
      "https://f-droid.org/packages/de.westnordost.streetcomplete/"
    ]
+  },
+  {
+    "path": "housenumber_unknown_small.svg",
+    "license": "CC0",
+    "authors": [
+      "Pieter Vander Vennet"
+    ],
+    "sources": []
  }
 ]
--- a/assets/themes/uk_addresses/uk_addresses.json
+++ b/assets/themes/uk_addresses/uk_addresses.json
@ -15,11 +15,15 @@
  "maintainer": "Pieter Vander Vennet, Rob Nickerson, Russ Garrett",
  "icon": "./assets/themes/uk_addresses/housenumber_unknown.svg",
  "version": "2021-09-17",
-  "startLat": -0.08528530407,
-  "startLon": 51.52103754846,
-  "startZoom": 18,
-  "widenFactor": 1.5,
+  "startLat": -0.08706,
+  "startLon": 51.52224,
+  "startZoom": 17,
+  "widenFactor": 1.01,
  "socialImage": "",
+  "clustering": {
+    "minNeededFeatures": 25,
+    "maxZoom": 17
+  },
  "layers": [
    {
      "id": "to_import",
@ -34,21 +38,21 @@
      "minzoom": 12,
      "wayHandling": 1,
      "icon": {
-        "render": "./assets/themes/uk_addresses/housenumber_unknown.svg"
-      },
-      "iconSize": {
-        "render": "40,40,center",
+        "render": "./assets/themes/uk_addresses/housenumber_unknown.svg",
        "mappings": [
          {
            "if": "_embedding_object:id~*",
-            "then": "15,15,center"
+            "then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
          },
          {
            "if": "_imported=yes",
-            "then": "8,8,center"
+            "then": "./assets/themes/uk_addresses/housenumber_unknown_small.svg"
          }
        ]
      },
+      "iconSize": {
+        "render": "40,40,center"
+      },
      "title": {
        "render": "Address to be determined"
      },
@ -73,6 +77,22 @@
        "_embedding_object:addr:housenumber=JSON.parse(feat.properties._embedding_object)?.['addr:housenumber']",
        "_embedding_object:addr:street=JSON.parse(feat.properties._embedding_object)?.['addr:street']",
        "_embedding_object:id=JSON.parse(feat.properties._embedding_object)?.id"
+      ],
+      "filter": [
+        {
+          "id": "to_handle",
+          "options": [
+            {
+              "question": "Only show non-matched objects",
+              "osmTags": {
+                "and": [
+                  "_imported=",
+                  "_embedding_object:id="
+                ]
+              }
+            }
+          ]
+        }
      ]
    },
    {