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

app/src/main/assets/omdb_config.json

@@ -204,7 +204,7 @@
 				"table": "OMDB_FILL_AREA",
 				"code": 3012,
 				"name": "导流区",
-				"zoomMin": 16,
+				"zoomMin": 18,
 				"zoomMax": 20
 			},
 			"3016":{
@@ -505,12 +505,6 @@
 				"zoomMin": 15,
 				"zoomMax": 17,
 				"transformer": [
-					{
-						"k": "geometry",
-						"v": "~",
-						"klib": "geometry",
-						"vlib": "generateS2EReferencePoint()"
-					}
 				]
 			},
 			"2205":{

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

@@ -49,6 +49,15 @@ class ImportPreProcess {
         val geometry = renderEntity.wkt
         var radian = 0.0 // geometry的角度，如果是点，获取angle，如果是线，获取最后两个点的方向
         var point = Coordinate(geometry?.coordinate)
+        // 如果数据属性中存在angle，则使用该值，否则需要根据line中的数据进行计算
+        if (renderEntity?.properties?.get(
+                "angle"
+            )!=null) {
+            var angle = renderEntity?.properties?.get("angle")?.toDouble()!!
+            // angle角度为与正北方向的顺时针夹角，将其转换为与X轴正方向的逆时针夹角，即为正东方向的夹角
+            angle = (450 - angle) % 360
+            radian = Math.toRadians(angle)
+        } else {
             var isReverse = false // 是否为逆向
             if (direction.isNotEmpty()) {
                 val paramDirections = direction.split("=")
@@ -56,18 +65,7 @@ class ImportPreProcess {
                     isReverse = true;
                 }
             }
-        if (Geometry.TYPENAME_POINT == geometry?.geometryType) { // angle为与正北方向的顺时针夹角
+            if (Geometry.TYPENAME_LINESTRING == geometry?.geometryType) {
-            var angle =
-                if (renderEntity?.properties?.get("angle") == null) 0.0 else renderEntity?.properties?.get(
-                    "angle"
-                )?.toDouble()!!
-//            if (isReverse) {
-//                angle += 180
-//            }
-            // angle角度为与正北方向的顺时针夹角，将其转换为与X轴正方向的逆时针夹角，即为正东方向的夹角
-            angle = (450 - angle) % 360
-            radian = Math.toRadians(angle)
-        } else if (Geometry.TYPENAME_LINESTRING == geometry?.geometryType) {
                 var coordinates = geometry.coordinates
                 if (isReverse) {
                     coordinates = coordinates.reversedArray()
@@ -78,6 +76,7 @@ class ImportPreProcess {
                 radian = Angle.angle(p1, p2)
                 point = p1
             }
+        }
 
         // 计算偏移距离
         val dx: Double = GeometryTools.convertDistanceToDegree(

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

@@ -2182,27 +2182,27 @@
                 <lineSymbol  repeat-gap="24" repeat-start="0" symbol-height="24" src="assets:omdb/icon_2201_1.svg" />
             </m>
             <m k="type" v="s_2_p_1">
-                <symbol repeat="false" repeat-start="0" rotate="false" gland="true"
+                <symbol gland="true"
                     src="assets:omdb/icon_2201_1_1.svg" symbol-height="56" symbol-width="56"></symbol>
             </m>
             <m k="type" v="e_2_p_1">
-                <symbol repeat="false" repeat-start="0" rotate="false" gland="true"
+                <symbol gland="true"
                     src="assets:omdb/icon_2201_1_2.svg" symbol-height="56" symbol-width="56"></symbol>
             </m>
             <m k="type" v="s_2_p_2">
-                <symbol repeat="false" repeat-start="0" rotate="false" gland="true"
+                <symbol gland="true"
                     src="assets:omdb/icon_2201_2_1.svg" symbol-height="56" symbol-width="56"></symbol>
             </m>
             <m k="type" v="e_2_p_2">
-                <symbol repeat="false" repeat-start="0" rotate="false" gland="true"
+                <symbol gland="true"
                     src="assets:omdb/icon_2201_2_2.svg" symbol-height="56" symbol-width="56"></symbol>
             </m>
             <m k="type" v="s_2_p_3">
-                <symbol repeat="false" repeat-start="0" rotate="false" gland="true"
+                <symbol gland="true"
                     src="assets:omdb/icon_2201_3_1.svg" symbol-height="56" symbol-width="56"></symbol>
             </m>
             <m k="type" v="e_2_p_3">
-                <symbol repeat="false" repeat-start="0" rotate="false" gland="true"
+                <symbol gland="true"
                     src="assets:omdb/icon_2201_3_2.svg" symbol-height="56" symbol-width="56"></symbol>
             </m>
         </m>