Merge pull request #2632 from IFRCGo/feature/fix-tiling-staging-strings

Fix maptiling strings

Author: szabozoltan69

README.md

@@ -273,7 +273,6 @@ Run ` python manage.py update-sovereign-and-disputed new_fields.csv` to update t
 To update GO countries and districts Mapbox tilesets, run the management command `python manage.py update-mapbox-tilesets`. This will export all country and district geometries to a GeoJSON file, and then upload them to Mapbox. The tilesets will take a while to process. The updated status can be viewed on the Mapbox Studio under tilesets. To run this management command, MAPBOX_ACCESS_TOKEN should be set in the environment. The referred files are in ./mapbox/..., so you should **not** run this command from an arbitrary point of the vm's filesystem (e.g. from the location of shapefiles), but from Django root.
 
 ### Options available for the command
-* `--production` — update production tilesets. If this flag is not set, by default the script will only update staging tiles
 * `--update-countries` — update tileset for countries, including labels
 * `--update-districts` — update tileset for districts, including labels
 * `--update-all` — update all countries and districts tilesets

api/management/commands/update-mapbox-tilesets.py

@@ -17,7 +17,6 @@ def add_arguments(self, parser):
         parser.add_argument("--create-and-update-admin2", help="Create and update admin2 tileset for this country ISO")
         parser.add_argument("--update-admin2", help="Update admin2 tileset for this country ISO")
         parser.add_argument("--update-all", action="store_true", help="Update tileset for countries and districts")
-        parser.add_argument("--production", action="store_true", help="Update production tilesets. Default is staging")
 
     db = settings.DATABASES["default"]
     DB_HOST = db["HOST"]
@@ -32,9 +31,7 @@ def handle(self, *args, **options):
             if os.getenv("MAPBOX_ACCESS_TOKEN") is None:
                 raise Exception("MAPBOX_ACCESS_TOKEN must be set")
 
-            staging = True
-            if options["production"]:
-                staging = False
+            staging = settings.GO_ENVIRONMENT != "production"
 
             if options["update_countries"] or options["update_all"]:
                 self.update_countries(staging)
@@ -131,7 +128,7 @@ def update_countries(self, staging):
                     "upload-source",
                     "--replace",
                     "go-ifrc",
-                    "go-country-centroids",
+                    tileset_source_name,
                     "/tmp/country-centroids.geojson",
                 ]
             )
@@ -245,13 +242,14 @@ def create_and_update_admin2(self, iso, staging=True):
         if status:
             update_status = self.update_admin2(iso, staging)
             if update_status:
