From a310df91e14bf8e6638ba2a20b0070879e3504dd Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Tue, 22 Aug 2023 11:19:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=93=81=E8=B7=AF=E9=81=93?= =?UTF-8?q?=E5=8F=A3=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 | 23 +++++++++++-- .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 30 ++++++++++++++++ .../src/main/assets/editormarker.xml | 34 ++++++++----------- .../src/main/assets/omdb/icon_1007_0.svg | 1 + .../collect/library/enums/DataCodeEnum.kt | 3 ++ 5 files changed, 68 insertions(+), 23 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_1007_0.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 09cfbb01..f255bebc 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -2,12 +2,28 @@ { "tableGroupName": "普通图层", "tableMap" : { + "1007": { + "table": "OMDB_NODE_FORM", + "code": 1007, + "name": "点形态", + "zoomMin": 15, + "zoomMax": 20, + "checkLinkId": false + }, + "1007_PA": { + "table": "OMDB_NODE_PA", + "code": 1007, + "name": "点形态PA", + "zoomMin": 15, + "zoomMax": 20, + "checkLinkId": false + }, "1012": { "table": "OMDB_CHECKPOINT", "code": 1012, "name": "检查点", "zoomMin": 15, - "zoomMax": 19 + "zoomMax": 20 }, "2001": { "table": "OMDB_RD_LINK", @@ -141,7 +157,8 @@ "code": 3016, "name": "停止位置", "zoomMin": 18, - "zoomMax": 20 + "zoomMax": 20, + "checkLinkId": false }, "4001": { "table": "OMDB_INTERSECTION", @@ -359,7 +376,7 @@ "code": 2004, "name": "道路属性", "zoomMin": 15, - "zoomMax": 19, + "zoomMax": 20, "transformer": [ { "k": "geometry", 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 e54d170f..f163c774 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -390,6 +390,36 @@ class ImportOMDBHelper @AssistedInject constructor( } } } + }else if(renderEntity.table == DataCodeEnum.OMDB_NODE_FORM.name){//特殊处理，因为code相同，使用表名判断 + //过滤不需要渲染的要素 + var formOfWay = renderEntity.properties["formOfWay"] + if(formOfWay!=null&&formOfWay=="30"){ + renderEntity.enable=2 + }else{ + Log.e("qj","过滤不显示数据${renderEntity.table}") + continue + } + }else if(renderEntity.table == DataCodeEnum.OMDB_NODE_PA.name){//特殊处理，因为code相同，使用表名判断 + //过滤不需要渲染的要素 + var attributeType = renderEntity.properties["attributeType"] + if(attributeType!=null&&attributeType=="30"){ + renderEntity.enable=2 + }else{ + Log.e("qj","过滤不显示数据${renderEntity.table}") + continue + } + }else if(renderEntity.code == DataCodeEnum.OMDB_OBJECT_STOPLOCATION.code){ + //过滤不需要渲染的要素 + var locationType = renderEntity.properties["locationType"] + if(locationType!=null){ + when (locationType) { + "3","4"->{ + renderEntity.enable=0 + Log.e("qj","过滤不显示数据${renderEntity.table}") + continue + } + } + } } listResult.add(renderEntity) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index d571b5e0..bba9dfa9 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1987,12 +1987,23 @@ - + + + + + + + + + + @@ -2193,10 +2204,10 @@ - + - + @@ -2208,23 +2219,6 @@ - - diff --git a/collect-library/src/main/assets/omdb/icon_1007_0.svg b/collect-library/src/main/assets/omdb/icon_1007_0.svg new file mode 100644 index 00000000..37555e34 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_1007_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 539457f9..26e298de 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,6 +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_CHECKPOINT("检查点", "1012"), OMDB_RD_LINK("道路线", "2001"), OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"), @@ -53,6 +55,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_LINK_FORM2_11("风景路线", "2206-11"), OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"), OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"), + OMDB_OBJECT_STOPLOCATION("停止位置", "3016"), OMDB_INTERSECTION("路口", "4001"), OMDB_SPEEDLIMIT("常规点限速", "4002"), OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),