Merge branch 'scala-2.10' into raster-styling

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

Author: David Winslow

examples/src/main/scala/example/AllValid.scala

@@ -5,7 +5,7 @@ import org.geoscript._
 object AllValid extends App {
   val shp = layer.Shapefile(args.head)
 
-  val invalid = shp.features filter { f => !f.geometry.isValid } toSeq
+  val invalid = shp.features.filterNot(_.geometry.isValid).toSeq
 
   println("Found %s invalid features.".format(invalid.size))
   for (f <- invalid) println(f.id)

examples/src/main/scala/example/ColorRamp.scala

@@ -1,6 +1,7 @@
 package org.geoscript.example
 
 import org.geoscript._
+import filter._
 import style.combinators._
 import org.geotools.filter.text.ecql.ECQL.{ toFilter => cql }
 
@@ -19,8 +20,9 @@ object ColorRamp extends org.geoscript.feature.GeoCrunch {
     sldStream.close()
   }
 
-  def hex(c: java.awt.Color) = 
-    "#%02x02x02x".format(c.getRed, c.getGreen, c.getBlue)
+  def hex(c: java.awt.Color): Paint = 
+    Color(literal(
+      "#%02x02x02x".format(c.getRed, c.getGreen, c.getBlue)))
 
   def colorRamp(data: layer.Layer, propertyName: String): style.Style = {
     val propertyView = data.features.view.map(f => f.get[Double](propertyName))
@@ -37,6 +39,6 @@ object ColorRamp extends org.geoscript.feature.GeoCrunch {
         filter = "%s BETWEEN %f AND %f".format(propertyName, min, max)
       } yield
         Fill(hex(color)) where cql(filter)
-    rules reduce (_ and _)
+    rules.reduce(_ and _).build
   }
 }

examples/src/main/scala/example/Postgis.scala

@@ -3,6 +3,7 @@ package org.geoscript.example
 import com.vividsolutions.jts.geom.Geometry
 import org.geoscript._
 import feature.{ Feature, Field }
