From 314eb6b4ec5d34152883b231424cb54fa1ac933a Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Sat, 10 Oct 2026 16:03:14 +0200 Subject: [PATCH] added scheduling --- BURST_EVENTS.md | 11 ++ SENSOR_FIRMWARE_VALIDATION.md | 42 +++-- SENSOR_SUBMISSION_API.md | 6 +- .../__pycache__/admin.cpython-312.pyc | Bin 14439 -> 15437 bytes .../__pycache__/admin.cpython-313.pyc | Bin 14630 -> 15658 bytes .../__pycache__/bursts.cpython-312.pyc | Bin 0 -> 1051 bytes .../__pycache__/bursts.cpython-313.pyc | Bin 0 -> 1066 bytes .../__pycache__/models.cpython-312.pyc | Bin 19339 -> 23170 bytes .../__pycache__/models.cpython-313.pyc | Bin 19603 -> 23458 bytes .../test_browser_processing.cpython-313.pyc | Bin 0 -> 16460 bytes .../test_sensor_submission.cpython-313.pyc | Bin 0 -> 11365 bytes .../__pycache__/tests.cpython-313.pyc | Bin 34805 -> 47003 bytes .../__pycache__/urls.cpython-312.pyc | Bin 1570 -> 1712 bytes .../__pycache__/urls.cpython-313.pyc | Bin 1486 -> 1622 bytes .../__pycache__/views.cpython-312.pyc | Bin 38628 -> 45443 bytes .../__pycache__/views.cpython-313.pyc | Bin 39056 -> 46021 bytes fireworks_detect/admin.py | 25 ++- fireworks_detect/bursts.py | 25 +++ ...vent_observation_duration_kind_and_more.py | 57 +++++++ .../migrations/0013_event_submitted_at.py | 18 +++ ...ion_duration_kind_and_more.cpython-313.pyc | Bin 0 -> 2730 bytes .../0013_event_submitted_at.cpython-313.pyc | Bin 0 -> 833 bytes fireworks_detect/models.py | 55 +++++++ .../fireworks_detect/event_detail.html | 6 +- .../fireworks_detect/events_list.html | 2 +- .../includes/manual_report_form.html | 15 +- .../fireworks_detect/includes/map_panel.html | 8 +- .../manual_pending_submission.html | 18 ++- .../templates/fireworks_detect/map.html | 6 +- fireworks_detect/test_sensor_submission.py | 18 ++- fireworks_detect/tests.py | 148 +++++++++++++++++- fireworks_detect/urls.py | 2 + fireworks_detect/views.py | 146 ++++++++++++++--- frontend/src/scripts/event-map.js | 18 ++- frontend/src/scripts/manual-report.js | 16 ++ .../components/manual-report-structure.scss | 61 ++++++++ frontend/src/styles/pages/map.scss | 37 +++++ locale/nl/LC_MESSAGES/django.mo | Bin 29818 -> 31560 bytes locale/nl/LC_MESSAGES/django.po | 80 ++++++++++ .../__pycache__/test_sensors.cpython-313.pyc | Bin 15563 -> 15797 bytes .../members/partials/sensor_detail.html | 1 + .../members/partials/sensor_list.html | 1 + members/test_sensors.py | 2 + .../src/entries/dashboard.js-C2DCho1J.js | 1 + .../frontend/src/entries/home.js-Cam3C1NX.js | 1 + .../frontend/src/entries/map.js-ZTK3kmoy.js | 1 + .../vite/assets/manual-report-44fwUW4y.js | 1 + .../vite/assets/manual-report-BTZbA1qV.css | 1 + staticfiles/vite/assets/map-CneBwLkV.css | 1 + templates/js_translations.html | 5 +- 50 files changed, 768 insertions(+), 67 deletions(-) create mode 100644 BURST_EVENTS.md create mode 100644 fireworks_detect/__pycache__/bursts.cpython-312.pyc create mode 100644 fireworks_detect/__pycache__/bursts.cpython-313.pyc create mode 100644 fireworks_detect/__pycache__/test_browser_processing.cpython-313.pyc create mode 100644 fireworks_detect/__pycache__/test_sensor_submission.cpython-313.pyc create mode 100644 fireworks_detect/bursts.py create mode 100644 fireworks_detect/migrations/0012_event_observation_duration_kind_and_more.py create mode 100644 fireworks_detect/migrations/0013_event_submitted_at.py create mode 100644 fireworks_detect/migrations/__pycache__/0012_event_observation_duration_kind_and_more.cpython-313.pyc create mode 100644 fireworks_detect/migrations/__pycache__/0013_event_submitted_at.cpython-313.pyc create mode 100644 staticfiles/vite/assets/frontend/src/entries/dashboard.js-C2DCho1J.js create mode 100644 staticfiles/vite/assets/frontend/src/entries/home.js-Cam3C1NX.js create mode 100644 staticfiles/vite/assets/frontend/src/entries/map.js-ZTK3kmoy.js create mode 100644 staticfiles/vite/assets/manual-report-44fwUW4y.js create mode 100644 staticfiles/vite/assets/manual-report-BTZbA1qV.css create mode 100644 staticfiles/vite/assets/map-CneBwLkV.css diff --git a/BURST_EVENTS.md b/BURST_EVENTS.md new file mode 100644 index 0000000..d6116ca --- /dev/null +++ b/BURST_EVENTS.md @@ -0,0 +1,11 @@ +# Burst Events + +A report with at least three `occurrences` is a Burst Event. `event_kind`, `is_burst`, `bangs_per_15_minutes`, and `burst_intensity` are derived properties on both PendingEvent and Event; they are never stored separately. One or two occurrences are ordinary reports. + +`captured_at` is the reported occurrence time for a manual report. PendingEvent `created_at` is its actual submission time; approval copies that value into Event `submitted_at`, while Event `approved_at` remains the approval time. Older Events have an unknown `submitted_at` because their original submission time cannot be reconstructed. `occurrence_time_approximate` records uncertainty about the reported time. No individual bang times are inferred from an aggregate report. + +`observation_duration_minutes` holds a window only when the reporter explicitly accepts an estimate, or when a future source provides a measured window. `observation_duration_kind` distinguishes `estimated` from `measured`; a blank kind or duration means intensity is unavailable. The quick form suggests 15 minutes and asks the reporter to accept that estimate. Existing records migrate with an unknown duration, preserving their counts without inventing an intensity. + +The normalised rate is `occurrences × 15 / observation_duration_minutes`. Provisional presentation bands live in `fireworks_detect/bursts.py`: light below 5, moderate from 5 to below 10, intense from 10 per 15 minutes. This describes **frequency, not loudness**. The map event JSON exposes the count, event kind, duration, duration kind, rate, intensity, and approximate-time flag for future timeline work. No timeline is rendered in this pass. + +Quick reports remain Pending until moderated. The browser can enhance the form, while the POST endpoint also accepts an ordinary server-rendered form submission with no microphone, classifier, or JavaScript. A reporter can correct the count and estimated duration before moderation through a session-scoped receipt form; each correction creates a ManualReportRevision. Corrections do not change the original occurrence or submission time. diff --git a/SENSOR_FIRMWARE_VALIDATION.md b/SENSOR_FIRMWARE_VALIDATION.md index afe28d8..76775b4 100644 --- a/SENSOR_FIRMWARE_VALIDATION.md +++ b/SENSOR_FIRMWARE_VALIDATION.md @@ -1,24 +1,32 @@ -# Waveshare firmware validation — concept archive +# Waveshare V2 firmware integration status -Reviewed `BoomCast_Waveshare_Arduino_v0.1.0-concept.zip` as supplied. The README targets the non-touch ESP32-S3-ePaper-1.54 **V2**, but the physical board revision has not been inspected. Waveshare states that V1 and V2 example programs are not interchangeable. Confirm the V2 marking on the PCB before flashing. The official V2 has 8 MiB PSRAM, 8 MiB flash, ES8311 codec, microphone, and microSD slot. The firmware's SDMMC pins 39/40/41 match Waveshare's published pinout for this board. +The owner has confirmed a non-touch Waveshare ESP32-S3-ePaper-1.54 V2 board. The firmware now lives at `../arduino/BoomCast_Waveshare_Arduino/`; that folder is currently **outside** the Django Git worktree (`django/`). Its sketch, build guide, source, pinned preparation script, local-config example, ignore rules, and hardware/API/checklist documents are there. -## Source review +The official Waveshare support was inspected at commit `aaf395c1bbd86f7c5b7a2f9f0401241ff5c44956`. The Arduino audio `board_cfg.h` and explicitly V2 ESP-IDF audio example agree on ES8311 I2S pins. The official Arduino SD example uses CLK/D0/CMD 39/40/41. The firmware uses those pins. Waveshare documents V2 as 8 MB flash and 8 MB PSRAM and says V1/V2 examples are not interchangeable. -- **Microphone and capture:** `boomcast_audio.cpp` uses Waveshare's `audio_bsp` wrapper and a 16 kHz stereo read, selecting the louder slot per frame for mono. That slot selection is a heuristic; verify actual channel mapping and recorded playback on the board. A 2.5-second PSRAM ring and 2.5-second post-trigger buffer make an intended 5-second capture. The detector uses RMS/peak thresholds and cooldown. The first capture after boot can contain less pre-roll. Return values from `audio_playback_read` are not checked, so failed or short reads could enter recordings. -- **WAV and storage:** `boomcast_queue.cpp` writes RIFF PCM mono 16-bit headers and a 16 kHz sample rate. Header arithmetic matches the intended sample count. The queue is on FAT microSD, but files are written directly to their final `.wav` names without a temporary file and atomic rename. Power loss or a full card can leave a truncated item that appears queued; `fwrite`, `fflush`, and `fclose` results are not checked. -- **Network and uploads:** `boomcast_network.cpp` reconnects Wi-Fi and starts NTP. `boomcast_uploader.cpp` sends a conventional multipart body with CRLF boundaries and a `file` part. It sends a Bearer header if a token is set. The current fields are `event_id`, `trigger_type`, optional `detected_at`, and `file`; this **does not satisfy** the new `/api/pending/` contract's `sensor_id`, `captured_at`, `duration_seconds`, or `firmware_version`. It still targets `/fireworks/classify/`. -- **TLS and credentials:** `TLS_ALLOW_INSECURE` defaults to true, and the HTTPS client has no CA certificate configured when it is false. `SENSOR_TOKEN` is in committed-style `boomcast_config.h`; move it into an ignored local header or provisioned NVS and configure a trusted CA before deployment. The setup AP also uses a fixed prototype password. -- **Retries and duplicate safety:** the SD item remains after non-2xx or transport failure, and filename-derived `event_id` is stable across retries. The main loop only calls the uploader after an explicit local UI sync request; it does not automatically drain the queue after reconnection. The uploader treats any 2xx response as success without parsing the submission ID or status, and deletes the file immediately. Add bounded retry scheduling with backoff, parse the JSON receipt, and delete only after a matching accepted or duplicate receipt. -- **Display and memory:** the ePaper shows capture and queue count, plus a transient upload message on the owner screen. It lacks distinct persistent queued, uploading, success, and failure indicators on the display. The upload path allocates the whole WAV plus multipart framing in PSRAM for each request; there is no measured heap or fragmentation data. Measure free and largest contiguous PSRAM before/after repeated uploads and Wi-Fi outages. +## Implemented in source -## Required firmware changes before an end-to-end trial +- Audio reads now check the codec return code, clear input buffers first, discard failed blocks, abort a capture after a read error, select one fixed microphone slot, and count read/recording errors. Capture duration uses the available pre-roll plus the requested post-roll; UTC capture-start and trigger timestamps are retained when time is valid. +- SD commits use checked WAV and sidecar writes, flush/fsync/close, WAV length/header validation, final renames, interrupted-commit recovery, a queue commit marker, oldest-first selection across the directory, an event-count cap, and a free-space reserve. Incomplete files are excluded from upload. +- Uploads stream file contents through `WiFiClientSecure` with a trusted CA, require HTTPS, send the actual `/api/pending/` fields, parse JSON receipts, verify the echoed event ID and submission ID, and retain files after ambiguous responses. Automatic retries use bounded exponential backoff and jitter. Source-embedded token placeholders were replaced with an ignored local header and optional NVS token; shared setup and management passwords were replaced with per-device NVS passwords. +- ePaper owner status reflects listening, recording, queue/offline, uploading, successful submission, retry failure, and audio error counters. +- Django now returns `event_id` in first and duplicate receipts and accepts an explicit `time_state=unknown` when the device clock was not synchronized. The same Pending Review and classifier pipeline remains in use. -1. Confirm the physical V2 revision and use its matching official support files. Do not copy Atom Echo GPIO assignments. -2. Point at `/api/pending/` and send `sensor_id`, stable `event_id`, UTC `captured_at`, measured `duration_seconds`, `firmware_version`, and `file`. Do not send a timestamp until NTP or the RTC is valid; preserve a reliable capture time with the queued file. -3. Configure CA-backed HTTPS and store the sensor token outside committed source. Reject HTTP on deployed builds. -4. Write queue items atomically, detect SD write errors, auto-retry with backoff, validate the JSON receipt, and retain files on ambiguous responses. -5. Show distinct recording, queued, uploading, success, and failure states; log I2S read failures and memory metrics. +## Verification performed -## Verification status +- Official Waveshare pin/support comparison at the pinned commit. +- The pinned `prepare_from_waveshare.sh` completed successfully against a checkout at that commit. +- Arduino CLI 1.5.1 compiled the sketch for ESP32-S3 with ESP32 core 3.3.0, 8 MB flash, OPI PSRAM, and the 8 MB partition scheme. The only emitted warnings were in copied Waveshare support and Espressif touch APIs. +- The `fireworks_detect` Django suite passed: 39 tests. Firmware-shaped unknown-time and receipt fields have focused backend tests. +- Firmware `.gitignore` patterns were checked for local credentials, copied support, and build artifacts. -Automated Django tests cover authenticated submission, storage, classification response handling, duplicate retry, invalid token/sensor/audio, conflict, and classifier outage. A temporary local Django instance was inspected with Playwright at desktop and 390 px mobile width; its Pending Review sensor detail rendered and showed no console errors. **No physical Waveshare board was flashed or tested.** Microphone fidelity, trigger timing, HTTPS certificate validation, firmware build, offline queue recovery, and on-device RAM stability remain hardware test items. Use a real recording and a controlled Wi-Fi outage for final acceptance. +## Still open + +- **Firmware compile passed; no flash was performed.** Arduino CLI 1.5.1 compiled the sketch with ESP32 core 3.3.0, Waveshare support at the pinned commit, LVGL 8.4.0, ArduinoJson 7.4.3, 8 MB flash, and OPI PSRAM. The build reports 1,350,599 bytes of program storage (40%) and 99,368 bytes of global dynamic memory (30%). Device runtime RAM use is unmeasured. +- **No physical V2 test was performed.** The fixed microphone slot, actual audio fidelity, short successful codec reads, ePaper refresh, SD power-cut behavior, TLS handshake, and offline recovery need the real board. +- Waveshare's codec API reports read success/failure but not a byte count; a successful short read cannot be detected through the current wrapper. +- FAT does not provide an atomic transaction spanning WAV and sidecar. Valid interrupted commits are recovered; incomplete/orphan files remain on SD for manual inspection rather than being uploaded or overwritten. +- The uploader currently runs synchronously in the main loop. During a slow HTTPS attempt, the local web UI and display update may pause. Verify this on hardware and move upload to a worker task if it affects usability or watchdog health. +- Arduino source is not tracked by the current Django Git repository. Decide on a project-wide repository or a dedicated firmware repository before relying on source control for deployment. + +See `../arduino/BoomCast_Waveshare_Arduino/docs/validation-checklist.md` for the pending physical acceptance checks. Do not treat this source review or the Django tests as hardware validation. diff --git a/SENSOR_SUBMISSION_API.md b/SENSOR_SUBMISSION_API.md index b43590e..ef05cb4 100644 --- a/SENSOR_SUBMISSION_API.md +++ b/SENSOR_SUBMISSION_API.md @@ -2,8 +2,10 @@ `POST /api/pending/` accepts `multipart/form-data` from an active, registered sensor. Send `Authorization: Bearer `. The token determines the sensor and owner; send the sensor's database ID in `sensor_id` as an assertion, never as authority. -Required parts: `file` (16-bit PCM mono WAV), `sensor_id`, `event_id` (1–100 ASCII letters, digits, `_` or `-`), `captured_at` (UTC ISO 8601 timestamp with offset or Unix seconds), `duration_seconds` (positive number matching the WAV within 0.1 seconds), and `firmware_version` (1–64 printable characters). Optional: `trigger_type` (short label), `signal_rms`, `signal_peak` (finite nonnegative numbers), and `latitude`/`longitude` (untrusted device claims, retained only as metadata). No client location is promoted to the trusted event location. +Required parts: `file` (16-bit PCM mono WAV), `sensor_id`, `event_id` (1–100 ASCII letters, digits, `_` or `-`), `captured_at` (UTC ISO 8601 timestamp with offset or Unix seconds, or omit it with `time_state=unknown` when the device clock was not synchronized), `duration_seconds` (positive number matching the WAV within 0.1 seconds), and `firmware_version` (1–64 printable characters). Optional: `trigger_type` (short label), `signal_rms`, `signal_peak` (finite nonnegative numbers), and `latitude`/`longitude` (untrusted device claims, retained only as metadata). No client location is promoted to the trusted event location. -WAV data must be PCM, mono, 16-bit, at 16 kHz, at most 25 MiB, and 0.1–30 seconds long. A successful first submission returns HTTP 201 with `submission_id`, `status: pending`, and classifier results. A repeat of the same `(sensor, event_id)` returns HTTP 200 with the same `submission_id` and `duplicate: true`; a different body with the same ID returns HTTP 409. Errors have `code` and `detail` fields. HTTP 429 means retry after the `Retry-After` interval. HTTP 502 means classification failed and the device should retain the queued clip. +WAV data must be PCM, mono, 16-bit, at 16 kHz, at most 25 MiB, and 0.1–30 seconds long. A successful first submission returns HTTP 201 with `event_id`, `submission_id`, `status: pending`, and classifier results. A repeat of the same `(sensor, event_id)` returns HTTP 200 with the same `event_id`, `submission_id`, and `duplicate: true`; a different body with the same ID returns HTTP 409. Errors have `code` and `detail` fields. HTTP 429 means retry after the `Retry-After` interval. HTTP 502 means classification failed and the device should retain the queued clip. The existing `/fireworks/classify/` route remains available for older clients. New firmware should use this contract. Pending audio stays behind the staff-only playback route and follows the existing accept/reject workflow and storage lifetime. + +`captured_at` means the start of the actual recorded WAV. Optional `capture_started_at`, `triggered_at`, and `queued_at` are UTC ISO 8601 timestamps; `time_state=unknown` leaves the database capture time null. A missing timestamp without that explicit state is invalid. diff --git a/fireworks_detect/__pycache__/admin.cpython-312.pyc b/fireworks_detect/__pycache__/admin.cpython-312.pyc index c492ecf9783999d4b2b461001d5ed74d2e11fb47..7a9ba43341b93487b98dbc2683fec4f8508cdba7 100644 GIT binary patch delta 3226 zcmaJ@eM}tJ5#P7>$sNb>aR;2ia2W8h$A>`#Vn-yxZi9_$@Kr-aD3bl8G*T4Dk*Zd%Tf6DiR+`jO6ZMbAjxE!w!CI?ItNu|%{l^N4R8>{g znYR?oLAuiZc6Mgo%)B@A=Dok??w+l<6A1Vuc>ekFN2lLZE>zT$_b$Y)hq5h+79y#B zHIUhsZB4WhNtSpeslD*;I&y%&-B-is8a#YnE_1|e0Y5}aB*6|@+AFEm3zAwxy{A`4 zITOmtka0QK5CU^YG!gKt*KU{K4DNc zn=)bjl4_pWL^iGEP5w^#@%95~>j=Uz09ey+;KytEQh7D4C#TXG%EowiV91REc8u$R z=v*Z`jz41v!oWCEhXAa|rv5}I4f^C{o-wLT(xjQr(qt-^WBS>2Hf2(F7zcYZ5T2P= zsa2NIwP``J=h5~FgaiV_8jwVkBI3djKOCy#Uk3U}FYl^}@ZpN)Cb71}9`pnZT9@Dx z{N;*0kk{W<{H=O}@Fc$xOwD0}#+8Z<$wB{Z2<-@8N9X~tLX)Rb+B8j0=`5QxX*LJ* zpv;5v5rirPF@=*zVT~|R1frt$<1a!#yoM=BWzvH5NR~n`IQXT?difDOQv{t^APzSKi&K+82LqW*llk@ey91OTP$>;I2k?YXdOl~VxP)u z`*dB2JjMUi+T;Ej>cxs>ZH$cm0O@K3FTy1N#kDrt^1hg-?3_VO%PXpSma6PBC>bsQ z*!lnKE*bv2_M5O~=eHjwM}ID?SWcB{=h%7=mgo5HBjcmvdms10uEPM!4eIHyFrVek z9oIzpDxs3M1Ek1hsA=SP;E#1)>iw<`{wgm?A9Xz^Lbmi$ABN(rJ$30Wlx2X!Qzs=Od2T&i1j zE|7#9zApHB&N&p171`{7+pR)lR@_#N&eGFqEtN^;sHUd1=?UD2p&WyQP|q95wMJ@K zL5-eS$B3+|t#9|#utKQ2f$J09i{Fg54GhCH{$Db>HjDaVXMNR=aNt^g#EG~ywPtQN z$k$FmRQ^6dVaI0n#47ZhN*T$Owwj|Xn>O$U@Dm)l>c;jmIE+kDK^wj7`ARSRC11nb zPuJOF;@t3-mR2h&iDoaV3Ik_ox3s=)ArIj#cn!R#KpS^Tp%e1_fd{qQ<_~_3rL^n@ z_yU2&usN_>#Y>&t#C-;7lP`9CtL`H~BHROjMlNJ``ABzr_%5>VAbgA<8vi{$-(A-q z!T%lrXc@LKWC&Zf7W@{>+7+irK#+x*YHQSv_jPw#QDzYE)WuqRS9`yP@B>}qy5>qkoT%U6(E zLPvf`WFF3c3_)DRSP|G8x}3OMST3Pf+CvxlJN;4e0slk)>nkU9aMP5PoYXfk25}NU zij{`y%HIyDU#XlVQjP&!L z4ff12%!nniE%0HlBJE{#I&Hw!!19ghD$R&WXX5@EN2UD;qIHU1B??OTUmw%IyhB-C z&1dK{>>n@!Z-&M=;3K%}l82K2Q>p7ysgoaka*NYkl1!d`agJ-en1XmK~D3{SmSsHS&R-J>oR}FFh>-H2?qr delta 2223 zcmZvde{54#6vy9v>#wzI$F}}hajvgyYxlar*cj}GQwDQ5*vfzbGnmkI>thtU7Vc|- z%|9q+Ge$IFoM^y*)IY=^!U#2pKtxSQjK;_k3FDcdi3!F?3<(+&|MH&u$`*%B`g!M` zbKkl5p8LJ`eRt&71CDR)cB{aCU)}$D-|vBGM>!du4$e4<5VOVX3IEu#T~$O71;w(j zXZjBrKrDk>Vu?ARyI?(;_t}D?@PZI4ofKkaa6)v$MN(+4&G+jR{XQp)xRly+1vs7{ zoYNn|E?Mt$QVe>Z42JRvz94>MIZNQ>so4~ab>l={3im~g7~#u;7H}Aj+n;7RX(fY9 zXa$@xoC-aK9z+TItB6VA=d$K(-&|=Z+dJp1JQk(_-Y2)$Xd@()OPdM^S&=(p_7GAB zCoGaJi184^LVogB-4%QqEzBp|sgFIVgzzJl!AjezH8=%|=CluNXH|-rJ4A5<0c1RvO9l%B}f+y%hD-16?yi2#ExdX8i!Bgj7z2FFw z1|Uu^xQcz1e3eA+x{7sGMTUGu=nmLcyq*>Ct>Rxwp9l`Z>r0|VxSY+hgO>@U)}^NP zINoybl=udpM-w+%Pd|tj?t{L~d@p;jiQwte%$O7&ih?sGqAt2o7olvJc|1um+s~ek zp#pfbWI!)tPwsxnB(d>@@e1@prp#A?HKhHBEr_iQvVrbJI}R7ieY!++{bhBLWMIafWEmM(2B+s zRgI1+k&Mcw+XTmbhsY3!QU`ej)=J$K!`R87Mh_{Pd0DOEn6A)?PS@ z8kC)jPO4^(j-=zMq)L~uFxME>wTVqLVnLr=5F_ZzAW(<=cxxs-3EhL9QA9Ul1H=6J zE@Tb`y$XavbGkAWI9Bfke_fOin69g@m@h8<0ACdu9+#sH?$!m5>Q!a#&9ZsXN*2$Z z-#axpATC_j&Ly-EZ?nHDGqB6mE#Gms&AQueb@a`;`?CFWcIl2iIBO5y3boJL+p`-U z8HmxvvxxLkF5Ix3m=0p1BxG0a_I%1s#B~OCf_Us2{I#;ibq(F0A+93$iMtLBjhC}ED$?m#qFy8n{c|G%Mg*{4?riYbiS{C!^p}Xk} zX~;cjN)Z!R#%hQ**XYW<0&g@+1$U5#Go95HE?MMVSyON7s_N?C7vu$BymFi7zP;>$s^UZ&&1orcH8{w@b-Z zQiwqd`$vkR&O_6rMUe(=Q#ffIv}}L$K!74>45RrWp+)U(ez;BQ0{&6NsM7;Ue{|-p zOv;jw3gXAvnR(xvotZa}uhG{R{davnj{txF`O>vB-w`kQTgWdjb-&qoxSh5qgtRy9 zJF@NY1GFO{upo(C`Z!9CvQTFe^Y=Je#o{L2sAdynoj%ahB5V`VjjckuY1%baTVtUj zUvShCiiW}1JS`4eaeF}+HopX#!$;D%6 zg>AO3jRE7f_vMHfV_&lvR)-N~AKIhrE7n+Z_?TQO%Y`XrPNn*kGN0G-YKgsKec2ZW zMw$Q+32kHJwk6Weerp?d#84k&L3^7c$;IlBJwnJp^@zht$b;2MXNr(P_KYjxNTGdz zz3M8EB=fu9C1dP8_o{j?Bc8LME_%A+?cjIWO2^QBKf*2m4YQO;Bxs8L)FTD?Ug$_4 z0uTf2)nJtE@(zAx0Cjs29z_rV44))r3bLkUltMw0E)#kHv>N8GJ?abkqHKC|lJ` zrc9|)$|#baFDjBeH%HZT`J${V^hsRoDnNL8Ijb1%f?CRPk$w@mWrSG-h}9+VC?S{= z{$pf_U1^H4xBT%oo>yY}?gU@W0)Y9)bu#tH`1COpL!1pEgMj6tysUgV-|KPIAv_2lZ4TgqaK|EqXRMW@HyXz)M{b0Z zm1CgUQnFMg;oJYLjqM9fnx%Za`eNuga**enXBYEqG-ygmQ>mmbloV=sGxD5XrbN>w^s6Xh!x;@lMbqS*B9)=1=_o72=ZVTbi0>xfV2Q+d z>}hneY4W^cIMc@u92ifhMc?YFWX~mDFwgUaYP5Zi^?`#(i-o&vsUO_?T4pa>?C5tK zM!#hBO2<5jy@YZjf(zjd0MUMLgNM6Xntu!$%?<$P{$A%TuwvIw;63Br$4UCve2HPp zDy8%EemcW>V&Bxnp@~Ool;BI>0x%rlo>#JTGx~GvYR_eFt#`!;v~GCGaLO4x^BV0! z7T%F&C*z|Nq2A5BKQz=`M7V%}1IcihBy<5a=MZ?iPoOjjuy!JqQHk(b_%MI+cV;)2 z+0Ep|fCc)uJX_4`I&WE)OZCQT1)#q`sddu-sYug8?~pctpatVU1@u(aE4GPNDeN!(oX8m*+jPy-Rv^jmxXbA`xOX4 zbQn!4&FAtZxggCcrEI>G!!s71qi}JlWlgG&NX-b8l!aBrLpU@wBU`;RH!%csSvHqX6YzH^P{iq^SeO8fm(XzTBlLlTRLsiG% zS>hN&s$FbhduKOK!TY#ot9f^x+I9bqH73_lDo|@ovCJv7f5!`H|aXl$A&O{k#f>KwHuM+w4c9 ztp{T$_95`W#it}rC9{t>FYm-!gBh;fMKxP4D0`@#2m<^I+J5HTnX>8E1)YuTyxOrG p?D#$D{K(=Z&EK_OPYkXk2JZ^+aMvnWy6&L*PK^C)XRi%O{|B#H0x4Qt{ivo(hh!rlaAd*%TWP-v36gKN)zPJ{+BekW4b6Xb49+)NW zpJhhBEHTldS+Xrz%#uBlo$p)89MMKOH6Z)!qSJ4{LaLBrAJ8U67 zAfyaV89gv-beY%8X+s5#qqf|z$`Er`8e$%J%~%HS5u3TL5E}|a2o^FJxR;lC`3}`Z zigaB>|1(gj;13?7*T2+WU$A?`hw_!Pd=&4P|0NCik1R!mtj}L54iVA__pPF(9$gy1 zX-g3ap10i~Ezo11Q@2CLo@DCA#_H8G#{O<9GH0oXwqQ&L!bS!v9$6GcS`VT__VJn` z8rv91PFl_WV8Z2vw;bzQ8_>{>(2Y>XKoewnI2BjbVI`H4S4&s0fFNvjzu zW}Ztcl;Q^FT6NBQt}e!wnw6X6#E53rotCsig(JSbdea)A$?4DE_C-l_GY=kBvT}~5 z)H#-Fj^Uh|&5UuK&MTd*(|Z4p!xR2Ak@D~O|0*U)mKB~w$m7OFC9pWTOz-6(GoP-Br*NP-Mnbi2Cq7}#XY~9)wi!r9@ zqXT=ZPwSI6o&UAEy{M)O(~1mcj0@BC5L4P=AlP8pj($@9<=`agIgPR#!HVz(1IfG) ztyw2>3O%MOSQrmu!za-lGTNuOZ(X z1}&P?Yq-1y!rF?O9kh~h~Emew}jf+`c1clP1D^EOvLQdBd+Bm>uQN`p2bL3 z`T~X?gGAGy|4S|+%%aVt+it>7O+oo4s=q?`8i9{B_ad4zp{hAWj*lngY$mCsX*qf{ zF<>{Yr$+_PJ|8z_>v*b1actQ*i?(A|km6rz8DrIDd}(O@@$*ItQaDamoWq-(!AE*Zfo4$2s^3Cg+cAFG>q+yn)NB2)7X)ccGu70pUE* zjXwxdVJU@a0uF4tPol7`wZWztXa$;Hhw0YJ4*ogkUqC(xoT;1{Je!D)JP|(anzd~# iGm=Xw?esUc#80T|hr6vI)8HM$AUNBu1KAujq5pqt(*%eB diff --git a/fireworks_detect/__pycache__/bursts.cpython-312.pyc b/fireworks_detect/__pycache__/bursts.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..034cb37bcdcaea128a015b136a6e814f6e393cd2 GIT binary patch literal 1051 zcmZuw&rcIU6n?X9*}{SqP@_U%0|8SoR8THrsE}5zk=D?Xn8svNIsYU`4Z1D4)ufPa~*2GV3YR_lkvP1XDp@C z#^OTyX_m{H=enR?zkHx!8tXVX>0UnN=xpVV11e zR!wZ!R*aVLz8zaLIeTaGO~;^2u%d|hoH|omHGDzRYe*`257xu>zNeLD}2wW0mKLv8fadShz-cszcn#T&u+8Qz1-*?f+XT@bDL z19Ih(gBI`a6<4Vvldd9K9_0G9&n`iqoQN+ipHd4%gK1ASEx{~@dEtspnFQd4%I5lp zhz5Kl-asmyOQy3)V|gK$G+ri`jpp10gTIGIJ2mJ2M8f2kog4zKl=LXk>=Q) k28^5xkMBEsZUY8ShQ{{kUZnv8e>wu>F*)lFlYYPKUp&qPcmMzZ literal 0 HcmV?d00001 diff --git a/fireworks_detect/__pycache__/bursts.cpython-313.pyc b/fireworks_detect/__pycache__/bursts.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..c2fe01cc027f24a3a5466c48ca2c49665a0a202b GIT binary patch literal 1066 zcmZuwPfrt35TD)t*}_sQts1oiHXvw0s6=}yh6-ubs%#D0CMGr6l zD~x~2b%dE83oGqZuC3%dseCsSITgeE$&NUA6h0PbK3CdHtDU*jv6yOmQ$37>i?Nl_ zasb7_HUPZh5`!5Se1R{!NEZ0w`CO7;2l#TRWfOAgT+3HHF|X_hx?vN;B2J)gYJ@f6 z_-cA($Bud2Zk%XV&SzvLqi(L{GwRFCrn;P9Fc(J`h9^?~abpxaG)4YlL=S#e}7I2Et%S3BbUR=O*QANLSAJimwLJHmW7blv@5 z=m-nl(2cGbrk5~Aj*U2is%mCgRUJX=udcfZbOg=LbUO2Rt?(kRW|Vw(1N%v<=>k@s z&B?=-=oNIN5ysds-I~6Do4sFk;2{EqZ)ufA(axq}C6N8`a2$66x!(}|8IH6<-Pzl1 km_C`BJF*V<+Awi4IeVlX*4q&M>-TVvxZYTRi@0h30oz#oWdHyG literal 0 HcmV?d00001 diff --git a/fireworks_detect/__pycache__/models.cpython-312.pyc b/fireworks_detect/__pycache__/models.cpython-312.pyc index bcff490c04ae52f7d9482e16ec7d196805584ee9..d53d28a28842c6ef8cbbddfe9deac8b53819a575 100644 GIT binary patch delta 5301 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 delta 2163 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 diff --git a/fireworks_detect/__pycache__/test_browser_processing.cpython-313.pyc b/fireworks_detect/__pycache__/test_browser_processing.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b58c52ed799f360a268e797e7962e257704a7a44 GIT binary patch literal 16460 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 HSNMMb`>mL0 literal 0 HcmV?d00001 diff --git a/fireworks_detect/__pycache__/test_sensor_submission.cpython-313.pyc b/fireworks_detect/__pycache__/test_sensor_submission.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fe22ae983375eeaffdcb570f935a1445f453a4ff GIT binary patch literal 11365 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 z

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 literal 0 HcmV?d00001 diff --git a/fireworks_detect/__pycache__/tests.cpython-313.pyc b/fireworks_detect/__pycache__/tests.cpython-313.pyc index fb2016aee50d9aaf48ca75b8b7a76d8e09768d4f..8542961621c7fb5c9cbe06f4fbb7ff5c248ce382 100644 GIT binary patch delta 13160 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 delta 5325 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 delta 343 zcmdnMyNE~qG%qg~0}!-6JCW7S%E0g##DM`JDC2Xdwto-ztf?qd#_ ztj@BQQDpK}mXyhMtSJVnKqVk$#czSc2WCb_#=8tM-&q70nZ7fi5FbI@4=R%{u~tov SX7l2f<>zN=;au}UpV z%`1t|OtI64Xw$zX3f1q)yq8gQGCNBOQ<2Ez43=~Qb)a1!`-=Yni4V+-jEr{~WWKWq uGBSN|h1c>#W=M(!e2pa}riLtdQ# delta 315 zcmcb{bByxHi;FYUD&rGNQ!?{!@q_r2 zI~Z3^_G5a=C^*@KIb`x#=CzC>ldD-$CO=_GF;E3+1ZggQ3nV@;Gcq#XWsv#KBEZP> godJdT2;zQFnOwnIHJOpki(8hTpQ(|%NExUN01-<@qyPW_ diff --git a/fireworks_detect/__pycache__/views.cpython-312.pyc b/fireworks_detect/__pycache__/views.cpython-312.pyc index 5e54ef5d504f17067f4a94f90429eac306a6c26b..fec4f319e745e333e74cc6e84b07f9b5bbddc4ab 100644 GIT binary patch delta 15338 zcmb7r33yw_dEk2wHvtel03HAj@Fpmp5_OU~cvGToQWteV5Fbc_2S5!#QIbJ}O5B)Q zE4JKmYAIG?IdK~~W?i{z6QxNLxpopK*(89-EhwzkN9=Uhu6G65ij&B-z5hQC04YW3 zxBF!NnEB_QfBu;_@4sgJ?%xVud`C$BgRSctETMcu=eXcu4FJYaiiz z?I@s9%opnh1o|r>zu_>Gxb7Z_mn|@lOWx}c>w(P?aXG*~X_mBHRuB*$(0}Cv`a8u{ z(6j#m)TRH^%j@#E>C?*c9-BO3Xx_E6yT`s|<5qif z)7FmeNMUPRd(*DXJ@&Tlo{d|YdfHm;t-E$M^=#a>6{&Xhv~@=eN5+ZQXLq@MPPf

