use admin1 id from the shapefile, expose admin2 in the django admin

Author: geohacker

api/admin.py

@@ -550,6 +550,9 @@ class RegionAdmin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdm
     search_fields = ('name',)
     modifiable = True
 
+class Admin2Admin(geoadmin.OSMGeoAdmin, CompareVersionAdmin, RegionRestrictedAdmin):
+    search_fields = ('name',)
+    modifiable = True
 
 class UserProfileAdmin(CompareVersionAdmin):
     search_fields = ('user__username', 'user__email', 'country__name',)
@@ -795,6 +798,7 @@ def has_add_permission(cls, request, obj=None):
 admin.site.register(models.Country, CountryAdmin)
 admin.site.register(models.Region, RegionAdmin)
 admin.site.register(models.District, DistrictAdmin)
+admin.site.register(models.Admin2, Admin2Admin)
 admin.site.register(models.Appeal, AppealAdmin)
 admin.site.register(models.AppealDocument, AppealDocumentAdmin)
 admin.site.register(models.AppealFilter, AppealFilterAdmin)

api/management/commands/import-admin2-data.py

@@ -13,7 +13,7 @@
 from api.models import Admin2Geoms
 
 class Command(BaseCommand):
-  help = "import a shapefile of administrative boundary level 2 data to the GO database. To run, python manage.py import-admin2-data input.shp --country-iso2=af"
+  help = "import a shapefile of administrative boundary level 2 data to the GO database. To run, python manage.py import-admin2-data input.shp"
 
   missing_args_message = "Filename is missing. A shapefile with valid admin polygons is required."
 
@@ -43,12 +43,6 @@ def add_arguments(self, parser):
       action='store_true',
       help='Import all  admin2 boundaries in the shapefile, if possible.'
     )
-    parser.add_argument(
-      '--country-iso2',
-      type=str,
-      required=True,
-      help='Country iso2 code'
-    )
 
   @transaction.atomic
   def handle(self, *args, **options):
@@ -77,13 +71,14 @@ def handle(self, *args, **options):
 
       # loop through each feature in the shapefile
       for feature in data[0]:
-          code = feature.get("code")
-          name = feature.get("name")
+          code = feature.get("pcode")
+          name = feature.get("name") if 'name' in feature.fields else feature.get("shapeName")
+          admin1_id = feature.get("district_id") if "district_id" in feature.fields else feature.get("admin1_id")
+
+          #FIXME: must make sure code and admin1_id are not null before continuing
+
           geom_wkt = feature.geom.wkt
           geom = GEOSGeometry(geom_wkt, srid=4326)
-          if geom.geom_type == "Polygon":
-              geom = MultiPolygon(geom)
-
           centroid = geom.centroid.wkt
           bbox = geom.envelope.wkt
           # import all shapes for admin2
@@ -117,26 +112,26 @@ def handle(self, *args, **options):
 
   @transaction.atomic
   def add_admin2(self, options, import_missing, feature, geom, centroid, bbox):
-      code = feature.get("code") or "N.A"
-      name = feature.get("name")
+      code = feature.get("pcode")
+      name = feature.get("name") if 'name' in feature.fields else feature.get("shapeName")
+      admin1_id = feature.get("district_id") if "district_id" in feature.fields else feature.get("admin1_id")
       admin2 = Admin2()
       admin2.code = code
       admin2.name = name
       admin2.centroid = centroid
       admin2.bbox = bbox
-      country_iso2 = options["country_iso2"]
-      # find district_id based on centroid of admin2 and country.
       try:
-          admin2.admin1_id = self.find_district_id(centroid, country_iso2)
+        admin1 = District.objects.get(id=admin1_id)
+        admin2.admin1_id = admin1.id
       except ObjectDoesNotExist:
-          print(f"Country({country_iso2}) or admin 1 does not found for - admin2: {name}")
+          print(f"admin1 {admin1_id} not found for - admin2: {name}")
           pass
 
       # save data
       if admin2.admin1_id is not None and ((import_missing == "all") or (code in import_missing.keys())):
           try:
-              admin2.save()
               print("importing", admin2.name)
+              admin2.save()
               if options["update_geom"]:
                   self.update_geom(admin2, geom)
           except IntegrityError as e: