Skip to content

Commit d1f79c5

Browse files
authored
Merge branch 'v.next' into Caleb/New-CreateDynamicBasemapGallery
2 parents 8972089 + e3491e0 commit d1f79c5

File tree

6 files changed

+147
-145
lines changed

6 files changed

+147
-145
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ This repository contains Swift sample code demonstrating the capabilities of the
1818

1919
## Requirements
2020

21-
* [ArcGIS Maps SDK for Swift](https://developers.arcgis.com/swift/) 200.4 (or newer)
22-
* [ArcGIS Maps SDK for Swift Toolkit](https://github.com/Esri/arcgis-maps-sdk-swift-toolkit) 200.4 (or newer)
21+
* [ArcGIS Maps SDK for Swift](https://developers.arcgis.com/swift/) 200.5 (or newer)
22+
* [ArcGIS Maps SDK for Swift Toolkit](https://github.com/Esri/arcgis-maps-sdk-swift-toolkit) 200.5 (or newer)
2323
* Xcode 15.0 (or newer)
2424

2525
The *ArcGIS Maps SDK for Swift Samples app* has a *Target SDK* version of *16.0*, meaning that it can run on devices with *iOS 16.0* or newer.

Samples.xcodeproj/project.pbxproj

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
0039A4F92885C50300592C86 /* ShowResultOfSpatialOperationsView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = E004A6F2284E4FEB002A1FE6 /* ShowResultOfSpatialOperationsView.swift */; };
3636
0039A4FA2885C50300592C86 /* StyleGraphicsWithRendererView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = E066DD372860AB28004D3D5B /* StyleGraphicsWithRendererView.swift */; };
3737
0039A4FB2885C50300592C86 /* StyleGraphicsWithSymbolsView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = E004A6E52846A61F002A1FE6 /* StyleGraphicsWithSymbolsView.swift */; };
38+
003B36F92C5042BA00A75F66 /* ShowServiceAreaView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 95D2EE0E2C334D1600683D53 /* ShowServiceAreaView.swift */; };
3839
0042E24328E4BF8F001F33D6 /* ShowViewshedFromPointInSceneView.Model.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0042E24228E4BF8F001F33D6 /* ShowViewshedFromPointInSceneView.Model.swift */; };
3940
0042E24528E4F82C001F33D6 /* ShowViewshedFromPointInSceneView.ViewshedSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0042E24428E4F82B001F33D6 /* ShowViewshedFromPointInSceneView.ViewshedSettingsView.swift */; };
4041
0042E24628E50EE4001F33D6 /* ShowViewshedFromPointInSceneView.swift in Copy Source Code Files */ = {isa = PBXBuildFile; fileRef = 0086F3FD28E3770900974721 /* ShowViewshedFromPointInSceneView.swift */; };
@@ -528,6 +529,7 @@
528529
files = (
529530
D78FA4952C3C8E8A0079313E /* CreateDynamicBasemapGalleryView.Views.swift in Copy Source Code Files */,
530531
D79482D72C35D8A3006521CD /* CreateDynamicBasemapGalleryView.swift in Copy Source Code Files */,
532+
003B36F92C5042BA00A75F66 /* ShowServiceAreaView.swift in Copy Source Code Files */,
531533
95ADF34F2C3CBAE800566FF6 /* EditFeatureAttachmentsView.Model.swift in Copy Source Code Files */,
532534
9579FCEC2C33616B00FC8A1D /* EditFeatureAttachmentsView.swift in Copy Source Code Files */,
533535
954708642C3C798C00CA8579 /* AddENCExchangeSetView.swift in Copy Source Code Files */,
@@ -3384,7 +3386,7 @@
33843386
"$(inherited)",
33853387
"@executable_path/Frameworks",
33863388
);
3387-
MARKETING_VERSION = 200.4.0;
3389+
MARKETING_VERSION = 200.5.0;
33883390
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-samples";
33893391
PRODUCT_NAME = "ArcGIS Maps SDK Samples";
33903392
SDKROOT = iphoneos;
@@ -3416,7 +3418,7 @@
34163418
"$(inherited)",
34173419
"@executable_path/Frameworks",
34183420
);
3419-
MARKETING_VERSION = 200.4.0;
3421+
MARKETING_VERSION = 200.5.0;
34203422
PRODUCT_BUNDLE_IDENTIFIER = "com.esri.arcgis-swift-sdk-samples";
34213423
PRODUCT_NAME = "ArcGIS Maps SDK Samples";
34223424
SDKROOT = iphoneos;
@@ -3460,7 +3462,7 @@
34603462
repositoryURL = "https://github.com/Esri/arcgis-maps-sdk-swift-toolkit/";
34613463
requirement = {
34623464
kind = upToNextMinorVersion;
3463-
minimumVersion = 200.4.0;
3465+
minimumVersion = 200.5.0;
34643466
};
34653467
};
34663468
/* End XCRemoteSwiftPackageReference section */

Shared/Samples/Create and edit geometries/CreateAndEditGeometriesView.swift

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -465,6 +465,14 @@ private class GeometryEditorModel: ObservableObject {
465465
selectedGraphic = graphic
466466
graphic.isVisible = false
467467
let geometry = graphic.geometry!
468+
469+
switch geometry {
470+
case is Point, is Multipoint:
471+
geometryEditor.tool = VertexTool()
472+
default:
473+
break
474+
}
475+
468476
geometryEditor.start(withInitial: geometry)
469477
isStarted = true
470478
}

Shared/Samples/Play KML tour/README.metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"category": "Layers",
2+
"category": "Visualization",
33
"description": "Play tours in KML files.",
44
"ignore": false,
55
"images": [

0 commit comments

Comments
 (0)