Create pointplacement when label-anchor is provided and label-offset is not

fixes dwins#26

Author: David Winslow

geocss/src/main/scala/org/geoscript/geocss/Translator.scala

@@ -565,23 +565,47 @@ class Translator(val baseURL: Option[java.net.URL]) {
           else
             None
 
-        val placement = offset match {
-          case Some(Seq(Some(d))) => styles.createLinePlacement(d)
-          case Some(Seq(Some(x), Some(y))) =>
+        val linePlacementOption = 
+          offset.collect {
+            case Seq(Some(d)) => styles.createLinePlacement(d)
+          }
+
+        val pointPlacementOption = 
+          offset.collect {
+            case Seq(Some(x), Some(y)) =>
+              styles.createPointPlacement(
+                anchorPoint.getOrElse(styles.getDefaultPointPlacement.getAnchorPoint),
+                styles.createDisplacement(x, y),
+                rotation.getOrElse(styles.getDefaultPointPlacement.getRotation))
+          }
+
+        val anchorPlacementOption =
+          anchorPoint.map { anchor =>
             styles.createPointPlacement(
-              anchorPoint.getOrElse(styles.getDefaultPointPlacement().getAnchorPoint()),
-              styles.createDisplacement(x, y),
-              rotation.getOrElse(styles.getDefaultPointPlacement().getRotation())
-            )
-          case _ => null
-        }
+              anchor, 
+              styles.getDefaultPointPlacement.getDisplacement,
+              rotation.getOrElse(styles.getDefaultPointPlacement.getRotation))
+          }
+
+        val placement = 
+          linePlacementOption orElse pointPlacementOption orElse anchorPlacementOption
+       //  offset match {
+       //    case Some(Seq(Some(d))) => styles.createLinePlacement(d)
+       //    case Some(Seq(Some(x), Some(y))) =>
+       //      styles.createPointPlacement(
+       //        anchorPoint.getOrElse(styles.getDefaultPointPlacement().getAnchorPoint()),
+       //        styles.createDisplacement(x, y),
+       //        rotation.getOrElse(styles.getDefaultPointPlacement().getRotation())
+       //      )
+       //    case _ => null
+       //  }
 
         val sym = styles.createTextSymbolizer(
           styles.createFill(fillParams.flatMap(_._3).orNull, null, fontOpacity.getOrElse(null), fontFill),
           font,
           halo,
           concatenatedExpression(props("label")),
-          placement,
+          placement.orNull,
           null  //the geometry, but only as a string. the setter accepts an expression so we use that instead
         )
         geom.foreach { sym.setGeometry(_) }

geocss/src/test/resources/label-anchor.css

@@ -0,0 +1,4 @@
+* {
+  label: [foo];
+  label-anchor: 0.75 0.75;
+}

geocss/src/test/scala/org/geoscript/geocss/SLDTest.scala

@@ -345,6 +345,11 @@ class SLDTest extends FunSuite with ShouldMatchers {
       (f \ "@name").text should equal("strConcat")
   }
 
+  test("label-anchor should be applied even when no label-offset is provided") {
+    val fontFill = css2sld2dom("/label-anchor.css")
+    (fontFill \\ "AnchorPoint") should have(size(1))
+  }
+
   test("Solid font-fill should not use GraphicFill") {
     val fontFill = css2sld2dom("/font-fill.css")
     (fontFill \\ "GraphicFill") should have(size(0))