4f})$V 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¥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 delta 9805 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 ULFOub)G}jY4eJ^9%D*lB56clti2wiq diff --git a/fireworks_detect/admin.py b/fireworks_detect/admin.py index 47c0e9d..8057b62 100644 --- a/fireworks_detect/admin.py +++ b/fireworks_detect/admin.py @@ -10,7 +10,7 @@ from django.urls import path, reverse from django.utils.html import format_html from django.utils.translation import gettext as _, gettext_lazy, ngettext -from .models import BrowserProcessingSettings, ClassificationRule, Event, PendingEvent, Sensor +from .models import BrowserProcessingSettings, ClassificationRule, Event, ManualReportRevision, PendingEvent, Sensor from . import views as classifier_views @@ -49,11 +49,11 @@ class BrowserProcessingSettingsAdmin(admin.ModelAdmin): class ClassificationAdmin(admin.ModelAdmin): - list_display = ("original_filename", "source_type", "sensor", "occurrences", "location", "visually_confirmed", "primary_label", "primary_score", "duration", "created_at") + list_display = ("original_filename", "source_type", "sensor", "occurrences", "event_kind", "observation_duration_minutes", "location", "visually_confirmed", "primary_label", "primary_score", "duration", "created_at") list_filter = ("source_type", "visually_confirmed", "created_at") search_fields = ("original_filename",) readonly_fields = ("audio_file", "sensor", "h3_cell", "direction_display", "direction_accuracy_degrees", "original_filename", "created_at", "pretty_classifier_response") - fields = ("audio_file", "sensor", "source_type", "occurrences", "location", "latitude", "longitude", "h3_cell", "direction_display", "direction_accuracy_degrees", "visually_confirmed", "original_filename", "created_at") + fields = ("audio_file", "sensor", "source_type", "occurrences", "observation_duration_minutes", "observation_duration_kind", "occurrence_time_approximate", "location", "latitude", "longitude", "h3_cell", "direction_display", "direction_accuracy_degrees", "visually_confirmed", "original_filename", "created_at") change_form_template = "admin/fireworks_detect/classification_audio_change_form.html" @admin.display(description=gettext_lazy("Direction")) @@ -149,13 +149,28 @@ class PendingEventAdmin(ClassificationAdmin): @admin.register(Event) class EventAdmin(ClassificationAdmin): - readonly_fields = ClassificationAdmin.readonly_fields + ("approved_at",) - fields = ClassificationAdmin.fields + ("approved_at",) + readonly_fields = ClassificationAdmin.readonly_fields + ("submitted_at", "approved_at") + fields = ClassificationAdmin.fields + ("submitted_at", "approved_at") def has_add_permission(self, request): return False +@admin.register(ManualReportRevision) +class ManualReportRevisionAdmin(admin.ModelAdmin): + list_display = ("original_pending_id", "previous_occurrences", "new_occurrences", "previous_duration_minutes", "new_duration_minutes", "changed_at") + readonly_fields = list_display + + def has_add_permission(self, request): + return False + + def has_change_permission(self, request, obj=None): + return False + + def has_delete_permission(self, request, obj=None): + return False + + @admin.register(Sensor) class SensorAdmin(admin.ModelAdmin): list_display = ("name", "owner", "is_active", "heartbeat_light", "last_heartbeat", "last_submission", "token_prefix", "archived_at") diff --git a/fireworks_detect/bursts.py b/fireworks_detect/bursts.py new file mode 100644 index 0000000..5979eca --- /dev/null +++ b/fireworks_detect/bursts.py @@ -0,0 +1,25 @@ +"""Derived burst presentation rules; rates describe frequency, not loudness.""" + +from decimal import Decimal + +BURST_MIN_BANGS = 3 +DEFAULT_ESTIMATED_DURATION_MINUTES = 15 +MODERATE_RATE_PER_15_MINUTES = Decimal("5") +INTENSE_RATE_PER_15_MINUTES = Decimal("10") + + +def burst_rate(bang_count, duration_minutes): + if bang_count < BURST_MIN_BANGS or not duration_minutes or duration_minutes <= 0: + return None + return Decimal(bang_count) * 15 / Decimal(duration_minutes) + + +def burst_intensity(bang_count, duration_minutes): + rate = burst_rate(bang_count, duration_minutes) + if rate is None: + return None + if rate >= INTENSE_RATE_PER_15_MINUTES: + return "intense" + if rate >= MODERATE_RATE_PER_15_MINUTES: + return "moderate" + return "light" diff --git a/fireworks_detect/migrations/0012_event_observation_duration_kind_and_more.py b/fireworks_detect/migrations/0012_event_observation_duration_kind_and_more.py new file mode 100644 index 0000000..39c9835 --- /dev/null +++ b/fireworks_detect/migrations/0012_event_observation_duration_kind_and_more.py @@ -0,0 +1,57 @@ +# Generated by Django 6.1.1 on 2026-10-09 23:43 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fireworks_detect', '0011_event_captured_at_event_device_metadata_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='observation_duration_kind', + field=models.CharField(blank=True, choices=[('estimated', 'Estimated'), ('measured', 'Measured')], max_length=10), + ), + migrations.AddField( + model_name='event', + name='observation_duration_minutes', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='event', + name='occurrence_time_approximate', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='pendingevent', + name='observation_duration_kind', + field=models.CharField(blank=True, choices=[('estimated', 'Estimated'), ('measured', 'Measured')], max_length=10), + ), + migrations.AddField( + model_name='pendingevent', + name='observation_duration_minutes', + field=models.PositiveSmallIntegerField(blank=True, null=True), + ), + migrations.AddField( + model_name='pendingevent', + name='occurrence_time_approximate', + field=models.BooleanField(default=False), + ), + migrations.CreateModel( + name='ManualReportRevision', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('original_pending_id', models.PositiveBigIntegerField()), + ('previous_occurrences', models.PositiveIntegerField()), + ('new_occurrences', models.PositiveIntegerField()), + ('previous_duration_minutes', models.PositiveSmallIntegerField(blank=True, null=True)), + ('new_duration_minutes', models.PositiveSmallIntegerField(blank=True, null=True)), + ('changed_at', models.DateTimeField(auto_now_add=True)), + ('pending_event', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='fireworks_detect.pendingevent')), + ], + ), + ] diff --git a/fireworks_detect/migrations/0013_event_submitted_at.py b/fireworks_detect/migrations/0013_event_submitted_at.py new file mode 100644 index 0000000..9a2ac98 --- /dev/null +++ b/fireworks_detect/migrations/0013_event_submitted_at.py @@ -0,0 +1,18 @@ +# Generated by Django 6.1.1 on 2026-10-09 23:51 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fireworks_detect', '0012_event_observation_duration_kind_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='submitted_at', + field=models.DateTimeField(blank=True, null=True), + ), + ] diff --git a/fireworks_detect/migrations/__pycache__/0012_event_observation_duration_kind_and_more.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0012_event_observation_duration_kind_and_more.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..02e191d58bf926e8fd2b6bb50dcecde2d1c36637 GIT binary patch literal 2730 zcmb_e&2JM&6yIHc8z(Og=oCoWY`+I!#b+941VQnj``JM-rE-kab1nDusF zUzCH-#mBE!eu{A1AI_rt33MjgMVLI}Bu?UQbCidta9gL2HZxC|%xj&hQJ z!B=vvbq#pW3qJ2j165uOym1zDqQIgxwMu1E)rrA^HC@4)QSpG@IMi8eUjqGS+=A$&XkGNU?(O z3H?6MPxaLAmkt;BeYNBN3x~M$-#EmjgK-$_$uc1&Ap+ez?t(y$0`TpZj!3D3|GXd# z0Pg56KxdlaE_7yq83fF+PhipqzzhLq->ibK;R9ff0%o+=d4SnSfd?zc05Sd%L|`FN z%I@7O_4kmS>LHuhE0c~(qfRvQVQH)&72oL>0MiHYiq*Y<46HZmJcGYS@$&*_4q?6jakGW&u}&4eN^r zrcJk>k<#!Q8?CBDnFntXY?x|IHnGAYH@Z`hhih0i97ilX+nK#_ZV=JO0*jhVR#~XB ztb=0%t_%4g(lDu-%di`DFAPNF8fJcX3@oWwQ`oVd=cuWqVPZoRXacN*Mnlush+e5Q zD8&SL!RauP>vgI>bkA87c@|RelHAZt7OP{TsHEyKP0h-rA!{XE*Qr^8uo!TKF+o+B zFf%RsSxj!2I;v3Y(mhnCV34k(RlLq35F%C9)JK@bnwT!?2KFc%(WzQhiL9ZHD+K0J zbqdz?hJoH4)L@4RUVBe4yaU?_dxtJdIoLhYXk}RjGEQ=VrFUGSuOV4cSYOw_%k|Om z533}%I~1bd4JUOvoJDj3m83x}F~QU!(gTh(=w`+E1#bK_3nP~;LM)1)c$9{QVID*1 zJBX)~L|7e02z(l*rV>naXIsIJPsoyr4eGo~Soo@<6rF5Szw7z>vP|7I8@{U>s;M@y zRFgGrhM2gDJ6o}9x~^fFc)&x~-TcftuN@Y)(!8y7*9J)6vykd;yeI9OhCI(h z`FPsVA~c0sCAT5nL1hI3tusMcWMMZpPNjsU8}n$ceCG~}>UG?G0}dc$n9w~H$cjnT zMWS+=U2cyfr2vC6_T&7o69=Mdv5X{<|_a01)GQ7p6qmT&jxWC zb*HCu^>rEqpYGt?7sj7F$Nk7{1-Zyq{FYBh1;4+u73CsF?C?lCJhGV{-AtU>Ob*$} zOgov`NLgQ$ta;74ShF5IZY7_*4f!L{5Ak^yKiN)BzDT{CZY5`WqH-?kWIK6s1Gkdr z_hL@|OV5BmfM-DM<9W0l2Ew2Jo)~!Aw9}{C>C-R#zh2(-vo}yYtpP)Dj<9ad|Uw{O6`UHq{=RdYNjCc^1c?pRzMk?ab7R?8|wp ze9tc5ZZv|K+?h9LqNUHyBAO?B5awZx4 z;TE0l7JwLJ!(N5ul*OF)M=jT_W_sDF&B)Ha+n{b+dKKiv{ l&KQGX%g6Klc97#w{KifE6`bUQPos7`+lpuZ=3wC(_y_Tc&td=o literal 0 HcmV?d00001 diff --git a/fireworks_detect/migrations/__pycache__/0013_event_submitted_at.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0013_event_submitted_at.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3e35860560cdadf61aebe0b834e97e2394568f55 GIT binary patch literal 833 zcmZuw&ubGw6rR~%*1h?+w;;3YV0veR_a-Pt%hsq`QS zf@d%NAN1zYf5BsWNtvs7=q(b(t8aE2QpACo{l0ng-hS^JW>%}Y2*!`M--cf>Lf;jc z5Az(%wgDWW00sCNYGICB8rN>4WpoDx+6@%wUA$w>lNR5HdWpF{Fg){25l@qD8V`6V z;*90eO0$S2d4G|EkaJFEuK*mOF5);qTnjMQ1I@?W=$bp#iwPwLDSBXZD?9c7#>~JB ztW7PbZ0b1ci|3Kw-0&glu0LY@8&X4nC;f2@6vSdulaz zW12*tQQNyDZBj%CkuHI<(Kw-itAxBBhlx53>@p#sH5WjJ?Um6I=_o+gyaGm>w{du2M-^ddw9{9_0b_$#utkM`4%i6(9}Xs8&7rZ zs`c*q)J4vfiQPQ0o2S=TPM2<-HkK!iwUfr$r_NX7xbf&`#c= BURST_MIN_BANGS + + @property + def event_kind(self): + return "burst" if self.is_burst else "ordinary" + + @property + def bangs_per_15_minutes(self): + from .bursts import burst_rate + if not self.observation_duration_kind: + return None + return burst_rate(self.occurrences, self.observation_duration_minutes) + + @property + def burst_intensity(self): + from .bursts import burst_intensity + if not self.observation_duration_kind: + return None + return burst_intensity(self.occurrences, self.observation_duration_minutes) + + @property + def burst_intensity_display(self): + return {"light": _("Light"), "moderate": _("Moderate"), "intense": _("Intense")}.get(self.burst_intensity) + @property def predictions(self): @@ -229,6 +267,7 @@ class PendingEvent(ClassifiedAudio): @transaction.atomic def approve(self): event = Event.objects.create( + submitted_at=self.created_at, audio_file=self.audio_file.name, sensor=self.sensor, captured_at=self.captured_at, @@ -238,6 +277,9 @@ class PendingEvent(ClassifiedAudio): classifier_response=self.classifier_response, source_type=self.source_type, occurrences=self.occurrences, + observation_duration_minutes=self.observation_duration_minutes, + observation_duration_kind=self.observation_duration_kind, + occurrence_time_approximate=self.occurrence_time_approximate, location=self.location, latitude=self.latitude, longitude=self.longitude, @@ -261,12 +303,25 @@ class Event(ClassifiedAudio): """A reviewed classification that is safe to appear in the event feed.""" approved_at = models.DateTimeField(auto_now_add=True) + submitted_at = models.DateTimeField(null=True, blank=True) class Meta(ClassifiedAudio.Meta): verbose_name = _("Event") verbose_name_plural = _("Events") +class ManualReportRevision(models.Model): + """Record edits to a session-owned manual Pending report.""" + + pending_event = models.ForeignKey(PendingEvent, null=True, blank=True, on_delete=models.SET_NULL) + original_pending_id = models.PositiveBigIntegerField() + previous_occurrences = models.PositiveIntegerField() + new_occurrences = models.PositiveIntegerField() + previous_duration_minutes = models.PositiveSmallIntegerField(null=True, blank=True) + new_duration_minutes = models.PositiveSmallIntegerField(null=True, blank=True) + changed_at = models.DateTimeField(auto_now_add=True) + + class SensorSubmission(models.Model): """Durable idempotency receipt, retained after moderation.""" diff --git a/fireworks_detect/templates/fireworks_detect/event_detail.html b/fireworks_detect/templates/fireworks_detect/event_detail.html index c62cafb..6e34feb 100644 --- a/fireworks_detect/templates/fireworks_detect/event_detail.html +++ b/fireworks_detect/templates/fireworks_detect/event_detail.html @@ -1,9 +1,13 @@ {% load i18n %} {% if event.source_type == "manual" %} -

