diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 36599433..54adecf8 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -49,7 +49,7 @@
"code": 2008,
"name": "道路种别",
"zoomMin": 15,
- "zoomMax": 20,
+ "zoomMax": 17,
"catch":false,
"checkLinkId": false
},
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
index f1a83914..722435c5 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -346,7 +346,7 @@ class ImportOMDBHelper @AssistedInject constructor(
renderEntity.properties["boundaryType"]
if (boundaryType != null) {
when (boundaryType.toInt()) {
- 0, 1, 5, 7, 9 -> {
+ 0, 1,3,4, 5, 7, 9 -> {
renderEntity.enable = 0
Log.e(
"qj",
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
index d4996311..392db41d 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -582,7 +582,7 @@ class ImportPreProcess {
angleReference.renderEntityId = renderEntity.id
angleReference.name = "${renderEntity.name}车道中线面"
angleReference.table = renderEntity.table
- angleReference.geometry = GeometryTools.computeLine(0.00003,0.00003,renderEntity.geometry)
+ angleReference.geometry = GeometryTools.createGeometry(renderEntity.geometry).buffer(0.000035).toString()//GeometryTools.computeLine(0.000035,0.000035,renderEntity.geometry)
angleReference.properties["qi_table"] = renderEntity.table
angleReference.properties["widthProperties"] = "3"
angleReference.zoomMin = renderEntity.zoomMin
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index 48d8d485..f25dfe24 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -59,7 +59,7 @@
+ android:title="版本:23QE4_V1.5.5_20230927_A" />
-
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 62746515..6f995238 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1587,9 +1587,6 @@
-
@@ -2023,7 +2020,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1.svg b/collect-library/src/main/assets/omdb/arrowDirection/1.svg
index b6309773..ab21f09b 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/10.svg b/collect-library/src/main/assets/omdb/arrowDirection/10.svg
index 997e5a2c..6d29fbe8 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/10.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/10.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1025.svg b/collect-library/src/main/assets/omdb/arrowDirection/1025.svg
index f5d83583..04372e47 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1025.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1025.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1026.svg b/collect-library/src/main/assets/omdb/arrowDirection/1026.svg
index 47afaa40..66074edd 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1026.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1026.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1027.svg b/collect-library/src/main/assets/omdb/arrowDirection/1027.svg
index 0332107e..50f51569 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1027.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1027.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1028.svg b/collect-library/src/main/assets/omdb/arrowDirection/1028.svg
index f950ad4a..87a5b5b1 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1028.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1028.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1029.svg b/collect-library/src/main/assets/omdb/arrowDirection/1029.svg
index ca19abf8..bcf69af1 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1029.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1029.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1032.svg b/collect-library/src/main/assets/omdb/arrowDirection/1032.svg
index 71fcf524..57d2e275 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1032.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1032.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/11.svg b/collect-library/src/main/assets/omdb/arrowDirection/11.svg
index 776dec2f..1675ca4d 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/11.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/11.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/12.svg b/collect-library/src/main/assets/omdb/arrowDirection/12.svg
index 2808334e..500eb5aa 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/12.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/12.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/128.svg b/collect-library/src/main/assets/omdb/arrowDirection/128.svg
index ef00f92a..b349fadf 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/128.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/128.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/13.svg b/collect-library/src/main/assets/omdb/arrowDirection/13.svg
index 2f52b5d9..40db1c91 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/13.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/13.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/14.svg b/collect-library/src/main/assets/omdb/arrowDirection/14.svg
index 34714d8d..4e0bbba8 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/14.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/14.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/1536.svg b/collect-library/src/main/assets/omdb/arrowDirection/1536.svg
index da36d14d..11c8efe8 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/1536.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/1536.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/16.svg b/collect-library/src/main/assets/omdb/arrowDirection/16.svg
index fa97503c..f0a543d3 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/16.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/16.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/17.svg b/collect-library/src/main/assets/omdb/arrowDirection/17.svg
index 67721acd..0aa4f8f8 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/17.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/17.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/2.svg b/collect-library/src/main/assets/omdb/arrowDirection/2.svg
index 51b45c35..a6a178e3 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/2.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/2.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/2048.svg b/collect-library/src/main/assets/omdb/arrowDirection/2048.svg
index 4c36bca5..722a6f0a 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/2048.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/2048.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/256.svg b/collect-library/src/main/assets/omdb/arrowDirection/256.svg
index 8b9d0506..f18d7501 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/256.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/256.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/3.svg b/collect-library/src/main/assets/omdb/arrowDirection/3.svg
index 70d151fa..50906d77 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/3.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/3.svg
@@ -10,7 +10,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/32.svg b/collect-library/src/main/assets/omdb/arrowDirection/32.svg
index 76982ae0..9efde649 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/32.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/32.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/4.svg b/collect-library/src/main/assets/omdb/arrowDirection/4.svg
index af5b7770..7169274e 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/4.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/4.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/4096.svg b/collect-library/src/main/assets/omdb/arrowDirection/4096.svg
index 4fea3c82..5a4c38f0 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/4096.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/4096.svg
@@ -6,7 +6,7 @@
-
+
X
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/5.svg b/collect-library/src/main/assets/omdb/arrowDirection/5.svg
index 69b2dc1d..78b63583 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/5.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/5.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/513.svg b/collect-library/src/main/assets/omdb/arrowDirection/513.svg
index e807a30a..565001c0 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/513.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/513.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/514.svg b/collect-library/src/main/assets/omdb/arrowDirection/514.svg
index b8009126..4f9969f1 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/514.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/514.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/515.svg b/collect-library/src/main/assets/omdb/arrowDirection/515.svg
index b6a8529e..e70c0ef5 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/515.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/515.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/516.svg b/collect-library/src/main/assets/omdb/arrowDirection/516.svg
index 47e7e825..65695e59 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/516.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/516.svg
@@ -5,7 +5,7 @@
Created with Sketch.
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/517.svg b/collect-library/src/main/assets/omdb/arrowDirection/517.svg
index 3c06e6cd..5953b621 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/517.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/517.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/520.svg b/collect-library/src/main/assets/omdb/arrowDirection/520.svg
index dc201de2..6c91c9f7 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/520.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/520.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/6.svg b/collect-library/src/main/assets/omdb/arrowDirection/6.svg
index ee40261a..437f8629 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/6.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/6.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/64.svg b/collect-library/src/main/assets/omdb/arrowDirection/64.svg
index 402f065a..afdc3810 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/64.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/64.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/65.svg b/collect-library/src/main/assets/omdb/arrowDirection/65.svg
index 1d20e061..1aa1162a 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/65.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/65.svg
@@ -12,7 +12,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/66.svg b/collect-library/src/main/assets/omdb/arrowDirection/66.svg
index a2fa5046..dcb6e509 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/66.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/66.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/69.svg b/collect-library/src/main/assets/omdb/arrowDirection/69.svg
index aeb0ab3c..23fe2c52 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/69.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/69.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/7.svg b/collect-library/src/main/assets/omdb/arrowDirection/7.svg
index 3cb83ead..db22dd9a 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/7.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/7.svg
@@ -11,7 +11,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/8.svg b/collect-library/src/main/assets/omdb/arrowDirection/8.svg
index d9e21f19..71538c78 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/8.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/8.svg
@@ -9,7 +9,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/9.svg b/collect-library/src/main/assets/omdb/arrowDirection/9.svg
index 8e6c6b3b..dcc39cb2 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/9.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/9.svg
@@ -9,7 +9,7 @@
-
+
diff --git a/collect-library/src/main/assets/omdb/arrowDirection/test.svg b/collect-library/src/main/assets/omdb/arrowDirection/test.svg
index ef91d67e..3c3f985c 100644
--- a/collect-library/src/main/assets/omdb/arrowDirection/test.svg
+++ b/collect-library/src/main/assets/omdb/arrowDirection/test.svg
@@ -6,7 +6,7 @@
-
+
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
index 20c238f8..87c3a7bf 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java
@@ -1509,7 +1509,7 @@ public class GeometryTools {
/**
- * @param distLeft 单位km
+ * @param distLeft 0.00001为一米
* @param distRight 单位km
* @param wkt 几何
* @return
@@ -1518,7 +1518,8 @@ public class GeometryTools {
if(!TextUtils.isEmpty(wkt)){
Geometry lineString1 = GeometryTools.createGeometry(wkt);
BufferParameters parameters1 = new BufferParameters();
- parameters1.setEndCapStyle(BufferParameters.CAP_FLAT);
+ parameters1.setJoinStyle(BufferParameters.DEFAULT_QUADRANT_SEGMENTS);
+ parameters1.setEndCapStyle(BufferParameters.DEFAULT_QUADRANT_SEGMENTS);
parameters1.setSingleSided(true);
Geometry buffer = BufferOp.bufferOp(lineString1, distLeft, parameters1);
diff --git a/vtm b/vtm
index c046e788..50f7b028 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit c046e788f5c739612a31c308639fca2de639669a
+Subproject commit 50f7b028e7f3934a8c330ea8a54046d7d368682d