Merge pull request #76 from geoscript/GSG-73

Add new properties to the ScaleBarItem.

Author: jericks

src/main/groovy/geoscript/carto/Java2DCartoBuilder.groovy

@@ -348,9 +348,12 @@ class Java2DCartoBuilder implements CartoBuilder {
         int height = scaleBarItem.height
         int border = 5
         Font font = scaleBarItem.font
+        Color fontColor = scaleBarItem.textColor
         Color strokeColor = scaleBarItem.strokeColor
         Color fillColor = scaleBarItem.fillColor
         int strokeWidth = scaleBarItem.strokeWidth
+        Color barStrokeColor = scaleBarItem.barStrokeColor
+        float barStrokeWidth = scaleBarItem.barStrokeWidth
         int ticHeight = 10
 
         ScaleBarItem.ScaleBarInfo scaleBarInfo = scaleBarItem.calculateScaleBarInfo()
@@ -366,6 +369,7 @@ class Java2DCartoBuilder implements CartoBuilder {
         int lineXEnd = (int)(lineXStart + scaleBarInfo.widthInPixels)
         int lineY = y + height - border
 
+        // Outline
         if (fillColor) {
             graphics.color = fillColor
             graphics.fillRect(lineXStart - border, y, lineXEnd - lineXStart + border * 2, height)
@@ -374,9 +378,13 @@ class Java2DCartoBuilder implements CartoBuilder {
         graphics.stroke = new BasicStroke(strokeWidth)
         graphics.drawRect(lineXStart - border, y, lineXEnd - lineXStart + border * 2, height)
 
+        // Scale bar
+        graphics.color = barStrokeColor
+        graphics.stroke = new BasicStroke(barStrokeWidth)
         graphics.drawLine(lineXStart, lineY, lineXEnd, lineY)
         graphics.drawLine(lineXStart, y + height - border, lineXStart, y + height - border - ticHeight)
         graphics.drawLine(lineXEnd, y + height - border, lineXEnd, y + height - border - ticHeight)
+        graphics.color = fontColor
         graphics.font = font
         String scaleText = "${(int) scaleBarInfo.widthInUnits} ${scaleBarInfo.unitForScaleText}"
         drawString(scaleText, new Rectangle(

src/main/groovy/geoscript/carto/ScaleBarItem.groovy

@@ -20,8 +20,14 @@ class ScaleBarItem extends Item {
 
     float strokeWidth = 1
 
+    float barStrokeWidth = 1
+
+    Color barStrokeColor = Color.BLACK
+
     Font font = new Font("Arial", Font.PLAIN, 12)
 
+    Color textColor = Color.BLACK
+
     int border = 5
 
     Units units = Units.METRIC
@@ -92,6 +98,36 @@ class ScaleBarItem extends Item {
         this
     }
 
+    /**
+     * Set the bar stroke Color
+     * @param strokeColor The bar stroke Color
+     * @return The ScaleBarItem
+     */
+    ScaleBarItem barStrokeColor(Color strokeColor) {
+        this.barStrokeColor = strokeColor
+        this
+    }
+
+    /**
+     * Set the bar stroke width
+     * @param strokeWidth The bar stroke width
+     * @return The ScaleBarItem
+     */
+    ScaleBarItem barStrokeWidth(float strokeWidth) {
+        this.barStrokeWidth = strokeWidth
+        this
+    }
+
+    /**
+     * Set the text Color
+     * @param color The text Color
+     * @return The ScaleBarItem
+     */
+    ScaleBarItem textColor(Color color) {
+        this.textColor = color
+        this
+    }
+
     /**
      * Set the Font
      * @param font The Font

src/test/groovy/geoscript/carto/Java2DCartoBuilderTest.groovy

@@ -53,6 +53,24 @@ class Java2DCartoBuilderTest {
         })
     }
 
+    @Test
+    void drawScaleBarWithOptions() {
+        File fileForShapefile = new File(getClass().getClassLoader().getResource("states.shp").toURI())
+        Shapefile shapefile = new Shapefile(fileForShapefile)
+        Map map = new Map(layers: [shapefile])
+        draw(new PageSize(400, 300), "scalebar_options.png", { PageSize pageSize, Java2DCartoBuilder builder ->
+            builder
+                .map(new MapItem(0,0,400,300).map(map))
+                .scaleBar(new ScaleBarItem(10,10,200,20)
+                    .map(map)
+                    .units(ScaleBarItem.Units.US)
+                    .barStrokeWidth(2.0f)
+                    .barStrokeColor(java.awt.Color.RED)
+                    .textColor(java.awt.Color.BLUE)
+                )
+        })
+    }
+
     @Test
     void drawNorthArrow() {
         draw(new PageSize(80, 140), "northarrow.png", { PageSize pageSize, Java2DCartoBuilder builder ->

src/test/groovy/geoscript/carto/ScaleBarItemTest.groovy

@@ -20,9 +20,12 @@ class ScaleBarItemTest {
 
         ScaleBarItem item = new ScaleBarItem(10,20,300,50)
             .font(new Font("Verdana", Font.BOLD, 14))
+            .textColor(Color.BLACK)
             .strokeColor(Color.BLUE)
             .fillColor(Color.GRAY)
             .strokeWidth(1.45f)
+            .barStrokeColor(Color.BLUE)
+            .barStrokeWidth(1.2f)
             .border(6)
             .units(ScaleBarItem.Units.US)
             .map(map)
@@ -35,8 +38,11 @@ class ScaleBarItemTest {
         assertEquals(item.font.name, "Verdana")
         assertEquals(item.font.style, Font.BOLD)
         assertEquals(item.font.size, 14)
+        assertEquals(item.textColor, Color.BLACK)
         assertEquals(item.strokeColor, Color.BLUE)
         assertEquals(item.fillColor, Color.GRAY)
+        assertEquals(item.barStrokeColor, Color.BLUE)
+        assertEquals(item.barStrokeWidth, 1.2f)
         assertEquals(item.border, 6)
         assertEquals(item.strokeWidth, 1.45f, 0.01f)
         assertEquals(ScaleBarItem.Units.US, item.units)