feat: Add Map Generator tab for offline map tile downloading - #2599
feat: Add Map Generator tab for offline map tile downloading#2599MartinovEm wants to merge 46 commits into
Conversation
Branch Targeting SuggestionYou've targeted the
If This is an automated suggestion to help route contributions to the appropriate branch. |
0f18283 to
e6e75da
Compare
2861132 to
bf1f572
Compare
Update: Added INAV Terrain (SRTM) targetThe Map Generator now supports generating INAV-compatible What it doesSelect "INAV Terrain (SRTM)" as the target, draw a rectangle over your flying area, and the configurator downloads NASA SRTM 30m elevation data, converts it to How it works
Features
ValidationThe terrain math has been validated against 133M+ data points across 13 tiles (flat terrain to 2900m mountains). Flight-tested on real hardware (SpeedyBee F405 Wing, INAV 9.0.1) — sub-meter mean error vs source data. ScreenshotsTerrain mode — grid overlay and area selection: 
Generating terrain files — sync modal with progress: 
Sync complete — files written to SD card: 
|
|
Fix: OSM tiles returning 403 in packaged builds (commit 97e9739) While working on the Map Generator tab, I noticed that the packaged/release builds of the configurator get 403 errors from OSM tile servers (affects GPS tab, Mission Control — any tab that loads OSM tiles). Dev mode works fine. Root cause: The packaged build loads the app using the local file protocol (
In dev mode, Vite serves via Fix: Added This brings the configurator into compliance with OSM's tile usage requirements. |
ead53a0 to
18be333
Compare
|
That's really interesting. I have confirmed it does set the User-Agent as required -- but I checked in dev mode. Speaking of their TOS, I see also: Do you have thoughts on that? I think the spirit of it is they don't want people downloading tiles they don't end up using, to reduce wasteful load on their servers. Would this feature, if merged, potentially cause that? |
|
@sensei-hacker Thanks for pointing this out! I agree with your interpretation of the OSM Standard tile policy regarding offline/bulk download. Before I change behavior in this PR, I want to confirm the intended direction with you:
If you agree with this direction, I will implement it in this PR. |
Seems reasonable to me. I see that for example MapTiler offers up to 5,000 sessions per month with their free tier, using the same API. Would it make sense to have a link to a documentation page that has a couple such providers? |
|
@sensei-hacker Thank you for the suggestions! I've implemented the first part:
Regarding MapTiler: I'm starting work on adding it as a provider directly in the dropdown. Since it requires a personal API key, the UI will include a key input field (shown only when MapTiler is selected) with a short inline message guiding users to get a free key at maptiler.com -- no separate documentation page needed. |
That will probably be more convenient than the existing API key field that is under the gear icon at top right of Configurator, won't it. I guess it can be the same setting under the hood, but just put the input field right where people need it? |
|
@sensei-hacker Thanks for the suggestion! Just to clarify — there isn't an existing map API key field under the gear icon. The gear settings only have the map provider for the Mission/GPS tabs (OSM / ESRI / MapProxy with URL + layer), which is separate from the Map Generator. So the key is new and lives right in the Map Generator tab where it's most useful, stored persistently in Here's a summary of what's been added: New provider: MapTiler with 6 map types:
The key input shows only when MapTiler is selected, with an inline "Get a free key at maptiler.com" link. A help icon next to the Provider dropdown links directly to the README setup section. MapTiler's free tier covers 5,000 sessions/month which is plenty for personal use. 
Full setup guide with registration steps: README → MapTiler Setup |
Add a new Map Generator tab that allows downloading offline map tiles for OSD map widgets on radios. Works without a flight controller connection. Supported output targets: b14ckyy ETHOS Mapping Widget, Yaapu Telemetry (ETHOS and EdgeTX sub-targets). Map providers: OpenStreetMap, ESRI, Google (Street/Satellite/Hybrid/Terrain). Features: draw rectangle to select download area with live measurements, configurable zoom level range (0-19), sync tiles directly to mounted SD card, export tiles as ZIP archive, eject SD card from the app (Windows/macOS/Linux), local tile cache for faster repeated downloads, save/restore settings persistence, geocoder search, measure tool, right-click context menu.
…dropdown - Make INAV Terrain (SRTM) the default target and list it first, grouped under "Flight Controller" vs the "Radio Widgets" (b14ckyy, Yaapu). - Rename the target label "Target Widget" -> "Target" (Terrain is a flight controller target, not a radio widget). - Apply target mode at init so cold-starting / restoring into terrain no longer leaves the tab in tile-mode UI. updateTerrainMode() previously only ran via syncMapOptions() before map init, where it bailed on the !map guard. - Suppress all tile-provider UI in terrain mode via a single tileMode flag: Google/OSM warnings, the MapTiler API key row, and Sync/ZIP export blocking. Terrain ignores the provider, so the default OSM provider must not show the OSM warning, keep the MapTiler key row visible, or disable export.
6a2edb1 to
05e37a6
Compare
|
Rebased onto All six platform builds pass on my fork: https://github.com/MartinovEm/inav-configurator/actions/runs/28181247774 |
Replaces the hardcoded "EthosMaps_" prefix (misleading for Yaapu,
contradictory for EdgeTX) with {projectName}_{target}.zip, sanitized
for filesystem safety. Gives the previously-unused Project Folder Name
field a real purpose.
…/map-generator # Conflicts: # js/appUpdater.js # js/configurator_main.js
|
Configurator test build ready — commit Download build artifacts for PR #2599 Available platforms (scroll to the Artifacts section at the bottom of the run page):
|
…indings - Associate an aria-label with the MapTiler API key input (Web:InputWithoutLabelCheck). - Hoist the drive-letter sanitization in ejectDrive above the platform branches so the macOS/Linux execFile calls receive the sanitized value too (jssecurity:S6350). The renderer only ever supplies a drive letter, so behavior is unchanged.
|
The latest push resolves the Reliability finding (added an The remaining 3 |
Yaapu maps widgets read Google-style tiles as JPEG — each maplib.lua's google_tiles_to_path() returns "s_%d.jpg" — so the previous PNG output was never found without hand-editing the widget Lua. Encode Yaapu tiles as JPEG (quality 0.8) and change the output extension from .png to .jpg for both ETHOS and EdgeTX (SD and ZIP). Update the on-screen example path and the tile-count label to say JPEG. b14ckyy and terrain output are unchanged.
On a fresh launch the tab opens in terrain mode (the default), but the hidden provider dropdown still holds its startup default 'OSM'. The Sync/ZIP click handlers checked provider === 'OSM' before the terrain branch, so both buttons silently did nothing until the user switched to a tile target and back. Move the isTerrainMode() check to the top of both handlers so terrain opens its sync modal directly and ignores the provider. Tile targets keep their OSM/MapTiler guards.
|
@sensei-hacker Pushed two small Map Generator fixes (Yaapu tiles now JPEG; terrain Sync/ZIP buttons work on cold start). All 7 builds are green. The SonarCloud failure is unchanged and expected — these fixes don't touch the flagged code, so it's still just the same 3 |
Tile x/y were computed and fetched at slippy zoom z-1 but written to the folder named z, so folder "12" held zoom-11 imagery. The ETHOS/Yaapu map widgets open folder N and address tiles at slippy zoom N, so they never found the off-by-one tiles and showed a blank map for every provider. Drop the -1 offset (tz = z) in calculateTiles() and buildTileList() so the folder number equals the real slippy zoom, matching the widgets and the original standalone tool. Verified on hardware.
…pped fetchResizedTile() drew a fixed 256x256 source rect, but MapTiler serves 512px tiles, so only the top-left quarter was captured and MapTiler maps came out as patchwork. Use the image's natural size as the source rect so the whole tile is scaled to 100x100. No-op for 256px providers (ESRI, Google, OSM); the ESRI labels overlay is left unchanged.
Add "Winter" to the MapTiler map-type list (style id winter-v4, PNG raster), wired into the tile URL builder, the preview layer, and the map-type dropdown. Other providers are unaffected.
…ource Terrain .DAT files can now be built from Copernicus GLO-30 instead of SRTM1. Validated against ICESat-2 ATL08 (n=10,777 paired points), GLO-30 reaches MAE 1.07 m on bare earth versus 2.01 m for SRTM, and it covers up to 84°N where SRTM stops at 60°N. SRTM stays selectable as a fallback. Copernicus ships Cloud-Optimized GeoTIFF, so geotiff (MIT) is added as a dependency. Its 3600x3600 pixel-is-point grid lands on the same whole arc-second graticule as SRTM .hgt, so filling the 3601x3601 grid the converter expects is a direct pixel copy with no resampling; the tile's south and east edge lines are copied from the neighbouring tiles, and the north/east/north-east neighbours are fetched as thin strips to cover the block grid's overshoot past the 1° square. The .DAT encoder is untouched: block layout, CRC-16/XMODEM, geodesy constants and filenames are unchanged, only the height values differ. Copernicus and SRTM grids are cached under separate keys so switching source cannot mix them. If the Copernicus service is unreachable the user is asked before falling back to SRTM; the source is never switched silently. Per the WorldDEM-30 licence the required source and liability notices are shown in the tab and written into the exported ZIP as NOTICE.txt. Verified on N42E023: CRC valid on all 15,500 blocks, sampled heights match the source GeoTIFF, no edge holes, and a real flight controller reads the files and transitions seamlessly into neighbouring tiles generated from SRTM.
Terrain: Copernicus GLO-30 is now the default elevation source (SRTM kept as fallback)The Terrain target can now build WhyI validated four public 30 m DEMs against ICESat-2 ATL08 laser ground returns (bare earth, orthometric EGM2008, cloud-free / snow-free / uncertainty < 10 m). Pooled study — n = 10,777 paired points, block-bootstrap 95% CI, Wilcoxon signed-rank:
Copernicus vs the current SRTM path: ΔMAE −0.94 m [−1.23, −0.75], p < 0.001. 
Denser single-tile check — same product and same QA filters, but seven summers (2019–2025) of ground tracks over one tile, n = 16,962: Copernicus 1.08 m, Re:Earth 1.13 m, SRTM 2.29 m, JAXA 3.68 m. Copernicus is unchanged with 6× more truth data and the ranking holds. SRTM also carries a +1.77 m high bias against the laser, versus +0.47 m for Copernicus. 
Spatially, how each candidate differs from the SRTM baseline shipped today (source rasters, identical sampling grid): 
Copernicus and Re:Earth are nearly identical, as expected — Re:Earth is Copernicus-derived. JAXA is visibly noisier and biased high. Two honest caveats: at n ≈ 11k almost any real difference is "significant", so the number that matters is the effect size in metres, not the p-value — all four are sub-3 m DEMs. And the DEMs are fixed-epoch (SRTM 2000, Copernicus 2010–2014) while the laser data is 2019–2025, so real terrain change adds noise — but equally to all four, so the comparison stays fair. The practical wins are bare-earth accuracy, coverage to 84°N (SRTM stops at 60°N), and fresher data. How it worksCopernicus ships Cloud-Optimized GeoTIFF, so The
LicenceCopernicus WorldDEM-30 permits redistribution of derived products, including commercially, conditional on two verbatim notices. These are shown in the tab and written into the exported ZIP as VerificationOn
|
…loader Use optional chaining for the not-found checks and Object.hasOwn() for the tile-cache lookup. Behaviour is unchanged.
|
2 participants
Add a new Map Generator tab that allows downloading offline map tiles for OSD map widgets on radios. Works without a flight controller connection.
Supported output targets: b14ckyy ETHOS Mapping Widget, Yaapu Telemetry (ETHOS and EdgeTX sub-targets). Map providers: OpenStreetMap, ESRI, Google (Street/Satellite/Hybrid/Terrain). Features: draw rectangle to select download area with live measurements, configurable zoom level range (1-20), sync tiles directly to mounted SD card, export tiles as ZIP archive, eject SD card from the app (Windows/macOS/Linux), local tile cache for faster repeated downloads, save/restore settings persistence, geocoder search, measure tool, right-click context menu.