包位置调整

codingmiao · Jan 16, 2023 · 5b8fc3c · 5b8fc3c
1 parent 78f30cc
commit 5b8fc3c
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 36 deletions.
diff --git a/giscat-vector/giscat-vector-mbexpression/pom.xml b/giscat-vector/giscat-vector-mbexpression/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>giscat-vector</artifactId>
         <groupId>org.wowtools</groupId>
-        <version>g1.5.1</version>
+        <version>g1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>giscat-vector-mbexpression</artifactId>
-    <version>g1.5.1</version>
+    <version>g1.5.2</version>
     <description>mapbox expressions表达式解析为java对象，用以支持数据过滤等场景</description>
 
     <dependencies>

diff --git a/...ssion/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersection.java b/...ssion/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersection.java
@@ -20,7 +20,7 @@
 package org.wowtools.giscat.vector.mbexpression.spatial;
 
 import org.locationtech.jts.geom.Geometry;
-import org.wowtools.giscat.util.analyse.TileClip;
+import org.wowtools.giscat.vector.util.analyse.TileClip;
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionName;
 import org.wowtools.giscat.vector.mbexpression.ExpressionParams;

diff --git a/...ression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersects.java b/...ression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersects.java
@@ -20,7 +20,7 @@
 package org.wowtools.giscat.vector.mbexpression.spatial;
 
 import org.locationtech.jts.geom.Geometry;
-import org.wowtools.giscat.util.analyse.Bbox;
+import org.wowtools.giscat.vector.util.analyse.Bbox;
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionName;
 import org.wowtools.giscat.vector.mbexpression.ExpressionParams;

diff --git a/...ctor-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/Read.java b/...ctor-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/Read.java
@@ -3,8 +3,8 @@
 import org.locationtech.jts.geom.Geometry;
 import org.locationtech.jts.io.ParseException;
 import org.locationtech.jts.io.WKTReader;
-import org.wowtools.giscat.util.analyse.Bbox;
-import org.wowtools.giscat.util.analyse.TileClip;
+import org.wowtools.giscat.vector.util.analyse.Bbox;
+import org.wowtools.giscat.vector.util.analyse.TileClip;
 import org.wowtools.giscat.vector.mbexpression.Expression;
 import org.wowtools.giscat.vector.mbexpression.ExpressionParams;
 import org.wowtools.giscat.vector.pojo.Feature;

diff --git a/...or-mbexpression/src/test/java/org/wowtools/giscat/vector/mbexpression/ExpressionTest.java b/...or-mbexpression/src/test/java/org/wowtools/giscat/vector/mbexpression/ExpressionTest.java
@@ -5,8 +5,8 @@
 import org.locationtech.jts.geom.GeometryFactory;
 import org.locationtech.jts.geom.LineString;
 import org.locationtech.jts.io.WKTReader;
-import org.wowtools.giscat.util.analyse.Bbox;
-import org.wowtools.giscat.util.analyse.TileClip;
+import org.wowtools.giscat.vector.util.analyse.Bbox;
+import org.wowtools.giscat.vector.util.analyse.TileClip;
 import org.wowtools.giscat.vector.pojo.Feature;
 
 import java.util.ArrayList;

diff --git a/giscat-vector/giscat-vector-mvt/pom.xml b/giscat-vector/giscat-vector-mvt/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>giscat</artifactId>
         <groupId>org.wowtools</groupId>
-        <version>g1.5.1</version>
+        <version>g1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>giscat-vector-mvt</artifactId>
-    <version>g1.5.1</version>
+    <version>g1.5.2</version>
     <description>Mapbox vector tile (mvt) 的序列化与反序列化</description>
 
     <dependencies>

diff --git a/giscat-vector/giscat-vector-mvt/src/main/java/org/wowtools/giscat/vector/mvt/MvtBuilder.java b/giscat-vector/giscat-vector-mvt/src/main/java/org/wowtools/giscat/vector/mvt/MvtBuilder.java
@@ -22,9 +22,9 @@
 
 import org.locationtech.jts.algorithm.Orientation;
 import org.locationtech.jts.geom.*;
