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 19a39a87a..3a61de538 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 @@ -20,11 +20,8 @@ import android.app.Application import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.AndroidViewModel import com.arcgismaps.data.ServiceFeatureTable -import com.arcgismaps.geometry.Point -import com.arcgismaps.geometry.SpatialReference 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 @@ -38,16 +35,8 @@ class MapViewModel( private val sampleCoroutineScope: CoroutineScope ) : AndroidViewModel(application) { - // create an ArcGISMap and Viewpoint + // create an ArcGISMap var arcGISMap: ArcGISMap = ArcGISMap(BasemapStyle.ArcGISNavigationNight) - var viewpoint: Viewpoint = Viewpoint( - center = Point( - x = -10977012.785807, - y = 4514257.550369, - spatialReference = SpatialReference(wkid = 3857) - ), - scale = 68015210.0 - ) // create a ViewModel to handle dialog interactions val messageDialogVM: MessageDialogViewModel = MessageDialogViewModel() 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 8200b54c8..095fd1c7c 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,6 +31,9 @@ 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.MapViewProxy import com.arcgismaps.toolkit.geocompose.MapViewpointOperation @@ -53,6 +56,15 @@ fun MainScreen(sampleName: String) { // create a mapViewProxy that will be used to identify features in the MapView // should also be passed to the MapView composable this mapViewProxy is associated with val mapViewProxy = MapViewProxy() + // create a Viewpoint + val viewpoint = Viewpoint( + center = Point( + x = -10977012.785807, + y = 4514257.550369, + spatialReference = SpatialReference(wkid = 3857) + ), + scale = 68015210.0 + ) Scaffold( topBar = { SampleTopAppBar(title = sampleName) }, @@ -68,7 +80,7 @@ fun MainScreen(sampleName: String) { .weight(1f) .animateContentSize(), arcGISMap = mapViewModel.arcGISMap, - viewpointOperation = MapViewpointOperation.Set(viewpoint = mapViewModel.viewpoint), + viewpointOperation = MapViewpointOperation.Set(viewpoint = viewpoint), mapViewProxy = mapViewProxy, onSingleTapConfirmed = { singleTapConfirmedEvent -> sampleCoroutineScope.launch {