Delete Outputs/SHP/walls3d - Copie.shp

Updated comments and error messages in the GDAL installation script to improve clarity and consistency. Adjusted the structure of the script for better readability.

.github/workflows/pyThtoQgis-3.yml

@@ -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 \
+          echo ""
-            "$PACKAGE_NAME"/gdal* \
+          echo "========================================"
-            "$CONDA_PREFIX/bin/"
+          echo "STRUCTURE DU PACKAGE"
+          echo "========================================"
+
+          find "$EXTRACT_DIR" \
+            -maxdepth 6 \
+            -print \
+            | sort
 
 
-          # --------------------------------------------------------
+          # ========================================================
-          # Bibliothèque GDAL
+          # Répertoire racine
-          # --------------------------------------------------------
+          # ========================================================
 
-          cp -a \
+          GDAL_DIR="$EXTRACT_DIR/$PACKAGE_NAME"
-            "$PACKAGE_NAME"/libgdal.so* \
-            "$CONDA_PREFIX/lib/"
 
 
-          # --------------------------------------------------------
+          if [ ! -d "$GDAL_DIR" ]; then
-          # Python bindings
-          # --------------------------------------------------------
 
-          rm -rf \
+              echo ""
-            "$CONDA_PREFIX/lib/python3.12/site-packages/osgeo"
+              echo "ERREUR : répertoire package absent :"
+              echo "$GDAL_DIR"
 
-          cp -a \
+              exit 1
-            "$PACKAGE_NAME/osgeo" \
-            "$CONDA_PREFIX/lib/python3.12/site-packages/"
 
-
+          fi
-          # --------------------------------------------------------
-          # 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
 
 
           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>"
+

Scripts/pyThtoQgis/.vscode/settings.json

@@ -5,6 +5,8 @@
           "esri",
           "gpkg",
           "Masekd",
+          "multipartie",
+          "multiparties",
           "osgeo",
           "outputfolder",
           "outputspath",

Scripts/pyThtoQgis/pyThtoQgis-VSCode.code-workspace

@@ -10,6 +10,7 @@
 			"esri",
 			"geopandas",
 			"Ggis",
+			"multipartie",
 			"outputfolder",
 			"Qgis",
 			"TYPEFCR"