viamatt
diff --git a/‎SharpMap/Layers/LabelLayer.cs‎
Lines changed: 5 additions & 21 deletions b/‎SharpMap/Layers/LabelLayer.cs‎
Lines changed: 5 additions & 21 deletions
@@ -586,8 +586,6 @@ public override void Render(Graphics g, MapViewport map)
                                 label.Style.BackColor, label.Style.Halo, label.Rotation,
                                 label.Text, map, label.Style.HorizontalAlignment,
                                 label.LabelPoint);
-
-                        affectedArea = VectorRenderer.RectExpandToInclude(affectedArea, rect);
                     }
                     else
                     {
@@ -602,44 +600,30 @@ public override void Render(Graphics g, MapViewport map)
                                 //g.FillPolygon(labels[i].Style.BackColor, labels[i].TextOnPathLabel.PointsText.ToArray());
                             }
                         }
-
-                        label.TextOnPathLabel.DrawTextOnPath();
+                        rect = label.TextOnPathLabel.DrawTextOnPathEx();
                     }
                 }
                 else if (labels[i] is PathLabel)
                 {
                     var plbl = labels[i] as PathLabel;
                     var lblStyle = plbl.Style;
-                    g.DrawString(lblStyle.Halo, new SolidBrush(lblStyle.ForeColor), plbl.Text,
+                    rect = g.DrawStringEx(lblStyle.Halo, new SolidBrush(lblStyle.ForeColor), plbl.Text,
                         lblStyle.Font.FontFamily, (int) lblStyle.Font.Style, lblStyle.Font.Size,
                         lblStyle.GetStringFormat(), lblStyle.IgnoreLength, plbl.Location);
                 }
+                affectedArea = VectorRenderer.RectExpandToInclude(affectedArea, rect);
             }
 
             if (!affectedArea.IsEmpty)
             {
-                // TODO optimise for Rotation = 0.
                 var pts = new PointF[]
                 {
                     new PointF(affectedArea.Left - 1, affectedArea.Top - 1),
-                    new PointF(affectedArea.Right + 1, affectedArea.Top - 1),
                     new PointF(affectedArea.Right + 1, affectedArea.Bottom + 1),
-                    new PointF(affectedArea.Left - 1,  affectedArea.Bottom + 1)
                 };
-
-                var coords = map.ImageToWorld(pts, true);
-
-                var minX = Math.Min(coords[0].X, Math.Min(coords[1].X, Math.Min(coords[2].X, coords[3].X)));
-                var maxX = Math.Max(coords[0].X, Math.Max(coords[1].X, Math.Max(coords[2].X, coords[3].X)));
-                var minY = Math.Min(coords[0].Y, Math.Min(coords[1].Y, Math.Min(coords[2].Y, coords[3].Y)));
-                var maxY = Math.Max(coords[0].Y, Math.Max(coords[1].Y, Math.Max(coords[2].Y, coords[3].Y)));
-
-                var env = new Envelope(minX, maxX, minY, maxY);
-                //env.ExpandBy(env.Width * 0.05, env.Height * 0.05);
-                
-                base._affectedArea.ExpandToInclude(env);
+                var coords = map.ImageToWorld(pts, false);
+                base._affectedArea.ExpandToInclude(new Envelope(coords[0], coords[1]));
             }
-            
             base.Render(g, map);
         }
Original file line number	Diff line number	Diff line change
`@@ -586,8 +586,6 @@ public override void Render(Graphics g, MapViewport map)`
`586`	`586`	`label.Style.BackColor, label.Style.Halo, label.Rotation,`
`587`	`587`	`label.Text, map, label.Style.HorizontalAlignment,`
`588`	`588`	`label.LabelPoint);`
`589`		`-`
`590`		`- affectedArea = VectorRenderer.RectExpandToInclude(affectedArea, rect);`
`591`	`589`	`}`
`592`	`590`	`else`
`593`	`591`	`{`
`@@ -602,44 +600,30 @@ public override void Render(Graphics g, MapViewport map)`
`602`	`600`	`//g.FillPolygon(labels[i].Style.BackColor, labels[i].TextOnPathLabel.PointsText.ToArray());`
`603`	`601`	`}`
`604`	`602`	`}`
`605`		`-`
`606`		`- label.TextOnPathLabel.DrawTextOnPath();`
	`603`	`+ rect = label.TextOnPathLabel.DrawTextOnPathEx();`
`607`	`604`	`}`
`608`	`605`	`}`
`609`	`606`	`else if (labels[i] is PathLabel)`
`610`	`607`	`{`
`611`	`608`	`var plbl = labels[i] as PathLabel;`
`612`	`609`	`var lblStyle = plbl.Style;`
`613`		`- g.DrawString(lblStyle.Halo, new SolidBrush(lblStyle.ForeColor), plbl.Text,`
	`610`	`+ rect = g.DrawStringEx(lblStyle.Halo, new SolidBrush(lblStyle.ForeColor), plbl.Text,`
`614`	`611`	`lblStyle.Font.FontFamily, (int) lblStyle.Font.Style, lblStyle.Font.Size,`
`615`	`612`	`lblStyle.GetStringFormat(), lblStyle.IgnoreLength, plbl.Location);`
`616`	`613`	`}`
	`614`	`+ affectedArea = VectorRenderer.RectExpandToInclude(affectedArea, rect);`
`617`	`615`	`}`
`618`	`616`
`619`	`617`	`if (!affectedArea.IsEmpty)`
`620`	`618`	`{`
`621`		`- // TODO optimise for Rotation = 0.`
`622`	`619`	`var pts = new PointF[]`
`623`	`620`	`{`
`624`	`621`	`new PointF(affectedArea.Left - 1, affectedArea.Top - 1),`
`625`		`- new PointF(affectedArea.Right + 1, affectedArea.Top - 1),`
`626`	`622`	`new PointF(affectedArea.Right + 1, affectedArea.Bottom + 1),`
`627`		`- new PointF(affectedArea.Left - 1, affectedArea.Bottom + 1)`
`628`	`623`	`};`
`629`		`-`
`630`		`- var coords = map.ImageToWorld(pts, true);`
`631`		`-`
`632`		`- var minX = Math.Min(coords[0].X, Math.Min(coords[1].X, Math.Min(coords[2].X, coords[3].X)));`
`633`		`- var maxX = Math.Max(coords[0].X, Math.Max(coords[1].X, Math.Max(coords[2].X, coords[3].X)));`
`634`		`- var minY = Math.Min(coords[0].Y, Math.Min(coords[1].Y, Math.Min(coords[2].Y, coords[3].Y)));`
`635`		`- var maxY = Math.Max(coords[0].Y, Math.Max(coords[1].Y, Math.Max(coords[2].Y, coords[3].Y)));`
`636`		`-`
`637`		`- var env = new Envelope(minX, maxX, minY, maxY);`
`638`		`- //env.ExpandBy(env.Width * 0.05, env.Height * 0.05);`
`639`		`-`
`640`		`- base._affectedArea.ExpandToInclude(env);`
	`624`	`+ var coords = map.ImageToWorld(pts, false);`
	`625`	`+ base._affectedArea.ExpandToInclude(new Envelope(coords[0], coords[1]));`
`641`	`626`	`}`
`642`		`-`
`643`	`627`	`base.Render(g, map);`
`644`	`628`	`}`
`645`	`629`