From 2d7d22236f10049b7322c407f3a3fdba8466a968 Mon Sep 17 00:00:00 2001
From: Logan Williams <logan@bellingcat.com>
Date: Tue, 2 May 2023 10:54:42 +0200
Subject: [PATCH] Make 403 message more clear

---
 frontend/src/components/HelpCard.vue |  2 +-
 frontend/src/components/queries.js   | 97 ++++++++++++++++++++++++++++
 frontend/src/store/index.js          |  5 +-
 3 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/HelpCard.vue b/frontend/src/components/HelpCard.vue
index d8fc8c8..8913858 100644
--- a/frontend/src/components/HelpCard.vue
+++ b/frontend/src/components/HelpCard.vue
@@ -26,7 +26,7 @@
         significantly around the world. This tool can be used to find possible
         leads, but it should not be considered exhaustive or used to exclude
         areas of interest. For any bugs or new preset requests, contact
-        <a href="mailto:logan@bellingcat.com">logan@bellingcat.com</a>. >
+        <a href="mailto:logan@bellingcat.com">logan@bellingcat.com</a>.
       </p>
     </v-card-text>
     <div class="readmore" @click="toggle" v-if="!expanded">
diff --git a/frontend/src/components/queries.js b/frontend/src/components/queries.js
index 7a0953e..78056a6 100644
--- a/frontend/src/components/queries.js
+++ b/frontend/src/components/queries.js
@@ -212,6 +212,18 @@ export default [
       },
     ],
   },
+  {
+    name: "One way road",
+    type: "line",
+    method: "OR",
+    filters: [
+      {
+        parameter: "oneway",
+        comparison: "=",
+        value: "yes",
+      },
+    ],
+  },
   {
     name: "Sidewalk",
     type: "line",
@@ -228,6 +240,33 @@ export default [
       },
     ],
   },
+  {
+    name: "Pedestrian path",
+    type: "line",
+    method: "OR",
+    filters: [
+      {
+        parameter: "highway",
+        comparison: "=",
+        value: "footway",
+      },
+      {
+        parameter: "highway",
+        comparison: "=",
+        value: "path",
+      },
+      {
+        parameter: "highway",
+        comparison: "=",
+        value: "steps",
+      },
+      {
+        parameter: "highway",
+        comparison: "=",
+        value: "pedestrian",
+      },
+    ],
+  },
   {
     name: "Cliff",
     type: "line",
@@ -240,6 +279,17 @@ export default [
       },
     ],
   },
+  {
+    name: "Waterway",
+    type: "line",
+    method: "OR",
+    filters: [
+      {
+        parameter: "waterway",
+        comparison: "is not null",
+      },
+    ],
+  },
   {
     name: "Park",
     type: "polygon",
@@ -293,6 +343,30 @@ export default [
       },
     ],
   },
+  {
+    name: "Water body",
+    type: "polygon",
+    method: "OR",
+    filters: [
+      {
+        parameter: "natural",
+        comparison: "=",
+        value: "water",
+      },
+    ],
+  },
+  {
+    name: "Plaza/square",
+    type: "polygon",
+    method: "OR",
+    filters: [
+      {
+        parameter: "place",
+        comparison: "=",
+        value: "square",
+      },
+    ],
+  },
   {
     name: "Building",
     type: "polygon",
@@ -475,6 +549,29 @@ export default [
       },
     ],
   },
+  {
+    name: "Supermarket",
+    type: "any",
+    method: "OR",
+    filters: [
+      {
+        parameter: "shop",
+        comparison: "=",
+        value: "supermarket",
+      },
+    ],
+  },
+  {
+    name: "Shop (any)",
+    type: "any",
+    method: "OR",
+    filters: [
+      {
+        parameter: "shop",
+        comparison: "is not null",
+      },
+    ],
+  },
   {
     name: "Fountain",
     type: "any",
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 13f5c7d..1558391 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -122,7 +122,7 @@ export default new Vuex.Store({
       }
 
       fetch(
-        "https://taginfo.openstreetmap.org/api/4/key/values?rp=50&sortname=count_all&sortorder=desc&key=" +
+        "https://taginfo.openstreetmap.org/api/4/key/values?rp=50&sortname=count_all&sortorder=desc&page=1&key=" +
           v
       )
         .then((d) => {
@@ -178,6 +178,9 @@ export default new Vuex.Store({
               "setError",
               "Your search area is too large, or your search timed out. Zoom in on a smaller area or change your search parameters. Adding a point feature (green) will increase speed."
             );
+          } else if (e.message == 403) {
+            commit("setLoading", false);
+            commit("setError", "Your login has expired. Please log in again.");
           } else {
             commit("setLoading", false);
             commit(