Merge pull request #534 from mapswipe/fix-tileserver-placeholders

adjust tileserver url check and allow {-y} placeholder

Author: Hagellach37

manager_dashboard/manager_dashboard/js/uploadProjects.js

@@ -172,16 +172,18 @@ function checkImageryUrl() {
     // check if url A contains the placeholders when using custom imagery
     urlA = document.getElementById("tileServerAUrl").value
     nameA = document.getElementById("tileServerAName").value
-    if (nameA === "custom" & (!urlA.includes("{x}") | !urlA.includes("{y}") | !urlA.includes("{z}"))) {
-        alert("The imagery url A must contain {x}, {y} and {z} placeholders.")
+    if (nameA === "custom" & (!urlA.includes("{z}") | !urlA.includes("{x}") | (!urlA.includes("{y}") & !urlA.includes("{-y}")))) {
+        alert("The imagery url A must contain {x}, {y} (or {-y}) and {z} placeholders." + urlA)
         return false
     }
 
+    console.log(urlA.includes("{x}"))
+
     // check if url B contains the placeholders when using custom imagery
     urlB = document.getElementById("tileServerBUrl").value
     nameB = document.getElementById("tileServerBName").value
-    if (nameB === "custom" & (!urlB.includes("{x}") | !urlB.includes("{y}") | !urlB.includes("{z}"))) {
-        alert("The imagery url B must contain {x}, {y} and {z} placeholders.")
+    if (nameB === "custom" & (!urlB.includes("{z}") | !urlB.includes("{x}") | (!urlB.includes("{y}") & !urlB.includes("{-y}")))) {
+        alert("The imagery url B must contain {x}, {y} (or {-y}) and {z} placeholders." + urlB)
         return false
     }
 

mapswipe_workers/mapswipe_workers/project_types/base/tile_server.py

@@ -21,8 +21,8 @@ def __init__(self, tile_server_dict):
         # check if url contains the right place holders
         if not self.check_imagery_url():
             raise CustomError(
-                f"The imagery url {self.url} must contain {{x}}, {{y}} and {{z}} or "
-                "the {quad_key} placeholders."
+                f"The imagery url {self.url} must contain {{x}}, {{y}} (or {{-y}}) "
+                "and {{z}} or the {quad_key} placeholders."
             )
 
         # set api key
@@ -47,6 +47,8 @@ def check_imagery_url(self):
         """Check if imagery url contains xyz or quad key placeholders."""
         if all([substring in self.url for substring in ["{x}", "{y}", "{z}"]]):
             return True
+        elif all([substring in self.url for substring in ["{x}", "{-y}", "{z}"]]):
+            return True
         elif "{quad_key}" in self.url:
             return True
         else: