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

 Conflicts:

	vtm

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

@@ -1510,7 +1510,7 @@
                 <line outline="kind0" use="trunk" fix="true" width="2.6"/>
             </m>
 
-            <m k="kind" v="4">width="0.4"
+            <m k="kind" v="4">
                 <line outline="kind0" use="primary:z11" fix="true" width="2.2"/>
             </m>
 

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

@@ -57,6 +57,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_OH_STRUCT("上方障碍物","3001"),
     OMDB_OBJECT_TEXT("文字", "3002"),
     OMDB_OBJECT_SYMBOL("符号", "3003"),
     OMDB_OBJECT_ARROW("箭头", "3004"),
@@ -65,6 +66,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
     OMDB_FILL_AREA("导流区", "3012"),
     OMDB_CROSS_WALK("人行横道", "3014"),
     OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
+    OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛","3027"),
     OMDB_INTERSECTION("路口", "4001"),
     OMDB_SPEEDLIMIT("常规点限速", "4002"),
     OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),

collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java

@@ -28,7 +28,7 @@ public class Constant {
     public static String[] HAD_LAYER_INVISIABLE_ARRAY;
     // 渲染引擎开始切割的级别
     public static final int OVER_ZOOM = 18;
-    public static final int MAX_ZOOM = 22;
+    public static final int MAX_ZOOM = 20;
     // 数据保存时的zoom
     public static final int DATA_ZOOM = 23;
     public static final int OMDB_MIN_ZOOM = 15;