Merge branch 'master' of https://github.com/autodotua/MapBoard

Author: f-shake

MapBoard.Core/Mapping/Model/FeatureExtension.cs

@@ -39,10 +39,10 @@ public static long GetID(this Feature feature)
         /// <param name="feature"></param>
         /// <param name="layer"></param>
         /// <returns></returns>
-        public static Feature Clone(this Feature feature, EditableLayerInfo layer)
+        public static Feature Clone(this Feature feature, IEditableLayerInfo layer)
         {
             IEnumerable<FieldInfo> fields = layer.Fields;
-            return feature.Clone(layer, fields.ToDictionary(p => p.Name));
+            return feature.Clone(layer.Layer.FeatureTable, fields.ToDictionary(p => p.Name));
         }
 
         /// <summary>
@@ -52,7 +52,7 @@ public static Feature Clone(this Feature feature, EditableLayerInfo layer)
         /// <param name="layer"></param>
         /// <param name="key2Field"></param>
         /// <returns></returns>
-        public static Feature Clone(this Feature feature, EditableLayerInfo layer, Dictionary<string, FieldInfo> key2Field)
+        public static Feature Clone(this Feature feature, FeatureTable table, Dictionary<string, FieldInfo> key2Field)
         {
             var dic = new Dictionary<string, object>();
             foreach (var attr in feature.Attributes)
@@ -88,7 +88,7 @@ public static Feature Clone(this Feature feature, EditableLayerInfo layer, Dicti
             {
                 dic.AddOrSetValue(Parameters.CreateTimeFieldName, DateTime.Now.ToString(Parameters.TimeFormat));
             }
-            var newFeature = layer.CreateFeature(dic, feature.Geometry);
+            var newFeature = table.CreateFeature(dic, feature.Geometry);
             return newFeature;
         }
     }

MapBoard.Core/Mapping/Model/LayerInfo/EditableLayerInfo.cs

@@ -107,7 +107,7 @@ public async Task<IEnumerable<Feature>> AddFeaturesAsync(IEnumerable<Feature> fe
                 List<Feature> newFeatures = new List<Feature>();
                 foreach (var feature in features)
                 {
-                    Feature newFeature = feature.Clone(this, key2Field);
+                    Feature newFeature = feature.Clone(table, key2Field);
                     newFeatures.Add(newFeature);
                 }
                 await table.AddFeaturesAsync(newFeatures);

MapBoard.Core/Mapping/XYZTiledLayer.cs

@@ -55,7 +55,7 @@ static XYZTiledLayer()
                                 }
                                 File.WriteAllBytes(cacheFile, data);
                                 cacheQueueFiles.TryRemove(cacheFile, out _);
