Chloropleths of region/constituency/ward and member markers

hub/graphql/types/model_types.py

@@ -259,13 +259,13 @@ def webhook_healthcheck(self: models.ExternalDataSource, info) -> bool:
         return self.webhook_healthcheck()
 
     @strawberry_django.field
-    def geojson_point_features(
+    def imported_data_geojson_points(
         self: models.ExternalDataSource, info: Info
     ) -> List[PointFeature]:
         data = self.get_import_data()
         return [
             PointFeature.from_geodjango(
-                point=generic_datum,
+                point=generic_datum.point,
                 id=generic_datum.data,
                 properties=generic_datum.json,
             )

hub/management/commands/import_regions.py

@@ -9,7 +9,6 @@
 from utils import mapit
 import requests
 
-
 class Command(BaseCommand):
     help = "Import historical European regions for high-level aggregation"
 
@@ -46,6 +45,7 @@ def handle(self, quiet: bool = False, *args, **options):
             geom = GEOSGeometry(json.dumps(area['geometry']))
             if isinstance(geom, Polygon):
                 geom = MultiPolygon([geom])
+            geom.srid = 27700
             a.geometry = geom_str
             a.polygon = geom
             a.point = a.polygon.centroid

hub/management/commands/import_wards.py

@@ -46,6 +46,7 @@ def handle(self, quiet: bool = False, *args, **options):
             geom = GEOSGeometry(json.dumps(area['geometry']))
             if isinstance(geom, Polygon):
                 geom = MultiPolygon([geom])
+            geom.srid = 27700
             a.geometry = geom_str
             a.polygon = geom
             a.point = a.polygon.centroid

hub/models.py

@@ -658,8 +658,8 @@ class Meta:
 
 
 class GenericData(CommonData):
-    point = PointField(blank=True, null=True)
-    polygon = MultiPolygonField(blank=True, null=True)
+    point = PointField(srid=4326, blank=True, null=True)
+    polygon = MultiPolygonField(srid=4326, blank=True, null=True)
     postcode_data = JSONField(blank=True, null=True)
 
     def get_postcode_data(self) -> Optional[PostcodesIOResult]:
@@ -675,8 +675,8 @@ class Area(models.Model):
     name = models.CharField(max_length=200)
     area_type = models.ForeignKey(AreaType, on_delete=models.CASCADE)
     geometry = models.TextField(blank=True, null=True)
-    polygon = MultiPolygonField(blank=True, null=True)
-    point = PointField(blank=True, null=True)
+    polygon = MultiPolygonField(srid=4326, blank=True, null=True)
+    point = PointField(srid=4326, blank=True, null=True)
     overlaps = models.ManyToManyField("self", through="AreaOverlap")
 
     def __str__(self):

nextjs/package.json

@@ -43,6 +43,7 @@
     "date-fns": "^3.5.0",
     "graphiql": "^3.1.1",
     "graphql": "^16.8.1",
+    "jotai": "^2.7.1",
     "lucide-react": "^0.344.0",
     "mapbox-gl": "^3.2.0",
     "next": "14.1.0",