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

fix: 修改车道边线数据导入时的选取原则

Browse Source
This commit is contained in:
xiaoyan 2023-06-05 15:59:56 +08:00
parent c6bf940dc4
commit 02a65100c8
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,14 +119,28 @@ class ImportPreProcess {
* 解析车道边线数据二级属性 * 解析车道边线数据二级属性
* */ * */
fun unpackingLaneBoundary(renderEntity: RenderEntity) { fun unpackingLaneBoundary(renderEntity: RenderEntity) {
var shape:JSONObject = JSONObject(mapOf(
"lateralOffset" to 0,
"markType" to 1,
"markColor" to 0,
"markMaterial" to 1,
"markSeqNum" to 1,
"markWidth" to 10,
"markingCount" to 1
))
if (renderEntity.code == 2013&&!renderEntity.properties["shapeList"].isNullOrEmpty()&&renderEntity.properties["shapeList"]!="null") { if (renderEntity.code == 2013&&!renderEntity.properties["shapeList"].isNullOrEmpty()&&renderEntity.properties["shapeList"]!="null") {
// 解析shapeList，将数组中的属性放会properties // 解析shapeList，将数组中的属性放会properties
val shapeList = JSONArray(renderEntity.properties["shapeList"]) val shapeList = JSONArray(renderEntity.properties["shapeList"])
val shape = shapeList.getJSONObject(0) for (i in 0 until shapeList.length()) {
for (key in shape.keys()) { shape = shapeList.getJSONObject(i)
renderEntity.properties[key] = shape[key].toString() if (shape.optInt("lateralOffset", 0) == 0) {
break
}
} }
} }
for (key in shape.keys()) {
renderEntity.properties[key] = shape[key].toString()
}
} }
/** /**

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

@ -1743,19 +1743,19 @@
<m v="2"> <m v="2">
<m k="markColor"> <m k="markColor">
<m v="0|1"> <m v="0|1">
<line stroke="#ffffff" use="boundaryType" dasharray="3,13"/> <line stroke="#ffffff" stipple-stroke="#000000" stipple="5" use="boundaryType" dasharray="13,135"/>
</m> </m>
<m v="2"> <m v="2">
<line stroke="#eccc68" use="boundaryType" dasharray="3,3"/> <line stroke="#eccc68" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
</m> </m>
<m v="6"> <m v="6">
<line stroke="#0000ff" use="boundaryType" dasharray="3,3"/> <line stroke="#0000ff" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
</m> </m>
<m v="7"> <m v="7">
<line stroke="#00ff00" use="boundaryType" dasharray="3,3"/> <line stroke="#00ff00" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
</m> </m>
<m v="9"> <m v="9">
<line stroke="#8e44ad" use="boundaryType" dasharray="3,3"/> <line stroke="#8e44ad" stipple-stroke="#ffffff" stipple="5" use="boundaryType" dasharray="13,135"/>
</m> </m>
</m> </m>
</m> </m>

2
vtm

@ -1 +1 @@
Subproject commit 1ee201a41f78f169873848209a3f3bdac36f185a Subproject commit fb0b88e916c51754baedfb7c5b42aa86b9dc337d