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 2021/12/01 11:12:15 UTC
[incubator-sedona] branch master updated: [DOCS] Upgrade Sedona version in Example projects to 1.1.1-incubating (#567)
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/incubator-sedona.git
The following commit(s) were added to refs/heads/master by this push:
new 41d531f [DOCS] Upgrade Sedona version in Example projects to 1.1.1-incubating (#567)
41d531f is described below
commit 41d531fabd9932ac4e6a494c06ccc08ba0623e29
Author: Jia Yu <ji...@apache.org>
AuthorDate: Wed Dec 1 03:12:07 2021 -0800
[DOCS] Upgrade Sedona version in Example projects to 1.1.1-incubating (#567)
---
examples/rdd-colocation-mining/build.sbt | 2 +-
examples/sql/build.sbt | 2 +-
examples/sql/src/main/scala/ScalaExample.scala | 11 +++++++++++
examples/sql/src/test/resources/raster/test1.tiff | Bin 0 -> 174803 bytes
examples/sql/src/test/resources/raster/test2.tiff | Bin 0 -> 174803 bytes
examples/viz/build.sbt | 2 +-
6 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/examples/rdd-colocation-mining/build.sbt b/examples/rdd-colocation-mining/build.sbt
index e054f2f..e4c8880 100644
--- a/examples/rdd-colocation-mining/build.sbt
+++ b/examples/rdd-colocation-mining/build.sbt
@@ -74,7 +74,7 @@ libraryDependencies ++= Seq(
assemblyMergeStrategy in assembly := {
case PathList("org.apache.sedona", "sedona-core", xs@_*) => MergeStrategy.first
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
- case "META-INF/services" => MergeStrategy.last
+ case PathList("META-INF","services",xs @ _*) => MergeStrategy.filterDistinctLines
case path if path.endsWith(".SF") => MergeStrategy.discard
case path if path.endsWith(".DSA") => MergeStrategy.discard
case path if path.endsWith(".RSA") => MergeStrategy.discard
diff --git a/examples/sql/build.sbt b/examples/sql/build.sbt
index f78d5e3..fcd440b 100644
--- a/examples/sql/build.sbt
+++ b/examples/sql/build.sbt
@@ -73,7 +73,7 @@ libraryDependencies ++= Seq(
assemblyMergeStrategy in assembly := {
case PathList("org.apache.sedona", "sedona-core", xs@_*) => MergeStrategy.first
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
- case "META-INF/services" => MergeStrategy.last
+ case PathList("META-INF","services",xs @ _*) => MergeStrategy.filterDistinctLines
case path if path.endsWith(".SF") => MergeStrategy.discard
case path if path.endsWith(".DSA") => MergeStrategy.discard
case path if path.endsWith(".RSA") => MergeStrategy.discard
diff --git a/examples/sql/src/main/scala/ScalaExample.scala b/examples/sql/src/main/scala/ScalaExample.scala
index ae8fc86..362d611 100644
--- a/examples/sql/src/main/scala/ScalaExample.scala
+++ b/examples/sql/src/main/scala/ScalaExample.scala
@@ -45,11 +45,13 @@ object ScalaExample extends App{
val csvPolygonInputLocation = resourceFolder + "testenvelope.csv"
val csvPointInputLocation = resourceFolder + "testpoint.csv"
val shapefileInputLocation = resourceFolder + "shapefiles/dbf"
+ val rasterdatalocation = resourceFolder + "raster/"
testPredicatePushdownAndRangeJonQuery()
testDistanceJoinQuery()
testAggregateFunction()
testShapefileConstructor()
+ testRasterIOAndMapAlgebra()
System.out.println("All SedonaSQL DEMOs passed!")
@@ -139,4 +141,13 @@ object ScalaExample extends App{
spatialDf.show()
spatialDf.printSchema()
}
+
+ def testRasterIOAndMapAlgebra(): Unit = {
+ var df = sparkSession.read.format("geotiff").option("dropInvalid", true).load(rasterdatalocation)
+ df.printSchema()
+ df.selectExpr("image.origin as origin","ST_GeomFromWkt(image.wkt) as Geom", "image.height as height", "image.width as width", "image.data as data", "image.nBands as numBands").show()
+ df = df.selectExpr(" image.data as data", "image.nBands as numBands")
+ df = df.selectExpr("RS_GetBand(data, 1, numBands) as targetBand")
+ df.selectExpr("RS_MultiplyFactor(targetBand, 3) as multiply").show()
+ }
}
\ No newline at end of file
diff --git a/examples/sql/src/test/resources/raster/test1.tiff b/examples/sql/src/test/resources/raster/test1.tiff
new file mode 100644
index 0000000..bebd682
Binary files /dev/null and b/examples/sql/src/test/resources/raster/test1.tiff differ
diff --git a/examples/sql/src/test/resources/raster/test2.tiff b/examples/sql/src/test/resources/raster/test2.tiff
new file mode 100644
index 0000000..bebd682
Binary files /dev/null and b/examples/sql/src/test/resources/raster/test2.tiff differ
diff --git a/examples/viz/build.sbt b/examples/viz/build.sbt
index 734d228..7df481a 100644
--- a/examples/viz/build.sbt
+++ b/examples/viz/build.sbt
@@ -75,7 +75,7 @@ libraryDependencies ++= Seq(
assemblyMergeStrategy in assembly := {
case PathList("org.apache.sedona", "sedona-core", xs@_*) => MergeStrategy.first
case PathList("META-INF", "MANIFEST.MF") => MergeStrategy.discard
- case "META-INF/services" => MergeStrategy.last
+ case PathList("META-INF","services",xs @ _*) => MergeStrategy.filterDistinctLines
case path if path.endsWith(".SF") => MergeStrategy.discard
case path if path.endsWith(".DSA") => MergeStrategy.discard
case path if path.endsWith(".RSA") => MergeStrategy.discard