This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sedona.git
The following commit(s) were added to refs/heads/master by this push:
new eb043a37a [SEDONA-623] Simplify Java `if` statements (#1516)
eb043a37a is described below
commit eb043a37ab34c3f6e143362d8b75e3d61eb2ccdf
Author: John Bampton <[email protected]>
AuthorDate: Wed Jul 10 03:07:26 2024 +1000
[SEDONA-623] Simplify Java `if` statements (#1516)
---
.../apache/sedona/core/rangeJudgement/RangeFilterUsingIndex.java | 2 +-
.../java/org/apache/sedona/core/spatialOperator/RangeQuery.java | 2 +-
.../main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java | 2 +-
.../src/main/java/org/apache/sedona/viz/core/GlobalParameter.java | 2 +-
.../java/org/apache/sedona/viz/core/RasterOverlayOperator.java | 8 ++++----
.../java/org/apache/sedona/viz/core/VectorOverlayOperator.java | 4 ++--
.../java/org/apache/sedona/viz/core/VisualizationOperator.java | 8 ++++----
7 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/rangeJudgement/RangeFilterUsingIndex.java
b/spark/common/src/main/java/org/apache/sedona/core/rangeJudgement/RangeFilterUsingIndex.java
index e4596680d..a1eda4f41 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/rangeJudgement/RangeFilterUsingIndex.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/rangeJudgement/RangeFilterUsingIndex.java
@@ -52,7 +52,7 @@ public class RangeFilterUsingIndex<U extends Geometry, T
extends Geometry> exten
*/
@Override
public Iterator<T> call(Iterator<SpatialIndex> treeIndexes) throws Exception
{
- assert treeIndexes.hasNext() == true;
+ assert treeIndexes.hasNext();
SpatialIndex treeIndex = treeIndexes.next();
List<T> results = new ArrayList<T>();
List<T> tempResults =
treeIndex.query(this.queryGeometry.getEnvelopeInternal());
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/spatialOperator/RangeQuery.java
b/spark/common/src/main/java/org/apache/sedona/core/spatialOperator/RangeQuery.java
index eaa4a27e1..6a0aaa54e 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/spatialOperator/RangeQuery.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/spatialOperator/RangeQuery.java
@@ -62,7 +62,7 @@ public class RangeQuery implements Serializable {
spatialRDD.getTargetEpgsgCode());
}
- if (useIndex == true) {
+ if (useIndex) {
if (spatialRDD.indexedRawRDD == null) {
throw new Exception(
"[RangeQuery][SpatialRangeQuery] Index doesn't exist. Please build
index on rawSpatialRDD.");
diff --git
a/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
b/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
index abed15612..bd386c353 100644
---
a/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
+++
b/spark/common/src/main/java/org/apache/sedona/core/spatialRDD/SpatialRDD.java
@@ -342,7 +342,7 @@ public class SpatialRDD<T extends Geometry> implements
Serializable {
*/
public void buildIndex(final IndexType indexType, boolean
buildIndexOnSpatialPartitionedRDD)
throws Exception {
- if (buildIndexOnSpatialPartitionedRDD == false) {
+ if (!buildIndexOnSpatialPartitionedRDD) {
// This index is built on top of unpartitioned SRDD
this.indexedRawRDD = this.rawSpatialRDD.mapPartitions(new
IndexBuilder(indexType));
} else {
diff --git
a/spark/common/src/main/java/org/apache/sedona/viz/core/GlobalParameter.java
b/spark/common/src/main/java/org/apache/sedona/viz/core/GlobalParameter.java
index 722c9fdba..010aa6d9a 100644
--- a/spark/common/src/main/java/org/apache/sedona/viz/core/GlobalParameter.java
+++ b/spark/common/src/main/java/org/apache/sedona/viz/core/GlobalParameter.java
@@ -260,7 +260,7 @@ public class GlobalParameter implements Serializable {
private boolean updateIndirectParameters() {
this.partitionsOnSingleAxis = (int) Math.sqrt(Math.pow(4,
this.minTreeLevel));
- if (this.useUserSuppliedResolution == false) {
+ if (!this.useUserSuppliedResolution) {
this.partitionIntervalX = 256;
this.partitionIntervalY = 256;
this.resolutionX = partitionsOnSingleAxis * 256;
diff --git
a/spark/common/src/main/java/org/apache/sedona/viz/core/RasterOverlayOperator.java
b/spark/common/src/main/java/org/apache/sedona/viz/core/RasterOverlayOperator.java
index dff78d91e..99290c378 100644
---
a/spark/common/src/main/java/org/apache/sedona/viz/core/RasterOverlayOperator.java
+++
b/spark/common/src/main/java/org/apache/sedona/viz/core/RasterOverlayOperator.java
@@ -71,7 +71,7 @@ public class RasterOverlayOperator {
public boolean JoinImage(JavaPairRDD<Integer, ImageSerializableWrapper>
distributedFontImage)
throws Exception {
logger.info("[Sedona-Viz][JoinImage][Start]");
- if (this.generateDistributedImage == false) {
+ if (!this.generateDistributedImage) {
throw new Exception(
"[OverlayOperator][JoinImage] The back image is not distributed.
Please don't use distributed format.");
}
@@ -101,11 +101,11 @@ public class RasterOverlayOperator {
imagePair._2._1.iterator();
Iterator<ImageSerializableWrapper> frontImageIterator =
imagePair._2._2.iterator();
- if (backImageIterator.hasNext() == false) {
+ if (!backImageIterator.hasNext()) {
throw new Exception(
"[OverlayOperator][JoinImage] The back image
iterator didn't get any image partitions.");
}
- if (frontImageIterator.hasNext() == false) {
+ if (!frontImageIterator.hasNext()) {
throw new Exception(
"[OverlayOperator][JoinImage] The front image
iterator didn't get any image partitions.");
}
@@ -139,7 +139,7 @@ public class RasterOverlayOperator {
* @throws Exception the exception
*/
public boolean JoinImage(BufferedImage frontRasterImage) throws Exception {
- if (this.generateDistributedImage == true) {
+ if (this.generateDistributedImage) {
throw new Exception(
"[OverlayOperator][JoinImage] The back image is distributed. Please
don't use centralized format.");
}
diff --git
a/spark/common/src/main/java/org/apache/sedona/viz/core/VectorOverlayOperator.java
b/spark/common/src/main/java/org/apache/sedona/viz/core/VectorOverlayOperator.java
index 24d8b7205..5fcd145d8 100644
---
a/spark/common/src/main/java/org/apache/sedona/viz/core/VectorOverlayOperator.java
+++
b/spark/common/src/main/java/org/apache/sedona/viz/core/VectorOverlayOperator.java
@@ -68,7 +68,7 @@ public class VectorOverlayOperator {
*/
public boolean JoinImage(JavaPairRDD<Integer, String> distributedFontImage)
throws Exception {
logger.info("[Sedona-Viz][JoinImage][Start]");
- if (this.generateDistributedImage == false) {
+ if (!this.generateDistributedImage) {
throw new Exception(
"[OverlayOperator][JoinImage] The back image is not distributed.
Please don't use distributed format.");
}
@@ -101,7 +101,7 @@ public class VectorOverlayOperator {
*/
public boolean JoinImage(List<String> frontVectorImage) throws Exception {
logger.info("[Sedona-VizViz][JoinImage][Start]");
- if (this.generateDistributedImage == true) {
+ if (this.generateDistributedImage) {
throw new Exception(
"[OverlayOperator][JoinImage] The back image is distributed. Please
don't use centralized format.");
}
diff --git
a/spark/common/src/main/java/org/apache/sedona/viz/core/VisualizationOperator.java
b/spark/common/src/main/java/org/apache/sedona/viz/core/VisualizationOperator.java
index a7d6beea9..5321fde2c 100644
---
a/spark/common/src/main/java/org/apache/sedona/viz/core/VisualizationOperator.java
+++
b/spark/common/src/main/java/org/apache/sedona/viz/core/VisualizationOperator.java
@@ -314,7 +314,7 @@ public abstract class VisualizationOperator implements
Serializable {
throws Exception {
logger.info("[Sedona-VizViz][ApplyPhotoFilter][Start]");
if (this.parallelPhotoFilter) {
- if (this.hasBeenSpatialPartitioned == false) {
+ if (!this.hasBeenSpatialPartitioned) {
this.spatialPartitioningWithDuplicates();
this.hasBeenSpatialPartitioned = true;
}
@@ -568,8 +568,8 @@ public abstract class VisualizationOperator implements
Serializable {
*/
protected boolean RenderImage(JavaSparkContext sparkContext) throws
Exception {
logger.info("[Sedona-VizViz][RenderImage][Start]");
- if (this.parallelRenderImage == true) {
- if (this.hasBeenSpatialPartitioned == false) {
+ if (this.parallelRenderImage) {
+ if (!this.hasBeenSpatialPartitioned) {
this.spatialPartitioningWithoutDuplicates();
this.hasBeenSpatialPartitioned = true;
}
@@ -618,7 +618,7 @@ public abstract class VisualizationOperator implements
Serializable {
}
});
// logger.debug("[Sedona-VizViz][Render]output count
"+this.distributedRasterImage.count());
- } else if (this.parallelRenderImage == false) {
+ } else if (!this.parallelRenderImage) {
// Draw full size image in parallel
this.distributedRasterImage =
this.distributedRasterColorMatrix.mapPartitionsToPair(
