增加对象类要素导入及渲染业务

app/src/main/assets/omdb_config.json

@@ -390,6 +390,52 @@
           }
         ]
       },
+      "3007": {
+        "table": "OMDB_OBJECT_WARNING_AREA",
+        "code": 3007,
+        "name": "警示区",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20
+      },
+      "3009": {
+        "table": "OMDB_OBJECT_BARRIER",
+        "code": 3009,
+        "name": "护栏",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20,
+        "transformer": [
+          {
+            "k": "geometry",
+            "v": "~",
+            "klib": "geometry",
+            "vlib": "generateMulToLine()"
+          }
+        ]
+      },
+      "3010": {
+        "table": "OMDB_OBJECT_WALL",
+        "code": 3010,
+        "name": "平行墙",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20,
+        "transformer": [
+          {
+            "k": "geometry",
+            "v": "~",
+            "klib": "geometry",
+            "vlib": "generateMulToLine()"
+          }
+        ]
+      },
       "3012": {
         "table": "OMDB_FILL_AREA",
         "code": 3012,
@@ -418,9 +464,19 @@
         "catch": true,
         "zoomMax": 20
       },
-      "3027": {
+      "3019": {
+        "table": "OMDB_OBJECT_CURB",
+        "code": 3019,
+        "name": "路牙",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20
+      },
+      "3028": {
         "table": "OMDB_OBJECT_REFUGE_ISLAND",
-        "code": 3027,
+        "code": 3028,
         "name": "路口内交通岛",
         "catch": true,
         "checkLinkId": true,

app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt

@@ -1373,4 +1373,16 @@ class ImportPreProcess {
             renderEntity.properties["text-src"] = "@text:${renderEntity.properties["maxSpeed"]}"
         }
     }
+
+    /**
+     * 多线转单线
+     * */
+    fun generateMulToLine(renderEntity: RenderEntity) {
+        val translateGeometry = renderEntity.wkt
+        if (translateGeometry != null) {
+            if (translateGeometry.geometryType == Geometry.TYPENAME_MULTILINESTRING) { // 如果是多线，只取第一条线
+                renderEntity.geometry =  renderEntity.wkt!!.getGeometryN(0).toString()
+            }
+        }
+    }
 }

app/src/main/java/com/navinfo/omqs/util/SignUtil.kt

@@ -816,6 +816,48 @@ class SignUtil {
                         else -> ""
                     }))
                 }
+                //路牙
+                DataCodeEnum.OMDB_OBJECT_CURB.code -> {
+                    list.add(TwoItemAdapterItem(title = "是否符合高精地图", text = when (data.properties["compliant"]) {
+                        "0" -> "否"
+                        "1" -> "是"
+                        else -> ""
+                    }))
+                }
+                //平行墙
+                DataCodeEnum.OMDB_OBJECT_WALL.code -> {
+                    list.add(TwoItemAdapterItem(title = "类型", text = when (data.properties["type"]) {
+                        "1" -> "隧道墙"
+                        "3" -> "其他墙"
+                        else -> ""
+                    }))
+                }
+                //警示区
+                DataCodeEnum.OMDB_OBJECT_WARNING_AREA.code -> {
+                    list.add(TwoItemAdapterItem(title = "颜色", text = when (data.properties["color"]) {
+                        "0" -> "未验证"
+                        "1" -> "白色"
+                        "2" -> "黄色"
+                        "3" -> "红色"
+                        else -> ""
+                    }))
+                    list.add(TwoItemAdapterItem(title = "材质", text = when (data.properties["material"]) {
+                        "1" -> "有突起的材质"
+                        "2" -> "喷漆材质"
+                        else -> ""
+                    }))
+                }
+                //护栏
+                DataCodeEnum.OMDB_OBJECT_BARRIER.code -> {
+                    list.add(TwoItemAdapterItem(title = "护栏类型", text = when (data.properties["barrierType"]) {
+                        "0" -> "护栏"
+                        "1" -> "新泽西护栏"
+                        "2" -> "安全护栏"
+                        "3" -> "围栏"
+                        "4" -> "其他护栏"
+                        else -> ""
+                    }))
+                }
             }
             adapter.data = list
             return adapter