Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
b0ff1d2
Make bearing a clockwise map rotation (#5)
wf9a5m75 Sep 12, 2026
a1521d7
Pass declutterPx through to the marker tile renderer
wf9a5m75 Sep 21, 2026
5df7b09
Leave a switchable trace at getTileUrl for the stalled-marker-layer hunt
wf9a5m75 Sep 21, 2026
a2ced1e
Add OpenMobileMapsDesign.None: no tile layer at all
wf9a5m75 Sep 29, 2026
01180f5
update dependencies (#6)
wf9a5m75 Oct 5, 2026
d505aa3
Update Play Services Maps to 20.1.0 and OkHttp to 5.5.1 (#7)
wf9a5m75 Oct 24, 2026
495fb06
Vector style support (#8)
wf9a5m75 Oct 24, 2026
981d11b
Add .claude/settings.json
wf9a5m75 Oct 28, 2026
6a100bf
Redraw tiles once per burst of tiled-marker changes
wf9a5m75 Nov 5, 2026
e228268
Show raster overlays at the rounded camera zoom
wf9a5m75 Nov 6, 2026
27ff60c
Merge pull request #9 from MapConductor/perf/tiled-marker-update
wf9a5m75 Nov 6, 2026
bd55ca9
Merge pull request #10 from MapConductor/fix/marker-tile-display-zoom
wf9a5m75 Nov 6, 2026
f1d82e5
Keep design attribution rules across configuration changes
wf9a5m75 Nov 7, 2026
6efd9b8
Merge pull request #11 from MapConductor/fix/saver-state
wf9a5m75 Nov 7, 2026
ea4e7ed
Draw large polygon sets as raster tiles (PolygonTiler)
wf9a5m75 Nov 7, 2026
2da6be6
Take the MapView off the lifecycle and destroy it when the map leaves
wf9a5m75 Nov 7, 2026
fd9f41f
Remove the touch listener when the controller is destroyed
wf9a5m75 Nov 7, 2026
4cf351c
Read the controller through the state base, which MapViewBase clears
wf9a5m75 Nov 8, 2026
9667740
Merge pull request #12 from MapConductor/fix/mapview-teardown
wf9a5m75 Nov 8, 2026
4fc6530
Clear strategy markers in clearOverlays()
wf9a5m75 Nov 8, 2026
5c7da9f
Give rasters, ground images and marker tiles their own index bands
wf9a5m75 Nov 8, 2026
ed3c28f
Merge pull request #13 from MapConductor/fix/clear-strategy
wf9a5m75 Nov 8, 2026
77ae68d
Merge pull request #14 from MapConductor/fix/overlay-stacking-order
wf9a5m75 Nov 8, 2026
6ad168f
Merge remote-tracking branch 'origin/develop' into feat/polygon-tiling
wf9a5m75 Nov 9, 2026
f15c1b3
Update the API baseline
wf9a5m75 Nov 9, 2026
436c300
Merge pull request #15 from MapConductor/feat/polygon-tiling
wf9a5m75 Nov 9, 2026
f57f996
Draw large polyline sets as raster tiles (PolylineTiler)
wf9a5m75 Nov 9, 2026
e768c4d
Merge pull request #16 from MapConductor/feat/polyline-tiling
wf9a5m75 Nov 10, 2026
2d80cbd
Support bulk Circles with raster tiles
wf9a5m75 Nov 11, 2026
491a68d
Merge pull request #17 from MapConductor/feat/circles-bulk-cache
wf9a5m75 Nov 11, 2026
823af09
Hand icons to the layer in MarkerDrawOrder
wf9a5m75 Nov 11, 2026
6317ca6
Reorder markers when the map rotates
wf9a5m75 Nov 11, 2026
c6d5260
Merge pull request #18 from MapConductor/fix/marker-zindex-order
wf9a5m75 Nov 12, 2026
9099a60
Apply camera paddings and report fov on OpenMobileMaps
wf9a5m75 Nov 12, 2026
0a6eebb
Merge remote-tracking branch 'origin/develop' into feat/camera-paddings
wf9a5m75 Nov 12, 2026
38663a8
Merge pull request #19 from MapConductor/feat/camera-paddings
wf9a5m75 Nov 12, 2026
b6d1e97
Release 1.4.0
wf9a5m75 Nov 13, 2026
99e7ec0
Merge pull request #20 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
37 changes: 34 additions & 3 deletions api/android-for-openmobilemaps.api
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsDesign implemen
public java.lang.Object getValue();
}
public final class com.mapconductor.openmobilemaps.OpenMobileMapsDesign$Companion {
public final com.mapconductor.openmobilemaps.OpenMobileMapsDesign getNone();
public final com.mapconductor.openmobilemaps.OpenMobileMapsDesign getOpenStreetMap();
public final com.mapconductor.openmobilemaps.OpenMobileMapsDesign getOpenStreetMapJapan();
public final com.mapconductor.openmobilemaps.OpenMobileMapsDesign getOpenTopoMap();
Expand All @@ -120,8 +121,15 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsGroundImageOver
}
public final class com.mapconductor.openmobilemaps.OpenMobileMapsLayers {
public static final int DESIGN_INDEX;
public static final int RASTER_INDEX_FIRST;
public static final int BELOW_INDEX_FIRST;
public static final int GROUND_IMAGE_INDEX_FIRST;
public static final int POLYGON_TILE_INDEX_FIRST;
public static final int FIXED_INDEX_FIRST;
public static final int POLYLINE_TILE_INDEX_FIRST;
public static final int POLYLINE_INDEX;
public static final int MARKER_TILE_INDEX_FIRST;
public static final int ICON_INDEX;
public com.mapconductor.openmobilemaps.OpenMobileMapsLayers();
public final io.openmobilemaps.mapscore.shared.map.layers.polygon.PolygonLayerInterface getPolygonFillLayer();
public final io.openmobilemaps.mapscore.shared.map.layers.line.LineLayerInterface getPolygonOutlineLayer();
Expand All @@ -132,9 +140,22 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsLayers {
public final void attachTo(io.openmobilemaps.mapscore.shared.map.MapInterface);
public final void setDesignLayer(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final io.openmobilemaps.mapscore.shared.map.LayerInterface insertBelowOverlays(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final io.openmobilemaps.mapscore.shared.map.LayerInterface insertGroundImage(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final io.openmobilemaps.mapscore.shared.map.LayerInterface insertPolygonTile(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final io.openmobilemaps.mapscore.shared.map.LayerInterface insertCircleTile(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final io.openmobilemaps.mapscore.shared.map.LayerInterface insertPolylineTile(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final io.openmobilemaps.mapscore.shared.map.LayerInterface insertMarkerTile(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final void remove(io.openmobilemaps.mapscore.shared.map.MapInterface, io.openmobilemaps.mapscore.shared.map.LayerInterface);
public final void clearAll();
}
final class com.mapconductor.openmobilemaps.OpenMobileMapsLayers$Band {
public final int getFirst();
public final int getEnd();
public final java.util.TreeSet<java.lang.Integer> getFree();
public final int getNext();
public final void setNext(int);
public final int take();
}
final class com.mapconductor.openmobilemaps.OpenMobileMapsLayers$Companion {
}
public interface com.mapconductor.openmobilemaps.OpenMobileMapsMapDesignTypeInterface extends com.mapconductor.core.map.MapDesignTypeInterface<java.lang.String> {
Expand Down Expand Up @@ -199,12 +220,15 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsMapViewHolder i
public androidx.compose.ui.geometry.Offset toScreenOffset-x-9fifI(com.mapconductor.core.features.GeoPointInterface);
public com.mapconductor.core.features.GeoPoint fromScreenOffsetSync-k-4lQ0M(long);
public java.lang.Object fromScreenOffset-3MmeM6k(long, kotlin.coroutines.Continuation<? super com.mapconductor.core.features.GeoPoint>);
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.openmobilemaps.OpenMobileMapsMapViewKt {
public static final com.mapconductor.openmobilemaps.OpenMobileMapsViewState rememberOpenMobileMapsMapViewState(com.mapconductor.openmobilemaps.OpenMobileMapsMapDesignTypeInterface, com.mapconductor.core.map.MapCameraPositionInterface, androidx.compose.runtime.Composer, int, int);
public static final void OpenMobileMapsMapView(com.mapconductor.openmobilemaps.OpenMobileMapsViewState, 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.openmobilemaps.OpenMobileMapsMapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final void OpenMobileMapsMapView(com.mapconductor.openmobilemaps.OpenMobileMapsViewState, 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.openmobilemaps.OpenMobileMapsMapViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final com.mapconductor.openmobilemaps.OpenMobileMapsMapViewController createOpenMobileMapsViewController(com.mapconductor.openmobilemaps.OpenMobileMapsMapViewHolder, java.util.ArrayList<io.openmobilemaps.mapscore.shared.map.loader.LoaderInterface>, float, com.mapconductor.core.marker.MarkerTilingOptions, com.mapconductor.core.map.MutableMapServiceRegistry);
}
public final class com.mapconductor.openmobilemaps.OpenMobileMapsMapViewSaver extends com.mapconductor.compose.map.BaseMapViewSaver<com.mapconductor.openmobilemaps.OpenMobileMapsViewState> {
Expand All @@ -231,6 +255,7 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsMarkerOverlayRe
public java.lang.Object onChange(java.util.List<? extends com.mapconductor.core.marker.MarkerOverlayRendererInterface$ChangeParamsInterface<io.openmobilemaps.mapscore.shared.map.layers.icon.IconInfoInterface>>, kotlin.coroutines.Continuation<? super java.util.List<? extends io.openmobilemaps.mapscore.shared.map.layers.icon.IconInfoInterface>>);
public java.lang.Object onRemove(java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<io.openmobilemaps.mapscore.shared.map.layers.icon.IconInfoInterface>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public java.lang.Object onPostProcess(kotlin.coroutines.Continuation<? super kotlin.Unit>);
protected java.lang.Object applyDrawOrder(java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<io.openmobilemaps.mapscore.shared.map.layers.icon.IconInfoInterface>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public void onDragSelectionChanged(com.mapconductor.core.marker.MarkerEntityInterface<io.openmobilemaps.mapscore.shared.map.layers.icon.IconInfoInterface>, com.mapconductor.core.marker.MarkerEntityInterface<io.openmobilemaps.mapscore.shared.map.layers.icon.IconInfoInterface>);
public void onDragPositionChanged(com.mapconductor.core.features.GeoPointInterface);
public final void onVisualTiltChanged();
Expand Down Expand Up @@ -294,6 +319,9 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsTiltEmulation {
public final kotlin.Pair<com.mapconductor.core.features.GeoPointInterface, java.lang.Double> shiftedCamera(com.mapconductor.core.map.MapCameraPosition);
public final kotlin.Pair<com.mapconductor.core.features.GeoPointInterface, java.lang.Double> restoreLogicalCamera(com.mapconductor.core.features.GeoPointInterface, double, double, double);
}
public final class com.mapconductor.openmobilemaps.OpenMobileMapsTiltEmulationKt {
public static final double OPEN_MOBILE_MAPS_VERTICAL_FOV;
}
public final class com.mapconductor.openmobilemaps.OpenMobileMapsTouchListener extends io.openmobilemaps.mapscore.map.util.SimpleTouchInterface {
public com.mapconductor.openmobilemaps.OpenMobileMapsTouchListener(com.mapconductor.openmobilemaps.OpenMobileMapsMapViewController);
public boolean onTouchDown(io.openmobilemaps.mapscore.shared.graphics.common.Vec2F);
Expand Down Expand Up @@ -339,11 +367,14 @@ public final class com.mapconductor.openmobilemaps.marker.OpenMobileMapsMarkerCo
public void destroy();
public java.lang.Object update(java.lang.Object, kotlin.coroutines.Continuation);
}
final class com.mapconductor.openmobilemaps.marker.OpenMobileMapsMarkerController$Companion {
public final long getTILE_REFRESH_COALESCE-UwyO8pc();
}
public final class com.mapconductor.openmobilemaps.tile.WebMercatorTileLayerConfig extends io.openmobilemaps.mapscore.shared.map.layers.tiled.Tiled2dMapLayerConfig {
public static final double WORLD_WIDTH_METERS;
public static final double HALF_WORLD;
public com.mapconductor.openmobilemaps.tile.WebMercatorTileLayerConfig(java.lang.String, java.lang.String, int, int, int, com.mapconductor.core.raster.TileScheme, int, boolean);
public com.mapconductor.openmobilemaps.tile.WebMercatorTileLayerConfig(java.lang.String, java.lang.String, int, int, int, com.mapconductor.core.raster.TileScheme, int, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker);
public com.mapconductor.openmobilemaps.tile.WebMercatorTileLayerConfig(java.lang.String, java.lang.String, int, int, int, com.mapconductor.core.raster.TileScheme, int, boolean, boolean);
public com.mapconductor.openmobilemaps.tile.WebMercatorTileLayerConfig(java.lang.String, java.lang.String, int, int, int, com.mapconductor.core.raster.TileScheme, int, boolean, boolean, int, kotlin.jvm.internal.DefaultConstructorMarker);
public int getCoordinateSystemIdentifier();
public java.lang.String getLayerName();
public java.lang.String getTileUrl(int, int, int, int);
Expand Down
18 changes: 12 additions & 6 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ android {

defaultConfig {
minSdk = project.property("minSdk").toString().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
}

Expand Down Expand Up @@ -64,8 +65,9 @@ dependencies {
// Open Mobile Maps SDK
api(libs.openmobilemaps.mapscore)
// ローカルタイルサーバの 404 を 204 へ書き換えるインターセプタで使う
// (mapscore の transitive 依存と同じ版。DataLoader が okhttp3.Interceptor を受け取る)
implementation("com.squareup.okhttp3:okhttp:5.1.0")
// (DataLoader が okhttp3.Interceptor を受け取る。mapscore 4.0.0 の transitive は
// 5.1.0 だが、ここで版をカタログに寄せて明示的に引き上げている)
implementation(libs.okhttp)

// 集約ビルド(android-sdk)ではプロジェクト参照、単体ビルド(CI のリリース)では
// Maven 座標で解決する。他プロバイダと同じ形。
Expand All @@ -76,8 +78,11 @@ dependencies {
}

testImplementation(libs.junit)
}

// Saver の保存 → 復元を実機の Bundle / Parcel で確かめる(SaverRoundTripTest)。
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
}

// Set project version for NMCP plugin
version = libraryVersion
Expand All @@ -86,9 +91,10 @@ val libraryDescription = "Open Mobile Maps implementation for MapConductor unifi

// Gradle 9.6 で `by tasks.registering` は非推奨(スクリプトコンパイルエラーになる)。
// googlemaps 等の既存モジュールは古い形のままなので、再コンパイル時に同じ問題が出る。
val javadocJar = tasks.register<Jar>("javadocJar") {
archiveClassifier.set("javadoc")
}
val javadocJar =
tasks.register<Jar>("javadocJar") {
archiveClassifier.set("javadoc")
}

afterEvaluate {
publishing {
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ minSdk=26
javaVersion=17
jvmTarget=17

libraryVersion=1.3.1
libraryVersion=1.4.0
android.generateSyncIssueWhenLibraryConstraintsAreEnabled=false
27 changes: 15 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
[versions]
composeLibs = "1.7.8"
composeLibs = "1.12.1"
# material3 は compose-ui とは別のバージョン系列。composeLibs(ui 系)を流用すると
# 存在しない material3:1.7.8 を要求してクラスパスごと解決に失敗する。
material3 = "1.4.0"
openmobilemaps = "4.0.0"
coroutines = "1.9.0"
agp = "9.2.1"
kotlin = "2.4.10"

composeBom = "2025.02.00"
coreKtx = "1.16.0"
lifecycleRuntimeKtx = "2.8.7"
okhttp = "5.3.2"
playServicesMaps = "20.0.0"
activityCompose = "1.9.3"
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 @@ -37,7 +40,7 @@ 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" }
androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling", version.ref = "composeLibs" }

# Test
Expand Down
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,3 @@ dependencyResolutionManagement {
}

rootProject.name = "android-for-openmobilemaps"

Loading
Loading