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 | 32 +++++++++++++++-----------------
1 files changed, 15 insertions(+), 17 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..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;
@@ -31,30 +30,29 @@
private final static Log log = LogFactory.getLog(GdalHelper.class);
public static void init(String gdalPath) {
- // 娉ㄥ唽鎵�鏈夌殑椹卞姩
- gdal.AllRegister();
-
- // 涓轰簡鏀寔涓枃璺緞锛岃娣诲姞涓嬮潰杩欏彞浠ｇ爜
+ // 鏀寔涓枃璺緞
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" + 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");
- 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();
+ ogr.RegisterAll();
}
/**
--
Gitblit v1.9.3