fix: 合并代码

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

@@ -178,6 +178,10 @@
     <style-line id="boundaryType" stipple-width="0.1" width="0.1" />
     <style-line dasharray="1,1" id="s2e" repeat-gap="3" repeat-start="0" stroke="#14582c"
         width="0.1" />
+
+    <!--道路形态-->
+    <style-line dasharray="8,2,2,2,2,2" id="road_morphology" repeat-gap="3" repeat-start="0" stroke="#fcba5a" width="0.2" />
+
     <!--###### ASSIGNMENT ######-->
 
     <m e="way" k="natural" v="issea|sea">
@@ -1951,8 +1955,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">
@@ -1972,6 +1976,9 @@
             <m k="width" v="~">
                 <line stroke="#7A88A0" width="2.8" />
             </m>
+            <m k="width" v="~">
+                <line stroke="#4624FF" width="0.1" />
+            </m>
         </m>
 
         <!--隧道-->
@@ -2031,9 +2038,12 @@
         <!-- 道路边界类型 -->
         <m v="OMDB_RDBOUND_BOUNDARYTYPE">
             <outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
-            <m k="boundaryType" v="0|2|3|4|5|6|7|8|9">
+            <m k="boundaryType" v="2|6|8">
                 <line stroke="#ffffff" use="boundaryType" width="0.1"/>
             </m>
+<!--            <m k="boundaryType" v="0|2|3|4|5|6|7|8|9">
+                <line stroke="#ffffff" use="boundaryType" width="0.1"/>
+            </m>-->
             <m k="boundaryType" v="1">
                 <!--无标线无可区分边界-->
                 <line dasharray="5,5" repeat-start="0" stroke="#ffffff" width="0.2"/>
@@ -2046,9 +2056,9 @@
             <outline-layer id="boundary" stroke="#ffffff" width="0.1" />
 
             <!--只区分虚线与实线-->
-            <m k="boundaryType" v="1">
+<!--            <m k="boundaryType" v="1">
                 <line dasharray="5,5" repeat-start="5" stroke="#90A0BD" width="0.05"/>
-            </m>
+            </m>-->
 
             <m k="boundaryType" v="2">
                 <!--标线-->
@@ -2079,31 +2089,84 @@
 
                         <!--其他|实线-->
                         <m k="markColor" v="1">
-                            <line dasharray="5,5" repeat-start="0" stroke="#ffffff" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#ffffff" width="0.1"/>
                         </m>
                         <m k="markColor" v="2">
-                            <line dasharray="5,5" repeat-start="0" stroke="#eccc68" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#eccc68" width="0.1"/>
                         </m>
 
                         <m k="markColor" v="6">
-                            <line dasharray="5,5" repeat-start="0" stroke="#0000ff" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#0000ff" width="0.1"/>
                         </m>
 
                         <m k="markColor" v="7">
-                            <line dasharray="5,5" repeat-start="0" stroke="#00ff00" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#00ff00" width="0.1"/>
                         </m>
 
                         <m k="markColor" v="0|9">
-                            <line dasharray="5,5" repeat-start="0" stroke="#8e44ad" width="0.1"/>
+                            <line dasharray="2,2" repeat-start="0" stroke="#8e44ad" width="0.1"/>
                         </m>
 
                     </m>
                 </m>
             </m>
-
-            <m k="boundaryType" v="0|3|4|5|6|7|8|9">
+            <m k="boundaryType" v="3|4|5|7">
                 <line stroke="#ffffff" use="boundaryType" />
             </m>
+<!--            <m k="boundaryType" v="0|3|4|5|6|7|8|9">
+                <line stroke="#ffffff" use="boundaryType" />
+            </m>-->
+        </m>
+
+        <!-- 道路属性 -->
+        <m v="OMDB_LINK_ATTRIBUTE">
+
+            <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 use="road_morphology" />
+            </m>
+
+            <m k="code" v="OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS">
+                <line use="road_morphology" />
+            </m>
+
+        </m>
+
+        <!-- 匝道 -->
+        <m v="OMDB_RAMP">
+            <line use="road_morphology" />
+        </m>
+
+        <!-- 上下线分离 -->
+        <m v="OMDB_MULTI_DIGITIZED">
+            <line use="road_morphology" />
+        </m>
+
+        <!-- 全封闭 -->
+        <m v="OMDB_CON_ACESS">
+            <line use="road_morphology" />
+        </m>
+
+        <!-- 高架 -->
+        <m v="OMDB_VIADUCT">
+            <line use="road_morphology" />
+        </m>
+
+        <!-- 道路形态1 -->
+        <m v="OMDB_LINK_FORM1">
+            <line use="road_morphology" />
+        </m>
+
+        <!-- 道路形态2 -->
+        <m v="OMDB_LINK_FORM2">
+            <line use="road_morphology" />
         </m>
 
         <!--常规点限速-->

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

