From ec9692c536ce997f325b8e6e3bcc5992e11cdc0e Mon Sep 17 00:00:00 2001
From: JT8D-17 <amusing.random.alias@gmail.com>
Date: Thu, 2 May 2024 19:04:20 +0200
Subject: [PATCH 1/3] Add EOX with 2021 images as provider

---
 Providers/Global/EOX2-2021.lay | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 Providers/Global/EOX2-2021.lay

diff --git a/Providers/Global/EOX2-2021.lay b/Providers/Global/EOX2-2021.lay
new file mode 100644
index 00000000..821e88fa
--- /dev/null
+++ b/Providers/Global/EOX2-2021.lay
@@ -0,0 +1,5 @@
+request_type=tms
+grid_type=webmercator
+url_template=https://{switch:a,b,c,d}.s2maps-tiles.eu/wmts/?layer=s2cloudless-2021_3857&style=default&tilematrixset=GoogleMapsCompatible&Service=WMTS&Request=GetTile&Version=1.0.0&Format=image%2Fjpeg&TileMatrix={zoom}&TileCol={x}&TileRow={y}
+max_zl=14
+imagery_dir=grouped

From 75fbdd5099ab1d48360921aee334ff59c0bc375b Mon Sep 17 00:00:00 2001
From: JT8D-17 <amusing.random.alias@gmail.com>
Date: Thu, 2 May 2024 19:36:07 +0200
Subject: [PATCH 2/3] Add bash scripts to set up and start O4XP with Python
 3.12 on Linux

---
 .gitignore                 |  1 +
 requirements_nover.txt     | 11 +++++++++++
 z_Install_Python_Venv.sh   | 39 ++++++++++++++++++++++++++++++++++++++
 z_Start_O4XP_PythonVenv.sh |  5 +++++
 4 files changed, 56 insertions(+)
 create mode 100644 requirements_nover.txt
 create mode 100755 z_Install_Python_Venv.sh
 create mode 100755 z_Start_O4XP_PythonVenv.sh

diff --git a/.gitignore b/.gitignore
index d78f63b0..5b3a2308 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ Tiles/
 **/*.bak
 **/*.swp
 .last_gui_params.txt
+z_Python_Venv
diff --git a/requirements_nover.txt b/requirements_nover.txt
new file mode 100644
index 00000000..9af4f2e3
--- /dev/null
+++ b/requirements_nover.txt
@@ -0,0 +1,11 @@
+certifi
+chardet
+idna
+numpy
+Pillow
+pyproj
+requests
+Rtree
+Shapely
+urllib3
+build
diff --git a/z_Install_Python_Venv.sh b/z_Install_Python_Venv.sh
new file mode 100755
index 00000000..6c14d906
--- /dev/null
+++ b/z_Install_Python_Venv.sh
@@ -0,0 +1,39 @@
+#! /bin/bash
+
+path="$PWD/z_Python_Venv"
+
+# 1. Create a Python virtual environment
+
+python -m venv $path
+
+# 2. Activate Python venv
+
+source $path/bin/activate
+
+# 3. Install packages with pip
+
+pip install -r $PWD/requirements_nover.txt
+
+# 4. Download scikit-fmm's "meson" branch, compile and install it
+
+git clone --branch meson https://github.com/scikit-fmm/scikit-fmm.git $path/scikit-fmm
+
+python -m build $path/scikit-fmm
+
+pip install $path/scikit-fmm
+
+# 6. DONE
+
+echo " "
+echo "Preparation complete!"
+echo " "
+echo "Use \"$path/bin/python $PWD/Ortho4XP\" to start O4XP"
+echo " "
+echo " "
+
+# Function: Pause
+function pause(){
+   read -p "$*"
+}
+
+pause "Press enter to continue... "
diff --git a/z_Start_O4XP_PythonVenv.sh b/z_Start_O4XP_PythonVenv.sh
new file mode 100755
index 00000000..c19bc9e6
--- /dev/null
+++ b/z_Start_O4XP_PythonVenv.sh
@@ -0,0 +1,5 @@
+#! /bin/bash
+
+path="$PWD/z_Python_Venv"
+
+$path/bin/python $PWD/Ortho4XP.py

From 53d540963ff9722255a4cf736c97da0fab81ebe1 Mon Sep 17 00:00:00 2001
From: JT8D-17 <amusing.random.alias@gmail.com>
Date: Fri, 31 May 2024 19:54:11 +0200
Subject: [PATCH 3/3] Installation script change due to scikit-fmm release for
 Python 3.12

---
 requirements_nover.txt   |  1 +
 z_Install_Python_Venv.sh | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/requirements_nover.txt b/requirements_nover.txt
index 9af4f2e3..20a4a6f2 100644
--- a/requirements_nover.txt
+++ b/requirements_nover.txt
@@ -9,3 +9,4 @@ Rtree
 Shapely
 urllib3
 build
+scikit-fmm
diff --git a/z_Install_Python_Venv.sh b/z_Install_Python_Venv.sh
index 6c14d906..910b48b9 100755
--- a/z_Install_Python_Venv.sh
+++ b/z_Install_Python_Venv.sh
@@ -14,15 +14,7 @@ source $path/bin/activate
 
 pip install -r $PWD/requirements_nover.txt
 
-# 4. Download scikit-fmm's "meson" branch, compile and install it
-
-git clone --branch meson https://github.com/scikit-fmm/scikit-fmm.git $path/scikit-fmm
-
-python -m build $path/scikit-fmm
-
-pip install $path/scikit-fmm
-
-# 6. DONE
+# 4. DONE
 
 echo " "
 echo "Preparation complete!"