From 64300745734a08d37851ade07ea85af14d7ffa0a Mon Sep 17 00:00:00 2001 From: Hamish Duff <99325835+duffh@users.noreply.github.com> Date: Wed, 6 Dec 2023 13:35:30 -0800 Subject: [PATCH] Merge `v.next` into `main` for 200.3.0 release (#1331) Co-authored-by: William Bohrmann <118313312+williambohrmann3@users.noreply.github.com> Co-authored-by: Andy Weis Co-authored-by: Zack Allen <16495151+ZackAllen@users.noreply.github.com> Co-authored-by: Morten Nielsen <1378165+dotMorten@users.noreply.github.com> Co-authored-by: William Bohrmann Co-authored-by: Preeti Co-authored-by: Morten Nielsen Co-authored-by: Greg De Stigter Co-authored-by: Teja Balu <83402878+tejabalu@users.noreply.github.com> --- src/Directory.Packages.props | 8 +- .../Maui.Samples/ArcGIS.Samples.Maui.csproj | 10 +- .../Maui.Samples/Resources/Styles/Styles.xaml | 56 ++++-- .../DistanceMeasurement.xaml | 2 +- .../LineOfSightGeoElement.xaml | 2 +- .../QueryFeatureCountAndExtent.xaml | 2 +- .../ViewshedLocation/ViewshedLocation.xaml | 2 +- .../CreateMobileGeodatabase.xaml | 2 +- .../EditAndSyncFeatures.xaml | 2 +- .../EditBranchVersioning.xaml | 2 +- .../EditFeatureAttachments.xaml | 2 +- .../EditFeatureLinkedAnnotation.xaml | 2 +- .../FeatureLayerQuery/FeatureLayerQuery.xaml | 2 +- .../GenerateGeodatabaseReplica.xaml | 2 +- .../GeodatabaseTransactions.xaml | 2 +- .../ListRelatedFeatures.xaml | 2 +- .../Data/ManageFeatures/ManageFeatures.xaml | 2 +- .../ReadShapefileMetadata.xaml | 2 +- .../StatisticalQuery/StatisticalQuery.xaml | 2 +- .../SymbolizeShapefile.xaml | 2 +- .../ToggleBetweenFeatureRequestModes.xaml | 2 +- .../Samples/Geometry/Buffer/Buffer.xaml | 2 +- .../Geometry/BufferList/BufferList.xaml | 2 +- .../Geometry/ConvexHull/ConvexHull.xaml | 2 +- .../ConvexHullList/ConvexHullList.xaml | 2 +- .../DensifyAndGeneralize.xaml | 2 +- .../FormatCoordinates/FormatCoordinates.xaml | 2 +- .../ListTransformations.xaml | 2 +- .../SpatialOperations/SpatialOperations.xaml | 2 +- .../AnalyzeHotspots/AnalyzeHotspots.xaml | 2 +- .../Animate3DGraphic/Animate3DGraphic.xaml | 2 +- .../ScenePropertiesExpressions.xaml | 2 +- .../SurfacePlacements/SurfacePlacements.xaml | 2 +- .../ChangeEncDisplaySettings.xaml | 2 +- ...gFeatureReductionToAPointFeatureLayer.xaml | 87 +++++++++ ...atureReductionToAPointFeatureLayer.xaml.cs | 179 +++++++++++++++++ ...ngfeaturereductiontoapointfeaturelayer.jpg | Bin 0 -> 64592 bytes .../readme.md | 43 ++++ .../readme.metadata.json | 39 ++++ .../AddVectorTiledLayerFromCustomStyle.xaml | 2 +- .../ApplyMosaicRule/ApplyMosaicRule.xaml | 2 +- .../BrowseOAFeatureService.xaml | 2 +- .../BrowseWfsLayers/BrowseWfsLayers.xaml | 2 +- .../ChangeBlendRenderer.xaml | 2 +- .../ChangeStretchRenderer.xaml | 2 +- .../ChangeSublayerRenderer.xaml | 2 +- .../ControlAnnotationSublayerVisibility.xaml | 2 +- .../DisplayDimensions/DisplayDimensions.xaml | 2 +- .../DisplayFeatureLayers.xaml | 2 +- .../Samples/Layers/DisplayKml/DisplayKml.xaml | 2 +- .../DisplayOACollection.xaml | 2 +- .../DisplaySubtypeFeatureLayer.xaml | 2 +- .../Samples/Layers/DisplayWfs/DisplayWfs.xaml | 2 +- .../Layers/ExportTiles/ExportTiles.xaml | 2 +- .../ExportVectorTiles/ExportVectorTiles.xaml | 2 +- .../FeatureLayerDefinitionExpression.xaml | 2 +- .../Layers/GroupLayers/GroupLayers.xaml | 2 +- .../ListKmlContents/ListKmlContents.xaml | 2 +- .../LoadWebTiledLayer.xaml.cs | 29 ++- .../LoadWebTiledLayer/loadwebtiledlayer.jpg | Bin 177212 -> 177212 bytes .../Layers/LoadWebTiledLayer/readme.md | 6 +- .../LoadWebTiledLayer/readme.metadata.json | 3 - .../MapImageLayerTables.xaml | 2 +- .../MapImageSublayerQuery.xaml | 2 +- .../Layers/PlayKmlTours/PlayKmlTours.xaml | 2 +- .../QueryCQLFilters/QueryCQLFilters.xaml | 2 +- .../RasterHillshade/RasterHillshade.xaml | 2 +- .../RasterRenderingRule.xaml | 2 +- .../RasterRgbRenderer/RasterRgbRenderer.xaml | 2 +- .../Samples/Layers/WMTSLayer/WMTSLayer.xaml | 2 +- .../WmsServiceCatalog/WmsServiceCatalog.xaml | 2 +- .../DisplayDeviceLocation.xaml | 2 +- .../IndoorPositioning/IndoorPositioning.xaml | 2 +- .../LocationDrivenGeotriggers.xaml | 2 +- .../LocationWithNMEA/LocationWithNMEA.xaml | 2 +- .../ShowLocationHistory.xaml | 2 +- .../ApplyScheduledUpdates.xaml | 2 +- .../Samples/Map/AuthorMap/AuthorMap.xaml | 2 +- .../BrowseBuildingFloors.xaml | 2 +- .../Map/ChangeBasemap/ChangeBasemap.xaml | 2 +- .../DownloadPreplannedMap.xaml | 2 +- .../GenerateOfflineMap.xaml | 2 +- .../GenerateOfflineMapWithOverrides.xaml | 2 +- .../ManageOperationalLayers.xaml | 2 +- .../MapReferenceScale/MapReferenceScale.xaml | 2 +- .../MobileMapSearchAndRoute.xaml | 2 +- .../OfflineBasemapByReference.xaml | 2 +- .../Samples/Map/OpenMapURL/OpenMapURL.xaml | 2 +- .../Map/SetMaxExtent/SetMaxExtent.xaml | 2 +- .../ChangeTimeExtent/ChangeTimeExtent.xaml | 2 +- .../ChangeViewpoint/ChangeViewpoint.xaml | 2 +- .../DisplayDrawingStatus.xaml | 2 +- .../MapView/DisplayGrid/DisplayGrid.xaml | 2 +- .../DisplayLayerViewState.xaml | 2 +- .../FeatureLayerTimeOffset.xaml | 2 +- .../IdentifyLayers/IdentifyLayers.xaml | 2 +- .../MapView/MapRotation/MapRotation.xaml | 2 +- .../MapView/ShowCallout/ShowCallout.xaml | 2 +- .../MapView/ShowMagnifier/ShowMagnifier.xaml | 2 +- .../TakeScreenshot/TakeScreenshot.xaml | 2 +- .../ClosestFacilityStatic.xaml | 2 +- .../NetworkAnalysis/FindRoute/FindRoute.xaml | 2 +- .../FindServiceArea/FindServiceArea.xaml | 2 +- ...FindServiceAreasForMultipleFacilities.xaml | 2 +- .../NavigateRoute/NavigateRoute.xaml | 2 +- .../NavigateRouteRerouting.xaml | 2 +- .../OfflineRouting/OfflineRouting.xaml | 2 +- .../RouteAroundBarriers.xaml | 2 +- .../ChangeAtmosphereEffect.xaml | 2 +- .../GetElevationAtPoint.xaml | 2 +- .../TerrainExaggeration.xaml | 2 +- .../AnimateImageOverlay.xaml | 2 +- .../ChooseCameraController.xaml | 2 +- .../Search/FindAddress/FindAddress.xaml | 2 +- .../Samples/Search/FindPlace/FindPlace.xaml | 2 +- .../Search/OfflineGeocode/OfflineGeocode.xaml | 2 +- .../Search/ReverseGeocode/ReverseGeocode.xaml | 2 +- .../CustomDictionaryStyle.xaml | 2 +- .../FeatureLayerExtrusion.xaml | 2 +- .../SymbolStylesFromWebStyles.xaml | 2 +- .../SymbolsFromMobileStyle.xaml | 2 +- .../UniqueValuesAlternateSymbols.xaml | 2 +- .../DisplayUtilityAssociations.xaml | 2 +- .../DisplayUtilityNetworkContainer.xaml | 2 +- .../PerformValveIsolationTrace.xaml | 2 +- .../TraceUtilityNetwork.xaml | 2 +- src/MAUI/readme.md | 1 + .../Resources/FeaturedSamples.xml | 5 +- .../WPF.Viewer/ArcGIS.WPF.Viewer.Net.csproj | 4 +- ...ngFeatureReductionToAPointFeatureLayer.jpg | Bin 0 -> 57550 bytes ...gFeatureReductionToAPointFeatureLayer.xaml | 97 +++++++++ ...atureReductionToAPointFeatureLayer.xaml.cs | 184 ++++++++++++++++++ .../readme.md | 43 ++++ .../readme.metadata.json | 39 ++++ .../LoadWebTiledLayer/LoadWebTiledLayer.jpg | Bin 188347 -> 188347 bytes .../LoadWebTiledLayer.xaml.cs | 29 ++- .../Layers/LoadWebTiledLayer/readme.md | 6 +- .../LoadWebTiledLayer/readme.metadata.json | 3 - src/WPF/readme.md | 1 + .../ArcGIS.WinUI.Viewer.csproj | 12 +- ...ngFeatureReductionToAPointFeatureLayer.jpg | Bin 0 -> 62554 bytes ...gFeatureReductionToAPointFeatureLayer.xaml | 86 ++++++++ ...atureReductionToAPointFeatureLayer.xaml.cs | 183 +++++++++++++++++ .../readme.md | 43 ++++ .../readme.metadata.json | 39 ++++ .../LoadWebTiledLayer/LoadWebTiledLayer.jpg | Bin 183154 -> 183154 bytes .../LoadWebTiledLayer.xaml.cs | 32 ++- .../Layers/LoadWebTiledLayer/readme.md | 6 +- .../LoadWebTiledLayer/readme.metadata.json | 3 - src/WinUI/readme.md | 1 + 150 files changed, 1291 insertions(+), 214 deletions(-) create mode 100644 src/MAUI/Maui.Samples/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml create mode 100644 src/MAUI/Maui.Samples/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml.cs create mode 100644 src/MAUI/Maui.Samples/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/addclusteringfeaturereductiontoapointfeaturelayer.jpg create mode 100644 src/MAUI/Maui.Samples/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/readme.md create mode 100644 src/MAUI/Maui.Samples/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/readme.metadata.json create mode 100644 src/WPF/WPF.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.jpg create mode 100644 src/WPF/WPF.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml create mode 100644 src/WPF/WPF.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml.cs create mode 100644 src/WPF/WPF.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/readme.md create mode 100644 src/WPF/WPF.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/readme.metadata.json create mode 100644 src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.jpg create mode 100644 src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml create mode 100644 src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/AddClusteringFeatureReductionToAPointFeatureLayer.xaml.cs create mode 100644 src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/readme.md create mode 100644 src/WinUI/ArcGIS.WinUI.Viewer/Samples/Layers/AddClusteringFeatureReductionToAPointFeatureLayer/readme.metadata.json diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index f74b63ba38..56322cd8ad 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -1,7 +1,7 @@ true - 200.2.0 + 200.3.0 @@ -25,12 +25,14 @@ - + - + + + \ No newline at end of file diff --git a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj index ef8cf2a6d7..d8074457c2 100644 --- a/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj +++ b/src/MAUI/Maui.Samples/ArcGIS.Samples.Maui.csproj @@ -1,8 +1,8 @@  - net7.0-android;net7.0-ios;net7.0-maccatalyst - $(TargetFrameworks);net7.0-windows10.0.19041.0 + net8.0-android;net8.0-ios;net8.0-maccatalyst + $(TargetFrameworks);net8.0-windows10.0.19041.0 Exe ArcGIS.Samples true @@ -61,7 +61,7 @@ - + @@ -138,11 +138,11 @@ - + - + diff --git a/src/MAUI/Maui.Samples/Resources/Styles/Styles.xaml b/src/MAUI/Maui.Samples/Resources/Styles/Styles.xaml index a5dd46a587..a94cfa4424 100644 --- a/src/MAUI/Maui.Samples/Resources/Styles/Styles.xaml +++ b/src/MAUI/Maui.Samples/Resources/Styles/Styles.xaml @@ -1,14 +1,44 @@  - + -