Skip to content

Compose MapView: Geometry editor #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Oct 30, 2023
Merged

Compose MapView: Geometry editor #170

Changes from 17 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a83b607
added map operator with graphics overlay
shubham7109 Oct 19, 2023
cabfdc8
add MapContainer semantics
shubham7109 Oct 19, 2023
12739dd
added missing lines
shubham7109 Oct 20, 2023
a8f341c
remove mapOperator parameter
shubham7109 Oct 20, 2023
c8bbf21
added rememberGraphicOverlays
shubham7109 Oct 24, 2023
ab71ead
Merge branch 'feature-branches/geo-compose' into shubham/compose-grap…
shubham7109 Oct 24, 2023
1d14954
Merge branch 'feature-branches/geo-compose' into shubham/compose-grap…
shubham7109 Oct 24, 2023
2aaee2f
remove ResultExtensions
shubham7109 Oct 24, 2023
b00561b
prototyping rememberGraphicOverlays
shubham7109 Oct 25, 2023
0e109a8
added GraphicsOverlayMutableList implementation
shubham7109 Oct 25, 2023
c7ac157
cleanup Map
shubham7109 Oct 25, 2023
1ed5749
remove extra line
shubham7109 Oct 25, 2023
38e7e17
moved ChangedEvent to be internal
shubham7109 Oct 25, 2023
471ab26
Merge branch 'feature-branches/geo-compose' into shubham/compose-grap…
shubham7109 Oct 25, 2023
c9d56ae
update doc to MapView
shubham7109 Oct 25, 2023
33cbaf7
added geometryEditor
shubham7109 Oct 25, 2023
d5604b3
removed graphicsOverlays impl
shubham7109 Oct 27, 2023
835be18
geometryEditor udpate doc
shubham7109 Oct 30, 2023
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
14 changes: 7 additions & 7 deletions toolkit/geo-compose/src/main/java/com/arcgismaps/toolkit/geocompose/MapView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import com.arcgismaps.mapping.ArcGISMap
import com.arcgismaps.mapping.view.LocationDisplay
import com.arcgismaps.mapping.view.MapView
import com.arcgismaps.mapping.view.MapViewInteractionOptions
import com.arcgismaps.mapping.view.geometryeditor.GeometryEditor
import kotlinx.coroutines.launch

/**
Expand All @@ -49,6 +50,7 @@ public val MapViewInteractionOptionDefaults: MapViewInteractionOptions = MapView
* @param modifier Modifier to be applied to the composable MapView
* @param arcGISMap the [ArcGISMap] to be rendered by this composable
* @param locationDisplay the [LocationDisplay] used by the composable [com.arcgismaps.toolkit.geocompose.MapView]
* @param geometryEditor create and edit geometries by interacting with the composable [com.arcgismaps.toolkit.geocompose.MapView].
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Something like,
the [GeometryEditor] used by the composable [com.arcgismaps.toolkit.geocompose.MapView] to create and edit geometries by user interaction

* @param mapViewInteractionOptions the [MapViewInteractionOptions] used by this composable [com.arcgismaps.toolkit.geocompose.MapView]
* @param onViewpointChanged lambda invoked when the viewpoint of the composable MapView has changed
* @param overlay the composable overlays to display on top of the composable MapView. Example, a compass, floorfilter etc.
Expand All @@ -59,6 +61,7 @@ public fun MapView(
modifier: Modifier = Modifier,
arcGISMap: ArcGISMap? = null,
locationDisplay: LocationDisplay = rememberLocationDisplay(),
geometryEditor: GeometryEditor? = null,
mapViewInteractionOptions: MapViewInteractionOptions = MapViewInteractionOptionDefaults,
onViewpointChanged: (() -> Unit)? = null,
overlay: @Composable () -> Unit = {}
Expand All @@ -67,18 +70,15 @@ public fun MapView(
val context = LocalContext.current
val mapView = remember { MapView(context) }

Box(modifier = Modifier.semantics {
contentDescription = "MapViewContainer"
}) {
AndroidView(modifier = modifier
.semantics {
contentDescription = "MapView"
},
Box(modifier = Modifier.semantics { contentDescription = "MapContainer" }) {
AndroidView(
modifier = modifier.semantics { contentDescription = "MapView" },
factory = { mapView },
update = {
it.map = arcGISMap
it.interactionOptions = mapViewInteractionOptions
it.locationDisplay = locationDisplay
it.geometryEditor = geometryEditor
})

overlay()
Expand Down