merge code

app/src/main/assets/omdb_config.json

@@ -158,7 +158,14 @@
 				"name": "隧道",
 				"zoomMin": 15,
 				"zoomMax": 20,
-				"transformer2Code": ""
+				"transformer": [
+					{
+						"k": "geometry",
+						"v": "~",
+						"klib": "geometry",
+						"vlib": "generateS2EReferencePoint()"
+					}
+				]
 			},
 			"3005":{
 				"table": "OMDB_TRAFFIC_SIGN",

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

@@ -225,7 +225,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 +257,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)) {

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

@@ -2163,7 +2163,7 @@
         <!--隧道-->
         <m v="OMDB_TUNNEL">
             <m k="formOfWay">
-                <line dasharray="4,4"  stroke="#4624FF" width="0.4" />
+                <line dasharray="4,4"  stroke="#4624FF" width="1.2" />
             </m>
             <m k="type" v="s_2_p">
                 <symbol repeat="false" repeat-start="0" rotate="false" gland="true"