Skip to content

Commit 6687687

Browse files
committed
Adding support for randomized fills vendor options
1 parent ddf875d commit 6687687

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,13 @@ class Translator(val baseURL: Option[java.net.URL]) {
5555

5656
val gtPolygonVendorOpts = Seq(
5757
"-gt-graphic-margin" -> "graphic-margin",
58-
"-gt-fill-label-obstacle" -> "labelObstacle"
58+
"-gt-fill-label-obstacle" -> "labelObstacle",
59+
"-gt-fill-random" -> "random",
60+
"-gt-fill-random-seed" -> "random-seed",
61+
"-gt-fill-random-tile-size" -> "random-tile-size",
62+
"-gt-fill-random-symbol-count" -> "random-symbol-count",
63+
"-gt-fill-random-space-around" -> "random-space-around",
64+
"-gt-fill-random-rotation" -> "random-rotation"
5965
)
6066

6167
val gtPointVendorOpts = Seq(

geocss/src/test/resources/gt-poly-opts.css

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,11 @@
55
fill: red;
66
-gt-fill-label-obstacle: true;
77
-gt-graphic-margin: 10 20 40 30;
8+
-gt-fill-random: grid;
9+
-gt-fill-random-seed: 125;
10+
-gt-fill-random-tile-size: 128;
11+
-gt-fill-random-symbol-count: 15;
12+
-gt-fill-random-space-around: 3;
13+
-gt-fill-random-rotation: free;
14+
815
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,11 @@ class SLDTest extends FunSuite with ShouldMatchers {
202202
val vendor = getVendorOption(vendorOptions)_;
203203
vendor("labelObstacle") should be(Some("true"))
204204
vendor("graphic-margin") should be(Some("10 20 40 30"))
205+
vendor("random") should be(Some("grid"))
206+
vendor("random-seed") should be(Some("125"))
207+
vendor("random-tile-size") should be(Some("128"))
208+
vendor("random-space-around") should be(Some("3"))
209+
vendor("random-rotation") should be(Some("free"))
205210
}
206211

207212
test("GeoTools point vendor options should be passed through") {

0 commit comments

Comments
 (0)