From c4e3ccb0b53486f025a7c35694efdd2267142149 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 16 一月 2023 19:10:21 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/GdalHelper.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdalHelper.java b/src/main/java/com/lf/server/helper/GdalHelper.java
index c25269b..c65c068 100644
--- a/src/main/java/com/lf/server/helper/GdalHelper.java
+++ b/src/main/java/com/lf/server/helper/GdalHelper.java
@@ -10,6 +10,8 @@
 import org.gdal.ogr.*;
 import org.gdal.osr.SpatialReference;
 
+import javax.swing.plaf.synth.SynthTextAreaUI;
+import java.io.File;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.time.LocalDate;
@@ -28,25 +30,31 @@
 public class GdalHelper {
     private final static Log log = LogFactory.getLog(GdalHelper.class);
 
-    public static void init(String driverPath) {
+    public static void init(String gdalPath) {
         // 娉ㄥ唽鎵�鏈夌殑椹卞姩
         gdal.AllRegister();
 
         // 涓轰簡鏀寔涓枃璺緞锛岃娣诲姞涓嬮潰杩欏彞浠g爜
         gdal.SetConfigOption("GDAL_FILENAME_IS_UTF8", "YES");
 
-        // 閰嶇疆GDAL_DATA璺緞锛坓dal鏍圭洰褰曚笅鐨刡in\gdal-data锛�
-        // gdal.SetConfigOption("GDAL_DATA", "E:\\terrait\\TianJin\\Zip\\release-1928-x64-dev\\release-1928-x64\\bin\\gdal-data");
-        // gdal.SetConfigOption("PROJ_LIB", "E:\\terrait\\TianJin\\Zip\\release-1928-x64-dev\\release-1928-x64\\bin\\proj7\\share");
-        if (null != driverPath) {
-            gdal.SetConfigOption("GDAL_DRIVER_PATH", driverPath);
-        }
-        //gdal.SetConfigOption("PROJ_LIB", "E:\\terrait\\TianJin\\Zip\\release-1928-x64-dev\\release-1928-x64\\bin\\proj7\\share");
-
         // 涓轰簡浣垮睘鎬ц〃瀛楁鏀寔涓枃锛岃娣诲姞涓嬮潰杩欏彞锛欳P936
         gdal.SetConfigOption("SHAPE_ENCODING", "");
         gdal.SetConfigOption("PGEO_DRIVER_TEMPLATE", "DRIVER=Microsoft Access Driver (*.mdb, *.accdb);DBQ=%s");
         gdal.SetConfigOption("MDB_DRIVER_TEMPLATE", "DRIVER=Microsoft Access Driver (*.mdb, *.accdb);DBQ=%s");
+
+        if (StringHelper.isEmpty(gdalPath)) {
+            return;
+        }
+
+        // 閰嶇疆鐜鍙橀噺
+        gdal.SetConfigOption("GDAL_DATA", gdalPath + File.separator + "gdal-data");
+        gdal.SetConfigOption("PROJ_LIB", gdalPath + File.separator + "proj7\\share");
+        gdal.SetConfigOption("GDAL_DRIVER_PATH", gdalPath + File.separator + "gdalplugins");
+
+        String path = System.getenv("PATH");
+        if (!path.contains(gdalPath)) {
+            System.setProperty("PATH", path + ";" + gdalPath);
+        }
     }
 
     /**

--
Gitblit v1.9.3