+import projection.lookupEPSG
 
 object PostgisTest extends App { 
   val conflict = workspace.Postgis("database" -> "conflict")
@@ -13,7 +14,7 @@ object PostgisTest extends App {
 
   val test = workSpaceTest.create("test",
     Field("name", classOf[String]),
-    Field("geom", classOf[Geometry], "EPSG:4326")
+    Field("geom", classOf[Geometry], lookupEPSG("EPSG:4326").get)
   )
 
   test += Feature( 

examples/src/main/scala/example/Render.scala

@@ -2,8 +2,9 @@ package org.geoscript.example
 
 import org.geoscript.layer.Shapefile,
   org.geoscript.style.CSS,
-  org.geoscript.render.{ render, PNG, Viewport },
-  org.geoscript.projection.Projection
+  org.geoscript.render.{ render, MapLayer, PNG, Viewport },
+  org.geoscript.projection.Projection,
+  org.geoscript.io.Sink
 
 object Render {
   def reference(e: org.geoscript.geometry.Envelope, p: Projection) = 
@@ -16,7 +17,7 @@ object Render {
     val viewport = Viewport.pad(reference(states.envelope, Projection("EPSG:4326")), frame)
     render(
       viewport,
-      Seq(states -> theme)
-    ) on PNG("states.png", frame)
+      Seq(MapLayer(states, theme))
+    ) on PNG(Sink.file("states.png"), frame)
   }
 }

examples/src/main/scala/example/Shp2Shp.scala

@@ -8,7 +8,7 @@ object Shp2Shp extends App {
   val source = layer.Shapefile(sourcefile)
   val destSchema = Schema(destname,
     source.schema.fields map {
-      case (g: GeoField) => g.copy(projection = proj)
+      case (g: GeoField) => g.copy(projection = projection.lookupEPSG(proj).get)
       case (f: Field) => f
     }
   )

examples/src/main/scala/example/kmlrip/DocumentReader.scala

@@ -23,23 +23,14 @@ trait GeoCrunch {
     shp.createNewDataStore(map)
   }
 
-  def create(params: Map[String, Serializable]): DataStore = {
-    var map = new java.util.HashMap[String, Object]
-    for ((key, value) <- params) map.put(key, value)
-    shp.createNewDataStore(map)
-  }
+  def create(params: Map[String, Serializable]): DataStore =
+    shp.createNewDataStore(params: Map[_, _]);
 
-  def connect(params: (String, Object)*): DataStore = {
-    var map = new java.util.HashMap[String,Object]
-    for ((key, value) <- params) map.put(key, value)
-    DataStoreFinder.getDataStore(map)
-  }
+  def connect(params: (String, Serializable)*): DataStore =
+    DataStoreFinder.getDataStore(params.toMap: Map[_, _])
 
-  def connect(params: Map[String,Serializable]): DataStore = {
-    var map = new java.util.HashMap[String,Object]
-    for ((key, value) <- params) map.put(key, value)
-    DataStoreFinder.getDataStore(map)
-  }
+  def connect(params: Map[String,Serializable]): DataStore =
+    DataStoreFinder.getDataStore(params: Map[_, _])
 
   def foreach[T <: ogc.feature.`type`.FeatureType, F <: ogc.feature.Feature](
     fc: gt.FeatureCollection[T,F]

examples/src/main/scala/example/kmlrip/QueueManager.scala

@@ -8,8 +8,8 @@ libraryDependencies <++= gtVersion { v =>
 }
 
 libraryDependencies ++= Seq(
-  "org.scala-tools.testing" %% "scalacheck" % "1.9" % "test",
-  "org.scalatest" %% "scalatest" % "1.8" % "test")
+  "org.scalacheck" % "scalacheck_2.10" % "1.10.0" % "test",
+  "org.scalatest" % "scalatest_2.10" % "1.9.1" % "test")
 
 initialCommands += """
 import org.{ geotools => gt }

examples/src/main/scala/example/kmlrip/Rip.scala

@@ -65,7 +65,7 @@ object Converter {
     filenames.foreach { x =>
       val in = new File(x)
       val url = in.toURI.toURL
-      if (in exists) {
+      if (in.exists) {
         val styleSheet = CssParser.parse(new FileInputStream(in))
         val out = target(in, suffix)
         styleSheet match {

examples/src/main/scala/example/kmlrip/messages.scala

@@ -251,8 +251,6 @@ object CssOps {
     def apply(x: Selector): Specificity = x match {
       case (_: Typename) => Specificity(0, 0, 1)
       case (_: PseudoSelector) => Specificity(0, 1, 0)
-      case (_: ParameterizedPseudoClass) => Specificity(0, 0, 2)
-      case (_: PseudoClass) => Specificity(0, 0, 1)
       case (_: Id) => Specificity(1, 0, 0)
       case And(children) => (children map apply).fold(Zero) { _ + _ }
       case Or(children) => children.map(apply).max
@@ -295,15 +293,27 @@ object CssOps {
     val ShortHex = """#?([a-fA-F0-9]{3})""".r
     val LongHex = """#?([a-fA-F0-9]{6})""".r
 
+    import scala.util.control.Exception.catching
+
     def unapply(value: Value): Option[ogc.expression.Expression] = value match {
       case Function("rgb", Seq(Literal(r), Literal(g), Literal(b))) =>
         val channels = Seq(r, g, b)
         val hex = "#%02x%02x%02x"
         def validInt(x: String) =
-          try { x.toInt; true } catch { case _ => false }
+          try {
+            x.toInt
+            true
+          } catch {
+            case (_: NumberFormatException) => false
+          }
 
         def validDouble(x: String) =
-          try { x.toDouble; true } catch { case _ => false }
+          try {
+            x.toDouble
+            true
+          } catch {
+            case (_: NumberFormatException) => false
+          }
 
         def dbl(x: String) = round(x.toFloat * 255f)