Add more label options to the simple style reader

Author: jericks

src/main/groovy/geoscript/style/io/SimpleStyleReader.groovy

@@ -120,16 +120,13 @@ class SimpleStyleReader implements Reader {
             }
             String placement = options.get("label-placement", "point")
             if (placement.equalsIgnoreCase("point")) {
-                // label-point-anchor, label-point-displace, label-point-rotate
                 Map params = [
                     anchor: options.get("label-point-anchor","0.5,0.5")?.split(","),
                     displace: options.get("label-point-displace","0,0")?.split(","),
                     rotate: options.get("label-point-rotate",0) as double
                 ]
                 label.point(params)
             } else if (placement.equalsIgnoreCase("line")) {
-                // label-line-offset, label-line-gap, label-line-igap, label-line-align, label-line-follow,
-                // label-line-group, label-line-displacement, label-line-repeat
                 Map params = [
                     offset: options.get("label-line-offset", 0) as double,
                     gap: options.get("label-line-gap"),
@@ -142,7 +139,15 @@ class SimpleStyleReader implements Reader {
                 ]
                 label.linear(params)
             }
-
+            if (options.containsKey("label-maxdisplacement")) {
+                label.maxDisplacement(options.get("label-maxdisplacement") as double)
+            }
+            if (options.containsKey("label-maxangledelta")) {
+                label.maxAngleDelta(options.get("label-maxangledelta") as float)
+            }
+            if (options.containsKey("label-polygonalign")) {
+                label.polygonAlign(options.get("label-polygonalign"))
+            }
             parts.add(label)
         }
         new Composite(parts)

src/test/groovy/geoscript/style/io/SimpleStyleReaderTest.groovy

@@ -2,6 +2,7 @@ package geoscript.style.io
 
 import geoscript.style.Composite
 import geoscript.style.Icon
+import geoscript.style.Label
 import geoscript.style.Style
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.io.TempDir
@@ -83,6 +84,23 @@ class SimpleStyleReaderTest {
         assertEquals style.toString(), "Composite (Shape(color = #7e7e7e, size = 6, type = triangle), Label(property = NAME))"
     }
 
+    @Test void polygonWithAlign() {
+        SimpleStyleReader styleReader = new SimpleStyleReader()
+        Style style = styleReader.read("fill=#555555 fill-opacity=0.6 stroke=#555555 stroke-width=0.5 label=name label-polygonalign=mbr")
+        assertEquals style.toString(), "Composite (Fill(color = #555555, opacity = 0.6), Stroke(color = #555555, width = 0.5), Label(property = name))"
+        Composite composite = style as Composite
+        assertEquals("mbr", composite.parts[2].options["polygonAlign"])
+    }
+
+    @Test void labelMaxDisplacementAndMaxAngleDelta() {
+        SimpleStyleReader styleReader = new SimpleStyleReader()
+        Style style = styleReader.read("fill=#555555 fill-opacity=0.6 stroke=#555555 stroke-width=0.5 label=name label-maxdisplacement=10 label-maxangledelta=45")
+        assertEquals style.toString(), "Composite (Fill(color = #555555, opacity = 0.6), Stroke(color = #555555, width = 0.5), Label(property = name))"
+        Composite composite = style as Composite
+        assertEquals("45.0", composite.parts[2].options["maxAngleDelta"])
+        assertEquals("10.0", composite.parts[2].options["maxDisplacement"])
+    }
+
     @Test void readFromMap() {
         SimpleStyleReader styleReader = new SimpleStyleReader()
         Style style = styleReader.read([fill: 'wheat', 'stroke-width': 1.2])