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

fix: 合并代码

Browse Source
This commit is contained in:
xiaoyan
2023-08-23 14:46:29 +08:00
parent b05c1f9038 207c61184d
commit d92a75e2b5
10 changed files with 118 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,6 +88,13 @@
}
]
},
"2017": {
"table": "OMDB_LINK_CONSTRUCTION",
"code": 2017,
"name": "道路施工",
"zoomMin": 15,
"zoomMax": 17
},
"2019": {
"table": "OMDB_LINK_SPEEDLIMIT",
"code": 2019,
@@ -122,6 +129,14 @@
"zoomMax": 20,
"checkLinkId": false
},
"2090":{
"table": "OMDB_LANE_CONSTRUCTION",
"code": 2090,
"name": "车道施工",
"zoomMin": 18,
"zoomMax": 20,
"checkLinkId": false
},
"2201":{
"table": "OMDB_BRIDGE",
"code": 2201,
@@ -352,6 +367,15 @@
"transformer": [
]
},
"4023": {
"table": "OMDB_TOLLGATE",
"code": 4023,
"name": "收费站",
"zoomMin": 15,
"zoomMax": 20,
"transformer": [
]
},
"4601":{
"table": "OMDB_LANEINFO",
"code": 4601,

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

@@ -413,6 +413,7 @@ class ImportOMDBHelper @AssistedInject constructor(
var formOfWay = renderEntity.properties["formOfWay"]
if(formOfWay!=null&&formOfWay=="30"){
renderEntity.enable=2
renderEntity.code = DataCodeEnum.OMDB_NODE_FORM.code
}else{
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue
@@ -422,6 +423,7 @@ class ImportOMDBHelper @AssistedInject constructor(
var attributeType = renderEntity.properties["attributeType"]
if(attributeType!=null&&attributeType=="30"){
renderEntity.enable=2
renderEntity.code = DataCodeEnum.OMDB_NODE_PA.code
}else{
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue
@@ -438,6 +440,12 @@ class ImportOMDBHelper @AssistedInject constructor(
}
}
}
}else if(renderEntity.code == DataCodeEnum.OMDB_LANE_CONSTRUCTION.code){
//特殊处理空数据，渲染原则使用
var startTime = renderEntity.properties["startTime"]
if(startTime==null||startTime=="") {
renderEntity.properties["startTime"] = "null"
}
}
listResult.add(renderEntity)

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

@@ -231,7 +231,11 @@ class ImportPreProcess {
if (renderEntity.table == table) {
Log.e("qj","generateS2EReferencePoint===开始")
if (renderEntity.properties.containsKey(proKey)) {
startReference.properties["type"] = "s_2_p_${renderEntity.properties[proKey]}"
if(renderEntity.properties[proKey]!=""){
startReference.properties["type"] = "s_2_p_${renderEntity.properties[proKey]}"
}else{
startReference.properties["type"] = "s_2_p_0"
}
Log.e("qj","generateS2EReferencePoint===s_2_p_${renderEntity.properties[proKey]}")
}
} else {
@@ -258,7 +262,11 @@ class ImportPreProcess {
endReference.properties["qi_table"] = renderEntity.table
if (renderEntity.table == table) {
if (renderEntity.properties.containsKey(proKey)) {
endReference.properties["type"] = "e_2_p_${renderEntity.properties[proKey]}"
if(renderEntity.properties[proKey]!=""){
endReference.properties["type"] = "e_2_p_${renderEntity.properties[proKey]}"
}else{
endReference.properties["type"] = "e_2_p_0"
}
}
} else {
endReference.properties["type"] = "e_2_p"