Skip to content

Commit 2424ba2

Browse files
authored
Merge pull request #32 from ArcGIS/version-update-changes
Version update
2 parents fcb86f4 + 307f045 commit 2424ba2

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ subprojects {
1818
dependencies {
1919
implementation "androidx.appcompat:appcompat:$appcompatVersion"
2020
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
21-
implementation "arcgisruntime:arcgis-android:$arcgisVersion"
21+
implementation "com.esri:arcgis-maps-kotlin:$arcgisVersion"
2222
implementation "androidx.multidex:multidex:$multidexVersion"
2323
}
2424
}

find-nearest-vertex/src/main/java/com/esri/arcgismaps/sample/findnearestvertex/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class MainActivity : AppCompatActivity() {
124124

125125
// create a map using the portal item
126126
val map = ArcGISMap(statePlaneCaliforniaZone5SpatialReference)
127-
val portal = Portal("https://arcgisruntime.maps.arcgis.com", false)
127+
val portal = Portal("https://arcgisruntime.maps.arcgis.com")
128128
val portalItem = PortalItem(portal, "99fd67933e754a1181cc755146be21ca")
129129
val usStatesGeneralizedLayer = FeatureLayer(portalItem, 0)
130130
// and add the feature layer to the map's operational layers

generate-offline-map/src/main/java/com/esri/arcgismaps/sample/generateofflinemap/MainActivity.kt

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class MainActivity : AppCompatActivity() {
7979
takeMapOfflineButton.isEnabled = false
8080

8181
// create a portal item with the itemId of the web map
82-
val portal = Portal(getString(R.string.portal_url), false)
82+
val portal = Portal(getString(R.string.portal_url))
8383
val portalItem = PortalItem(portal, getString(R.string.item_id))
8484

8585
// create a symbol to show a box around the extent we want to download
@@ -93,20 +93,13 @@ class MainActivity : AppCompatActivity() {
9393
showMessage(it.message.toString())
9494
}
9595
.onSuccess {
96-
// get the min an max scale of the the operational layer
97-
val maxScale = map.operationalLayers[6].maxScale
98-
val minScale = map.operationalLayers[6].minScale
99-
if(minScale != null && maxScale != null){
100-
// limit the map scale to the largest layer scale
101-
map.maxScale = maxScale
102-
map.minScale = minScale
103-
// set the map to the map view
104-
mapView.map = map
105-
// add the graphics overlay to the map view when it is created
106-
mapView.graphicsOverlays.add(graphicsOverlay)
107-
} else {
108-
showMessage("Error retrieving map scale")
109-
}
96+
// limit the map scale to the largest layer scale
97+
map.maxScale = map.operationalLayers[6].maxScale ?: 0.0
98+
map.minScale = map.operationalLayers[6].minScale ?: 0.0
99+
// set the map to the map view
100+
mapView.map = map
101+
// add the graphics overlay to the map view when it is created
102+
mapView.graphicsOverlays.add(graphicsOverlay)
110103
}
111104
}
112105
lifecycleScope.launch {

version.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ext {
1212
appcompatVersion = '1.3.0'
1313
constraintLayoutVersion = '2.1.4'
1414
multidexVersion = '2.0.1'
15-
arcgisVersion = '200.0.0-3707'
15+
arcgisVersion = '200.0.0-3709'
1616
materialVersion = '1.6.1'
1717
recyclerViewVersion = '1.1.0'
1818
// plugin versions

0 commit comments

Comments
 (0)