fix: 合并代码

collect-library/src/main/assets/editormarker.xml

@@ -1971,12 +1971,9 @@
             <m k="type" v="node">
                 <symbol src="assets:symbols/dot_blue_dark.svg"></symbol>
             </m>
-<!--            <m k="intersectionPid">
+            <m k="intersectionPid">
                 <symbol src="assets:symbols/dot_magenta.svg"></symbol>
-            </m>-->
-<!--            <m k="geometry">
-                <symbol src="@typesrc"></symbol>
-            </m>-->
+            </m>
         </m>
 
         <!--车道中心线-->

collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt

@@ -62,6 +62,7 @@ open class RenderEntity() : RealmObject(), Parcelable {
     var zoomMin: Int = 18 //显示最小级别
     var zoomMax: Int = 23 //显示最大级别
     var enable:Int = 0 // 默认0不是显示 1为渲染显示 2为常显
+    var catchEnable:Int = 0 // 0捕捉 1不捕捉
 
     constructor(name: String) : this() {
         this.name = name

collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt

@@ -72,13 +72,13 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
     OMDB_LANE_LINK_LG("车道中心线", "5001");
 
     companion object {
-        fun findTableNameByCode(code: String): String? {
+        fun findTableNameByCode(code: String): String {
             for (enumInstance in DataCodeEnum.values()) {
                 if (enumInstance.code == code) {
                     return enumInstance.tableName
                 }
             }
-            return null // 若未找到匹配的 code，则返回 null 或其他适当的默认值
+            return "" // 若未找到匹配的 code，则返回 null 或其他适当的默认值
         }
     }
 }

collect-library/src/main/java/com/navinfo/collect/library/map/handler/MarkHandler.kt

@@ -345,6 +345,16 @@ class MarkHandler(context: AppCompatActivity, mapView: NIMapView) :
         }
     }
 
+    fun removeMarker() {
+        for (e in mDefaultMarkerLayer.itemList) {
+            if (e is MarkerItem) {
+                mDefaultMarkerLayer.removeItem(e)
+                break
+            }
+        }
+        mMapView.vtmMap.updateMap(true)
+    }
+
 
     /**
      * 增加或更新marker

collect-library/src/main/java/com/navinfo/collect/library/utils/AssetsFileLoadUtil.kt

@@ -0,0 +1,12 @@
+package com.navinfo.collect.library.utils
+
+import android.content.Context
+import java.io.InputStream
+
+class AssetsFileLoadUtil {
+    companion object {
+        fun loadWarningSvg(context: Context, code: String): InputStream? {
+            return context.assets.open("omdb/appendix/1105_${code}_0.svg")
+        }
+    }
+}