| + + | +
| + + | +
Hello {{ name }},
-{{ message }}
+ +|
+
-
- {% if edit_url %}
- You can view, update, or cancel your drone request using this secure link. - {% endif %} - -Please quote your reference number in any replies. diff --git a/backend/entrypoint.sh b/backend/entrypoint.sh index f37dd2c..4731e4f 100644 --- a/backend/entrypoint.sh +++ b/backend/entrypoint.sh @@ -188,8 +188,8 @@ echo "" # Start the application with appropriate settings if [ "${ENVIRONMENT}" = "production" ]; then - echo "Starting in PRODUCTION mode with multiple workers..." - exec uvicorn app.main:app --host 0.0.0.0 --port 8000 --workers ${WORKERS:-4} + echo "Starting in PRODUCTION mode with a single worker for in-process WebSocket broadcasts..." + exec uvicorn app.main:app --host 0.0.0.0 --port 8000 else echo "Starting in DEVELOPMENT mode with auto-reload..." exec uvicorn app.main:app --host 0.0.0.0 --port 8000 --reload diff --git a/backend/tests/test_drone_requests_api.py b/backend/tests/test_drone_requests_api.py index 2800956..5fd05db 100644 --- a/backend/tests/test_drone_requests_api.py +++ b/backend/tests/test_drone_requests_api.py @@ -1,3 +1,4 @@ +from app.core.frz import point_inside_swansea_frz from app.models.drone_request import DroneRequest @@ -16,11 +17,14 @@ def drone_payload(**overrides): "estimated_completion_at": "2026-06-20T10:30:00", "maximum_elevation_ft_amsl": 250, "location_description": "North apron", - "location_latitude": 51.47, - "location_longitude": -0.45, - "location_inside_frz": "yes", + "location_latitude": 51.623389, + "location_longitude": -4.069231, + "location_inside_frz": "no", "notes": "Survey flight", - "prototype_overlay": {"radius_nm": 1}, + "prototype_overlay": { + "airport_reference_point": {"lat": 0, "lng": 0}, + "frz_radius_metres": 1, + }, } payload.update(overrides) return payload @@ -142,3 +146,11 @@ def test_drone_request_not_found_and_validation_paths(auth_client, client): == 404 ) assert auth_client.get("/api/v1/drone-requests/404/journal").status_code == 404 + + +def test_swansea_frz_runway_extensions_start_at_thresholds(): + assert point_inside_swansea_frz(51.626825, -4.037672) is True + assert point_inside_swansea_frz(51.583775, -4.097928) is True + assert point_inside_swansea_frz(51.603007, -4.025604) is True + assert point_inside_swansea_frz(51.607593, -4.109996) is True + assert point_inside_swansea_frz(51.68000, -4.06780) is False diff --git a/web/drone-requests.html b/web/drone-requests.html index 1380982..e853fd3 100644 --- a/web/drone-requests.html +++ b/web/drone-requests.html @@ -324,6 +324,7 @@ let requests = []; let map = null; let mapLayers = []; + let frzGeometry = null; document.addEventListener('DOMContentLoaded', () => { document.getElementById('login-form').addEventListener('submit', handleLogin); @@ -339,6 +340,18 @@ maxZoom: 19, attribution: '© OpenStreetMap contributors' }).addTo(map); + loadFrzGeometry(); + } + + async function loadFrzGeometry() { + try { + const response = await fetch('/api/v1/drone-requests/frz'); + if (!response.ok) throw new Error('Failed to load FRZ geometry'); + frzGeometry = await response.json(); + renderMap(); + } catch (err) { + console.warn('Unable to load FRZ geometry', err); + } } function initializeAuth() { @@ -514,67 +527,35 @@ function renderMap() { clearMapLayers(); - if (!selectedRequest || !map) return; + if (!map) return; - const point = [selectedRequest.location_latitude, selectedRequest.location_longitude]; - const overlay = selectedRequest.prototype_overlay || {}; - const arp = overlay.airport_reference_point || { lat: 51.6053, lng: -4.0678 }; - const radius = overlay.frz_radius_metres || 3704; + if (frzGeometry) { + const frzLayer = L.geoJSON(frzGeometry, { + style: { + color: '#e74c3c', + weight: 2, + fillColor: '#e74c3c', + fillOpacity: 0.10 + } + }).addTo(map); + addLayer(frzLayer); + } - addLayer(L.circle([arp.lat, arp.lng], { - radius, - color: '#2c3e50', - weight: 2, - fillColor: '#3498db', - fillOpacity: 0.08 - }).addTo(map)); - - addRunwayProtectionRectangles(arp); - - addLayer(L.marker(point).addTo(map).bindPopup(` - ${escapeHtml(selectedRequest.reference_number)}- ${escapeHtml(selectedRequest.operator_name)} - ${selectedRequest.maximum_elevation_ft_amsl} ft AMSL - `)); + if (selectedRequest) { + const point = [selectedRequest.location_latitude, selectedRequest.location_longitude]; + addLayer(L.marker(point).addTo(map).bindPopup(` + ${escapeHtml(selectedRequest.reference_number)} + ${escapeHtml(selectedRequest.operator_name)} + ${selectedRequest.maximum_elevation_ft_amsl} ft AMSL + `)); + } + if (!mapLayers.length) return; const group = L.featureGroup(mapLayers); map.fitBounds(group.getBounds().pad(0.18)); setTimeout(() => map.invalidateSize(), 50); } - function addRunwayProtectionRectangles(arp) { - addLayer(L.polygon(rotatedRectangle(arp.lat, arp.lng, 41, 5000, 1000), { - color: '#e67e22', - weight: 1, - fillOpacity: 0.08 - }).addTo(map)); - addLayer(L.polygon(rotatedRectangle(arp.lat, arp.lng, 95, 5000, 1000), { - color: '#e67e22', - weight: 1, - fillOpacity: 0.08 - }).addTo(map)); - } - - function rotatedRectangle(lat, lng, bearingDeg, lengthM, widthM) { - const halfL = lengthM / 2; - const halfW = widthM / 2; - return [ - offsetPoint(lat, lng, bearingDeg, halfL, halfW), - offsetPoint(lat, lng, bearingDeg, halfL, -halfW), - offsetPoint(lat, lng, bearingDeg, -halfL, -halfW), - offsetPoint(lat, lng, bearingDeg, -halfL, halfW) - ]; - } - - function offsetPoint(lat, lng, bearingDeg, forwardM, rightM) { - const bearing = bearingDeg * Math.PI / 180; - const northM = Math.cos(bearing) * forwardM + Math.cos(bearing + Math.PI / 2) * rightM; - const eastM = Math.sin(bearing) * forwardM + Math.sin(bearing + Math.PI / 2) * rightM; - const latOffset = northM / 111320; - const lngOffset = eastM / (111320 * Math.cos(lat * Math.PI / 180)); - return [lat + latOffset, lng + lngOffset]; - } - function addLayer(layer) { mapLayers.push(layer); } |