From 5b8fc3cef57ef768e779e30690bb502aa7e7d7e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E9=9B=A8?= <liuyu@wowtools.org>
Date: Mon, 16 Jan 2023 17:39:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 giscat-vector/giscat-vector-mbexpression/pom.xml       |  4 ++--
 .../vector/mbexpression/spatial/BboxIntersection.java  |  2 +-
 .../vector/mbexpression/spatial/BboxIntersects.java    |  2 +-
 .../giscat/vector/mbexpression/spatial/Read.java       |  4 ++--
 .../giscat/vector/mbexpression/ExpressionTest.java     |  4 ++--
 giscat-vector/giscat-vector-mvt/pom.xml                |  4 ++--
 .../org/wowtools/giscat/vector/mvt/MvtBuilder.java     |  6 +++---
 .../java/org/wowtools/giscat/vector/mvt/MvtLayer.java  |  2 +-
 .../giscat/vector/mvt/MvtCoordinateConvertorTest.java  |  2 +-
 .../giscat/vector/mvt/demos/reload/WebDemoReload.java  |  2 +-
 giscat-vector/giscat-vector-pojo/pom.xml               |  4 ++--
 giscat-vector/giscat-vector-util/pom.xml               |  4 ++--
 .../giscat/{ => vector}/util/analyse/Bbox.java         |  2 +-
 .../giscat/{ => vector}/util/analyse/TileClip.java     |  2 +-
 .../wowtools/giscat/{ => vector}/util/cst/LonLat.java  |  2 +-
 .../giscat/{ => vector}/util/cst/Tile2Wgs84.java       |  2 +-
 .../giscat/{ => vector}/util/cst/Utm2Wgs84.java        |  2 +-
 .../{ => vector}/util/cst/WebMercator2Wgs84.java       |  2 +-
 .../{ => vector}/util/analyse/TileClipJmhTest.java     |  2 +-
 .../giscat/{ => vector}/util/analyse/TileClipTest.java |  2 +-
 .../giscat/{ => vector}/util/cst/Utm2Wgs84Test.java    |  2 +-
 giscat-vector/pom.xml                                  |  4 ++--
 pom.xml                                                | 10 +++++-----
 23 files changed, 36 insertions(+), 36 deletions(-)
 rename giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/{ => vector}/util/analyse/Bbox.java (98%)
 rename giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/{ => vector}/util/analyse/TileClip.java (99%)
 rename giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/{ => vector}/util/cst/LonLat.java (89%)
 rename giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/{ => vector}/util/cst/Tile2Wgs84.java (98%)
 rename giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/{ => vector}/util/cst/Utm2Wgs84.java (99%)
 rename giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/{ => vector}/util/cst/WebMercator2Wgs84.java (98%)
 rename giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/{ => vector}/util/analyse/TileClipJmhTest.java (98%)
 rename giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/{ => vector}/util/analyse/TileClipTest.java (97%)
 rename giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/{ => vector}/util/cst/Utm2Wgs84Test.java (96%)

