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

增加道路施工及车道施工

Browse Source
This commit is contained in:
qiji4215 2023-08-22 17:44:37 +08:00
parent f43dce5ae2
commit 9ba310428f
7 changed files with 61 additions and 4 deletions
Show Stats 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,
@ -319,6 +334,15 @@
"transformer": [
]
},
"4023": {
"table": "OMDB_TOLLGATE",
"code": 4023,
"name": "收费站",
"zoomMin": 15,
"zoomMax": 20,
"transformer": [
]
},
"4601":{
"table": "OMDB_LANEINFO",
"code": 4601,

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

@ -395,6 +395,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
@ -404,6 +405,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

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

@ -2003,7 +2003,21 @@
<symbol src="assets:omdb/icon_1007_0.svg" symbol-height="56"
symbol-width="56"></symbol>
</m>
<!-- 收费站 -->
<m v="OMDB_TOLLGATE">
<m k="angle">
<symbol repeat="false" repeat-start="0" rotate="false"
src="assets:omdb/icon_4023_0.svg" symbol-height="24" symbol-width="24"></symbol>
</m>
<!-- <m k="type" v="angle">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
src="assets:omdb/icon_arrow_right.svg" symbol-height="64"
symbol-width="64"></symbol>
</m>
<m k="type" v="s_2_e">
<line use="s2e" />
</m>-->
</m>
<!-- 道路边界类型 -->
<m v="OMDB_RDBOUND_BOUNDARYTYPE">
<outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
@ -2221,6 +2235,18 @@
</m>
</m>
<!-- 道路施工 -->
<m v="OMDB_LINK_CONSTRUCTION">
<line stroke="#FF0000" width="0.5" />
<symbol repeat="true" repeat-start="0" repeat-gap="32" src="assets:omdb/icon_2017_0.svg"></symbol>
</m>
<!-- 车道施工 -->
<m v="OMDB_LANE_CONSTRUCTION">
<line stroke="#FF0000" width="0.5" />
<symbol repeat="true" repeat-start="0" repeat-gap="32" src="assets:omdb/icon_2017_0.svg"></symbol>
</m>
<!--常规点限速-->
<m v="OMDB_SPEEDLIMIT">
<m k="speedFlag" v="0">

1
collect-library/src/main/assets/omdb/icon_2017_0.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692696109420" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="11756" width="32" height="32" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M537.6 409.6a51.2 51.2 0 1 1-2.7904 102.3232c2.9952 3.3024 5.8368 7.04 8.5504 11.2128 2.0992 7.9104 4.224 16.384 6.3232 24.9856l4.7616 19.456c6.8608 27.904 13.7216 53.9136 20.5824 63.232 9.7024 13.184 16.4096 32.384 14.7456 46.5408l-0.6656 3.7376 52.8128 25.1392 3.5072-3.584c6.1696-3.1488 9.6256-6.2976 15.104-4.608l2.5088 1.024 14.08 7.168c7.04 0 7.04-3.584 7.04-10.7776-20.4288-31.2576 1.9712-69.248 35.328-68.4288l3.4048 0.2304 35.2-57.4464c9.984-13.568 16.7936-20.736 23.4496-6.3488l1.1776 2.7648L972.8 918.016 128 921.6l31.6672-57.4464 154.88-3.584c-6.8096-45.312 46.0288-188.672 84.5568-246.272l3.456-5.0176-28.16-53.8368c-7.04-14.336 0-28.7232 28.16-43.0848 21.12-10.752 42.24-21.5296 63.36-25.1136a88.9088 88.9088 0 0 1 28.2368 0.5888A51.2 51.2 0 0 1 537.6 409.6z m-40.0128 242.7648l17.6128 28.7232c10.5728 14.336 17.6128 32.3072 14.08 50.2528 0 51.5072-3.2256 103.0144-15.8208 123.1104l-1.792 2.5344h28.16v10.752h10.5728c-3.5072-14.336 3.5072-25.088 14.08-32.2816 14.08-3.584 17.6128-17.9712 17.6128-39.5008 31.6672-25.1136 56.32-35.8912 70.4-14.336 6.4-6.5536 12.8-7.1424 24.4736-4.5056l3.6608 0.896v-14.336l-28.16-17.9712c-6.2464 0-9.728-2.816-10.4192-8.4992l-0.128-2.2784v-10.752l-144.3072-71.808zM224.6912 97.28l2.9952 0.1792c16.0256 2.4064 28.16 22.3232 24.2944 42.24L120.32 829.5168c-3.84 19.9168-20.3776 33.9968-36.4032 32.0512-16.0512-1.9456-28.16-22.3232-24.32-42.24L191.2576 129.5104c3.8656-19.9168 20.4032-33.9968 36.4288-32.0512z m198.9888 576.6144c-19.3536 59.2384-44.6464 118.4768-73.1136 169.4208l-7.8592 13.6704 130.2528-3.584c-9.9072-30.2848-7.424-76.3648-4.1728-123.392l0.64-9.4464-45.7472-46.6688z m116.1472-68.1984c-3.2256 13.2608-15.488 29.568-14.592 37.632l0.512 1.8688 42.24 21.5296c-14.08-17.9456-21.12-39.4752-28.16-61.0304z m-91.52-71.7824c-24.6272 0-38.7072 10.752-17.5872 32.3072 0-10.752 7.04-25.1392 17.6128-32.3072zM658.0736 99.328c16.0256-1.3312 32.5632 8.448 36.4288 22.3744l91.0592 331.8784c3.8656 14.2336-8.2688 28.16-24.32 29.4912-16 1.3568-32.512-8.448-36.4032-22.3744L633.7792 128.8448c-3.8656-13.9008 6.3232-26.7776 24.2944-29.4912zM452.096 129.9968c16.0256 0 28.16 7.7824 28.16 19.9168v156.9024c0 9.728-12.1344 19.9168-28.16 19.9168-16.0256 0-28.16-7.7824-28.16-19.9168V149.9392c0-9.728 12.1344-19.9168 28.16-19.9168z" fill="#FF0000" p-id="11757" data-spm-anchor-id="a313x.search_index.0.i16.1f1e3a81TbBd6K" class=""></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

1
collect-library/src/main/assets/omdb/icon_4023_0.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692693298865" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10694" xmlns:xlink="http://www.w3.org/1999/xlink" width="56" height="56"><path d="M512 0c187.733333 0 341.333333 146.773333 341.333333 329.386667v11.946666c-3.413333 109.226667-66.56 230.4-168.96 354.986667-49.493333 58.026667-102.4 114.346667-160.426666 163.84l-11.946667 10.24-11.946667-10.24-15.36-13.653333c-51.2-46.08-100.693333-97.28-145.066666-150.186667C237.226667 571.733333 175.786667 448.853333 170.666667 341.333333v-11.946666C170.666667 150.186667 319.146667 3.413333 503.466667 0h8.533333z" fill="#2D54EC" p-id="10695"></path><path d="M609.28 455.68h29.013333c8.533333 0 10.24-6.826667 11.946667-15.36 0-6.826667-8.533333-13.653333-17.066667-13.653333h-11.946666c0-1.706667-1.706667-1.706667-3.413334-3.413334l-42.666666-39.253333c-1.706667-1.706667-5.12-5.12-5.12-3.413333-5.12-11.946667-18.773333-20.48-32.426667-20.48H477.866667c-20.48 0-23.893333 8.533333-23.893334 27.306666v83.626667h112.64V426.666667l25.6 18.773333 5.12 5.12c1.706667 3.413333 5.12 5.12 11.946667 5.12z m-95.573333-109.226667c25.6 0 47.786667-20.48 47.786666-44.373333 0-25.6-20.48-44.373333-47.786666-44.373333-25.6 0-47.786667 20.48-47.786667 44.373333 0 23.893333 20.48 44.373333 47.786667 44.373333z m107.52-112.64v46.08h18.773333V187.733333H375.466667v358.4h264.533333v-76.8h-18.773333v27.306667H413.013333V233.813333h208.213334z" fill="#FFFFFF" p-id="10696"></path><path d="M204.8 921.6a307.2 102.4 0 1 0 614.4 0 307.2 102.4 0 1 0-614.4 0Z" fill="#2D54EC" opacity=".366" p-id="10697"></path><path d="M409.6 921.6a102.4 34.133333 0 1 0 204.8 0 102.4 34.133333 0 1 0-204.8 0Z" fill="#2D54EC" p-id="10698"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

7
collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
View File

@ -4,8 +4,8 @@ package com.navinfo.collect.library.enums
* 要素枚举定义
* */
enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_NODE_FORM("点形态", "1007"),
OMDB_NODE_PA("点形态PA", "1007"),
OMDB_NODE_FORM("点形态", "1007-6"),
OMDB_NODE_PA("点形态PA", "1007-6"),
OMDB_CHECKPOINT("检查点", "1012"),
OMDB_RD_LINK("道路线", "2001"),
OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"),
@ -18,6 +18,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_LINK_DIRECT("道路方向", "2010"),
OMDB_LINK_NAME("道路名", "2011"),
OMDB_LANE_MARK_BOUNDARYTYPE("车道边界类型", "2013"),
OMDB_LINK_CONSTRUCTION("道路施工", "2017"),
OMDB_LINK_SPEEDLIMIT("常规线限速", "2019"),
OMDB_LINK_SPEEDLIMIT_COND("条件线限速", "2020"),
OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"),
@ -34,6 +35,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_LANE_NUM("车道数", "2041"),
OMDB_VIADUCT("高架", "2043"),
OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"),
OMDB_LANE_CONSTRUCTION("车道施工", "2090"),
OMDB_BRIDGE("桥", "2201"),
OMDB_TUNNEL("隧道", "2202"),
OMDB_ROUNDABOUT("环岛", "2204"),
@ -63,6 +65,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_RESTRICTION("普通交限", "4006"),
OMDB_ELECTRONICEYE("电子眼", "4010"),
OMDB_TRAFFICLIGHT("交通灯", "4022"),
OMDB_TOLLGATE("收费站", "4023"),
OMDB_LANEINFO("车信", "4601"),
OMDB_LANE_LINK_LG("车道中心线", "5001");

2
vtm

@ -1 +1 @@
Subproject commit bd83adb7df464686b3f19e8a08aeef2cb49f5c17
Subproject commit ebe23ed7731e301669b2b4ea03918e313a63617e