diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 3414f1c2..cf436fe1 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, @@ -352,6 +367,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 e4751f9a..978f7352 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -413,6 +413,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 @@ -422,6 +423,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 @@ -438,6 +440,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 ade3a752..07064918 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2003,7 +2003,21 @@ - + + + + + + + @@ -2152,11 +2166,11 @@ - - @@ -2168,27 +2182,27 @@ - - - - - - @@ -2221,6 +2235,7 @@ + @@ -2315,5 +2330,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 new file mode 100644 index 00000000..13e9c47a --- /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_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 new file mode 100644 index 00000000..1bd2dffb --- /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/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/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");