From ab70cf751e06f15f6d3f22bdc648c3ac80db28bb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 17 一月 2023 08:54:52 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/GdalHelper.java |   28 +++++++++++++---------------
 1 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdalHelper.java b/src/main/java/com/lf/server/helper/GdalHelper.java
index c65c068..6cba31b 100644
--- a/src/main/java/com/lf/server/helper/GdalHelper.java
+++ b/src/main/java/com/lf/server/helper/GdalHelper.java
@@ -31,30 +31,28 @@
     private final static Log log = LogFactory.getLog(GdalHelper.class);
 
     public static void init(String gdalPath) {
-        // 娉ㄥ唽鎵�鏈夌殑椹卞姩
-        gdal.AllRegister();
-
-        // 涓轰簡鏀寔涓枃璺緞锛岃娣诲姞涓嬮潰杩欏彞浠g爜
+        // 鏀寔涓枃璺緞
         gdal.SetConfigOption("GDAL_FILENAME_IS_UTF8", "YES");
 
-        // 涓轰簡浣垮睘鎬ц〃瀛楁鏀寔涓枃锛岃娣诲姞涓嬮潰杩欏彞锛欳P936
+        // 灞炴�ц〃瀛楁鏀寔涓枃娣诲姞锛欳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");
+        if (!StringHelper.isEmpty(gdalPath)) {
+            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);
+            String path = System.getenv("PATH");
+            if (!path.contains(gdalPath)) {
+                System.setProperty("PATH", path + ";" + gdalPath);
+            }
         }
+
+        // 娉ㄥ唽鎵�鏈夌殑椹卞姩
+        gdal.AllRegister();
     }
 
     /**

--
Gitblit v1.9.3