Merge branch 'master' of github.com:thomersch/openstreetmap-calendar

osmcal/templates/osmcal/event_join.html

@@ -1,11 +1,14 @@
 {% extends "base.html" %}
 
 {% block content %}
+<div class="content-main-fullwidth">
+
 	<h1 class="event-single-title">Join <a href="{% url 'event' event.id %}">{{ event.name }}</a></h1>
 	On {% include "osmcal/date.txt" %}
 
 	<form action="{% url 'event-join' event.id %}" method="POST" class="event-single-join">
 		{% csrf_token %}
 		<button class="btn">Attend {{ event.name }}</button>
 	</form>
+</div>
 {% endblock %}

osmcal/templatetags/schema.py

@@ -19,18 +19,54 @@ def schema_block(evt):
     }
     if evt.end:
         data["endDate"] = evt.end_localized.isoformat()
+    if evt.description:
+        data["description"] = evt.description
 
     if evt.cancelled:
         data["eventStatus"] = "https://schema.org/EventCancelled"
     else:
         data["eventStatus"] = "https://schema.org/EventScheduled"
 
-    if evt.location:
+    addr = None
+    if evt.location_address:
+        addr = {
+            "@type": "PostalAddress",
+            "addressLocality": ", ".join(
+                filter(
+                    lambda x: x is not None,
+                    [
+                        evt.location_address.get("village"),
+                        evt.location_address.get("town"),
+                        evt.location_address.get("city"),
+                    ],
+                )
+            ),
+        }
+        if "country_code" in evt.location_address:
+            addr["addressCountry"] = evt.location_address.get("country_code").upper()
+        if "state" in evt.location_address:
+            addr["addressRegion"] = evt.location_address.get("state")
+        if "postcode" in evt.location_address:
+            addr["postalCode"] = evt.location_address.get("postcode")
+        if "road" in evt.location_address:
+            addr["streetAddress"] = ", ".join(
+                filter(
+                    lambda x: x is not None,
+                    [evt.location_address.get("house_number"), evt.location_address.get("road")],
+                )
+            )
+
+    if addr or evt.location or evt.location_name:
         data["location"] = {
-            "latitude": evt.location.y,
-            "longitude": evt.location.x,
-            "address": evt.location_detailed_addr,
+            "@type": "Place",
         }
+        if evt.location:
+            data["location"]["latitude"] = evt.location.y
+            data["location"]["longitude"] = evt.location.x
+        if addr:
+            data["location"]["address"] = addr
+        if evt.location_name:
+            data["location"]["name"] = evt.location_name
 
     if evt.link:
         data["url"] = evt.link

pyproject.toml

@@ -26,7 +26,7 @@ django-background-tasks = "*"
 [tool.poetry.group.dev.dependencies]
 PyYaml = "~=6.0"
 pylint = "*"
-black = "~=23.3.0"
+black = "~=24.3.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]