diff --git a/giscat-vector/giscat-vector-mbexpression/pom.xml b/giscat-vector/giscat-vector-mbexpression/pom.xml
index cd435e1..6b49635 100644
--- 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/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersection.java b/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersection.java
index fbab162..04d09fa 100644
--- a/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersection.java
+++ b/giscat-vector/giscat-vector-mbexpression/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/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersects.java b/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersects.java
index 98c241d..23cfd0d 100644
--- a/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/BboxIntersects.java
+++ b/giscat-vector/giscat-vector-mbexpression/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/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/Read.java b/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/Read.java
index 4ae640c..97e1ead 100644
--- a/giscat-vector/giscat-vector-mbexpression/src/main/java/org/wowtools/giscat/vector/mbexpression/spatial/Read.java
+++ b/giscat-vector/giscat-vector-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/giscat-vector/giscat-vector-mbexpression/src/test/java/org/wowtools/giscat/vector/mbexpression/ExpressionTest.java b/giscat-vector/giscat-vector-mbexpression/src/test/java/org/wowtools/giscat/vector/mbexpression/ExpressionTest.java
index f5ec7d1..86c1d3b 100644
--- a/giscat-vector/giscat-vector-mbexpression/src/test/java/org/wowtools/giscat/vector/mbexpression/ExpressionTest.java
+++ b/giscat-vector/giscat-vector-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
index 616ea10..c992c92 100644
--- 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
index 102d84a..01844e3 100644
--- 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
index 5a61b63..887a3bd 100644
--- 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/giscat-vector/giscat-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/MvtCoordinateConvertorTest.java b/giscat-vector/giscat-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/MvtCoordinateConvertorTest.java
index ae0618b..c038f28 100644
--- a/giscat-vector/giscat-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/MvtCoordinateConvertorTest.java
+++ b/giscat-vector/giscat-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/giscat-vector/giscat-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/demos/reload/WebDemoReload.java b/giscat-vector/giscat-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/demos/reload/WebDemoReload.java
index f11689e..ca1fb42 100644
--- a/giscat-vector/giscat-vector-mvt/src/test/java/org/wowtools/giscat/vector/mvt/demos/reload/WebDemoReload.java
+++ b/giscat-vector/giscat-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
index e29422c..a2c032d 100644
--- 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
index ebc2744..8338d29 100644
--- 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/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/analyse/Bbox.java b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/analyse/Bbox.java
similarity index 98%
rename from giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/analyse/Bbox.java
rename to giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/analyse/Bbox.java
index 48bc02e..8038563 100644
--- a/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/analyse/Bbox.java
+++ b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/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/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/analyse/TileClip.java b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/analyse/TileClip.java
similarity index 99%
rename from giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/analyse/TileClip.java
rename to giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/analyse/TileClip.java
index 0fe07b1..89e32c7 100644
--- a/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/analyse/TileClip.java
+++ b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/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/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/LonLat.java b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/LonLat.java
similarity index 89%
rename from giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/LonLat.java
rename to giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/LonLat.java
index 72b95d5..c34e80f 100644
--- a/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/LonLat.java
+++ b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/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/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/Tile2Wgs84.java b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/Tile2Wgs84.java
similarity index 98%
rename from giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/Tile2Wgs84.java
rename to giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/Tile2Wgs84.java
index 900c034..9b6e9aa 100644
--- a/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/Tile2Wgs84.java
+++ b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/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/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/Utm2Wgs84.java b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/Utm2Wgs84.java
similarity index 99%
rename from giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/Utm2Wgs84.java
rename to giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/Utm2Wgs84.java
index 9270783..650e09a 100644
--- a/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/Utm2Wgs84.java
+++ b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/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/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/WebMercator2Wgs84.java b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/WebMercator2Wgs84.java
similarity index 98%
rename from giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/WebMercator2Wgs84.java
rename to giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/vector/util/cst/WebMercator2Wgs84.java
index c30b0c0..9b573bb 100644
--- a/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/util/cst/WebMercator2Wgs84.java
+++ b/giscat-vector/giscat-vector-util/src/main/java/org/wowtools/giscat/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-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/analyse/TileClipJmhTest.java b/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/vector/util/analyse/TileClipJmhTest.java
similarity index 98%
rename from giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/analyse/TileClipJmhTest.java
rename to giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/vector/util/analyse/TileClipJmhTest.java
index ef784dd..cf2490d 100644
--- a/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/analyse/TileClipJmhTest.java
+++ b/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/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/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/analyse/TileClipTest.java b/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/vector/util/analyse/TileClipTest.java
similarity index 97%
rename from giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/analyse/TileClipTest.java
rename to giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/vector/util/analyse/TileClipTest.java
index 3a5069f..c280081 100644
--- a/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/analyse/TileClipTest.java
+++ b/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/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/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/cst/Utm2Wgs84Test.java b/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/vector/util/cst/Utm2Wgs84Test.java
similarity index 96%
rename from giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/cst/Utm2Wgs84Test.java
rename to giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/vector/util/cst/Utm2Wgs84Test.java
index cb2d44f..e0521b8 100644
--- a/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/giscat/util/cst/Utm2Wgs84Test.java
+++ b/giscat-vector/giscat-vector-util/src/test/java/org/wowtools/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
index 8b16574..9caa623 100644
--- 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
index f78d949..0cbcf2c 100644
--- 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>