From 85e863c7b4c2ae831a125be62cbeaa3a1274f3bf Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 14 Aug 2023 17:08:47 +0800
Subject: [PATCH] merge code

---
 app/src/main/assets/omdb_config.json          |  26 ++++-
 .../com/navinfo/omqs/db/ImportOMDBHelper.kt   |  60 +++++++++-
 .../com/navinfo/omqs/db/ImportPreProcess.kt   |   9 +-
 .../src/main/assets/editormarker.xml          |  52 ++++++++-
 .../collect/library/enum/DataCodeEnum.kt      | 110 +++++++++++++++++-
 5 files changed, 244 insertions(+), 13 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index a7f5a8e2..325256e2 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -111,7 +111,7 @@
 			"name": "全封闭"
 		},
 		"2037": {
-			"table": "OMDB_FORM_OF_WAY",
+			"table": "OMDB_TAMP",
 			"code": 2037,
 			"name": "匝道"
 		},
@@ -156,6 +156,30 @@
 			"zoomMax": 20,
 			"transformer2Code": ""
 		},
+		"2204":{
+			"table": "OMDB_RoundAbout",
+			"code": 2204,
+			"name": "环岛",
+			"zoomMin": 15,
+			"zoomMax": 17,
+			"transformer2Code": ""
+		},
+		"2205":{
+			"table": "OMDB_LINK_FORM1",
+			"code": 2205,
+			"name": "道路形态1",
+			"zoomMin": 15,
+			"zoomMax": 17,
+			"transformer2Code": ""
+		},
+		"2206":{
+			"table": "OMDB_LINK_FORM2",
+			"code": 2206,
+			"name": "道路形态2",
+			"zoomMin": 15,
+			"zoomMax": 17,
+			"transformer2Code": ""
+		},
 		"4001": {
 			"table": "OMDB_INTERSECTION",
 			"code": 4001,
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 0de7cbab..707079c1 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -265,7 +265,7 @@ class ImportOMDBHelper @AssistedInject constructor(
                                     Log.e("qj","${renderEntity.name}==不包括任务linkPid")
                                 }
 
-                                //道路属性code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA
+                                //道路属性code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS
                                 if(renderEntity.table == "OMDB_LINK_ATTRIBUTE"){
 
                                     var type = renderEntity.properties["SA"]
@@ -276,8 +276,62 @@ class ImportOMDBHelper @AssistedInject constructor(
                                         type = renderEntity.properties["PA"]
                                         if(type!=null&&type=="1"){
                                             renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code
-                                        }else{//不满足条件时过滤该数据
-                                            continue
+                                        } else{
+                                            type = renderEntity.properties["FRONTAGE"]
+                                            if(type!=null&&type=="1"){
+                                                renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code
+                                            }else{
+                                                type = renderEntity.properties["MAIN_SIDE_ACCESS"]
+                                                if(type!=null&&type=="1"){
+                                                    renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code
+                                                }else{
+                                                    continue
+                                                }
+                                            }
+                                        }
+                                    }
+                                }else if(renderEntity.table == "OMDB_RAMP"){
+                                    /*匝道*/
+                                    var formWay = renderEntity.properties["FORM_OF_WAY"]
+                                    if(formWay!=null){
+                                        when (formWay) {
+                                            "93"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_1.code
+                                            "98"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_2.code
+                                            "99"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_3.code
+                                            "100"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_4.code
+                                            "102"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_5.code
+                                            "103"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_6.code
+                                            "104"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_7.code
+                                        }
+                                    }
+                                }else if(renderEntity.table == "OMDB_LINK_FORM1"){
+                                    /*道路形态1*/
+                                    var formWay = renderEntity.properties["FORM_OF_WAY"]
+                                    if(formWay!=null){
+                                        when (formWay) {
+                                            "35"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_1.code
+                                            "37"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_2.code
+                                            "38"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_3.code
+                                        }
+                                    }
+                                }else if(renderEntity.table == "OMDB_LINK_FORM2"){
+                                    /*道路形态2*/
+                                    var formWay = renderEntity.properties["FORM_OF_WAY"]
+                                    if(formWay!=null){
+                                        when (formWay) {
+                                            "10"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_1.code
+                                            "11"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_2.code
+                                            "17"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_3.code
+                                            "18"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_4.code
+                                            "20"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_5.code
+                                            "22"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_6.code
+                                            "36"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_7.code
+                                            "52"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_8.code
+                                            "53"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_9.code
+                                            "54"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_10.code
+                                            "60"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_11.code
+                                            "84"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_12.code
+                                            "85"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_13.code
                                         }
                                     }
                                 }
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 8c585df2..7f9df32f 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -3,6 +3,7 @@ package com.navinfo.omqs.db
 import android.util.Log
 import com.navinfo.collect.library.data.entity.ReferenceEntity
 import com.navinfo.collect.library.data.entity.RenderEntity
+import com.navinfo.collect.library.enum.DataCodeEnum
 import com.navinfo.collect.library.utils.GeometryTools
 import io.realm.Realm
 import org.json.JSONArray
@@ -457,10 +458,14 @@ class ImportPreProcess {
     fun generateRoadText(renderEntity: RenderEntity) {
         // 根据类型进行文字转换
         if (renderEntity.code != null) {
-            if(renderEntity.code=="2004-1"){
+            if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code){
                 renderEntity.properties["name"] = "SA"
-            }else if(renderEntity.code=="2004-2"){
+            }else if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code){
                 renderEntity.properties["name"] = "PA"
+            }else if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code){
+                renderEntity.properties["name"] = "FRONTAGE"
+            }else if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code){
+                renderEntity.properties["name"] = "MAIN"
             }
         }
     }
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index f78594ff..fd6f0968 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1951,8 +1951,8 @@
         </m>
 
         <m v="OMDB_AREA">
