Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
bdc5318
Make bearing a clockwise map rotation (#12)
wf9a5m75 Sep 12, 2026
5f073a9
Record the cancellable renderTile overload
wf9a5m75 Sep 16, 2026
7bd524f
Pass declutterPx through to the marker tile renderer
wf9a5m75 Sep 21, 2026
341ce1d
update dependencies (#13)
wf9a5m75 Oct 5, 2026
c45c680
Vector style support and render local raster tiles without HERE's net…
wf9a5m75 Oct 24, 2026
cb0945a
Add .claude/settings.json
wf9a5m75 Oct 28, 2026
b627cfa
Redraw tiles once per burst of tiled-marker changes
wf9a5m75 Nov 5, 2026
715e1f0
Merge pull request #15 from MapConductor/perf/tiled-marker-update
wf9a5m75 Nov 6, 2026
e0d4d40
Keep the map design across configuration changes
wf9a5m75 Nov 7, 2026
b1eabc2
Merge pull request #16 from MapConductor/fix/saver-state
wf9a5m75 Nov 7, 2026
9029369
Draw large polygon sets as raster tiles (PolygonTiler)
wf9a5m75 Nov 7, 2026
7ca1e7f
Destroy the MapView when the map leaves the composition
wf9a5m75 Nov 7, 2026
eac94c6
Read the controller through the state base, which MapViewBase clears
wf9a5m75 Nov 8, 2026
1df9c80
Interpolate the closing edge of geodesic polygons
wf9a5m75 Nov 8, 2026
79b9f43
Densify non-geodesic polygon rings, closing edge included
wf9a5m75 Nov 8, 2026
23b34ec
Merge pull request #17 from MapConductor/fix/mapview-teardown
wf9a5m75 Nov 8, 2026
4da7ca4
Merge pull request #18 from MapConductor/fix/geodesic-polygon-fill
wf9a5m75 Nov 8, 2026
32fde1d
Clear strategy markers in clearOverlays()
wf9a5m75 Nov 8, 2026
544673c
Put rasters and ground images under map items; separate draw-order bands
wf9a5m75 Nov 8, 2026
9a11990
Merge pull request #19 from MapConductor/fix/clear-strategy
wf9a5m75 Nov 8, 2026
a705602
Merge pull request #20 from MapConductor/fix/overlay-stacking-order
wf9a5m75 Nov 8, 2026
cec7a8c
Merge remote-tracking branch 'origin/develop' into feat/polygon-tiling
wf9a5m75 Nov 9, 2026
1923dc1
Stack the polygon tiles at the bottom of the polygon band
wf9a5m75 Nov 9, 2026
d94b6ac
Update the API baseline
wf9a5m75 Nov 9, 2026
379b56d
Merge pull request #21 from MapConductor/feat/polygon-tiling
wf9a5m75 Nov 9, 2026
45c8b12
Draw large polyline sets as raster tiles (PolylineTiler)
wf9a5m75 Nov 9, 2026
3ccc747
Merge pull request #22 from MapConductor/feat/polyline-tiling
wf9a5m75 Nov 10, 2026
ce49fb2
Support bulk Circles with raster tiles
wf9a5m75 Nov 11, 2026
75bbda4
Merge pull request #23 from MapConductor/feat/circles-bulk-cache
wf9a5m75 Nov 11, 2026
472aa67
Order markers with MarkerDrawOrder
wf9a5m75 Nov 11, 2026
678d936
Rank markers into HERE's usable drawOrder range
wf9a5m75 Nov 11, 2026
b799adc
Merge pull request #24 from MapConductor/fix/marker-zindex-order
wf9a5m75 Nov 12, 2026
73eb460
Apply camera paddings and report fov on HERE
wf9a5m75 Nov 12, 2026
e64c753
Merge remote-tracking branch 'origin/develop' into feat/camera-paddings
wf9a5m75 Nov 12, 2026
28173a0
Merge pull request #25 from MapConductor/feat/camera-paddings
wf9a5m75 Nov 12, 2026
808e5f1
Release 1.4.0
wf9a5m75 Nov 13, 2026
5c23d3a
Merge pull request #26 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 @@ -54,8 +54,29 @@ jobs:
fi

- 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 @@ -69,7 +90,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
41 changes: 39 additions & 2 deletions api/android-for-here.api
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,9 @@ public final class com.mapconductor.here.HereMapViewController extends com.mapco
public final class com.mapconductor.here.HereMapViewController$Companion {
}
public final class com.mapconductor.here.HereMapViewControllerCameraKt {
public static final double viewportHeightDp(com.mapconductor.here.HereMapViewController);
public static final java.lang.Double verticalFov(com.mapconductor.here.HereMapViewController);
public static final com.mapconductor.core.map.MapCameraPosition toNativeCamera(com.mapconductor.here.HereMapViewController, com.mapconductor.core.map.MapCameraPosition);
public static final void handleMoveCamera(com.mapconductor.here.HereMapViewController, com.mapconductor.core.map.MapCameraPosition);
public static final void handleAnimateCamera(com.mapconductor.here.HereMapViewController, com.mapconductor.core.map.MapCameraPosition, long);
public static final void handleFitBounds(com.mapconductor.here.HereMapViewController, com.mapconductor.core.features.GeoRectBounds, int);
Expand All @@ -172,7 +175,7 @@ public final class com.mapconductor.here.HereMapViewControllerStore extends com.
public final void initSDK(android.content.Context);
}
public final class com.mapconductor.here.HereMapViewKt {
public static final void HereMapView(com.mapconductor.here.HereViewState, 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.MapProjection, kotlin.jvm.functions.Function3<? super com.mapconductor.here.HereViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
public static final void HereMapView(com.mapconductor.here.HereViewState, 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.MapProjection, 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.here.HereViewScope, ? super androidx.compose.runtime.Composer, ? super java.lang.Integer, kotlin.Unit>, androidx.compose.runtime.Composer, int, int, int);
}
public final class com.mapconductor.here.HereMapViewSaver extends com.mapconductor.compose.map.BaseMapViewSaver<com.mapconductor.here.HereViewState> {
public com.mapconductor.here.HereMapViewSaver();
Expand All @@ -184,6 +187,17 @@ public final class com.mapconductor.here.HereMapViewSaver extends com.mapconduct
public com.mapconductor.core.map.MapViewStateInterface createState(java.lang.String, android.os.Bundle, com.mapconductor.core.map.MapCameraPosition);
public java.lang.String getStateId(com.mapconductor.core.map.MapViewStateInterface);
}
public final class com.mapconductor.here.HereOverlayStacking {
public static final com.mapconductor.here.HereOverlayStacking INSTANCE;
public final int polygonDrawOrder(int);
public final int circleDrawOrder(int);
public final int polylineDrawOrder(int);
public final com.here.sdk.mapview.MapLayerPriority rasterPriority();
public final com.here.sdk.mapview.MapLayerPriority groundImagePriority();
public final com.here.sdk.mapview.MapLayerPriority polygonTilePriority();
public final com.here.sdk.mapview.MapLayerPriority polygonTilePriority(java.lang.String);
public final com.here.sdk.mapview.MapLayerPriority polylineTilePriority(java.lang.String);
}
public final class com.mapconductor.here.HereTypeAliasKt {
}
public final class com.mapconductor.here.HereViewControllerStoreKt {
Expand All @@ -197,6 +211,9 @@ public final class com.mapconductor.here.HereViewHolder implements com.mapconduc
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();
}
Expand Down Expand Up @@ -311,6 +328,7 @@ public final class com.mapconductor.here.marker.HereMarkerController$Companion {
public final class com.mapconductor.here.marker.HereMarkerRenderer extends com.mapconductor.core.marker.AbstractMarkerOverlayRenderer<com.mapconductor.here.HereViewHolder, com.here.sdk.mapview.MapMarker> {
public com.mapconductor.here.marker.HereMarkerRenderer(com.mapconductor.here.HereViewHolder, kotlinx.coroutines.CoroutineScope);
public com.mapconductor.here.marker.HereMarkerRenderer(com.mapconductor.here.HereViewHolder, kotlinx.coroutines.CoroutineScope, int, kotlin.jvm.internal.DefaultConstructorMarker);
protected java.lang.Object applyDrawOrder(java.util.List<? extends com.mapconductor.core.marker.MarkerEntityInterface<com.here.sdk.mapview.MapMarker>>, kotlin.coroutines.Continuation<? super kotlin.Unit>);
public boolean getSupportsAnimationOverlay();
public void setMarkerVisible(com.mapconductor.core.marker.MarkerEntityInterface<com.here.sdk.mapview.MapMarker>, boolean);
public void setMarkerPosition(com.mapconductor.core.marker.MarkerEntityInterface<com.here.sdk.mapview.MapMarker>, com.mapconductor.core.features.GeoPoint);
Expand Down Expand Up @@ -400,11 +418,13 @@ final class com.mapconductor.here.raster.HereRasterLayerOverlayRenderer$TileSpec
public final java.lang.String getSourceName();
public final java.lang.String getLayerName();
public final java.util.List<java.lang.Integer> getStorageLevels();
public final java.lang.String getLocalTemplate();
public final com.here.sdk.mapview.datasource.TileUrlProviderCallback component1();
public final java.lang.String component2();
public final java.lang.String component3();
public final java.util.List<java.lang.Integer> component4();
public final com.mapconductor.here.raster.HereRasterLayerOverlayRenderer$TileSpec copy(com.here.sdk.mapview.datasource.TileUrlProviderCallback, java.lang.String, java.lang.String, java.util.List<java.lang.Integer>);
public final java.lang.String component5();
public final com.mapconductor.here.raster.HereRasterLayerOverlayRenderer$TileSpec copy(com.here.sdk.mapview.datasource.TileUrlProviderCallback, java.lang.String, java.lang.String, java.util.List<java.lang.Integer>, java.lang.String);
public java.lang.String toString();
public int hashCode();
public boolean equals(java.lang.Object);
Expand All @@ -413,9 +433,26 @@ final class com.mapconductor.here.raster.HereRasterTileProxyProvider implements
public static final com.mapconductor.here.raster.HereRasterTileProxyProvider$Companion Companion;
public com.mapconductor.here.raster.HereRasterTileProxyProvider(com.mapconductor.core.raster.RasterLayerState);
public byte[] renderTile(com.mapconductor.core.tileserver.TileRequest);
public byte[] renderTile(com.mapconductor.core.tileserver.TileRequest, kotlin.jvm.functions.Function0<java.lang.Boolean>);
}
public final class com.mapconductor.here.raster.HereRasterTileProxyProvider$Companion {
}
final class com.mapconductor.here.raster.LocalRasterTileSource implements com.here.sdk.mapview.datasource.RasterTileSource {
public static final int RENDER_WIDTH;
public static final long TEN_YEARS_MS;
public com.mapconductor.here.raster.LocalRasterTileSource(com.mapconductor.core.tileserver.LocalTileServer, java.lang.String, java.util.List<java.lang.Integer>);
public com.here.sdk.mapview.datasource.TileSource$DataVersion getDataVersion(com.here.sdk.mapview.datasource.TileKey);
public void addListener(com.here.sdk.mapview.datasource.TileSource$Listener);
public void removeListener(com.here.sdk.mapview.datasource.TileSource$Listener);
public com.here.sdk.mapview.datasource.TilingScheme getTilingScheme();
public java.util.List<java.lang.Integer> getStorageLevels();
public com.here.sdk.mapview.datasource.TileSource$LoadTileRequestHandle loadTile(com.here.sdk.mapview.datasource.TileKey, com.here.sdk.mapview.datasource.RasterTileSource$LoadResultHandler);
}
final class com.mapconductor.here.raster.LocalRasterTileSource$Companion {
public final kotlinx.coroutines.CoroutineDispatcher getRenderDispatcher();
public final com.here.sdk.mapview.datasource.TileSource$DataVersion getVERSION();
public final com.here.sdk.mapview.datasource.TileSource$TileMetadata getMETADATA();
}
public final class com.mapconductor.here.zoom.ZoomAltitudeConverter extends com.mapconductor.core.zoom.AbstractZoomAltitudeConverter {
public static final com.mapconductor.here.zoom.ZoomAltitudeConverter$Companion Companion;
public static final double HERE_ZOOM_TO_GOOGLE_ZOOM_AT_EQUATOR;
Expand Down
9 changes: 9 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ dependencies {
),
),
)
// 実機テスト(HereMapViewSaverTest)は MapScheme などを実行時に読むので、テスト APK には同梱する。
androidTestImplementation(
fileTree(
mapOf(
"dir" to rootDir.resolve("libs").toString(),
"include" to arrayOf("heresdk*.jar", "heresdk*.aar"),
),
),
)
if (findProject(":android-sdk-compose") != null) {
api(project(":android-sdk-compose"))
} else {
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
22 changes: 14 additions & 8 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
[versions]
coroutines = "1.9.0"
composeLibs = "1.7.8"
agp = "9.2.1"
kotlin = "2.0.21"
coroutines = "1.11.0"
composeLibs = "1.12.1"
# material3 は compose-ui とは別のバージョン系列。composeLibs(ui 系)を流用すると
# 存在しない material3:1.7.8 を要求してクラスパスごと解決に失敗する。
material3 = "1.4.0"
agp = "9.4.1"
kotlin = "2.4.20"

composeBom = "2025.02.00"
lifecycleRuntimeKtx = "2.8.7"
activityCompose = "1.9.3"
composeBom = "2026.09.00"
lifecycleRuntimeKtx = "2.11.0"
activityCompose = "1.13.0"
ktLint = "14.2.0"

junit = "4.13.2"
Expand All @@ -27,7 +30,10 @@ androidx-lifecycle-common-java8 = { group = "androidx.lifecycle", name = "lifecy

# 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 @@ -64,6 +64,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)
}
85 changes: 85 additions & 0 deletions src/androidTest/java/com/mapconductor/here/HereMapViewSaverTest.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
package com.mapconductor.here

import androidx.compose.runtime.saveable.Saver
import androidx.compose.runtime.saveable.SaverScope
import androidx.test.ext.junit.runners.AndroidJUnit4
import com.here.sdk.mapview.MapScheme
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 が [HereMapViewSaver] を通って作り直されても、デザイン(id・
* attributionRules ほか)と uiSettings・カメラが落ちないこと。Bundle は実機の Parcel を一度通す。
*/
@RunWith(AndroidJUnit4::class)
class HereMapViewSaverTest {
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 = HereMapDesign.Custom(MapScheme.SATELLITE, rules)
val state = HereViewState(id = "here-1", mapDesignType = design, cameraPosition = camera)
state.uiSettings = MapUISettings(rotateGesture = false, tiltGesture = false)

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

val actual = restored.mapDesignType
assertTrue(actual is HereMapDesign.Custom)
assertEquals(MapScheme.SATELLITE, actual.id)
assertEquals(rules, actual.attributionRules)
assertCommon(restored, "here-1")
}

@Test
fun keepsPresetDesignAsTheSameObject() {
val state = HereViewState(id = "here-2", mapDesignType = HereMapDesign.LiteNight)
assertSame(HereMapDesign.LiteNight, roundTrip(HereMapViewSaver().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