You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sedona.apache.org by ji...@apache.org on 2023/09/01 07:46:04 UTC
[sedona] 01/01: Fix the bug
This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch bug-fix-base64
in repository https://gitbox.apache.org/repos/asf/sedona.git
commit 9f30d5f8d8dd059cbfe5c4e3a77065170945cc43
Author: Jia Yu <ji...@apache.org>
AuthorDate: Fri Sep 1 00:45:52 2023 -0700
Fix the bug
---
.../raster/{RasterOutputTests.java => RasterOutputTest.java} | 7 ++++---
docs/api/sql/Raster-writer.md | 2 +-
.../src/test/scala/org/apache/sedona/sql/rasteralgebraTest.scala | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/common/src/test/java/org/apache/sedona/common/raster/RasterOutputTests.java b/common/src/test/java/org/apache/sedona/common/raster/RasterOutputTest.java
similarity index 80%
rename from common/src/test/java/org/apache/sedona/common/raster/RasterOutputTests.java
rename to common/src/test/java/org/apache/sedona/common/raster/RasterOutputTest.java
index 72fe6bb4d..a03d9f3f1 100644
--- a/common/src/test/java/org/apache/sedona/common/raster/RasterOutputTests.java
+++ b/common/src/test/java/org/apache/sedona/common/raster/RasterOutputTest.java
@@ -26,13 +26,14 @@ import java.io.IOException;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-public class RasterOutputTests extends RasterTestBase {
+public class RasterOutputTest
+ extends RasterTestBase {
@Test
public void testAsBase64() throws IOException {
- GridCoverage2D raster = rasterFromGeoTiff(resourceFolder + "raster/test1.tiff");
+ GridCoverage2D raster = rasterFromGeoTiff(resourceFolder + "raster/raster_with_no_data/test5.tiff");
String resultRaw = RasterOutputs.asBase64(raster);
- assertTrue(resultRaw.contains("iVBORw0KGgoAAAANSUhEUgAAAgAAAAIFCAAAAACB3hqVAACAAElEQVR42uy9K5fkONil27Bh0oQBAwY1NDQ0NDU0NBQVFBQUFRQUFBQ1NDQ0NTT0PFtR1d/MmR9w1lnrVF8qKysjwtZ72/u9+Z9//v9f/6/96rvB9GPfz8M0jcMS/LJOxm7B2udcXHb5NGGb48rfeDM7s9jZzNO6uiX5aN28zPO62HBE/0Q7LXaa1vh5de/X8PN5r/MW3GSWeZqtd8lmH806O+esNUtI6xiPdfz/wCGZZU12Wv1qbVrn1YRgC3dicsq1zGF/nmePMT5P9ot3LnubSk4peu/K5cKz5BRnO2fr/HDXupdc8l7TlU5X9uPZzqf92mJMewmRbz1PiqkkZ8N9P257/OPXlHnP"));
+ assertTrue(resultRaw.startsWith("iVBORw0KGgoAAAANSUhEUgAABaAAAALQCAMAAABR+ye1AAADAFBMVEXE9/W48vOq7PGa5u6L3"));
}
@Test
diff --git a/docs/api/sql/Raster-writer.md b/docs/api/sql/Raster-writer.md
index 8fda3cf22..2bc0307fa 100644
--- a/docs/api/sql/Raster-writer.md
+++ b/docs/api/sql/Raster-writer.md
@@ -26,7 +26,7 @@ SELECT RS_Base64(raster) from rasters
Output:
```
-data:image/png;base64,iVBORw0KGgoAAAA...
+iVBORw0KGgoAAAA...
```
#### RS_AsGeoTiff
diff --git a/sql/common/src/test/scala/org/apache/sedona/sql/rasteralgebraTest.scala b/sql/common/src/test/scala/org/apache/sedona/sql/rasteralgebraTest.scala
index 0d5fd2219..5bcf618f9 100644
--- a/sql/common/src/test/scala/org/apache/sedona/sql/rasteralgebraTest.scala
+++ b/sql/common/src/test/scala/org/apache/sedona/sql/rasteralgebraTest.scala
@@ -22,7 +22,7 @@ import org.apache.sedona.common.raster.MapAlgebra
import org.apache.sedona.common.utils.RasterUtils
import org.apache.spark.sql.functions.{collect_list, expr}
import org.geotools.coverage.grid.GridCoverage2D
-import org.junit.Assert.{assertEquals, assertNull, assertTrue}
+import org.junit.Assert.{assertEquals, assertNull}
import org.locationtech.jts.geom.{Coordinate, Geometry}
import org.scalatest.{BeforeAndAfter, GivenWhenThen}
@@ -473,7 +473,7 @@ class rasteralgebraTest extends TestBaseScala with BeforeAndAfter with GivenWhen
it("Passed RS_Base64") {
val df = sparkSession.read.format("binaryFile").load(resourceFolder + "raster/raster_with_no_data/test5.tiff")
val resultRaw = df.selectExpr("RS_Base64(RS_FromGeoTiff(content)) as raster").first().getString(0)
- assert(resultRaw.contains("""iVBORw0KGgoAAAANSUhEUgAABaAAAALQCAMAAABR+ye1AAADAFBMVEXE9/W48vOq7PGa5u6L3+t52Odn0eVVyOJDwN4yudsisdgUqtUKpNQCn9ICnNICmdICl9ICldICk9ICkNICjtICjNICitICidIChtIChN"""))
+ assert(resultRaw.startsWith("iVBORw0KGgoAAAANSUhEUgAABaAAAALQCAMAAABR+ye1AAADAFBMVEXE9/W48vOq7PGa5u6L3"))
}
it("Passed RS_AsArcGrid") {