11375214 fixed the misplaced dependency block by adding a correct copy
inside [dependencies], but the misplaced copy below [features] was still
present -- it had already been moved back by 5eda8056, the commit
11375214 is built on. The result is three dependencies declared twice:
error: duplicate key
so widgets/Cargo.toml still does not parse and every consumer of the
fork is still blocked, just with a different message.
Two people fixed the same bug in parallel. Removing the second, now
redundant, copy; the surviving declaration sits with the other optional
sibling crates in [dependencies].
Verified:
cargo metadata --manifest-path widgets/Cargo.toml \
--features maps,csg,gltf,test
resolves.
The makepad-gltf, makepad-csg, and makepad-test dependencies were incorrectly
placed after the [features] section, causing TOML parsing errors. Moved them
to the [dependencies] section where they belong.
The "Update fork to upstream dev 5d4483f" merge relocated this block:
makepad-gltf = { path = "../libs/gltf", optional = true }
makepad-csg = { path = "../libs/csg/csg", optional = true }
makepad-test = { path = "../libs/makepad_test", optional = true }
from the end of [dependencies] to below the [features] header. TOML has
no way to know these are dependencies once they sit under [features], so
cargo parses each as a feature definition whose value should be an array
of strings and fails:
error: invalid type: map, expected a sequence
--> widgets/Cargo.toml:47:16
Every consumer of this fork is broken as a result. The three crates stop
being dependencies at all, so the features that gate them --
gltf/csg/test, and maps via i_overlay -- no longer exist:
package `nigig-map` depends on `makepad-widgets` with feature `maps`
but `makepad-widgets` does not have that feature.
help: available features: default, serde
At the previous rev (2c5cd97) the same three lines are inside
[dependencies], which is why that rev resolves and this one does not.
This is a pure relocation -- the six moved lines are byte-identical, no
version, path or flag changed. Verified with
cargo metadata --manifest-path widgets/Cargo.toml \
--features maps,csg,gltf,test
which fails on d6d1f99c and succeeds with this commit.
- Add drape.rs for terrain hillshade landcover draping
- Add overlay.rs for route polylines, markers, and position puck
- Add icons.rs and icons/ directory for map icon management
- Update geometry.rs with 3D road elevation and join improvements
- Update tile.rs with unified road mesh rendering
- Update view.rs with seamless 2D/3D mode transitions
- Update style.rs with night themes and emissive roads
- Add i_overlay dependency for polygon boolean operations
- Update maps feature to include i_overlay
Key improvements:
- 3D road elevation and seam continuity
- Building shadow geometry and terrain cast shadows
- Route assistant and navigation layer support
- Clickable themes and night mode
- Water, grass, and shrub rendering
- Optimized road geometry and mode transitions
