Skip to content

Commit

Permalink
Merge branch 'sedona-master' into develop_Nilesh_1.4.0
Browse files Browse the repository at this point in the history
# Conflicts:
#	common/src/main/java/org/apache/sedona/common/Functions.java
#	common/src/test/java/org/apache/sedona/common/FunctionsTest.java
#	flink/src/main/java/org/apache/sedona/flink/Catalog.java
#	flink/src/main/java/org/apache/sedona/flink/expressions/Functions.java
#	flink/src/test/java/org/apache/sedona/flink/FunctionTest.java
#	python/sedona/sql/st_functions.py
#	python/tests/sql/test_function.py
#	sql/common/src/main/scala/org/apache/sedona/sql/UDF/Catalog.scala
#	sql/common/src/main/scala/org/apache/spark/sql/sedona_sql/expressions/Functions.scala
#	sql/common/src/main/scala/org/apache/spark/sql/sedona_sql/expressions/st_functions.scala
#	sql/common/src/test/scala/org/apache/sedona/sql/dataFrameAPITestScala.scala
#	sql/common/src/test/scala/org/apache/sedona/sql/functionTestScala.scala
  • Loading branch information
iGN5117 committed Jun 9, 2023
2 parents 0d68337 + 7910dc3 commit d1e4365
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions python/tests/sql/test_dataframe_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@
(stf.ST_YMax, ("geom",), "triangle_geom", "", 1.0),
(stf.ST_YMin, ("geom",), "triangle_geom", "", 0.0),
(stf.ST_Z, ("b",), "two_points", "", 4.0),
(stf.ST_NumPoints, ("line",), "linestring_geom", "", 6),

# predicates
(stp.ST_Contains, ("geom", lambda: f.expr("ST_Point(0.5, 0.25)")), "triangle_geom", "", True),
Expand Down

0 comments on commit d1e4365

Please sign in to comment.