From 31cce6a6c32007d7dda72850302744d97d8bda55 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期四, 09 二月 2023 15:02:52 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/helper/GdbHelper.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/lf/server/helper/GdbHelper.java b/src/main/java/com/lf/server/helper/GdbHelper.java
index bc38afb..8058c38 100644
--- a/src/main/java/com/lf/server/helper/GdbHelper.java
+++ b/src/main/java/com/lf/server/helper/GdbHelper.java
@@ -421,15 +421,17 @@
             return null;
         }
 
+        Integer srid = null;
         String geomType = null;
-        SpatialReference sr = new SpatialReference();
         if (baseMapper instanceof GeomBaseMapper) {
             GeomBaseMapper geomMapper = (GeomBaseMapper) baseMapper;
             geomType = geomMapper.selectGeometryType(tab);
 
-            Integer srid = geomMapper.selectSrid(tab);
-            sr.ImportFromEPSG(null == srid ? 4490 : srid);
+            srid = geomMapper.selectSrid(tab);
         }
+
+        SpatialReference sr = new SpatialReference();
+        sr.ImportFromEPSG(null == srid ? 4490 : srid);
 
         return dataSource.CreateLayer(tab, sr, getGeomType(geomType), null);
     }
@@ -439,7 +441,7 @@
      */
     private static Integer getGeomType(String geomType) {
         if (StringHelper.isEmpty(geomType)) {
-            return ogr.wkbUnknown;
+            return ogr.wkbPoint;
         }
 
         switch (geomType) {
@@ -530,8 +532,10 @@
 
             if (t instanceof BaseGeoEntity) {
                 BaseGeoEntity geoEntity = (BaseGeoEntity) t;
-                Geometry geom = Geometry.CreateFromWkt(geoEntity.getGeom());
-                f.SetGeometry(geom);
+                if (!StringHelper.isEmpty(geoEntity.getGeom())) {
+                    Geometry geom = Geometry.CreateFromWkt(geoEntity.getGeom());
+                    f.SetGeometry(geom);
+                }
             }
 
             setFeatureData(f, fields, t);

--
Gitblit v1.9.3