diff options
Diffstat (limited to 'SESSION_STATE.md')
| -rw-r--r-- | SESSION_STATE.md | 75 |
1 files changed, 66 insertions, 9 deletions
diff --git a/SESSION_STATE.md b/SESSION_STATE.md index a5ccf86..e17781b 100644 --- a/SESSION_STATE.md +++ b/SESSION_STATE.md @@ -1,10 +1,10 @@ # SESSION_STATE.md ## Current Task Goal -GPS navigation implementation: position model, SOG/COG, NMEA RMC parser — COMPLETE +Section 7.3 AIS display — COMPLETE (2026-03-15): AIS integrated into ViewModel, MapFragment, and MainActivity ## Verified (2026-03-15) -- All 22 GPS/NMEA tests GREEN via test-runner (BUILD SUCCESSFUL) +- All 41 tests GREEN: 22 GPS/NMEA + 16 AIS + 3 ViewModel AIS (via /tmp/ais-vm-test-runner/) - NmeaParser extended with MWV (wind), DBT (depth), HDG/HDM (heading) parsers - Sensor data classes added: WindData, DepthData, HeadingData - NmeaStreamManager added for TCP stream management @@ -67,13 +67,70 @@ GPS navigation implementation: position model, SOG/COG, NMEA RMC parser — COMP - `app/src/test/kotlin/org/terst/nav/gps/GpsProviderTest.kt` (9 tests, pre-existing) - All verified via direct `kotlinc` (1.9.22) + `JUnitCore` invocation +### [APPROVED] AisVessel data class +- File: `app/src/main/kotlin/org/terst/nav/ais/AisVessel.kt` +- Package: `org.terst.nav.ais` +- Fields: mmsi, name, callsign, lat, lon, sog, cog, heading, vesselType, timestampMs +- Note: `com/example/androidapp` tree is root-owned; files placed under `org/terst/nav/` (actual project package) + +### [APPROVED] CpaCalculator object +- File: `app/src/main/kotlin/org/terst/nav/ais/CpaCalculator.kt` +- Flat-earth CPA/TCPA algorithm; returns (cpa_nm, tcpa_min) +- Zero-relative-velocity guard: returns (currentDist, 0.0) + +### [APPROVED] AisVdmParser class +- File: `app/src/main/kotlin/org/terst/nav/nmea/AisVdmParser.kt` +- Parses !AIVDM/!AIVDO sentences; multi-part reassembly by seqId +- Type 1/2/3: MMSI, SOG, lon, lat, COG, heading decoded +- Type 5: MMSI, callsign (7 chars), name (20 chars), vesselType decoded; trailing '@'/' ' trimmed +- Not-available sentinel handling: SOG=1023→0.0, COG=3600→0.0, lon=0x6791AC0→0.0, lat=0x3412140→0.0 + +### [APPROVED] AIS Tests (16 tests — all GREEN) +- `test-runner/src/test/kotlin/org/terst/nav/ais/AisVesselTest.kt` (4 tests) +- `test-runner/src/test/kotlin/org/terst/nav/ais/CpaCalculatorTest.kt` (4 tests) +- `test-runner/src/test/kotlin/org/terst/nav/nmea/AisVdmParserTest.kt` (8 tests) +- Verification harness: `/tmp/ais-test-runner/` (JUnit5, com.example.androidapp package) +- Production test files also in `android-app/app/src/test/kotlin/org/terst/nav/ais/` + +### [APPROVED] AisRepository class +- File: `app/src/main/kotlin/org/terst/nav/ais/AisRepository.kt` +- Upserts position targets by MMSI; merges type-5 static data (name/callsign/vesselType) +- Pending static map: holds type-5 data until position arrives for same MMSI +- `evictStale(nowMs)`: removes vessels older than `staleTimeoutMs` (default 10 min) +- `AisDataSource` interface (with Flow<String>) defined in same file + +### [APPROVED] AisHubApiService + AisHubVessel +- File: `app/src/main/kotlin/org/terst/nav/ais/AisHubApiService.kt` +- Note: placed in `ais/` directory (writable) with package `org.terst.nav.data.api` +- `AisHubVessel` data class with Moshi `@Json` and `@JsonClass(generateAdapter=true)` annotations +- `AisHubApiService` Retrofit interface: GET /0/down with lat/lon bounding box params + +### [APPROVED] AisHubSource object +- File: `app/src/main/kotlin/org/terst/nav/ais/AisHubSource.kt` +- Converts `AisHubVessel` REST response to `AisVessel` domain objects +- Returns null for non-numeric MMSI, lat, or lon; defaults sog/cog=0.0, heading=511, vesselType=0 + +### [APPROVED] AIS Repository Tests (11 tests — all GREEN) +- `app/src/test/kotlin/org/terst/nav/ais/AisRepositoryTest.kt` (7 tests) +- `app/src/test/kotlin/org/terst/nav/ais/AisHubSourceTest.kt` (4 tests) +- Harness: `/tmp/ais-repo-test-runner/` (JUnit5, org.terst.nav package, stub annotations for offline build) + +### [APPROVED] Section 7.3 AIS display — ViewModel + MapFragment integration (2026-03-15) +- `MainViewModel.processAisSentence(sentence)` — delegates to AisRepository, updates `_aisTargets` StateFlow +- `MainViewModel.refreshAisFromInternet(latMin, latMax, lonMin, lonMax, username, password)` — AISHub polling via inline Retrofit; skips if username empty +- `MainViewModel.aisTargets: StateFlow<List<AisVessel>>` — exposed to observers +- `AisRepository.ingestVessel(vessel)` — direct insert for internet-sourced vessels +- `MapFragment.updateAisLayer(style, vessels)` — GeoJSON FeatureCollection, SymbolLayer "ais-vessels"; heading-based iconRotate; zoom-step text (visible at zoom ≥ 12) +- `MapFragment.addShipArrowImage(style)` — rasterises ic_ship_arrow.xml into style +- `ic_ship_arrow.xml` — pink arrow vector drawable for AIS icons +- `MainActivity.startAisHardwareFeed(host, port)` — TCP stub reads !AIVDM lines, forwards to viewModel +- `MainViewModelTest` — 3 new tests: valid type-1 adds vessel, same MMSI deduped, non-AIS stays empty +- JVM test harness: `/tmp/ais-vm-test-runner/` (3 tests — all GREEN) + ## Next 3 Specific Steps -1. **UI instrument display** — SOG/COG readout widget in `MainActivity`; bind to `GpsProvider` - listener; update TextView/custom view on each `onPositionUpdate` -2. **NmeaGpsProvider** — `GpsProvider` implementation parsing NMEA RMC sentences over TCP/UDP - socket using existing `NmeaParser`; automatic reconnect on disconnect -3. **Fix build permissions** — `chown -R www-data:www-data /workspace/nav/android-app/app/build` - to enable full Gradle unit test runs +1. **CPA/TCPA alarms** — use CpaCalculator in ViewModel to emit alarm when CPA < threshold; add UI indicator in MapFragment +2. **AISHub periodic polling** — call refreshAisFromInternet() on a timer (e.g. every 60s) when GPS position is known +3. **AIS TCP full implementation** — replace stub socket reader with NmeaStreamManager integration ## Scripts Added - `test-runner/` — standalone Kotlin/JVM Gradle project; runs all 22 GPS/NMEA tests without Android SDK @@ -81,4 +138,4 @@ GPS navigation implementation: position model, SOG/COG, NMEA RMC parser — COMP ## Process Improvements - Gradle builds blocked by Android SDK requirement; added `test-runner/` JVM-only subproject as reliable test runner -- All 22 tests verified GREEN via `test-runner/` JVM project (2026-03-14) +- All 22 tests verified GREEN via `test-runner/` JVM project (2026-03-14)
\ No newline at end of file |