diff --git a/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/components/MapViewModel.kt b/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/components/MapViewModel.kt index e6baf725d..6e00e34dd 100644 --- a/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/components/MapViewModel.kt +++ b/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/components/MapViewModel.kt @@ -23,6 +23,7 @@ import androidx.lifecycle.AndroidViewModel import com.arcgismaps.data.ServiceFeatureTable import com.arcgismaps.mapping.ArcGISMap import com.arcgismaps.mapping.BasemapStyle +import com.arcgismaps.mapping.Viewpoint import com.arcgismaps.mapping.layers.ArcGISMapImageLayer import com.arcgismaps.mapping.layers.FeatureLayer.Companion.createWithFeatureTable import com.arcgismaps.mapping.view.IdentifyLayerResult @@ -71,14 +72,18 @@ class MapViewModel( } // add the world cities layer with and the damaged properties feature layer - map.operationalLayers.addAll(listOf(mapImageLayer, featureLayer)) + map.apply { + // set initial Viewpoint to North America + initialViewpoint = Viewpoint(39.8, -98.6, 5e7) + operationalLayers.addAll(listOf(mapImageLayer, featureLayer)) + } } /** * Identify the feature layer results and display the resulting information */ - fun handleIdentifyResult(result: Result>) { + private fun handleIdentifyResult(result: Result>) { sampleCoroutineScope.launch { result.onSuccess { identifyResultList -> val message = StringBuilder() diff --git a/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/screens/MainScreen.kt b/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/screens/MainScreen.kt index bf7b77201..2e2ca4c72 100644 --- a/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/screens/MainScreen.kt +++ b/identify-layer-features/src/main/java/com/esri/arcgismaps/sample/identifylayerfeatures/screens/MainScreen.kt @@ -31,11 +31,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import com.arcgismaps.geometry.Point -import com.arcgismaps.geometry.SpatialReference -import com.arcgismaps.mapping.Viewpoint import com.arcgismaps.toolkit.geocompose.MapView -import com.arcgismaps.toolkit.geocompose.MapViewpointOperation import com.esri.arcgismaps.sample.identifylayerfeatures.components.MapViewModel import com.esri.arcgismaps.sample.sampleslib.components.MessageDialog import com.esri.arcgismaps.sample.sampleslib.components.SampleTopAppBar @@ -52,14 +48,7 @@ fun MainScreen(sampleName: String) { // create a ViewModel to handle MapView interactions val mapViewModel = remember { MapViewModel(sampleApplication, sampleCoroutineScope) } // create a Viewpoint - val northAmericaViewpoint = Viewpoint( - center = Point( - x = -10977012.785807, - y = 4514257.550369, - spatialReference = SpatialReference(wkid = 3857) - ), - scale = 68015210.0 - ) + Scaffold( topBar = { SampleTopAppBar(title = sampleName) }, @@ -75,7 +64,6 @@ fun MainScreen(sampleName: String) { .weight(1f) .animateContentSize(), arcGISMap = mapViewModel.map, - viewpointOperation = MapViewpointOperation.Set(viewpoint = northAmericaViewpoint), mapViewProxy = mapViewModel.mapViewProxy, onSingleTapConfirmed = mapViewModel::identify )