diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 825b3d8e..096703c3 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -158,12 +158,19 @@
"transformer2Code": ""
},
"2204":{
- "table": "OMDB_RoundAbout",
+ "table": "OMDB_ROUNDABOUT",
"code": 2204,
"name": "环岛",
"zoomMin": 15,
"zoomMax": 17,
- "transformer2Code": ""
+ "transformer": [
+ {
+ "k": "geometry",
+ "v": "~",
+ "klib": "geometry",
+ "vlib": "generateS2EReferencePoint()"
+ }
+ ]
},
"2205":{
"table": "OMDB_LINK_FORM1",
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 fbec9a8c..89ce9a4c 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -218,6 +218,7 @@ class ImportPreProcess {
val startReference = ReferenceEntity()
startReference.renderEntityId = renderEntity.id
startReference.name = "${renderEntity.name}参考点"
+ startReference.code = renderEntity.code
startReference.table = renderEntity.table
startReference.zoomMin = renderEntity.zoomMin
startReference.zoomMax = renderEntity.zoomMax
@@ -225,8 +226,7 @@ class ImportPreProcess {
startReference.enable = renderEntity.enable
// 起点坐标
- startReference.geometry =
- GeometryTools.createGeometry(GeoPoint(pointStart.y, pointStart.x)).toString()
+ 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")
@@ -238,13 +238,16 @@ class ImportPreProcess {
}
} else {
startReference.properties["type"] = "s_2_p"
+ Log.e("qj","generateS2EReferencePoint===s_2_p${renderEntity.name}")
}
+ startReference.properties["geometry"] = startReference.geometry
Realm.getDefaultInstance().insert(startReference)
val endReference = ReferenceEntity()
endReference.renderEntityId = renderEntity.id
endReference.name = "${renderEntity.name}参考点"
+ endReference.code = renderEntity.code
endReference.table = renderEntity.table
endReference.zoomMin = renderEntity.zoomMin
endReference.zoomMax = renderEntity.zoomMax
@@ -252,8 +255,7 @@ class ImportPreProcess {
endReference.enable = renderEntity.enable
// 终点坐标
- endReference.geometry =
- GeometryTools.createGeometry(GeoPoint(pointEnd.y, pointEnd.x)).toString()
+ endReference.geometry = GeometryTools.createGeometry(GeoPoint(pointEnd.y, pointEnd.x)).toString()
endReference.properties = renderEntity.properties
endReference.properties["qi_table"] = renderEntity.table
if (renderEntity.table == table) {
@@ -262,7 +264,9 @@ class ImportPreProcess {
}
} else {
endReference.properties["type"] = "e_2_p"
+ Log.e("qj","generateS2EReferencePoint===e_2_p${renderEntity.name}")
}
+ endReference.properties["geometry"] = endReference.geometry
Realm.getDefaultInstance().insert(endReference)
}
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 1e2cde9d..fc1166d2 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -180,7 +180,7 @@
width="0.1" />
-
+
@@ -1976,56 +1976,9 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ -->
@@ -2122,13 +2075,13 @@
-
-
+
+
-
-
+
+
@@ -2171,6 +2124,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/collect-library/src/main/assets/omdb/icon_2202_1.svg b/collect-library/src/main/assets/omdb/icon_2202_1.svg
index db0fef8a..92899deb 100644
--- a/collect-library/src/main/assets/omdb/icon_2202_1.svg
+++ b/collect-library/src/main/assets/omdb/icon_2202_1.svg
@@ -1 +1,18 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2204_0.svg b/collect-library/src/main/assets/omdb/icon_2204_0.svg
new file mode 100644
index 00000000..0473894b
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2204_0.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt
index 60bc8056..07d2917b 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/data/entity/ReferenceEntity.kt
@@ -19,7 +19,7 @@ open class ReferenceEntity() : RealmObject() {
var renderEntityId: String = "" // 参考的renderEntity的Id
lateinit var name: String //要素名
lateinit var table: String //要素表名
- var code: Int = 0 // 要素编码
+ var code: String = "0" // 要素编码
var zoomMin: Int = 18 //显示最小级别
var zoomMax: Int = 23 //显示最大级别
var taskId: Int = 0 //任务ID
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
index 2d05ca77..e9f72c8e 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enum/DataCodeEnum.kt
@@ -73,7 +73,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
"2201"
),
OMDB_TUNNEL("隧道", "2202"),
- OMDB_RoundAbout(
+ OMDB_ROUNDABOUT(
"环岛",
"2204"
),