Merge branch 'master' of gitlab.navinfo.com:CollectVehicle/OneMapQS

 Conflicts:

	vtm

app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt

@@ -454,6 +454,12 @@ class ImportOMDBHelper @AssistedInject constructor(
                                         if(startTime==null||startTime=="") {
                                             renderEntity.properties["startTime"] = "null"
                                         }
+                                    } else if(renderEntity.code == DataCodeEnum.OMDB_POLE.code){ // 杆状物
+                                        //过滤树类型的杆状物，无需导入到数据库中
+                                        val poleType = renderEntity.properties["poleType"]
+                                        if(poleType!=null&&poleType.toInt()==2){
+                                            continue
+                                        }
                                     }
 
                                     listResult.add(renderEntity)

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

@@ -57,7 +57,12 @@ 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_TEXT("文字","3002"),
+    OMDB_OBJECT_TEXT("文字", "3002"),
+    OMDB_OBJECT_SYMBOL("符号", "3003"),
+    OMDB_OBJECT_ARROW("箭头", "3004"),
+    OMDB_TRAFFIC_SIGN("交通标牌", "3005"),
+    OMDB_POLE("杆状物", "3006"),
+    OMDB_FILL_AREA("导流区", "3012"),
     OMDB_CROSS_WALK("人行横道", "3014"),
     OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
     OMDB_INTERSECTION("路口", "4001"),