-import org.wowtools.giscat.util.analyse.Bbox;
-import org.wowtools.giscat.util.analyse.TileClip;
-import org.wowtools.giscat.util.cst.Tile2Wgs84;
+import org.wowtools.giscat.vector.util.analyse.Bbox;
+import org.wowtools.giscat.vector.util.analyse.TileClip;
+import org.wowtools.giscat.vector.util.cst.Tile2Wgs84;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;

diff --git a/giscat-vector/giscat-vector-mvt/src/main/java/org/wowtools/giscat/vector/mvt/MvtLayer.java b/giscat-vector/giscat-vector-mvt/src/main/java/org/wowtools/giscat/vector/mvt/MvtLayer.java
@@ -23,7 +23,7 @@
 import org.locationtech.jts.geom.GeometryCollection;
 import org.locationtech.jts.geom.TopologyException;
 import org.locationtech.jts.simplify.TopologyPreservingSimplifier;
-import org.wowtools.giscat.util.analyse.Bbox;
+import org.wowtools.giscat.vector.util.analyse.Bbox;
 import org.wowtools.giscat.vector.pojo.Feature;
 
 import java.util.*;

diff --git a/...t-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/MvtCoordinateConvertorTest.java b/...t-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/MvtCoordinateConvertorTest.java
@@ -1,6 +1,6 @@
 package org.wowtools.giscat.vector.mvt;
 
-import org.wowtools.giscat.util.cst.Tile2Wgs84;
+import org.wowtools.giscat.vector.util.cst.Tile2Wgs84;
 
 import static org.junit.Assert.assertEquals;
 

diff --git a/...t-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/demos/reload/WebDemoReload.java b/...t-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/demos/reload/WebDemoReload.java
@@ -8,7 +8,7 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.wowtools.giscat.util.analyse.Bbox;
+import org.wowtools.giscat.vector.util.analyse.Bbox;
 import org.wowtools.giscat.vector.mvt.MvtBuilder;
 import org.wowtools.giscat.vector.mvt.MvtLayer;
 import org.wowtools.giscat.vector.pojo.Feature;

diff --git a/giscat-vector/giscat-vector-pojo/pom.xml b/giscat-vector/giscat-vector-pojo/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>giscat-vector</artifactId>
         <groupId>org.wowtools</groupId>
-        <version>g1.5.1</version>
+        <version>g1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>giscat-vector-pojo</artifactId>
-    <version>g1.5.1</version>
+    <version>g1.5.2</version>
     <dependencies>
         <dependency>
             <groupId>org.locationtech.jts</groupId>

diff --git a/giscat-vector/giscat-vector-util/pom.xml b/giscat-vector/giscat-vector-util/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>giscat</artifactId>
         <groupId>org.wowtools</groupId>
-        <version>g1.5.1</version>
+        <version>g1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>giscat-vector-util</artifactId>
-    <version>g1.5.1</version>
+    <version>g1.5.2</version>
 
     <description>常用gis工具</description>
 

diff --git a/...rg/wowtools/giscat/util/analyse/Bbox.java → ...ools/giscat/vector/util/analyse/Bbox.java b/...rg/wowtools/giscat/util/analyse/Bbox.java → ...ools/giscat/vector/util/analyse/Bbox.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.util.analyse;
+package org.wowtools.giscat.vector.util.analyse;
 
 import org.locationtech.jts.geom.*;
 

diff --git a/...owtools/giscat/util/analyse/TileClip.java → .../giscat/vector/util/analyse/TileClip.java b/...owtools/giscat/util/analyse/TileClip.java → .../giscat/vector/util/analyse/TileClip.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.util.analyse;
+package org.wowtools.giscat.vector.util.analyse;
 
 import org.locationtech.jts.geom.*;
 

diff --git a/.../org/wowtools/giscat/util/cst/LonLat.java → ...wtools/giscat/vector/util/cst/LonLat.java b/.../org/wowtools/giscat/util/cst/LonLat.java → ...wtools/giscat/vector/util/cst/LonLat.java
@@ -1,4 +1,4 @@
-package org.wowtools.giscat.util.cst;
+package org.wowtools.giscat.vector.util.cst;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/.../wowtools/giscat/util/cst/Tile2Wgs84.java → ...ls/giscat/vector/util/cst/Tile2Wgs84.java b/.../wowtools/giscat/util/cst/Tile2Wgs84.java → ...ls/giscat/vector/util/cst/Tile2Wgs84.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.util.cst;
+package org.wowtools.giscat.vector.util.cst;
 
 import org.apache.commons.math.util.FastMath;
 

