Merge branch 'main' into shift-selling

Author: tykling

src/backoffice/views/facilities.py

@@ -96,12 +96,34 @@ def post(self, request, camp_slug, slug):
             else:
                 errorCount += 1
                 continue
-            obj, created = Facility.objects.update_or_create(
-                name=props["name"],
-                description=description,
-                facility_type=facility_type,
-                location=geom,
-            )
+            # Check if UUID in props then create/update with UUID
+            if "uuid" in props:
+                obj, created = Facility.objects.get_or_create(
+                    uuid=props["uuid"],
+                    facility_type=facility_type,
+                )
+                obj.name = props["name"]
+                obj.description = description
+                obj.location = geom
+                obj.save()
+            # Check if id in feature then create/update with id as UUID
+            elif "id" in feature:
+                obj, created = Facility.objects.get_or_create(
+                    uuid=feature["id"],
+                    facility_type=facility_type,
+                )
+                obj.name = props["name"]
+                obj.description = description
+                obj.location = geom
+                obj.save()
+            # Create/Update feature without UUID
+            else:
+                obj, created = Facility.objects.update_or_create(
+                    name=props["name"],
+                    description=description,
+                    facility_type=facility_type,
+                    location=geom,
+                )
             if created:
                 createdCount += 1
             else:

src/backoffice/views/maps.py

@@ -113,7 +113,7 @@ def load_feature_collection(self, layer, geojson) -> None:
                 # parse single feature
                 geom = self.load_features(feature["geometry"])
             self.create_feature_object(
-                feature_uuid=feature.get("id"),
+                feature_uuid=(feature["properties"].get("uuid", feature.get("id"))),
                 props=feature["properties"],
                 layer=layer,
                 geom=geom,

src/camps/templates/bornhack-2025_camp_detail.html

@@ -10,7 +10,8 @@
 {% block content %}
   <div class="row mt-3">
     <div class="col-12 text-center">
-      <img src="{% static camp.logo_large %}" width="800" class="img-responsive" id="front-logo" />
+      <img src="/static/img/bornhack-2025/logo/bornhack-2025-logo-l-for-light.png" width="800" class="front-logo img-responsive bornhack-hide-dark" />
+      <img src="/static/img/bornhack-2025/logo/bornhack-2025-logo-l-for-dark.png" width="800" class="front-logo img-responsive bornhack-hide-light" />
     </div>
   </div>
 

src/facilities/views.py

@@ -54,7 +54,7 @@ def dump_features(self) -> list[object]:
             for facility in Facility.objects.filter(facility_type=ft.pk):
                 entry = {
                     "type": "Feature",
-                    "id": facility.pk,
+                    "facility_id": facility.pk,
                     "geometry": {
                         "type": "Point",
                         "coordinates": [facility.location.x, facility.location.y],

src/maps/views.py

@@ -267,6 +267,7 @@ def get_context_data(self, **kwargs) -> dict:
                 Feature.objects.filter(layer=self.layer.uuid),
                 geometry_field="geom",
                 fields=[
+                    "uuid",
                     "name",
                     "description",
                     "color",