This is an automated email from the ASF dual-hosted git repository.
jiayu pushed a commit to branch release-1.4.0
in repository https://gitbox.apache.org/repos/asf/sedona.git
The following commit(s) were added to refs/heads/release-1.4.0 by this push:
new 66c90430 Update jupyter notebooks
66c90430 is described below
commit 66c904302cd7fd0b01e4be244a0f36e81623a2f2
Author: Jia Yu <[email protected]>
AuthorDate: Sun Mar 19 19:19:18 2023 -0700
Update jupyter notebooks
---
binder/ApacheSedonaCore.ipynb | 10 +++-------
binder/ApacheSedonaRaster.ipynb | 2 +-
binder/ApacheSedonaSQL.ipynb | 3 +--
binder/ApacheSedonaSQL_SpatialJoin_AirportsPerCountry.ipynb | 6 ++----
binder/Pipfile | 4 ++--
binder/postBuild | 6 +++---
binder/start | 2 +-
7 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/binder/ApacheSedonaCore.ipynb b/binder/ApacheSedonaCore.ipynb
index 57983a81..d219ee98 100644
--- a/binder/ApacheSedonaCore.ipynb
+++ b/binder/ApacheSedonaCore.ipynb
@@ -75,7 +75,7 @@
" appName(\"Sedona App\").\\\n",
" config(\"spark.serializer\", KryoSerializer.getName).\\\n",
" config(\"spark.kryo.registrator\", SedonaKryoRegistrator.getName)
.\\\n",
- " config(\"spark.jars.packages\",
\"org.apache.sedona:sedona-python-adapter-3.0_2.12:1.1.0-incubating,org.datasyslab:geotools-wrapper:1.1.0-25.2\")
.\\\n",
+ " config(\"spark.jars.packages\",
\"org.apache.sedona:sedona-spark-shaded-3.0_2.12:1.4.0,org.datasyslab:geotools-wrapper:1.4.0-28.2\")
.\\\n",
" getOrCreate()"
]
},
@@ -183,9 +183,7 @@
"outputs": [
{
"data": {
- "image/svg+xml": [
- "<svg xmlns=\"http://www.w3.org/2000/svg\";
xmlns:xlink=\"http://www.w3.org/1999/xlink\"; width=\"100.0\" height=\"100.0\"
viewBox=\"-176.64696132 26.718666680000002 95.20719264000002
48.162659640000015\" preserveAspectRatio=\"xMinYMin meet\"><g
transform=\"matrix(1,0,0,-1,0,101.59999300000001)\"><path fill-rule=\"evenodd\"
fill=\"#66cc99\" stroke=\"#555555\" stroke-width=\"1.9041438528000003\"
opacity=\"0.6\" d=\"M -173.120769,30.244859 L -173.120769,71.355134 L
-84.965961,71.35513 [...]
- ],
+ "image/svg+xml": "<svg xmlns=\"http://www.w3.org/2000/svg\";
xmlns:xlink=\"http://www.w3.org/1999/xlink\"; width=\"100.0\" height=\"100.0\"
viewBox=\"-176.64696132 26.718666680000002 95.20719264000002
48.162659640000015\" preserveAspectRatio=\"xMinYMin meet\"><g
transform=\"matrix(1,0,0,-1,0,101.59999300000001)\"><path fill-rule=\"evenodd\"
fill=\"#66cc99\" stroke=\"#555555\" stroke-width=\"1.9041438528000003\"
opacity=\"0.6\" d=\"M -173.120769,30.244859 L -173.120769,71.355134 L -84 [...]
"text/plain": [
"Envelope(-173.120769, -84.965961, 30.244859, 71.355134)"
]
@@ -229,9 +227,7 @@
"outputs": [
{
"data": {
- "image/svg+xml": [
- "<svg xmlns=\"http://www.w3.org/2000/svg\";
xmlns:xlink=\"http://www.w3.org/1999/xlink\"; width=\"100.0\" height=\"100.0\"
viewBox=\"-176.64696132 26.718666680000002 95.20719264000002
48.162659640000015\" preserveAspectRatio=\"xMinYMin meet\"><g
transform=\"matrix(1,0,0,-1,0,101.59999300000001)\"><path fill-rule=\"evenodd\"
fill=\"#66cc99\" stroke=\"#555555\" stroke-width=\"1.9041438528000003\"
opacity=\"0.6\" d=\"M -173.120769,30.244859 L -173.120769,71.355134 L
-84.965961,71.35513 [...]
- ],
+ "image/svg+xml": "<svg xmlns=\"http://www.w3.org/2000/svg\";
xmlns:xlink=\"http://www.w3.org/1999/xlink\"; width=\"100.0\" height=\"100.0\"
viewBox=\"-176.64696132 26.718666680000002 95.20719264000002
48.162659640000015\" preserveAspectRatio=\"xMinYMin meet\"><g
transform=\"matrix(1,0,0,-1,0,101.59999300000001)\"><path fill-rule=\"evenodd\"
fill=\"#66cc99\" stroke=\"#555555\" stroke-width=\"1.9041438528000003\"
opacity=\"0.6\" d=\"M -173.120769,30.244859 L -173.120769,71.355134 L -84 [...]
"text/plain": [
"Envelope(-173.120769, -84.965961, 30.244859, 71.355134)"
]
diff --git a/binder/ApacheSedonaRaster.ipynb b/binder/ApacheSedonaRaster.ipynb
index 0952c8a6..525e7d6d 100644
--- a/binder/ApacheSedonaRaster.ipynb
+++ b/binder/ApacheSedonaRaster.ipynb
@@ -63,7 +63,7 @@
" appName(\"Demo-app\").\\\n",
" config(\"spark.serializer\", KryoSerializer.getName).\\\n",
" config(\"spark.kryo.registrator\", SedonaKryoRegistrator.getName)
.\\\n",
- " config(\"spark.jars.packages\",
\"org.apache.sedona:sedona-python-adapter-3.0_2.12:1.2.1-incubating,org.datasyslab:geotools-wrapper:1.1.0-25.2\")
.\\\n",
+ " config(\"spark.jars.packages\",
\"org.apache.sedona:sedona-spark-shaded-3.0_2.12:1.4.0,org.datasyslab:geotools-wrapper:1.4.0-28.2\")
.\\\n",
" getOrCreate()\n",
"\n",
"SedonaRegistrator.registerAll(spark)\n",
diff --git a/binder/ApacheSedonaSQL.ipynb b/binder/ApacheSedonaSQL.ipynb
index 6443e0a3..f5ffd914 100644
--- a/binder/ApacheSedonaSQL.ipynb
+++ b/binder/ApacheSedonaSQL.ipynb
@@ -121,8 +121,7 @@
" appName('appName'). \\\n",
" config(\"spark.serializer\", KryoSerializer.getName). \\\n",
" config(\"spark.kryo.registrator\", SedonaKryoRegistrator.getName).
\\\n",
- " config('spark.jars.packages',\n",
- "
'org.apache.sedona:sedona-python-adapter-3.0_2.12:1.1.0-incubating,org.datasyslab:geotools-wrapper:1.1.0-25.2').
\\\n",
+ " config(\"spark.jars.packages\",
\"org.apache.sedona:sedona-spark-shaded-3.0_2.12:1.4.0,org.datasyslab:geotools-wrapper:1.4.0-28.2\")
.\\\n",
" getOrCreate()"
]
},
diff --git a/binder/ApacheSedonaSQL_SpatialJoin_AirportsPerCountry.ipynb
b/binder/ApacheSedonaSQL_SpatialJoin_AirportsPerCountry.ipynb
index 0b6f73b7..119d0c70 100644
--- a/binder/ApacheSedonaSQL_SpatialJoin_AirportsPerCountry.ipynb
+++ b/binder/ApacheSedonaSQL_SpatialJoin_AirportsPerCountry.ipynb
@@ -125,9 +125,7 @@
" appName(\"SedonaSQL-Example\").\\\n",
" config(\"spark.serializer\", KryoSerializer.getName).\\\n",
" config(\"spark.kryo.registrator\", SedonaKryoRegistrator.getName)
.\\\n",
- " config('spark.jars.packages',\n",
- "
'org.apache.sedona:sedona-python-adapter-3.0_2.12:1.1.0-incubating,'\n",
- " 'org.datasyslab:geotools-wrapper:1.1.0-25.2'). \\\n",
+ " config(\"spark.jars.packages\",
\"org.apache.sedona:sedona-spark-shaded-3.0_2.12:1.4.0,org.datasyslab:geotools-wrapper:1.4.0-28.2\")
.\\\n",
" getOrCreate()\n",
"SedonaRegistrator.registerAll(spark)\n",
"sc = spark.sparkContext\n",
@@ -530,7 +528,7 @@
},
{
"data": {
- "image/png":
"iVBORw0KGgoAAAANSUhEUgAAAYwAAACXCAYAAAAGX2ymAAAAOXRFWHRTb2Z0d2FyZQBNYXRwbG90bGliIHZlcnNpb24zLjQuMywgaHR0cHM6Ly9tYXRwbG90bGliLm9yZy/MnkTPAAAACXBIWXMAAAsTAAALEwEAmpwYAABIAElEQVR4nO29eZgsaVng+3sjIpdasvY6+3769N50033obnYQQUDZBgTUUeZeZhgdvep4x7mg4+ijjpfxGa8Pc8dHBYcrOgyIKIjIsMpio9ALvTe9nO4+fZY++zlVp9ZcIt77x/tFLlWZWVlrZtaJ3/PkU5mRGRFfRkV+7/fuoqokJCQkJCQshdfuASQkJCQkdAeJwEhISEhIaIlEYCQkJCQktEQiMBISEhISWiIRGAkJCQkJLRG0ewDVjI2N6b59+9o9jISEhIQ157777juvquP13rtKRGdXcexT8CVVff0qDtES
[...]
+ "image/png":
"iVBORw0KGgoAAAANSUhEUgAAAYwAAACXCAYAAAAGX2ymAAAAOXRFWHRTb2Z0d2FyZQBNYXRwbG90bGliIHZlcnNpb24zLjQuMywgaHR0cHM6Ly9tYXRwbG90bGliLm9yZy/MnkTPAAAACXBIWXMAAAsTAAALEwEAmpwYAABIAElEQVR4nO29eZgsaVng+3sjIpdasvY6+3769N50033obnYQQUDZBgTUUeZeZhgdvep4x7mg4+ijjpfxGa8Pc8dHBYcrOgyIKIjIsMpio9ALvTe9nO4+fZY++zlVp9ZcIt77x/tFLlWZWVlrZtaJ3/PkU5mRGRFfRkV+7/fuoqokJCQkJCQshdfuASQkJCQkdAeJwEhISEhIaIlEYCQkJCQktEQiMBISEhISWiIRGAkJCQkJLRG0ewDVjI2N6b59+9o9jISEhIQ157777juvquP13rtKRGdXcexT8CVVff0qDtES
[...]
"text/plain": [
"<Figure size 432x288 with 2 Axes>"
]
diff --git a/binder/Pipfile b/binder/Pipfile
index 47b80f4c..38a78f2b 100644
--- a/binder/Pipfile
+++ b/binder/Pipfile
@@ -12,11 +12,11 @@ pytest-cov = "*"
[packages]
pandas="*"
-geopandas="==0.6.0"
+geopandas="==0.11.1"
pyspark="==3.1.2"
attrs="*"
ipykernel = "*"
-apache-sedona="==1.1.0"
+apache-sedona="==1.4.0"
matplotlib = "*"
descartes = "*"
diff --git a/binder/postBuild b/binder/postBuild
index 95949698..88f44ad8 100644
--- a/binder/postBuild
+++ b/binder/postBuild
@@ -1,6 +1,6 @@
#Download Apache Spark
-wget
https://archive.apache.org/dist/spark/spark-3.1.2/spark-3.1.2-bin-hadoop3.2.tgz
-tar -xzf spark-3.1.2-bin-hadoop3.2.tgz
+wget
https://archive.apache.org/dist/spark/spark-3.3.2/spark-3.3.2-bin-hadoop3.tgz
+tar -xzf spark-3.3.2-bin-hadoop3.tgz
#Tidy up
-rm spark-3.1.2-bin-hadoop3.2.tgz
\ No newline at end of file
+rm spark-3.3.2-bin-hadoop3.tgz
\ No newline at end of file
diff --git a/binder/start b/binder/start
index 59e5ccff..fe679bda 100644
--- a/binder/start
+++ b/binder/start
@@ -1,6 +1,6 @@
#!/bin/bash
-SPARK_HOME=$HOME/spark-3.1.2-bin-hadoop3.2
+SPARK_HOME=$HOME/spark-3.3.2-bin-hadoop3
export PATH=$SPARK_HOME/bin:$PATH
export PYTHONPATH=$SPARK_HOME/python:$PYTHONPATH
export PYSPARK_SUBMIT_ARGS="--master local[*] pyspark-shell"
