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:00:54 +08:00
parent d05222e65f f43dce5ae2
commit e30e824a1b
21 changed files with 503 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -365,6 +365,7 @@ class ImportOMDBHelper @AssistedInject constructor(
}
}
}else if(renderEntity.code == DataCodeEnum.OMDB_LINK_FORM2.code){
Log.e("qj","道路形态2${renderEntity.properties["formOfWay"]}")
/*道路形态2*/
var formWay = renderEntity.properties["formOfWay"]
if(formWay!=null){
@@ -407,6 +408,36 @@ class ImportOMDBHelper @AssistedInject constructor(
}
}
}
}else if(renderEntity.table == DataCodeEnum.OMDB_NODE_FORM.name){//特殊处理，因为code相同，使用表名判断
//过滤不需要渲染的要素
var formOfWay = renderEntity.properties["formOfWay"]
if(formOfWay!=null&&formOfWay=="30"){
renderEntity.enable=2
}else{
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue
}
}else if(renderEntity.table == DataCodeEnum.OMDB_NODE_PA.name){//特殊处理，因为code相同，使用表名判断
//过滤不需要渲染的要素
var attributeType = renderEntity.properties["attributeType"]
if(attributeType!=null&&attributeType=="30"){
renderEntity.enable=2
}else{
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue
}
}else if(renderEntity.code == DataCodeEnum.OMDB_OBJECT_STOPLOCATION.code){
//过滤不需要渲染的要素
var locationType = renderEntity.properties["locationType"]
if(locationType!=null){
when (locationType) {
"3","4"->{
renderEntity.enable=0
Log.e("qj","过滤不显示数据${renderEntity.table}")
continue
}
}
}
}
listResult.add(renderEntity)

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

@@ -567,6 +567,7 @@ class ImportPreProcess {
val intersectionReference = ReferenceEntity()
intersectionReference.renderEntityId = renderEntity.id
intersectionReference.name = "${renderEntity.name}参考点"
intersectionReference.code = renderEntity.code
intersectionReference.table = renderEntity.table
intersectionReference.zoomMin = renderEntity.zoomMin
intersectionReference.zoomMax = renderEntity.zoomMax

4
app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
View File

@@ -258,7 +258,7 @@ class RealmOperateHelper() {
val realm = getRealmDefaultInstance()
// 查询realm中对应tile号的数据
val realmList = getRealmTools(RenderEntity::class.java, false).and()
.notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.tableName)
.notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name)
.and()
.rawPredicate("tileX>=$xStart and tileX<=$xEnd and tileY>=$yStart and tileY<=$yEnd")
.findAll()
@@ -288,7 +288,7 @@ class RealmOperateHelper() {
val result = mutableListOf<RenderEntity>()
val realm = getRealmDefaultInstance()
val realmList = getRealmTools(RenderEntity::class.java, false).and()
.notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.tableName)
.notEqualTo("table", DataCodeEnum.OMDB_RD_LINK.name)
.and()
.equalTo("properties['${LinkTable.linkPid}']", linkPid).and()
.findAll()