From 9ba310428f9e6f6fa1de448354c73f5bff7c4874 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Tue, 22 Aug 2023 17:44:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E8=B7=AF?= =?UTF-8?q?=E6=96=BD=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 From 5614f513f7ad80fa43321902d1213e0b14c07465 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 23 Aug 2023 14:08:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E8=B7=AF?= =?UTF-8?q?=E6=96=BD=E5=B7=A5/=E8=BD=A6=E9=81=93=E6=96=BD=E5=B7=A5?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 2 +- .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 6 ++++ .../com/navinfo/omqs/db/ImportPreProcess.kt | 12 +++++-- .../src/main/assets/editormarker.xml | 31 ++++++++++++------- .../src/main/assets/omdb/icon_2017_0.svg | 2 +- .../src/main/assets/omdb/icon_2017_1.svg | 1 + .../src/main/assets/omdb/icon_2017_2.svg | 1 + .../src/main/assets/omdb/icon_4023_0.svg | 2 +- .../src/main/assets/omdb/icon_4023_1.svg | 25 +++++++++++++++ vtm | 2 +- 10 files changed, 66 insertions(+), 18 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_2017_1.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2017_2.svg create mode 100644 collect-library/src/main/assets/omdb/icon_4023_1.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 8c9c787d..0f278b52 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -132,7 +132,7 @@ "2090":{ "table": "OMDB_LANE_CONSTRUCTION", "code": 2090, - "name": "道路边界类型", + "name": "车道施工", "zoomMin": 18, "zoomMax": 20, "checkLinkId": false 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 0259b13e..83d80bcb 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -422,6 +422,12 @@ class ImportOMDBHelper @AssistedInject constructor( } } } + }else if(renderEntity.code == DataCodeEnum.OMDB_LANE_CONSTRUCTION.code){ + //特殊处理空数据，渲染原则使用 + var startTime = renderEntity.properties["startTime"] + if(startTime==null||startTime=="") { + renderEntity.properties["startTime"] = "null" + } } listResult.add(renderEntity) 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 7bc86ec1..774e1120 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -231,7 +231,11 @@ class ImportPreProcess { if (renderEntity.table == table) { Log.e("qj","generateS2EReferencePoint===开始") if (renderEntity.properties.containsKey(proKey)) { - startReference.properties["type"] = "s_2_p_${renderEntity.properties[proKey]}" + if(renderEntity.properties[proKey]!=""){ + startReference.properties["type"] = "s_2_p_${renderEntity.properties[proKey]}" + }else{ + startReference.properties["type"] = "s_2_p_0" + } Log.e("qj","generateS2EReferencePoint===s_2_p_${renderEntity.properties[proKey]}") } } else { @@ -258,7 +262,11 @@ class ImportPreProcess { endReference.properties["qi_table"] = renderEntity.table if (renderEntity.table == table) { if (renderEntity.properties.containsKey(proKey)) { - endReference.properties["type"] = "e_2_p_${renderEntity.properties[proKey]}" + if(renderEntity.properties[proKey]!=""){ + endReference.properties["type"] = "e_2_p_${renderEntity.properties[proKey]}" + }else{ + endReference.properties["type"] = "e_2_p_0" + } } } else { endReference.properties["type"] = "e_2_p" diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 4780e800..069de8ad 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2007,7 +2007,7 @@ + src="assets:omdb/icon_4023_0.svg" symbol-height="56" symbol-width="56"> - - - - - - - - - - @@ -2338,5 +2327,23 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2017_0.svg b/collect-library/src/main/assets/omdb/icon_2017_0.svg index 819c9f5b..13e9c47a 100644 --- a/collect-library/src/main/assets/omdb/icon_2017_0.svg +++ b/collect-library/src/main/assets/omdb/icon_2017_0.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2017_1.svg b/collect-library/src/main/assets/omdb/icon_2017_1.svg new file mode 100644 index 00000000..9b5dc50f --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2017_1.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2017_2.svg b/collect-library/src/main/assets/omdb/icon_2017_2.svg new file mode 100644 index 00000000..f4e92eb2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2017_2.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 index d59830e7..1bd2dffb 100644 --- a/collect-library/src/main/assets/omdb/icon_4023_0.svg +++ b/collect-library/src/main/assets/omdb/icon_4023_0.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_4023_1.svg b/collect-library/src/main/assets/omdb/icon_4023_1.svg new file mode 100644 index 00000000..f7e002c8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_4023_1.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + 收费站 + + + + \ No newline at end of file diff --git a/vtm b/vtm index ebe23ed7..c06df01a 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit ebe23ed7731e301669b2b4ea03918e313a63617e +Subproject commit c06df01add423f5ef3beda3201597c96b57d983a From 207c61184da2d318d64206263121178ebe6f9e67 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 23 Aug 2023 14:18:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=9D=9E=E9=81=BF?= =?UTF-8?q?=E8=AE=A9=E5=B1=9E=E6=80=A7=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/assets/editormarker.xml | 20 +++++++++---------- vtm | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 069de8ad..f134f5de 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2166,11 +2166,11 @@ - - @@ -2182,27 +2182,27 @@ - - - - - - @@ -2338,10 +2338,10 @@ - + - + diff --git a/vtm b/vtm index c06df01a..46142c01 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit c06df01add423f5ef3beda3201597c96b57d983a +Subproject commit 46142c01c32056db6a661aad7e565c3c607c372f