{% trans "Manual fireworks report" %}

+

{% if event.is_burst %}{% trans "Burst Event" %}{% else %}{% trans "Manual fireworks report" %}{% endif %}

{% blocktrans with date=event.approved_at|date:"j M Y, H:i" %}Approved {{ date }} · Reported manually{% endblocktrans %}

{% trans "Report details" %}

{% trans "Occurrences" %}{{ event.occurrences }}
+
{% trans "Occurred" %}{% if event.occurrence_time_approximate %}{% trans "Approximately" %} {% endif %}{{ event.captured_at|date:"j M Y, H:i"|default:"Unknown" }}
+
{% trans "Submitted" %}{% if event.submitted_at %}{{ event.submitted_at|date:"j M Y, H:i" }}{% else %}{% trans "Unknown" %}{% endif %}
+{% if event.is_burst %}
{% trans "Duration" %}{% if event.observation_duration_minutes %}{{ event.observation_duration_minutes }} {% if event.observation_duration_kind == "estimated" %}{% trans "minutes (estimated)" %}{% else %}{% trans "minutes (measured)" %}{% endif %}{% else %}{% trans "Unknown" %}{% endif %}
+
{% trans "Intensity" %}{% if event.burst_intensity %}{{ event.burst_intensity_display }} · {{ event.bangs_per_15_minutes|floatformat:1 }} {% trans "bangs per 15 minutes" %}{% else %}{% trans "Not rated" %}{% endif %}
{% endif %}
{% trans "Location" %}{{ event.location|default:"Not recorded" }}
{% trans "Captured location" %}{{ event_h3_cell|default:"Not recorded" }}
{% trans "Direction" %}{{ event.direction_display }}
diff --git a/fireworks_detect/templates/fireworks_detect/events_list.html b/fireworks_detect/templates/fireworks_detect/events_list.html index d61dde4..3323d78 100644 --- a/fireworks_detect/templates/fireworks_detect/events_list.html +++ b/fireworks_detect/templates/fireworks_detect/events_list.html @@ -5,7 +5,7 @@ {% if event.source_type == "manual" %} {% trans "Manual report" %} - {% trans "Manual fireworks report" %}
+ {% if event.is_burst %}{% trans "Burst Event" %}{% else %}{% trans "Manual fireworks report" %}{% endif %}
{% blocktrans count count=event.occurrences %}{{ count }} occurrence{% plural %}{{ count }} occurrences{% endblocktrans %}{% if event.location %} · {{ event.location }}{% endif %} {% else %} {% trans "Sensor classification" %} diff --git a/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html b/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html index e747dd8..bde7f6c 100644 --- a/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html +++ b/fireworks_detect/templates/fireworks_detect/includes/manual_report_form.html @@ -20,6 +20,12 @@ +
+ +
+ + {% trans "Leave the time empty to use the submission time." %} +
@@ -28,6 +34,13 @@
+

{% trans "Ordinary report" %}

+
+
+ + + + {% trans "Optional. Without an accepted window, BoomCast reports the count without an intensity rating." %}
{% include "fireworks_detect/includes/manual_direction_panel.html" %} @@ -55,7 +68,7 @@ - +
diff --git a/fireworks_detect/templates/fireworks_detect/includes/map_panel.html b/fireworks_detect/templates/fireworks_detect/includes/map_panel.html index 6c37702..d2c94f8 100644 --- a/fireworks_detect/templates/fireworks_detect/includes/map_panel.html +++ b/fireworks_detect/templates/fireworks_detect/includes/map_panel.html @@ -1,8 +1,8 @@ {% load i18n %} -
-
{% trans "Manual reports · privacy-preserving H3 cells" %} {% blocktrans with resolution=h3_resolution %}H3 resolution {{ resolution }} · sensor layer disabled{% endblocktrans %}
-
- +
+
{% trans "Reviewed reports · privacy-preserving H3 cells" %} {% blocktrans with resolution=h3_resolution %}H3 resolution {{ resolution }}{% endblocktrans %}
+
+
{{ h3_cells|json_script:"h3-cells-data" }} diff --git a/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html b/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html index fe56eff..9c23088 100644 --- a/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html +++ b/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html @@ -6,12 +6,24 @@

{{ error }}

{% else %} - {% trans "Report received!" %} + {% if updated %}{% trans "Report updated!" %}{% else %}{% trans "Report received!" %}{% endif %}

{% trans "Thank you. Your report helps map fireworks nearby." %}

