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/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 88a006aa..a5f15f8f 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1587,9 +1587,6 @@ - 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 271e7b22..c31554d8 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 271e7b22785b0570a34c50476e17a98dfcca7e71 +Subproject commit c31554d80a4e8a16e90dfc00911478ab5897e674