-<!--            <area use="sign-bg" repeat="false" src="assets:omdb/veer_side_walk.jpg" stroke="#ff0000" stroke-width="2"></area>-->
-            <area use="sign-bg" repeat="false" src="@text:人行横道" stroke="#ff0000" stroke-width="2"></area>
+<!--            <area use="sign-bg" repeat="false" src="assets:omdb/veer_side_walk.jpg" stroke="#ff0000" stroke-width="2"></area>
+            <area use="sign-bg" repeat="false" src="@text:人行横道" stroke="#ff0000" stroke-width="2"></area>-->
         </m>
         <!-- 路口 -->
         <m v="OMDB_INTERSECTION">
@@ -2113,7 +2113,53 @@
 
         <!-- 道路属性 -->
         <m v="OMDB_LINK_ATTRIBUTE">
-            <text use="road" size="16"></text>
+
+            <m k="code" v="OMDB_LINK_ATTRIBUTE_SA">
+                <text use="road" stroke="#fcba5a" size="16"></text>
+            </m>
+
+            <m k="code" v="OMDB_LINK_ATTRIBUTE_PA">
+                <text use="road" stroke="#fcba5a" size="16"></text>
+            </m>
+
+            <m k="code" v="OMDB_LINK_ATTRIBUTE_FORNTAGE">
+                <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            </m>
+
+            <m k="code" v="OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS">
+                <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+            </m>
+
+        </m>
+
+        <!-- 匝道 -->
+        <m v="OMDB_RAMP">
+             <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+        </m>
+
+        <!-- 上下线分离 -->
+        <m v="OMDB_MULTI_DIGITIZED">
+            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+        </m>
+
+        <!-- 全封闭 -->
+        <m v="OMDB_CON_ACESS">
+            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+        </m>
+
+        <!-- 高架 -->
+        <m v="OMDB_VIADUCT">
+            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+        </m>
+
+        <!-- 道路形态1 -->
+        <m v="OMDB_LINK_FORM1">
+            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
+        </m>
+
+        <!-- 道路形态2 -->
+        <m v="OMDB_LINK_FORM2">
+            <line dasharray="10,2,2,2,2,2" repeat-start="0" stroke="#fcba5a" width="0.2" />
         </m>
 
         <!--常规点限速-->
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
index 4d9c390c..81ff0844 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
@@ -13,6 +13,14 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
         "道路属性-PA",
         "2004-2"
     ),
