Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion api/android-for-openmobilemaps.api
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ public final class com.mapconductor.openmobilemaps.OpenMobileMapsMapViewHolder i
}
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 Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ dependencies {
testImplementation(libs.junit)
}


// Set project version for NMCP plugin
version = libraryVersion
val libraryName = "MapConductor for Open Mobile Maps"
val libraryDescription = "Open Mobile Maps implementation for MapConductor unified mapping library"

// 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
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"

Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import com.mapconductor.core.map.MapCameraPosition
import com.mapconductor.core.map.MapCameraPositionInterface
import com.mapconductor.core.map.MapViewState
import com.mapconductor.core.map.MapViewStateInterface
import com.mapconductor.core.map.MapViewStyle
import com.mapconductor.core.map.MutableMapServiceRegistry
import com.mapconductor.core.marker.MarkerEventControllerInterface
import com.mapconductor.core.marker.MarkerManager
Expand Down Expand Up @@ -162,6 +163,15 @@ fun OpenMobileMapsMapView(
onCameraMoveStart: OnCameraMoveHandler? = null,
onCameraMove: OnCameraMoveHandler? = null,
onCameraMoveEnd: OnCameraMoveHandler? = null,
/**
* How the map looks, when the app states it rather than naming a design.
*
* A vector style *is* the basemap. `com.mapconductor:vectorstyle` builds
* one; what happens underneath depends on this backend and the app does
* not have to know.
*/
style: MapViewStyle? = null,
onStyleDiagnostics: ((List<String>) -> Unit)? = null,
content: (@Composable OpenMobileMapsMapViewScope.() -> Unit)? = null,
) {
val context = LocalContext.current
Expand Down Expand Up @@ -265,6 +275,8 @@ fun OpenMobileMapsMapView(
true
}
},
style = style,
onStyleDiagnostics = onStyleDiagnostics,
content = content,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ internal object OpenMobileMapsTiltEmulation {
val tiltAbsRad = Math.toRadians(tiltAbsDeg)
val altitude = altitudeFor(position.zoom, position.position.latitude)
val distanceForward = altitude * cos(tiltAbsRad) * tan(tiltAbsRad) * TARGET_DISTANCE_SCALE
val target = Spherical.computeOffset(position.position, distanceForward, CameraBearing.toNativeHeading(position.bearing))
val target =
Spherical
.computeOffset(position.position, distanceForward, CameraBearing.toNativeHeading(position.bearing))
return target to zoom
}

Expand All @@ -72,7 +74,11 @@ internal object OpenMobileMapsTiltEmulation {
val tiltAbsRad = Math.toRadians(tiltAbsDeg)
val altitude = altitudeFor(originalZoom, center.latitude)
val distanceBackward = altitude * cos(tiltAbsRad) * tan(tiltAbsRad) * TARGET_DISTANCE_SCALE
val originalPosition: GeoPoint = Spherical.computeOffset(center, distanceBackward, CameraBearing.toNativeHeading(bearing) + 180.0)
val originalPosition: GeoPoint =
Spherical.computeOffset(
center, distanceBackward,
CameraBearing.toNativeHeading(bearing) + 180.0,
)
return originalPosition to originalZoom
}

Expand Down
Loading