diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d84e4a52..dba0cc3b 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -21,11 +21,11 @@ + + - - diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 43317f3c..273c291c 100644 --- a/app/src/main/assets/omdb_config.json +++ b/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", @@ -200,6 +207,13 @@ "zoomMin": 18, "zoomMax": 20 }, + "3014":{ + "table": "OMDB_CROSS_WALK", + "code": 3014, + "name": "人行横道", + "zoomMin": 18, + "zoomMax": 20 + }, "3016":{ "table": "OMDB_OBJECT_STOPLOCATION", "code": 3016, 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 fc941920..4be80621 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -443,6 +443,8 @@ class ImportPreProcess { referenceEntity.table = renderEntity.table referenceEntity.enable = renderEntity.enable referenceEntity.taskId = renderEntity.taskId + referenceEntity.zoomMin = renderEntity.zoomMin + referenceEntity.zoomMax = renderEntity.zoomMax // 与原数据使用相同的geometry referenceEntity.geometry = renderEntity.geometry.toString() referenceEntity.properties["qi_table"] = renderEntity.table diff --git a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt index 03ee80c9..d15c4302 100644 --- a/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt +++ b/app/src/main/java/com/navinfo/omqs/http/taskupload/TaskUploadScope.kt @@ -14,6 +14,7 @@ import com.navinfo.omqs.bean.SysUserBean import com.navinfo.omqs.http.DefaultResponse import com.navinfo.omqs.tools.FileManager.Companion.FileUploadStatus import com.navinfo.omqs.util.DateTimeUtil +import com.navinfo.omqs.util.FileUtils import io.realm.Realm import kotlinx.coroutines.* import java.util.* diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index ebc1e764..79440e2f 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2163,7 +2163,7 @@ - + + src="assets:omdb/4010/right.svg" symbol-height="40" symbol-width="40"> @@ -2331,6 +2331,11 @@ + + + + + @@ -2352,7 +2357,7 @@ + src="@src" symbol-height="24" symbol-width="24" degree="90"> diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014.png new file mode 100644 index 00000000..e261be02 Binary files /dev/null and b/collect-library/src/main/assets/omdb/tex_fill_area_3014.png differ diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014.svg new file mode 100644 index 00000000..f120c277 --- /dev/null +++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg new file mode 100644 index 00000000..3955f1c3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014_0.svg @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png new file mode 100644 index 00000000..6d0cf474 Binary files /dev/null and b/collect-library/src/main/assets/omdb/tex_fill_area_3014_1.png differ diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png new file mode 100644 index 00000000..d21b45d8 Binary files /dev/null and b/collect-library/src/main/assets/omdb/tex_fill_area_3014_2.png differ diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png b/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png new file mode 100644 index 00000000..dcad73bc Binary files /dev/null and b/collect-library/src/main/assets/omdb/tex_fill_area_3014_3.png differ diff --git a/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg b/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg new file mode 100644 index 00000000..a1e0761d --- /dev/null +++ b/collect-library/src/main/assets/omdb/tex_fill_area_3014_4.svg @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt index ad6c96bb..80d97d4f 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt +++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt @@ -57,6 +57,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_LINK_FORM2_11("风景路线", "2206-11"), OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"), OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"), + OMDB_CROSS_WALK("人行横道", "3014"), OMDB_OBJECT_STOPLOCATION("停止位置", "3016"), OMDB_INTERSECTION("路口", "4001"), OMDB_SPEEDLIMIT("常规点限速", "4002"),