Hull Index suffers the same issues

locationtech · Feb 29, 2016 · 594f45e · 594f45e
1 parent 6cec8d7
commit 594f45e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/...n/java/mil/nga/giat/geowave/analytic/mapreduce/clustering/runner/ConvexHullJobRunner.java b/...n/java/mil/nga/giat/geowave/analytic/mapreduce/clustering/runner/ConvexHullJobRunner.java
@@ -18,6 +18,7 @@
 import mil.nga.giat.geowave.analytic.param.MapReduceParameters;
 import mil.nga.giat.geowave.analytic.param.ParameterEnum;
 import mil.nga.giat.geowave.analytic.param.StoreParameters;
+import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider;
 import mil.nga.giat.geowave.mapreduce.input.GeoWaveInputKey;
 import mil.nga.giat.geowave.mapreduce.output.GeoWaveOutputKey;
 
@@ -75,7 +76,8 @@ public int run(
 				new ParameterEnum<?>[] {
 					HullParameters.Hull.WRAPPER_FACTORY_CLASS,
 					HullParameters.Hull.PROJECTION_CLASS,
-					HullParameters.Hull.DATA_TYPE_ID
+					HullParameters.Hull.DATA_TYPE_ID,
+					HullParameters.Hull.INDEX_ID
 				},
 				config,
 				getScope());
@@ -109,7 +111,7 @@ public int run(
 		checkIndex(
 				runTimeProperties,
 				HullParameters.Hull.INDEX_ID,
-				"hull_idx");
+				new SpatialDimensionalityTypeProvider().createPrimaryIndex().getId().getString());
 		return super.run(
 				config,
 				runTimeProperties);

diff --git a/.../mil/nga/giat/geowave/analytic/mapreduce/clustering/runner/GeoWaveInputLoadJobRunner.java b/.../mil/nga/giat/geowave/analytic/mapreduce/clustering/runner/GeoWaveInputLoadJobRunner.java
@@ -14,6 +14,7 @@
 import mil.nga.giat.geowave.analytic.param.MapReduceParameters;
 import mil.nga.giat.geowave.analytic.param.OutputParameters;
 import mil.nga.giat.geowave.analytic.param.ParameterEnum;
+import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider;
 import mil.nga.giat.geowave.mapreduce.input.GeoWaveInputKey;
 import mil.nga.giat.geowave.mapreduce.output.GeoWaveOutputKey;
 
@@ -73,7 +74,7 @@ public int run(
 				OutputParameters.Output.INDEX_ID,
 				runTimeProperties.getPropertyAsString(
 						CentroidParameters.Centroid.INDEX_ID,
-						"hull_idx"));
+						new SpatialDimensionalityTypeProvider().createPrimaryIndex().getId().getString()));
 		OutputParameters.Output.INDEX_ID.getHelper().setValue(
 				config,
 				getScope(),

diff --git a/test/src/test/java/mil/nga/giat/geowave/test/mapreduce/DBScanIT.java b/test/src/test/java/mil/nga/giat/geowave/test/mapreduce/DBScanIT.java
@@ -48,6 +48,7 @@
 import mil.nga.giat.geowave.core.cli.DataStoreCommandLineOptions;
 import mil.nga.giat.geowave.core.cli.GenericStoreCommandLineOptions;
 import mil.nga.giat.geowave.core.cli.IndexStoreCommandLineOptions;
+import mil.nga.giat.geowave.core.geotime.ingest.SpatialDimensionalityTypeProvider;
 import mil.nga.giat.geowave.core.geotime.store.query.SpatialQuery;
 import mil.nga.giat.geowave.core.store.DataStore;
 import mil.nga.giat.geowave.core.store.adapter.AdapterStore;
@@ -198,7 +199,7 @@ private int readHulls(
 				adapterStore,
 				new SimpleFeatureItemWrapperFactory(),
 				"concave_hull",
-				"hull_idx",
+				new SpatialDimensionalityTypeProvider().createPrimaryIndex().getId().getString(),
 				"bx5",
 				0);