Merged in upstream.

studioimp · May 12, 2015 · 65b20be · 65b20be
2 parents cd63b8a + 4c31fb7
commit 65b20be
Show file tree

Hide file tree

Showing 209 changed files with 6,321 additions and 2,614 deletions.
diff --git a/macros/src/main/scala/geotrellis/README.md b/macros/src/main/scala/geotrellis/README.md
diff --git a/proj4/src/main/scala/geotrellis/proj4/README.md b/proj4/src/main/scala/geotrellis/proj4/README.md
diff --git a/project/Build.scala b/project/Build.scala
@@ -364,7 +364,7 @@ object GeotrellisBuild extends Build {
   lazy val spark: Project =
     Project("spark", file("spark"))
       .settings(sparkSettings: _*)
-      .dependsOn(raster, gdal)
+      .dependsOn(raster, gdal, index)
 
   lazy val sparkSettings =
     Seq(
@@ -378,15 +378,19 @@ object GeotrellisBuild extends Build {
       ),
       libraryDependencies ++=
         Seq(
+          "org.apache.accumulo" % "accumulo-core" % Version.accumulo 
+            exclude("org.jboss.netty", "netty")
+            exclude("org.apache.hadoop", "hadoop-client"),
           "org.apache.spark" %% "spark-core" % Version.spark % "provided",
           "org.apache.hadoop" % "hadoop-client" % Version.hadoop % "provided",
           "com.quantifind" %% "sumac" % "0.3.0",
-          "org.apache.accumulo" % "accumulo-core" % "1.5.2",
           "de.javakaffee" % "kryo-serializers" % "0.27",
+          "com.google.uzaygezen" % "uzaygezen-core" % "0.2",
           logging, awsSdkS3,
           spire,
           monocleCore, monocleMacro,
           nscalaTime,
+          scalazStream,
           scalatest % "test"
         ),
       resolvers ++= Seq(

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -23,7 +23,8 @@ object Dependencies {
     "maven2 dev repository"   at "http://download.java.net/maven/2",
     "Typesafe Repo"           at "http://repo.typesafe.com/typesafe/releases/",
     "spray repo"              at "http://repo.spray.io/",
-    "sonatypeSnapshots"       at "http://oss.sonatype.org/content/repositories/snapshots"
+    "sonatypeSnapshots"       at "http://oss.sonatype.org/content/repositories/snapshots",
+    "Scalaz Bintray Repo" at "https://dl.bintray.com/scalaz/releases"
   )
   val typesafeConfig = "com.typesafe"        % "config"           % "1.2.1"
   val logging       = "com.typesafe.scala-logging" %% "scala-logging-slf4j" % "2.1.2"
@@ -66,5 +67,7 @@ object Dependencies {
 
   val nscalaTime    = "com.github.nscala-time" %% "nscala-time" % "1.6.0"
 
-  val awsSdkS3      = "com.amazonaws" % "aws-java-sdk-s3" % "1.9.16"
+  val awsSdkS3      = "com.amazonaws" % "aws-java-sdk-s3" % "1.9.33"
+
+  val scalazStream  = "org.scalaz.stream" %% "scalaz-stream" % "0.7a"
 }
diff --git a/project/Version.scala b/project/Version.scala
@@ -29,6 +29,7 @@ object Version {
   val spray       = "1.3.2"
   val jackson     = "1.6.1"
   val monocle     = "1.0.1"
+  val accumulo    = "1.6.2"
   lazy val hadoop      = Environment.hadoopVersion
   lazy val spark       = Environment.sparkVersion
 }
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=0.13.5
+sbt.version=0.13.8
diff --git a/publish-local.sh b/publish-local.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
 
-./sbt "project macros" +publish-local & ./sbt "project vector" +publish-local & ./sbt "project proj4" +publish-local & ./sbt "project raster" +publish-local & ./sbt "project engine" +publish-local & ./sbt "project testkit" +publish-local & ./sbt "project services" +publish-local & ./sbt "project jetty" +publish-local & ./sbt "project spark" +publish-local & ./sbt "project gdal" +publish-local & ./sbt "project geotools" +publish-local & ./sbt "project slick" +publish-local
+./sbt "project macros" +publish-local && ./sbt "project vector" +publish-local && ./sbt "project proj4" +publish-local && ./sbt "project raster" +publish-local && ./sbt "project index" +publish-local && ./sbt "project engine" +publish-local && ./sbt "project testkit" +publish-local && ./sbt "project services" +publish-local && ./sbt "project jetty" +publish-local && ./sbt "project spark" +publish-local && ./sbt "project gdal" +publish-local && ./sbt "project geotools" +publish-local && ./sbt "project slick" +publish-local
+
diff --git a/...io/geotiff/writer/GeoTiffWriterSpec.scala → ...raster/io/geotiff/GeoTiffWriterSpec.scala b/...io/geotiff/writer/GeoTiffWriterSpec.scala → ...raster/io/geotiff/GeoTiffWriterSpec.scala
@@ -14,10 +14,9 @@
  * limitations under the License.
  */
 
-package geotrellis.raster.io.geotiff.writer
+package geotrellis.raster.io.geotiff
 
 import geotrellis.raster._
-import geotrellis.raster.io.geotiff._
 import geotrellis.raster.io.geotiff.reader._
 
 import geotrellis.vector.Extent

diff --git a/raster/src/main/scala/geotrellis/raster/GridBounds.scala b/raster/src/main/scala/geotrellis/raster/GridBounds.scala
@@ -33,8 +33,8 @@ case class GridBounds(colMin: Int, rowMin: Int, colMax: Int, rowMax: Int) {
   val height = rowMax - rowMin + 1
 
   def contains(col: Int, row: Int): Boolean =
-    (colMin <= col || col <= colMax) &&
-    (rowMin <= row || row <= rowMax)
+    (colMin <= col && col <= colMax) &&
+    (rowMin <= row && row <= rowMax)
 
   def intersects(other: GridBounds): Boolean =
     !(colMax < other.colMin || other.colMax < colMin) &&

diff --git a/raster/src/main/scala/geotrellis/raster/README.md b/raster/src/main/scala/geotrellis/raster/README.md
diff --git a/raster/src/main/scala/geotrellis/raster/TileLayout.scala b/raster/src/main/scala/geotrellis/raster/TileLayout.scala
@@ -46,7 +46,7 @@ case class TileLayout(layoutCols: Int, layoutRows: Int, tileCols: Int, tileRows:
    */
   def totalRows: Long = layoutRows.toLong * tileRows
 
-  def tileDimensions: (Int, Int) = (layoutCols, layoutRows)
+  def layoutDimensions: (Int, Int) = (layoutCols, layoutRows)
 
   def tileSize: Int = tileCols * tileRows
 

diff --git a/raster/src/main/scala/geotrellis/raster/interpolation/NearestNeighborInterpolation.scala b/raster/src/main/scala/geotrellis/raster/interpolation/NearestNeighborInterpolation.scala
@@ -7,14 +7,30 @@ class NearestNeighborInterpolation(tile: Tile, extent: Extent)
     extends Interpolation(tile, extent) {
 
   override def interpolateValid(x: Double, y: Double): Int = {
-    val col = re.mapXToGrid(x)
-    val row = re.mapYToGrid(y)
+    val col = {
+      val c = re.mapXToGrid(x)
+      if(c < tile.cols) c else tile.cols - 1
+    }
+
+    val row = {
+      val r = re.mapYToGrid(y)
+      if(r < tile.rows) r else tile.rows - 1
+    }
+
     tile.get(col, row)
   }
 
   override def interpolateDoubleValid(x: Double, y: Double): Double = {
-    val col = re.mapXToGrid(x)
-    val row = re.mapYToGrid(y)
+    val col = {
+      val c = re.mapXToGrid(x)
+      if(c < tile.cols) c else tile.cols - 1
+    }
+
+    val row = {
+      val r = re.mapYToGrid(y)
+      if(r < tile.rows) r else tile.rows - 1
+    }
+
     tile.getDouble(col, row)
   }
 

diff --git a/raster/src/main/scala/geotrellis/raster/io/README.md b/raster/src/main/scala/geotrellis/raster/io/README.md
diff --git a/...ter/io/geotiff/writer/GeoTiffWriter.scala → ...lis/raster/io/geotiff/GeoTiffWriter.scala b/...ter/io/geotiff/writer/GeoTiffWriter.scala → ...lis/raster/io/geotiff/GeoTiffWriter.scala
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package geotrellis.raster.io.geotiff.writer
+package geotrellis.raster.io.geotiff
 
 import geotrellis.raster._
 import geotrellis.raster.io._
-import geotrellis.raster.io.geotiff._
 import geotrellis.vector.Extent
 import geotrellis.proj4.CRS