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:46:29 +08:00
commit d92a75e2b5
10 changed files with 118 additions and 13 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,
@ -352,6 +367,15 @@
"transformer": [
]
},
"4023": {
"table": "OMDB_TOLLGATE",
"code": 4023,
"name": "收费站",
"zoomMin": 15,
"zoomMax": 20,
"transformer": [
]
},
"4601":{
"table": "OMDB_LANEINFO",
"code": 4601,

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

@ -413,6 +413,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
@ -422,6 +423,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
@ -438,6 +440,12 @@ class ImportOMDBHelper @AssistedInject constructor(
}
}
}
}else if(renderEntity.code == DataCodeEnum.OMDB_LANE_CONSTRUCTION.code){
//特殊处理空数据，渲染原则使用
var startTime = renderEntity.properties["startTime"]
if(startTime==null||startTime=="") {
renderEntity.properties["startTime"] = "null"
}
}
listResult.add(renderEntity)

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

@ -231,7 +231,11 @@ class ImportPreProcess {
if (renderEntity.table == table) {
Log.e("qj","generateS2EReferencePoint===开始")
if (renderEntity.properties.containsKey(proKey)) {
startReference.properties["type"] = "s_2_p_${renderEntity.properties[proKey]}"
if(renderEntity.properties[proKey]!=""){
startReference.properties["type"] = "s_2_p_${renderEntity.properties[proKey]}"
}else{
startReference.properties["type"] = "s_2_p_0"
}
Log.e("qj","generateS2EReferencePoint===s_2_p_${renderEntity.properties[proKey]}")
}
} else {
@ -258,7 +262,11 @@ class ImportPreProcess {
endReference.properties["qi_table"] = renderEntity.table
if (renderEntity.table == table) {
if (renderEntity.properties.containsKey(proKey)) {
endReference.properties["type"] = "e_2_p_${renderEntity.properties[proKey]}"
if(renderEntity.properties[proKey]!=""){
endReference.properties["type"] = "e_2_p_${renderEntity.properties[proKey]}"
}else{
endReference.properties["type"] = "e_2_p_0"
}
}
} else {
endReference.properties["type"] = "e_2_p"

51
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="56" symbol-width="56"></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" />
@ -2152,11 +2166,11 @@
<line dasharray="4,4" stroke="#4624FF" width="0.4" />
</m>
<m k="type" v="s_2_p">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2202_0.svg" symbol-height="24" symbol-width="24"></symbol>
</m>
<m k="type" v="e_2_p">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2202_1.svg" symbol-height="24" symbol-width="24"></symbol>
</m>
</m>
@ -2168,27 +2182,27 @@
<lineSymbol repeat-gap="24" repeat-start="0" symbol-height="24" src="assets:omdb/icon_2201_1.svg" />
</m>
<m k="type" v="s_2_p_1">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2201_1_1.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="e_2_p_1">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2201_1_2.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="s_2_p_2">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2201_2_1.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="e_2_p_2">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2201_2_2.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="s_2_p_3">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2201_3_1.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="e_2_p_3">
<symbol repeat="false" repeat-start="0" rotate="false"
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2201_3_2.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
</m>
@ -2221,6 +2235,7 @@
</m>
</m>
<!--常规点限速-->
<m v="OMDB_SPEEDLIMIT">
<m k="speedFlag" v="0">
@ -2315,5 +2330,23 @@
<!-- <area use="obj-area" repeat="false"></area>-->
<!-- <symbol src="assets:omdb/icon_fill_area_3012.svg"></symbol>-->
</m>
<!-- 道路施工 -->
<m v="OMDB_LINK_CONSTRUCTION">
<line stroke="#FF0000" width="1" />
<symbol repeat="true" repeat-start="0" src="assets:omdb/icon_2017_1.svg"></symbol>
</m>
<!-- 车道施工 -->
<m v="OMDB_LANE_CONSTRUCTION">
<line stroke="#eccc68" width="0.1" />
<m k="startTime" v="null">
<symbol repeat="true" repeat-start="0" gland="true" repeat-gap="100" src="assets:omdb/icon_2017_1.svg"></symbol>
</m>
<m k="startTime" v="-|null">
<symbol repeat="true" repeat-start="0" repeat-gap="100" gland="true" src="assets:omdb/icon_2017_2.svg"></symbol>
</m>
</m>
</m>
</rendertheme>

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="39.7" height="39.7" viewBox="0 0 39.7 39.7"><defs><style>.d{fill:#fff;}.e{fill:#919191;}.f{fill:#7c7d7d;}.g{fill:#a01f38;}.h{fill:#c9233b;}.i{fill:#dad7e5;}.j{fill:#425b72;}.k{fill:#1a232b;}</style></defs><g id="c"><g><path class="g" d="M39.7,19.8c0,11-8.9,19.8-19.8,19.8C1.6,39.7-7.2,16.6,7.1,4.6c12.7-10.7,32.6-1.7,32.6,15.2Z"/><path class="h" d="M39.7,19.8c0,4.7-1.6,9.2-4.6,12.8-8.8,6.6-18.6,5.6-25.3,.1C1.3,25.8,0,13.3,7,4.8c0,0,0-.1,.1-.2,12.7-10.7,32.6-1.7,32.6,15.2Z"/><path class="i" d="M34.7,19.8c0,8.2-6.7,14.9-14.9,14.8-8.2,0-14.9-6.7-14.8-14.9,0-7.7,5.9-14.1,13.6-14.8,8.2-.7,15.4,5.4,16.1,13.6,0,.4,0,.9,0,1.3Z"/><path class="d" d="M34.7,19.8c0,4.5-2.3,8.7-3.6,9.5-6.7,4.8-16,3.3-20.8-3.4-3.7-5.2-3.7-12.2,0-17.4,.8-1.3,5-3.6,9.5-3.6,8.2,0,14.9,6.7,14.9,14.9Z"/><path class="e" d="M21.1,5v2.5c0,.7-.6,1.2-1.2,1.2s-1.2-.6-1.2-1.2v-2.5c.8,0,1.7,0,2.5,0Z"/><path class="f" d="M10.2,12l-1.7-1.7c.5-.6,1.1-1.2,1.8-1.7l1.7,1.7c.5,.5,.5,1.3,0,1.8s-1.3,.5-1.8,0Z"/><path class="f" d="M7.5,21.1h-2.5c0-.8,0-1.7,0-2.5h2.5c.7,0,1.2,.6,1.2,1.2s-.6,1.2-1.2,1.2Z"/><path class="f" d="M12,29.5l-1.7,1.7c-.6-.5-1.2-1.1-1.7-1.7l1.7-1.7c.5-.5,1.3-.5,1.8,0,.5,.5,.5,1.3,0,1.8h0Z"/><path class="f" d="M21.1,32.2v2.5c-.8,0-1.7,0-2.5,0v-2.5c0-.7,.6-1.2,1.2-1.2s1.2,.6,1.2,1.2Z"/><path class="f" d="M31.2,29.4c-.5,.6-1.1,1.2-1.7,1.8l-1.7-1.7c-.5-.5-.5-1.3,0-1.8,.5-.5,1.3-.5,1.8,0h0l1.7,1.7Z"/><path class="e" d="M34.7,21.1h-2.5c-.7,0-1.2-.6-1.2-1.2s.6-1.2,1.2-1.2h2.5c0,.8,0,1.7,0,2.5Z"/><path class="e" d="M31.2,10.2c-1.9,1.9-1.9,2.1-2.6,2.1-.7,0-1.2-.5-1.2-1.2,0-.3,.1-.7,.4-.9l1.7-1.7c.6,.5,1.2,1.1,1.7,1.7Z"/><path class="e" d="M18.6,18.6v-6.2c0-.7,.6-1.2,1.2-1.2s1.2,.6,1.2,1.2v6.2c0,.7-.6,1.2-1.2,1.2s-1.2-.6-1.2-1.2Z"/><path class="e" d="M24.8,21.1h-3.7c-.7,0-1.2-.6-1.2-1.2s.6-1.2,1.2-1.2h3.7c.7,0,1.2,.6,1.2,1.2s-.6,1.2-1.2,1.2Z"/><path class="e" d="M10.2,12l-1.2-1.2c.4-.8,.8-1.5,1.3-2.2l1.6,1.6c.5,.5,.5,1.3,0,1.8-.5,.5-1.3,.5-1.8,0Z"/><path class="e" d="M7.9,21c-.2-.8-.3-1.6-.4-2.4,.7,0,1.2,.6,1.2,1.3,0,.5-.3,.9-.8,1.1Z"/><path class="e" d="M12.3,28.3c-.3-.3-.6-.6-.9-.9,.5,.1,.8,.5,.9,.9Z"/><path class="e" d="M21.1,32.2c-.8,0-1.6-.2-2.4-.4,.3-.6,1-.9,1.6-.7,.4,.2,.7,.6,.8,1.1Z"/><path class="e" d="M31.1,29.3c-.7,.5-1.4,1-2.2,1.3l-1.2-1.2c-.5-.5-.5-1.3,0-1.8,.5-.5,1.3-.5,1.8,0l1.6,1.7Z"/><path class="k" d="M22.3,19.8c0,1.4-1.1,2.5-2.5,2.5-1.4,0-2.5-1.1-2.5-2.5,0-1,.6-1.9,1.5-2.3,1.2-.6,2.7,0,3.3,1.2,.1,.3,.2,.7,.2,1Z"/><path class="j" d="M22.1,20.9c-1.3,.6-2.7,0-3.3-1.3-.3-.6-.3-1.4,0-2,1.3-.6,2.7,0,3.3,1.3,.3,.6,.3,1.4,0,2Z"/></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="45.4" height="39.7" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 45.4 39.7"><defs><style>.p{fill:url(#i);}.q{fill:url(#o);}.r{fill:url(#n);}.s{fill:url(#f);}.t{fill:none;}.u{fill:url(#j);}.u,.v{stroke:#706a69;stroke-miterlimit:10;stroke-width:.3px;}.v{fill:url(#l);}.w{fill:#ffc840;}.x{fill:#ff4649;}.y{fill:#333;}.z{fill:#535a60;}.aa{fill:#262d34;isolation:isolate;opacity:.2;}.ab{clip-path:url(#k);}.ac{clip-path:url(#m);}</style><linearGradient id="f" x1="31" y1="21.8" x2="33.7" y2="21.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#989898"/><stop offset=".1" stop-color="#c1c1c1"/><stop offset=".3" stop-color="#e3e3e3"/><stop offset=".4" stop-color="#f7f7f7"/><stop offset=".5" stop-color="#fff"/><stop offset=".6" stop-color="#fbfbfb"/><stop offset=".6" stop-color="#f1f2f2"/><stop offset=".7" stop-color="#e0e1e2"/><stop offset=".8" stop-color="#c9c9cb"/><stop offset=".8" stop-color="#aaabad"/><stop offset=".9" stop-color="#848689"/><stop offset="1" stop-color="#585b5e"/><stop offset="1" stop-color="#3f4246"/></linearGradient><linearGradient id="i" x1="10.6" y1="21.8" x2="13.2" y2="21.8" xlink:href="#f"/><linearGradient id="j" x1="1.9" y1="12.9" x2="43.5" y2="12.9" xlink:href="#f"/><clipPath id="k"><rect class="t" x="2.9" y="9.6" width="39.7" height="7.2" rx=".2" ry=".2"/></clipPath><linearGradient id="l" x1="1.9" y1="24.4" x2="43.5" y2="24.4" xlink:href="#f"/><clipPath id="m"><rect class="t" x="2.5" y="21.1" width="40.5" height="7.2" rx=".2" ry=".2"/></clipPath><radialGradient id="n" cx="11" cy="1.1" fx="11" fy="1.1" r="1.7" gradientTransform="translate(1.6 4.1) scale(.9)" gradientUnits="userSpaceOnUse"><stop offset=".5" stop-color="#fff"/><stop offset=".5" stop-color="#fffdf4"/><stop offset=".8" stop-color="#ffea93"/><stop offset=".9" stop-color="#ffdf56"/><stop offset="1" stop-color="#ffdb3f"/></radialGradient><radialGradient id="o" cx="33" fx="33" xlink:href="#n"/></defs><g id="c"><g><rect class="t" width="45.4" height="39.7"/><g><ellipse id="d" class="aa" cx="32.3" cy="37" rx="5.6" ry="1.5"/><ellipse id="e" class="z" cx="32.3" cy="37" rx="2.9" ry="1.2"/><path class="s" d="M31.3,6.5h1.9c.3,0,.5,.2,.5,.5v29.4c0,.3-.2,.5-.5,.5h-2c-.3,0-.5-.2-.5-.5V7.1c0-.3,.2-.5,.5-.5Z"/></g><g><ellipse id="g" class="aa" cx="11.8" cy="37.1" rx="5.6" ry="1.4"/><ellipse id="h" class="z" cx="11.8" cy="37.1" rx="2.9" ry="1.1"/><path class="p" d="M10.9,6.5h1.9c.3,0,.5,.2,.5,.5v29.5c0,.3-.2,.5-.5,.5h-2c-.3,0-.5-.2-.5-.5V7.1c0-.3,.2-.5,.5-.5Z"/></g><rect class="u" x="1.9" y="8.3" width="41.6" height="9.1" rx=".2" ry=".2"/><rect x="1.9" y="9" width="41.6" height="8.5" rx=".2" ry=".2"/><rect class="w" x="2.5" y="9.6" width="40.5" height="7.2" rx=".2" ry=".2"/><g class="ab"><polygon class="y" points="6.4 18.7 2.3 17.7 9.8 6.6 13.9 7.6 6.4 18.7"/><polygon class="y" points="16.3 19.1 11.9 18.1 19.5 7 23.8 8 16.3 19.1"/><polygon class="y" points="35.6 19 31.3 18 38.9 6.9 43.2 7.9 35.6 19"/><polygon class="y" points="26.1 18.5 21.6 17.5 29.3 6.4 33.8 7.5 26.1 18.5"/></g><rect class="v" x="1.9" y="19.8" width="41.6" height="9.1" rx=".2" ry=".2"/><rect x="1.9" y="20.5" width="41.6" height="8.5" rx=".2" ry=".2"/><rect class="w" x="2.5" y="21.1" width="40.5" height="7.2" rx=".2" ry=".2"/><g class="ac"><polygon class="y" points="6.1 30.2 1.9 29.2 9.5 18.1 13.8 19.1 6.1 30.2"/><polygon class="y" points="16.2 30.6 11.8 29.6 19.5 18.5 23.9 19.5 16.2 30.6"/><polygon class="y" points="35.9 30.5 31.5 29.5 39.2 18.4 43.6 19.4 35.9 30.5"/><polygon class="y" points="26.2 30.1 21.6 29 29.4 17.9 34 19 26.2 30.1"/></g><g><circle class="x" cx="11.9" cy="5.1" r="2.3"/><circle class="r" cx="11.9" cy="5.1" r="1.4"/></g><g><circle class="x" cx="32.3" cy="5.1" r="2.3"/><circle class="q" cx="32.3" cy="5.1" r="1.4"/></g></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

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

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB

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

@ -0,0 +1 @@
<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="124.7" height="124.7" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 124.7 124.7"><defs><style>.i{fill:url(#f);}.j{fill:#fff;}.k{fill:#1566e8;}.l,.m{fill:#535a60;}.n{fill:#262d34;isolation:isolate;opacity:.2;}.o{fill:url(#g);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1px;}.m{opacity:0;}</style><linearGradient id="f" x1="60.1" y1="50.4" x2="64.9" y2="50.4" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#989898"/><stop offset="0" stop-color="#a3a3a3"/><stop offset=".1" stop-color="#c4c5c5"/><stop offset=".2" stop-color="#d8d9d9"/><stop offset=".3" stop-color="#e0e1e1"/><stop offset=".4" stop-color="#dbdcdc"/><stop offset=".5" stop-color="#cccece"/><stop offset=".6" stop-color="#b5b6b7"/><stop offset=".7" stop-color="#949697"/><stop offset=".8" stop-color="#6a6c6f"/><stop offset=".8" stop-color="#3f4246"/><stop offset="1" stop-color="#404247"/><stop offset="1" stop-color="#43434a"/></linearGradient><linearGradient id="g" x1="40.1" y1="23.8" x2="84.6" y2="23.8" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#afbacb"/><stop offset=".1" stop-color="#c1ccda"/><stop offset=".4" stop-color="#d9e6f0"/><stop offset=".5" stop-color="#e3f0f8"/><stop offset=".6" stop-color="#dde9f2"/><stop offset=".8" stop-color="#ccd8e4"/><stop offset="1" stop-color="#b1bbcc"/><stop offset="1" stop-color="#aeb8c9"/></linearGradient></defs><g id="c"><g><rect class="m" y="0" width="124.7" height="124.7"/><g><ellipse id="d" class="n" cx="62.4" cy="61.8" rx="14.4" ry="3.7"/><ellipse id="e" class="l" cx="62.4" cy="61.8" rx="7.5" ry="3"/><path class="i" d="M62.4,38.3h0c1.4,0,2.6,1.2,2.6,2.6v19.2c0,1.4-1.1,2.5-2.5,2.5h-.3c-1.4,0-2.5-1.1-2.5-2.5v-19.3c0-1.4,1.2-2.6,2.6-2.6Z"/><rect class="o" x="40.1" y=".5" width="44.5" height="46.6" rx="14.4" ry="14.4"/><rect class="k" x="40.6" y="2.6" width="43.5" height="44" rx="14.1" ry="14.1"/><path id="h" class="j" d="M46,10.1c-.3,0-.6-.2-.7-.4s0-.6,.1-.8c1.3-1.6,3-2.9,4.8-3.9,.2,0,.4-.1,.6,0,.2,0,.4,.2,.5,.4,.2,.4,0,.9-.3,1.1-1.7,.9-3.1,2.1-4.3,3.5-.2,.2-.4,.3-.6,.3h0Zm-1.8,2.6c-.1,0-.3,0-.4-.1-.2-.1-.3-.3-.4-.5,0-.2,0-.4,.1-.6l.3-.4c.1-.2,.3-.3,.5-.4,.2,0,.4,0,.6,0,.2,.1,.3,.3,.4,.5s0,.4-.1,.6l-.3,.4c-.1,.2-.4,.4-.7,.4h0Z"/><g><path class="j" d="M68.5,35.5h-16.3V13.7h16.3v3.6h2v-5.3h-20.2v25.2h20.2v-3.5h-2v1.8Z"/><path class="j" d="M57.3,19.7c0,2.1,1.7,3.7,3.8,3.7s3.8-1.7,3.8-3.7-1.7-3.7-3.8-3.7-3.8,1.7-3.8,3.7h0Z"/><path class="j" d="M73.3,29.4s0,0-.1,0h0s-3.6,0-3.6,0l-5.3-5.2h-6.7s-1.3,.2-2.4,2v6.1h10.6v-2.5s.3-.1,.6,0c.4,.1,2.5,2.5,2.5,2.5h4.6c.5-.1,.9-.7,.9-1.4,0-.8-.5-1.4-1.1-1.4h0Zm2.4,0h3.2v2.7h-3.2v-2.7Z"/></g></g></g></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

25
collect-library/src/main/assets/omdb/icon_4023_1.svg Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg id="b" xmlns="http://www.w3.org/2000/svg" width="59.2" height="59.2" viewBox="0 0 59.2 59.2">
<defs>
<style>
.d{fill:#1566e8;stroke:#fff;stroke-miterlimit:10;stroke-width:2.5px;}.e,.f{fill:#fff;}.f{font-family:AlibabaPuHuiTiB-GBpc-EUC-H,
'Alibaba PuHuiTi';font-size:12px;}
</style>
</defs>
<g id="c">
<g>
<circle class="d" cx="29.6" cy="29.6" r="28.3" />
<g>
<path class="e"
d="M34.5,48.2H18.2V26.5h16.3v3.6h2v-5.3H16.2v25.2h20.2v-3.5h-2v1.8Z" />
<path class="e"
d="M23.2,32.4c0,2.1,1.7,3.7,3.8,3.7s3.8-1.7,3.8-3.7-1.7-3.7-3.8-3.7-3.8,1.7-3.8,3.7h0Z" />
<path class="e"
d="M39.3,42.2s0,0-.1,0h0s-3.6,0-3.6,0l-5.3-5.2h-6.7s-1.3,.2-2.4,2v6.1h10.6v-2.5s.3-.1,.6,0c.4,.1,2.5,2.5,2.5,2.5h4.6c.5-.1,.9-.7,.9-1.4,0-.8-.5-1.4-1.1-1.4h0Zm2.4,0h3.2v2.7h-3.2v-2.7Z" />
</g>
<text class="f" transform="translate(12.3 19.9)">
<tspan x="0" y="0">收费站</tspan>
</text>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 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");