Repository navigation
Conversation
* Make bearing a clockwise map rotation bearing を「値を増やすと地図が時計回りに回る」向きに統一し、ネイティブ SDK との変換をコアの CameraBearing に集約する。 * ci: build the core module from the matching branch コアの未マージ/未リリースな変更に追随する PR を、コアが先に取り込まれるのを待たずに検証できるようにする。同名ブランチが無ければ従来どおり既定のコアを使う。 * fix: point material3 at its own version line material3 は compose-ui とは別のバージョン系列で、composeLibs(1.7.8)を流用すると存在しない material3:1.7.8 を要求して sample-app のクラスパスごと解決に失敗する。集約ビルド(android-sdk)の catalog と同じ 1.4.0 に合わせる。 --------- Co-authored-by: masashi <info@mkgeeklab.com>
MarkerTilingOptions.declutterPx existed and samples set it, but every controller dropped it on the floor when constructing MarkerTileRenderer, so the renderer ran with 0 and drew every marker on every tile. On a slow device that is the difference between an overview tile costing 538ms and 79ms (SO-02L, 144k markers, z10, MarkerTileRenderBenchmark) -- and the drawn result now actually matches what iOS and react show for the same options.
None is longdo.Layers.CLEAR. Switching the base swaps the underlying MapLibre style, which drops the sources and layers this controller added to map.Renderer; they are put back on style.load (and once more 1.5 s later as a fallback).
* feat: integrate vector style support and pending map fixes * Keep each file's line endings as they are on develop The checkpoint commit rewrote whole files between LF and CRLF, which buried its real changes under line-ending noise. Content is unchanged.
ImageIcon(imageUrl = ...) keeps the same instance when its image arrives; only its hashCode changes, and MarkerState makes the icon read recompose. Key the remembered bitmap on the hash as well, or the overlay keeps the transparent placeholder.
MarkerState.icon no longer reads Compose state; iconRevision is the counter that goes up when a URL icon's image arrives. Reading it also makes the overlay recompose then.
Redraw a marker when its URL icon's image arrives
The saver kept only the id and restored through fromId, so designs outside the presets became Normal and attribution rules were lost. It now saves the layer name and rules. Adds a device round-trip test.
Keep the map design across configuration changes
The polygon controller gets a PolygonTiler, whose tiles are shown through the raster layer path the marker tiles use (upsert / removeById, outside the app's RasterLayer composition). Tiled polygons stay registered for taps and give the map SDK nothing. Longdo has no RasterLayer controller, so the tiles are mounted like other rasters from outside the content (mountRasterLayer), and reapply skips tiled entities, which have no handle.
MarkerState.onAdded asks hasMarker once per marker after every composition; a linear scan made that quadratic (1e5 markers, 1e10 comparisons).
The controller was destroyed but the WebView was not, so its renderer and JS bridge kept the controller with every overlay. It is now detached, loses the bridge and is destroyed.
The state kept its own controller field, set on attach and never cleared, so a state the app keeps held the destroyed controller and every overlay of the old map. It now reads the base's attached controller, which MapViewBase detaches when the map is torn down.
Longdo is a page in a WebView: LongdoMap.run queues the script and returns, and an add that finds the style not ready retries from the page. So onAdded came before the map had the overlay: Boston's 604 downtown polygons reported it 0.1 s after the hand-over and were all on the map 1.4 s later. The renderers' onAdd (polygon, polyline, circle, ground image), the app's raster layers, the marker tiles and the polygon tiles (now applied, not launched) return once the page's map has their layers (PageLayerWait).
This provider does not go through MapViewBase, which does it for the others; a state the app keeps held the destroyed controller and its overlays.
Release the map view and the controller when the map leaves the composition
Markers drawn through a StrategyMarkerController (clustering and other extension modules register these with registerOverlayController) were left on the map by clearOverlays(), which only cleared this provider's own controllers. Call BaseMapViewController.clearStrategyMarkerControllers(). Needs android-sdk-core with clearStrategyMarkerControllers() (fix/clear-strategy).
Every layer was appended with addLayer() in the order it arrived, so the raster (added last in a re-send) covered everything and ground images and polygons followed add order. LongdoOverlayStacking generates the JS that records each layer's band and zIndex on map.Renderer and inserts it before the lowest SDK layer with a higher key; rasters also stay below the basemap's first label. Stacking order (all providers, all platforms), bottom to top: raster layers < ground images < polygons < circles < polylines < markers. Needs android-sdk-core with OverlayStacking (fix/overlay-stacking-order).
Clear strategy markers in clearOverlays()
Stack overlays by band inside the Longdo renderer
With develop's OverlayStacking, a raster layer goes in the raster band, under ground images. The polygon tiles are polygons drawn as images, so they go over ground images and under circles, polylines and markers.
Additions only: the polygon tiles' stacking key, and declarations develop added without running apiDump (TILE_REFRESH_COALESCE, and on ArcGIS the marker controller's constructor that takes a boolean).
# Conflicts: # src/main/java/com/mapconductor/longdo/circle/LongdoCircleOverlayRenderer.kt # src/main/java/com/mapconductor/longdo/groundimage/LongdoGroundImageOverlayRenderer.kt # src/main/java/com/mapconductor/longdo/polygon/LongdoPolygonOverlayRenderer.kt # src/main/java/com/mapconductor/longdo/polyline/LongdoPolylineOverlayRenderer.kt
Additions only (this branch had not run apiDump); in core, one member moved.
Draw large polygon sets as raster tiles (PolygonTiler)
The polyline controller gets a PolylineTiler, shown through the same raster layer path as the polygon tiles. Stacking key (Polyline, Int.MIN_VALUE): over circles, under native polylines and markers. Whatever redraws from the polyline manager skips tiled entities (no native line).
Draw large polyline sets as raster tiles (PolylineTiler)
Support bulk Circles with raster tiles
Compose draws later children on top and the overlays followed the published list (add order). They are now sorted by zIndex, then south and west.
Same-zIndex overlays follow the screen position (lower in front), using rememberMarkerDrawOrderFrame so they are re-sorted once rotation settles.
Stack markers by the shared draw order
Longdo Map API3 has no padding, so paddings are emulated by moving the camera center and undone when camera events come back. The holder's synchronous projection now centers on that moved camera, so InfoBubble and marker tracking stay aligned with padding. fov is 36.87, the MapLibre GL default the map renders with.
Report camera fov and apply paddings
toScreenOffset / fromScreenOffsetSync ignored tilt, so InfoBubbles, marker animations and tile-marker hit tests drifted on a tilted map (up to 114 px from the engine's own project() at tilt 60 near the centre, 247 px at a padded centre). With the fov they match the engine within 0.4 px at tilt 0/30/60 and bearing 0/±90 on the TB520FU. Needs android-sdk-core fix/screen-projection-tilt.
Pass the camera's field of view to the screen projection
Release 1.4.0
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge develop into main for the 1.4.0 release.