Merge pull request #317 from Esri/Ting/RevertChanges

[Update] Revert commits on main branch

Shared/Samples/Add WMS layer/AddWMSLayerView.swift

@@ -45,7 +45,3 @@ struct AddWMSLayerView: View {
         MapView(map: map)
     }
 }
-
-#Preview {
-    AddWMSLayerView()
-}

Shared/Samples/Add clustering feature reduction to a point feature layer/AddClusteringFeatureReductionToAPointFeatureLayerView.swift

@@ -73,9 +73,3 @@ struct AddClusteringFeatureReductionToAPointFeatureLayerView: View {
         }
     }
 }
-
-#Preview {
-    NavigationView {
-        AddClusteringFeatureReductionToAPointFeatureLayerView()
-    }
-}

Shared/Samples/Add dynamic entity layer/AddDynamicEntityLayerView.swift

@@ -114,9 +114,3 @@ struct AddDynamicEntityLayerView: View {
         }
     }
 }
-
-#Preview {
-    NavigationView {
-        AddDynamicEntityLayerView()
-    }
-}

Shared/Samples/Add scene layer from service/AddSceneLayerFromServiceView.swift

@@ -52,7 +52,3 @@ private extension URL {
         URL(string: "https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer")!
     }
 }
-
-#Preview {
-    AddSceneLayerFromServiceView()
-}

Shared/Samples/Analyze network with subnetwork trace/AnalyzeNetworkWithSubnetworkTraceView.swift

@@ -311,9 +311,3 @@ private extension UtilityNetworkAttributeComparison.Operator {
     static var allCases: [UtilityNetworkAttributeComparison.Operator] { [.equal, .notEqual, .greaterThan, .greaterThanEqual, .lessThan, .lessThanEqual, .includesTheValues, .doesNotIncludeTheValues, .includesAny, .doesNotIncludeAny]
     }
 }
-
-#Preview {
-    NavigationView {
-        AnalyzeNetworkWithSubnetworkTraceView()
-    }
-}

Shared/Samples/Apply unique value renderer/ApplyUniqueValueRendererView.swift

@@ -78,7 +78,3 @@ struct ApplyUniqueValueRendererView: View {
         MapView(map: map)
     }
 }
-
-#Preview {
-    ApplyUniqueValueRendererView()
-}

Shared/Samples/Augment reality to fly over scene/AugmentRealityToFlyOverSceneView.swift

@@ -58,7 +58,3 @@ private extension URL {
         .init(string: "https://elevation3d.arcgis.com/arcgis/rest/services/WorldElevation3D/Terrain3D/ImageServer")!
     }
 }
-
-#Preview {
-    AugmentRealityToFlyOverSceneView()
-}

Shared/Samples/Browse building floors/BrowseBuildingFloorsView.swift

@@ -75,7 +75,3 @@ private extension PortalItem.ID {
     /// A portal item of Building L's floors on the Esri Redlands campus.
     static var esriBuildingL: Self { Self("f133a698536f44c8884ad81f80b6cfc7")! }
 }
-
-#Preview {
-    BrowseBuildingFloorsView()
-}

Shared/Samples/Change map view background/ChangeMapViewBackgroundView.swift

@@ -40,9 +40,3 @@ struct ChangeMapViewBackgroundView: View {
             }
     }
 }
-
-#Preview {
-    NavigationView {
-        ChangeMapViewBackgroundView()
-    }
-}

Shared/Samples/Change viewpoint/ChangeViewpointView.swift

@@ -128,7 +128,3 @@ extension ChangeViewpointView {
         }
     }
 }
-
-#Preview {
-    ChangeViewpointView()
-}

Shared/Samples/Clip geometry/ClipGeometryView.swift

@@ -174,9 +174,3 @@ private extension Envelope {
         return builder.toGeometry()
     }
 }
-
-#Preview {
-    NavigationView {
-        ClipGeometryView()
-    }
-}

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

@@ -363,9 +363,3 @@ class GeometryEditorMenuModel: ObservableObject {
         isStarted = true
     }
 }
-
-#Preview {
-    NavigationView {
-        CreateAndEditGeometriesView()
-    }
-}

Shared/Samples/Create and save KML file/CreateAndSaveKMLView.swift

@@ -135,9 +135,3 @@ private extension UTType {
     /// A type that represents a KMZ file.
     static let kmz = UTType(filenameExtension: "kmz")!
 }
-
-#Preview {
-    NavigationView {
-        CreateAndSaveKMLView()
-    }
-}

Shared/Samples/Create buffers around points/CreateBuffersAroundPointsView.swift

@@ -287,9 +287,3 @@ private extension CreateBuffersAroundPointsView {
         }
     }
 }
-
-#Preview {
-    NavigationView {
-        CreateBuffersAroundPointsView()
-    }
-}