+    OMDB_LINK_ATTRIBUTE_FORNTAGE(
+        "道路属性-辅路",
+        "2004-3"
+    ),
+    OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS(
+        "道路属性-主辅路出入口",
+        "2004-4"
+    ),
     OMDB_RD_LINK_KIND("道路种别", "2008"),
     OMDB_LINK_DIRECT("道路方向", "2010"), OMDB_LINK_NAME(
         "道路名",
@@ -24,16 +32,110 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
         "2020"
     ),
     OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"),
-    OMDB_CON_ACCESS("全封闭", "2022"), OMDB_FORM_OF_WAY(
-        "匝道",
-        "2037"
+    OMDB_CON_ACCESS("全封闭", "2022"), OMDB_RAMP_1(
+        "普通路连接匝道",
+        "2037-1"
+    ),
+    OMDB_RAMP_2(
+        "高速入口匝道",
+        "2037-2"
+    ),
+    OMDB_RAMP_3(
+        "高速出口匝道",
+        "2037-3"
+    ),
+    OMDB_RAMP_4(
+        "高速连接匝道",
+        "2037-4"
+    ),
+    OMDB_RAMP_5(
+        "高速直连入口匝道",
+        "2037-5"
+    ),
+    OMDB_RAMP_6(
+        "高速直连出口匝道",
+        "2037-6"
+    ),
+    OMDB_RAMP_7(
+        "高速直连出口匝道高速出入口匝道",
+        "2037-7"
     ),
     OMDB_MULTI_DIGITIZED("上下线分离", "2040"), OMDB_LANE_NUM("车道数", "2041"),
+    OMDB_VIADUCT("高架", "2043"),
     OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"), OMDB_BRIDGE(
         "桥",
         "2201"
     ),
-    OMDB_TUNNEL("隧道", "2202"), OMDB_INTERSECTION("路口", "4001"),
+    OMDB_TUNNEL("隧道", "2202"),
+    OMDB_RoundAbout(
+        "环岛",
+        "2204"
+    ),
+    OMDB_LINK_FORM1_1(
+        "U-Turn",
+        "2205-1"
+    ),
+    OMDB_LINK_FORM1_2(
+        "提前右转",
+        "2205-2"
+    ),
+    OMDB_LINK_FORM1_3(
+        "提前左转",
+        "2205-3"
+    ),
+    OMDB_LINK_FORM2_1(
+        "IC",
+        "2206-1"
+    ),
+    OMDB_LINK_FORM2_2(
+        "JCT",
+        "2206-2"
+    ),
+    OMDB_LINK_FORM2_3(
+        "跨线地道",
+        "2206-3"
+    ),
+    OMDB_LINK_FORM2_4(
+        "私道",
+        "2206-4"
+    ),
+    OMDB_LINK_FORM2_5(
+        "步行街",
+        "2206-5"
+    ),
+    OMDB_LINK_FORM2_6(
+        "公交专用道",
+        "2206-6"
+    ),
+    OMDB_LINK_FORM2_7(
+        "POI 连接路",
+        "2206-7"
+    ),
+    OMDB_LINK_FORM2_8(
+        "区域内道路",
+        "2206-8"
+    ),
+    OMDB_LINK_FORM2_9(
+        "停车场出入口连接路",
+        "2206-9"
+    ),
+    OMDB_LINK_FORM2_10(
+        "停车场内部虚拟连接路",
+        "2206-10"
+    ),
+    OMDB_LINK_FORM2_11(
+        "风景路线",
+        "2206-11"
+    ),OMDB_LINK_FORM2_12(
+        "车辆测试路段",
+        "2206-12"
+    ),
+    OMDB_LINK_FORM2_13(
+        "驾照考试路段",
+        "2206-13"
+    ),
+
+    OMDB_INTERSECTION("路口", "4001"),
     OMDB_SPEEDLIMIT("常规点限速", "4002"), OMDB_SPEEDLIMIT_COND(
         "条件点限速",
         "4003"