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-08-14 17:08:47 +08:00
parent 63d36c3e1d
commit 85e863c7b4
5 changed files with 244 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -111,7 +111,7 @@
"name": "全封闭"
},
"2037": {
"table": "OMDB_FORM_OF_WAY",
"table": "OMDB_TAMP",
"code": 2037,
"name": "匝道"
},
@@ -156,6 +156,30 @@
"zoomMax": 20,
"transformer2Code": ""
},
"2204":{
"table": "OMDB_RoundAbout",
"code": 2204,
"name": "环岛",
"zoomMin": 15,
"zoomMax": 17,
"transformer2Code": ""
},
"2205":{
"table": "OMDB_LINK_FORM1",
"code": 2205,
"name": "道路形态1",
"zoomMin": 15,
"zoomMax": 17,
"transformer2Code": ""
},
"2206":{
"table": "OMDB_LINK_FORM2",
"code": 2206,
"name": "道路形态2",
"zoomMin": 15,
"zoomMax": 17,
"transformer2Code": ""
},
"4001": {
"table": "OMDB_INTERSECTION",
"code": 4001,

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

@@ -265,7 +265,7 @@ class ImportOMDBHelper @AssistedInject constructor(
Log.e("qj","${renderEntity.name}==不包括任务linkPid")
}
//道路属性code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA
//道路属性code编码需要特殊处理 存在多个属性值时，渲染优先级：SA>PA,存在多个属性值时，渲染优先级：FRONTAGE>MAIN_SIDE_A CCESS
if(renderEntity.table == "OMDB_LINK_ATTRIBUTE"){
var type = renderEntity.properties["SA"]
@@ -276,8 +276,62 @@ class ImportOMDBHelper @AssistedInject constructor(
type = renderEntity.properties["PA"]
if(type!=null&&type=="1"){
renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code
}else{//不满足条件时过滤该数据
continue
} else{
type = renderEntity.properties["FRONTAGE"]
if(type!=null&&type=="1"){
renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code
}else{
type = renderEntity.properties["MAIN_SIDE_ACCESS"]
if(type!=null&&type=="1"){
renderEntity.code = DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code
}else{
continue
}
}
}
}
}else if(renderEntity.table == "OMDB_RAMP"){
/*匝道*/
var formWay = renderEntity.properties["FORM_OF_WAY"]
if(formWay!=null){
when (formWay) {
"93"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_1.code
"98"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_2.code
"99"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_3.code
"100"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_4.code
"102"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_5.code
"103"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_6.code
"104"-> renderEntity.code = DataCodeEnum.OMDB_RAMP_7.code
}
}
}else if(renderEntity.table == "OMDB_LINK_FORM1"){
/*道路形态1*/
var formWay = renderEntity.properties["FORM_OF_WAY"]
if(formWay!=null){
when (formWay) {
"35"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_1.code
"37"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_2.code
"38"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM1_3.code
}
}
}else if(renderEntity.table == "OMDB_LINK_FORM2"){
/*道路形态2*/
var formWay = renderEntity.properties["FORM_OF_WAY"]
if(formWay!=null){
when (formWay) {
"10"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_1.code
"11"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_2.code
"17"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_3.code
"18"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_4.code
"20"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_5.code
"22"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_6.code
"36"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_7.code
"52"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_8.code
"53"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_9.code
"54"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_10.code
"60"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_11.code
"84"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_12.code
"85"-> renderEntity.code = DataCodeEnum.OMDB_LINK_FORM2_13.code
}
}
}

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

@@ -3,6 +3,7 @@ package com.navinfo.omqs.db
import android.util.Log
import com.navinfo.collect.library.data.entity.ReferenceEntity
import com.navinfo.collect.library.data.entity.RenderEntity
import com.navinfo.collect.library.enum.DataCodeEnum
import com.navinfo.collect.library.utils.GeometryTools
import io.realm.Realm
import org.json.JSONArray
@@ -457,10 +458,14 @@ class ImportPreProcess {
fun generateRoadText(renderEntity: RenderEntity) {
// 根据类型进行文字转换
if (renderEntity.code != null) {
if(renderEntity.code=="2004-1"){
if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code){
renderEntity.properties["name"] = "SA"
}else if(renderEntity.code=="2004-2"){
}else if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code){
renderEntity.properties["name"] = "PA"
}else if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code){
renderEntity.properties["name"] = "FRONTAGE"
}else if(renderEntity.code==DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code){
renderEntity.properties["name"] = "MAIN"
}
}
}