Merge pull request #137 from moradology/feature/multiband-color-encoding

Add support for RGB and RGBA tiffs

Author: moradology

ogc-example/src/main/scala/geotrellis/server/ogc/wms/WmsView.scala

@@ -88,7 +88,7 @@ class WmsView(wmsModel: WmsModel, serviceUrl: URL) extends LazyLogging {
               Invalid(errs)
           }.attempt flatMap {
             case Right(Valid((mbtile, hists))) => // success
-              val rendered = Render(mbtile, layer.style, wmsReq.format, hists)
+              val rendered = Render.singleband(mbtile, layer.style, wmsReq.format, hists)
               Ok(rendered)
             case Right(Invalid(errs)) => // maml-specific errors
               logger.debug(errs.toList.toString)

ogc-example/src/main/scala/geotrellis/server/ogc/wmts/WmtsView.scala

@@ -73,7 +73,7 @@ class WmtsView(wmtsModel: WmtsModel, serviceUrl: URL) extends LazyLogging {
                 Invalid(errs)
             }.attempt flatMap {
               case Right(Valid((mbtile, hists))) => // success
-                val rendered = Render(mbtile, layer.style, wmtsReq.format, hists)
+                val rendered = Render.singleband(mbtile, layer.style, wmtsReq.format, hists)
                 Ok(rendered)
               case Right(Invalid(errs)) => // maml-specific errors
                 logger.debug(errs.toList.toString)

ogc/src/main/scala/geotrellis/server/ogc/OutputFormat.scala

@@ -14,7 +14,7 @@ object OutputFormat {
   object Png {
     final val PngEncodingRx = """image/png(?:;encoding=(\w+))?""".r
 
-    def encodoingToString(enc: PngColorEncoding): String = enc match {
+    def encodingToString(enc: PngColorEncoding): String = enc match {
       case RgbaPngEncoding => "rgba"
       case GreyaPngEncoding => "greya"
       case _: RgbPngEncoding => "rgb"
@@ -34,7 +34,7 @@ object OutputFormat {
 
   case class Png(encoding: Option[PngColorEncoding]) extends OutputFormat {
     override def toString = encoding match {
-      case Some(e) => s"image/png;encoding=${Png.encodoingToString(e)}"
+      case Some(e) => s"image/png;encoding=${Png.encodingToString(e)}"
       case None => "image/png"
     }
 

ogc/src/main/scala/geotrellis/server/ogc/Render.scala

@@ -3,26 +3,56 @@ package geotrellis.server.ogc
 import geotrellis.raster._
 import geotrellis.raster.render._
 import geotrellis.raster.render.png._
-import geotrellis.raster.histogram._
 import geotrellis.raster.render.png._
+import geotrellis.raster.render._
+import geotrellis.raster.histogram._
 
 import scala.collection.mutable
 import scala.util.Try
 
 object Render {
-  def apply(mbtile: MultibandTile, maybeStyle: Option[OgcStyle], format: OutputFormat, hists: List[Histogram[Double]]): Array[Byte] =
+  def rgb(mbtile: MultibandTile, maybeStyle: Option[OgcStyle], format: OutputFormat, hists: List[Histogram[Double]]): Array[Byte] =
     maybeStyle match {
       case Some(style) =>
         style.renderImage(mbtile, format, hists)
       case None =>
         format match {
           case format: OutputFormat.Png =>
-            format.render(mbtile.band(bandIndex = 0))
+            OutputFormat.Png(Some(RgbPngEncoding)).render(mbtile.color())
+          case OutputFormat.Jpg =>
+            mbtile.color().renderJpg.bytes
+          case format =>
+            throw new IllegalArgumentException(s"$format is not a valid output format")
+        }
+    }
 
+  def rgba(mbtile: MultibandTile, maybeStyle: Option[OgcStyle], format: OutputFormat, hists: List[Histogram[Double]]): Array[Byte] =
+    maybeStyle match {
+      case Some(style) =>
+        style.renderImage(mbtile, format, hists)
+      case None =>
+        format match {
+          case format: OutputFormat.Png =>
+            OutputFormat.Png(Some(RgbaPngEncoding)).render(mbtile.color())
           case OutputFormat.Jpg =>
-            mbtile.band(bandIndex = 0).renderJpg.bytes
+            mbtile.color().renderJpg.bytes
+          case format =>
+            throw new IllegalArgumentException(s"$format is not a valid output format")
+        }
+    }
 
-          case OutputFormat.GeoTiff => ??? // Implementation necessary
+  def singleband(mbtile: MultibandTile, maybeStyle: Option[OgcStyle], format: OutputFormat, hists: List[Histogram[Double]]): Array[Byte] =
+    maybeStyle match {
+      case Some(style) =>
+        style.renderImage(mbtile, format, hists)
+      case None =>
+        format match {
+          case format: OutputFormat.Png =>
+            format.render(mbtile.band(bandIndex = 0))
+          case OutputFormat.Jpg =>
+            mbtile.band(bandIndex = 0).renderJpg.bytes
+          case format =>
+            throw new IllegalArgumentException(s"$format is not a valid output format")
         }
     }