[feat] 增加GeoPoint到GeoHash之间的编解码

NewLifeX · Oct 23, 2023 · 0553122 · 0553122
1 parent ce33fce
commit 0553122
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 19 deletions.
diff --git a/MapApi/MapApi.csproj b/MapApi/MapApi.csproj
@@ -24,9 +24,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Cube.Core" Version="5.5.2023.601" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.801" />
-    <PackageReference Include="NewLife.XCode" Version="11.9.2023.801" />
+    <PackageReference Include="NewLife.Cube.Core" Version="5.6.2023.1016" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.1001" />
+    <PackageReference Include="NewLife.XCode" Version="11.10.2023.1012" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/NewLife.Map/Data/GeoPoint.cs b/NewLife.Map/Data/GeoPoint.cs
@@ -40,6 +40,22 @@ public GeoPoint(String location)
     }
     #endregion
 
+    #region 方法
+    /// <summary>编码坐标点为GeoHash字符串</summary>
+    /// <param name="level">字符个数。默认9位字符编码，精度2米</param>
+    /// <returns></returns>
+    public String Encode(Int32 level = 9) => GeoHash.Encode(Longitude, Latitude, level);
+
+    /// <summary>解码GeoHash字符串为坐标点</summary>
+    /// <param name="hash"></param>
+    /// <returns></returns>
+    public static GeoPoint Decode(String hash)
+    {
+        var p = GeoHash.Decode(hash);
+        return new GeoPoint(p.Longitude, p.Latitude);
+    }
+    #endregion
+
     /// <summary>已重载</summary>
     /// <returns></returns>
     public override String ToString() => $"{Longitude},{Latitude}";

diff --git a/NewLife.Map/Map.cs b/NewLife.Map/Map.cs
@@ -1,8 +1,6 @@
-using NewLife.Caching;
-using NewLife.Data;
+using NewLife.Data;
 using NewLife.Log;
 using NewLife.Reflection;
-using NewLife.Security;
 using NewLife.Serialization;
 using NewLife.Threading;
 
@@ -90,7 +88,7 @@ public class Map : DisposeBase
     public String? LastString { get; private set; }
 
     /// <summary>最后结果</summary>
-    public IDictionary<String, Object>? LastResult { get; private set; }
+    public IDictionary<String, Object?>? LastResult { get; private set; }
 
     /// <summary>收到异常响应时是否抛出异常</summary>
     public Boolean ThrowException { get; set; }
@@ -157,7 +155,7 @@ public virtual async Task<String> GetStringAsync(String url)
 
         LastResult = rs;
 
-        return (T)rs;
+        return rs == null ? null : JsonHelper.Convert<T>(rs);
     }
     #endregion
 

diff --git a/NewLife.Map/NewLife.Map.csproj b/NewLife.Map/NewLife.Map.csproj
@@ -47,8 +47,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.801" />
-    <PackageReference Include="NewLife.Stardust" Version="2.9.2023.801" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2023.1001" />
+    <PackageReference Include="NewLife.Stardust" Version="2.9.2023.1001" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.801" />
-    <PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.801" />
-    <PackageReference Include="NewLife.XCode" Version="11.9.2023.801" />
-    <PackageReference Include="xunit.assert" Version="2.5.0" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2023.1001" />
+    <PackageReference Include="NewLife.Stardust.Extensions" Version="2.9.2023.1001" />
+    <PackageReference Include="NewLife.XCode" Version="11.10.2023.1012" />
+    <PackageReference Include="xunit.assert" Version="2.5.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/XUnitTest/XUnitTest.csproj b/XUnitTest/XUnitTest.csproj
@@ -9,11 +9,11 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
-    <PackageReference Include="NewLife.Core" Version="10.5.2023.801" />
-    <PackageReference Include="NewLife.UnitTest" Version="1.0.2023.718" />
-    <PackageReference Include="xunit" Version="2.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="NewLife.Core" Version="10.6.2023.1001" />
+    <PackageReference Include="NewLife.UnitTest" Version="1.0.2023.905" />
+    <PackageReference Include="xunit" Version="2.5.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>