Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

app/src/main/assets/omdb_config.json

@@ -49,7 +49,7 @@
 				"code": 2008,
 				"name": "道路种别",
 				"zoomMin": 15,
-				"zoomMax": 20,
+				"zoomMax": 17,
 				"catch":false,
 				"checkLinkId": false
 			},

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",

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

app/src/main/res/menu/personal_center_menu.xml

@@ -59,7 +59,7 @@
         <item
             android:id="@+id/personal_center_menu_version"
             android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：23QE4_V1.5.4_20230926_A" />
+            android:title="版本：23QE4_V1.5.5_20230927_A" />
     </group>
     <group android:checkableBehavior="single">
         <item android:title="小标题">