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

app/src/main/assets/omdb_config.json

@@ -136,6 +136,13 @@
 				"zoomMin": 16,
 				"zoomMax": 20
 			},
+			"3016":{
+				"table": "OMDB_OBJECT_STOPLOCATION",
+				"code": 3016,
+				"name": "停止位置",
+				"zoomMin": 18,
+				"zoomMax": 20
+			},
 			"4001": {
 				"table": "OMDB_INTERSECTION",
 				"code": 4001,
@@ -404,8 +411,7 @@
 				"code": 2206,
 				"name": "道路形态2",
 				"zoomMin": 15,
-				"zoomMax": 17,
+				"zoomMax": 17
-				"transformer2Code": ""
 			}
 
 		}

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

@@ -347,6 +347,7 @@ class ImportOMDBHelper @AssistedInject constructor(
                                             }
                                         }
                                     }else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){
+                                        Log.e("qj","道路形态2${renderEntity.properties["formOfWay"]}")
                                         /*道路形态2*/
                                         var formWay = renderEntity.properties["formOfWay"]
                                         if(formWay!=null){

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

@@ -567,6 +567,7 @@ class ImportPreProcess {
                 val intersectionReference = ReferenceEntity()
                 intersectionReference.renderEntityId = renderEntity.id
                 intersectionReference.name = "${renderEntity.name}参考点"
+                intersectionReference.code = renderEntity.code
                 intersectionReference.table = renderEntity.table
                 intersectionReference.zoomMin = renderEntity.zoomMin
                 intersectionReference.zoomMax = renderEntity.zoomMax

app/src/main/res/drawable/selector_high_road_line_src.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/icon_hide_line" android:state_selected="true"></item>
+    <item android:drawable="@drawable/icon_high_line" android:state_selected="true"></item>
-    <item android:drawable="@drawable/icon_high_line" />
+    <item android:drawable="@drawable/icon_hide_line" />
 </selector>

app/src/main/res/layout/activity_main.xml

@@ -82,14 +82,14 @@
             android:id="@+id/main_activity_top_sign_recyclerview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="220dp"
+            android:layout_marginLeft="300dp"
             android:layout_marginTop="2dp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <FrameLayout
             android:id="@+id/main_activity_sign_more_info_fragment"
-            android:layout_width="240dp"
+            android:layout_width="220dp"
             android:layout_height="300dp"
             android:layout_marginTop="80dp"
             android:minHeight="140dp"
@@ -235,6 +235,7 @@
             android:layout_height="wrap_content"
             android:background="@drawable/shape_road_name_bg"
             android:onClick="@{()->mainActivity.openRoadNameFragment()}"
+            android:layout_marginLeft="10dp"
             android:paddingLeft="10dp"
             android:paddingTop="4dp"
             android:paddingRight="10dp"

collect-library/resources/rendertheme.xsd

@@ -145,6 +145,8 @@
         <xs:attribute name="blend-fill" default="#000000" type="tns:color" use="optional"/>
         <xs:attribute name="mesh" default="false" type="xs:boolean" use="optional"/>
         <xs:attribute name="repeat" default="true" type="xs:boolean" use="optional"/>
+        <!-- 长边坐标轴，默认为s -->
+        <xs:attribute name="longEdge" type="tns:text" default="s"/>
     </xs:complexType>
 
     <xs:complexType name="caption">

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

@@ -1968,9 +1968,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>-->
 <!--            <m k="geometry">
                 <symbol src="@typesrc"></symbol>
             </m>-->
@@ -2068,10 +2068,12 @@
                     </m>
                 </m>
             </m>
+            <!--护栏-->
             <m k="boundaryType" v="4">
                 <line stroke="#FFBC6E" use="boundaryType" width="0.1"/>
                 <symbol repeat-gap="12" repeat="true" repeat-start="0" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="46"></symbol>
             </m>
+            <!--路牙-->
             <m k="boundaryType" v="3">
                 <symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="8"></symbol>
             </m>
@@ -2186,6 +2188,45 @@
             <symbol repeat="true" repeat-start="0" repeat-gap="32" src="assets:omdb/icon_2204_0.svg"></symbol>
         </m>
 
+        <!-- 停止位置 -->
+        <m v="OMDB_OBJECT_STOPLOCATION">
+
+            <m k="locationType" v="1">
+                <m k="color" v="1">
+                    <line stroke="#ffffff" use="boundaryType" width="0.1"/>
+                </m>
+                <m k="color" v="9">
+                    <line stroke="#eccc68" use="boundaryType" width="0.1"/>
+                </m>
+            </m>
+
+            <m k="locationType" v="2">
+                <m k="color" v="1">
+                    <symbol repeat="true" repeat-gap="1" repeat-start="2" src="assets:omdb/icon_3016_0.svg" symbol-width="5" symbol-height="24"></symbol>
+                </m>
+                <m k="color" v="9">
+                    <symbol repeat="true" repeat-gap="1" repeat-start="2" src="assets:omdb/icon_3016_1.svg" symbol-width="5" symbol-height="24"></symbol>
+                </m>
+            </m>
+            <!--虚线不做渲染-->
+<!--            <m k="locationType" v="3">
+                <m k="color" v="1">
+                    <symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="4"></symbol>
+                </m>
+                <m k="color" v="9">
+                    <symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="4"></symbol>
+                </m>
+            </m>
+            <m k="locationType" v="4">
+                <m k="color" v="1">
+                    <line dasharray="1,1,1,1" repeat-start="0" stroke="#ffffff" width="0.1"/>
+                </m>
+                <m k="color" v="9">
+                    <line dasharray="1,1,1,1" repeat-start="0" stroke="#eccc68" width="0.1"/>
+                </m>
+            </m>-->
+        </m>
+
         <!--常规点限速-->
         <m v="OMDB_SPEEDLIMIT">
             <m k="speedFlag" v="0">
@@ -2272,8 +2313,10 @@
 
         <!-- 导流区 -->
         <m v="OMDB_FILL_AREA">
-            <area use="obj-area" repeat="false" src="assets:omdb/tex_fill_area_3012.png"></area>
+            <area use="obj-area" repeat="true" src="assets:omdb/tex_fill_area_3012.png" longEdge="t"></area>
             <text use="area-name"></text>
+<!--            <area use="obj-area" repeat="false"></area>-->
+<!--            <symbol src="assets:omdb/icon_fill_area_3012.svg"></symbol>-->
         </m>
     </m>
 </rendertheme>

collect-library/src/main/assets/omdb/icon_3016_0.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692587943200" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6322" width="10" height="10" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M128 479.9488h768.0512v-64H128zM128 607.9488h768.0512v-64H128z" fill="#ffffff" p-id="6323"></path></svg>

collect-library/src/main/assets/omdb/icon_3016_1.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692588290872" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6617" xmlns:xlink="http://www.w3.org/1999/xlink" width="10" height="10"><path d="M128 479.9488h768.0512v-64H128zM128 607.9488h768.0512v-64H128z" fill="#eccc68" p-id="6618"></path></svg>

collect-library/src/main/assets/omdb/icon_3016_3.svg

@@ -0,0 +1,8 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+    "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg t="1692587943200" class="icon" viewBox="0 0 1024 1024" version="1.1"
+    xmlns="http://www.w3.org/2000/svg" p-id="6322" width="10" height="10"
+    xmlns:xlink="http://www.w3.org/1999/xlink">
+    <path d="M128 479.9488h768.0512v-64H128zM128 607.9488h768.0512v-64H128z" fill="#ffffff"
+        p-id="6323"></path>
+</svg>

collect-library/src/main/assets/omdb/icon_fill_area_3012.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692250898311" class="icon" viewBox="0 0 1029 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17364" width="32.15625" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M513.998507 838.81472L471.04 771.07712l188.1856-119.35232 42.96192 67.7376z" fill="#ffffff" p-id="17365"></path><path d="M333.571413 717.085013l45.7728-65.870506 180.391254 125.346133-45.7728 65.872213zM525.453653 617.2672l-46.578346-77.31712 327.191893-183.719253 46.578347 77.318826z" fill="#ffffff" p-id="17366"></path><path d="M192.570027 466.875733l39.514453-80.974506 334.77632 151.74656-39.514453 80.974506zM519.231147 358.3488l-58.55232-71.877973L944.546133 74.671787l58.55232 71.877973z" fill="#ffffff" p-id="17367"></path><path d="M50.399573 177.826133l53.072214-73.96352 464.4352 180.007254-53.070507 73.96352z" fill="#ffffff" p-id="17368"></path><path d="M545.8688 973.75232l-71.4752 36.406613L5.927253 90.436267l71.4752-36.404907z" fill="#ffffff" p-id="17369"></path><path d="M552.285867 1009.890987l-71.115094-37.108054L958.660267 57.71264l71.113386 37.108053z" fill="#ffffff" p-id="17370"></path><path d="M471.04 957.44h83.626667v51.2h-83.626667z" fill="#ffffff" p-id="17371"></path></svg>

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

@@ -57,9 +57,9 @@ class LineHandler(context: AppCompatActivity, mapView: NIMapView) : BaseHandler(
             mMapView.vtmMap,
             Style.builder()
 //            .stippleColor(context.resources.getColor(R.color.draw_line_red_color, null))
-                .fillColor(context.resources.getColor(R.color.draw_line_red_color))
+                .fillColor(context.resources.getColor(R.color.draw_line_pink_color))
                 .fillAlpha(0.5f)
-                .strokeColor(context.resources.getColor(R.color.draw_line_red_color))
+                .strokeColor(context.resources.getColor(R.color.draw_line_pink_color))
                 .strokeWidth(3f)
                 .fixed(true).build()
         )

collect-library/src/main/res/values/colors.xml

@@ -8,6 +8,7 @@
     <color name="draw_line_blue1_color" comment="线数据样式">#028FFF</color>
     <color name="draw_line_blue2_color" comment="线数据样式">#4E55AF</color>
     <color name="draw_line_red_color" comment="线数据样式">#FFF6565D</color>
+    <color name="draw_line_pink_color" comment="线数据样式">#FFd4237a</color>
     <color name="default_red" comment="应用主要色调">#F03736</color>
     <color name="draw_area_color" comment="测量面积渲染颜色">#8DEF08EB</color>