Merge pull request #75 from davetimmins/dev

Dev
davetimmins · Sep 25, 2021 · a64cfe8 · a64cfe8
2 parents f449034 + fdac065
commit a64cfe8
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 16 deletions.
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 = "2.0.0";
+var version = "2.0.1";
 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>2.0.0</Version>
+    <Version>2.0.1</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>
 

diff --git a/src/Anywhere.ArcGIS/Operation/PortalResponse.cs b/src/Anywhere.ArcGIS/Operation/PortalResponse.cs
@@ -10,6 +10,9 @@ public interface IPortalResponse
 
         [DataMember(Name = "_links")]
         List<Link> Links { get; set; }
+
+        [DataMember(Name = "_raw")]
+        string RawResult { get; set; }
     }
 
     /// <summary>
@@ -26,6 +29,8 @@ public class PortalResponse : IPortalResponse
 
         [DataMember(Name = "_links")]
         public List<Link> Links { get; set; }
+        [DataMember(Name = "_raw")]
+        public string RawResult { get; set; }
     }
 
     [DataContract]

diff --git a/src/Anywhere.ArcGIS/Operation/ServiceDescriptionDetails.cs b/src/Anywhere.ArcGIS/Operation/ServiceDescriptionDetails.cs
@@ -114,7 +114,7 @@ public class TimeInfo
         public string TimeRelation { get; set; }
 
         [DataMember(Name = "defaultTimeInterval")]
-        public int DefaultTimeInterval { get; set; }
+        public double DefaultTimeInterval { get; set; }
 
         [DataMember(Name = "defaultTimeIntervalUnits")]
         public string DefaultTimeIntervalUnits { get; set; }

diff --git a/src/Anywhere.ArcGIS/PortalGateway.cs b/src/Anywhere.ArcGIS/PortalGateway.cs
@@ -107,7 +107,7 @@ public PortalGateway(string rootUrl, string username, string password, ISerializ
         {
             var result = new SiteDescription();
 
-            result.Resources.AddRange(await DescribeEndpoint(new ArcGISServerOperation("/".AsEndpoint()), ct).ConfigureAwait(false));
+            result?.Resources?.AddRange(await DescribeEndpoint(new ArcGISServerOperation("/".AsEndpoint()), ct).ConfigureAwait(false));
 
             return result;
         }

diff --git a/src/Anywhere.ArcGIS/PortalGatewayBase.cs b/src/Anywhere.ArcGIS/PortalGatewayBase.cs
@@ -142,6 +142,8 @@ public void Dispose()
 
         public bool IncludeHypermediaWithResponse { get; set; }
 
+        public bool IncludeRawResultWithResponse { get; set; }
+
         public string RootUrl { get; private set; }
 
         public ITokenProvider TokenProvider { get; private set; }
@@ -389,7 +391,7 @@ public TimeSpan HttpRequestTimeout
             where T : IGeometry
         {
             var result = await Post<ApplyEditsResponse, ApplyEdits<T>>(edits, ct);
-            result.SetExpected(edits);
+            result?.SetExpected(edits);
             return result;
         }
 
@@ -410,7 +412,7 @@ public TimeSpan HttpRequestTimeout
             if (ct.IsCancellationRequested) return null;
 
             var result = features.UpdateGeometries(projected.Geometries);
-            if (result.First().Geometry.SpatialReference == null)
+            if (result != null && result.Any() && result?.First() != null && result.First().Geometry != null && result?.First()?.Geometry?.SpatialReference == null)
             {
                 result.First().Geometry.SpatialReference = outputSpatialReference;
             }
@@ -425,7 +427,7 @@ public TimeSpan HttpRequestTimeout
             if (ct.IsCancellationRequested) return null;
 
             var result = operation.Features.UpdateGeometries<T>(projected.Geometries);
-            if (result.First().Geometry.SpatialReference == null)
+            if (result != null && result.Any() && result?.First() != null && result.First().Geometry != null && result?.First()?.Geometry?.SpatialReference == null)
             {
                 result.First().Geometry.SpatialReference = operation.OutputSpatialReference;
             }
@@ -450,7 +452,7 @@ public TimeSpan HttpRequestTimeout
             if (ct.IsCancellationRequested) return null;
 
             var result = features.UpdateGeometries<T>(buffered.Geometries);
-            if (result.Any() && result?.First() != null && result.First().Geometry != null && result?.First()?.Geometry?.SpatialReference == null)
+            if (result != null && result.Any() && result?.First() != null && result.First().Geometry != null && result?.First()?.Geometry?.SpatialReference == null)
             {
                 result.First().Geometry.SpatialReference = spatialReference;
             }
@@ -474,7 +476,7 @@ public TimeSpan HttpRequestTimeout
             if (ct.IsCancellationRequested) return null;
 
             var result = features.UpdateGeometries<T>(simplified.Geometries);
-            if (result.First().Geometry.SpatialReference == null)
+            if (result != null && result.Any() && result?.First() != null && result.First().Geometry != null && result?.First()?.Geometry?.SpatialReference == null)
             {
                 result.First().Geometry.SpatialReference = spatialReference;
             }
@@ -773,6 +775,11 @@ protected async Task<T> Get<T, TRequest>(TRequest requestObject, CancellationTok
                 result.Links = new List<Link> { new Link(uri.AbsoluteUri) };
             }
 
+            if (IncludeRawResultWithResponse)
+            {
+                result.RawResult = resultString;
+            }
+
             requestObject.AfterRequest?.Invoke(resultString);
 
             return result;
@@ -874,6 +881,11 @@ protected async Task<T> Post<T, TRequest>(TRequest requestObject, CancellationTo
                 result.Links = new List<Link> { new Link(uri.AbsoluteUri, requestObject) };
             }
 
+            if (IncludeRawResultWithResponse)
+            {
+                result.RawResult = resultString;
+            }
+
             requestObject.AfterRequest?.Invoke(resultString);
 
             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
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="Polly" Version="7.2.1" />
-    <PackageReference Include="Serilog" Version="2.9.0" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="System.Reactive.Linq" Version="4.4.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">

diff --git a/tests/Anywhere.ArcGIS.Test.Integration/ArcGISGatewayTests.cs b/tests/Anywhere.ArcGIS.Test.Integration/ArcGISGatewayTests.cs
@@ -156,10 +156,11 @@ public async Task CanGetServiceTileInfo(string rootUrl, string serviceId)
         }
 
 		[Theory]
