Alex38Lyon/Synthese-PSM_LARRA
1
0
Fork 0
mirror of https://github.com/Alex38Lyon/Synthese-PSM_LARRA.git synced 2026-10-01 16:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: Alex38Lyon/Synthese-PSM_LARRA:gdal-sfcgal-3.13.3
Branches Tags
Alex38Lyon/Synthese-PSM_LARRA:main
Alex38Lyon/Synthese-PSM_LARRA:gdal-sfcgal-3.13.3
...
compare: Alex38Lyon/Synthese-PSM_LARRA:0d395c0ac9b3ef11e383d2843c31502928025c38
Branches Tags
Alex38Lyon/Synthese-PSM_LARRA:main
Alex38Lyon/Synthese-PSM_LARRA:gdal-sfcgal-3.13.3
6 Commits
gdal-sfcgal-3.13.3 ... 0d395c0ac9
Author SHA1 Message Date
github-actions[bot] 0d395c0ac9 Auto-generate outputs from SHP 2026-08-31 22:04:38 +00:00
Alex38Lyon ee9b9160a2 Lancement 2026-09-01 00:02:24 +02:00
Alex38Lyon 3a2f7018a0 Refactor GDAL installation script with improved comments 
Updated comments and error messages in the GDAL installation script to improve clarity and consistency. Adjusted the structure of the script for better readability.
 2026-08-31 23:58:28 +02:00
Alex38Lyon 1ee82128b3 Enhance GDAL installation script with checks and messages 
Added checks for GDAL package existence and structure, improved error handling, and clarified installation steps.
 2026-08-31 23:53:27 +02:00
Alex38Lyon c5d34c8544 Refactor GDAL installation with error handling 
Updated GDAL installation process to include checks for executables, libraries, and directories. Enhanced error handling and output messages for better debugging.
 2026-08-31 23:45:57 +02:00
