Remove old geometry field on boundary

temba/locations/migrations/0035_remove_adminboundary_simplified_geometry.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.1.4 on 2025-01-10 15:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("locations", "0034_populate_json_geometry"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="adminboundary",
+            name="simplified_geometry",
+        ),
+    ]

temba/locations/models.py

@@ -2,23 +2,11 @@
 from mptt.models import MPTTModel, TreeForeignKey
 from smartmin.models import SmartModel
 
-from django.contrib.gis.db import models
+from django.db import models
 from django.db.models import F, Value
 from django.db.models.functions import Concat, Upper
 
 
-# default manager for AdminBoundary, doesn't load geometries
-class NoGeometryManager(models.Manager):
-    def get_queryset(self):
-        return super().get_queryset().defer("simplified_geometry")
-
-
-# optional 'geometries' manager for AdminBoundary, loads everything
-class GeometryManager(models.Manager):
-    def get_queryset(self):
-        return super().get_queryset()
-
-
 class AdminBoundary(MPTTModel, models.Model):
     """
     Represents a single administrative boundary (like a country, state or district)
@@ -41,12 +29,8 @@ class AdminBoundary(MPTTModel, models.Model):
     level = models.IntegerField()
     parent = TreeForeignKey("self", null=True, on_delete=models.PROTECT, related_name="children", db_index=True)
     path = models.CharField(max_length=768)  # e.g. Rwanda > Kigali
-    simplified_geometry = models.MultiPolygonField(null=True)
     geometry = models.JSONField(null=True)
 
-    objects = NoGeometryManager()
-    geometries = GeometryManager()
-
     @staticmethod
     def get_geojson_dump(name, features):
         # build a feature collection

temba/locations/tests/test_geojson.py

@@ -400,7 +400,6 @@ def test_import_geojson(self):
         self.assertEqual(0, AdminBoundary.objects.filter(level=3).count())
 
         self.country = AdminBoundary.objects.get(level=0)
-        self.assertIsNone(self.country.simplified_geometry)
         self.assertEqual(self.country.geometry, matchers.Dict())
 
     def assertOSMIDs(self, ids):

temba/locations/views.py

@@ -49,7 +49,7 @@ def derive_url_pattern(cls, path, action):
             return r"^%s/%s/(?P<osmId>\w+\.?\d+\.?\d?\_?\d?)/$" % (path, action)
 
         def get_object(self):
-            return AdminBoundary.geometries.get(osm_id=self.kwargs["osmId"])
+            return AdminBoundary.objects.get(osm_id=self.kwargs["osmId"])
 
         def render_to_response(self, context):
             if self.object.children.all().count() > 0:
@@ -68,7 +68,7 @@ def derive_url_pattern(cls, path, action):
             return r"^%s/%s/(?P<osmId>[\w\.]+)/$" % (path, action)
 
         def get_object(self):
-            return AdminBoundary.geometries.get(osm_id=self.kwargs["osmId"])
+            return AdminBoundary.objects.get(osm_id=self.kwargs["osmId"])
 
         def post(self, request, *args, **kwargs):
             # try to parse our body