This is an automated email from the ASF dual-hosted git repository. jiayu pushed a commit to branch fix-lonlat-order in repository https://gitbox.apache.org/repos/asf/sedona.git
commit a7a30a2d0416ff3599cbb51ecc8ecb48bd0d29af Author: Jia Yu <[email protected]> AuthorDate: Tue Aug 8 11:45:15 2023 -0700 Fix a bunch of failed test cases --- .../scala/org/apache/sedona/sql/adapterTestScala.scala | 3 +-- .../main/java/org/apache/sedona/viz/showcase/Example.java | 14 +++++++------- .../org/apache/sedona/viz/showcase/ScalaExample.scala | 12 ++++++------ .../test/java/org/apache/sedona/viz/ChoroplethmapTest.java | 8 ++++---- viz/src/test/java/org/apache/sedona/viz/HeatmapTest.java | 8 ++++---- .../org/apache/sedona/viz/ParallelVisualizationTest.java | 10 +++++----- .../test/java/org/apache/sedona/viz/ScatterplotTest.java | 12 ++++++------ .../test/scala/org/apache/sedona/viz/rdd/scalaTest.scala | 14 +++++++------- 8 files changed, 40 insertions(+), 41 deletions(-) diff --git a/sql/common/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala b/sql/common/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala index 2fb58a82..76132c7b 100644 --- a/sql/common/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala +++ b/sql/common/src/test/scala/org/apache/sedona/sql/adapterTestScala.scala @@ -28,7 +28,6 @@ import org.apache.sedona.core.spatialRDD.{CircleRDD, PointRDD, PolygonRDD} import org.apache.sedona.sql.utils.Adapter import org.apache.spark.sql.sedona_sql.UDT.GeometryUDT import org.apache.spark.sql.types._ -import org.apache.spark.storage.StorageLevel import org.locationtech.jts.geom.Point import org.scalatest.GivenWhenThen @@ -195,7 +194,7 @@ class adapterTestScala extends TestBaseScala with GivenWhenThen{ val urlPrefix = resourceFolder + "modis/" val HDFDataVariableList:Array[String] = Array("LST", "QC", "Error_LST", "Emis_31", "Emis_32") val earthdataHDFPoint = new EarthdataHDFPointMapper(HDFincrement, HDFoffset, HDFrootGroupName, HDFDataVariableList, HDFDataVariableName, urlPrefix) - val spatialRDD = new PointRDD(sparkSession.sparkContext, InputLocation, numPartitions, earthdataHDFPoint, StorageLevel.MEMORY_ONLY) + val spatialRDD = new PointRDD(sparkSession.sparkContext, InputLocation, numPartitions, earthdataHDFPoint) import scala.jdk.CollectionConverters._ spatialRDD.fieldNames = HDFDataVariableList.dropRight(4).toList.asJava val spatialDf = Adapter.toDf(spatialRDD, sparkSession) diff --git a/viz/src/main/java/org/apache/sedona/viz/showcase/Example.java b/viz/src/main/java/org/apache/sedona/viz/showcase/Example.java index 990129cc..11cdec33 100644 --- a/viz/src/main/java/org/apache/sedona/viz/showcase/Example.java +++ b/viz/src/main/java/org/apache/sedona/viz/showcase/Example.java @@ -206,7 +206,7 @@ public class Example public static boolean buildScatterPlot(String outputPath) { try { - PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY()); + PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions); ScatterPlot visualizationOperator = new ScatterPlot(1000, 600, USMainLandBoundary, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.GREEN, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -241,7 +241,7 @@ public class Example public static boolean buildHeatMap(String outputPath) { try { - RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); HeatMap visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2); visualizationOperator.Visualize(sparkContext, spatialRDD); SedonaVizImageGenerator imageGenerator = new SedonaVizImageGenerator(); @@ -263,8 +263,8 @@ public class Example public static boolean buildChoroplethMap(String outputPath) { try { - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); - PolygonRDD queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); + PolygonRDD queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions); spatialRDD.spatialPartitioning(GridType.KDBTREE); queryRDD.spatialPartitioning(spatialRDD.getPartitioner()); spatialRDD.buildIndex(IndexType.RTREE, true); @@ -300,7 +300,7 @@ public class Example public static boolean parallelFilterRenderNoStitch(String outputPath) { try { - RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); HeatMap visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2, 4, 4, true, true); visualizationOperator.Visualize(sparkContext, spatialRDD); SedonaVizImageGenerator imageGenerator = new SedonaVizImageGenerator(); @@ -322,7 +322,7 @@ public class Example public static boolean parallelFilterRenderStitch(String outputPath) { try { - RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); HeatMap visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2, 4, 4, true, true); visualizationOperator.Visualize(sparkContext, spatialRDD); ImageGenerator imageGenerator = new ImageGenerator(); @@ -348,7 +348,7 @@ public class Example try { EarthdataHDFPointMapper earthdataHDFPoint = new EarthdataHDFPointMapper(HDFIncrement, HDFOffset, HDFRootGroupName, HDFDataVariableList, HDFDataVariableName, HDFswitchXY, urlPrefix); - PointRDD spatialRDD = new PointRDD(sparkContext, earthdataInputLocation, earthdataNumPartitions, earthdataHDFPoint, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, earthdataInputLocation, earthdataNumPartitions, earthdataHDFPoint); ScatterPlot visualizationOperator = new ScatterPlot(1000, 600, spatialRDD.boundaryEnvelope, ColorizeOption.EARTHOBSERVATION, false, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.BLUE, true); visualizationOperator.Visualize(sparkContext, spatialRDD); diff --git a/viz/src/main/scala/org/apache/sedona/viz/showcase/ScalaExample.scala b/viz/src/main/scala/org/apache/sedona/viz/showcase/ScalaExample.scala index f159474f..f88bf6af 100644 --- a/viz/src/main/scala/org/apache/sedona/viz/showcase/ScalaExample.scala +++ b/viz/src/main/scala/org/apache/sedona/viz/showcase/ScalaExample.scala @@ -126,7 +126,7 @@ object ScalaExample extends App { * @return true, if successful */ def buildHeatMap(outputPath: String): Boolean = { - val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions) val visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2) visualizationOperator.Visualize(sparkContext, spatialRDD) val imageGenerator = new ImageGenerator @@ -141,8 +141,8 @@ object ScalaExample extends App { * @return true, if successful */ def buildChoroplethMap(outputPath: String): Boolean = { - val spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY) - val queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions) + val queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions) spatialRDD.spatialPartitioning(GridType.KDBTREE) queryRDD.spatialPartitioning(spatialRDD.getPartitioner) spatialRDD.buildIndex(IndexType.RTREE, true) @@ -167,7 +167,7 @@ object ScalaExample extends App { * @return true, if successful */ def parallelFilterRenderNoStitch(outputPath: String): Boolean = { - val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions) val visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2, 4, 4, true, true) visualizationOperator.Visualize(sparkContext, spatialRDD) val imageGenerator = new ImageGenerator @@ -182,7 +182,7 @@ object ScalaExample extends App { * @return true, if successful */ def parallelFilterRenderStitch(outputPath: String): Boolean = { - val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions) val visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2, 4, 4, true, true) visualizationOperator.Visualize(sparkContext, spatialRDD) val imageGenerator = new ImageGenerator @@ -193,7 +193,7 @@ object ScalaExample extends App { def earthdataVisualization(outputPath: String): Boolean = { val earthdataHDFPoint = new EarthdataHDFPointMapper(HDFIncrement, HDFOffset, HDFRootGroupName, HDFDataVariableList, HDFDataVariableName, HDFswitchXY, urlPrefix) - val spatialRDD = new PointRDD(sparkContext, earthdataInputLocation, earthdataNumPartitions, earthdataHDFPoint, StorageLevel.MEMORY_ONLY) + val spatialRDD = new PointRDD(sparkContext, earthdataInputLocation, earthdataNumPartitions, earthdataHDFPoint) val visualizationOperator = new ScatterPlot(1000, 600, spatialRDD.boundaryEnvelope, ColorizeOption.EARTHOBSERVATION, false, false) visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.BLUE, true) visualizationOperator.Visualize(sparkContext, spatialRDD) diff --git a/viz/src/test/java/org/apache/sedona/viz/ChoroplethmapTest.java b/viz/src/test/java/org/apache/sedona/viz/ChoroplethmapTest.java index 812d2fea..eb176417 100644 --- a/viz/src/test/java/org/apache/sedona/viz/ChoroplethmapTest.java +++ b/viz/src/test/java/org/apache/sedona/viz/ChoroplethmapTest.java @@ -53,8 +53,8 @@ public class ChoroplethmapTest public void testRectangleRDDVisualization() throws Exception { - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); - RectangleRDD queryRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); + RectangleRDD queryRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); spatialRDD.spatialPartitioning(GridType.KDBTREE); queryRDD.spatialPartitioning(spatialRDD.getPartitioner()); spatialRDD.buildIndex(IndexType.RTREE, true); @@ -85,8 +85,8 @@ public class ChoroplethmapTest throws Exception { //UserSuppliedPolygonMapper userSuppliedPolygonMapper = new UserSuppliedPolygonMapper(); - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); - PolygonRDD queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); + PolygonRDD queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions); spatialRDD.spatialPartitioning(GridType.KDBTREE); queryRDD.spatialPartitioning(spatialRDD.getPartitioner()); spatialRDD.buildIndex(IndexType.RTREE, true); diff --git a/viz/src/test/java/org/apache/sedona/viz/HeatmapTest.java b/viz/src/test/java/org/apache/sedona/viz/HeatmapTest.java index 7f62e799..cc540b38 100644 --- a/viz/src/test/java/org/apache/sedona/viz/HeatmapTest.java +++ b/viz/src/test/java/org/apache/sedona/viz/HeatmapTest.java @@ -47,7 +47,7 @@ public class HeatmapTest public void testPointRDDVisualization() throws Exception { - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); HeatMap visualizationOperator = new HeatMap(800, 500, USMainLandBoundary, false, 3); visualizationOperator.Visualize(sparkContext, spatialRDD); ImageGenerator imageGenerator = new ImageGenerator(); @@ -63,7 +63,7 @@ public class HeatmapTest public void testRectangleRDDVisualization() throws Exception { - RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); HeatMap visualizationOperator = new HeatMap(800, 500, USMainLandBoundary, false, 2, 4, 4, false, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -82,7 +82,7 @@ public class HeatmapTest throws Exception { //UserSuppliedPolygonMapper userSuppliedPolygonMapper = new UserSuppliedPolygonMapper(); - PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY()); + PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions); HeatMap visualizationOperator = new HeatMap(800, 500, USMainLandBoundary, false, 2); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -99,7 +99,7 @@ public class HeatmapTest public void testLineStringRDDVisualization() throws Exception { - LineStringRDD spatialRDD = new LineStringRDD(sparkContext, LineStringInputLocation, LineStringSplitter, false, LineStringNumPartitions, StorageLevel.MEMORY_ONLY()); + LineStringRDD spatialRDD = new LineStringRDD(sparkContext, LineStringInputLocation, LineStringSplitter, false, LineStringNumPartitions); HeatMap visualizationOperator = new HeatMap(800, 500, USMainLandBoundary, false, 2); visualizationOperator.Visualize(sparkContext, spatialRDD); diff --git a/viz/src/test/java/org/apache/sedona/viz/ParallelVisualizationTest.java b/viz/src/test/java/org/apache/sedona/viz/ParallelVisualizationTest.java index a37fc395..1892279c 100644 --- a/viz/src/test/java/org/apache/sedona/viz/ParallelVisualizationTest.java +++ b/viz/src/test/java/org/apache/sedona/viz/ParallelVisualizationTest.java @@ -67,7 +67,7 @@ public class ParallelVisualizationTest public void testPointRDDVisualization() throws Exception { - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); HeatMap visualizationOperator = new HeatMap(resolutionX, resolutionY, USMainLandBoundary, false, 2, partitionX, partitionY, true, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -85,7 +85,7 @@ public class ParallelVisualizationTest public void testRectangleRDDVisualizationWithTiles() throws Exception { - RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); HeatMap visualizationOperator = new HeatMap(resolutionX, resolutionY, USMainLandBoundary, false, 2, partitionX, partitionY, true, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -103,7 +103,7 @@ public class ParallelVisualizationTest public void testRectangleRDDVisualizationNoTiles() throws Exception { - RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); HeatMap visualizationOperator = new HeatMap(resolutionX, resolutionY, USMainLandBoundary, false, 5, partitionX, partitionY, true, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -122,7 +122,7 @@ public class ParallelVisualizationTest throws Exception { //UserSuppliedPolygonMapper userSuppliedPolygonMapper = new UserSuppliedPolygonMapper(); - PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY()); + PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions); HeatMap visualizationOperator = new HeatMap(resolutionX, resolutionY, USMainLandBoundary, false, 2, partitionX, partitionY, true, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -140,7 +140,7 @@ public class ParallelVisualizationTest public void testLineStringRDDVisualization() throws Exception { - LineStringRDD spatialRDD = new LineStringRDD(sparkContext, LineStringInputLocation, LineStringSplitter, false, LineStringNumPartitions, StorageLevel.MEMORY_ONLY()); + LineStringRDD spatialRDD = new LineStringRDD(sparkContext, LineStringInputLocation, LineStringSplitter, false, LineStringNumPartitions); HeatMap visualizationOperator = new HeatMap(resolutionX, resolutionY, USMainLandBoundary, false, 2, partitionX, partitionY, true, true); visualizationOperator.Visualize(sparkContext, spatialRDD); diff --git a/viz/src/test/java/org/apache/sedona/viz/ScatterplotTest.java b/viz/src/test/java/org/apache/sedona/viz/ScatterplotTest.java index cbc0de94..2bf9179c 100644 --- a/viz/src/test/java/org/apache/sedona/viz/ScatterplotTest.java +++ b/viz/src/test/java/org/apache/sedona/viz/ScatterplotTest.java @@ -79,7 +79,7 @@ public class ScatterplotTest public void testPointRDDVisualization() throws Exception { - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); ScatterPlot visualizationOperator = new ScatterPlot(1000, 600, USMainLandBoundary, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.GREEN, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -104,7 +104,7 @@ public class ScatterplotTest public void testPointRDDVisualizationWithParallelRendering() throws Exception { - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); ScatterPlot visualizationOperator = new ScatterPlot(1000, 600, USMainLandBoundary, ColorizeOption.NORMAL, false, 4, 4, true, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.GREEN, true); @@ -124,7 +124,7 @@ public class ScatterplotTest public void testSaveAsDistributedFile() throws Exception { - PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY()); + PointRDD spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions); ScatterPlot visualizationOperator = new ScatterPlot(1000, 600, USMainLandBoundary, false, 2, 2, true, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.GREEN, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -152,7 +152,7 @@ public class ScatterplotTest public void testRectangleRDDVisualization() throws Exception { - RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY()); + RectangleRDD spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions); ScatterPlot visualizationOperator = new ScatterPlot(1000, 600, USMainLandBoundary, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.RED, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -178,7 +178,7 @@ public class ScatterplotTest throws Exception { //UserSuppliedPolygonMapper userSuppliedPolygonMapper = new UserSuppliedPolygonMapper(); - PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY()); + PolygonRDD spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions); ScatterPlot visualizationOperator = new ScatterPlot(1000, 600, USMainLandBoundary, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.GREEN, true); visualizationOperator.Visualize(sparkContext, spatialRDD); @@ -206,7 +206,7 @@ public class ScatterplotTest int resolutionY = 800; int resolutionX = RasterizationUtils.GetWidthFromHeight(resolutionY, USMainLandBoundary); //UserSuppliedLineStringMapper userSuppliedLineStringMapper = new UserSuppliedLineStringMapper(); - LineStringRDD spatialRDD = new LineStringRDD(sparkContext, LineStringInputLocation, LineStringSplitter, false, LineStringNumPartitions, StorageLevel.MEMORY_ONLY()); + LineStringRDD spatialRDD = new LineStringRDD(sparkContext, LineStringInputLocation, LineStringSplitter, false, LineStringNumPartitions); ScatterPlot visualizationOperator = new ScatterPlot(resolutionX, resolutionY, USMainLandBoundary, false); visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.GREEN, true); visualizationOperator.Visualize(sparkContext, spatialRDD); diff --git a/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala b/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala index 12d248bb..e417718a 100644 --- a/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala +++ b/viz/src/test/scala/org/apache/sedona/viz/rdd/scalaTest.scala @@ -97,7 +97,7 @@ class scalaTest extends FunSpec with BeforeAndAfterAll{ describe("SedonaViz in Scala") { it("should pass scatter plot") { - val spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions) var visualizationOperator = new ScatterPlot(1000, 600, USMainLandBoundary, false) visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.GREEN, true) visualizationOperator.Visualize(sparkContext, spatialRDD) @@ -119,7 +119,7 @@ class scalaTest extends FunSpec with BeforeAndAfterAll{ } it("should pass heat map") { - val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions) val visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2) visualizationOperator.Visualize(sparkContext, spatialRDD) val imageGenerator = new ImageGenerator @@ -128,8 +128,8 @@ class scalaTest extends FunSpec with BeforeAndAfterAll{ } it("should pass choropleth map") { - val spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions, StorageLevel.MEMORY_ONLY) - val queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new PointRDD(sparkContext, PointInputLocation, PointOffset, PointSplitter, false, PointNumPartitions) + val queryRDD = new PolygonRDD(sparkContext, PolygonInputLocation, PolygonSplitter, false, PolygonNumPartitions) spatialRDD.spatialPartitioning(GridType.KDBTREE) queryRDD.spatialPartitioning(spatialRDD.getPartitioner) spatialRDD.buildIndex(IndexType.RTREE, true) @@ -148,7 +148,7 @@ class scalaTest extends FunSpec with BeforeAndAfterAll{ } it("should pass parallel filtering and rendering without stitching image tiles") { - val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions) val visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2, 4, 4, true, true) visualizationOperator.Visualize(sparkContext, spatialRDD) val imageGenerator = new ImageGenerator @@ -157,7 +157,7 @@ class scalaTest extends FunSpec with BeforeAndAfterAll{ } it("should pass parallel filtering and rendering with stitching image tiles") { - val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions, StorageLevel.MEMORY_ONLY) + val spatialRDD = new RectangleRDD(sparkContext, RectangleInputLocation, RectangleSplitter, false, RectangleNumPartitions) val visualizationOperator = new HeatMap(1000, 600, USMainLandBoundary, false, 2, 4, 4, true, true) visualizationOperator.Visualize(sparkContext, spatialRDD) val imageGenerator = new ImageGenerator @@ -169,7 +169,7 @@ class scalaTest extends FunSpec with BeforeAndAfterAll{ ignore("should pass earth data hdf scatter plot") { val earthdataHDFPoint = new EarthdataHDFPointMapper(HDFIncrement, HDFOffset, HDFRootGroupName, HDFDataVariableList, HDFDataVariableName, HDFswitchXY, urlPrefix) - val spatialRDD = new PointRDD(sparkContext, earthdataInputLocation, earthdataNumPartitions, earthdataHDFPoint, StorageLevel.MEMORY_ONLY) + val spatialRDD = new PointRDD(sparkContext, earthdataInputLocation, earthdataNumPartitions, earthdataHDFPoint) val visualizationOperator = new ScatterPlot(1000, 600, spatialRDD.boundaryEnvelope, ColorizeOption.EARTHOBSERVATION, false, false) visualizationOperator.CustomizeColor(255, 255, 255, 255, Color.BLUE, true) visualizationOperator.Visualize(sparkContext, spatialRDD)
