Merge remote-tracking branch 'origin/raster-styling'

Author: dwins

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

@@ -43,27 +43,17 @@ object CssParser extends RegexParsers {
         }
     }
 
-  private object SingleComment extends Parser[String] {
-    val whiteSpace = """\s*""".r
-    val comment = """/\*((?:[^/]|[^*]/)*)\*/""".r
-
-    override def apply(in: Reader[Char]): ParseResult[String] = {
-      val source = in.source
-      val start = findStart(source, in.offset)
-      val space = source.subSequence(start, source.length)
-      comment.findPrefixMatchOf(space) match {
-        case Some(cmt) => Success(cmt.group(1), in.drop(start - in.offset + cmt.end))
-        case None => Failure("nothing found", in)
-      }
-    }
-
-    private def findStart(source: CharSequence, offset: Int): Int = {
-      val space = source.subSequence(offset, source.length)
-      whiteSpace.findPrefixMatchOf(space) match {
-        case Some(m) => offset + m.end
-        case None => offset
-      }
-    }
+  private val SingleComment: Parser[String] = {
+    val whitespacepadding = rep(elem("Whitespace", _.isWhitespace))
+    val startComment = elem('/') ~ elem('*')
+    val endComment = elem('*') ~ elem('/')
+    val commentChar = (elem('*') <~ not(elem('/'))) | elem("Comment content", _ != '*')
+    for {
+      _ <- whitespacepadding
+      _ <- startComment
+      body <- rep(commentChar)
+      _ <- endComment
+    } yield body.mkString
   }
 
   private val ParsedComment = rep1(SingleComment) map { x => Description(x.last) }

geocss/src/test/resources/raster.colorenhancement.css

@@ -0,0 +1,21 @@
+/*
+ * The raster-color-enhancement property specifies image processing filters to
+ * be applied to an entire raster layer.
+ *
+ * The keyword "none" will cause colors to be included directly; with high
+ * values encoded as white and low values encoded as black. This is the default
+ * behavior.
+ * raster-color-enhancement: none;
+ *
+ * The keyword "normalize" will stretch or compress values so that the minimum
+ * value in the raster is mapped to black and the maximum is mapped to white,
+ * with intermediate colors mapped linearly along the scale between the two.
+ * raster-color-enhancement: normalize;
+ *
+ * The keyword "histogram" will calculate a color curve such that the output
+ * image has roughly the same number of pixels at each brightness.
+ */
+* {
+  raster-channels: 1;
+  raster-color-enhancement: histogram;
+}

geocss/src/test/resources/raster.colormap.css

@@ -0,0 +1,24 @@
+/*
+ * The raster-color-map property specifies a series of colors to associate with
+ * specific values in a raster. Note that this only applies with grey-scale
+ * rasters - that is, when raster-color-map is used, it should always be in
+ * conjunction with a raster-channels value specifying only a single value.
+ *
+ * A raster-color-map property consists at least one color map entry, created
+ * by the color-map-entry function.  The color-map-entry must contain a CSS
+ * color and a numeric value:
+ * raster-color-map: color-map-entry(#ff0000, 0)
+ *
+ * Optionally, it may also include an opacity value:
+ * raster-color-map: color-map-entry(#ff0000, 0, 0.5)
+ *
+ * By default values in between entries in the color map will have colors
+ * smoothly interpolated.  This behavior can be controlled using the
+ * raster-color-map-type property.
+ */
+* {
+  raster-channels: 1;
+  raster-color-map: color-map-entry(#ff0000, 0)
+                    color-map-entry(#00ff00, 50, 0.5),
+                    color-map-entry(#00ff00, 100);
+}

geocss/src/test/resources/raster.colormaptype.css

@@ -0,0 +1,24 @@
+/*
+ * The raster-color-map-type property specifies how values that are not
+ * explicitly listed in a colormap should be rendered.  If no color-map is
+ * being used, then it has no effect.
+ *
+ * There are three meaningful values of this property; others will be ignored.
+ * The default value is "ramp." This specifies that colors should be linearly
+ * interpolated.
+ * raster-color-map-type: ramp;
+ *
+ * A value of "intervals" causes every value to be colored according to the
+ * highest-valued entry in the colormap that is not greater than the value.
+ * raster-color-map-type: intervals;
+ *
+ * A value of "values" causes the style to render only values that exactly
+ * match those specified in the color map.
+ * raster-color-map-type: values;
+ */
+* {
+  raster-channels: 1;
+  raster-color-map: color-map-entry(#ff0000, 0)
+                    color-map-entry(#00ff00, 100);
+  raster-color-map-type: intervals;
+}

geocss/src/test/resources/raster.gamma.css

@@ -0,0 +1,13 @@
+/*
+ * The raster-gamma property specifies a gamma correction
+ * (http://en.wikipedia.org/wiki/Gamma_correction) to be applied to the output raster.
+ * Gamma correction has the general effect of brightening or darkening shadows
+ * in the image.
+ *
+ * A gamma value of 1 leaves the image unaltered (this is the default).  Values
+ * smaller than one darken the image, while values larger than one lighten it.
+ */
+* {
+  raster-channels: 1;
+  raster-gamma: 0.5;
+}

geocss/src/test/resources/raster.geometry.css

@@ -0,0 +1,10 @@
+/*
+ * The GeoTools RasterSymbolizer representation has a Geometry property, so I
+ * exposed it via CSS.  I am not really sure what it does, but it is important
+ * enough that GeoTools preserves it when serializing to SLD.  It takes a CQL
+ * filter expression (Don't forget to enclose that in [square brackets]).
+ */
+* {
+  raster-channels: auto;
+  raster-geometry: [the_geom];
+}

geocss/src/test/resources/raster.opacity.css

@@ -0,0 +1,12 @@
+/**
+ * The raster-opacity property specifies an opacity in the range 0 (fully
+ * transparent) to 1 (fully opaque.) to be applied to the entire raster.
+ * Note that a color ramp may specify varying opacity, in which case the
+ * opacities multiply - if raster-opacity is .5 and a pixel is assigned opacity
+ * value 0.5 by a color ramp, then the pixel will be rendered with opacity
+ * 0.25.
+ */
+* {
+  raster-channels: auto;
+  raster-opacity: 0.5;
+}

geocss/src/test/resources/raster.simple.css

@@ -0,0 +1,34 @@
+/*
+ * The simplest possible style that applies to raster data.  Raster display is
+ * activated by the raster-channels property, which selects bands of the raster to display.
+ * Raster bands can have any string for a name, but most (all?) GeoTools
+ * coverage stores use numerals (so the first band is named "1", the second is
+ * named "2", etc.)
+ *
+ * The raster-channels property can take four forms.
+ *
+ * If it contains simply the keyword "auto" then the style will attempt to
+ * guess how to render the raster by inspection - a single-band raster is
+ * rendered in greyscale, a 3-band raster is interpreted as RGB.  I believe
+ * (but have not verified) that rasters with other numbers of bands will be
+ * interpreted as greyscale by discarding all but the first band.
+ * raster-channels: auto;
+ *
+ * If it contains a single string other than "auto" then that string will be
+ * taken as the name of a band which will be used for a grey channel in the
+ * output.
+ * raster-channel: 1;
+ *
+ * If it contains three strings then they will be taken as the names of the
+ * bands to use for Red, Green, and Blue channels respectively.
+ * raster-channel: 1 2 3;
+ *
+ * As with other styling properties, commas (',') delimit values to be used in
+ * separate rendering passes, so: raster-channel: 1, 2, 3; overlays channels 1,
+ * 2, and 3 on top of each other in greyscale, rather than combining them into
+ * an RGB image.
+ */
+
+* {
+  raster-channels: auto;
+}