From 5614f513f7ad80fa43321902d1213e0b14c07465 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 23 Aug 2023 14:08:09 +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/=E8=BD=A6=E9=81=93=E6=96=BD=E5=B7=A5=E6=B8=B2?= =?UTF-8?q?=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