xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge code

Browse Source
This commit is contained in:
qiji4215
2023-09-05 16:58:34 +08:00
parent 4230bbd3d0
commit edf98fe624
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/assets/omdb_config.json
View File

@@ -527,17 +527,23 @@
"2022": { "2022": {
"table": "OMDB_CON_ACCESS", "table": "OMDB_CON_ACCESS",
"code": 2022, "code": 2022,
"name": "全封闭" "name": "全封闭",
"zoomMin": 15,
"zoomMax": 17
}, },
"2037": { "2037": {
"table": "OMDB_RAMP", "table": "OMDB_RAMP",
"code": 2037, "code": 2037,
"name": "匝道" "name": "匝道",
"zoomMin": 15,
"zoomMax": 17
}, },
"2040": { "2040": {
"table": "OMDB_MULTI_DIGITIZED", "table": "OMDB_MULTI_DIGITIZED",
"code": 2040, "code": 2040,
"name": "上下线分离" "name": "上下线分离",
"zoomMin": 15,
"zoomMax": 17
}, },
"2204":{ "2204":{
"table": "OMDB_ROUNDABOUT", "table": "OMDB_ROUNDABOUT",

7
app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
View File

@@ -437,7 +437,6 @@ class ImportOMDBHelper @AssistedInject constructor(
Log.e("qj", "${renderEntity.name}==不包括任务linkPid") Log.e("qj", "${renderEntity.name}==不包括任务linkPid")
} }
// 对renderEntity做预处理后再保存 // 对renderEntity做预处理后再保存
val resultEntity = val resultEntity =
importConfig.transformProperties(renderEntity) importConfig.transformProperties(renderEntity)
@@ -471,6 +470,8 @@ class ImportOMDBHelper @AssistedInject constructor(
if (type != null && type == "1") { if (type != null && type == "1") {
renderEntity.code = renderEntity.code =
DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code
renderEntity.zoomMin = 15
renderEntity.zoomMax = 17
Log.e("qj", "道路属性===3") Log.e("qj", "道路属性===3")
} else { } else {
type = type =
@@ -478,9 +479,13 @@ class ImportOMDBHelper @AssistedInject constructor(
if (type != null && type == "1") { if (type != null && type == "1") {
renderEntity.code = renderEntity.code =
DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code
renderEntity.zoomMin = 15
renderEntity.zoomMax = 17
Log.e("qj", "道路属性===4") Log.e("qj", "道路属性===4")
} else { } else {
renderEntity.enable = 0 renderEntity.enable = 0
renderEntity.zoomMin = 15
renderEntity.zoomMax = 17
Log.e( Log.e(
"qj", "qj",
"过滤不显示数据${renderEntity.table}" "过滤不显示数据${renderEntity.table}"

9
collect-library/src/main/assets/editormarker.xml
View File

@@ -1491,10 +1491,6 @@
</m> </m>
<m k="qi_table"> <m k="qi_table">
<!-- 道路线 -->
<m v="OMDB_RD_LINK">
<line stroke="#9c9c9c" width="1" />
</m>
<!--道路种别--> <!--道路种别-->
<m v="OMDB_RD_LINK_KIND"> <m v="OMDB_RD_LINK_KIND">
@@ -1529,6 +1525,11 @@
</m> </m>
</m> </m>
<!-- 道路线 -->
<m v="OMDB_RD_LINK">
<line stroke="#9c9c9c" width="0.5" />
</m>
<!--道路方向--> <!--道路方向-->
<m v="OMDB_LINK_DIRECT"> <m v="OMDB_LINK_DIRECT">
<m k="direct"> <m k="direct">