Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
13ff635
Make bearing a clockwise map rotation (#15)
wf9a5m75 Sep 12, 2026
756b0b2
Pass declutterPx through to the marker tile renderer
wf9a5m75 Sep 21, 2026
9b0a7f1
update dependencies (#16)
wf9a5m75 Oct 5, 2026
22dd0c5
Fix logical raster tile size for Google Maps vector labels
wf9a5m75 Oct 8, 2026
c3dab43
Merge remote-tracking branch 'origin/develop' into develop
wf9a5m75 Oct 8, 2026
3706596
Update Play Services Maps to 20.1.0 and OkHttp to 5.5.1 (#17)
wf9a5m75 Oct 24, 2026
3730d0f
Vector style support and cancel obsolete local tile requests (#18)
wf9a5m75 Oct 24, 2026
c2de6a5
Add .claude/settings.json
wf9a5m75 Oct 28, 2026
482f4d0
Redraw tiles once per burst of tiled-marker changes
wf9a5m75 Nov 5, 2026
3ca06b6
Size marker tiles like a rounding map
wf9a5m75 Nov 6, 2026
55dbeeb
Swap a raster layer without a blank frame
wf9a5m75 Nov 6, 2026
11b8177
Track tile activity with an AtomicLong
wf9a5m75 Nov 6, 2026
2b99f67
Merge pull request #19 from MapConductor/perf/tiled-marker-update
wf9a5m75 Nov 6, 2026
6660c09
Merge pull request #20 from MapConductor/fix/marker-tile-display-zoom
wf9a5m75 Nov 6, 2026
857d884
Register the ground image controller again
wf9a5m75 Nov 6, 2026
20a3484
Merge pull request #21 from MapConductor/fix/register-ground-image-co…
wf9a5m75 Nov 6, 2026
eed610a
Keep the map design across configuration changes
wf9a5m75 Nov 7, 2026
a8a1bb8
Merge pull request #22 from MapConductor/fix/saver-state
wf9a5m75 Nov 7, 2026
28e3ada
Draw large polygon sets as raster tiles (PolygonTiler)
wf9a5m75 Nov 7, 2026
37fc8c3
Destroy the MapView when the map leaves the composition
wf9a5m75 Nov 7, 2026
e011e24
Let go of tile overlays when the raster controller is destroyed
wf9a5m75 Nov 7, 2026
6c5d902
Read the controller through the state base, which MapViewBase clears
wf9a5m75 Nov 8, 2026
1661e81
Interpolate the closing edge of geodesic polygons
wf9a5m75 Nov 8, 2026
cd15df6
Densify the closing edge of non-geodesic polygons too
wf9a5m75 Nov 8, 2026
b3b13a8
Merge pull request #23 from MapConductor/fix/mapview-teardown
wf9a5m75 Nov 8, 2026
a874b96
Merge pull request #24 from MapConductor/fix/geodesic-polygon-fill
wf9a5m75 Nov 8, 2026
79d366a
Clear strategy markers in clearOverlays()
wf9a5m75 Nov 8, 2026
836e1c7
Map zIndex into the overlay bands
wf9a5m75 Nov 8, 2026
494c509
Merge pull request #25 from MapConductor/fix/clear-strategy
wf9a5m75 Nov 8, 2026
2134b13
Merge pull request #26 from MapConductor/fix/overlay-stacking-order
wf9a5m75 Nov 8, 2026
0e7fc91
Merge remote-tracking branch 'origin/develop' into feat/polygon-tiling
wf9a5m75 Nov 9, 2026
1d62660
Stack the polygon tiles at the bottom of the polygon band
wf9a5m75 Nov 9, 2026
4ef144f
Merge pull request #27 from MapConductor/feat/polygon-tiling
wf9a5m75 Nov 9, 2026
0613e2b
Draw large polyline sets as raster tiles (PolylineTiler)
wf9a5m75 Nov 9, 2026
c1f559d
Merge pull request #28 from MapConductor/feat/polyline-tiling
wf9a5m75 Nov 10, 2026
26ca973
Support bulk Circles with raster tiles
wf9a5m75 Nov 11, 2026
d440233
Merge pull request #29 from MapConductor/feat/circles-bulk-cache
wf9a5m75 Nov 11, 2026
cf38016
Order markers with MarkerDrawOrder
wf9a5m75 Nov 11, 2026
80cabf1
Reorder markers when the map rotates
wf9a5m75 Nov 11, 2026
711b43d
Merge pull request #30 from MapConductor/fix/marker-zindex-order
wf9a5m75 Nov 12, 2026
433b031
Apply camera paddings and report fov on Google Maps
wf9a5m75 Nov 12, 2026
0b37385
Merge remote-tracking branch 'origin/develop' into feat/camera-paddings
wf9a5m75 Nov 12, 2026
858c316
Merge pull request #31 from MapConductor/feat/camera-paddings
wf9a5m75 Nov 12, 2026
83bd84c
Release 1.4.0
wf9a5m75 Nov 13, 2026
2e4dbb7
Merge pull request #32 from MapConductor/release/1.4.0
wf9a5m75 Nov 13, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .claude/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"attribution": {
"commit": "",
"pr": ""
}
}
25 changes: 23 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,29 @@ jobs:
cache: 'gradle'

- name: Build core and compose locally
env:
HEAD_REF: ${{ github.head_ref }}
run: |
git clone --depth 1 https://github.com/MapConductor/android-sdk-core.git _core
# コア側に PR と同名のブランチがあるなら、そちらを組む。
#
# ここを default ブランチ固定にしていると、**コアの未マージな変更に追随する
# PR は永久に赤いまま**になる。実際 CameraBearing をコアへ足したとき、
# プロバイダ側の PR が 10 本まとめて Unresolved reference で落ちた。
# コアが先にマージされるまで待つ、という運用は取り込み順の事故を呼ぶので、
# 同名ブランチがあれば拾う形にしてある(無ければ従来どおり default)。
clone_matching() {
repo="$1"; dir="$2"
url="https://github.com/MapConductor/$repo.git"
if [ -n "$HEAD_REF" ] && git ls-remote --exit-code --heads "$url" "$HEAD_REF" >/dev/null 2>&1; then
echo "$repo: matching branch $HEAD_REF"
git clone --depth 1 --branch "$HEAD_REF" "$url" "$dir"
else
echo "$repo: default branch"
git clone --depth 1 "$url" "$dir"
fi
}

clone_matching android-sdk-core _core
cd _core
./gradlew --no-daemon publishToMavenLocal
cd ..
Expand All @@ -53,7 +74,7 @@ jobs:
}
EOF

git clone --depth 1 https://github.com/MapConductor/android-sdk-compose.git _compose
clone_matching android-sdk-compose _compose
cd _compose
./gradlew --no-daemon publishToMavenLocal
cd ..
Expand Down
15 changes: 14 additions & 1 deletion api/android-for-googlemaps.api
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,8 @@ public final class com.mapconductor.googlemaps.GoogleMapViewController extends c
public final class com.mapconductor.googlemaps.GoogleMapViewController$Companion {
}
public final class com.mapconductor.googlemaps.GoogleMapViewControllerCameraKt {
public static final double viewportHeightDp(com.mapconductor.googlemaps.GoogleMapViewController);
public static final com.mapconductor.core.map.MapCameraPosition toNativeCamera(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.map.MapCameraPosition);
public static final void handleMoveCamera(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.map.MapCameraPosition);
public static final void handleAnimateCamera(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.map.MapCameraPosition, long);
public static final void handleFitBounds(com.mapconductor.googlemaps.GoogleMapViewController, com.mapconductor.core.features.GeoRectBounds, int);
Expand Down Expand Up @@ -136,11 +138,14 @@ public final class com.mapconductor.googlemaps.GoogleMapViewHolder implements co
public androidx.compose.ui.geometry.Offset toScreenOffset-x-9fifI(com.mapconductor.core.features.GeoPointInterface);
public java.lang.Object fromScreenOffset-3MmeM6k(long, kotlin.coroutines.Continuation<? super com.mapconductor.core.features.GeoPoint>);
public com.mapconductor.core.features.GeoPoint fromScreenOffsetSync-k-4lQ0M(long);
public com.mapconductor.core.projection.ProjectedPoint toProjectedPoint(com.mapconductor.core.features.GeoPointInterface);
public com.mapconductor.core.features.GeoPoint fromProjectedPoint(com.mapconductor.core.projection.ProjectedPoint);
public com.mapconductor.core.projection.MapCoordinateSystem getCoordinateSystem();
public java.lang.Object getMapView();
public java.lang.Object getMap();
}
public final class com.mapconductor.googlemaps.GoogleMapViewKt {
public static final void GoogleMapView(com.mapconductor.googlemaps.GoogleMapViewState, androidx.compose.ui.Modifier, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.CameraRestriction, kotlin.jvm.functions.Function2<? super android.content.Context, ? super kotlin.coroutines.Continuation<? super java.lang.Boolean>, ? extends java.lang.Object>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapViewStateInterface<?>, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function3<? super com.mapconductor.googlemaps.GoogleMapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final void GoogleMapView(com.mapconductor.googlemaps.GoogleMapViewState, androidx.compose.ui.Modifier, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.CameraRestriction, kotlin.jvm.functions.Function2<? super android.content.Context, ? super kotlin.coroutines.Continuation<? super java.lang.Boolean>, ? extends java.lang.Object>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapViewStateInterface<?>, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.features.GeoPoint, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, kotlin.jvm.functions.Function1<? super com.mapconductor.core.map.MapCameraPosition, kotlin.Unit>, com.mapconductor.core.map.MapViewStyle, kotlin.jvm.functions.Function1<? super java.util.List<java.lang.String>, kotlin.Unit>, kotlin.jvm.functions.Function3<? super com.mapconductor.googlemaps.GoogleMapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final com.mapconductor.googlemaps.GoogleMapViewController createGoogleMapViewController(com.mapconductor.googlemaps.GoogleMapViewHolder, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.MutableMapServiceRegistry);
}
public final class com.mapconductor.googlemaps.GoogleMapViewSaver extends com.mapconductor.compose.map.BaseMapViewSaver<com.mapconductor.googlemaps.GoogleMapViewState> {
Expand Down Expand Up @@ -178,6 +183,7 @@ public final class com.mapconductor.googlemaps.LatLngInterpolationCache {
public final void put(java.lang.String, java.util.List<com.google.android.gms.maps.model.LatLng>);
}
public final class com.mapconductor.googlemaps.MapCameraPositionKt {
public static final double GOOGLE_VERTICAL_FOV;
public static final com.google.android.gms.maps.model.CameraPosition toCameraPosition(com.mapconductor.core.map.MapCameraPosition);
public static final com.mapconductor.core.map.MapCameraPosition from(com.mapconductor.core.map.MapCameraPosition$Companion, com.mapconductor.core.map.MapCameraPositionInterface);
public static final com.mapconductor.core.map.MapCameraPosition toMapCameraPosition(com.google.android.gms.maps.model.CameraPosition, com.mapconductor.core.map.MapPaddingsInterface);
Expand Down Expand Up @@ -252,6 +258,7 @@ public final class com.mapconductor.googlemaps.marker.GoogleMapMarkerControllerI
public final class com.mapconductor.googlemaps.marker.GoogleMapMarkerRenderer extends com.mapconductor.core.marker.AbstractMarkerOverlayRenderer<com.mapconductor.googlemaps.GoogleMapViewHolder, com.google.android.gms.maps.model.Marker> {
public com.mapconductor.googlemaps.marker.GoogleMapMarkerRenderer(com.mapconductor.googlemaps.GoogleMapViewHolder, kotlinx.coroutines.CoroutineScope);
public com.mapconductor.googlemaps.marker.GoogleMapMarkerRenderer(com.mapconductor.googlemaps.GoogleMapViewHolder, kotlinx.coroutines.CoroutineScope, int, kotlin.jvm.internal.DefaultConstructorMarker);
protected java.lang.Object applyDrawOrder(java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<com.google.android.gms.maps.model.Marker>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public boolean getSupportsAnimationOverlay();
public void setMarkerVisible(com.mapconductor.core.marker.MarkerEntityInterface<com.google.android.gms.maps.model.Marker>, boolean);
public void setMarkerPosition(com.mapconductor.core.marker.MarkerEntityInterface<com.google.android.gms.maps.model.Marker>, com.mapconductor.core.features.GeoPoint);
Expand Down Expand Up @@ -308,6 +315,8 @@ public final class com.mapconductor.googlemaps.polyline.GoogleMapPolylineOverlay
public final class com.mapconductor.googlemaps.raster.GoogleMapRasterLayerController extends com.mapconductor.core.raster.RasterLayerController<com.google.android.gms.maps.model.TileOverlay> implements com.mapconductor.googlemaps.raster.GoogleMapRasterLayerControllerInterface {
public com.mapconductor.googlemaps.raster.GoogleMapRasterLayerController(com.mapconductor.core.raster.RasterLayerManagerInterface<com.google.android.gms.maps.model.TileOverlay>, com.mapconductor.googlemaps.raster.GoogleMapRasterLayerOverlayRenderer);
public com.mapconductor.googlemaps.raster.GoogleMapRasterLayerController(com.mapconductor.core.raster.RasterLayerManagerInterface, com.mapconductor.googlemaps.raster.GoogleMapRasterLayerOverlayRenderer, int, kotlin.jvm.internal.DefaultConstructorMarker);
public java.lang.Object onCameraChanged(com.mapconductor.core.map.MapCameraPosition, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public void destroy();
}
public interface com.mapconductor.googlemaps.raster.GoogleMapRasterLayerControllerInterface extends com.mapconductor.core.controller.OverlayControllerInterface<com.mapconductor.core.raster.RasterLayerState, com.mapconductor.core.raster.RasterLayerEntityInterface<com.google.android.gms.maps.model.TileOverlay>> {
}
Expand All @@ -327,6 +336,10 @@ public final class com.mapconductor.googlemaps.raster.GoogleMapRasterLayerOverla
}
final class com.mapconductor.googlemaps.raster.GoogleMapRasterLayerOverlayRenderer$Companion {
}
final class com.mapconductor.googlemaps.raster.GoogleMapRasterLayerOverlayRenderer$DetachableTileProvider implements com.google.android.gms.maps.model.TileProvider {
public com.google.android.gms.maps.model.Tile getTile(int, int, int);
public final void detach();
}
final class com.mapconductor.googlemaps.raster.GoogleMapRasterLayerOverlayRenderer$TileSpec {
public final java.lang.String getTemplate();
public final int getTileSize();
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ android.useAndroidX=true
kotlin.code.style=official
android.nonTransitiveRClass=true

compileSdk=35
compileSdk=37
minSdk=26
javaVersion=17
jvmTarget=17

libraryVersion=1.3.1
libraryVersion=1.4.0
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
30 changes: 18 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
[versions]
composeLibs = "1.7.8"
coroutines = "1.9.0"
agp = "9.2.1"
kotlin = "2.0.21"

composeBom = "2025.02.00"
coreKtx = "1.16.0"
lifecycleRuntimeKtx = "2.8.7"
okhttp = "5.3.2"
playServicesMaps = "20.0.0"
activityCompose = "1.9.3"
composeLibs = "1.12.1"
# material3 は compose-ui とは別のバージョン系列。composeLibs(ui 系)を流用すると
# 存在しない material3:1.7.8 を要求してクラスパスごと解決に失敗する。
material3 = "1.4.0"
coroutines = "1.11.0"
agp = "9.4.1"
kotlin = "2.4.20"

composeBom = "2026.09.00"
coreKtx = "1.19.1"
lifecycleRuntimeKtx = "2.11.0"
okhttp = "5.5.1"
playServicesMaps = "20.1.0"
activityCompose = "1.13.0"
ktLint = "14.2.0"

junit = "4.13.2"
Expand All @@ -35,7 +38,10 @@ play-services-maps = { module = "com.google.android.gms:play-services-maps", ver

# Sample app
androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "composeLibs" }
androidx-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "material3" }
# sample-app が Icons.AutoMirrored を使う。material3 は material-icons を推移的に持ってこないので
# 明示的に足す。版は compose BOM 任せ(集約ビルドの catalog と同じ形)。
androidx-material-icons-core = { group = "androidx.compose.material", name = "material-icons-core" }
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeLibs" }

# Test
Expand Down
1 change: 1 addition & 0 deletions sample-app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ dependencies {
implementation(libs.androidx.ui)
implementation(libs.androidx.ui.tooling.preview)
implementation(libs.androidx.material3)
implementation(libs.androidx.material.icons.core)
debugImplementation(platform(libs.androidx.compose.bom))
debugImplementation(libs.androidx.ui.tooling)
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
package com.mapconductor.googlemaps

import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.SaverScope
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.google.android.gms.maps.GoogleMap
import com.mapconductor.core.features.GeoPoint
import com.mapconductor.core.map.AttributionRule
import com.mapconductor.core.map.MapCameraPosition
import com.mapconductor.core.map.MapUISettings
import org.junit.Assert.assertEquals
import org.junit.Assert.assertSame
import org.junit.Assert.assertTrue
import org.junit.Test
import org.junit.runner.RunWith
import android.os.Bundle
import android.os.Parcel

/**
* 回転などの構成変更で state が [GoogleMapViewSaver] を通って作り直されても、デザイン(id・
* attributionRules ほか)と uiSettings・カメラが落ちないこと。Bundle は実機の Parcel を一度通す。
*/
@RunWith(AndroidJUnit4::class)
class GoogleMapViewSaverTest {
private val rules =
listOf(AttributionRule("© test"), AttributionRule("© ranged", minZoom = 3, maxZoom = 15))

private val camera =
MapCameraPosition(
position = GeoPoint(21.38, -157.93),
zoom = 12.0,
bearing = 20.0,
tilt = 10.0,
)

@Test
fun keepsCustomDesignWithAttributionRules() {
val design = GoogleMapDesign.Custom(GoogleMap.MAP_TYPE_SATELLITE, rules)
val state = GoogleMapViewState(id = "google-1", mapDesignType = design, cameraPosition = camera)
state.uiSettings = MapUISettings(rotateGesture = false, tiltGesture = false)

val restored = roundTrip(GoogleMapViewSaver().createSaver(), state)

// 以前は id だけを保存して Create(id) で戻しており、Satellite(規則なし)になっていた。
val actual = restored.mapDesignType
assertTrue(actual is GoogleMapDesign.Custom)
assertEquals(GoogleMap.MAP_TYPE_SATELLITE, actual.id)
assertEquals(rules, actual.attributionRules)
assertCommon(restored, "google-1")
}

@Test
fun keepsPresetDesignAsTheSameObject() {
val state = GoogleMapViewState(id = "google-2", mapDesignType = GoogleMapDesign.Hybrid)
assertSame(GoogleMapDesign.Hybrid, roundTrip(GoogleMapViewSaver().createSaver(), state).mapDesignType)
}

private fun assertCommon(
restored: com.mapconductor.core.map.MapViewStateInterface<*>,
id: String,
) {
assertEquals(id, restored.id)
assertEquals(false, restored.uiSettings.rotateGesture)
assertEquals(false, restored.uiSettings.tiltGesture)
assertEquals(true, restored.uiSettings.scrollGesture)
assertEquals(12.0, restored.cameraPosition.zoom, 1e-9)
assertEquals(20.0, restored.cameraPosition.bearing, 1e-9)
assertEquals(21.38, restored.cameraPosition.position.latitude, 1e-9)
}

private fun <T : Any> roundTrip(
saver: Saver<T, Bundle>,
value: T,
): T {
val saved = with(saver) { SaverScope { true }.save(value) }!!
// 一度 Parcel に書いて読み戻す(プロセスが落ちたあとの復元と同じ経路)。
val parcel = Parcel.obtain()
try {
parcel.writeBundle(saved)
parcel.setDataPosition(0)
return saver.restore(parcel.readBundle(javaClass.classLoader)!!)!!
} finally {
parcel.recycle()
}
}
}
Loading
Loading