From ed8c7a5effd0d423ce1118b680ecdca6fe732609 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 02 七月 2025 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.11.205:9000/r/P2022036_Service

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

diff --git a/src/main/java/com/lf/server/helper/GdalHelper.java b/src/main/java/com/lf/server/helper/GdalHelper.java
index 6cba31b..c03235f 100644
--- a/src/main/java/com/lf/server/helper/GdalHelper.java
+++ b/src/main/java/com/lf/server/helper/GdalHelper.java
@@ -10,7 +10,6 @@
 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;
@@ -33,8 +32,7 @@
     public static void init(String gdalPath) {
         // 鏀寔涓枃璺緞
         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");
@@ -42,7 +40,8 @@
         // 閰嶇疆鐜鍙橀噺
         if (!StringHelper.isEmpty(gdalPath)) {
             gdal.SetConfigOption("GDAL_DATA", gdalPath + File.separator + "gdal-data");
-            gdal.SetConfigOption("PROJ_LIB", gdalPath + File.separator + "proj7\\share");
+            gdal.SetConfigOption("PROJ_LIB", gdalPath + File.separator + "proj7" + File.separator + "share");
+            //System.setProperty("PROJ_LIB", gdalPath + File.separator + "proj7" + File.separator + "share")
             gdal.SetConfigOption("GDAL_DRIVER_PATH", gdalPath + File.separator + "gdalplugins");
 
             String path = System.getenv("PATH");
@@ -53,6 +52,7 @@
 
         // 娉ㄥ唽鎵�鏈夌殑椹卞姩
         gdal.AllRegister();
+        ogr.RegisterAll();
     }
 
     /**

--
Gitblit v1.9.3