Merge pull request #1578 from IFRCGo/fix-docs

Admin2 tile fixes

Author: szabozoltan69

README.md

@@ -229,9 +229,7 @@ The above command will generate a list of missing admin2s in the database based
 
 ### Options available for the command
 * `--update-geom` -- updates the geometry for all admin2 matched in the shapefile.
-* `--update-bbox` -- updates the bbox for all admin2 matched in the shapefile.
-* `--update-centroid` -- updates the centroid for all admin2 matched in the shapefile.
-* `--import-missing missing-admin2.txt` -- this will import admin2 listed in `missing-districts.txt` to the database. The file is the same format as generated by the default command.
+* `--import-missing missing-admin2.txt` -- this will import admin2 listed in `missing-admin2.txt` to the database. The file is the same format as generated by the default command.
 * `--import-all` -- this option is used to import all admin2 in the shapefile.
 
 

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

@@ -69,7 +69,7 @@ def handle(self, *args, **options):
 
       if options['update_admin2']:
         print(f'Updating tileset for {options["update_admin2"]}')
-        self.update_admin2(options['update_admin2'], staging)
+        self.publish_admin2(options['update_admin2'], staging, False)
 
     except BaseException as e:
       raise CommandError('Could not update tilesets: ' + str(e))
@@ -224,7 +224,10 @@ def update_admin2(self, iso, staging=True):
     if not staging:
       tileset_source__name = f'go-admin2-{iso}-src'
 
-    status = subprocess.run(['tilesets', 'upload-source', '--replace', 'go-ifrc', tileset_source__name, f'/tmp/{iso}.geojson'])
+    print('Tileset source', tileset_source__name)
+    status = self.prepare_admin2_geojson(iso)
+    if status:
+      status = subprocess.run(['tilesets', 'upload-source', '--replace', 'go-ifrc', tileset_source__name, f'/tmp/{iso}.geojson'])
     return True if status.returncode == 0 else False
 
   def publish_admin2(self, iso, staging=True, create=False):

mapbox/admin2/GTM-staging.json

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

mapbox/admin2/GTM.json

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

mapbox/admin2/HND-staging.json

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

mapbox/admin2/HND.json

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

mapbox/admin2/HTI-staging.json

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

mapbox/admin2/HTI.json

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

mapbox/admin2/SLV-staging.json

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

mapbox/admin2/SLV.json

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