- {{ pending.created_at|date:"H:i" }} · + {% if pending.occurrence_time_approximate %}{% trans "Approximately" %} {% endif %}{{ pending.captured_at|date:"j M Y, H:i" }} · {% blocktrans count count=pending.occurrences %}{{ count }} occurrence{% plural %}{{ count }} occurrences{% endblocktrans %} - {% if direction_label %} · {{ direction_label }} {{ pending.direction_degrees|floatformat:0 }}°{% endif %} + {% if pending.direction_degrees is not None %} · {{ direction_label|default:pending.direction_cardinal }} {{ pending.direction_degrees|floatformat:0 }}°{% endif %}

+

{% if pending.is_burst %}{% trans "Burst Event" %}{% else %}{% trans "Ordinary report" %}{% endif %} · {% trans "Submitted" %} {{ pending.created_at|date:"j M Y, H:i" }}

+ {% if pending.is_burst %}

{% trans "Duration" %}: {% if pending.observation_duration_minutes %}{{ pending.observation_duration_minutes }} {% trans "minutes (estimated)" %}{% else %}{% trans "Unknown" %}{% endif %}

+

{% trans "Intensity" %}: {% if pending.burst_intensity %}{{ pending.burst_intensity_display }} ({{ pending.bangs_per_15_minutes|floatformat:1 }} {% trans "bangs per 15 minutes" %}){% else %}{% trans "Not rated" %}{% endif %}

{% endif %} + {% if editable %}
+ {% csrf_token %} + + + + + + +
{% endif %} {% endif %}
diff --git a/fireworks_detect/templates/fireworks_detect/map.html b/fireworks_detect/templates/fireworks_detect/map.html index fd60c30..101d6d1 100644 --- a/fireworks_detect/templates/fireworks_detect/map.html +++ b/fireworks_detect/templates/fireworks_detect/map.html @@ -14,12 +14,12 @@ {% include "fireworks_detect/includes/navigation.html" with active_page="map" %}
-

{% trans "Manual report intelligence" %}

{% trans "Sound activity map." %}

-

{% trans "Reviewed manual reports with a captured location appear as their H3 cell, not their precise coordinates. Saved phone compass readings show the reported direction of the sound." %}

+

{% trans "Reviewed sound reports" %}

{% trans "Sound activity map." %}

+

{% trans "Reviewed reports with a stored location appear at their H3 cell centre, not their precise coordinates. Sensor events use only saved event locations; device-reported coordinates are not trusted for this map." %}