-        [InlineData("http://sampleserver3.arcgisonline.com/ArcGIS/", "Petroleum/KSWells/MapServer/0")]
-        [InlineData("http://sampleserver3.arcgisonline.com/ArcGIS/", "Petroleum/KSWells/MapServer/1")]
-        [InlineData("http://services.arcgisonline.co.nz/arcgis", "Canvas/Light/MapServer/0")]
-        [InlineData("https://services1.arcgis.com/dOFzdrPdRgtU4fRo/ArcGIS", "ServiceDefDouble/FeatureServer/0")]
+        //[InlineData("http://sampleserver3.arcgisonline.com/ArcGIS/", "Petroleum/KSWells/MapServer/0")]
+        //[InlineData("http://sampleserver3.arcgisonline.com/ArcGIS/", "Petroleum/KSWells/MapServer/1")]
+        //[InlineData("http://services.arcgisonline.co.nz/arcgis", "Canvas/Light/MapServer/0")]
+        //[InlineData("https://services1.arcgis.com/dOFzdrPdRgtU4fRo/ArcGIS", "ServiceDefDouble/FeatureServer/0")]
+        [InlineData("https://services2.arcgis.com/dEKgZETqwmDAh1rP/ArcGIS", "superseded_cp2014_v18_2020_Neighbourhood_Plan_boundaries/FeatureServer/0")]
         public async Task CanDescribeLayer(string rootUrl, string layerUrl)
         {
             var gateway = new PortalGateway(rootUrl);
@@ -172,6 +173,7 @@ public async Task CanDescribeLayer(string rootUrl, string layerUrl)
             Assert.Null(layerResponse.Error);
             Assert.NotNull(layerResponse.GeometryType);
         }
+
         [Theory]
         [InlineData("http://sampleserver3.arcgisonline.com/ArcGIS/", "Petroleum/KSWells/MapServer")]
         [InlineData("http://services.arcgisonline.co.nz/arcgis", "Canvas/Light/MapServer")]

diff --git a/tests/Anywhere.ArcGIS.Test/Anywhere.ArcGIS.Test.csproj b/tests/Anywhere.ArcGIS.Test/Anywhere.ArcGIS.Test.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>