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

fix: 修改车信导入功能

Browse Source
This commit is contained in:
xiaoyan 2023-11-21 17:06:24 +08:00
parent 5fbeb45e5a
commit 2e0712ed2b
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -626,8 +626,19 @@ class ImportPreProcess {
// 分别获取两个数组中的数据，取第一个作为主数据，另外两个作为辅助渲染数据 // 分别获取两个数组中的数据，取第一个作为主数据，另外两个作为辅助渲染数据
val laneInfoDirectArray = JSONArray(laneinfoGroup[0].toString()) val laneInfoDirectArray = JSONArray(laneinfoGroup[0].toString())
val laneInfoTypeArray = JSONArray(laneinfoGroup[1].toString()) val laneInfoTypeArray = JSONArray(laneinfoGroup[1].toString())
val listResult = mutableListOf<ReferenceEntity>()
val referenceEntity = ReferenceEntity()
referenceEntity.name = "${renderEntity.name}参考方向"
referenceEntity.table = renderEntity.table
referenceEntity.enable = renderEntity.enable
referenceEntity.code = renderEntity.code
referenceEntity.taskId = renderEntity.taskId
referenceEntity.zoomMin = renderEntity.zoomMin
referenceEntity.zoomMax = renderEntity.zoomMax
// 与原数据使用相同的geometry
referenceEntity.geometry = renderEntity.geometry
referenceEntity.properties["qi_table"] = renderEntity.table
referenceEntity.properties["symbol"] = "true"
for (i in 0 until laneInfoDirectArray.length()) { for (i in 0 until laneInfoDirectArray.length()) {
val currentDirect = val currentDirect =
laneInfoDirectArray[i].toString().split(",").distinct().joinToString("_") laneInfoDirectArray[i].toString().split(",").distinct().joinToString("_")
@ -637,7 +648,7 @@ class ImportPreProcess {
if (currentType == "0") "normal" else if (currentType == "1") "extend" else "bus" if (currentType == "0") "normal" else if (currentType == "1") "extend" else "bus"
val symbol = val symbol =
"assets:omdb/4601/${type}/1301_${currentDirect}.svg" "assets:omdb/4601/${type}/1301_${currentDirect}.svg"
renderEntity.properties["src"] = if(renderEntity.properties["src"].isNullOrEmpty()) symbol else "${renderEntity.properties["src"]}|${symbol}" referenceEntity.properties["img-src"] = if(referenceEntity.properties["img-src"].isNullOrEmpty()) symbol else "${referenceEntity.properties["img-src"]}|${symbol}"
// // 根据后续的数据生成辅助表数据 // // 根据后续的数据生成辅助表数据
// val referenceEntity = ReferenceEntity() // val referenceEntity = ReferenceEntity()
@ -665,6 +676,8 @@ class ImportPreProcess {
// renderEntity.referenceEntitys?.add(referenceEntity) // renderEntity.referenceEntitys?.add(referenceEntity)
//listResult.add(referenceEntity) //listResult.add(referenceEntity)
} }
referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
renderEntity.referenceEntitys?.add(referenceEntity)
//insertData(listResult) //insertData(listResult)
} }
//将主表线转化为单个点，按点要素实现捕捉 //将主表线转化为单个点，按点要素实现捕捉

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

@ -1555,8 +1555,10 @@
<!-- 车信 --> <!-- 车信 -->
<m v="OMDB_LANEINFO" > <m v="OMDB_LANEINFO" >
<m k="symbol" v="true">
<symbol repeat="false" repeat-start="0" repeat-gap="2000" <symbol repeat="false" repeat-start="0" repeat-gap="2000"
src="@src" symbol-height="24" degree="90"></symbol> src="@img-src" symbol-height="24" degree="90"></symbol>
</m>
</m> </m>
<!-- 杆状物 --> <!-- 杆状物 -->
<m v="OMDB_POLE"> <m v="OMDB_POLE">