Updates with rendering of labels

FObermaier · FObermaier · commit b7898c78f885 · 2019-07-29T06:20:15.000+02:00
diff --git a/src/Common/SharpMap/Layers/LabelLayer.cs b/src/Common/SharpMap/Layers/LabelLayer.cs
@@ -24,6 +24,7 @@
 using GeoAPI.Geometries;
 using NetTopologySuite.Extensions.Features;
 using NetTopologySuite.Extensions.Geometries;
+using NetTopologySuite.Geometries;
 using SharpMap.Api;
 using SharpMap.Api.Delegates;
 using SharpMap.Api.Enums;
@@ -273,14 +274,23 @@ public override void OnRender(System.Drawing.Graphics g, IMap map)
 					else
 						style = Style;
 
-					float rotation = 0;
-			        if (!String.IsNullOrEmpty(RotationColumn))
-			            rotation = FeatureAttributeAccessorHelper.GetAttributeValue<float>(feature, RotationColumn, 0f);
+                    if (!style.Enabled || (map.Zoom < style.MinVisible || map.Zoom > style.MaxVisible))
+                        continue;
 
 				    string text = GetText(feature);
 
 					if (!string.IsNullOrEmpty(text))
 					{
+                        float rotation = 0;
+                        if (!String.IsNullOrEmpty(RotationColumn))
+                            rotation = FeatureAttributeAccessorHelper.GetAttributeValue<float>(feature, RotationColumn, 0f);
+
+                        // TODO: Add feature based
+                        //int priority = 0;
+                        //if (!String.IsNullOrEmpty(RotationColumn))
+                        //    rotation = FeatureAttributeAccessorHelper.GetAttributeValue<int>(feature, Priority, 0f);
+
+
                         if (geometry is IGeometryCollection)
 						{
 							if (MultipartGeometryBehaviour == MultipartGeometryBehaviourEnum.All)
@@ -463,12 +473,11 @@ public override Envelope Envelope
 		            return null;
 		        }
 
+                var res = DataSource.GetExtents();
                 if (CoordinateTransformation != null)
-                {
-                    throw new NotImplementedException();
-                }
+                    res = GeometryTransform.TransformBox(res, CoordinateTransformation.MathTransform);
 
-                return DataSource.GetExtents();
+                return res;
 		    }
 		}
 
diff --git a/src/Common/SharpMap/Layers/Layer.cs b/src/Common/SharpMap/Layers/Layer.cs
@@ -40,6 +40,7 @@
 using SharpMap.Rendering.Thematics;
 using SharpMap.Styles;
 using log4net;
+using SharpMap.Utilities;
 
 namespace SharpMap.Layers
 {
@@ -455,7 +456,7 @@ private void BuildQuadTree()
                     geometrys[i] = g;
                 }
 
-                var rectangleF = new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);
+                var rectangleF = envelope.ToRectangleF(); //new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);
 
                 tree = new QuadTree(rectangleF, maxLevels, isPoint);
 
@@ -499,7 +500,8 @@ private void BuildQuadTree()
 
         private RectangleF ToRectangleF(Envelope envelope)
         {
-            return new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);
+            return envelope.ToRectangleF();
+            //return new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);
         }
 
         #region debugging
diff --git a/src/Common/SharpMap/Rendering/Label.cs b/src/Common/SharpMap/Rendering/Label.cs
@@ -16,7 +16,10 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
 
 using System;
+using System.CodeDom;
 using System.Collections.Generic;
+using System.Drawing;
+using QuickGraph;
 using SharpMap.Api;
 
 
@@ -135,13 +138,11 @@ public bool Intersects(LabelBox box)
 		/// <returns>0 if the intersect</returns>
 		public int CompareTo(LabelBox other)
 		{
-			if (this.Intersects(other))
+			if (Intersects(other))
 				return 0;
-			else if (other.Left > this.Left+this.Width ||
-				other.Top - other.Height > this.Top)
+			if (other.Left > Right || other.Bottom > Top)
 				return 1;
-			else
-				return -1;
+			return -1;
 		}
 
 		#endregion
