diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 08bf4e2b..43317f3c 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -197,7 +197,7 @@ "table": "OMDB_FILL_AREA", "code": 3012, "name": "导流区", - "zoomMin": 16, + "zoomMin": 18, "zoomMax": 20 }, "3016":{ @@ -498,12 +498,6 @@ "zoomMin": 15, "zoomMax": 17, "transformer": [ - { - "k": "geometry", - "v": "~", - "klib": "geometry", - "vlib": "generateS2EReferencePoint()" - } ] }, "2205":{ diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 1a62c9b0..fc941920 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -49,34 +49,33 @@ class ImportPreProcess { val geometry = renderEntity.wkt var radian = 0.0 // geometry的角度，如果是点，获取angle，如果是线，获取最后两个点的方向 var point = Coordinate(geometry?.coordinate) - var isReverse = false // 是否为逆向 - if (direction.isNotEmpty()) { - val paramDirections = direction.split("=") - if (paramDirections.size >= 2 && renderEntity.properties[paramDirections[0].trim()] == paramDirections[1].trim()) { - isReverse = true; - } - } - if (Geometry.TYPENAME_POINT == geometry?.geometryType) { // angle为与正北方向的顺时针夹角 - var angle = - if (renderEntity?.properties?.get("angle") == null) 0.0 else renderEntity?.properties?.get( - "angle" - )?.toDouble()!! -// if (isReverse) { -// angle += 180 -// } + // 如果数据属性中存在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 if (Geometry.TYPENAME_LINESTRING == geometry?.geometryType) { - var coordinates = geometry.coordinates - if (isReverse) { - coordinates = coordinates.reversedArray() + } else { + var isReverse = false // 是否为逆向 + if (direction.isNotEmpty()) { + val paramDirections = direction.split("=") + if (paramDirections.size >= 2 && renderEntity.properties[paramDirections[0].trim()] == paramDirections[1].trim()) { + isReverse = true; + } + } + if (Geometry.TYPENAME_LINESTRING == geometry?.geometryType) { + var coordinates = geometry.coordinates + if (isReverse) { + coordinates = coordinates.reversedArray() + } + val p1: Coordinate = coordinates.get(coordinates.size - 2) + val p2: Coordinate = coordinates.get(coordinates.size - 1) + // 计算线段的方向 + radian = Angle.angle(p1, p2) + point = p1 } - val p1: Coordinate = coordinates.get(coordinates.size - 2) - val p2: Coordinate = coordinates.get(coordinates.size - 1) - // 计算线段的方向 - radian = Angle.angle(p1, p2) - point = p1 } // 计算偏移距离 @@ -225,7 +224,6 @@ class ImportPreProcess { // 起点坐标 startReference.geometry = GeometryTools.createGeometry(GeoPoint(pointStart.y, pointStart.x)).toString() - startReference.properties = renderEntity.properties startReference.properties["qi_table"] = renderEntity.table Log.e("qj","generateS2EReferencePoint===$table===$proKey") if (renderEntity.table == table) { @@ -258,7 +256,6 @@ class ImportPreProcess { // 终点坐标 endReference.geometry = GeometryTools.createGeometry(GeoPoint(pointEnd.y, pointEnd.x)).toString() - endReference.properties = renderEntity.properties endReference.properties["qi_table"] = renderEntity.table if (renderEntity.table == table) { if (renderEntity.properties.containsKey(proKey)) { diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 2bceef42..ebc1e764 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1551,399 +1551,399 @@ + src="assets:omdb/4601/normal/1301_1.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_1_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_4_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_4_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_5_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/normal/1301_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_0.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_1_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_4_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_4_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_5_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/extend/1301_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_0.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_1_7.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_2_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_3_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_4.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_4_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_4_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_5.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_5_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_6.svg" symbol-height="24" degree="90"> + src="assets:omdb/4601/bus/1301_7.svg" symbol-height="24" degree="90"> @@ -2182,27 +2182,27 @@ - - - - - - @@ -2312,11 +2312,11 @@ - + + src="assets:omdb/4010/right.svg" symbol-height="44" symbol-width="44"> @@ -2326,7 +2326,7 @@ - + @@ -2352,7 +2352,7 @@ + src="@src" symbol-height="36" symbol-width="36" degree="90"> diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg index 11c4ad4a..6787d248 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_0.svg @@ -1,11 +1,11 @@ - + 1301_1_o Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg index 7fad797e..b8bea87f 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1.svg @@ -1,12 +1,12 @@ - + 1301_1_a Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg index ef978302..8f6f6b0c 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2.svg @@ -1,12 +1,12 @@ - + 1301_1_g Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg index 7a4eaa39..60d2aaed 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3.svg @@ -1,12 +1,12 @@ - + 1301_1_h Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg index b083effc..aa70807e 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_3_4.svg @@ -1,13 +1,13 @@ - + 1 Created with Sketch. - - - + + + - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg index f1783eb2..0342b5aa 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_4.svg @@ -1,12 +1,12 @@ - + 1301_1_j Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg index 41817043..ed445eb7 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_5.svg @@ -1,12 +1,12 @@ - + 编组 13 Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg index 1ae6c322..f06a895a 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_2_6.svg @@ -1,9 +1,9 @@ - + 1301_1_3 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg index dbb3b0a8..d807d280 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3.svg @@ -1,9 +1,9 @@ - + 1301_1_f Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg index 95890b21..e21d5079 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_4.svg @@ -1,9 +1,9 @@ - + 1301_1_i Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg index a5f97b40..43860c88 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_5.svg @@ -1,9 +1,9 @@ - + 1301_1_4 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg index 7746a04e..91b52ffa 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_3_6.svg @@ -1,9 +1,9 @@ - + 1301_1_5 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg index e102cc2e..ae7f1592 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_4.svg @@ -1,9 +1,9 @@ - + 1301_1_e Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg index 2ea27c43..c2e1ef97 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_5.svg @@ -1,9 +1,9 @@ - + 1301_1_t Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg index a168c5fe..d8005039 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_7.svg @@ -1,9 +1,9 @@ - + 提示前方可自行或右后方掉头 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_v.svg similarity index 92% rename from collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_v.svg index 54be427f..d392ac9f 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_v.svg @@ -1,9 +1,9 @@ - + 1301_1_v Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_w.svg similarity index 91% rename from collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_w.svg index 8d88db55..3a0c2918 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_4_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_w.svg @@ -1,9 +1,9 @@ - + 1301_1_w Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_x.svg similarity index 90% rename from collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_x.svg index 79506a9e..9be2fe1c 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_1_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_x.svg @@ -1,9 +1,9 @@ - + 1301_1_x Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_y.svg similarity index 92% rename from collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_y.svg index 51a11221..dec1b080 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_y.svg @@ -1,9 +1,9 @@ - + 1301_1_y Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_1_z.svg similarity index 92% rename from collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg rename to collect-library/src/main/assets/omdb/4601/bus/1301_1_z.svg index cff1424a..55305487 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_1_z.svg @@ -1,9 +1,9 @@ - + 1301_1_z Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg index ec913bb4..d9a9f805 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2.svg @@ -1,9 +1,9 @@ - + 1301_1_b Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg index 2239d079..2d152b04 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3.svg @@ -1,9 +1,9 @@ - + 1301_1_k Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg index 20da2578..523d2787 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_3_4.svg @@ -1,9 +1,9 @@ - + 1301_1_m Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg index 1eba8f6b..d3d362c0 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_4.svg @@ -1,9 +1,9 @@ - + 1301_1_l Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg index d5171f4b..a5619a47 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_2_5.svg @@ -1,9 +1,9 @@ - + 1301_1_u Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg index d2da475a..492f7c4f 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3.svg @@ -1,9 +1,9 @@ - + 1301_1_c Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg index c2ccda33..75d8e6aa 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_3_4.svg @@ -1,9 +1,9 @@ - + 1301_1_n Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg index ec270561..ff047e6a 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_4.svg @@ -1,9 +1,9 @@ - + 1301_1_d Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg index 3dda5a65..14ea578d 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_4_6.svg @@ -1,9 +1,9 @@ - + 1301_1_0 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg index c3bdba5f..adb4788a 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_5.svg @@ -1,9 +1,9 @@ - + 1301_1_r Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg index e230cdf6..109280c0 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_5_6.svg @@ -1,11 +1,11 @@ - + 1301_1_1 Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg index 0452c08c..cfff198d 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_6.svg @@ -1,9 +1,9 @@ - + 1301_1_s Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg b/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg index 6c966615..73f7f1c4 100644 --- a/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg +++ b/collect-library/src/main/assets/omdb/4601/bus/1301_7.svg @@ -1,9 +1,9 @@ - + 提示右后方掉头 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg index 31181865..b610804a 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_0.svg @@ -1,11 +1,11 @@ - + 1301_2_o Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg index 2432424e..4d59163d 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1.svg @@ -1,12 +1,12 @@ - + 1301_2_a Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg index 54900d75..e55748e7 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2.svg @@ -1,12 +1,12 @@ - + 1301_2_g Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg index 824e6503..c73d7414 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3.svg @@ -1,9 +1,9 @@ - + 1301_2_h Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg index 9aae9284..508ff024 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_3_4.svg @@ -1,9 +1,9 @@ - + 2 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg index 6e952eab..aa1850cc 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_4.svg @@ -1,9 +1,9 @@ - + 1301_2_j Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg index 028e0281..ec798ad7 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_5.svg @@ -1,9 +1,9 @@ - + 1301_2_2 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg index d79bb956..adaaac68 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_2_6.svg @@ -1,9 +1,9 @@ - + 1301_2_3 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg index 9c121433..0925b6ac 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3.svg @@ -1,9 +1,9 @@ - + 1301_2_f Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg index b25a0cad..41e44082 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_4.svg @@ -1,9 +1,9 @@ - + 1301_2_i Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg index e6b10741..5c801072 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_5.svg @@ -1,9 +1,9 @@ - + 1301_2_4 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg index 3ff7e8b5..db79565a 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_3_6.svg @@ -1,9 +1,9 @@ - + 1301_2_5 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg index 32b6d317..918e698d 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_4.svg @@ -1,9 +1,9 @@ - + 1301_2_e Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg index acb3d7ff..b63e4307 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_5.svg @@ -1,9 +1,9 @@ - + 1301_2_t Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg index 0ec4d847..f57de850 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_6.svg @@ -1,9 +1,9 @@ - + 1301_2_x Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg index e707aec2..53300e25 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_1_7.svg @@ -1,9 +1,9 @@ - + 提示前方可自行或右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg index ad77a66d..b4818b91 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2.svg @@ -1,9 +1,9 @@ - + 1301_2_b Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg index f8f2c938..dad8c55c 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3.svg @@ -1,9 +1,9 @@ - + 1301_2_k Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg index d073873d..52d41ff7 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_3_4.svg @@ -1,9 +1,9 @@ - + 1301_2_m Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg index 3f2f9707..41b0d5cc 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_4.svg @@ -1,9 +1,9 @@ - + 1301_2_l Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg index d843eb38..bc25dc2f 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_5.svg @@ -1,9 +1,9 @@ - + 1301_2_u Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg index bdb8fff7..c2be3c4c 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_2_6.svg @@ -1,9 +1,9 @@ - + 1301_2_y Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg index df172c9c..08766c81 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3.svg @@ -1,9 +1,9 @@ - + 1301_2_c Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg index acb9ae05..9c265e49 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_4.svg @@ -1,9 +1,9 @@ - + 1301_2_n Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg index 069cbd0b..0543d49f 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_5.svg @@ -1,9 +1,9 @@ - + 1301_2_v Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg index 79d5c087..d4ade4cc 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_3_6.svg @@ -1,9 +1,9 @@ - + 1301_2_z Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg index b6e1d0db..e7f75e57 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4.svg @@ -1,9 +1,9 @@ - + 1301_2_d Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg index 81af0ab8..571c1a85 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4_5.svg @@ -1,9 +1,9 @@ - + 1301_2_w Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg index 57990202..30e5875f 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_4_6.svg @@ -1,9 +1,9 @@ - + 1301_2_0 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg index aba27872..184fc457 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_5.svg @@ -1,9 +1,9 @@ - + 1301_2_r Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg index 572458f7..19f1423a 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_5_6.svg @@ -1,9 +1,9 @@ - + 1301_2_1 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg index b33898a2..6085283b 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_6.svg @@ -1,9 +1,9 @@ - + 1301_2_s Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg b/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg index eed6f75f..1aeeb819 100644 --- a/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg +++ b/collect-library/src/main/assets/omdb/4601/extend/1301_7.svg @@ -1,9 +1,9 @@ - + 提示右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg index eee46b0a..61ee9895 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1.svg @@ -1,12 +1,12 @@ - + 1301_0_a Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg index a17714ac..ddedb0c1 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2.svg @@ -1,12 +1,12 @@ - + 1301_0_g Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg index 15b4e042..b052220c 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3.svg @@ -1,12 +1,12 @@ - + 1301_0_h Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg index 7e376960..03726e44 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_3_4.svg @@ -1,11 +1,11 @@ - + 3 Created with Sketch. - - - + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg index 54172a31..a946f171 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_4.svg @@ -1,12 +1,12 @@ - + 1301_0_j Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg index 389ab0ab..2639d991 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_5.svg @@ -1,12 +1,12 @@ - + 1301_0_2 Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg index a42e748c..e5f4b00a 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_2_6.svg @@ -1,9 +1,9 @@ - + 1301_0_3 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg index 98d227b3..214dfc3a 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3.svg @@ -1,12 +1,12 @@ - + 1301_0_f Created with Sketch. - - - - + + + + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg index a790d632..0ddc8739 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_4.svg @@ -1,9 +1,9 @@ - + 1301_0_i Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg index 91980137..3bf84c25 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_5.svg @@ -1,9 +1,9 @@ - + 1301_0_4 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg index a8eb644b..3cb0cf6a 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_3_6.svg @@ -1,9 +1,9 @@ - + 1301_0_5 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg index 002e5954..6cc93c5c 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_4.svg @@ -1,9 +1,9 @@ - + 1301_0_e Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg index a57d2197..d206d43e 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_5.svg @@ -1,9 +1,9 @@ - + 1301_0_t Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg index 44e65ef4..644311e6 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_6.svg @@ -1,9 +1,9 @@ - + 1301_0_x Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg index 9e84d3c8..0e2949d5 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_1_7.svg @@ -1,9 +1,9 @@ - + 提示前方可自行或右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg index 5301bd45..b7ea9893 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2.svg @@ -1,9 +1,9 @@ - + 1301_0_b Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg index a12e77c3..6759a145 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3.svg @@ -1,9 +1,9 @@ - + 1301_0_k Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg index c65f71cb..3a872137 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_3_4.svg @@ -1,9 +1,9 @@ - + 1301_0_m Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg index 84f7e390..08c5da09 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_4.svg @@ -1,9 +1,9 @@ - + 1301_0_l Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg index 8b28100c..37186fc9 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_5.svg @@ -1,9 +1,9 @@ - + 1301_0_u Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg index 11521180..c12236bd 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_2_6.svg @@ -1,9 +1,9 @@ - + 1301_0_y Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg index aa94ed6e..f88672a9 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3.svg @@ -1,9 +1,9 @@ - + 1301_0_c Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg index 178daa1f..575f302c 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_4.svg @@ -1,9 +1,9 @@ - + 1301_0_n Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg index 0a722d82..5b95f428 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_5.svg @@ -1,9 +1,9 @@ - + 1301_0_v Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg index 70057c1c..b178cd11 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_3_6.svg @@ -1,9 +1,9 @@ - + 1301_0_z Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg index 8e5aeea7..c482dfe1 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4.svg @@ -1,9 +1,9 @@ - + 1301_0_d Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg index 8dbbcd42..26b1fd48 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4_5.svg @@ -1,9 +1,9 @@ - + 1301_0_w Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg index 1d34c49d..ca270524 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_4_6.svg @@ -1,9 +1,9 @@ - + 1301_0_0 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg index ab0df392..aab434e7 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_5.svg @@ -1,9 +1,9 @@ - + 1301_0_r Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg index 4fcaeb4e..45869d5b 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_5_6.svg @@ -1,9 +1,9 @@ - + 1301_0_1 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg index b1061c69..2c547235 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_6.svg @@ -1,9 +1,9 @@ - + 1301_0_s Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg b/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg index ab543afa..ba4b350e 100644 --- a/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg +++ b/collect-library/src/main/assets/omdb/4601/normal/1301_7.svg @@ -1,9 +1,9 @@ - + 提示右后方掉头复制 Created with Sketch. - + diff --git a/collect-library/src/main/assets/omdb/diversion_zone.jpg b/collect-library/src/main/assets/omdb/diversion_zone.jpg deleted file mode 100644 index 204baaa2..00000000 Binary files a/collect-library/src/main/assets/omdb/diversion_zone.jpg and /dev/null differ diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt index d9711c6b..f9943757 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt @@ -317,7 +317,7 @@ open class ClusterMarkerRenderer : MarkerRenderer { // this item will act as a cluster, just use a proper bitmap // depending on cluster size, instead of its marker val bitmap = getClusterBitmap(it.clusterSize + 1) - s.set(it.x, it.y, bitmap, true, false) + s.set(it.x, it.y, bitmap, true, false, 0f) s.offset = PointF(0.5f, 0.5f) s.billboard = true // could be a parameter } else { @@ -325,7 +325,7 @@ open class ClusterMarkerRenderer : MarkerRenderer { var symbol: MarkerSymbol? = it.item.marker if (symbol == null) symbol = mDefaultMarker symbol?.let { symbol -> - s.set(it.x, it.y, symbol.bitmap, true, false) + s.set(it.x, it.y, symbol.bitmap, true, false, 0f) s.offset = symbol.hotspot s.billboard = symbol.isBillboard } diff --git a/vtm b/vtm index a35893dc..163b9f07 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit a35893dcb6f2ac2c38eb2cc11643725e2e91f1ff +Subproject commit 163b9f0773f8216621d2a2c46aa7fa1ee98e431f