@@ -24,7 +24,7 @@ open class RenderEntity() : RealmObject(), Parcelable {
     var id: String = UUID.randomUUID().toString() // id
     lateinit var name: String //要素名
     lateinit var table: String //要素表名
-    var code: Int = 0 // 要素编码
+    var code: String = "0" // 要素编码
     var geometry: String =
         "" // 要素渲染参考的geometry，该数据可能会在导入预处理环节被修改，原始geometry会保存在properties的geometry字段下
         get() {

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

@@ -0,0 +1,164 @@
+package com.navinfo.collect.library.enum
+
+/*
+* 要素枚举定义
+* */
+enum class DataCodeEnum(var tableName: String, var code: String) {
+    OMDB_CHECKPOINT("检查点", "1012"), OMDB_RD_LINK(
+        "道路线",
+        "2001"
+    ),
+    OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"),
+    OMDB_LINK_ATTRIBUTE("道路属性", "2004"),
+    OMDB_LINK_ATTRIBUTE_SA("道路属性-SA", "2004-1"), OMDB_LINK_ATTRIBUTE_PA(
+        "道路属性-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(
+        "道路名",
+        "2011"
+    ),
+    OMDB_LANE_MARK_BOUNDARYTYPE("车道边界类型", "2013"),
+    OMDB_LINK_SPEEDLIMIT("常规线限速", "2019"), OMDB_LINK_SPEEDLIMIT_COND(
+        "条件线限速",
+        "2020"
+    ),
+    OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"),
+    OMDB_CON_ACCESS("全封闭", "2022"),
+    OMDB_RAMP(
+        "匝道",
+        "2037"
+    ),
+    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_RoundAbout(
+        "环岛",
+        "2204"
+    ),
+    OMDB_LINK_FORM1(
+        "道路形态1",
+        "2205"
+    ),
+    OMDB_LINK_FORM1_1(
+        "U-Turn",
+        "2205-1"
+    ),
+    OMDB_LINK_FORM1_2(
+        "提前右转",
+        "2205-2"
+    ),
+    OMDB_LINK_FORM1_3(
+        "提前左转",
+        "2205-3"
+    ),
+    OMDB_LINK_FORM2(
+        "道路形态2",
+        "2206"
+    ),
+    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"
+    ),
+    OMDB_SPEEDLIMIT_VAR("可变点限速", "4004"), OMDB_RESTRICTION("普通交限", "4006"),
+    OMDB_ELECTRONICEYE("电子眼", "4010"), OMDB_TRAFFICLIGHT(
+        "交通灯",
+        "4022"
+    ),
+    OMDB_LANEINFO("车信", "4601"), OMDB_LANE_LINK_LG("车道中心线", "5001")
+}
+

collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java

@@ -262,7 +262,7 @@ public final class NIMapView extends RelativeLayout {
 
         // 增加比例尺图层
         NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
-        mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, 128, 5);
+        mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 10, 0);
 
 //        if (gridLayer == null) {
 //            gridLayer = new TileGridLayer(getVtmMap());
@@ -898,7 +898,7 @@ public final class NIMapView extends RelativeLayout {
             mapScaleBarLayer = null;
         }
         NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
-        mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_CENTER, xOffset, yOffset);
+        mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, xOffset, yOffset);
     }
 
     /**

collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java

@@ -55,7 +55,6 @@ public class OMDBTileDataSource implements ITileDataSource {
             if (!listResult.isEmpty()) {
                 mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult);
             }
-//            Log.e("jingo", listResult.size() + "条数据 主");
             mapDataSink.completed(QueryResult.SUCCESS);
         } else {
             mapDataSink.completed(QueryResult.SUCCESS);