Shared/Samples/Create convex hull around geometries/CreateConvexHullAroundGeometriesView.swift

@@ -141,9 +141,3 @@ private extension Geometry {
         spatialReference: .webMercator
     )
 }
-
-#Preview {
-    NavigationView {
-        CreateConvexHullAroundGeometriesView()
-    }
-}

Shared/Samples/Create convex hull around points/CreateConvexHullAroundPointsView.swift

@@ -128,9 +128,3 @@ private extension CreateConvexHullAroundPointsView {
         }
     }
 }
-
-#Preview {
-    NavigationView {
-        CreateConvexHullAroundPointsView()
-    }
-}

Shared/Samples/Create load report/CreateLoadReportView.swift

@@ -53,9 +53,3 @@ struct CreateLoadReportView: View {
             }
     }
 }
-
-#Preview {
-    NavigationView {
-        CreateLoadReportView()
-    }
-}

Shared/Samples/Create mobile geodatabase/CreateMobileGeodatabaseView.swift

@@ -171,9 +171,3 @@ private extension FormatStyle where Self == Date.VerbatimFormatStyle {
         )
     }
 }
-
-#Preview {
-    NavigationView {
-        CreateMobileGeodatabaseView()
-    }
-}

Shared/Samples/Create planar and geodetic buffers/CreatePlanarAndGeodeticBuffersView.swift

@@ -179,7 +179,3 @@ private extension Measurement where UnitType == UnitLength {
     /// The maximum radius.
     static var rMax: Self { Measurement(value: 2_000, unit: UnitLength.miles) }
 }
-
-#Preview {
-    CreatePlanarAndGeodeticBuffersView()
-}

Shared/Samples/Create symbol styles from web styles/CreateSymbolStylesFromWebStylesView.swift

@@ -276,9 +276,3 @@ private extension URL {
         URL(string: "http://services.arcgis.com/V6ZHFr6zdgNZuVG0/arcgis/rest/services/LA_County_Points_of_Interest/FeatureServer/0")!
     }
 }
-
-#Preview {
-    NavigationView {
-        CreateSymbolStylesFromWebStylesView()
-    }
-}

Shared/Samples/Cut geometry/CutGeometryView.swift

@@ -152,9 +152,3 @@ private extension Geometry {
         )
     }
 }
-
-#Preview {
-    NavigationView {
-        CutGeometryView()
-    }
-}

Shared/Samples/Densify and generalize geometry/DensifyAndGeneralizeGeometryView.swift

@@ -180,9 +180,3 @@ extension DensifyAndGeneralizeGeometryView {
         }
     }
 }
-
-#Preview {
-    NavigationView {
-        DensifyAndGeneralizeGeometryView()
-    }
-}

Shared/Samples/Display annotation/DisplayAnnotationView.swift

@@ -62,7 +62,3 @@ private extension URL {
         URL(string: "https://sampleserver6.arcgisonline.com/arcgis/rest/services/RiversAnnotation/FeatureServer/0")!
     }
 }
-
-#Preview {
-    DisplayAnnotationView()
-}

Shared/Samples/Display content of utility network container/DisplayContentOfUtilityNetworkContainerView.swift

@@ -163,9 +163,3 @@ struct DisplayContentOfUtilityNetworkContainerView: View {
         .frame(idealWidth: 320, idealHeight: 428)
     }
 }
-
-#Preview {
-    NavigationView {
-        DisplayContentOfUtilityNetworkContainerView()
-    }
-}

Shared/Samples/Display map from portal item/DisplayMapFromPortalItemView.swift

@@ -107,9 +107,3 @@ private extension PortalItem.ID {
     /// The portal item ID of the Geology of United States map.
     static var usGeology: Self { Self("92ad152b9da94dee89b9e387dfe21acd")! }
 }
-
-#Preview {
-    NavigationView {
-        DisplayMapFromPortalItemView()
-    }
-}

Shared/Samples/Display map/DisplayMapView.swift

@@ -24,7 +24,3 @@ struct DisplayMapView: View {
         MapView(map: map)
     }
 }
-
-#Preview {
-    DisplayMapView()
-}

Shared/Samples/Display overview map/DisplayOverviewMapView.swift

@@ -57,7 +57,3 @@ struct DisplayOverviewMapView: View {
 private extension PortalItem.ID {
     static var northAmericaTouristAttractions: Self { Self("97ceed5cfc984b4399e23888f6252856")! }
 }
-
-#Preview {
-    DisplayOverviewMapView()
-}

Shared/Samples/Display points using clustering feature reduction/DisplayPointsUsingClusteringFeatureReductionView.swift

@@ -95,9 +95,3 @@ struct DisplayPointsUsingClusteringFeatureReductionView: View {
         }
     }
 }
