feat: MapLibre (Marker, Polyline, and Polygon)

.claude/settings.local.json

@@ -16,9 +16,12 @@
       "Bash(for:*)",
       "WebFetch(domain:github.com)",
       "Bash(grep:*)",
-      "Bash(rm:*)"
+      "Bash(rm:*)",
+      "Bash(cat:*)",
+      "Read(//Users/masashi/.gradle/caches/**)",
+      "Bash(xargs jar tf:*)"
     ],
     "deny": [],
     "ask": []
   }
-}
+}

build.gradle.kts

@@ -43,12 +43,14 @@ val modules: List<String> =
     rootDir
         .resolve("projects.properties")
         .readLines()
-        .firstOrNull { it.startsWith("modules=") }
-        ?.removePrefix("modules=")
-        ?.split(",")
-        ?.map { it.trim() }
-        ?.filter { it.isNotEmpty() }
-        ?: emptyList()
+        .dropWhile { !it.startsWith("modules=") }
+        .takeWhile { it.startsWith("modules=") || it.trim().endsWith(",\\") || it.trim().matches(Regex("^[a-zA-Z0-9-]+$")) }
+        .joinToString("")
+        .removePrefix("modules=")
+        .replace("\\", "")
+        .split(",")
+        .map { it.trim() }
+        .filter { it.isNotEmpty() }
 
 tasks.register("allLintChecks") {
     group = "verification"

example-app/build.gradle.kts

@@ -139,29 +139,19 @@ android {
 dependencies {
 
     implementation(libs.androidx.core.ktx)
-
     implementation(libs.androidx.lifecycle.runtime.ktx)
-
     implementation(libs.androidx.activity.compose)
-
     implementation(libs.androidx.lifecycle.viewmodel.compose)
-
     implementation(platform(libs.androidx.compose.bom))
-
     implementation(libs.androidx.ui)
-
     implementation(libs.androidx.ui.graphics)
-
     implementation(libs.androidx.material3)
-
     implementation(libs.androidx.appcompat)
 
     // Google Maps SDK
-
     implementation(libs.play.services.maps)
 
     // Here Maps SDK
-
     implementation(
         fileTree(
             mapOf(
@@ -172,19 +162,18 @@ dependencies {
     )
 
     // Mapbox SDK
-
     implementation(libs.mapbox.android)
 
     // ArcGIS Maps for Kotlin - SDK dependency
-
     implementation(libs.arcgis.maps.kotlin)
-
     implementation(platform(libs.arcgis.maps.kotlin.toolkit.bom))
-
     implementation(libs.arcgis.maps.kotlin.toolkit.geoview.compose)
-
     implementation(libs.arcgis.maps.kotlin.toolkit.authentication)
 
+    // MapLibre SDK
+    implementation(libs.maplibre.sdk)
+    implementation(libs.maplibre.annotation)
+
     // Map Conductor
 //    implementation("com.mapconductor:core")
 //    implementation("com.mapconductor:icons")
@@ -204,6 +193,7 @@ dependencies {
     releaseImplementation(libs.mapconductor.here)
     releaseImplementation(libs.mapconductor.mapbox)
     releaseImplementation(libs.mapconductor.arcgis)
+    releaseImplementation(libs.mapconductor.maplibre)
     releaseImplementation(libs.mapconductor.marker.strategy)
     releaseImplementation(libs.mapconductor.marker.native.strategy)
 
@@ -213,28 +203,19 @@ dependencies {
     debugImplementation(project(":mapconductor-for-here"))
     debugImplementation(project(":mapconductor-for-mapbox"))
     debugImplementation(project(":mapconductor-for-arcgis"))
+    debugImplementation(project(":mapconductor-for-maplibre"))
     debugImplementation(project(":mapconductor-marker-strategy"))
     debugImplementation(project(":mapconductor-marker-native-strategy"))
 
     implementation(libs.androidx.vectordrawable)
-
     testImplementation(libs.junit)
-
     testImplementation(libs.androidx.core)
-
     testImplementation(libs.androidx.junit)
-
     testImplementation(libs.androidx.runner)
-
     androidTestImplementation(libs.androidx.junit)
-
     androidTestImplementation(libs.androidx.espresso.core)
-
     androidTestImplementation(platform(libs.androidx.compose.bom))
-
     androidTestImplementation(libs.androidx.ui.test.junit4)
-
     debugImplementation(libs.androidx.ui.tooling)
-
     debugImplementation(libs.androidx.ui.test.manifest)
 }

example-app/src/main/java/com/mapconductor/example/DemoAppScreen.kt

@@ -27,6 +27,8 @@ import com.mapconductor.example.pages.marker.animation.AnimationMapPage
 import com.mapconductor.example.pages.marker.icons.MarkerBasicPage
 import com.mapconductor.example.pages.marker.postoffice.PostOfficeMapPage
 import com.mapconductor.example.pages.polygon.basic.PolygonMapPage
+import com.mapconductor.example.pages.polygon.click.PolygonClickPage
+import com.mapconductor.example.pages.polygon.geodesic.PolygonGeodesicPage
 import com.mapconductor.example.pages.polyline.PolylineClickMapPage
 import com.mapconductor.example.pages.polyline.PolylineMapPage
 import com.mapconductor.example.pages.startup.StartUpPage
@@ -134,6 +136,14 @@ fun DemoAppScreen(initPage: String = "map") {
                 id = "polygon",
                 title = "Polygon ",
             ),
+            SidebarItem(
+                id = "polygon-click",
+                title = "Polygon Click",
+            ),
+            SidebarItem(
+                id = "polygon-geodesic",
+                title = "Geodesic polygons",
+            ),
         )
 
     AppTheme {
@@ -226,6 +236,16 @@ fun DemoAppScreen(initPage: String = "map") {
                             onToggleSidebar = navigationViewModel::toggleSidebar,
                         )
                     }
+                    "polygon-click" -> {
+                        PolygonClickPage(
+                            onToggleSidebar = navigationViewModel::toggleSidebar,
+                        )
+                    }
+                    "polygon-geodesic" -> {
+                        PolygonGeodesicPage(
+                            onToggleSidebar = navigationViewModel::toggleSidebar,
+                        )
+                    }
                     "groundImage" -> {
                         GroundImageMapPage(
                             groundImageResources = groundImageResources,

example-app/src/main/java/com/mapconductor/example/MainActivity.kt

@@ -12,8 +12,8 @@ class MainActivity : ComponentActivity() {
 
         setContent {
             DemoAppScreen(
-//                initPage = "polyline-click",
-                initPage = "startup",
+                initPage = "polygon-geodesic",
+//                initPage = "startup",
             )
         }
     }

example-app/src/main/java/com/mapconductor/example/MapViewContainer.kt

@@ -11,7 +11,6 @@ import com.mapconductor.core.groundimage.OnGroundImageEventHandler
 import com.mapconductor.core.map.MapViewState
 import com.mapconductor.core.map.OnMapEventHandler
 import com.mapconductor.core.map.OnMapLoadedHandler
-import com.mapconductor.core.map.OnMapViewInitializedHandler
 import com.mapconductor.core.marker.MarkerRenderingStrategy
 import com.mapconductor.core.marker.OnMarkerEventHandler
 import com.mapconductor.core.polygon.OnPolygonEventHandler
@@ -25,13 +24,15 @@ import com.mapconductor.here.HereViewStateImpl
 import com.mapconductor.mapbox.MapboxActualMarker
 import com.mapconductor.mapbox.MapboxMapView
 import com.mapconductor.mapbox.MapboxViewStateImpl
+import com.mapconductor.maplibre.MapLibreActualMarker
+import com.mapconductor.maplibre.MapLibreMapView
+import com.mapconductor.maplibre.MapLibreViewStateImpl
 
 @Composable
 fun MapViewContainer(
     modifier: Modifier = Modifier,
     renderingStrategy: MarkerRenderingStrategy<*>? = null,
     state: MapViewState<*>? = null,
-    onMapViewInitialized: OnMapViewInitializedHandler? = null,
     onMapLoaded: OnMapLoadedHandler? = null,
     onMapClick: OnMapEventHandler? = null,
     onMarkerClick: OnMarkerEventHandler? = null,
@@ -44,7 +45,6 @@ fun MapViewContainer(
     onPolylineClick: OnPolylineEventHandler? = null,
     onPolygonClick: OnPolygonEventHandler? = null,
     onGroundImageClick: OnGroundImageEventHandler? = null,
-    shouldInitialize: Boolean = true, // Allow deferring initialization
     content: (@Composable MapViewScope.() -> Unit)? = null,
 ) {
     @Suppress("UNCHECKED_CAST")
@@ -54,7 +54,6 @@ fun MapViewContainer(
                 modifier = modifier,
                 markerRenderingStrategy = renderingStrategy as? MarkerRenderingStrategy<GoogleMapActualMarker>?,
                 state = state,
-                onMapViewInitialized = onMapViewInitialized,
                 onMapLoaded = onMapLoaded,
                 onMapClick = onMapClick,
                 onMarkerClick = onMarkerClick,
@@ -67,7 +66,6 @@ fun MapViewContainer(
                 onPolylineClick = onPolylineClick,
                 onPolygonClick = onPolygonClick,
                 onGroundImageClick = onGroundImageClick,
-                shouldInitialize = shouldInitialize,
                 content = content,
             )
 
@@ -76,7 +74,6 @@ fun MapViewContainer(
                 modifier = modifier,
                 markerRenderingStrategy = renderingStrategy as? MarkerRenderingStrategy<HereActualMarker>?,
                 state = state,
-                onMapViewInitialized = onMapViewInitialized,
                 onMapLoaded = onMapLoaded,
                 onMapClick = onMapClick,
                 onMarkerClick = onMarkerClick,
@@ -96,7 +93,6 @@ fun MapViewContainer(
                 modifier = modifier,
                 markerRenderingStrategy = renderingStrategy as? MarkerRenderingStrategy<MapboxActualMarker>?,
                 state = state,
-                onMapViewInitialized = onMapViewInitialized,
                 onMapLoaded = onMapLoaded,
                 onMapClick = onMapClick,
                 onMarkerClick = onMarkerClick,
@@ -116,7 +112,25 @@ fun MapViewContainer(
                 modifier = modifier,
                 markerRenderingStrategy = renderingStrategy as? MarkerRenderingStrategy<ArcGISActualMarker>?,
                 state = state,
-                onMapViewInitialized = onMapViewInitialized,
+                onMapLoaded = onMapLoaded,
+                onMapClick = onMapClick,
+                onMarkerClick = onMarkerClick,
+                onMarkerDragStart = onMarkerDragStart,
+                onMarkerDrag = onMarkerDrag,
+                onMarkerDragEnd = onMarkerDragEnd,
+                onMarkerAnimateStart = onMarkerAnimateStart,
+                onMarkerAnimateEnd = onMarkerAnimateEnd,
+                onCircleClick = onCircleClick,
+                onPolylineClick = onPolylineClick,
+                onPolygonClick = onPolygonClick,
+                content = content,
+            )
+
+        is MapLibreViewStateImpl ->
+            MapLibreMapView(
+                modifier = modifier,
+                markerRenderingStrategy = renderingStrategy as? MarkerRenderingStrategy<MapLibreActualMarker>?,
+                state = state,
                 onMapLoaded = onMapLoaded,
                 onMapClick = onMapClick,
                 onMarkerClick = onMarkerClick,