-                polygon_tileset_name = f"go-ifrc.go-admin2-{iso}-staging"
-                polygon_recipe_name = f"mapbox/admin2/{iso}-staging.json"
-                centroids_tileset_name = f"go-ifrc.go-admin2-{iso}-centroids"
-                centroids_recipe_name = f"mapbox/admin2/{iso}-centroids.json"
-                if not staging:
-                    polygon_tileset_name = f"go-ifrc.go-admin2-{iso}"
-                    polygon_recipe_name = f"mapbox/admin2/{iso}.json"
+                polygon_tileset_name = f"go-ifrc.go-admin2-{iso}-staging" if staging else f"go-ifrc.go-admin2-{iso}"
+                polygon_recipe_name = f"mapbox/admin2/{iso}-staging.json" if staging else f"mapbox/admin2/{iso}.json"
+                centroids_tileset_name = (
+                    f"go-ifrc.go-admin2-{iso}-centroids-staging" if staging else f"go-ifrc.go-admin2-{iso}-centroids"
+                )
+                centroids_recipe_name = (
+                    f"mapbox/admin2/{iso}-centroids-staging.json" if staging else f"mapbox/admin2/{iso}-centroids.json"
+                )
 
                 create_status = subprocess.run(
                     [
@@ -285,10 +283,8 @@ def create_and_update_admin2(self, iso, staging=True):
     def update_admin2(self, iso, staging=True):
         # update tileset source
         # update tileset and publish
-        polygon_tileset_source__name = f"go-admin2-{iso}-src-staging"
-        centroids_tileset_source_name = f"go-admin2-{iso}-centroids-src"
-        if not staging:
-            polygon_tileset_source__name = f"go-admin2-{iso}-src"
+        polygon_tileset_source__name = f"go-admin2-{iso}-src-staging" if staging else f"go-admin2-{iso}-src"
+        centroids_tileset_source_name = f"go-admin2-{iso}-centroids-src-staging" if staging else f"go-admin2-{iso}-centroids-src"
 
         print("Tileset source", polygon_tileset_source__name)
         print("Tileset source centroids", centroids_tileset_source_name)
@@ -319,10 +315,10 @@ def publish_admin2(self, iso, staging=True, create=False):
             update_status = True
 
         if update_status:
-            polygon_tileset_name = f"go-ifrc.go-admin2-{iso}-staging"
-            centroids_tileset_name = f"go-ifrc.go-admin2-{iso}-centroids"
-            if not staging:
-                polygon_tileset_name = f"go-ifrc.go-admin2-{iso}"
+            polygon_tileset_name = f"go-ifrc.go-admin2-{iso}-staging" if staging else f"go-ifrc.go-admin2-{iso}"
+            centroids_tileset_name = (
+                f"go-ifrc.go-admin2-{iso}-centroids-staging" if staging else f"go-ifrc.go-admin2-{iso}-centroids"
+            )
 
             publish_status = subprocess.run(["tilesets", "publish", polygon_tileset_name])
             publish_status = subprocess.run(["tilesets", "publish", centroids_tileset_name])

assets

@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "layers": {
+      "go-admin2-AFG-centroids-staging": {
+        "source": "mapbox://tileset-source/go-ifrc/go-admin2-AFG-centroids-src-staging",
+        "minzoom": 5,
+        "maxzoom": 10
+      }
+    }
+  }
+  

mapbox/admin2/AFG-centroids-staging.json

@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "layers": {
+      "go-admin2-ARG-centroids-staging": {
+        "source": "mapbox://tileset-source/go-ifrc/go-admin2-ARG-centroids-src-staging",
+        "minzoom": 5,
+        "maxzoom": 10
+      }
+    }
+  }
+  

mapbox/admin2/ARG-centroids-staging.json

@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "layers": {
+      "go-admin2-BDI-centroids-staging": {
+        "source": "mapbox://tileset-source/go-ifrc/go-admin2-BDI-centroids-src-staging",
+        "minzoom": 5,
+        "maxzoom": 10
+      }
+    }
+  }
+  

mapbox/admin2/BDI-centroids-staging.json

@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "layers": {
+      "go-admin2-BEN-centroids-staging": {
+        "source": "mapbox://tileset-source/go-ifrc/go-admin2-BEN-centroids-src-staging",
+        "minzoom": 5,
+        "maxzoom": 10
+      }
+    }
+  }
+  

mapbox/admin2/BEN-centroids-staging.json

@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "layers": {
+      "go-admin2-BFA-centroids-staging": {
+        "source": "mapbox://tileset-source/go-ifrc/go-admin2-BFA-centroids-src-staging",
+        "minzoom": 5,
+        "maxzoom": 10
+      }
+    }
+  }
+  

mapbox/admin2/BFA-centroids-staging.json

@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "layers": {
+      "go-admin2-BGD-centroids-staging": {
+        "source": "mapbox://tileset-source/go-ifrc/go-admin2-BGD-centroids-src-staging",
+        "minzoom": 5,
+        "maxzoom": 10
+      }
+    }
+  }
+  

mapbox/admin2/BGD-centroids-staging.json

@@ -0,0 +1,11 @@
+{
+    "version": 1,
+    "layers": {
+      "go-admin2-BGR-centroids-staging": {
+        "source": "mapbox://tileset-source/go-ifrc/go-admin2-BGR-centroids-src-staging",
+        "minzoom": 5,
+        "maxzoom": 10
+      }
+    }
+  }
+