diff --git a/...g/wowtools/giscat/util/cst/Utm2Wgs84.java → ...ols/giscat/vector/util/cst/Utm2Wgs84.java b/...g/wowtools/giscat/util/cst/Utm2Wgs84.java → ...ols/giscat/vector/util/cst/Utm2Wgs84.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.util.cst;
+package org.wowtools.giscat.vector.util.cst;
 
 import lombok.Getter;
 import lombok.Setter;

diff --git a/...ls/giscat/util/cst/WebMercator2Wgs84.java → ...at/vector/util/cst/WebMercator2Wgs84.java b/...ls/giscat/util/cst/WebMercator2Wgs84.java → ...at/vector/util/cst/WebMercator2Wgs84.java
@@ -17,7 +17,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  ****************************************************************/
-package org.wowtools.giscat.util.cst;
+package org.wowtools.giscat.vector.util.cst;
 
 /**
  * web墨卡托与wgs84坐标互转

diff --git a/.../giscat/util/analyse/TileClipJmhTest.java → .../vector/util/analyse/TileClipJmhTest.java b/.../giscat/util/analyse/TileClipJmhTest.java → .../vector/util/analyse/TileClipJmhTest.java
@@ -1,4 +1,4 @@
-package org.wowtools.giscat.util.analyse;
+package org.wowtools.giscat.vector.util.analyse;
 
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Geometry;

diff --git a/...ols/giscat/util/analyse/TileClipTest.java → ...cat/vector/util/analyse/TileClipTest.java b/...ols/giscat/util/analyse/TileClipTest.java → ...cat/vector/util/analyse/TileClipTest.java
@@ -1,4 +1,4 @@
-package org.wowtools.giscat.util.analyse;
+package org.wowtools.giscat.vector.util.analyse;
 
 import org.locationtech.jts.geom.*;
 import org.locationtech.jts.io.ParseException;

diff --git a/...wtools/giscat/util/cst/Utm2Wgs84Test.java → ...giscat/vector/util/cst/Utm2Wgs84Test.java b/...wtools/giscat/util/cst/Utm2Wgs84Test.java → ...giscat/vector/util/cst/Utm2Wgs84Test.java
@@ -1,4 +1,4 @@
-package org.wowtools.giscat.util.cst;
+package org.wowtools.giscat.vector.util.cst;
 
 
 import org.junit.Assert;

diff --git a/giscat-vector/pom.xml b/giscat-vector/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>giscat</artifactId>
         <groupId>org.wowtools</groupId>
-        <version>g1.5.1</version>
+        <version>g1.5.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>giscat-vector</artifactId>
-    <version>g1.5.1</version>
+    <version>g1.5.2</version>
 
     <packaging>pom</packaging>
     <modules>

diff --git a/pom.xml b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>org.wowtools</groupId>
     <artifactId>giscat</artifactId>
     <packaging>pom</packaging>
-    <version>g1.5.1</version>
+    <version>g1.5.2</version>
     <name>giscat</name>
     <modules>
         <module>giscat-vector</module>
@@ -27,22 +27,22 @@
             <dependency>
                 <artifactId>giscat-vector-pojo</artifactId>
                 <groupId>org.wowtools</groupId>
-                <version>g1.5.1</version>
+                <version>g1.5.2</version>
             </dependency>
             <dependency>
                 <artifactId>giscat-vector-util</artifactId>
                 <groupId>org.wowtools</groupId>
-                <version>g1.5.1</version>
+                <version>g1.5.2</version>
             </dependency>
             <dependency>
                 <artifactId>giscat-vector-mvt</artifactId>
                 <groupId>org.wowtools</groupId>
-                <version>g1.5.1</version>
+                <version>g1.5.2</version>
             </dependency>
             <dependency>
                 <artifactId>giscat-vector-mbexpression</artifactId>
                 <groupId>org.wowtools</groupId>
-                <version>g1.5.1</version>
+                <version>g1.5.2</version>
             </dependency>
 
             <dependency>