updates for geowave 0.9.3 release

Signed-off-by: Rich Fecher <rfecher@gmail.com>
locationtech · Dec 21, 2016 · 66e2e6c · 66e2e6c
1 parent 77348ea
commit 66e2e6c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 24 deletions.
diff --git a/geotools/src/test/scala/geotrellis/geotools/GeometryToSimpleFeatureMethodsSpec.scala b/geotools/src/test/scala/geotrellis/geotools/GeometryToSimpleFeatureMethodsSpec.scala
@@ -34,7 +34,7 @@ class GeometryToSimpleFeatureMethodsSpec
     val multiPoint = MultiPoint(Point(0, 0), Point(4, 0), Point(0, 3), Point(0, 0))
     val multiLine = MultiLine(Line(Point(0, 0), Point(4, 0)), Line(Point(0, 3), Point(0, 0)))
     val multiPolygon = MultiPolygon(
-      Polygon(Point(0, 0), Point(4, 0), Point(0, 3), Point(0, 0)),
+      Polygon(Point(0, 0), Point(-4, 0), Point(0, -3), Point(0, 0)),
       Polygon(Point(0, 0), Point(5, 0), Point(0, 12), Point(0, 0))
     )
 

diff --git a/geowave/build.sbt b/geowave/build.sbt
@@ -8,25 +8,25 @@ libraryDependencies ++= Seq(
   "org.apache.accumulo" % "accumulo-core" % Version.accumulo
     exclude("org.jboss.netty", "netty")
     exclude("org.apache.hadoop", "hadoop-client"),
-  "mil.nga.giat" % "geowave-adapter-raster" % "0.9.3-SNAPSHOT"
+  "mil.nga.giat" % "geowave-adapter-raster" % "0.9.3"
     excludeAll(ExclusionRule(organization = "org.mortbay.jetty"),
       ExclusionRule(organization = "javax.servlet")),
-  "mil.nga.giat" % "geowave-adapter-vector" % "0.9.3-SNAPSHOT"
+  "mil.nga.giat" % "geowave-adapter-vector" % "0.9.3"
     excludeAll(ExclusionRule(organization = "org.mortbay.jetty"),
       ExclusionRule(organization = "javax.servlet")),
-  "mil.nga.giat" % "geowave-core-store" % "0.9.3-SNAPSHOT"
+  "mil.nga.giat" % "geowave-core-store" % "0.9.3"
     excludeAll(ExclusionRule(organization = "org.mortbay.jetty"),
       ExclusionRule(organization = "javax.servlet")),
-  "mil.nga.giat" % "geowave-core-geotime" % "0.9.3-SNAPSHOT"
+  "mil.nga.giat" % "geowave-core-geotime" % "0.9.3"
     excludeAll(ExclusionRule(organization = "org.mortbay.jetty"),
       ExclusionRule(organization = "javax.servlet")),
-  "mil.nga.giat" % "geowave-datastore-accumulo" % "0.9.3-SNAPSHOT"
+  "mil.nga.giat" % "geowave-datastore-accumulo" % "0.9.3"
     excludeAll(ExclusionRule(organization = "org.mortbay.jetty"),
       ExclusionRule(organization = "javax.servlet")),
   hadoopClient % "provided"
     excludeAll(ExclusionRule(organization = "org.mortbay.jetty"),
       ExclusionRule(organization = "javax.servlet")),
-  "org.geoserver" % "gs-wms" % "2.8.2"
+  "org.geoserver" % "gs-wms" % "2.10.0"
     excludeAll(ExclusionRule(organization = "org.mortbay.jetty"),
       ExclusionRule(organization = "javax.servlet")),
   "org.geotools" % "gt-coverage" % Version.geotools % "provided"

diff --git a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeoWaveFeatureRDDReader.scala b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeoWaveFeatureRDDReader.scala
@@ -22,7 +22,6 @@ import geotrellis.spark.io.avro._
 import geotrellis.spark.io.avro.codecs._
 import geotrellis.spark.io.hadoop.formats._
 import geotrellis.spark.util.KryoWrapper
-import geotrellis.util.annotations.experimental
 import geotrellis.vector._
 
 import org.apache.avro.Schema
@@ -101,8 +100,7 @@ import scala.reflect._
     val queryOptions = new QueryOptions(gwDataAdapter, gw2dIndex)
     queryOptions.setLimit(queryLimit)
 
-    GeoWaveInputFormat.setDataStoreName(jobConf, "accumulo")
-    GeoWaveInputFormat.setStoreConfigOptions(jobConf, pluginOpts.getFactoryOptionsAsMap)
+    GeoWaveInputFormat.setStoreOptions(jobConf, pluginOpts)
     GeoWaveInputFormat.setQuery(jobConf, query)
     GeoWaveInputFormat.setQueryOptions(jobConf, queryOptions)
 

diff --git a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerReader.scala b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerReader.scala
@@ -118,11 +118,9 @@ object GeowaveLayerReader {
   @experimental def computeConfiguration()(implicit sc: SparkContext) = {
     val pluginOptions = new DataStorePluginOptions
     pluginOptions.setFactoryOptions(requiredOptions)
-    val configOptions = pluginOptions.getFactoryOptionsAsMap
     val job = Job.getInstance(sc.hadoopConfiguration)
     val config = job.getConfiguration
-    GeoWaveInputFormat.setDataStoreName(config, "accumulo")
-    GeoWaveInputFormat.setStoreConfigOptions(config, configOptions)
+    GeoWaveInputFormat.setStoreOptions(config, pluginOptions)
 
     config
   }

diff --git a/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerWriter.scala b/geowave/src/main/scala/geotrellis/spark/io/geowave/GeowaveLayerWriter.scala
@@ -37,11 +37,6 @@ import mil.nga.giat.geowave.core.index.sfc.SFCDimensionDefinition
 import mil.nga.giat.geowave.core.index.sfc.SFCFactory.SFCType
 import mil.nga.giat.geowave.core.index.sfc.tiered.TieredSFCIndexFactory
 import mil.nga.giat.geowave.core.store._
-import mil.nga.giat.geowave.core.store.adapter.statistics.StatsCompositionTool
-import mil.nga.giat.geowave.core.store.data.VisibilityWriter
-import mil.nga.giat.geowave.core.store.index.PrimaryIndex
-import mil.nga.giat.geowave.core.store.operations.remote.options.DataStorePluginOptions
-import mil.nga.giat.geowave.core.store.util.DataStoreUtils
 import mil.nga.giat.geowave.datastore.accumulo._
 import mil.nga.giat.geowave.datastore.accumulo.metadata._
 import mil.nga.giat.geowave.datastore.accumulo.operations.config.AccumuloOptions
@@ -64,9 +59,13 @@ import javax.media.jai.{ ImageLayout, JAI }
 import scala.collection.JavaConversions._
 import scala.collection.mutable.ListBuffer
 import scala.reflect._
+import mil.nga.giat.geowave.core.store.util.DataStoreUtils
 
 import resource._
 import spray.json._
+import mil.nga.giat.geowave.core.store.operations.remote.options.DataStorePluginOptions
+import mil.nga.giat.geowave.core.store.adapter.statistics.StatsCompositionTool
+import mil.nga.giat.geowave.core.store.data.VisibilityWriter
 
 
 /**
@@ -112,15 +111,11 @@ import spray.json._
     val pluginOptions = new DataStorePluginOptions
     pluginOptions.setFactoryOptions(as.accumuloRequiredOptions)
 
-    val configOptions = pluginOptions.getFactoryOptionsAsMap
+    val configOptions = pluginOptions.getOptionsAsMap
 
     val geotrellisKvToGeoWaveKv: Iterable[(K, V)] => Iterable[(Key, Value)] = { pairs =>
       {
         val gwMetadata = new java.util.HashMap[String, String](); gwMetadata.put("cellType", cellType)
-        configOptions.put(
-          GeoWaveStoreFinder.STORE_HINT_OPTION.getName(),
-          "accumulo"
-        )
 
         /* Produce mosaic from all of the tiles in this partition */
         val sources = new java.util.ArrayList(pairs.map(geotrellisKvToGeotools))

diff --git a/project/Version.scala b/project/Version.scala
@@ -17,7 +17,7 @@
 object Version {
   val geotrellis  = "1.0.0" + Environment.versionSuffix
   val scala       = "2.11.8"
-  val geotools    = "14.4"
+  val geotools    = "16.0"
   val akka        = "2.4.10"
   val spray       = "1.3.3"
   val sprayJson   = "1.3.2"