-                                Debug.WriteLine($"写入Tile缓存，queue={cacheWriterQuque.Count}, hashset={cacheQueueFiles.Count}");
+                                //Debug.WriteLine($"写入Tile缓存，queue={cacheWriterQuque.Count}, hashset={cacheQueueFiles.Count}");
                             }
                             else
                             {

MapBoard.Core/Util/FeatureUtility.cs

@@ -14,6 +14,7 @@
 using MapBoard.Model;
 using System.Collections.Concurrent;
 using FzLib.Collection;
+using static MapBoard.Util.GeometryUtility.CentripetalCatmullRom;
 
 namespace MapBoard.Util
 {
@@ -397,7 +398,7 @@ private static double GetVerticleDistance(MapPoint p1, MapPoint p2, MapPoint pc)
         private static double GetVerticleDistance(Polyline line, MapPoint pc)
         {
             var nearestPoint = GeometryEngine.NearestCoordinate(line, pc);
-            var dist = GeometryEngine.DistanceGeodetic(pc, nearestPoint.Coordinate, LinearUnits.Meters, AngularUnits.Degrees, GeodeticCurveType.NormalSection);
+            var dist = GeometryEngine.DistanceGeodetic(pc, nearestPoint.Coordinate, LinearUnits.Meters, AngularUnits.Degrees, GeodeticCurveType.Geodesic);
             return dist.Distance;
         }
 
@@ -702,8 +703,9 @@ await Task.Run(() =>
         /// <param name="features"></param>
         /// <param name="pointsPerSegment">两个节点之间生成多少新点</param>
         /// <param name="level">平滑等级，0最拟合，1一般，2最平滑</param>
+        /// <param name="minSmoothAngle">最小需要平滑的角度。若某三个节点组成的角小于该角度，那么会对中间点左右两侧分别进行平滑然后拼接</param>
         /// <returns></returns>
-        public static async Task Smooth(IEditableLayerInfo layer, Feature[] features, int pointsPerSegment, int level)
+        public static async Task<IEnumerable<Feature>> Smooth(IEditableLayerInfo layer, Feature[] features, int pointsPerSegment, int level, bool deleteOldFeature = false, double minSmoothAngle = 45)
         {
             if (level < 0 || level > 2)
             {
@@ -713,56 +715,45 @@ public static async Task Smooth(IEditableLayerInfo layer, Feature[] features, in
             {
                 throw new ArgumentOutOfRangeException(nameof(pointsPerSegment));
             }
-            //CentripetalCatmullRom中数量是算上头尾的
-            pointsPerSegment += 2;
-            ConcurrentBag<UpdatedFeature> updatedFeatures = new ConcurrentBag<UpdatedFeature>();
+            ConcurrentBag<UpdatedFeature> updatedFeatures = null;
+            ConcurrentBag<Feature> addedFeatures = null;
+            if (deleteOldFeature)
+            {
+                updatedFeatures = new ConcurrentBag<UpdatedFeature>();
+            }
+            else
+            {
+                addedFeatures = new ConcurrentBag<Feature>();
+            }
             await Task.Run(() =>
             {
                 Parallel.ForEach(features, feature =>
                 {
-                    Geometry oldGeometry = feature.Geometry;
-                    Geometry newGeometry = null;
-                    if (feature.Geometry is Multipart m)
+                    var oldGeometry = feature.Geometry;
+                    var newGeometry = GeometryUtility.Smooth(oldGeometry, pointsPerSegment, level, minSmoothAngle); ;
+                    if (deleteOldFeature)
                     {
-                        List<IEnumerable<MapPoint>> newParts = new List<IEnumerable<MapPoint>>();
-                        foreach (var part in m.Parts)
-                        {
-                            if (part.PointCount <= 2)
-                            {
-                                newParts.Add(part.Points);
-                            }
-                            else
-                            {
-                                newParts.Add(CentripetalCatmullRom.Interpolate(part.Points.ToList(), pointsPerSegment, (CentripetalCatmullRom.CatmullRomType)level));
-                            }
-                        }
-                        switch (feature.Geometry)
-                        {
-                            case Polyline line:
-                                newGeometry = new Polyline(newParts);
-                                break;
-
-                            case Polygon polygon:
-                                newGeometry = new Polygon(newParts);
-                                break;
-                        }
-                    }
-                    else if (feature.Geometry is Multipoint mp)
-                    {
-                        if (mp.Points.Count > 2)
-                        {
-                            newGeometry = new Multipoint(CentripetalCatmullRom.Interpolate(mp.Points.ToList(), pointsPerSegment, (CentripetalCatmullRom.CatmullRomType)level));
-                        }
+                        feature.Geometry = newGeometry;
+                        updatedFeatures.Add(new UpdatedFeature(feature, oldGeometry, feature.Attributes));
                     }
                     else
                     {
-                        throw new NotSupportedException("仅支持多点、折线和多边形");
+                        var newFeature = feature.Clone(layer);
+                        newFeature.Geometry = newGeometry;
+                        addedFeatures.Add(newFeature);
                     }
-                    feature.Geometry = newGeometry;
-                    updatedFeatures.Add(new UpdatedFeature(feature, oldGeometry, feature.Attributes));
                 });
             });
-            await layer.UpdateFeaturesAsync(updatedFeatures, FeatureOperation);
+
+            if (deleteOldFeature)
+            {
+                await layer.UpdateFeaturesAsync(updatedFeatures, FeatureOperation);
+                return updatedFeatures.Select(p => p.Feature);
+            }
+            else
+            {
+                return await layer.AddFeaturesAsync(addedFeatures, FeatureOperation);
+            }
         }
 
         /// <summary>