Merge pull request #1087 from Esri/v.next

Release 100.11.2
Esri · Jul 9, 2021 · ee1bbe9 · ee1bbe9
2 parents 61c82de + 00752ca
commit ee1bbe9
Show file tree

Hide file tree

Showing 75 changed files with 2,134 additions and 27,451 deletions.
diff --git a/Scripts/CI/README_Metadata_StyleCheck/metadata_style_checker.py b/Scripts/CI/README_Metadata_StyleCheck/metadata_style_checker.py
@@ -138,7 +138,7 @@ def get_images_paths(self):
         """
         results = []
         for file in os.listdir(self.folder_path):
-            if os.path.splitext(file)[1].lower() in ['.png']:
+            if os.path.splitext(file)[1].lower() in ['.png', '.gif']:
                 results.append(file)
         if not results:
             raise Exception('Unable to get images paths.')

diff --git a/arcgis-ios-sdk-samples.xcodeproj/project.pbxproj b/arcgis-ios-sdk-samples.xcodeproj/project.pbxproj
diff --git a/arcgis-ios-sdk-samples/Content Display Logic/ContentPList.plist b/arcgis-ios-sdk-samples/Content Display Logic/ContentPList.plist
@@ -711,6 +711,30 @@
 				<key>displayName</key>
 				<string>Edit KML ground overlay</string>
 			</dict>
+			<dict>
+				<key>displayName</key>
+				<string>Display OGC API collection</string>
+				<key>descriptionText</key>
+				<string>Display an OGC API feature collection and query features while navigating the map view.</string>
+				<key>storyboardName</key>
+				<string>DisplayOGCAPICollection</string>
+			</dict>
+			<dict>
+				<key>displayName</key>
+				<string>Browse OGC API feature service</string>
+				<key>descriptionText</key>
+				<string>Browse an OGC API feature service for layers and add them to the map.</string>
+				<key>storyboardName</key>
+				<string>BrowseOGCAPIFeatureService</string>
+			</dict>
+			<dict>
+				<key>displayName</key>
+				<string>Query with CQL filters</string>
+				<key>descriptionText</key>
+				<string>Query data from an OGC API feature service using CQL filters.</string>
+				<key>storyboardName</key>
+				<string>QueryWithCQLFilters</string>
+			</dict>
 		</array>
 	</dict>
 	<dict>
@@ -1163,10 +1187,6 @@
 				<string>EditFeaturesOnline</string>
 				<key>descriptionText</key>
 				<string>View, edit, or add features using a popup.</string>
-				<key>dependency</key>
-				<array>
-					<string>SanDiegoTilePackage</string>
-				</array>
 			</dict>
 			<dict>
 				<key>displayName</key>

diff --git a/arcgis-ios-sdk-samples/Content Display Logic/PortalItems.plist b/arcgis-ios-sdk-samples/Content Display Logic/PortalItems.plist
@@ -30,9 +30,9 @@
 		</dict>
 		<dict>
 			<key>identifier</key>
-			<string>628e8e3521cf45e9a28a12fe10c02c4d</string>
+			<string>85282f2aaa2844d8935cdb8722e22a93</string>
 			<key>filename</key>
-			<string>naperville_imagery.tpk</string>
+			<string>naperville_imagery.tpkx</string>
 		</dict>
 		<dict>
 			<key>identifier</key>
@@ -106,6 +106,30 @@
 			<key>identifier</key>
 			<string>d5bad9f4fee9483791e405880fb466da</string>
 		</dict>
+		<dict>
+			<key>identifier</key>
+			<string>260eb6535c824209964cf281766ebe43</string>
+			<key>filename</key>
+			<string>SanFrancisco.mmpk</string>
+		</dict>
+		<dict>
+			<key>identifier</key>
+			<string>e1f3a7254cb845b09450f54937c16061</string>
+			<key>filename</key>
+			<string>Yellowstone.mmpk</string>
+		</dict>
+		<dict>
+			<key>identifier</key>
+			<string>22c3083d4fa74e3e9b25adfc9f8c0496</string>
+			<key>filename</key>
+			<string>streetmap_SD.tpkx</string>
+		</dict>
+		<dict>
+			<key>identifier</key>
+			<string>e4a398afe9a945f3b0f4dca1e4faccb5</string>
+			<key>filename</key>
+			<string>SanFrancisco.tpkx</string>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/arcgis-ios-sdk-samples/Edit data/Edit and sync features/README.md b/arcgis-ios-sdk-samples/Edit data/Edit and sync features/README.md
@@ -34,6 +34,10 @@ Pan and zoom to position the red rectangle around the area to be taken offline.
 * AGSSyncGeodatabaseParameters
 * AGSSyncLayerOption
 
+## Offline data
+
+This sample uses a [San Francisco offline basemap tile package](https://www.arcgis.com/home/item.html?id=e4a398afe9a945f3b0f4dca1e4faccb5).
+
 ## About the data
 
 The basemap uses an offline tile package of San Francisco. The online feature service has features with wildfire information.

diff --git a/arcgis-ios-sdk-samples/Edit data/Offline edit and sync/OfflineEditingViewController.swift b/arcgis-ios-sdk-samples/Edit data/Offline edit and sync/OfflineEditingViewController.swift
@@ -49,8 +49,7 @@ class OfflineEditingViewController: UIViewController {
         (navigationItem.rightBarButtonItem as! SourceCodeBarButtonItem).filenames = ["OfflineEditingViewController", "FeatureLayersViewController"]
 
         // Use the San Francisco tile package as the basemap.
-        let tpkURL = Bundle.main.url(forResource: "SanFrancisco", withExtension: "tpk")!
-        let tileCache = AGSTileCache(fileURL: tpkURL)
+        let tileCache = AGSTileCache(name: "SanFrancisco")
         let localTiledLayer = AGSArcGISTiledLayer(tileCache: tileCache)
 
         let map = AGSMap(basemap: AGSBasemap(baseLayer: localTiledLayer))

diff --git a/arcgis-ios-sdk-samples/Edit data/Offline edit and sync/README.md b/arcgis-ios-sdk-samples/Edit data/Offline edit and sync/README.md
@@ -37,6 +37,10 @@ Tap the "Generate Geodatabase" button and then pan and zoom to position the red
 * AGSSyncGeodatabaseParameters
 * AGSSyncLayerOption
 
+## Offline data
+
+This sample uses a [San Francisco offline basemap tile package](https://www.arcgis.com/home/item.html?id=e4a398afe9a945f3b0f4dca1e4faccb5).
+
 ## About the data
 
 The basemap uses an offline tile package of San Francisco. The online feature service has features with wildfire information.

diff --git a/arcgis-ios-sdk-samples/Features/Generate geodatabase/GenerateGeodatabaseViewController.swift b/arcgis-ios-sdk-samples/Features/Generate geodatabase/GenerateGeodatabaseViewController.swift
@@ -35,8 +35,7 @@ class GenerateGeodatabaseViewController: UIViewController {
         // add the source code button item to the right of navigation bar
         (navigationItem.rightBarButtonItem as! SourceCodeBarButtonItem).filenames = ["GenerateGeodatabaseViewController"]
 
-        let tpkURL = Bundle.main.url(forResource: "SanFrancisco", withExtension: "tpk")!
-        let tileCache = AGSTileCache(fileURL: tpkURL)
+        let tileCache = AGSTileCache(name: "SanFrancisco")
         let localTiledLayer = AGSArcGISTiledLayer(tileCache: tileCache)
 
         let map = AGSMap(basemap: AGSBasemap(baseLayer: localTiledLayer))

diff --git a/arcgis-ios-sdk-samples/Features/Generate geodatabase/README.md b/arcgis-ios-sdk-samples/Features/Generate geodatabase/README.md
@@ -28,6 +28,10 @@ Zoom to any extent. Then tap the generate button to generate a geodatabase of fe
 * AGSGeodatabase
 * AGSGeodatabaseSyncTask
 
+## Offline data
+
+This sample uses a [San Francisco offline basemap tile package](https://www.arcgis.com/home/item.html?id=e4a398afe9a945f3b0f4dca1e4faccb5).
+
 ## Tags
 
 disconnected, local geodatabase, offline, sync
diff --git a/arcgis-ios-sdk-samples/Layers/ArcGIS tiled layer (tile cache)/README.md b/arcgis-ios-sdk-samples/Layers/ArcGIS tiled layer (tile cache)/README.md
@@ -29,7 +29,7 @@ Launch the app to view the "San Francisco offline tile package" as the basemap.
 
 ## Offline data
 
-This sample uses the [San Francisco offline tile package](https://www.arcgis.com/home/item.html?id=72e703cd01654e7796eb1ae75af1cb53). It is downloaded from ArcGIS Online automatically.
+This sample uses the [San Francisco offline tile package](https://www.arcgis.com/home/item.html?id=e4a398afe9a945f3b0f4dca1e4faccb5). It is downloaded from ArcGIS Online automatically.
 
 ## About the data
 

diff --git a/...s-sdk-samples/Layers/ArcGIS tiled layer (tile cache)/TilePackagesListViewController.swift b/...s-sdk-samples/Layers/ArcGIS tiled layer (tile cache)/TilePackagesListViewController.swift
@@ -34,7 +34,7 @@ class TilePackagesListViewController: UITableViewController {
 
     func fetchTilePackages() {
         // Fetch URLs for tile packages in the main bundle.
-        if let urls = Bundle.main.urls(forResourcesWithExtension: "tpk", subdirectory: nil) {
+        if let urls = Bundle.main.urls(forResourcesWithExtension: "tpkx", subdirectory: nil) {
             bundleTilePackageURLs = urls
         }
 

diff --git a/...s-sdk-samples/Layers/Browse OGC API feature service/BrowseOGCAPIFeatureService.storyboard b/...s-sdk-samples/Layers/Browse OGC API feature service/BrowseOGCAPIFeatureService.storyboard
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
+    <device id="retina6_1" orientation="portrait" appearance="light"/>
+    <dependencies>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <scenes>
+        <!--BrowseOGCAPI Feature Service View Controller-->
+        <scene sceneID="s0d-6b-0kx">
+            <objects>
+                <viewController id="Y6W-OH-hqX" customClass="BrowseOGCAPIFeatureServiceViewController" customModule="ArcGIS_Runtime_SDK_Samples" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="5EZ-qb-Rvc">
+                        <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="u6U-yX-17o" userLabel="Map View" customClass="AGSMapView">
+                                <rect key="frame" x="0.0" y="44" width="414" height="769"/>
+                            </view>
+                            <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jXp-jp-Vzg">
+                                <rect key="frame" x="0.0" y="813" width="414" height="49"/>
+                                <items>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="KnP-M3-jrs"/>
+                                    <barButtonItem enabled="NO" title="Layers" id="7Dh-s3-xHh">
+                                        <connections>
+                                            <action selector="browseLayerInfos:" destination="Y6W-OH-hqX" id="dgP-MK-fTp"/>
+                                        </connections>
+                                    </barButtonItem>
+                                    <barButtonItem style="plain" systemItem="flexibleSpace" id="chR-6j-b8p"/>
+                                </items>
+                            </toolbar>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="vDu-zF-Fre"/>
+                        <color key="backgroundColor" systemColor="tertiarySystemBackgroundColor"/>
+                        <constraints>
+                            <constraint firstItem="u6U-yX-17o" firstAttribute="top" secondItem="vDu-zF-Fre" secondAttribute="top" id="3Aa-FM-h6x"/>
+                            <constraint firstItem="vDu-zF-Fre" firstAttribute="bottom" secondItem="jXp-jp-Vzg" secondAttribute="bottom" id="F06-Na-UTb"/>
+                            <constraint firstItem="u6U-yX-17o" firstAttribute="trailing" secondItem="5EZ-qb-Rvc" secondAttribute="trailing" id="Xa5-gn-tE6"/>
+                            <constraint firstItem="u6U-yX-17o" firstAttribute="leading" secondItem="5EZ-qb-Rvc" secondAttribute="leading" id="Zfx-fb-gsd"/>
+                            <constraint firstItem="jXp-jp-Vzg" firstAttribute="leading" secondItem="5EZ-qb-Rvc" secondAttribute="leading" id="kR6-mL-4NH"/>
+                            <constraint firstItem="jXp-jp-Vzg" firstAttribute="top" secondItem="u6U-yX-17o" secondAttribute="bottom" id="znU-Hw-trq"/>
+                            <constraint firstItem="jXp-jp-Vzg" firstAttribute="trailing" secondItem="5EZ-qb-Rvc" secondAttribute="trailing" id="zoT-MU-M3m"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="layersBarButtonItem" destination="7Dh-s3-xHh" id="FC3-qC-xCu"/>
+                        <outlet property="mapView" destination="u6U-yX-17o" id="ZQW-v3-tGm"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Ief-a0-LHa" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="137.68115942028987" y="118.52678571428571"/>
+        </scene>
+    </scenes>
+    <resources>
+        <systemColor name="tertiarySystemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+    </resources>
+</document>