@@ -259,26 +260,49 @@ public int CompareTo(Label other)
 		{
 			if (this == other)
 				return 0;
-			else if (box == null)
-				return -1;
-			else if (other.Box == null)
-				return 1;
-			else
-				return box.CompareTo(other.Box);
+			if (box == null)
+                return other.box == null
+                    ? ComparePoints(labelPoint, other.LabelPoint)
+                    : ComparePointToBox(labelPoint, other.Box);
+			if (other.Box == null)
+                return ComparePointToBox(other.LabelPoint, Box);
+			
+			return box.CompareTo(other.Box);
 		}
 
 		#endregion
 
-		
-		#region IComparer<Label> Members
-
-		/// <summary>
-		/// Checks if two labels intersect
-		/// </summary>
-		/// <param name="x"></param>
-		/// <param name="y"></param>
-		/// <returns></returns>
-		public int Compare(Label x, Label y)
+        private static int ComparePoints(PointF pt1, PointF pt2)
+        {
+            if (pt1 == pt2)
+                return 0;
+
+            int res = pt1.X.CompareTo(pt2.X);
+            if (res != 0) return res;
+            return pt1.Y.CompareTo(pt2.Y);
+        }
+        private static int ComparePointToBox(PointF pt, LabelBox box)
+        {
+            //if (box.Left <= pt.X && pt.X <= box.Right &&
+            //    box.Bottom <= pt.Y && pt.Y <= box.Top) return 0;
+
+            if (pt.X < box.Left) return -1;
+            if (pt.X > box.Right) return 1;
+            if (pt.Y < box.Bottom) return -1;
+            if (pt.Y > box.Top) return 1;
+
+            return 0;
+        }
+
+        #region IComparer<Label> Members
+
+        /// <summary>
+        /// Checks if two labels intersect
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="y"></param>
+        /// <returns></returns>
+        public int Compare(Label x, Label y)
 		{
 			return x.CompareTo(y);
 		}
diff --git a/src/Common/SharpMap/Rendering/LabelCollisionDetection.cs b/src/Common/SharpMap/Rendering/LabelCollisionDetection.cs
@@ -55,7 +55,10 @@ public static void SimpleCollisionDetection(List<SharpMap.Rendering.Label> label
 		/// <param name="labels"></param>
 		public static void ThoroughCollisionDetection(List<SharpMap.Rendering.Label> labels)
 		{
-			labels.Sort(); // sort labels by intersectiontests of labelbox
+            try { 
+                labels.Sort(); // sort labels by intersectiontests of labelbox
+            }
+            finally{}
 			//remove labels that intersect other labels
 			for (int i = labels.Count - 1; i > 0; i--)
 				for (int j = i - 1; j > 0; j--)
diff --git a/src/Common/SharpMap/SharpMap.csproj b/src/Common/SharpMap/SharpMap.csproj
@@ -272,6 +272,7 @@
     <Compile Include="Styles\Style.cs" />
     <Compile Include="Styles\VectorStyle.cs" />
     <Compile Include="Utilities\Algorithms.cs" />
+    <Compile Include="Utilities\RectangleUtility.cs" />
     <Compile Include="Utilities\RegularGridGeoTransform.cs" />
     <Compile Include="Utilities\Indexing\BinaryTree.cs" />
     <Compile Include="Utilities\Indexing\SpatialIndexing.cs" />
diff --git a/src/Common/SharpMap/Styles/VectorStyle.cs b/src/Common/SharpMap/Styles/VectorStyle.cs
@@ -349,6 +349,8 @@ public override object Clone()
                 vectorStyle.UpdateSymbols();
             }
 
+            vectorStyle.Enabled = Enabled;
+
 	        return vectorStyle;
 	    }
 
