From bd155431f6bfb8967dcd6f7f7f29bbf6d8fe82fc Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Tue, 10 Nov 2026 16:16:50 -0800 Subject: [PATCH] Support bulk Circles with raster tiles --- .../longdo/LongdoMapViewController.kt | 17 +++++++++++++++++ .../longdo/LongdoMapViewControllerRaster.kt | 3 +++ .../longdo/LongdoOverlayStacking.kt | 3 +++ .../longdo/circle/LongdoCircleController.kt | 4 ++-- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt b/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt index 3ea96ad..4d4d8a5 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapViewController.kt @@ -1,6 +1,9 @@ package com.mapconductor.longdo import com.longdo.sdk3.LongdoMap +import com.mapconductor.core.circle.CIRCLE_TILE_LAYER_ID +import com.mapconductor.core.circle.CircleTiler +import com.mapconductor.core.circle.circleTileRasterLayerState import com.mapconductor.core.circle.CircleCapableInterface import com.mapconductor.core.circle.OnCircleEventHandler import com.mapconductor.core.controller.BaseMapViewController @@ -129,6 +132,20 @@ class LongdoMapViewController( } } + // Many circles too: the same raster layer path, in the circle band. + circleController.tiler = + CircleTiler().apply { + onTemplate = { template, tileSize -> + if (template != null) { + // Returns once the tile layer is on the page's map: the tiled + // circles' onAdded is called on the return. + mountRasterLayerOnMap(circleTileRasterLayerState(template, tileSize)) + } else { + unmountRasterLayer(CIRCLE_TILE_LAYER_ID) + } + } + } + // Many polylines too: the same raster layer path, in the polyline band. polylineController.tiler = PolylineTiler().apply { diff --git a/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerRaster.kt b/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerRaster.kt index 0e84dad..a62eb89 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerRaster.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoMapViewControllerRaster.kt @@ -1,5 +1,6 @@ package com.mapconductor.longdo +import com.mapconductor.core.circle.CIRCLE_TILE_LAYER_ID import com.mapconductor.core.controller.OverlayKind import com.mapconductor.core.polygon.POLYGON_TILE_LAYER_ID import com.mapconductor.core.polyline.POLYLINE_TILE_LAYER_ID @@ -45,6 +46,8 @@ private fun rasterAddLayerJs( ): String = if (state.id == POLYGON_TILE_LAYER_ID) { LongdoOverlayStacking.addPolygonTileLayerJs(layerSpec) + } else if (state.id == CIRCLE_TILE_LAYER_ID) { + LongdoOverlayStacking.addCircleTileLayerJs(layerSpec) } else if (state.id == POLYLINE_TILE_LAYER_ID) { LongdoOverlayStacking.addPolylineTileLayerJs(layerSpec) } else { diff --git a/src/main/java/com/mapconductor/longdo/LongdoOverlayStacking.kt b/src/main/java/com/mapconductor/longdo/LongdoOverlayStacking.kt index 1be98d4..0988da3 100644 --- a/src/main/java/com/mapconductor/longdo/LongdoOverlayStacking.kt +++ b/src/main/java/com/mapconductor/longdo/LongdoOverlayStacking.kt @@ -33,6 +33,9 @@ internal object LongdoOverlayStacking { /** ポリゴンのタイル: ポリゴンの帯の一番下(画像になったポリゴンであって、地図の画像ではない)。 */ fun addPolygonTileLayerJs(layerSpec: String): String = addLayerJs(layerSpec, OverlayKind.Polygon, Int.MIN_VALUE) + /** 円のタイル: サークルの帯の一番下(ポリゴンの上、ネイティブの円とポリラインのタイルの下)。 */ + fun addCircleTileLayerJs(layerSpec: String): String = addLayerJs(layerSpec, OverlayKind.Circle, Int.MIN_VALUE) + /** ポリラインのタイル: ポリラインの帯の一番下(サークルの上、ネイティブのポリラインの下)。 */ fun addPolylineTileLayerJs(layerSpec: String): String = addLayerJs(layerSpec, OverlayKind.Polyline, Int.MIN_VALUE) diff --git a/src/main/java/com/mapconductor/longdo/circle/LongdoCircleController.kt b/src/main/java/com/mapconductor/longdo/circle/LongdoCircleController.kt index e28d300..6ebbf5b 100644 --- a/src/main/java/com/mapconductor/longdo/circle/LongdoCircleController.kt +++ b/src/main/java/com/mapconductor/longdo/circle/LongdoCircleController.kt @@ -15,8 +15,8 @@ class LongdoCircleController( override val renderer: LongdoCircleOverlayRenderer, circleManager: CircleManagerInterface = CircleManager(), ) : CircleController(circleManager, renderer) { - /** 既知の円を再適用する(地図 `ready` 後の復元用)。 */ + /** 既知の円を再適用する(地図 `ready` 後の復元用)。タイルで描く円(ハンドル無し)は飛ばす。 */ fun reapply() { - renderer.reapply(circleManager.allEntities().map { it.circle }) + renderer.reapply(circleManager.nativeEntities().mapNotNull { it.circle as LongdoCircleHandle? }) } }