Merge pull request #69 from davetimmins/dev

Dev
davetimmins · Jun 3, 2020 · 238c106 · 238c106
2 parents a805ab0 + ef6c9c5
commit 238c106
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 14 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -9,7 +9,7 @@
   init:
     - git config --global core.autocrlf true
 
-  image: Visual Studio 2017
+  image: Visual Studio 2019
 
   version: "{build}"
 
@@ -33,7 +33,7 @@
   init:
     - git config --global core.autocrlf true
 
-  image: Visual Studio 2017
+  image: Visual Studio 2019
 
   version: "{build}"
 
@@ -61,7 +61,7 @@
   init:
     - git config --global core.autocrlf true
 
-  image: Visual Studio 2017
+  image: Visual Studio 2019
 
   version: "{build}"
 

diff --git a/build.cake b/build.cake
@@ -9,7 +9,7 @@ var target = Argument("target", "Default");
 var configuration = Argument("configuration", "Release");
 var solution = "./Anywhere.ArcGIS.sln";
 
-var version = "1.11.1";
+var version = "1.12.0";
 var versionSuffix = Environment.GetEnvironmentVariable("VERSION_SUFFIX");
 
 //////////////////////////////////////////////////////////////////////

diff --git a/src/Anywhere.ArcGIS/Anywhere.ArcGIS.csproj b/src/Anywhere.ArcGIS/Anywhere.ArcGIS.csproj
@@ -15,7 +15,7 @@
     <RepositoryUrl>https://github.com/davetimmins/Anywhere.ArcGIS</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>ArcGIS ArcGISServer ArcGISOnline Esri REST netstandard anywhere GIS Mapping Map Location GeoLocation OAuth</PackageTags>
-    <Version>1.11.1</Version>
+    <Version>1.12.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 

diff --git a/src/Anywhere.ArcGIS/Operation/Query.cs b/src/Anywhere.ArcGIS/Operation/Query.cs
@@ -237,6 +237,27 @@ public string Time
         /// </summary>
         [DataMember(Name = "outStatistics")]
         public List<OutputStatistic> OutputStatistics { get; set; }
+
+        /// <summary>
+        /// The buffer distance for the input geometries. 
+        /// The distance unit is specified by units. 
+        /// For example, if the distance is 100, the query geometry is a point, units is set to meters, and all points within 100 meters of the point are returned. 
+        /// The geodesic buffer is created based on the datum of the output spatial reference if it exists. 
+        /// If there is no output spatial reference, the input geometry spatial reference is used. 
+        /// Otherwise, the native layer spatial reference is used to generate the geometry buffer used in the query. 
+        /// This parameter only applies if supportsQueryWithDistance is true.
+        /// </summary>
+        [DataMember(Name = "distance")]
+        public double Distance { get; set; }
+
+        /// <summary>
+        /// The unit for calculating the buffer distance. 
+        /// If unit is not specified, the default will be esriSRUnit_Foot when querying feature services in ArcGIS Enterprise, and esriSRUnit_Meter when querying feature services in ArcGIS Online. 
+        /// This parameter only applies if supportsQueryWithDistance is true.
+        /// Values: esriSRUnit_Meter | esriSRUnit_StatuteMile | esriSRUnit_Foot | esriSRUnit_Kilometer | esriSRUnit_NauticalMile | esriSRUnit_USNauticalMile
+        /// </summary>
+        [DataMember(Name = "units")]
+        public string DistanceUnits { get; set; }
     }
 
     [DataContract]
@@ -444,6 +465,16 @@ public static class SpatialRelationshipTypes
         public const string Relation = "esriSpatialRelRelation";
     }
 
+    public static class BufferDistanceUnits
+    {
+        public const string Meters = "esriSRUnit_Meter";
+        public const string Miles = "esriSRUnit_StatuteMile";
+        public const string Feet = "esriSRUnit_Foot";
+        public const string Kilometers = "esriSRUnit_Kilometer";
+        public const string NauticalMiles = "esriSRUnit_NauticalMile";
+        public const string USNauticalMiles = "esriSRUnit_USNauticalMile";
+    }
+
     public static class FieldDataTypes
     {
         public readonly static Dictionary<Type, Func<string>> FieldDataTypeMap = new Dictionary<Type, Func<string>>

diff --git a/src/Anywhere.ArcGIS/PortalGatewayBase.cs b/src/Anywhere.ArcGIS/PortalGatewayBase.cs
@@ -428,7 +428,10 @@ public virtual async Task<List<Feature<T>>> Buffer<T>(List<Feature<T>> features,
             if (ct.IsCancellationRequested) return null;
 
             var result = features.UpdateGeometries<T>(buffered.Geometries);
-            if (result.First().Geometry.SpatialReference == null) result.First().Geometry.SpatialReference = spatialReference;
+            if (result.Any() && result?.First() != null && result.First().Geometry != null && result?.First()?.Geometry?.SpatialReference == null)
+            {
+                result.First().Geometry.SpatialReference = spatialReference;
+            }
             return result;
         }
 

diff --git a/tests/Anywhere.ArcGIS.Test.Integration/Anywhere.ArcGIS.Test.Integration.csproj b/tests/Anywhere.ArcGIS.Test.Integration/Anywhere.ArcGIS.Test.Integration.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Polly" Version="7.2.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Polly" Version="7.2.1" />
     <PackageReference Include="Serilog" Version="2.9.0" />
-    <PackageReference Include="System.Reactive.Linq" Version="4.3.2" />
+    <PackageReference Include="System.Reactive.Linq" Version="4.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/tests/Anywhere.ArcGIS.Test/Anywhere.ArcGIS.Test.csproj b/tests/Anywhere.ArcGIS.Test/Anywhere.ArcGIS.Test.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>