diff --git a/src/Common/SharpMap/Utilities/RectangleUtility.cs b/src/Common/SharpMap/Utilities/RectangleUtility.cs
@@ -0,0 +1,124 @@
+using System.Drawing;
+using GeoAPI.Geometries;
+
+namespace SharpMap.Utilities
+{
+    public static class RectangleUtility
+    {
+        public static RectangleF ToRectangleF(this Envelope e)
+        {
+            //new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);
+            return RectangleF.FromLTRB(ToLower(e.MinX), ToLower(e.MinY), ToUpper(e.MaxX), ToUpper(e.MaxY));
+        }
+
+        private static float ToLower(double d)
+        {
+            float f = (float) d;
+            if (f <= d) return f;
+            return nextafter(f, float.MinValue);
+        }
+        private static float ToUpper(double d)
+        {
+            float f = (float)d;
+            if (f >= d) return f;
+            return nextafter(f, float.MaxValue);
+        }
+
+        /// <summary>
+        /// Gets the floating-point number that is next after <paramref name="fromNumber"/> in the direction of <paramref name="towardNumber"/>.
+        /// </summary>
+        /// <param name="fromNumber">A floating-point number.</param>
+        /// <param name="towardNumber">A floating-point number.</param>
+        /// <returns>The floating-point number that is next after <paramref name="fromNumber"/> in the direction of <paramref name="towardNumber"/>.</returns>
+        /// <remarks>
+        /// <para>
+        /// IEC 60559 recommends that <paramref name="fromNumber"/> be returned whenever <c><paramref name="fromNumber"/> == <paramref name="towardNumber"/></c>.
+        /// These functions return <paramref name="towardNumber"/> instead, which makes the behavior around zero consistent: <c><see cref="math.nextafter(float, float)">nextafter</see>(-0.0, +0.0)</c>
+        /// returns <c>+0.0</c> and <c><see cref="math.nextafter(float, float)">nextafter</see>(+0.0, -0.0)</c> returns <c>&ndash;0.0</c>.
+        /// </para>
+        /// <para>
+        /// See <a href="http://en.cppreference.com/w/c/numeric/math/nextafter">nextafter</a> in the C standard documentation.
+        /// </para>
+        /// </remarks>
+        /// <example>
+        /// <code language="C#">
+        /// Assert.IsTrue(math.nextafter(0F, 0F) == 0F);
+        /// Assert.IsTrue(math.nextafter(-0F, 0F) == 0F;
+        /// Assert.IsTrue(math.nextafter(0F, -0F) == -0F);
+        /// 
+        /// Assert.IsTrue(math.nextafter(math.FLT_MIN, 0D) == math.FLT_DENORM_MAX);
+        /// Assert.IsTrue(math.nextafter(math.FLT_DENORM_MIN, 0F) == 0F);
+        /// Assert.IsTrue(math.nextafter(math.FLT_MIN, -0F) == math.FLT_DENORM_MAX);
+        /// Assert.IsTrue(math.nextafter(math.FLT_DENORM_MIN, -0F) == 0F);
+        /// 
+        /// Assert.IsTrue(math.nextafter(0F, System.Single.PositiveInfinity) == math.FLT_DENORM_MIN);
+        /// Assert.IsTrue(math.nextafter(-0F, System.Single.NegativeInfinity) == -math.FLT_DENORM_MIN);
+        /// </code> 
+        /// <code language="VB.NET">
+        /// Assert.IsTrue(math.nextafter(0F, 0F) = 0F);
+        /// Assert.IsTrue(math.nextafter(-0F, 0F) = 0F);
+        /// Assert.IsTrue(math.nextafter(0F, -0F) = -0F);
+        /// 
+        /// Assert.IsTrue(math.nextafter(math.FLT_MIN, 0F) = math.FLT_DENORM_MAX);
+        /// Assert.IsTrue(math.nextafter(math.FLT_DENORM_MIN, 0F) = 0F);
+        /// Assert.IsTrue(math.nextafter(math.FLT_MIN, -0F) = math.FLT_DENORM_MAX);
+        /// Assert.IsTrue(math.nextafter(math.FLT_DENORM_MIN, -0F) = 0F);
+        /// 
+        /// Assert.IsTrue(math.nextafter(0F, System.Single.PositiveInfinity) = math.FLT_DENORM_MIN);
+        /// Assert.IsTrue(math.nextafter(-0F, System.Single.NegativeInfinity) = -math.FLT_DENORM_MIN);
+        /// </code> 
+        /// </example>
+        private static float nextafter(float fromNumber, float towardNumber)
+        {
+            // If either fromNumber or towardNumber is NaN, return NaN.
+            if (System.Single.IsNaN(towardNumber) || System.Single.IsNaN(fromNumber))
+            {
+                return System.Single.NaN;
+            }
+            // If no direction or if fromNumber is infinity or is not a number, return fromNumber.
+            if (fromNumber == towardNumber)
+            {
+                return towardNumber;
+            }
+            // If fromNumber is zero, return smallest subnormal.
+            if (fromNumber == 0)
+            {
+                return (towardNumber > 0) ? System.Single.Epsilon : -System.Single.Epsilon;
+            }
+            // All other cases are handled by incrementing or decrementing the bits value.
+            // Transitions to infinity, to subnormal, and to zero are all taken care of this way.
+            int bits = SingleToInt32Bits(fromNumber);
+            // A xor here avoids nesting conditionals. We have to increment if fromValue lies between 0 and toValue.
+            if ((fromNumber > 0) ^ (fromNumber > towardNumber))
+            {
+                bits += 1;
+            }
+            else
+            {
+                bits -= 1;
+            }
+            return Int32BitsToSingle(bits);
+        }
+
+        /// <summary>
+        /// Converts the specified single-precision floating point number to a 32-bit signed integer.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        /// <returns>A 32-bit signed integer whose value is equivalent to <paramref name="value"/>.</returns>
+        private static unsafe int SingleToInt32Bits(float value)
+        {
+            return *((int*)&value);
+        }
+
+        /// <summary>
+        /// Converts the specified 32-bit signed integer to a single-precision floating point number.
+        /// </summary>
+        /// <param name="value">The number to convert.</param>
+        /// <returns>A double-precision floating point number whose value is equivalent to <paramref name="value"/>.</returns>
+        private static unsafe float Int32BitsToSingle(int value)
+        {
+            return *((float*)&value);
+        }
+
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@`
`40`	`40`	`using SharpMap.Rendering.Thematics;`
`41`	`41`	`using SharpMap.Styles;`
`42`	`42`	`using log4net;`
	`43`	`+using SharpMap.Utilities;`
`43`	`44`
`44`	`45`	`namespace SharpMap.Layers`
`45`	`46`	`{`
`@@ -455,7 +456,7 @@ private void BuildQuadTree()`
`455`	`456`	`geometrys[i] = g;`
`456`	`457`	`}`
`457`	`458`
`458`		`- var rectangleF = new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);`
	`459`	`+ var rectangleF = envelope.ToRectangleF(); //new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);`
`459`	`460`
`460`	`461`	`tree = new QuadTree(rectangleF, maxLevels, isPoint);`
`461`	`462`
`@@ -499,7 +500,8 @@ private void BuildQuadTree()`
`499`	`500`
`500`	`501`	`private RectangleF ToRectangleF(Envelope envelope)`
`501`	`502`	`{`
`502`		`- return new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);`
	`503`	`+ return envelope.ToRectangleF();`
	`504`	`+ //return new RectangleF((float)envelope.MinX, (float)envelope.MinY, (float)envelope.Width, (float)envelope.Height);`
`503`	`505`	`}`
`504`	`506`
`505`	`507`	`#region debugging`
Original file line number	Diff line number	Diff line change
`@@ -349,6 +349,8 @@ public override object Clone()`
`349`	`349`	`vectorStyle.UpdateSymbols();`
`350`	`350`	`}`
`351`	`351`
	`352`	`+ vectorStyle.Enabled = Enabled;`
	`353`	`+`
`352`	`354`	`return vectorStyle;`
`353`	`355`	`}`
`354`	`356`