Alex38Lyon dfb6900e71 pyThtoQGis 2026-08-31 23:39:02 +02:00
11 changed files with 247 additions and 49 deletions
Expand all files Collapse all files
.github/workflows/pyThtoQgis-3.yml
+156 -49
View File
@@ -187,12 +187,11 @@ jobs:
ls -lh \
"$RUNNER_TEMP/${PACKAGE_NAME}.tar.gz"
# ============================================================
# 7. Installation package GDAL
# ============================================================
- name: Install GDAL package
- name: Installation GDAL package
if: steps.changed.outputs.shp == 'true'
shell: bash -el {0}
run: |
@@ -205,79 +204,186 @@ jobs:
PACKAGE="$RUNNER_TEMP/${PACKAGE_NAME}.tar.gz"
EXTRACT_DIR="$RUNNER_TEMP/gdal-extract"
echo "========================================"
echo "INSTALLATION GDAL"
echo "========================================"
cd "$RUNNER_TEMP"
# ========================================================
# Vérification du package
# ========================================================
if [ ! -f "$PACKAGE" ]; then
echo "ERREUR : package introuvable :"
echo "$PACKAGE"
exit 1
fi
# ========================================================
# Extraction
# ========================================================
rm -rf "$EXTRACT_DIR"
mkdir -p "$EXTRACT_DIR"
tar \
-xzf \
"$PACKAGE"
"$PACKAGE" \
-C "$EXTRACT_DIR"
# --------------------------------------------------------
# Exécutables
# --------------------------------------------------------
# ========================================================
# Affichage STRUCTURE REELLE
# ========================================================
cp -a \
"$PACKAGE_NAME"/gdal* \
"$CONDA_PREFIX/bin/"
echo ""
echo "========================================"
echo "STRUCTURE DU PACKAGE"
echo "========================================"
find "$EXTRACT_DIR" \
-maxdepth 6 \
-print \
| sort
# --------------------------------------------------------
# Bibliothèque GDAL
# --------------------------------------------------------
# ========================================================
# Répertoire racine
# ========================================================
cp -a \
"$PACKAGE_NAME"/libgdal.so* \
"$CONDA_PREFIX/lib/"
GDAL_DIR="$EXTRACT_DIR/$PACKAGE_NAME"
# --------------------------------------------------------
# Python bindings
# --------------------------------------------------------
if [ ! -d "$GDAL_DIR" ]; then
rm -rf \
"$CONDA_PREFIX/lib/python3.12/site-packages/osgeo"
echo ""
echo "ERREUR : répertoire package absent :"
echo "$GDAL_DIR"
cp -a \
"$PACKAGE_NAME/osgeo" \
"$CONDA_PREFIX/lib/python3.12/site-packages/"
exit 1
# --------------------------------------------------------
# Headers
# --------------------------------------------------------
rm -rf \
"$CONDA_PREFIX/include/gdal"
cp -a \
"$PACKAGE_NAME/gdal" \
"$CONDA_PREFIX/include/"
# --------------------------------------------------------
# GDAL data
# --------------------------------------------------------
rm -rf \
"$CONDA_PREFIX/share/gdal"
cp -a \
"$PACKAGE_NAME/gdal" \
"$CONDA_PREFIX/share/" \
2>/dev/null || true
fi
echo ""
echo "GDAL installé."
echo "GDAL_DIR :"
echo "$GDAL_DIR"
# ========================================================
# Vérification structure attendue
# ========================================================
echo ""
echo "========================================"
echo "VERIFICATION"
echo "========================================"
if [ ! -d "$GDAL_DIR/bin" ]; then
echo "ERREUR : bin/ absent"
exit 1
fi
if [ ! -d "$GDAL_DIR/lib" ]; then
echo "ERREUR : lib/ absent"
exit 1
fi
# ========================================================
# Installation BIN
# ========================================================
echo ""
echo "Installation bin/..."
cp -av \
"$GDAL_DIR/bin/." \
"$CONDA_PREFIX/bin/"
# ========================================================
# Installation LIB
# ========================================================
echo ""
echo "Installation lib/..."
cp -av \
"$GDAL_DIR/lib/." \
"$CONDA_PREFIX/lib/"
# ========================================================
# Installation SHARE
# ========================================================
if [ -d "$GDAL_DIR/share" ]; then
echo ""
echo "Installation share/..."
cp -av \
"$GDAL_DIR/share/." \
"$CONDA_PREFIX/share/"
fi
# ========================================================
# Vérification GDAL
# ========================================================
echo ""
echo "========================================"
echo "VERIFICATION GDAL"
echo "========================================"
echo ""
echo "gdalinfo :"
which gdalinfo
gdalinfo --version
echo ""
echo "GDAL Python :"
python - <<'PY'
from osgeo import gdal
from osgeo import ogr
print("GDAL :", gdal.VersionInfo("--version"))
print("OGR drivers :", ogr.GetDriverCount())
PY
echo ""
echo "========================================"
echo "GDAL INSTALLE"
echo "========================================"
# ============================================================
# 8. Vérification GDAL
# ============================================================
@@ -513,3 +619,4 @@ jobs:
commit_user_email: "41898282+github-actions[bot]@users.noreply.github.com"
commit_author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
Outputs/SHP/QGis_GPKG_Files/areas2dMasked.gpkg
BIN
View File
Binary file not shown.
Outputs/SHP/QGis_GPKG_Files/lines2dMasked.gpkg
BIN
View File
Binary file not shown.
Outputs/SHP/QGis_GPKG_Files/outline2d.gpkg
BIN
View File
Binary file not shown.
Outputs/SHP/QGis_GPKG_Files/points2d.gpkg
BIN
View File
Binary file not shown.
Outputs/SHP/QGis_GPKG_Files/pyThtoQgis.log
+91
View File
@@ -13876,3 +13876,94 @@ on 21527: 2026-08-31 20:03:45,678 - WARNING - Any intersection issue, attributes
2026-08-31 20:03:53,187 - INFO - =========================================================================================================
2026-08-31 20:03:53,187 - INFO - Execution completed without errors in 67.35 s
2026-08-31 20:03:53,187 - INFO - =========================================================================================================
2026-08-31 22:03:43,659 - INFO - *********************************************************************************************************
2026-08-31 22:03:43,659 - INFO - Script to generate QGis (.gpkg) files from Therion (.shp) files with auto-correction if possible
2026-08-31 22:03:43,659 - INFO - original written by X. Robert, ISTerre : October 2022
2026-08-31 22:03:43,659 - INFO - updated by : alexandre.pont@yahoo.fr
2026-08-31 22:03:43,659 - INFO - version : 2026.08.31
2026-08-31 22:03:43,659 - INFO - commande line mode
2026-08-31 22:03:43,659 - INFO - input folder : ~/Synthese-PSM_LARRA/Outputs/SHP
2026-08-31 22:03:43,659 - INFO - output folder : ~/Outputs/SHP/QGis_GPKG_Files
2026-08-31 22:03:43,660 - INFO - log file : ~/SHP/QGis_GPKG_Files/pyThtoQgis.log
2026-08-31 22:03:43,660 - INFO - *********************************************************************************************************
2026-08-31 22:03:43,660 - INFO - Step 1: test files and convert to GPKG format in the folder: ~/Outputs/SHP/QGis_GPKG_Files
2026-08-31 22:03:43,660 - INFO - Working with file (1/7): points2d.shp
2026-08-31 22:03:45,260 - INFO - ==================== BILAN FILE: ~/Outputs/SHP/points2d.shp ===================================
2026-08-31 22:03:45,260 - INFO - Géométries invalides : 0 sur 16155
2026-08-31 22:03:45,264 - INFO - =========================================================================================================
2026-08-31 22:03:45,272 - INFO - SHP file conversion : points2d.shp with 16155 objets
2026-08-31 22:03:46,912 - INFO - Conversion GPKG terminée fichier: points2d, 16155 objets convertis
2026-08-31 22:03:46,912 - INFO - Working with file (2/7): lines2d.shp
2026-08-31 22:03:48,672 - INFO - ==================== BILAN FILE: ~/Outputs/SHP/lines2d.shp ===================================
2026-08-31 22:03:48,672 - WARNING - Géométries invalides : 992 sur 34514
2026-08-31 22:03:48,672 - WARNING - Too few points : 992
2026-08-31 22:03:48,675 - INFO - =========================================================================================================
2026-08-31 22:03:48,678 - INFO - SHP file conversion : lines2d.shp with 34514 objets
2026-08-31 22:03:50,857 - INFO - Conversion GPKG terminée fichier: lines2d_fixed, 34514 objets convertis
2026-08-31 22:03:52,612 - INFO - ==================== BILAN FILE: ~/SHP/QGis_GPKG_Files/lines2d_fixed.gpkg ===================================
2026-08-31 22:03:52,612 - INFO - Géométries invalides : 0 sur 34514
2026-08-31 22:03:52,615 - INFO - =========================================================================================================
2026-08-31 22:03:52,616 - INFO - Working with file (3/7): outline2d.shp
2026-08-31 22:03:52,708 - INFO - ==================== BILAN FILE: ~/Outputs/SHP/outline2d.shp ===================================
2026-08-31 22:03:52,708 - WARNING - Géométries invalides : 305 sur 464
2026-08-31 22:03:52,708 - WARNING - Unknown (1) : 305
2026-08-31 22:03:52,708 - INFO - =========================================================================================================
2026-08-31 22:03:52,711 - INFO - SHP file conversion : outline2d.shp with 464 objets
2026-08-31 22:03:52,827 - INFO - Conversion GPKG terminée fichier: outline2d, 464 objets convertis
2026-08-31 22:03:52,890 - INFO - ==================== BILAN FILE: ~/SHP/QGis_GPKG_Files/outline2d.gpkg ===================================
2026-08-31 22:03:52,890 - INFO - Géométries invalides : 0 sur 464
2026-08-31 22:03:52,890 - INFO - =========================================================================================================
2026-08-31 22:03:52,891 - INFO - Working with file (4/7): areas2d.shp
2026-08-31 22:03:52,926 - INFO - ==================== BILAN FILE: ~/Outputs/SHP/areas2d.shp ===================================
2026-08-31 22:03:52,927 - INFO - Géométries invalides : 0 sur 490
2026-08-31 22:03:52,927 - INFO - =========================================================================================================
2026-08-31 22:03:52,929 - INFO - SHP file conversion : areas2d.shp with 490 objets
2026-08-31 22:03:52,978 - INFO - Conversion GPKG terminée fichier: areas2d_fixed, 490 objets convertis
2026-08-31 22:03:52,978 - INFO - Working with file (5/7): walls3d.shp
2026-08-31 22:03:55,046 - INFO - ==================== BILAN FILE: ~/Outputs/SHP/walls3d.shp ===================================
2026-08-31 22:03:55,046 - WARNING - Géométries invalides : 471 sur 471
2026-08-31 22:03:55,046 - WARNING - Not supported : 471
2026-08-31 22:03:55,046 - INFO - =========================================================================================================
2026-08-31 22:03:55,049 - INFO - SHP file conversion : walls3d.shp with 471 objets
2026-08-31 22:04:00,409 - INFO - Conversion GPKG terminée fichier: walls3d, 471 objets convertis
2026-08-31 22:04:00,611 - INFO - ==================== BILAN FILE: ~/SHP/QGis_GPKG_Files/walls3d.gpkg ===================================
2026-08-31 22:04:00,611 - INFO - Géométries invalides : 0 sur 471
2026-08-31 22:04:00,611 - INFO - =========================================================================================================
2026-08-31 22:04:00,612 - INFO - Working with file (6/7): stations3d.shp
2026-08-31 22:04:05,278 - INFO - ==================== BILAN FILE: ~/Outputs/SHP/stations3d.shp ===================================
2026-08-31 22:04:05,278 - INFO - Géométries invalides : 0 sur 67579
2026-08-31 22:04:05,288 - INFO - =========================================================================================================
2026-08-31 22:04:05,294 - INFO - SHP file conversion : stations3d.shp with 67579 objets
2026-08-31 22:04:10,273 - INFO - Conversion GPKG terminée fichier: stations3d, 67579 objets convertis
2026-08-31 22:04:10,273 - INFO - Working with file (7/7): shots3d.shp
2026-08-31 22:04:14,338 - INFO - ==================== BILAN FILE: ~/Outputs/SHP/shots3d.shp ===================================
2026-08-31 22:04:14,339 - WARNING - Géométries invalides : 4327 sur 66048
2026-08-31 22:04:14,339 - WARNING - Too few points : 4327
2026-08-31 22:04:14,345 - INFO - =========================================================================================================
2026-08-31 22:04:14,350 - INFO - SHP file conversion : shots3d.shp with 66048 objets
2026-08-31 22:04:19,138 - INFO - Conversion GPKG terminée fichier: shots3d, 66048 objets convertis
2026-08-31 22:04:23,193 - INFO - ==================== BILAN FILE: ~/SHP/QGis_GPKG_Files/shots3d.gpkg ===================================
2026-08-31 22:04:23,193 - INFO - Géométries invalides : 0 sur 66048
2026-08-31 22:04:23,200 - INFO - =========================================================================================================
2026-08-31 22:04:23,203 - INFO - Step 2: adapte drawing files (cut it) for QGis in the folder: ~/Outputs/SHP/QGis_GPKG_Files
2026-08-31 22:04:23,203 - INFO - Clipping file : ~/SHP/QGis_GPKG_Files/lines2d_fixed.gpkg to file : ~/SHP/QGis_GPKG_Files/lines2dMasked.gpkg
on 100: 2026-08-31 22:04:23,274 - WARNING - Any intersection issue, attributes: _SCRAP_ID=3024, _TYPE=rock-edge, _SCRAP=BB26_meandre_entree, _CLIP=on, _TAGS=6144, _SUBTYPE=None, _SCALE=4, _TEXT=None
on 4224: 2026-08-31 22:04:23,947 - WARNING - Any intersection issue, attributes: _SCRAP_ID=4226, _TYPE=fault, _SCRAP=SP-Explo_01_2013_10_09_02, _CLIP=on, _TAGS=6144, _SUBTYPE=None, _SCALE=4, _TEXT=None
on 4225: 2026-08-31 22:04:23,948 - WARNING - Any intersection issue, attributes: _SCRAP_ID=4226, _TYPE=fault, _SCRAP=SP-Explo_01_2013_10_09_02, _CLIP=on, _TAGS=6144, _SUBTYPE=None, _SCALE=4, _TEXT=None
on 8037: 2026-08-31 22:04:24,762 - WARNING - Any intersection issue, attributes: _SCRAP_ID=33199, _TYPE=rock-border, _SCRAP=SP-AP7_Aval_02, _CLIP=on, _TAGS=6144, _SUBTYPE=None, _SCALE=4, _TEXT=None
on 8451: 2026-08-31 22:04:24,868 - WARNING - Any intersection issue, attributes: _SCRAP_ID=33046, _TYPE=contour, _SCRAP=SP-AP7_Aval_01, _CLIP=on, _TAGS=6144, _SUBTYPE=None, _SCALE=4, _TEXT=None
on 10037: 2026-08-31 22:04:25,216 - WARNING - Any intersection issue, attributes: _SCRAP_ID=38882, _TYPE=pit, _SCRAP=SP-B3_Aval_02E, _CLIP=on, _TAGS=6144, _SUBTYPE=None, _SCALE=4, _TEXT=None
on 12615: 2026-08-31 22:04:25,706 - WARNING - Any intersection issue, attributes: _SCRAP_ID=41256, _TYPE=rock-border, _SCRAP=SP-GL102_Aval_01B, _CLIP=on, _TAGS=6144, _SUBTYPE=None, _SCALE=4, _TEXT=None
on 21527: 2026-08-31 22:04:27,503 - WARNING - Any intersection issue, attributes: _SCRAP_ID=58879, _TYPE=border, _SCRAP=SP-Explo_12_1982_08_05_01, _CLIP=on, _TAGS=6144, _SUBTYPE=invisible, _SCALE=4, _TEXT=None
2026-08-31 22:04:31,880 - INFO - ==================== BILAN FILE: ~/SHP/QGis_GPKG_Files/lines2dMasked.gpkg ===================================
2026-08-31 22:04:31,880 - INFO - Géométries invalides : 0 sur 34506
2026-08-31 22:04:31,882 - INFO - =========================================================================================================
2026-08-31 22:04:31,884 - WARNING - 8 deleted geometries need to be verified in lines2dMasked.gpkg file
2026-08-31 22:04:31,887 - INFO - Clipping file : ~/SHP/QGis_GPKG_Files/areas2d_fixed.gpkg to file : ~/SHP/QGis_GPKG_Files/areas2dMasked.gpkg
2026-08-31 22:04:32,278 - INFO - ==================== BILAN FILE: ~/SHP/QGis_GPKG_Files/areas2dMasked.gpkg ===================================
2026-08-31 22:04:32,279 - INFO - Géométries invalides : 0 sur 490
2026-08-31 22:04:32,279 - INFO - =========================================================================================================
2026-08-31 22:04:32,279 - INFO - 490 clipped geometries in areas2d_fixed.gpkg file
2026-08-31 22:04:32,280 - INFO - =========================================================================================================
2026-08-31 22:04:32,280 - INFO - Execution completed without errors in 48.63 s
2026-08-31 22:04:32,280 - INFO - =========================================================================================================
Outputs/SHP/QGis_GPKG_Files/shots3d.gpkg
BIN
View File
Binary file not shown.
Outputs/SHP/QGis_GPKG_Files/stations3d.gpkg
BIN
View File
Binary file not shown.
Outputs/SHP/QGis_GPKG_Files/walls3d.gpkg
BIN
View File
Binary file not shown.
Scripts/pyThtoQgis/Lib/__pycache__/general_fonctions.cpython-312.pyc
BIN
View File
Binary file not shown.
Scripts/pyThtoQgis/Lib/__pycache__/global_data.cpython-312.pyc
BIN
View File
Binary file not shown.