Repository navigation
merge develop into ground-plan - #3481
Conversation
terrain: wait for Kartverket's overuse answer and pace Norway's requests
…f a line still() starts an engine of its own on a canvas that the page does not show, at a size in pixels, and ends it after the still. The engine draws the jittered frames of the view again and copies the canvas and the depth of the last frame. For a line, it puts each point on the drawn terrain as the route ribbon does and tests it against that depth. coverView() chooses the view of a cover from at most four terrain tiles. With `still` in the address, the page starts no engine and gives both functions to a script. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
A duplicate keeps the summary of its source. The planner counts and removes records that are not route records. The store reads indexedDB only when it opens. The state checks use only own keys. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Delete builder/desktop and the web code that only the desktop host reaches: the device page, the ride library page, the desktop page, the gating layer and the desktop platform. The hosted map builder keeps the device step; a browser with no WebUSB now shows "This browser cannot use the USB cable. Use Chrome or Edge." obc-usb stays for `obc format-card`. Its `open` returns only the link, and the Linux udev rule moves to builder/usb/linux with a README. CI loses the desktop-frontend and desktop jobs, and the tools, suites, licences and data readers lose their desktop entries. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The new crate host/obc-fit reads the FIT container in both byte orders, with compressed timestamps, and skips developer fields and unknown messages. A cut file or a wrong CRC gives the records before the damage. It writes an activity file for a ride and a course file for a route. The bridge exports obc_fit_read, obc_fit_write_ride and obc_fit_write_course, and lib/core/fit.ts wraps them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Library store, summaries and the backup file
…-desktop-app # Conflicts: # docs/design/map.json
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…draw An engine with a size makes no controls and no resize observer, and only it copies the canvas and the depth. A capture rejects when no frame can draw. A route of no extent gets no view. The GPU test skips itself on a software renderer. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ecords A course point of a turn type is no waypoint. The serial number of a course comes from a hash of its name, positions and time, so two courses have two file_ids. A compressed timestamp past the end of u32 is dropped. A course keeps a record with a position and no time. The fixture test waits for the owner's files and moves to a later change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Delete the three-way confirm, the TypeScript trip codec, and the OBCR waypoint reader with its wasm export. `vendorIn` and `siteNav` are now required, so the "unavailable" error and the header without site links go. The device end of the loopback link is a `RecordLink`. Comments no longer name the desktop app. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
trailview: render one view to a still, with the place of each point of a line
The still gives its credits. The script home-views.mjs renders the views of home-views.json at times by the sun, uploads a set under its digest, and puts the manifest of a set at the live key. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…till Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The cover job renders the TrailView still of a route or a ride, one at a time in the whole browser, and stores the image and the place of each point of the summary line in the library. Cover.svelte draws the line on the cover, with a mark and a selected part, or the line on a plain ground when there is no cover. planner.ts makes the one library of the page, gives it to the planner and starts the job. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…over Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Remove the desktop app
switch checks the bucket, not the cache of the public host. upload resolves --out and takes only images of the production release. A list takes the whole copied address. A sun up at midnight on the Zurich clock gets its own refusal. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # docs/design/map.json
Keep an ask that comes during a render or before the job starts, store no cover for a deleted record, keep far points as floats, and make the screenshot test fail on a lost line, mark or hidden strength. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Rust 1.100 extends needless_range_loop and needless_bool. Seven places on develop now fail clippy with -D warnings. Each change keeps the behavior. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…tings Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Ride page: one line large in a window, in the colours of its zones (#3433)
The name of the axis beside the ticks switches between the distance and the time of day. A stop is a mark on the row of the ticks, and the foot of the pointer says its length. With a part selected, the menu "More" has "Only the selected part" for the three exports. With every line hidden, the card shows its chips only. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
The cover drew a selected part in amber, and the map drew it in the colour of the line. Now both draw the part in the colour of the line and the rest pale. On the cover the pale rest has no glow and no core: with them, the light tint was brighter than the part on a dark slope. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
… card as the part The foot of the pointer on the time axis says the time at the place of the pointer. The length of a stop rounds to minutes before it changes to hours. The stops are found one time for a ride. A click on a climb in the left card selects it as the part. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
The rest of the line draws before the part, so the part is on top where the line crosses itself or goes back on itself. A segment that overlaps the part is in the part, so a part shorter than one segment shows. The test reads the colour, the strength and the order of each stroke. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Ride page: the time axis, the stops and the export of a part (#3433)
…way back A drag across the line of the window shows that stretch large. A pinch on a trackpad changes the length of the view, and a sideways scroll moves it. The ticks, the scale, the numbers and the zone times are of the view. The button "Whole ride" stands beside the title while the view is a stretch; Escape goes back to the whole ride first and closes the window second. The window opens on a selected part. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Cover: a selected part keeps the colour of its line, as on the map
A sideways scroll on the line never reaches the browser, also in the whole ride. The numbers of a stretch are of the samples from the first to the last one in it, and of the two samples around a stretch with none. While the view is that of the selected part, the numbers are of the samples of the part. The animation stops with the window, the scale of the whole line is computed once, and the ticks are fine only in a stretch. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Ride page: a stretch of one line large in its window, and an obvious way back
Merges origin/develop 636f9ce into ground-plan a8f1293. Conflicts: - engine.ts, trailview.ts: develop's stills and the plan's boot both stay. `TrailView.start` takes its options in one object (plan, finest, pool, size); the still's output size goes through `size()`, which the frames before the device and `fit()` read. - planner.rs: trailview-features takes revision 19, above develop's 12 and ground-plan's 18, which both used 9 to 12 for other contents. - terrain.rs: develop's reader with FINE_ZOOM (the same rule on both sides). - ci.yml: develop's jobs, without the desktop jobs, plus the ground plan bridge downloads. - justfile: the desktop recipe goes, as on develop. - vite.config.ts: develop's define, plus the stamp and bundle plugins. - README: both rows. map.json: written again by `obc cairn map`. Semantic conflict: ground-plan's `View` requires `plan`, so develop's `coverView` and the fake renderer of `covers/job.test.ts` set `plan: 'off'`. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the
|
The state of a backup has the field `nextMap`: the regions, the boxes and the two map styles of the device map that the rider chose, and the size of its download. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…s the map that waits The page `#/device/area` shows the coverage map with the ground outside the area pale and the routes of the library on it. The rider adds regions with a click and boxes with a drag, sees the routes that leave the area with two answers, opens the map styles in a window, and Done writes the library state `nextMap`. The page works with no device. The row Map of the Device page shows the map on the device, or "New area" or "New colours" with the size of the download, and the link to the page. The button "Send the map" is in the row and does nothing yet: no code builds a map. The coverage map has the props `tool`, `rail`, `pale` and `routes`, and it loads its own style rules, so a page of the shell can show it. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
- The Device page loads the regions of the map catalog one time, and the row Map keeps its text during a sync. - Done compares the map with the stored `nextMap`, so a stored map with a region that the catalog no longer holds is written again. - A route that leaves the area on two sides gets one box for each side. - A route with no length outside the area gets no warning. - A stored box must have a size. - The dark rule of the pale ground repeated the light value; a comment named a rule that is not there; an empty branch is gone. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
The button of the row Map starts a run of its own in the device sync state: it downloads the cells of `nextMap`, assembles the map in the tab and puts it on the device. A sync never builds a map, and the sync and the map send wait for each other. After the put the run remembers the area of the map object and the map waits no more, unless the rider chose another map during the build. While the run goes, the row shows one line with the step and one bar, and "Stop" in the place of the button. Stop, a pulled cable and a card with no room keep the old map on the card and the new map waiting, each with one sentence. A browser that saves data asks first. The working files of map assembly have the Web Lock `obc-map-work`, with a signal that ends a wait, so the map builder page and this run do not delete the files of each other. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
- The build makes exactly the map that waits or nothing: a region, a box or a map style that is not there any more refuses the run, so the remembered area of the map on the device is never false. The comparison of two maps is now in `lib/device-sync/area.ts`. - Stop is not available while the device stores the map. - Stop and a pulled cable also end the wait for the modules and for the map catalog. - A failed write of the library after the put is no failed send. - The sentence of the last send goes when another map waits. - The text for a send that did not end makes no claim about the download. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…intly The ground outside the area lost its contrast under the pale layer. It is now grey with a light veil: the names, the roads and the lakes keep their contrast, and the area stands out by its colour. The lines of the map cells show faintly where a cell is at least 36 pixels wide, in both modes: an area grows to whole cells, and the lines show why. While the rider draws a box, a line goes around the cells that it takes. Both are for a page of the shell (`pale`). The map builder page is as it was. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
… draws only what the renderer shows Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
Device map: the page for the area and the colours, and "Send the map" (#3441)
|
Owner decision, 2026-11-14, on the changes to the default view (the table of this pull request and the sheet The default-view changes are accepted. Still needed before Generated by Claude Code |
Merges origin/ground-plan 46793ba (#3482, deck step part B) into the merge of develop. Both sides had trailview-features revision 19 for other contents (this branch: develop's 12 and ground-plan's 18 merged; #3482: the merged A lines), so the layer takes the next number above both: 20. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Review of PR #3481 (develop into ground-plan), head 1b9bb6fVerdict: MERGE (into Reviewer: fresh adversarial agent. I changed no code, pushed nothing, posted nothing. Blocking findingsNone. I found no lost or doubled behaviour of either side, no broken CI job set, no wrong revision and Non-blocking findingsN1. The plan bridge guard trips on the next Rust release or dependency bump, on unrelated develop PRs
N2. Develop loses every automated TrailView render in CI, not only the weekly job
N3.
|
Status (2026-11-14 evening)
ground-plana8f1293 +develop636f9ce (the first merge, described below).ground-plan46793ba (ground plan GP12.3b part B: the viewer draws the decks, the device links the storeys #3482, deck step part B).develop19dc9d0 (Device map: the page for the area and the colours, and "Send the map" (#3441) #3483, the device's area page; it touches no TrailView file).trailview-featuresrevision 19 for other contents (this branch:develop's 12 andground-plan's 18 merged; ground plan GP12.3b part B: the viewer draws the decks, the device links the storeys #3482: the merged A lines). The merged layer takes the next number above both: 20 (host/obc-data-steps/src/planner.rs). A bake of the fixture box with the mergedtrailview-featuresgives the committed tiles (ground plan GP12.3b part B: the viewer draws the decks, the device links the storeys #3482's rebake) byte for byte.the_tiles_carry_the_levels_of_each_celland the storeys tests pass (obc test -p obc-ground-plan: 135 of 135, default features = storeys on).develop. Do not merge this branch intodevelopwithout his word.builder/web/src/lib/trailview/engine.tsandbuilder/web/src/trailview.ts(the stills ofdevelopbeside the boot of the plan),.github/workflows/ci.yml(develop's jobs plus the plan bridge downloads), the revision 20 inplanner.rs, and the semantic fixplan: 'off'(still-view.ts,covers/job.test.ts).Proofs on 1b9bb6f:
ground-plan46793ba.underpass-eyediffers by 579 px: the known two-state flip at the edges of one house, as before.i01-wall-cap,i07-road-up-wall,main-road-15m,i09-shading,lake-shore,b315-bridge-junction,v17-sharp-corners,b45-bridge-junction,d-bridge-eye,under-bridge,junction0-far-700,stream-lake-far.develop's stills on the new build, on the GPU:still.test.js2 of 2 andhome-views.test.js6 of 6 (with@gpu) pass.obc test -p obc-trailview-features(122),-p obc-data-steps(80),-p obc-ground-plan(135).cargo fmt --all --check.obc suites check,obc prose --check,build_docs.py --check-links.obc cairn mapchanges only the line, violation and problem counts, whichcheckignores. I did not commit them.develop.ios-app18.6 min,test11.9 min).developmoved again after the re-merge, to ce7d966 (test: two cases of one test get their own names, so the test catalogue imports again #3485: one test name inroads/standing.test.ts). It merges without a conflict. I did not merge it.The sections below describe the first merge (33897af). Their numbers hold for the code. The plan path numbers were measured against a8f1293.
Why
The owner wants
ground-planto merge intodevelopsoon. This pull request is the preparation: it mergesdevelopintoground-plan, so that the later merge intodevelophas no conflicts, and it shows what the default path (noground=plan) gets. It does not changedevelop.Commits merged
origin/ground-plana8f1293 (first parent, ground plan GP12.3b part A: the levels in the bake, the storey shell without its own machinery (WASM cuts) #3470)origin/develop636f9ce (second parent, Ride page: a stretch of one line large in its window, and an obvious way back #3480)One merge commit, no rebase. Before the merge,
develophad 361 commits thatground-plandid not have, andground-planhad 655 commits thatdevelopdid not have. The merge base is 9ec892f.Conflicted files
The merge gives conflicts in the 9 files of the audit (
epic-audit/AUDIT.mdsection 4.2). I read the pull requests of both sides for each file.ground-plandevelopbuilder/web/src/lib/trailview/engine.tsstart(canvas, gpu | Promise<Gpu>, ..., plan, finest, pool),engine.request()before the attach, the frames before the device (ask()), the canvas size in a methodsize(),eyeDrawn, the reach margin (#3260)start(..., scale, size?), a fieldsize, noControlsand noResizeObserverfor a still,capture(),grab,copy(), the route ribbon liftLIFT_M,placed()start(canvas, gpu, config, view, scale, { plan, finest, pool, size }): the options are one object, because two optional lists of positions can not both followscale. The still's size is the fieldoutput(the namesizeis the method ofground-plan), andsize()givesoutputwhen it is set, soask()andfit()use the still's size. In the frame loop, the grabbed frame resolves first, theneyeDrawnruns as onground-planbuilder/web/src/trailview.tsmain()loads the release, the device, the bridge and the plan workers side by side; the pipelines compile at the attachopen()gives the device and the release tomain()and tostills()(?still), and callsprepare()open(plan)follows the boot ofground-planand gives the device as a promise.main()passes the promise tostart.stills()waits for the device and callsprepare(), as ondevelop: no engine runs on a still page before the first still, so no worker waits for that compilehost/obc-data-steps/src/planner.rstrailview-featuresrevision 18ground-plan(it holds the same reader fix), and a bake of the fixture gives the committed tiles byte for byte (see Checks)host/obc-trailview-features/src/terrain.rsz == 13FINE_ZOOMdevelop's text. The tiles are at most zoom 13, so the two are the same rule.github/workflows/ci.ymlobc-ground-plan-bridge-pkginweb,web-browseranddesktop-frontenddesktop-frontendanddesktop; downloadsobc-flat-device-pkginweb-browser; a shorter comment inwebdevelop's jobs and comments, plus the plan bridge download inwebandweb-browsertools/justfiledevelopbuilder/web/vite.config.tsstampVersion(),bundleVersions()VITE_FAKE_DEVICEdefine and a shorter licence commentdevelop's comment linebuilder/web/src/lib/trailview/README.mdgroundandplanstilldocs/design/map.jsonobc cairn map.docs/design/README.mdcame out the same as ondevelopSemantic conflict
svelte-checkfound one conflict that git did not show.ground-planmadeView.plana required field (theplan=facesdebug draw).develop'scoverView()(still-view.ts) and the fake renderer incovers/job.test.tsmake views without it. Both now setplan: 'off', asdefaultView()does. This is the one test file that I changed: the type of its fake view must matchView.I read the other files that both sides changed and git merged without a conflict:
terrain/terrain.ts(develop: one comment line),harness.js(develop removes theFLATground, which noground-plancode uses;ground-planexportsGPU),playwright.trailview.config.js(develop'sserve.py, ground-plan'sOBC_TRAILVIEW_GPU),tools/testing/suites.toml,tools/test_plan.pyand its test,Cargo.toml,Cargo.lock(againstground-plan, onlydevelop's own crates change; no third-party version changes),docs/design/trailview.md,docs/testing.md,AGENTS.md,specs/obc-data.md,host/obc-data-steps/src/functions.rs,host/obc-data/README.md,.gitignore,firmware/tools/dependency_rules.jsonandhost/obc-trailview-features/src/roads/rows.rs(develop's clippy loop; the same as onground-plan). Each holds the change of both sides, and no side uses a name that the other removed.Notes:
developloses the weekly TrailView job oftest-weekly.yml(tests: cut the slow TrailView tests and route the census by its inputs #3216). The@gputests run in the manual suiteweb.trailview-gpuon a GPU. On SwiftShader,develop'sstill.test.jsandhome-views.test.jsskip themselves anyway.ground-planfile names the desktop app thatdevelopremoved (grep desktopin the suites, the justfile and the CI files finds onlysim/desktop).Plan path (
ground=plan): no change againstground-planThe plan path of the merge is the plan path of
ground-plan:host/obc-ground-plan,builder/ground-plan-wasm,data/trailviewand the browser fixture are byte-equal toground-plan. Againstground-plan, the merge changes onlyCargo.lockbydevelop's own crates (no third-party version moves). The plan bridge that this PC builds from the merge is byte-equal to the one it builds fromground-plan(2,002,512 B). In CI the bridge is 772,451 B gzip and 2,001,570 B raw, as in the run of ground plan GP12.3b part A: the levels in the bake, the storey shell without its own machinery (WASM cuts) #3470.build_request, thenmesh_cellwith the rims of the cells about it), storeys off as in the bridge: records, face words, far block, rim and mesh digests ofground-plana8f1293 and of the merge are equal in 256 of 256 cells.trailview-features(the inputs ofbaseline/feature-bake, 4 threads) gives the committed tiles byte for byte (make-fixture.py features: no file changes). So revision 19 needs no new fixture bytes; the revision only keys the nextobc databake.ground=plan(v17-sharp-corners,b45-bridge-junction,d-bridge-eye,underpass-eye,stream-culvert-main-road,lake-shore,junction0-eye,i07-hairpin-eye), GPU, 1920 × 960, the same fixture data: 7 views are equal to the pixel.underpass-eyetakes one of two states from run to run on both builds (3 runs each: the states differ by 579 pixels at the edges of one house); each state of one build is equal to a state of the other.Default path (no
ground=plan): what develop's users getMethod: every view of
road-views.json(120),road-views-top.json(50),road-views-far.json(18) andviews.json(3), shot on the GPU (GTX 1660 SUPER, under the lock, 1920 × 960, one page at a time) from fixture builds ofdevelop636f9ce and of the merge 33897af. Both builds read the same data: the fixture terrain and the merge's fixture feature tiles, no ground layers. A pixel counts when one channel differs by more than 8 of 255. To name the causes, I shot the default path ofground-plan's first-parent history (79 merges) with the merge's harness and the same data: 24 sample views at every 10th merge and then at every merge of each interval that changed, all 191 views at the merge after each cause, and the changed views at the merge before it. The shots are on timosPC:/media/timo/OSM1/tmp/ground-plan/develop-merge-2/(sheets/INDEX.md; the per-view numbers insheets/default/attribution2.tsv).Result:
ground-plana8f1293 | merge: 191 of 191 views equal. Nothing on the default path comes from the merge itself.develop| merge: 188 of 191 views differ, 3 are equal. Every part of 100 pixels or more is named below. The merge's default path gave the same pixels in two runs (36 views);developand the earlyground-planbuilds flip between two states in some views from run to run (for examplev11-two-bad-junctions1,533 px,b45-bridge-junction-far-7001,381 px,conn-path-off-track-eye760 px): such parts are named "flip".data/trailview/roads.json: the cut and fill slopes of every class (roads 0.85 → 2:3, tracks 0.85 → 1:1, paths 2.14 and 0.70 → 1:1), from its commit 37664cd. The old corridors read these slopes, so the banks beside every road and path are gentler and wider, wall tops are lower, and the ground under an eye moves, so top views move a little. Proof:ground-planjust before #3188 with only this file changed gives the shots after #3188 to the pixel in 10 of 10 viewsFOAM_MOST0.35 on the stream ribbons: less white foam on streams (411 to 16,281 px, for exampleb315-bridge-junction15,281 px)tears-zigzag: 2,191 px at a far road in the top left cornerWorse in places (judgement for the owner, from the sheets):
i07-road-up-wall,under-bridge,main-road-15m), and a crease below the ramp inconn-steep-ramp-abovethat is faint ondevelopbecomes a dark line.#3179 and #3180, which the audit lists for the old path, change no view by 100 pixels or more here (the merges #3167 to #3204 change only flipping views).
Not visible in these shots: the signs on buildings (#3315; the fixture tiles have no
usetag, sodevelopdraws none either), and the load order and caches (#3225, #3263, #3322, #3323, #3268, #3220: an idle shot shows the final image only). The data change of revision 19 (road and water heights of the new solver) is not in these shots by design; it comes with the next bake.Per view: pixels over 8 and the named parts
i01-wall-capi02-dark-linesi03-guardraili04-markingsi05-dark-shadowi06-trail-widthi07-road-up-walli08-riveri09-shadingmouth-streammouth-stream-farmouth-tracki10-intersectionmain-road-eyemain-road-15mside-eyeside-15mhp-eyehp-15md-hairpin-eyed-hairpin-15msecondary-eyemountain-eyevalley-eyeresidential-curve-eyeresidential-15mresidential-nightjunction0-eyet-tertiary-eyex-tertiary-eyet-mouth-closecrossing-closesett-eyesteps-town-eyed-bridge-eyed-bridge-15munderpass-eyeunder-bridgebridge-eyegravel-eyedirt-eyegrass-eyehairpin-eyetrail-eyealpine-trail-eyefootway-eyecycleway-eyeb-steps-eyerail-narrow-eyerail-closefunicular-eyelake-shoreriver-area-trackzebra-taggedpath-on-cutj-tt-astreams-understreams-under-farstream-culvert-main-roadstream-culvert-trackstream-plain-trackstream-under-bridgetears-zigzagtears-zigzag-90mforecourt-topstream-bridge-farstream-lake-farstream-parallel-roadconn-own-aconn-own-bconn-own-cconn-path-off-road-aboveconn-path-off-road-eyeconn-track-off-road-aboveconn-track-off-road-eyeconn-path-off-walk-aboveconn-path-off-walk-eyeconn-road-into-path-aboveconn-road-into-path-eyeconn-walk-into-path-aboveconn-walk-into-path-eyeconn-road-into-track-aboveconn-road-into-track-eyeconn-walk-into-track-aboveconn-walk-into-track-eyeconn-path-off-track-aboveconn-path-off-track-eyepath-edge-eyepath-edge-handoverstream-mouth-eyestream-mouth-eye-northstream-main-road-eyeconn-footway-hump-aboveconn-footway-hump-eyeconn-steep-ramp-aboveconn-steep-ramp-eyeconn-parallel-way-aboveconn-parallel-way-eyei07-hairpin-eyeworst3flat-bend-topv01-stairsv02-stream-path-shrubsv03-good-pathv04-wall-road-junctionv05-slope-artifactv06-road-path-brokenv07-good-junctionv08-rough-connectionv09-sidewalk-patchesv10-signpost-benchv11-two-bad-junctionsv12-good-town-junctionsv13-culvertsv14-paths-not-joinedv15-stuff-on-roadv16-road-railv17-sharp-cornersb45-bridge-junctionb315-bridge-junctionv01-stairs-topv02-stream-path-shrubs-topv03-good-path-topv04-wall-road-junction-topv05-slope-artifact-topv06-road-path-broken-topv07-good-junction-topv08-rough-connection-topv09-sidewalk-patches-topv10-signpost-bench-topv11-two-bad-junctions-topv12-good-town-junctions-topv13-culverts-topv14-paths-not-joined-topv15-stuff-on-road-topv16-road-rail-topv17-sharp-corners-topi07-hairpin-topd-hairpin-tophp-topt-tertiary-topx-tertiary-topjunction0-topj-tt-a-topb45-bridge-junction-topb315-bridge-junction-topd-bridge-topzebra-tagged-topcrossing-close-topstream-culvert-main-road-topstream-culvert-track-topmouth-stream-topstream-parallel-road-toplake-shore-toprail-close-topsteps-town-topconn-own-a-topconn-own-b-topconn-own-c-topconn-path-off-road-topconn-track-off-road-topconn-path-off-walk-topconn-road-into-path-topconn-walk-into-path-topconn-road-into-track-topconn-walk-into-track-topconn-path-off-track-topconn-footway-hump-topconn-steep-ramp-topconn-parallel-way-topjunction0-far-300junction0-far-700junction0-far-1400j-tt-a-far-300j-tt-a-far-700j-tt-a-far-1400t-tertiary-far-300t-tertiary-far-700t-tertiary-far-1400x-tertiary-far-300x-tertiary-far-700x-tertiary-far-1400i07-hairpin-far-300i07-hairpin-far-700i07-hairpin-far-1400b45-bridge-junction-far-300b45-bridge-junction-far-700b45-bridge-junction-far-1400walk-engelberg-to-titlisfly-12km-over-engelbergfly-60km-above-the-fixtureMeasurements
Main bundle of the default path (fixture builds of the TrailView page,
vite build --mode trailview, raw / gzip -9):develop636f9cetrailview-*.jsplanner-*.jsengine-*.jsground-plana8f1293 gives 1,131,858 / 358,687 B for the TrailView entry: the merge addsdevelop's stills (+10,640 B raw). The plan bridge (2.0 MB raw, 767 KB gzip) is a separate asset in both builds; the default path does not fetch it.WASM guards in CI (run 43527050344): plan bridge 772,451 B of 773,120 B gzip (669 B left) and 2,001,570 B of 2,001,920 B raw (350 B left), the same as
ground-plan's run for #3470; builder core 496,290 B of 555,008 B gzip and 1,288,539 B of 1,359,872 B raw, the same asdevelop's push run 43521754194.CI wall time (first job start to last job end): this pull request 18.6 min (25 jobs;
ios-app17.7 min,test15.2 min, of whichcargo nextestfast 9.3 min and fixtures 4.2 min).developpull requests that changeCargo.lockand so run the whole Rust workspace: #3447 14.0 min (test7.2 min, fast 2.4 min), #3402 18.5 min (test8.8 min, fast 2.9 min). So thetestjob takes about 6.5 to 8 minutes more; its fast tier now also builds and runsobc-ground-planwith its fixture tests.developpush runs that select less take about 7 min (636f9ce: 7.5 min).What the code says about older tiles
I did not download or open a production release. What the code says:
featureTiles(stream/terrain.ts) reads an archive withfeatures_format4 and shows no features, with a warning, for another format. Both sides keep format 4 (stream/features.tsFORMAT). The revision (12, 18 or 19) is a key ofobc dataonly: no tile and no metadata holds it. So by the code, the merged viewer reads the feature tiles of a release baked at revision 12 on the default path. The tags thatground-planadded (levels, storeys, crossing states, shallow tunnels) are read only on the plan path.develop's releases have notrailview-stampslayer (develop's catalog does not name it). Without it, or with anotherstamp_version,bakedNodesgives nothing and the stamp worker makes every node, as ondeveloptoday.stream/ground.tsFORMATS: 3, 2, 1) on both sides.Checks
Run on this PC, own target
checkouts/429fbe719546aee5, capped, all pass:obc suites prepare(the three WASM bridges built from this checkout).obc test -p obc-trailview-features(122),-p obc-data-steps(80),-p obc-data(262, 1 skipped),-p obc-ground-plan(135, withthe_tiles_carry_the_levels_of_each_cell).cargo clippy -p obc-data-steps -p obc-trailview-features -p obc-data -p obc-ground-plan --all-targets -- -D warnings;cargo fmt --all --check.builder/web:npm run check(0 errors, 0 warnings),npm run check:wgsl, vitest ontrailview/sight.test.ts,still-view.test.ts,terrain/terrain.test.ts,terrain/model.test.ts,plan/plan.test.ts,view.test.ts,terrain/stamp-sources.test.ts,src/lib/coversandsrc/lib/platform/bundle.test.ts(11 files, 79 tests).still.test.js(2 tests) andhome-views.test.js(6 tests, with the@gpurender): develop's stills work after the merge. The plan boot works: theground=planshots above build their records (35 to 56 cells per view) with no page error.obc suites check,obc prose --check,python3 docs/build_docs.py --check-links,obc cairn map.CI: run 43527050344 on 33897af, all jobs pass.
Left out locally: the Python suites
python.repository-toolsandpython.trailview, the rest ofobc test affected(the whole Rust workspace, becauseCargo.lockchanged), the SwiftShader browser suites, firmware and iOS. CI ran them.Changed tests: one.
builder/web/src/lib/covers/job.test.ts: its fake renderer makes aView, which now needsplan: 'off'(see Semantic conflict).What is left
develop. He accepted the default-view changes (the slope change of #3188, the banks without the cut texture of #3219, and the other changes of the table above) on 2026-11-14.Public docs
No page of
docs/content/changes in the merge commit beyond whatdevelopalready changed. Againstground-plan, the public docs that change all come fromdevelop. The merge edits two generated or reference files only: the TrailView README rows (one row from each side) anddocs/design/map.json(written byobc cairn map).Mode: change #3096
Requirements: none
🤖 Generated with Claude Code