-
-#Preview {
-    NavigationView {
-        DisplayPointsUsingClusteringFeatureReductionView()
-    }
-}

Shared/Samples/Display scene/DisplaySceneView.swift

@@ -56,7 +56,3 @@ struct DisplaySceneView: View {
         SceneView(scene: scene)
     }
 }
-
-#Preview {
-    DisplaySceneView()
-}

Shared/Samples/Display web scene from portal item/DisplayWebSceneFromPortalItemView.swift

@@ -40,7 +40,3 @@ private extension PortalItem.ID {
         .init("c6f90b19164c4283884361005faea852")!
     }
 }
-
-#Preview {
-    DisplayWebSceneFromPortalItemView()
-}

Shared/Samples/Download preplanned map area/DownloadPreplannedMapAreaView.swift

@@ -84,9 +84,3 @@ private extension Viewpoint {
         return Viewpoint(boundingGeometry: zoomEnvelope)
     }
 }
-
-#Preview {
-    NavigationView {
-        DownloadPreplannedMapAreaView()
-    }
-}

Shared/Samples/Download vector tiles to local cache/DownloadVectorTilesToLocalCacheView.swift

@@ -290,6 +290,19 @@ private extension DownloadVectorTilesToLocalCacheView {
     }
 }
 
+private extension MapViewProxy {
+    /// Creates an envelope from the given rectangle.
+    /// - Parameter viewRect: The rectangle to create an envelope of.
+    /// - Returns: An envelope of the given rectangle.
+    func envelope(fromViewRect viewRect: CGRect) -> Envelope? {
+        guard let min = location(fromScreenPoint: CGPoint(x: viewRect.minX, y: viewRect.minY)),
+              let max = location(fromScreenPoint: CGPoint(x: viewRect.maxX, y: viewRect.maxY)) else {
+            return nil
+        }
+        return Envelope(min: min, max: max)
+    }
+}
+
 private extension Envelope {
     /// Expands the envelope by a given factor.
     func expanded(by factor: Double) -> Envelope {
@@ -298,9 +311,3 @@ private extension Envelope {
         return builder.toGeometry()
     }
 }
-
-#Preview {
-    NavigationView {
-        DownloadVectorTilesToLocalCacheView()
-    }
-}

Shared/Samples/Filter features in scene/FilterFeaturesInSceneView.swift

@@ -234,9 +234,3 @@ private extension Viewpoint {
         )
     )
 }
-
-#Preview {
-    NavigationView {
-        FilterFeaturesInSceneView()
-    }
-}

Shared/Samples/Find address with reverse geocode/FindAddressWithReverseGeocodeView.swift

@@ -155,7 +155,3 @@ private extension URL {
         URL(string: "https://geocode-api.arcgis.com/arcgis/rest/services/World/GeocodeServer")!
     }
 }
-
-#Preview {
-    FindAddressWithReverseGeocodeView()
-}

Shared/Samples/Find closest facility from point/FindClosestFacilityFromPointView.swift

@@ -228,9 +228,3 @@ private extension URL {
         URL(string: "https://static.arcgis.com/images/Symbols/SafetyHealth/esriCrimeMarker_56_Gradient.png")!
     }
 }
-
-#Preview {
-    NavigationView {
-        FindClosestFacilityFromPointView()
-    }
-}

Shared/Samples/Find closest facility to multiple points/FindClosestFacilityToMultiplePointsView.swift

@@ -183,7 +183,3 @@ private extension URL {
         URL(string: "https://static.arcgis.com/images/Symbols/SafetyHealth/Hospital.png")!
     }
 }
-
-#Preview {
-    FindClosestFacilityToMultiplePointsView()
-}

Shared/Samples/Find nearest vertex/FindNearestVertexView.swift

@@ -188,7 +188,3 @@ private extension PortalItem.ID {
     /// The ID used in the "US States Generalized" portal item.
     static var usStatesGeneralized: Self { Self("8c2d6d7df8fa4142b0a1211c8dd66903")! }
 }
-
-#Preview {
-    FindNearestVertexView()
-}

Shared/Samples/Find route around barriers/FindRouteAroundBarriersView.swift

@@ -150,9 +150,3 @@ struct FindRouteAroundBarriersView: View {
         .errorAlert(presentingError: $error)
     }
 }
-
-#Preview {
-    NavigationView {
-        FindRouteAroundBarriersView()
-    }
-}

Shared/Samples/Find route/FindRouteView.swift

@@ -215,9 +215,3 @@ private extension URL {
         URL(string: "https://sampleserver6.arcgisonline.com/arcgis/rest/services/NetworkAnalysis/SanDiego/NAServer/Route")!
     }
 }
-
-#Preview {
-    NavigationView {
-        FindRouteView()
-    }
-}