From 9ba310428f9e6f6fa1de448354c73f5bff7c4874 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Tue, 22 Aug 2023 17:44:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E8=B7=AF=E6=96=BD?= =?UTF-8?q?=E5=B7=A5=E5=8F=8A=E8=BD=A6=E9=81=93=E6=96=BD=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 24 ++++++++++++++++ .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 2 ++ .../src/main/assets/editormarker.xml | 28 ++++++++++++++++++- .../src/main/assets/omdb/icon_2017_0.svg | 1 + .../src/main/assets/omdb/icon_4023_0.svg | 1 + .../collect/library/enums/DataCodeEnum.kt | 7 +++-- vtm | 2 +- 7 files changed, 61 insertions(+), 4 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_2017_0.svg create mode 100644 collect-library/src/main/assets/omdb/icon_4023_0.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index f255bebc..8c9c787d 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -88,6 +88,13 @@ } ] }, + "2017": { + "table": "OMDB_LINK_CONSTRUCTION", + "code": 2017, + "name": "道路施工", + "zoomMin": 15, + "zoomMax": 17 + }, "2019": { "table": "OMDB_LINK_SPEEDLIMIT", "code": 2019, @@ -122,6 +129,14 @@ "zoomMax": 20, "checkLinkId": false }, + "2090":{ + "table": "OMDB_LANE_CONSTRUCTION", + "code": 2090, + "name": "道路边界类型", + "zoomMin": 18, + "zoomMax": 20, + "checkLinkId": false + }, "2201":{ "table": "OMDB_BRIDGE", "code": 2201, @@ -319,6 +334,15 @@ "transformer": [ ] }, + "4023": { + "table": "OMDB_TOLLGATE", + "code": 4023, + "name": "收费站", + "zoomMin": 15, + "zoomMax": 20, + "transformer": [ + ] + }, "4601":{ "table": "OMDB_LANEINFO", "code": 4601, 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 f163c774..0259b13e 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -395,6 +395,7 @@ class ImportOMDBHelper @AssistedInject constructor( var formOfWay = renderEntity.properties["formOfWay"] if(formOfWay!=null&&formOfWay=="30"){ renderEntity.enable=2 + renderEntity.code = DataCodeEnum.OMDB_NODE_FORM.code }else{ Log.e("qj","过滤不显示数据${renderEntity.table}") continue @@ -404,6 +405,7 @@ class ImportOMDBHelper @AssistedInject constructor( var attributeType = renderEntity.properties["attributeType"] if(attributeType!=null&&attributeType=="30"){ renderEntity.enable=2 + renderEntity.code = DataCodeEnum.OMDB_NODE_PA.code }else{ Log.e("qj","过滤不显示数据${renderEntity.table}") continue diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index bba9dfa9..4780e800 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2003,7 +2003,21 @@ - + + + + + + + @@ -2221,6 +2235,18 @@ + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/icon_2017_0.svg b/collect-library/src/main/assets/omdb/icon_2017_0.svg new file mode 100644 index 00000000..819c9f5b --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2017_0.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4023_0.svg b/collect-library/src/main/assets/omdb/icon_4023_0.svg new file mode 100644 index 00000000..d59830e7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_4023_0.svg @@ -0,0 +1 @@ + \ 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 26e298de..ad6c96bb 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 @@ -4,8 +4,8 @@ package com.navinfo.collect.library.enums * 要素枚举定义 * */ enum class DataCodeEnum(var tableName: String, var code: String) { - OMDB_NODE_FORM("点形态", "1007"), - OMDB_NODE_PA("点形态PA", "1007"), + OMDB_NODE_FORM("点形态", "1007-6"), + OMDB_NODE_PA("点形态PA", "1007-6"), OMDB_CHECKPOINT("检查点", "1012"), OMDB_RD_LINK("道路线", "2001"), OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"), @@ -18,6 +18,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_LINK_DIRECT("道路方向", "2010"), OMDB_LINK_NAME("道路名", "2011"), OMDB_LANE_MARK_BOUNDARYTYPE("车道边界类型", "2013"), + OMDB_LINK_CONSTRUCTION("道路施工", "2017"), OMDB_LINK_SPEEDLIMIT("常规线限速", "2019"), OMDB_LINK_SPEEDLIMIT_COND("条件线限速", "2020"), OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"), @@ -34,6 +35,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_LANE_NUM("车道数", "2041"), OMDB_VIADUCT("高架", "2043"), OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"), + OMDB_LANE_CONSTRUCTION("车道施工", "2090"), OMDB_BRIDGE("桥", "2201"), OMDB_TUNNEL("隧道", "2202"), OMDB_ROUNDABOUT("环岛", "2204"), @@ -63,6 +65,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_RESTRICTION("普通交限", "4006"), OMDB_ELECTRONICEYE("电子眼", "4010"), OMDB_TRAFFICLIGHT("交通灯", "4022"), + OMDB_TOLLGATE("收费站", "4023"), OMDB_LANEINFO("车信", "4601"), OMDB_LANE_LINK_LG("车道中心线", "5001"); diff --git a/vtm b/vtm index bd83adb7..ebe23ed7 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit bd83adb7df464686b3f19e8a08aeef2cb49f5c17 +Subproject commit ebe23ed7731e301669b2b4ea03918e313a63617e