From 7e655f796c5c8cd643bd7ab69a72aeae13e71d14 Mon Sep 17 00:00:00 2001 From: Masashi Katsumata Date: Thu, 29 Oct 2026 01:37:56 -0700 Subject: [PATCH] Use the core reapplyStyle() for raster layers MapplsRasterLayerController.reapplyStyle() read the manager outside the controller lock and registered what it read again. Drop it and use the one in android-sdk-core's RasterLayerController (MapConductor/android-sdk-core#17), which runs under the lock. --- api/android-for-mappls.api | 1 - .../raster/MapplsRasterLayerController.kt | 25 ------------------- 2 files changed, 26 deletions(-) diff --git a/api/android-for-mappls.api b/api/android-for-mappls.api index 7e0bddd..31bc400 100644 --- a/api/android-for-mappls.api +++ b/api/android-for-mappls.api @@ -462,7 +462,6 @@ public final class com.mapconductor.mappls.raster.MapplsRasterLayerController ex public java.lang.Object update(com.mapconductor.core.raster.RasterLayerState, kotlin.coroutines.Continuation); public java.lang.Object clear(kotlin.coroutines.Continuation); public void destroy(); - public final java.lang.Object reapplyStyle(kotlin.coroutines.Continuation); public java.lang.Object update(java.lang.Object, kotlin.coroutines.Continuation); } public final class com.mapconductor.mappls.raster.MapplsRasterLayerHandle { diff --git a/src/main/java/com/mapconductor/mappls/raster/MapplsRasterLayerController.kt b/src/main/java/com/mapconductor/mappls/raster/MapplsRasterLayerController.kt index d75fad1..bc865f5 100644 --- a/src/main/java/com/mapconductor/mappls/raster/MapplsRasterLayerController.kt +++ b/src/main/java/com/mapconductor/mappls/raster/MapplsRasterLayerController.kt @@ -1,10 +1,8 @@ package com.mapconductor.mappls.raster import com.mapconductor.core.raster.RasterLayerController -import com.mapconductor.core.raster.RasterLayerEntity import com.mapconductor.core.raster.RasterLayerManager import com.mapconductor.core.raster.RasterLayerManagerInterface -import com.mapconductor.core.raster.RasterLayerOverlayRendererInterface import com.mapconductor.core.raster.RasterLayerState class MapplsRasterLayerController( @@ -35,27 +33,4 @@ class MapplsRasterLayerController( MapplsRasterHeaderInjector.remove(this) super.destroy() } - - suspend fun reapplyStyle() { - val states = rasterLayerManager.allEntities().map { it.state } - if (states.isEmpty()) return - val addParams = - states.map { state -> - object : RasterLayerOverlayRendererInterface.AddParamsInterface { - override val state: RasterLayerState = state - } - } - val layers = renderer.onAdd(addParams) - layers.forEachIndexed { index, layer -> - layer?.let { - rasterLayerManager.registerEntity( - RasterLayerEntity( - layer = it, - state = states[index], - ), - ) - } - } - renderer.onPostProcess() - } }