-
+
diff --git a/fireworks_detect/test_sensor_submission.py b/fireworks_detect/test_sensor_submission.py index a9475ef..f0740bb 100644 --- a/fireworks_detect/test_sensor_submission.py +++ b/fireworks_detect/test_sensor_submission.py @@ -44,11 +44,18 @@ class SensorSubmissionTests(TestCase): def test_authenticated_upload_is_classified_and_retry_is_idempotent(self): response_body = io.BytesIO(json.dumps({"predictions": [{"class": "Fireworks", "score": 0.8}], "duration_seconds": 1}).encode()) with TemporaryDirectory() as media, override_settings(MEDIA_ROOT=media), patch("fireworks_detect.views.urlopen", return_value=response_body) as classify: - first = self.submit(trigger_type="audio_spike", latitude="52.1") + first = self.submit( + trigger_type="audio_spike", latitude="52.1", + capture_started_at="2026-10-09T10:00:00Z", + triggered_at="2026-10-09T10:00:02Z", + queued_at="2026-10-09T10:00:05Z", + ) second = self.submit() self.assertEqual(first.status_code, 201) self.assertEqual(second.status_code, 200) self.assertEqual(first.json()["submission_id"], second.json()["submission_id"]) + self.assertEqual(first.json()["event_id"], "device-event-1") + self.assertEqual(second.json()["event_id"], "device-event-1") self.assertEqual(PendingEvent.objects.count(), 1) self.assertEqual(SensorSubmission.objects.count(), 1) self.assertEqual(classify.call_count, 1) @@ -57,8 +64,17 @@ class SensorSubmissionTests(TestCase): self.assertEqual(pending.source_type, "sensor") self.assertFalse(pending.latitude) self.assertEqual(pending.device_metadata["latitude"], "52.1") + self.assertEqual(pending.device_metadata["triggered_at"], "2026-10-09T10:00:02Z") self.assertTrue(pending.audio_file.storage.exists(pending.audio_file.name)) + def test_unknown_capture_time_is_explicit_and_retained(self): + response_body = io.BytesIO(json.dumps({"predictions": [], "duration_seconds": 1}).encode()) + with TemporaryDirectory() as media, override_settings(MEDIA_ROOT=media), patch("fireworks_detect.views.urlopen", return_value=response_body): + response = self.submit(captured_at="", time_state="unknown") + self.assertEqual(response.status_code, 201) + self.assertIsNone(PendingEvent.objects.get().captured_at) + self.assertEqual(PendingEvent.objects.get().device_metadata["time_state"], "unknown") + def test_pending_admin_shows_sensor_details(self): staff = get_user_model().objects.create_superuser("reviewer-sensor", password="test") pending = PendingEvent.objects.create(sensor=self.sensor, source_type="sensor", original_filename="event.wav", classifier_response={"predictions": [{"class": "Fireworks", "score": 0.8}]}, firmware_version="0.1.0-concept", device_metadata={"trigger_type": "audio_spike"}) diff --git a/fireworks_detect/tests.py b/fireworks_detect/tests.py index 6e8646d..d7fad67 100644 --- a/fireworks_detect/tests.py +++ b/fireworks_detect/tests.py @@ -14,7 +14,8 @@ from django.urls import reverse from django.utils import timezone from .h3_utils import cell_from_coordinates, h3_resolution -from .models import ClassificationRule, Event, PendingEvent +from .models import ClassificationRule, Event, ManualReportRevision, PendingEvent +from .bursts import burst_intensity, burst_rate class ClassificationRuleApiTests(TestCase): @@ -88,6 +89,114 @@ class ManualPendingEventTests(TestCase): self.assertContains(response, 'data-result="error"', status_code=400) self.assertFalse(PendingEvent.objects.exists()) + def test_burst_boundaries_and_intensity_rates(self): + for count, duration, category in ((1, 15, None), (2, 15, None), (3, 15, "light"), (10, 15, "intense"), (10, 30, "moderate"), (10, 60, "light")): + with self.subTest(count=count, duration=duration): + pending = PendingEvent(occurrences=count, observation_duration_minutes=duration, observation_duration_kind="estimated") + self.assertEqual(pending.is_burst, count >= 3) + self.assertEqual(pending.burst_intensity, category) + self.assertEqual(burst_rate(10, 30), Decimal("5")) + self.assertEqual(burst_intensity(10, None), None) + + def test_server_rendered_quick_report_with_estimated_duration_and_approximate_time(self): + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), { + "occurrences": "10", "occurred_at": "2026-10-09T20:30", "time_approximate": "on", + "duration_minutes": "30", "duration_confirmed": "on", + }) + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Burst Event") + self.assertContains(response, "Moderate") + pending = PendingEvent.objects.get() + self.assertEqual(pending.occurrences, 10) + self.assertEqual(pending.observation_duration_minutes, 30) + self.assertEqual(pending.observation_duration_kind, "estimated") + self.assertTrue(pending.occurrence_time_approximate) + self.assertNotEqual(pending.captured_at, pending.created_at) + self.assertEqual(pending.bangs_per_15_minutes, Decimal("5")) + reviewed = pending.approve() + self.assertEqual(reviewed.observation_duration_minutes, 30) + self.assertEqual(reviewed.captured_at, pending.captured_at) + self.assertEqual(reviewed.submitted_at, pending.created_at) + + def test_unaccepted_window_has_no_intensity_and_legacy_burst_stays_compatible(self): + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), {"occurrences": "3", "duration_minutes": "15"}) + self.assertEqual(response.status_code, 200) + pending = PendingEvent.objects.get() + self.assertTrue(pending.is_burst) + self.assertIsNone(pending.observation_duration_minutes) + self.assertIsNone(pending.burst_intensity) + old = Event.objects.create(occurrences=10, original_filename="old report", classifier_response={}, source_type="manual") + self.assertTrue(old.is_burst) + self.assertIsNone(old.burst_intensity) + + accepted = self.client.post(reverse("fireworks_detect:submit_manual_pending"), { + "occurrences": "3", "duration_confirmed": "on", + }) + self.assertEqual(accepted.status_code, 200) + self.assertEqual(PendingEvent.objects.latest("pk").observation_duration_minutes, 15) + + measured = Event.objects.create(occurrences=10, original_filename="measured", classifier_response={}, + observation_duration_minutes=30, observation_duration_kind="measured") + self.assertEqual(measured.burst_intensity, "moderate") + self.assertEqual(measured.observation_duration_kind, "measured") + + def test_session_scoped_count_edits_recalculate_and_preserve_original_time(self): + self.client.post(reverse("fireworks_detect:submit_manual_pending"), { + "occurrences": "2", "occurred_at": "2026-10-09T20:30", + }) + pending = PendingEvent.objects.get() + occurred_at, submitted_at = pending.captured_at, pending.created_at + url = reverse("fireworks_detect:update_manual_pending", args=[pending.pk]) + response = self.client.post(url, {"occurrences": "3", "duration_minutes": "15", "duration_confirmed": "on"}) + self.assertEqual(response.status_code, 200) + pending.refresh_from_db() + self.assertEqual(pending.burst_intensity, "light") + self.client.post(url, {"occurrences": "10", "duration_minutes": "10", "duration_confirmed": "on"}) + pending.refresh_from_db() + self.assertEqual(pending.burst_intensity, "intense") + self.client.post(url, {"occurrences": "10", "duration_minutes": "30", "duration_confirmed": "on"}) + pending.refresh_from_db() + self.assertEqual(pending.burst_intensity, "moderate") + self.client.post(url, {"occurrences": "2"}) + pending.refresh_from_db() + self.assertFalse(pending.is_burst) + self.assertIsNone(pending.burst_intensity) + self.assertEqual(pending.captured_at, occurred_at) + self.assertEqual(pending.created_at, submitted_at) + self.assertEqual(ManualReportRevision.objects.filter(original_pending_id=pending.pk).count(), 4) + from django.test import Client + self.assertEqual(Client().post(url, {"occurrences": "10"}).status_code, 404) + + def test_invalid_estimated_duration_and_future_occurrence_are_rejected(self): + for data in ( + {"occurrences": "10", "duration_confirmed": "on", "duration_minutes": "0"}, + {"occurrences": "10", "duration_confirmed": "on", "duration_minutes": "1441"}, + {"occurrences": "10", "occurred_at": (timezone.localtime() + timedelta(days=1)).strftime("%Y-%m-%dT%H:%M")}, + ): + with self.subTest(data=data): + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), data) + self.assertEqual(response.status_code, 400) + self.assertFalse(PendingEvent.objects.exists()) + + def test_map_data_exposes_derived_burst_fields_without_precise_location(self): + event = Event.objects.create( + original_filename="manual burst", classifier_response={}, source_type="manual", occurrences=10, + latitude=Decimal("52.123456"), longitude=Decimal("5.987654"), + observation_duration_minutes=30, observation_duration_kind="estimated", + occurrence_time_approximate=True, captured_at=timezone.now() - timedelta(hours=1), + ) + from .views import _events_for_map + mapped, _ = _events_for_map({"date_from": None, "date_to": None, "visual": "all", "source": "manual"}) + item = next(item for item in mapped if item["occurrences"] == 10) + self.assertEqual(item["event_kind"], "burst") + self.assertEqual(item["observation_duration_kind"], "estimated") + self.assertEqual(item["bangs_per_15_minutes"], 5.0) + self.assertEqual(item["burst_intensity"], "moderate") + self.assertTrue(item["occurrence_time_approximate"]) + self.assertIsNone(item["submitted_on"]) + self.assertNotIn("latitude", item) + self.assertNotIn("longitude", item) + def test_manual_report_accepts_optional_wav_on_the_same_pending_event(self): from tempfile import TemporaryDirectory @@ -220,7 +329,7 @@ class ManualPendingEventTests(TestCase): ) list_response = self.client.get(reverse("fireworks_detect:events_list")) - self.assertContains(list_response, "Manual fireworks report") + self.assertContains(list_response, "Burst Event") self.assertContains(list_response, "5 occurrences") self.assertContains(list_response, "Back garden") @@ -238,7 +347,7 @@ class ManualPendingEventTests(TestCase): self.assertEqual(h3_resolution(), 8) self.assertTrue(cell_from_coordinates(Decimal("52.123456"), Decimal("5.987654"))) - def test_map_uses_manual_h3_data_and_excludes_sensor_events(self): + def test_map_source_filter_separates_reviewed_sensor_events(self): manual_cell = cell_from_coordinates(Decimal("52.123456"), Decimal("5.987654")) sensor_cell = cell_from_coordinates(Decimal("53.123456"), Decimal("5.987654")) Event.objects.create( @@ -271,12 +380,41 @@ class ManualPendingEventTests(TestCase): self.assertContains(response, '"direction_degrees": 237.0') self.assertContains(response, "data-h3-resolution") self.assertContains(response, 'type="module"') - self.assertContains(response, "sensor layer disabled") - self.assertContains(response, "Sensor events — coming soon") + self.assertContains(response, 'name="source"') + self.assertContains(response, "Sensor events") self.assertNotContains(response, sensor_cell) self.assertNotContains(response, "52.123456") self.assertNotContains(response, "H3 demo cell") + sensor_response = self.client.get(reverse("fireworks_detect:map"), {"range": "all", "source": "sensor"}) + self.assertEqual(len(sensor_response.context["map_events"]), 1) + self.assertEqual(sensor_response.context["map_events"][0]["source_type"], "sensor") + self.assertContains(sensor_response, sensor_cell) + self.assertNotContains(sensor_response, manual_cell) + self.assertNotContains(sensor_response, "53.123456") + + both_response = self.client.get(reverse("fireworks_detect:map"), {"range": "all", "source": "all"}) + self.assertEqual(len(both_response.context["map_events"]), 2) + self.assertContains(both_response, manual_cell) + self.assertContains(both_response, sensor_cell) + + def test_sensor_map_excludes_pending_and_device_only_locations(self): + pending_cell = cell_from_coordinates(Decimal("51.876543"), Decimal("5.123456")) + PendingEvent.objects.create( + original_filename="pending.wav", classifier_response={}, + source_type=PendingEvent.SourceType.SENSOR, h3_cell=pending_cell, + ) + Event.objects.create( + original_filename="unlocated.wav", classifier_response={}, + source_type=Event.SourceType.SENSOR, + device_metadata={"latitude": "52.654321", "longitude": "5.654321"}, + ) + + response = self.client.get(reverse("fireworks_detect:map"), {"range": "all", "source": "sensor"}) + self.assertEqual(response.context["map_events"], []) + self.assertNotContains(response, pending_cell) + self.assertNotContains(response, "52.654321") + def test_map_date_range_filters_manual_reports(self): recent_cell = cell_from_coordinates(Decimal("52.400000"), Decimal("5.700000")) older_cell = cell_from_coordinates(Decimal("53.400000"), Decimal("5.700000")) diff --git a/fireworks_detect/urls.py b/fireworks_detect/urls.py index a2471f4..bd02c69 100644 --- a/fireworks_detect/urls.py +++ b/fireworks_detect/urls.py @@ -12,6 +12,7 @@ from .views import ( pending_audio, manual_direction_panel, submit_manual_pending_event, + update_manual_pending_event, submit_pending_event, sensor_heartbeat, submit_sensor_pending, @@ -29,6 +30,7 @@ urlpatterns = [ path("heartbeat/", sensor_heartbeat, name="sensor_heartbeat"), path("submit-pending/", submit_pending_event, name="submit_pending"), path("submit-manual-pending/", submit_manual_pending_event, name="submit_manual_pending"), + path("submit-manual-pending//update/", update_manual_pending_event, name="update_manual_pending"), path("manual-direction/", manual_direction_panel, name="manual_direction_panel"), path("events/", events_view, name="events"), path("events/list/", events_list, name="events_list"), diff --git a/fireworks_detect/views.py b/fireworks_detect/views.py index 6d1e976..4c807e3 100644 --- a/fireworks_detect/views.py +++ b/fireworks_detect/views.py @@ -29,7 +29,8 @@ from django.views.decorators.http import require_http_methods from .h3_utils import cell_boundary, cell_center, cell_from_coordinates, h3_resolution from .browser_policy import advisory_browser_metadata, browser_config, browser_policy -from .models import BrowserProcessingSettings, ClassificationRule, Event, PendingEvent, Sensor, SensorSubmission +from .models import BrowserProcessingSettings, ClassificationRule, Event, ManualReportRevision, PendingEvent, Sensor, SensorSubmission +from .bursts import BURST_MIN_BANGS, DEFAULT_ESTIMATED_DURATION_MINUTES, burst_intensity, burst_rate CLASSIFIER_URL = "http://192.168.1.122:5000/classify" @@ -85,17 +86,24 @@ def _map_filters(request): visual = request.GET.get("visual", "all") if visual not in {"all", "yes", "no"}: visual = "all" + source = request.GET.get("source", "manual") + if source not in {"manual", "sensor", "all"}: + source = "manual" return { "date_from": date_from, "date_to": date_to, "range": selected_range, "visual": visual, + "source": source, } def _events_for_map(filters): - """Create privacy-preserving map data for reviewed manual reports only.""" - events = Event.objects.filter(source_type=Event.SourceType.MANUAL) + """Create H3 map data for reviewed events with a stored, trusted location.""" + source = filters.get("source", "manual") + events = Event.objects.all() + if source != "all": + events = events.filter(source_type=source) if filters["date_from"]: events = events.filter(created_at__date__gte=filters["date_from"]) if filters["date_to"]: @@ -109,7 +117,8 @@ def _events_for_map(filters): mapped_events = [] for event in events.values( "h3_cell", "latitude", "longitude", "occurrences", "visually_confirmed", - "direction_degrees", "direction_accuracy_degrees", "created_at", + "direction_degrees", "direction_accuracy_degrees", "created_at", "captured_at", "submitted_at", "source_type", + "observation_duration_minutes", "observation_duration_kind", "occurrence_time_approximate", ): # Coordinates are used only here to derive an H3 cell; they never leave the server. h3_cell = event["h3_cell"] or cell_from_coordinates(event["latitude"], event["longitude"]) @@ -124,13 +133,26 @@ def _events_for_map(filters): "center": center, "reports": 0, "occurrences": 0, + "manual_reports": 0, + "sensor_reports": 0, }) aggregate["reports"] += 1 aggregate["occurrences"] += event["occurrences"] + aggregate[f'{event["source_type"]}_reports'] += 1 + rate = burst_rate(event["occurrences"], event["observation_duration_minutes"]) if event["observation_duration_kind"] else None mapped_events.append({ "cell": h3_cell, "center": center, + "source_type": event["source_type"], "occurrences": event["occurrences"], + "event_kind": "burst" if event["occurrences"] >= BURST_MIN_BANGS else "ordinary", + "observation_duration_minutes": event["observation_duration_minutes"], + "observation_duration_kind": event["observation_duration_kind"], + "bangs_per_15_minutes": float(rate) if rate is not None else None, + "burst_intensity": burst_intensity(event["occurrences"], event["observation_duration_minutes"]) if event["observation_duration_kind"] else None, + "occurrence_time_approximate": event["occurrence_time_approximate"], + "occurred_on": (event["captured_at"] or event["created_at"]).date().isoformat(), + "submitted_on": event["submitted_at"].date().isoformat() if event["submitted_at"] else None, "visually_confirmed": event["visually_confirmed"], # A day is sufficient for this map and avoids sharing a precise report time. "reported_on": event["created_at"].date().isoformat(), @@ -152,11 +174,13 @@ def fireworks_map_view(request): "h3_cells": h3_cells, "map_events": map_events, "mapped_event_count": len(map_events), + "map_source": filters["source"], "map_filters": { "date_from": filters["date_from"].isoformat() if filters["date_from"] else "", "date_to": filters["date_to"].isoformat() if filters["date_to"] else "", "range": filters["range"], "visual": filters["visual"], + "source": filters["source"], }, }) @@ -395,6 +419,10 @@ def submit_manual_pending_event(request): status=400, ) + details, error = _manual_observation_details(request, occurrences) + if error: + return render(request, "fireworks_detect/manual_pending_submission.html", {"error": error}, status=400) + uploaded_file = request.FILES.get("audio") if uploaded_file: if uploaded_file.size > MAX_AUDIO_SIZE or uploaded_file.content_type not in ("audio/wav", "audio/wave", "audio/x-wav"): @@ -415,6 +443,7 @@ def submit_manual_pending_event(request): classifier_response={}, source_type=PendingEvent.SourceType.MANUAL, occurrences=occurrences, + **details, latitude=latitude, longitude=longitude, h3_cell=h3_cell or "", @@ -422,15 +451,86 @@ def submit_manual_pending_event(request): direction_accuracy_degrees=direction_accuracy_degrees, direction_source="device_compass" if direction_degrees is not None else "", ) + owned = request.session.get("manual_pending_ids", []) + request.session["manual_pending_ids"] = (owned + [pending.pk])[-20:] direction_names = { "N": _("North"), "NE": _("Northeast"), "E": _("East"), "SE": _("Southeast"), "S": _("South"), "SW": _("Southwest"), "W": _("West"), "NW": _("Northwest"), } return render(request, "fireworks_detect/manual_pending_submission.html", { "pending": pending, + "editable": True, "direction_label": direction_names.get(pending.direction_cardinal) if direction_degrees is not None else "", }) + +def _manual_observation_details(request, occurrences): + raw_time = request.POST.get("occurred_at", "").strip() + if raw_time: + occurred_at = parse_datetime(raw_time) + if occurred_at is None: + return None, _("Enter a valid occurrence date and time.") + if timezone.is_naive(occurred_at): + occurred_at = timezone.make_aware(occurred_at, timezone.get_current_timezone()) + if occurred_at > timezone.now() + timedelta(minutes=5): + return None, _("Occurrence time cannot be in the future.") + else: + occurred_at = timezone.now() + + details = { + "captured_at": occurred_at, + "occurrence_time_approximate": request.POST.get("time_approximate") == "on", + "observation_duration_minutes": None, + "observation_duration_kind": "", + } + if occurrences >= BURST_MIN_BANGS and request.POST.get("duration_confirmed") == "on": + raw_duration = request.POST.get("duration_minutes", "").strip() + try: + duration = int(raw_duration) if raw_duration else DEFAULT_ESTIMATED_DURATION_MINUTES + except ValueError: + return None, _("Enter a duration between 1 and 1,440 minutes.") + if not 1 <= duration <= 1440: + return None, _("Enter a duration between 1 and 1,440 minutes.") + details["observation_duration_minutes"] = duration + details["observation_duration_kind"] = PendingEvent.DurationKind.ESTIMATED + return details, None + + +@require_http_methods(["POST"]) +@never_cache +def update_manual_pending_event(request, event_id): + if event_id not in request.session.get("manual_pending_ids", []): + raise Http404 + try: + occurrences = int(request.POST.get("occurrences", "")) + except (TypeError, ValueError): + occurrences = 0 + if not 1 <= occurrences <= 1000: + return render(request, "fireworks_detect/manual_pending_submission.html", {"error": _("Choose between 1 and 1,000 occurrences.")}, status=400) + _, error = _manual_observation_details(request, occurrences) + if error: + return render(request, "fireworks_detect/manual_pending_submission.html", {"error": error}, status=400) + # The occurrence time and location belong to the original observation. + duration = None + kind = "" + if occurrences >= BURST_MIN_BANGS and request.POST.get("duration_confirmed") == "on": + raw = request.POST.get("duration_minutes", "").strip() + duration = int(raw) if raw else DEFAULT_ESTIMATED_DURATION_MINUTES + kind = PendingEvent.DurationKind.ESTIMATED + with transaction.atomic(): + pending = get_object_or_404(PendingEvent.objects.select_for_update(), pk=event_id, source_type=PendingEvent.SourceType.MANUAL) + ManualReportRevision.objects.create( + pending_event=pending, original_pending_id=pending.pk, + previous_occurrences=pending.occurrences, new_occurrences=occurrences, + previous_duration_minutes=pending.observation_duration_minutes, + new_duration_minutes=duration, + ) + pending.occurrences = occurrences + pending.observation_duration_minutes = duration + pending.observation_duration_kind = kind + pending.save(update_fields=["occurrences", "observation_duration_minutes", "observation_duration_kind"]) + return render(request, "fireworks_detect/manual_pending_submission.html", {"pending": pending, "editable": True, "updated": True}) + @never_cache def events_list(request): return render(request, "fireworks_detect/events_list.html", {"events": Event.objects.all()[:30]}) @@ -549,23 +649,30 @@ def submit_sensor_pending(request): finally: uploaded.seek(0) raw_time = request.POST.get("captured_at", "") - try: - captured_at = datetime.fromtimestamp(float(raw_time), datetime_timezone.utc) if re.fullmatch(r"[0-9]{10}(?:\.[0-9]+)?", raw_time) else parse_datetime(raw_time) - if captured_at is None or timezone.is_naive(captured_at): - raise ValueError() - if captured_at > timezone.now() + timedelta(minutes=5): - raise ValueError() - except (ValueError, OverflowError, OSError): - return _submission_error("invalid_capture_time", "captured_at must be a valid past UTC time.") + if not raw_time and request.POST.get("time_state") == "unknown": + captured_at = None + else: + try: + captured_at = datetime.fromtimestamp(float(raw_time), datetime_timezone.utc) if re.fullmatch(r"[0-9]{10}(?:\.[0-9]+)?", raw_time) else parse_datetime(raw_time) + if captured_at is None or timezone.is_naive(captured_at): + raise ValueError() + if captured_at > timezone.now() + timedelta(minutes=5): + raise ValueError() + except (ValueError, OverflowError, OSError): + return _submission_error("invalid_capture_time", "Provide a valid UTC captured_at or time_state=unknown.") firmware = request.POST.get("firmware_version", "") if not 1 <= len(firmware) <= 64 or not firmware.isprintable(): return _submission_error("invalid_firmware_version", "Provide a printable firmware_version of at most 64 characters.") - metadata = {} - for key in ("trigger_type", "signal_rms", "signal_peak", "latitude", "longitude"): + metadata = {"time_state": "unknown"} if captured_at is None else {} + for key in ("trigger_type", "signal_rms", "signal_peak", "latitude", "longitude", "capture_started_at", "triggered_at", "queued_at"): value = request.POST.get(key) if value is None or value == "": continue - if key == "trigger_type": + if key.endswith("_at"): + parsed = parse_datetime(value) + if parsed is None or timezone.is_naive(parsed): + return _submission_error("invalid_metadata", f"Invalid {key}.") + elif key == "trigger_type": if len(value) > 64 or not value.isprintable(): return _submission_error("invalid_metadata", "Invalid trigger_type.") else: @@ -585,7 +692,7 @@ def submit_sensor_pending(request): if existing: if existing.audio_sha256 != audio_hash: return _submission_error("event_id_conflict", "event_id already belongs to different audio.", 409) - return JsonResponse({"submission_id": str(existing.submission_id), "status": "pending" if existing.pending_event_id else "reviewed", "duplicate": True}, status=200) + return JsonResponse({"submission_id": str(existing.submission_id), "event_id": event_id, "status": "pending" if existing.pending_event_id else "reviewed", "duplicate": True}, status=200) rate_key = f"sensor-submissions:{sensor.pk}" if cache.get(rate_key, 0) >= 30: response = _submission_error("rate_limited", "Sensor submission rate exceeded.", 429) @@ -606,17 +713,20 @@ def submit_sensor_pending(request): except (HTTPError, URLError, TimeoutError, OSError, ValueError, json.JSONDecodeError): return _submission_error("classifier_unavailable", "Classification failed; retain the queued recording.", 502) uploaded.seek(0) + pending = None try: with transaction.atomic(): pending = PendingEvent.objects.create(audio_file=uploaded, sensor=sensor, source_type=PendingEvent.SourceType.SENSOR, original_filename=Path(uploaded.name).name[:255], classifier_response=payload, captured_at=captured_at, firmware_version=firmware, device_metadata=metadata) receipt = SensorSubmission.objects.create(sensor=sensor, event_id=event_id, audio_sha256=audio_hash, pending_event=pending) except IntegrityError: + if pending and pending.audio_file: + pending.audio_file.storage.delete(pending.audio_file.name) existing = SensorSubmission.objects.get(sensor=sensor, event_id=event_id) if existing.audio_sha256 != audio_hash: return _submission_error("event_id_conflict", "event_id already belongs to different audio.", 409) - return JsonResponse({"submission_id": str(existing.submission_id), "status": "pending" if existing.pending_event_id else "reviewed", "duplicate": True}) + return JsonResponse({"submission_id": str(existing.submission_id), "event_id": event_id, "status": "pending" if existing.pending_event_id else "reviewed", "duplicate": True}) sensor.record_heartbeat(submission=True) - return JsonResponse({"submission_id": str(receipt.submission_id), "pending_event_id": pending.pk, "status": "pending", "classification": payload}, status=201) + return JsonResponse({"submission_id": str(receipt.submission_id), "event_id": event_id, "pending_event_id": pending.pk, "status": "pending", "classification": payload}, status=201) @csrf_exempt diff --git a/frontend/src/scripts/event-map.js b/frontend/src/scripts/event-map.js index 4c6adad..8c84fd5 100644 --- a/frontend/src/scripts/event-map.js +++ b/frontend/src/scripts/event-map.js @@ -24,13 +24,17 @@ const bounds = L.latLngBounds([]); h3Cells.forEach((cell) => { + const hasManual = cell.manual_reports > 0; + const hasSensor = cell.sensor_reports > 0; + const color = hasManual && hasSensor ? "#a78bfa" : hasSensor ? "#22d3ee" : "#f59e0b"; const polygon = L.polygon(cell.boundary, { - color: "#f59e0b", weight: 2, fillColor: "#f59e0b", fillOpacity: 0.25, + color, weight: 2, fillColor: color, fillOpacity: 0.25, }).addTo(map); polygon.bindPopup( "H3 " + cell.cell + "" + "" + cell.reports + " " + (cell.reports === 1 ? (t.report || "report") : (t.reports || "reports")) + " · " + cell.occurrences + - " " + (cell.occurrences === 1 ? (t.occurrence || "occurrence") : (t.occurrences || "occurrences")) + " · " + (t.resolution || "resolution") + " " + h3Resolution + "" + " " + (cell.occurrences === 1 ? (t.occurrence || "occurrence") : (t.occurrences || "occurrences")) + " · " + (t.resolution || "resolution") + " " + h3Resolution + + "
" + cell.manual_reports + " " + (t.manualReport || "Manual report") + " · " + cell.sensor_reports + " " + (t.sensorEvent || "Sensor event") + "" ); bounds.extend(L.latLngBounds(cell.boundary)); }); @@ -60,7 +64,11 @@ const reportIcon = L.divIcon({ className: "", html: "
✦
", iconSize: [37, 37], iconAnchor: [19, 19], }); + const sensorIcon = L.divIcon({ + className: "", html: "
S
", iconSize: [37, 37], iconAnchor: [19, 19], + }); reports.forEach((report) => { + const isSensor = report.source_type === "sensor"; const visualStatus = report.visually_confirmed ? (t.visuallyConfirmed || "Visually confirmed") : (t.notVisuallyConfirmed || "Not visually confirmed"); let detail = report.occurrences + " " + (report.occurrences === 1 ? (t.occurrence || "occurrence") : (t.occurrences || "occurrences")) + " · " + visualStatus + "
" + (t.reported || "Reported") + " " + report.reported_on; @@ -70,8 +78,8 @@ detail += " (±" + Math.round(report.direction_accuracy_degrees) + "°)"; } } - L.marker(report.center, { icon: reportIcon }).addTo(map).bindPopup( - "" + (t.manualReport || "Manual report") + " · H3 " + report.cell + "" + + L.marker(report.center, { icon: isSensor ? sensorIcon : reportIcon }).addTo(map).bindPopup( + "" + (isSensor ? (t.sensorEvent || "Sensor event") : (t.manualReport || "Manual report")) + " · H3 " + report.cell + "" + "" + detail + "" ); @@ -98,4 +106,4 @@ input.addEventListener("change", () => { range.value = "custom"; }); }); } - \ No newline at end of file + diff --git a/frontend/src/scripts/manual-report.js b/frontend/src/scripts/manual-report.js index aff439f..632d48d 100644 --- a/frontend/src/scripts/manual-report.js +++ b/frontend/src/scripts/manual-report.js @@ -21,6 +21,10 @@ const reportTime = document.querySelector("#manual-report-time"); const reportHours = document.querySelector("#report-clock-hours"); const reportMinutes = document.querySelector("#report-clock-minutes"); + const occurredAt = document.querySelector("#manual-occurred-at"); + const useNow = document.querySelector("#manual-use-now"); + const burstStatus = document.querySelector("#manual-burst-status"); + const burstDuration = document.querySelector("#manual-burst-duration"); let orientationListener; let compassUnavailableTimeout; let compassRotation = null; @@ -47,6 +51,11 @@ updateReportTime(); if (reportTime) window.setInterval(updateReportTime, 60000); const idleSubmitLabel = submitLabel?.textContent || "I heard fireworks"; + useNow?.addEventListener("click", () => { + const now = new Date(); + const local = new Date(now.getTime() - now.getTimezoneOffset() * 60000); + occurredAt.value = local.toISOString().slice(0, 16); + }); const setSubmissionState = (next, message = "") => { manualForm.dataset.state = next; @@ -70,16 +79,23 @@ return successful; }; + const showBurstState = () => { + const burst = Number(occurrences.value) >= 3; + if (burstStatus) burstStatus.textContent = burst ? (t.burstEvent || "Burst Event") : (t.ordinaryReport || "Ordinary report"); + if (burstDuration) burstDuration.hidden = !burst; + }; const setCount = (value) => { const count = Number.parseInt(value, 10); occurrences.value = String(Math.min(1000, Math.max(1, Number.isFinite(count) ? count : 1))); decrease.disabled = occurrences.value === "1"; increase.disabled = occurrences.value === "1000"; + showBurstState(); }; setCount(occurrences.value); decrease.addEventListener("click", () => setCount(Number(occurrences.value) - 1)); increase.addEventListener("click", () => setCount(Number(occurrences.value) + 1)); occurrences.addEventListener("change", () => setCount(occurrences.value)); + occurrences.addEventListener("input", showBurstState); const stopCompassReading = () => { if (orientationListener) window.removeEventListener("deviceorientation", orientationListener); diff --git a/frontend/src/styles/components/manual-report-structure.scss b/frontend/src/styles/components/manual-report-structure.scss index 7405f46..874796c 100644 --- a/frontend/src/styles/components/manual-report-structure.scss +++ b/frontend/src/styles/components/manual-report-structure.scss @@ -6,6 +6,67 @@ --manual-report-section-gap: 1rem; } +.manual-report__occurrence, .manual-report__duration { + display: grid; + gap: .55rem; + max-width: 36rem; + margin-bottom: var(--manual-report-section-gap); + padding: .85rem 1rem; + border: 1px solid #584891; + border-radius: 1rem; + background: #151932; + color: #e9def8; + input[type="datetime-local"], input[type="number"] { + width: 100%; + min-height: 2.75rem; + padding: .45rem .65rem; + border: 1px solid #725da4; + border-radius: .55rem; + color: #f5f0ff; + background: #211d3d; + font: inherit; + color-scheme: dark; + } + small { color: #cbbce5; } +} + +.manual-report__duration[hidden] { display: none; } +.manual-report__time-row { + display: flex; + gap: .5rem; + align-items: center; + input { min-width: 0; flex: 1; } + button { flex: none; } +} +@media (max-width: 30rem) { + .manual-report__time-row { flex-direction: column; align-items: stretch; } + .manual-report__time-row button { align-self: flex-start; } +} +.manual-report__occurrence button { + justify-self: start; + padding: .35rem .75rem; + border: 1px solid #725da4; + border-radius: .55rem; + color: #f5f0ff; + background: #302553; + cursor: pointer; +} +.manual-report__check { + display: flex; + align-items: center; + gap: .5rem; + color: #e9def8; +} +.manual-report__burst-status { margin: .5rem 0 0; color: #ffbf72; font-weight: 750; } +.manual-submission__edit { + display: grid; + gap: .4rem; + max-width: 18rem; + margin-top: 1rem; + input[type="number"] { min-height: 2.5rem; padding: .4rem; border-radius: .5rem; } + button { min-height: 2.5rem; cursor: pointer; } +} + .manual-report__primary { display: grid; gap: var(--manual-report-section-gap); diff --git a/frontend/src/styles/pages/map.scss b/frontend/src/styles/pages/map.scss index 1fcf0f7..786d09f 100644 --- a/frontend/src/styles/pages/map.scss +++ b/frontend/src/styles/pages/map.scss @@ -258,6 +258,14 @@ body { background: #8b5cf633; } +.legend-sensor { + width: .85rem; + height: .85rem; + border: 2px solid #a5f3fc; + border-radius: .2rem; + background: #0891b2; +} + .legend-line { width: 1.1rem; border-top: 2px dashed #644b9c; @@ -277,6 +285,20 @@ body { box-shadow: 0 .3rem 1rem #a84f2670; } +.sensor-icon { + display: grid; + width: 2.3rem; + height: 2.3rem; + place-items: center; + border: 2px solid #cffafe; + border-radius: .55rem; + color: #ecfeff; + font-size: 1rem; + font-weight: 900; + background: #087e97; + box-shadow: 0 .3rem 1rem #06465a88; +} + .source-icon { display: grid; width: 2.45rem; @@ -388,6 +410,18 @@ body { font-size: .78rem; } +@media (max-width:80rem) { + .filters { + grid-template-columns: repeat(5,minmax(0,1fr)); + .filter-submit { + grid-column: 1/3; + } + .map-tag { + grid-column: 5; + } + } +} + @media (max-width:52rem) { .shell { width: min(100% - 1.25rem,80rem); @@ -405,6 +439,9 @@ body { .filter:first-child { grid-column: 1/-1; } + .filter-submit, .map-tag { + grid-column: auto; + } } .map { height: 32rem; diff --git a/locale/nl/LC_MESSAGES/django.mo b/locale/nl/LC_MESSAGES/django.mo index e956dd4582d667af4e44719280358613ce82ed91..4e803a1fca6d7f1492d0e1bbf8a92bf97813cb43 100644 GIT binary patch delta 9080 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 gndswNG<({J)8#3c9_&^0<#X=;1B4z?00000 diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index ee5c6b0..45fa5cf 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -1403,3 +1403,83 @@ msgstr "Toegang tot de microfoon is geweigerd. Je kunt nog steeds handmatig meld msgid "Microphone capture failed." msgstr "Opnemen met de microfoon is mislukt." +msgid "When did it happen?" +msgstr "Wanneer gebeurde het?" + +msgid "Use now" +msgstr "Gebruik nu" + +msgid "Time is approximate" +msgstr "Tijdstip is ongeveer" + +msgid "Leave the time empty to use the submission time." +msgstr "Laat leeg om het verzendtijdstip te gebruiken." + +msgid "Ordinary report" +msgstr "Gewone melding" + +msgid "Burst Event" +msgstr "Knalreeks" + +msgid "Estimated observation window (minutes, for 3+ bangs)" +msgstr "Geschatte tijdsduur (minuten, vanaf 3 knallen)" + +msgid "Use this estimated window for burst intensity" +msgstr "Gebruik deze geschatte tijdsduur voor de intensiteit" + +msgid "Optional. Without an accepted window, BoomCast reports the count without an intensity rating." +msgstr "Optioneel. Zonder bevestigde tijdsduur toont BoomCast geen intensiteit." + +msgid "Correct bang count" +msgstr "Aantal knallen aanpassen" + +msgid "Estimated minutes for a burst" +msgstr "Geschatte minuten voor de knalreeks" + +msgid "Use this estimated window" +msgstr "Gebruik deze geschatte tijdsduur" + +msgid "Update report" +msgstr "Melding bijwerken" + +msgid "Duration" +msgstr "Tijdsduur" + +msgid "Intensity" +msgstr "Intensiteit" + +msgid "Not rated" +msgstr "Niet beoordeeld" + +msgid "Unknown" +msgstr "Onbekend" + +msgid "Approximately" +msgstr "Ongeveer" + +msgid "Submitted" +msgstr "Verzonden" + +msgid "Occurred" +msgstr "Gebeurd" + +msgid "minutes (estimated)" +msgstr "minuten (geschat)" + +msgid "minutes (measured)" +msgstr "minuten (gemeten)" + +msgid "bangs per 15 minutes" +msgstr "knallen per 15 minuten" + +msgid "Light" +msgstr "Licht" + +msgid "Moderate" +msgstr "Matig" + +msgid "Intense" +msgstr "Intens" + +msgid "Report updated!" +msgstr "Melding bijgewerkt!" diff --git a/members/__pycache__/test_sensors.cpython-313.pyc b/members/__pycache__/test_sensors.cpython-313.pyc index 24dc70961324bb8e367820282c1f9b34cd805cf6..7990eef943f2ca8d8a2828e3a5a6b37c943d8cf4 100644 GIT binary patch delta 1391 zcmaKrUu;uV9LIZhZ*OnA_O^HH)~*F9wqt8HK;5Qpt&~j`$41!P9m0ZWCM~R6*V~?U zf&raGBZL4!evpu0491r=Fg9{SLW~b+GzNW{2~Rh^`NH#v5Arh4?_6fbV!RKZ`@6sM z=lA`6&$+*Sbnle%#N%<<*fZ&SIMo`xtH`4L54+8F4Ze~3j3Z)?2;*)3W>Kp@P%|3A ziO)ZZP4jmMT7%ZuEx=`G7#8Fh3BYQ@R(K*`Wziiu3b&jJ3Bq^IN1>-u@~EE9?0V`* z?&QH(g_z=Gc_wFEa#2D?4dQ-CHiv(g!`I)s`QiMr#cU-zfB3#*xq0`4^0LeZ_QB7d z^W<|FQT`S+#{mLAyzF-~88VaM)LcwPQEh?&uUo3^B1|ltZioqj=7uxgUcqC{hm#DH~h}e$X z;ws!w+dcGEmZGmQjM3NOC-qR*049Qn5F&waBK9Eq5N{%S7~&4P3FAR{yY2-t1cf?~ z+E}9WDLCt=12>P&zq2@A8J{0oIBZNUZ7Ydi|tU1Si<7u$WK zxS|yiMQG3%O{Ct%RT9<9Y!%&x`5lNB#9_n{h6=Ize~-oSCR)`w0GFeY5SPOJs`kP) z_QS8yP#F6#6|05)dbz(iJCU;*Nx*8fCz!%Gb_7#mZv#6pC9SOIGI@F&(~}77hGr4}YLC~i*Na0+K0|euT04nBxY+(9nKDMU&(yT>8?~WY)h2#`!rDE0yz?wMZ4_QA z37e*HKmSJQ{ANzWYR4<7>K?ocuDBM(VJoIMRnqg6;y0eeGfz#&EY0Z!X4xPVIs?qy zbDdw4Ge%3-Nnwurs^NSz~FB`u3w0{6MP&D-b delta 1250 zcmZ{jOH5Ni6oxz8z6+%fQd>Z!v>=yP5ad+~6arPF0gv5m|Sm+H~6O0?TwYFlSg_@CLBeJx2H@>wEVrHMg(drQVg#?l2YC*Qc0$8vK*UiB z>yDo4Hr9x`5!r}Zgb5KsG$EQ1H4MCg=3*QMkMkV440TS>7qbaz2tGJx67mF3c7!^k5g(z!o z^X!mj`L#!9CSiE%E46jtiXwy$(fP>VK>8r)&++x*xS!z#NeUWZG4G+N1GT}5Kd)2m zsTz~M56*#=c8)}(+AalUn)SfDX6!MqD&rjS9=Q6UjqR&*l^(J7I(1Fha9YqGs& ziSw(LcVgxLt%jZY?9tTU#emg0h!8?O+DWx1tYsytvx``K!b_Y`pWZS?E5HX5`ui-D z%*@(+c`pzk{1r@fBZd$XVimE5&>|in9)dsEYCfZ@I;eE&>JN$`5j@D=z)T+EEQ4YU c&Wh26n9xL@!kxw {% with status=heartbeat %}● {{ status.1 }}{% endwith %}
+
{% trans "Sensor ID" %}
{{ sensor.pk }}
{% trans "Last heartbeat" %}
{{ sensor.last_heartbeat|date:"j M Y, H:i"|default:"—" }}
{% trans "Last submission" %}
{{ sensor.last_submission|date:"j M Y, H:i"|default:"—" }}
{% trans "Token prefix" %}
{{ sensor.token_prefix|default:"—" }}
diff --git a/members/templates/members/partials/sensor_list.html b/members/templates/members/partials/sensor_list.html index fa2b646..2f05e43 100644 --- a/members/templates/members/partials/sensor_list.html +++ b/members/templates/members/partials/sensor_list.html @@ -7,6 +7,7 @@

