diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index d7c5d125..5dd373d9 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/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,
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 0fff377c..6bc10a98 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/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()
+ }
+ }
+ }
}
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
index 7ac5fbea..fc2be460 100644
--- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
+++ b/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
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 09903d8e..1d0a272e 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1785,6 +1785,53 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1958,14 +2005,16 @@
-
-
+ -->
+
-
-
+ -->
+
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_0.svg b/collect-library/src/main/assets/omdb/icon_3007_0.svg
new file mode 100644
index 00000000..5cd7a867
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_0.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_1.svg b/collect-library/src/main/assets/omdb/icon_3007_1.svg
new file mode 100644
index 00000000..92b42e64
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_1.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_2.svg b/collect-library/src/main/assets/omdb/icon_3007_2.svg
new file mode 100644
index 00000000..2ae3a4a2
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_2.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_3.svg b/collect-library/src/main/assets/omdb/icon_3007_3.svg
new file mode 100644
index 00000000..80f04c4a
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_3.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
index 95799a6c..a89155ab 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
@@ -71,10 +71,14 @@ public enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_OBJECT_ARROW("箭头", "3004"),
OMDB_TRAFFIC_SIGN("交通标牌", "3005"),
OMDB_POLE("杆状物", "3006"),
+ OMDB_OBJECT_WARNING_AREA("警示区", "3007"),
+ OMDB_OBJECT_BARRIER("护栏", "3009"),
+ OMDB_OBJECT_WALL("平行墙", "3010"),
OMDB_FILL_AREA("导流区", "3012"),
OMDB_CROSS_WALK("人行横道", "3014"),
OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
- OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛", "3027"),
+ OMDB_OBJECT_CURB("路牙", "3019"),
+ OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛", "3028"),
OMDB_INTERSECTION("路口", "4001"),
OMDB_SPEEDLIMIT("常规点限速", "4002"),
OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),
diff --git a/vtm b/vtm
index 30e94bcd..c2d87b10 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 30e94bcd06009bcb3f4c469ee7bb8062334d6124
+Subproject commit c2d87b1095d493a70a6b3a7aa366f9e6042300db