{{ sensor.name }}

{% with status=sensor.heartbeat_status %}● {{ status.1 }}{% endwith %}
{% if sensor.is_active %}{% trans "Enabled" %}{% else %}{% trans "Disabled" %}{% endif %}
+
{% trans "Sensor ID" %}
{{ sensor.pk }}
{% trans "Last heartbeat" %}
{{ sensor.last_heartbeat|date:"j M Y, H:i"|default:"—" }}
{% trans "Created" %}
{{ sensor.created_at|date:"j M Y" }}
{% trans "Token prefix" %}
{{ sensor.token_prefix|default:"—" }}
diff --git a/members/test_sensors.py b/members/test_sensors.py index 1e8f4aa..cf7f86d 100644 --- a/members/test_sensors.py +++ b/members/test_sensors.py @@ -32,6 +32,7 @@ class SensorSettingsTests(TestCase): listing = self.client.get(reverse("user_settings")) self.assertContains(listing, "Balcony") self.assertContains(listing, "Portable") + self.assertContains(listing, f"{sensor.pk}", html=True) self.assertNotContains(listing, "System") self.assertNotContains(listing, "Bob's device") self.client.force_login(self.bob) @@ -45,6 +46,7 @@ class SensorSettingsTests(TestCase): detail = self.client.get(reverse("manage_sensor", args=[sensor.pk]), **headers) self.assertContains(detail, "Balcony") + self.assertContains(detail, f"{sensor.pk}", html=True) self.assertContains(detail, reverse("sensor_list")) self.assertNotContains(detail, "") diff --git a/staticfiles/vite/assets/frontend/src/entries/dashboard.js-C2DCho1J.js b/staticfiles/vite/assets/frontend/src/entries/dashboard.js-C2DCho1J.js new file mode 100644 index 0000000..00f3979 --- /dev/null +++ b/staticfiles/vite/assets/frontend/src/entries/dashboard.js-C2DCho1J.js @@ -0,0 +1 @@ +/* empty css *//* empty css */import"./fireworks-home.js-CZsCTUTv.js";import"./map.js-ZTK3kmoy.js";import"../../../manual-report-44fwUW4y.js";import"../../../theme-DXAi27ON.js"; diff --git a/staticfiles/vite/assets/frontend/src/entries/home.js-Cam3C1NX.js b/staticfiles/vite/assets/frontend/src/entries/home.js-Cam3C1NX.js new file mode 100644 index 0000000..ce00367 --- /dev/null +++ b/staticfiles/vite/assets/frontend/src/entries/home.js-Cam3C1NX.js @@ -0,0 +1 @@ +/* empty css */import"../../../manual-report-44fwUW4y.js";import"../../../theme-DXAi27ON.js"; diff --git a/staticfiles/vite/assets/frontend/src/entries/map.js-ZTK3kmoy.js b/staticfiles/vite/assets/frontend/src/entries/map.js-ZTK3kmoy.js new file mode 100644 index 0000000..9bbb4a7 --- /dev/null +++ b/staticfiles/vite/assets/frontend/src/entries/map.js-ZTK3kmoy.js @@ -0,0 +1 @@ +/* empty css *//* empty css */import"../../../theme-DXAi27ON.js";const e=window.BOOMCAST_I18N||{},u=document.getElementById("event-map"),f=u.dataset.h3Resolution,n=L.map(u,{zoomControl:!1,scrollWheelZoom:!1}).setView([52.1326,5.2913],7);L.control.zoom({position:"bottomleft"}).addTo(n);const m=L.control({position:"topright"});m.onAdd=()=>{const o=L.DomUtil.create("div","map-compass");return o.setAttribute("role","img"),o.setAttribute("aria-label",e.mapCompass||"Map compass: north is up"),o.innerHTML='NESW↑',L.DomEvent.disableClickPropagation(o),o};m.addTo(n);L.tileLayer("https://{s}.tile.openstreetmap.de/{z}/{x}/{y}.png",{maxZoom:18,attribution:"© OpenStreetMap contributors"}).addTo(n);const M=JSON.parse(document.getElementById("h3-cells-data").textContent),y=JSON.parse(document.getElementById("map-events-data").textContent),d=L.latLngBounds([]);M.forEach(o=>{const s=o.manual_reports>0,c=o.sensor_reports>0,t=s&&c?"#a78bfa":c?"#22d3ee":"#f59e0b";L.polygon(o.boundary,{color:t,weight:2,fillColor:t,fillOpacity:.25}).addTo(n).bindPopup('H3 '+o.cell+''+o.reports+" "+(o.reports===1?e.report||"report":e.reports||"reports")+" · "+o.occurrences+" "+(o.occurrences===1?e.occurrence||"occurrence":e.occurrences||"occurrences")+" · "+(e.resolution||"resolution")+" "+f+"
"+o.manual_reports+" "+(e.manualReport||"Manual report")+" · "+o.sensor_reports+" "+(e.sensorEvent||"Sensor event")+"
"),d.extend(L.latLngBounds(o.boundary))});function v(o){return["N","NE","E","SE","S","SW","W","NW"][Math.floor((o+22.5)%360/45)]}function b(o,s,c){const a=s*Math.PI/180,r=o[0]*Math.PI/180,h=o[1]*Math.PI/180,i=c/6378137,l=Math.asin(Math.sin(r)*Math.cos(i)+Math.cos(r)*Math.sin(i)*Math.cos(a)),g=h+Math.atan2(Math.sin(a)*Math.sin(i)*Math.cos(r),Math.cos(i)-Math.sin(r)*Math.sin(l));return[l*180/Math.PI,g*180/Math.PI]}const S=L.divIcon({className:"",html:'
✦
',iconSize:[37,37],iconAnchor:[19,19]}),_=L.divIcon({className:"",html:'
S
',iconSize:[37,37],iconAnchor:[19,19]});y.forEach(o=>{const s=o.source_type==="sensor",c=o.visually_confirmed?e.visuallyConfirmed||"Visually confirmed":e.notVisuallyConfirmed||"Not visually confirmed";let t=o.occurrences+" "+(o.occurrences===1?e.occurrence||"occurrence":e.occurrences||"occurrences")+" · "+c+"
"+(e.reported||"Reported")+" "+o.reported_on;if(o.direction_degrees!==null&&(t+="
"+(e.compassDirection||"Compass direction")+" "+Math.round(o.direction_degrees)+"° ("+v(o.direction_degrees)+")",o.direction_accuracy_degrees!==null&&(t+=" (±"+Math.round(o.direction_accuracy_degrees)+"°)")),L.marker(o.center,{icon:s?_:S}).addTo(n).bindPopup(''+(s?e.sensorEvent||"Sensor event":e.manualReport||"Manual report")+" · H3 "+o.cell+''+t+""),o.direction_degrees!==null){const a=b(o.center,o.direction_degrees,900);L.polyline([o.center,a],{color:"#fff7e6",weight:9,opacity:.8}).addTo(n),L.polyline([o.center,a],{color:"#6d45a0",weight:5,opacity:1}).addTo(n);const r=L.divIcon({className:"",html:'
↑
',iconSize:[56,56],iconAnchor:[28,28]});L.marker(a,{icon:r,interactive:!1}).addTo(n)}});d.isValid()&&n.fitBounds(d.pad(.18));const p=document.getElementById("range");p&&document.querySelectorAll("#from-date, #to-date").forEach(o=>{o.addEventListener("change",()=>{p.value="custom"})}); diff --git a/staticfiles/vite/assets/manual-report-44fwUW4y.js b/staticfiles/vite/assets/manual-report-44fwUW4y.js new file mode 100644 index 0000000..86f60a1 --- /dev/null +++ b/staticfiles/vite/assets/manual-report-44fwUW4y.js @@ -0,0 +1 @@ +const we=document.querySelector("#manual-report-form"),g=window.BOOMCAST_I18N||{};function fe(){if(!we)return null;const e=document.querySelector("#burst-start"),t=e.closest(".burst-listener"),n=e.closest(".manual-report__supporting"),i=document.querySelector("#burst-state"),I=document.querySelector("#burst-panel"),y=document.querySelector("#burst-heading"),L=document.querySelector("#burst-detail"),w=document.querySelector("#burst-waveform"),Z=document.querySelector("#burst-preview"),se=document.querySelector("#burst-resume"),re=document.querySelector("#burst-discard"),pe=document.querySelector("#burst-stop"),_=document.querySelector("#burst-error"),A=new Float32Array(300);let f=0,S="off",M,d,X,c,G,x,k,v;function $(){const a=w.getContext("2d");a.clearRect(0,0,w.width,w.height),a.fillStyle="#ffbd62";const l=w.width/A.length,p=Math.max(.003,...A);for(let s=0;s{for(let V=0;V{if(l.type==="level"&&(S==="listening"||S==="tail"))A[f]=l.value,f=(f+1)%A.length,$();else if(l.type==="trigger"&&S==="listening")N("tail");else if(l.type==="clip"){const p=new File([be(l.samples,l.sampleRate)],he(),{type:"audio/wav"});v?(v(p),v=null):S==="tail"&&(ee(),k=p,x=URL.createObjectURL(p),Z.src=x,Z.hidden=!1,N("captured"))}},X.connect(c),c.connect(G).connect(d.destination),await d.resume(),A.fill(0),f=0,$(),N("listening")}catch(l){await P(),t&&(t.dataset.state="error"),n&&(n.dataset.state="error"),i&&(i.textContent=g.microphoneUnavailable||"Microphone unavailable"),_.textContent=l.name==="NotAllowedError"?g.microphoneDenied||"Microphone permission was denied. Manual reporting is still available.":g.microphoneFailed||"Microphone capture failed.",_.hidden=!1}finally{e.disabled=!1}}async function P(){v&&(v(null),v=null),ee(),c==null||c.disconnect(),X==null||X.disconnect(),G==null||G.disconnect(),M==null||M.getTracks().forEach(a=>a.stop()),await(d==null?void 0:d.close()),M=d=X=c=G=null,A.fill(0),f=0,N("off")}function te(){ee(),A.fill(0),f=0,$(),c==null||c.port.postMessage("reset"),c&&N("listening")}return e.addEventListener("click",ye),pe.addEventListener("click",P),re.addEventListener("click",te),se.addEventListener("click",te),window.addEventListener("pagehide",P),document.addEventListener("visibilitychange",()=>{document.hidden&&P()}),{get active(){return S!=="off"},async clipForSubmission(){return k||(S==="off"||!c?null:new Promise(a=>{v=a,c.port.postMessage("snapshot")}))},submissionSucceeded:te}}const o=window.BOOMCAST_I18N||{},m=document.querySelector("#manual-report-form"),K=document.querySelector("#manual-submit"),F=document.querySelector("#manual-submit-label"),C=document.querySelector("#manual-occurrences"),de=document.querySelector("#manual-decrease"),Ce=document.querySelector("#manual-increase"),Se=document.querySelector("#manual-latitude"),Ge=document.querySelector("#manual-longitude"),O=document.querySelector("#manual-direction-degrees"),ve=document.querySelector("#manual-direction-accuracy"),j=()=>document.querySelector("#manual-capture-direction"),u=()=>document.querySelector("#manual-direction-status"),r=()=>document.querySelector("#manual-direction-panel"),H=document.querySelector("#manual-compass"),T=document.querySelector("#manual-compass-home"),z=document.querySelector("#manual-compass-rose"),Re=document.querySelector("#manual-compass-heading"),E=document.querySelector("#manual-report-time"),ce=document.querySelector("#report-clock-hours"),le=document.querySelector("#report-clock-minutes"),Ze=document.querySelector("#manual-occurred-at"),ne=document.querySelector("#manual-use-now"),ge=document.querySelector("#manual-burst-status"),ue=document.querySelector("#manual-burst-duration");let B,J,R=null;const Y=fe(),oe=e=>Number.isFinite(e),ie=e=>[o.north||"North",o.northeast||"Northeast",o.east||"East",o.southeast||"Southeast",o.south||"South",o.southwest||"Southwest",o.west||"West",o.northwest||"Northwest"][Math.floor((e+22.5)%360/45)],Q=e=>Number(e.toFixed(1)).toString(),Ie=()=>{var I,y;if(!E)return;const e=new Date;E.dateTime=e.toISOString();const t=new Intl.DateTimeFormat(document.documentElement.lang||void 0,{hour:"2-digit",minute:"2-digit",hourCycle:"h23"}).formatToParts(e),n=(I=t.find(L=>L.type==="hour"))==null?void 0:I.value,i=(y=t.find(L=>L.type==="minute"))==null?void 0:y.value;!n||!i||!ce||!le||(ce.textContent=n,le.textContent=i,E.setAttribute("aria-label",`${n}:${i}`))};Ie();E&&window.setInterval(Ie,6e4);const Me=(F==null?void 0:F.textContent)||"I heard fireworks";ne==null||ne.addEventListener("click",()=>{const e=new Date,t=new Date(e.getTime()-e.getTimezoneOffset()*6e4);Ze.value=t.toISOString().slice(0,16)});const h=(e,t="")=>{if(m.dataset.state=e,K.disabled=e==="submitting",F&&(F.textContent=e==="submitting"?o.sendingReport||"Sending…":Me),t){const n=document.querySelector("#manual-submission");n.className="manual-report__submission",n.textContent=t}},Ae=(e,t)=>{const n=new DOMParser().parseFromString(e,"text/html").querySelector("#manual-submission");return n?(document.querySelector("#manual-submission").replaceWith(n),h(t?"submitted":"error"),t):(h("error",o.reportFailed||"Could not send the report. Please try again."),!1)},me=()=>{const e=Number(C.value)>=3;ge&&(ge.textContent=e?o.burstEvent||"Burst Event":o.ordinaryReport||"Ordinary report"),ue&&(ue.hidden=!e)},U=e=>{const t=Number.parseInt(e,10);C.value=String(Math.min(1e3,Math.max(1,Number.isFinite(t)?t:1))),de.disabled=C.value==="1",Ce.disabled=C.value==="1000",me()};U(C.value);de.addEventListener("click",()=>U(Number(C.value)-1));Ce.addEventListener("click",()=>U(Number(C.value)+1));C.addEventListener("change",()=>U(C.value));C.addEventListener("input",me);const q=()=>{B&&window.removeEventListener("deviceorientation",B),window.clearTimeout(J),B=null,J=null,H.hidden=!0,R=null},Xe=e=>{const t=-e;if(R===null)R=t,z.style.transition="none",z.style.transform=`rotate(${R}deg)`,z.offsetWidth,z.style.transition="";else{const n=(t-R+540)%360-180;R+=n,z.style.transform=`rotate(${R}deg)`}Re.textContent=`${Q(e)}° · ${ie(e)}`,H.setAttribute("aria-label",`${o.compassDirection||"Compass direction"} ${Q(e)}° ${ie(e)}`),H.hidden=!1},We=(e,t)=>{const n=u();if(n)if(n.classList.toggle("manual-direction-panel__status--accuracy",t!==null),t===null)n.textContent=o.accuracyUnavailable||"Accuracy unavailable";else{const I=document.createElement("span");I.textContent=o.accuracy||"Accuracy";const y=document.createElement("strong");y.textContent=`±${Q(t)}°`,n.replaceChildren(I,y)}const i=j();i&&(i.textContent=o.stopCapture||"Stop measuring direction")},Be=()=>{u()&&(q(),r()&&(r().dataset.state="measuring"),u().textContent=o.pointPhone||"Point the top of your phone toward the sound — direction will update live.",B=e=>{const t="webkitCompassHeading"in e,n=oe(e.webkitCompassHeading)?e.webkitCompassHeading:!t&&e.absolute&&oe(e.alpha)?(360-e.alpha)%360:null;if(n===null||n<0||n>=360)return;const i=oe(e.webkitCompassAccuracy)&&e.webkitCompassAccuracy>=0?e.webkitCompassAccuracy:null;O.value=n,ve.value=i===null?"":i,We(n,i),Xe(n),window.clearTimeout(J)},window.addEventListener("deviceorientation",B),J=window.setTimeout(()=>{q();const e=j(),t=u();e&&(e.textContent=o.captureDirection||"Start measuring direction"),t&&(t.textContent=o.compassUnavailable||"Compass unavailable on this device."),r()&&(r().dataset.state="unavailable")},15e3))},He=async()=>{var e;if(B){q(),j().textContent=o.captureAgain||"Measure again",r()&&(r().dataset.state=O.value?"captured":"ready");return}if((e=u())==null||e.classList.remove("manual-direction-panel__status--accuracy"),!window.isSecureContext){u().textContent=o.secureCompass||"Compass capture requires a secure HTTPS connection.",r()&&(r().dataset.state="unavailable");return}if(typeof window.DeviceOrientationEvent>"u"){u().textContent=o.compassUnavailable||"Compass unavailable on this device.",r()&&(r().dataset.state="unavailable");return}if(typeof DeviceOrientationEvent.requestPermission=="function"){u().textContent=o.compassPermission||"Requesting compass permission…";try{if(await DeviceOrientationEvent.requestPermission(!0)!=="granted"){u()&&(u().textContent=o.compassDenied||"Compass permission denied."),r()&&(r().dataset.state="unavailable");return}}catch{u()&&(u().textContent=o.compassDenied||"Compass permission denied."),r()&&(r().dataset.state="unavailable");return}}Be()},ae=async()=>{if(U(C.value),q(),h("submitting",o.sendingReport||"Sending…"),Y!=null&&Y.active){try{const e=await Y.clipForSubmission(),t=new FormData(m);e&&t.append("audio",e);const n=await fetch(m.action,{method:"POST",body:t,credentials:"same-origin"}),i=await n.text();Ae(i,n.ok)&&Y.submissionSucceeded()}catch{h("error",o.reportFailed||"Could not send the report. Please try again.")}return}if(window.htmx)try{htmx.ajax("POST",m.action,{source:m,target:"#manual-submission",swap:"outerHTML"})}catch{h("error",o.reportFailed||"Could not send the report. Please try again.")}else m.submit()};m.addEventListener("click",e=>{e.target.closest("#manual-capture-direction")&&He(),e.target.closest(".manual-direction-panel__close")&&(q(),T&&T.append(H))});document.body.addEventListener("htmx:beforeSwap",e=>{var t;((t=e.detail.target)==null?void 0:t.id)==="manual-direction-panel"&&T&&T.append(H)});document.body.addEventListener("htmx:afterSwap",e=>{var n,i;if(((n=e.detail.target)==null?void 0:n.id)!=="manual-direction-panel")return;j()&&((i=r().querySelector(".manual-direction-panel__copy"))==null||i.after(H));const t=document.querySelector("#manual-direction-summary");if(t&&O.value!==""){const I=Number(O.value);t.textContent=`${ie(I)} · ${Q(I)}°`,r().dataset.state="captured"}});K.addEventListener("click",()=>{if(!K.disabled){if(h("submitting",o.requestingLocation||"Requesting your optional location…"),!navigator.geolocation){ae();return}navigator.geolocation.getCurrentPosition(e=>{Se.value=e.coords.latitude,Ge.value=e.coords.longitude,ae()},()=>ae(),{enableHighAccuracy:!1,maximumAge:3e5,timeout:1e4})}});m.addEventListener("submit",e=>{e.preventDefault(),K.disabled||K.click()});document.body.addEventListener("htmx:afterRequest",e=>{if(e.detail.elt!==m)return;const t=e.detail.xhr;t?t.status>=400?Ae(t.responseText,!1):h("submitted"):h("error",o.reportFailed||"Could not send the report. Please try again.")});document.body.addEventListener("htmx:sendError",e=>{e.detail.elt===m&&h("error",o.reportFailed||"Could not send the report. Please try again.")}); diff --git a/staticfiles/vite/assets/manual-report-BTZbA1qV.css b/staticfiles/vite/assets/manual-report-BTZbA1qV.css new file mode 100644 index 0000000..5c09995 --- /dev/null +++ b/staticfiles/vite/assets/manual-report-BTZbA1qV.css @@ -0,0 +1 @@ +.manual-report__supporting{padding:1rem;border:1px solid #514282;border-radius:1rem;background:#11152c}.manual-report__supporting-header{display:flex;align-items:center;gap:.7rem}.manual-report__microphone{display:grid;width:2.5rem;height:2.5rem;flex:none;place-items:center;border-radius:.7rem;background:#2a2051;font-size:1.3rem}.burst-listener__state{display:block;margin-top:.15rem;color:#b9addb;font-size:.84rem}.manual-report__supporting[data-state=listening] .burst-listener__state{color:#8fe5cc}.manual-report__supporting[data-state=error] .burst-listener__state{color:#ffbd9d}.burst-listener{width:100%;margin-top:.85rem}.burst-listener__button,.burst-listener__actions button{min-height:2.75rem;padding:.65rem 1rem;border:1px solid #8d77d2;border-radius:.7rem;color:#e8dcff;font:inherit;font-weight:750;background:#292148;cursor:pointer}.burst-listener__button{width:100%}.burst-listener__panel{color:#f0eaff}.burst-listener__panel strong{font-size:.92rem}.burst-listener__panel canvas{display:block;width:100%;height:4rem;margin:.7rem 0 .35rem;border-radius:.5rem;background:linear-gradient(90deg,#191738,#241b44)}.burst-listener__panel p{margin:.35rem 0 .75rem;color:#b9addb;font-size:.82rem}.burst-listener__panel audio{width:100%;margin-bottom:.75rem}.burst-listener__actions{display:flex;flex-wrap:wrap;gap:.5rem}.burst-listener__actions button{flex:1 1 10rem}.burst-listener__actions #burst-stop{border-color:#fb9b72;color:#ffd8c4;background:#2e1b31}.burst-listener [hidden]{display:none!important}.burst-listener [role=alert]{margin:.65rem 0 0;color:#ffd1b6}.burst-listener button:focus-visible{outline:3px solid #c9b4ff;outline-offset:3px}:root[data-theme=light] .manual-report__supporting{border-color:#d9b4d8;background:#fff8fb}:root[data-theme=light] .manual-report__microphone{background:#ead2eb}:root[data-theme=light] .burst-listener__state,:root[data-theme=light] .burst-listener__panel p{color:#694b68}:root[data-theme=light] .burst-listener__panel{color:#321d42}:root[data-theme=light] .burst-listener__button,:root[data-theme=light] .burst-listener__actions button{border-color:#b68bb5;color:#321d42;background:#ead2eb}:root[data-theme=light] .burst-listener__actions #burst-stop{border-color:#cf7957;color:#71331d;background:#ffe9de}.manual-compass{display:grid;justify-items:center;width:7rem;margin:.6rem 0 0 auto;color:#fff3d7;font-size:.78rem;font-weight:850;font-variant-numeric:tabular-nums}.manual-compass[hidden]{display:none}.manual-compass__dial{position:relative;width:5.75rem;aspect-ratio:1;border:2px solid #f2d7a8;border-radius:50%;background:radial-gradient(circle,#342441 0,#342441 28%,#211a32 75%);box-shadow:0 .35rem 1rem #09061566,inset 0 0 0 .25rem #ffffff12}.manual-compass__rose{position:absolute;top:0;right:0;bottom:0;left:0;transition:transform .12s ease-out}.manual-compass__rose span{position:absolute;line-height:1}.manual-compass__north{top:.38rem;left:50%;color:#ff9e78;transform:translate(-50%)}.manual-compass__east{right:.47rem;top:50%;transform:translateY(-50%)}.manual-compass__south{bottom:.38rem;left:50%;transform:translate(-50%)}.manual-compass__west{left:.47rem;top:50%;transform:translateY(-50%)}.manual-compass__pointer{position:absolute;top:-.55rem;left:50%;width:0;height:0;border-right:.37rem solid transparent;border-bottom:.65rem solid #ffbd62;border-left:.37rem solid transparent;transform:translate(-50%);filter:drop-shadow(0 .1rem .15rem #160d1b)}.manual-compass__center{position:absolute;top:50%;left:50%;width:.5rem;aspect-ratio:1;border-radius:50%;background:#ffbd62;transform:translate(-50%,-50%)}.manual-compass__heading{margin-top:.5rem;white-space:nowrap}:root[data-theme=light] .manual-compass{color:#43243d}:root[data-theme=light] .manual-compass__dial{border-color:#996a9b;background:radial-gradient(circle,#f8ebf8 0,#f8ebf8 28%,#e8d7e9 75%)}:root[data-theme=light] .manual-compass__east,:root[data-theme=light] .manual-compass__south,:root[data-theme=light] .manual-compass__west{color:#43243d}@media(prefers-reduced-motion:reduce){.manual-compass__rose{transition:none}}.manual-report__header{max-width:42rem}.manual-report{--manual-report-section-gap: 1rem}.manual-report__occurrence,.manual-report__duration{display:grid;gap:.55rem;max-width:36rem;margin-bottom:var(--manual-report-section-gap);padding:.85rem 1rem;border:1px solid #584891;border-radius:1rem;background:#151932;color:#e9def8}.manual-report__occurrence input[type=datetime-local],.manual-report__occurrence input[type=number],.manual-report__duration input[type=datetime-local],.manual-report__duration input[type=number]{width:100%;min-height:2.75rem;padding:.45rem .65rem;border:1px solid #725da4;border-radius:.55rem;color:#f5f0ff;background:#211d3d;font:inherit;color-scheme:dark}.manual-report__occurrence small,.manual-report__duration small{color:#cbbce5}.manual-report__duration[hidden]{display:none}.manual-report__time-row{display:flex;gap:.5rem;align-items:center}.manual-report__time-row input{min-width:0;flex:1}.manual-report__time-row button{flex:none}@media(max-width:30rem){.manual-report__time-row{flex-direction:column;align-items:stretch}.manual-report__time-row button{align-self:flex-start}}.manual-report__occurrence button{justify-self:start;padding:.35rem .75rem;border:1px solid #725da4;border-radius:.55rem;color:#f5f0ff;background:#302553;cursor:pointer}.manual-report__check{display:flex;align-items:center;gap:.5rem;color:#e9def8}.manual-report__burst-status{margin:.5rem 0 0;color:#ffbf72;font-weight:750}.manual-submission__edit{display:grid;gap:.4rem;max-width:18rem;margin-top:1rem}.manual-submission__edit input[type=number]{min-height:2.5rem;padding:.4rem;border-radius:.5rem}.manual-submission__edit button{min-height:2.5rem;cursor:pointer}.manual-report__primary{display:grid;gap:var(--manual-report-section-gap);max-width:36rem}.manual-report__quantity{padding:1rem;border:1px solid #584891;border-radius:1rem;background:#151932}.manual-report .manual-report__quantity #manual-occurrences{width:100%;min-width:0;min-height:3.75rem;margin:0;padding:0;border:0;color:#f5f0ff;font-size:clamp(2.25rem,8vw,3.5rem);font-weight:850;text-align:center;background:transparent;-webkit-appearance:textfield;appearance:textfield;-moz-appearance:textfield}.manual-report__quantity #manual-occurrences::-webkit-inner-spin-button,.manual-report__quantity #manual-occurrences::-webkit-outer-spin-button{-webkit-appearance:none;margin:0}.manual-report__stepper{display:grid;grid-template-columns:3.5rem minmax(0,1fr) 3.5rem;align-items:center;gap:.5rem}.manual-report__stepper button{display:grid;place-items:center;width:3.5rem;height:3.5rem;min-height:0;padding:0;border:1px solid #6d54ac;border-radius:50%;color:#f5f0ff;font:inherit;font-size:2rem;line-height:1;background:#302553;cursor:pointer}.manual-report__stepper button:disabled{opacity:.4;cursor:default}.manual-report .manual-report__primary .manual-direction-panel{width:100%;margin:0;border-radius:1rem;background:#1a1739}.manual-direction-panel[data-state=measuring]{border-color:#a27cff}.manual-direction-panel[data-state=captured]{border-color:#68dba1}.manual-direction-panel[data-state=unavailable]{border-color:#d38b7a}.manual-direction-panel__topline{display:flex;align-items:center;justify-content:space-between;gap:1rem}.manual-direction-panel__summary{margin:.35rem 0 .8rem;color:#f5f0ff;font-weight:700}.manual-report .manual-direction-panel__status--accuracy{display:flex;align-items:center;justify-content:space-between;gap:.75rem;margin:.75rem 0;padding:.55rem .75rem;border:1px solid #5d4d92;border-radius:.7rem;color:#d9cfee;background:#191630;font-size:.85rem}.manual-direction-panel__status--accuracy strong{color:#f5edff;font-size:1rem;font-variant-numeric:tabular-nums;white-space:nowrap}.manual-direction-panel__open,.manual-direction-panel__close{min-height:2.75rem;border:1px solid #8d77d2;border-radius:.7rem;color:#e8dcff;font:inherit;font-weight:750;background:#302553;cursor:pointer}.manual-direction-panel__open{padding:.5rem .85rem}.manual-direction-panel__close{min-width:2.75rem;font-size:1.4rem}.manual-report #manual-submit{width:100%;max-width:36rem;min-height:4.5rem;margin-top:var(--manual-report-section-gap)}.manual-report__submit:disabled{cursor:wait;opacity:.72}.manual-submission{display:grid;justify-items:center;gap:.5rem;max-width:36rem;margin-top:1rem;padding:1.3rem;border:1px solid #4caa82;border-radius:1rem;color:#eafff2;text-align:center;background:#10352e}.manual-submission__icon{display:grid;width:3.5rem;height:3.5rem;place-items:center;border:2px solid #6ce4a8;border-radius:50%;color:#eafff2;font-size:2rem;background:#226c51}.manual-submission strong{font-size:1.35rem}.manual-submission p{margin:0;line-height:1.45}.manual-submission__summary{margin-top:.35rem!important;color:#b2e8cf;font-size:.9rem}.manual-submission--error{border-color:#d37c6a;color:#fff0e8;background:#3a1c2b}.manual-submission--error .manual-submission__icon{border-color:#ffac8c;background:#9b493a}.manual-report__submission:empty{display:none}.manual-report button:focus-visible,.manual-report input:focus-visible{outline:3px solid #c9b4ff;outline-offset:3px}.manual-report__supporting{max-width:36rem;margin-top:var(--manual-report-section-gap);padding-top:1.25rem;border-top:1px solid #584891}.manual-report__supporting h3{margin:0;color:#d8cffd;font-size:1rem}.manual-report__supporting .burst-listener{width:100%}:root[data-theme=light] .manual-report__quantity{border-color:#d9b4d8;background:#fff8fb}:root[data-theme=light] .manual-report__quantity #manual-occurrences{border:0!important;color:#321d42!important;background:transparent!important}:root[data-theme=light] .manual-report__stepper button,:root[data-theme=light] .manual-direction-panel__open,:root[data-theme=light] .manual-direction-panel__close{color:#321d42;border-color:#b68bb5;background:#ead2eb}:root[data-theme=light] .manual-direction-panel__summary{color:#321d42}:root[data-theme=light] .manual-report .manual-direction-panel__status--accuracy{border-color:#cfaad1;color:#694b68;background:#fff8fb}:root[data-theme=light] .manual-direction-panel__status--accuracy strong{color:#321d42}:root[data-theme=light] .manual-submission{border-color:#54a67b;color:#164d34;background:#e8fff2}:root[data-theme=light] .manual-submission__icon{color:#fff}:root[data-theme=light] .manual-submission__summary{color:#2b6b48}:root[data-theme=light] .manual-submission--error{border-color:#ca7d65;color:#743520;background:#fff0e8}:root[data-theme=light] .manual-report__supporting{border-color:#d9b4d8}:root[data-theme=light] .manual-report__supporting h3{color:#492846}@media(max-width:42rem){.home-grid{grid-template-columns:minmax(0,1fr)}body:not(.dashboard-page){padding:max(1rem,env(safe-area-inset-top,0px)) max(.5rem,env(safe-area-inset-right,0px)) max(1rem,env(safe-area-inset-bottom,0px)) max(.5rem,env(safe-area-inset-left,0px))}.home-grid .manual-report,.dashboard-report,.dashboard-report .manual-report{overflow:visible}.manual-report{padding:1.25rem}.dashboard-report .manual-report{padding:0}.manual-report__header{padding-right:2.5rem}.manual-report form{padding-bottom:calc(5rem + env(safe-area-inset-bottom,0px))}.manual-report #manual-submit{position:sticky;bottom:calc(.5rem + env(safe-area-inset-bottom,0px));z-index:10;box-shadow:0 .7rem 1.6rem #070a18b3}body:has(#manual-occurrences:focus) .manual-report #manual-submit{position:static}.dashboard-intro{margin-bottom:1rem}.dashboard-intro h1{font-size:clamp(2rem,8vw,2.8rem)}.dashboard-intro p:last-child{margin-top:.75rem;font-size:.95rem;line-height:1.4}.dashboard-section{margin-top:1rem}.dashboard-shell{padding-bottom:calc(2rem + env(safe-area-inset-bottom,0px))}.manual-report__stepper{grid-template-columns:3.5rem minmax(0,1fr) 3.5rem}}@media(max-width:23.5rem){.manual-report{padding:1rem}.manual-report__quantity{padding:.75rem}.manual-report__stepper{grid-template-columns:3rem minmax(0,1fr) 3rem;gap:.25rem}.manual-report__stepper button{width:3rem;height:3rem}}.manual-report__heading-row{display:flex;align-items:center;gap:.7rem}.manual-report__fire{flex:none;font-size:clamp(1.8rem,5vw,2.5rem);filter:drop-shadow(0 .2rem .65rem rgba(255,112,59,.5333333333))}.manual-report__intro,.dashboard-report .manual-report__intro{margin-bottom:.85rem}.report-clock{box-sizing:border-box;width:100%;max-width:36rem;margin:0 0 1rem;padding:.65rem .95rem .7rem;border:1px solid #69539d;border-radius:.85rem;background:linear-gradient(115deg,#17162d,#10182c);box-shadow:inset 0 1px #ffffff0a}.report-clock__label{color:#cbbce5;font-size:.66rem;font-weight:750;letter-spacing:.13em;text-transform:uppercase}.report-clock__display{display:flex;align-items:end;justify-content:space-between;gap:.75rem}.report-clock__time{display:inline-flex;align-items:center;color:#ffbf72;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace;font-size:clamp(2rem,9vw,2.45rem);font-weight:700;line-height:1.1;letter-spacing:0;font-variant-numeric:tabular-nums;text-shadow:0 0 .7rem rgba(255,150,59,.3333333333);white-space:nowrap}.report-clock__time span{display:inline-block}.report-clock__time #report-clock-hours,.report-clock__time #report-clock-minutes{width:2ch}.report-clock__colon{width:1ch;flex:none;margin-inline:-.08em;line-height:1;text-align:center;transform:translateY(-.06em);animation:report-clock-blink 2s steps(1,end) infinite}.report-clock__now{display:inline-flex;align-items:center;gap:.4rem;flex:none;padding:.2rem .45rem;border:1px solid #93634d;border-radius:999px;color:#ffd2a2;font-size:.7rem;font-weight:750;letter-spacing:.08em;text-transform:uppercase}.report-clock__dot{width:.4rem;height:.4rem;border-radius:50%;background:#ffab5d}@keyframes report-clock-blink{50%{opacity:0}}.manual-direction-panel__open{width:100%;text-align:left}.manual-direction-panel--open .manual-compass{width:100%;margin:.5rem auto 1rem}.manual-direction-panel--open .manual-compass__dial{width:min(100%,12rem);border-color:#8b67d4;background:radial-gradient(circle,#302054 0,#302054 20%,#17132d 70%);box-shadow:0 0 0 .35rem #6640a228,0 0 2rem #ac6aff35}.manual-direction-panel--open .manual-compass__pointer{border-bottom-color:#ff925f}.manual-direction-panel--open .manual-compass__heading{font-size:1.1rem}.manual-report__stepper button,.manual-direction-panel__open,.manual-direction-panel__close,.manual-report__submit{transition:transform .15s ease,box-shadow .15s ease,filter .15s ease}.manual-report__stepper button:not(:disabled):active,.manual-direction-panel__open:active,.manual-report__submit:not(:disabled):active{transform:scale(.97)}.manual-report__submit:not(:disabled):hover{filter:brightness(1.05)}.manual-submission--success .manual-submission__icon{animation:manual-confirm .35s ease-out both}@keyframes manual-confirm{0%{transform:scale(.75);opacity:.3}to{transform:scale(1);opacity:1}}:root[data-theme=dark] .home-grid .manual-report,:root[data-theme=dark] .dashboard-report{border-color:#7256ab;background:radial-gradient(circle at 88% 5%,rgba(88,37,74,.3333333333),transparent 13rem),linear-gradient(155deg,#151326,#0d1022 72%);box-shadow:0 1rem 3rem #02041399}:root[data-theme=dark] .manual-report__title{color:#fff8f3}:root[data-theme=dark] .manual-report__intro{color:#d6cce4}:root[data-theme=dark] .manual-report__quantity{border-color:#514896;background:linear-gradient(145deg,#19183a,#121834);box-shadow:inset 0 0 0 1px #ffffff08}:root[data-theme=dark] .home-grid .manual-direction-panel,:root[data-theme=dark] .dashboard-report .manual-direction-panel{border-color:#59499b;background:linear-gradient(145deg,#211945,#151835)}:root[data-theme=dark] .manual-report__supporting{border-color:#493d7d;background:linear-gradient(145deg,#15142f,#10162d)}:root[data-theme=dark] .manual-report__stepper button{box-shadow:0 .25rem .7rem #07041655}:root[data-theme=dark] .manual-report__submit{background:linear-gradient(110deg,#ffc276,#ff7654);box-shadow:0 .55rem 1.35rem #e2633a4d}:root[data-theme=dark] .manual-direction-panel[data-state=measuring]{border-color:#a27cff}:root[data-theme=dark] .manual-direction-panel[data-state=captured]{border-color:#68dba1}:root[data-theme=dark] .manual-direction-panel[data-state=unavailable]{border-color:#d38b7a}:root[data-theme=light] .report-clock{border-color:#8b6bab;background:linear-gradient(115deg,#221b37,#182039)}:root[data-theme=light] .manual-direction-panel--open .manual-compass__dial{background:radial-gradient(circle,#f8ebf8 0,#f8ebf8 25%,#e8d7e9 75%)}@media(prefers-reduced-motion:reduce){.manual-report__stepper button,.manual-direction-panel__open,.manual-direction-panel__close,.manual-report__submit{transition:none}.manual-submission--success .manual-submission__icon{animation:none}.report-clock__colon{animation:none;opacity:1}} diff --git a/staticfiles/vite/assets/map-CneBwLkV.css b/staticfiles/vite/assets/map-CneBwLkV.css new file mode 100644 index 0000000..96b6e45 --- /dev/null +++ b/staticfiles/vite/assets/map-CneBwLkV.css @@ -0,0 +1 @@ +:root{--ink: #eef3ff;--muted: #a9b9d8;--surface: #111a31;--line: #2a3a61;--blue: #83b7ff;--violet: #b69cff;--amber: #ffbc61;--green: #6ee7b7}*{box-sizing:border-box}body{min-width:320px;min-height:100vh;margin:0;color:var(--ink);font-family:var(--font-ui);background:radial-gradient(circle at 8% 0%,#263a76 0,transparent 32rem),radial-gradient(circle at 95% 0%,#492064 0,transparent 27rem),#090e1d}.shell{width:min(100% - 2.5rem,70rem);margin:0 auto;padding:clamp(2rem,6vw,5rem) 0}.topbar{display:flex;align-items:center;justify-content:space-between;gap:1rem;margin-bottom:3.5rem}.brand{display:flex;align-items:center;gap:.7rem;color:var(--ink);font-size:.9rem;font-weight:800;letter-spacing:.1em;text-decoration:none;text-transform:uppercase}.brand-mark{display:grid;width:2.25rem;aspect-ratio:1;place-items:center;border-radius:.75rem;color:#141022;background:linear-gradient(135deg,#fcd34d,#fb7185);box-shadow:0 .5rem 1.5rem #fb718550}.nav{display:flex;gap:.35rem;padding:.25rem;border:1px solid var(--line);border-radius:.75rem;background:#111a31a6}.nav a{padding:.5rem .75rem;border-radius:.5rem;color:var(--muted);font-size:.86rem;font-weight:700;text-decoration:none}.nav a[aria-current=page]{color:var(--ink);background:#2a3b67}.kicker{margin:0 0 .65rem;color:#bfdbfe;font-size:.76rem;font-weight:800;letter-spacing:.14em;text-transform:uppercase}.headline{display:flex;align-items:end;justify-content:space-between;gap:2rem;margin-bottom:2rem}.headline h1{margin:0;font-size:clamp(2.3rem,5vw,4.5rem);line-height:.98;letter-spacing:-.06em}.headline p{max-width:30rem;margin:0;color:var(--muted);line-height:1.6}.filters{display:grid;grid-template-columns:repeat(5,minmax(8rem,1fr)) auto auto;gap:.75rem;align-items:end;margin-bottom:1rem;padding:1rem;border:1px solid var(--line);border-radius:1.1rem;background:#121d37d9;box-shadow:0 1rem 3rem #03071466}.filter{display:grid;gap:.35rem}.filter label{color:#9fb1d5;font-size:.7rem;font-weight:800;letter-spacing:.08em;text-transform:uppercase}.filter select,.filter input{width:100%;min-height:2.65rem;border:1px solid #354a77;border-radius:.65rem;padding:0 .75rem;color:var(--ink);font:inherit;background:#0c1428}.filter select:focus,.filter input:focus{outline:2px solid #82b5ff;outline-offset:2px}.filter-submit{min-height:2.65rem;border:1px solid #8ab7ff;border-radius:.65rem;padding:0 1rem;color:#101a31;font:inherit;font-weight:800;background:#b9d6ff;cursor:pointer}.map-tag{align-self:center;padding:.46rem .65rem;border:1px solid #4a5f8e;border-radius:999px;color:#c9d8f6;font-size:.75rem;font-weight:700;white-space:nowrap;background:#1d2b4e}.map-panel{overflow:hidden;border:1px solid var(--line);border-radius:1.25rem;background:var(--surface);box-shadow:0 1.5rem 4rem #0206168a}.map-header{display:flex;align-items:center;justify-content:space-between;gap:1rem;padding:1rem 1.2rem;border-bottom:1px solid var(--line)}.map-header strong{font-size:.95rem}.live{display:flex;align-items:center;gap:.45rem;color:#a7f3d0;font-size:.8rem}.live i{width:.5rem;height:.5rem;border-radius:50%;background:var(--green);box-shadow:0 0 0 .25rem #34d3992e}.map-wrap{position:relative}.map{height:clamp(30rem,65vh,45rem);background:#dce4cf}.legend{position:absolute;z-index:600;right:1rem;bottom:1rem;width:min(15rem,100% - 2rem);padding:.85rem;border:1px solid #344973;border-radius:.8rem;color:#dce7fe;font-size:.78rem;background:#101a31e8;box-shadow:0 .75rem 2rem #05091480;-webkit-backdrop-filter:blur(10px);backdrop-filter:blur(10px)}.legend h2{margin:0 0 .6rem;font-size:.82rem}.legend div{display:flex;align-items:center;gap:.5rem;margin-top:.4rem}.legend-dot{width:.7rem;height:.7rem;border:2px solid #f2c56b;border-radius:50%;background:#ed8e2e88}.legend-ring{width:.85rem;height:.85rem;border:2px solid #a98af7;border-radius:50%;background:#8b5cf633}.legend-sensor{width:.85rem;height:.85rem;border:2px solid #a5f3fc;border-radius:.2rem;background:#0891b2}.legend-line{width:1.1rem;border-top:2px dashed #644b9c}.report-icon{display:grid;width:2.3rem;height:2.3rem;place-items:center;border:2px solid #fff3d5;border-radius:50%;color:#452000;font-size:1rem;font-weight:900;background:#f7a52f;box-shadow:0 .3rem 1rem #a84f2670}.sensor-icon{display:grid;width:2.3rem;height:2.3rem;place-items:center;border:2px solid #cffafe;border-radius:.55rem;color:#ecfeff;font-size:1rem;font-weight:900;background:#087e97;box-shadow:0 .3rem 1rem #06465a88}.source-icon{display:grid;width:2.45rem;height:2.45rem;place-items:center;border:2px solid #fff3d5;border-radius:50% 50% 50% 0;color:#452000;font-size:1.15rem;background:#f7a52f;box-shadow:0 .3rem 1rem #a84f2670;transform:rotate(-45deg)}.source-icon span{transform:rotate(45deg)}.direction-marker{display:grid;width:3.5rem;height:3.5rem;place-items:center;border:3px solid #fff7e6;border-radius:50%;color:#fff;background:#6d45a0;box-shadow:0 .3rem 1rem #281642b3}.direction-marker span{display:block;font-size:2.45rem;font-weight:950;line-height:1;text-shadow:0 .1rem .25rem #1e1136;transform-origin:center}.map-compass{position:relative;width:5rem;height:5rem;border:2px solid #eaf1ff;border-radius:50%;color:#f7fbff;font-size:.72rem;font-weight:900;background:#111a31e8;box-shadow:0 .5rem 1.5rem #05091480;-webkit-backdrop-filter:blur(8px);backdrop-filter:blur(8px)}.map-compass span{position:absolute;display:grid;place-items:center}.map-compass .compass-n{top:.35rem;left:50%;transform:translate(-50%);color:#ffd18c}.map-compass .compass-e{top:50%;right:.45rem;transform:translateY(-50%)}.map-compass .compass-s{bottom:.35rem;left:50%;transform:translate(-50%)}.map-compass .compass-w{top:50%;left:.45rem;transform:translateY(-50%)}.map-compass .compass-needle{top:1.3rem;left:50%;color:#ffd18c;font-size:2rem;line-height:1;transform:translate(-50%);text-shadow:0 .1rem .35rem #3b1b48}.leaflet-control-zoom a{color:#243456!important}.leaflet-popup-content-wrapper,.leaflet-popup-tip{color:#e9f1ff;background:#14203a}.leaflet-popup-content{margin:.75rem .9rem;font-family:inherit}.popup-title{display:block;margin-bottom:.2rem;font-weight:800}.popup-meta{color:#a9b9d8;font-size:.78rem}@media(max-width:80rem){.filters{grid-template-columns:repeat(5,minmax(0,1fr))}.filters .filter-submit{grid-column:1/3}.filters .map-tag{grid-column:5}}@media(max-width:52rem){.shell{width:min(100% - 1.25rem,80rem)}.topbar{margin-bottom:2.5rem}.headline{align-items:start;flex-direction:column;gap:1rem}.filters{grid-template-columns:1fr 1fr}.filters .filter:first-child{grid-column:1/-1}.filters .filter-submit,.filters .map-tag{grid-column:auto}.map{height:32rem}}@media(max-width:30rem){.nav a{padding:.5rem}.filters{grid-template-columns:1fr}.filters .filter:first-child{grid-column:auto}} diff --git a/templates/js_translations.html b/templates/js_translations.html index 1d87918..f7e146a 100644 --- a/templates/js_translations.html +++ b/templates/js_translations.html @@ -81,6 +81,9 @@ window.BOOMCAST_I18N = { irrelevantGateMessage: "{% trans 'BoomCast could not identify a sound this service currently looks for. You can still submit it for manual review.' as value %}{{ value|escapejs }}", gateChooseMessage: "{% trans 'Recording checked. Choose another recording or submit for manual review.' as value %}{{ value|escapejs }}", secureVideoFailed: "{% trans 'Could not prepare this video for upload. Please choose an audio recording.' as value %}{{ value|escapejs }}", - manualReport: "{% trans 'Manual report' as value %}{{ value|escapejs }}" + manualReport: "{% trans 'Manual report' as value %}{{ value|escapejs }}", + burstEvent: "{% trans 'Burst Event' as value %}{{ value|escapejs }}", + ordinaryReport: "{% trans 'Ordinary report' as value %}{{ value|escapejs }}", + sensorEvent: "{% trans 'Sensor event' as value %}{{ value|escapejs }}" };