diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 09cfbb01..f255bebc 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -2,12 +2,28 @@
{
"tableGroupName": "普通图层",
"tableMap" : {
+ "1007": {
+ "table": "OMDB_NODE_FORM",
+ "code": 1007,
+ "name": "点形态",
+ "zoomMin": 15,
+ "zoomMax": 20,
+ "checkLinkId": false
+ },
+ "1007_PA": {
+ "table": "OMDB_NODE_PA",
+ "code": 1007,
+ "name": "点形态PA",
+ "zoomMin": 15,
+ "zoomMax": 20,
+ "checkLinkId": false
+ },
"1012": {
"table": "OMDB_CHECKPOINT",
"code": 1012,
"name": "检查点",
"zoomMin": 15,
- "zoomMax": 19
+ "zoomMax": 20
},
"2001": {
"table": "OMDB_RD_LINK",
@@ -141,7 +157,8 @@
"code": 3016,
"name": "停止位置",
"zoomMin": 18,
- "zoomMax": 20
+ "zoomMax": 20,
+ "checkLinkId": false
},
"4001": {
"table": "OMDB_INTERSECTION",
@@ -359,7 +376,7 @@
"code": 2004,
"name": "道路属性",
"zoomMin": 15,
- "zoomMax": 19,
+ "zoomMax": 20,
"transformer": [
{
"k": "geometry",
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
index e54d170f..f163c774 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt
@@ -390,6 +390,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)
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index d571b5e0..bba9dfa9 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1987,12 +1987,23 @@
</m>
<!-- 检查点 -->
- <m v="OMDB_CHECKPOINT">
+ <m v="OMDB_NODE_FORM">
<symbol src="assets:omdb/icon_1012_0.svg" symbol-height="56"
symbol-width="56"></symbol>
</m>
+ <!-- 铁路路口 -->
+ <m v="OMDB_NODE_FORM">
+ <symbol src="assets:omdb/icon_1007_0.svg" symbol-height="56"
+ symbol-width="56"></symbol>
+ </m>
+ <!-- 铁路路口 -->
+ <m v="OMDB_NODE_PA">
+ <symbol src="assets:omdb/icon_1007_0.svg" symbol-height="56"
+ symbol-width="56"></symbol>
+ </m>
+
<!-- 道路边界类型 -->
<m v="OMDB_RDBOUND_BOUNDARYTYPE">
<outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
@@ -2193,10 +2204,10 @@
<m k="locationType" v="1">
<m k="color" v="1">
- <line stroke="#ffffff" use="boundaryType" width="0.1"/>
+ <line stroke="#ffffff" repeat-start="2" use="boundaryType" width="0.1"/>
</m>
<m k="color" v="9">
- <line stroke="#eccc68" use="boundaryType" width="0.1"/>
+ <line stroke="#eccc68" repeat-start="2" use="boundaryType" width="0.1"/>
</m>
</m>
@@ -2208,23 +2219,6 @@
<symbol repeat="true" repeat-gap="1" repeat-start="2" src="assets:omdb/icon_3016_1.svg" symbol-width="5" symbol-height="24"></symbol>
</m>
</m>
- <!--虚线不做渲染-->
-<!-- <m k="locationType" v="3">
- <m k="color" v="1">
- <symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="4"></symbol>
- </m>
- <m k="color" v="9">
- <symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="4"></symbol>
- </m>
- </m>
- <m k="locationType" v="4">
- <m k="color" v="1">
- <line dasharray="1,1,1,1" repeat-start="0" stroke="#ffffff" width="0.1"/>
- </m>
- <m k="color" v="9">
- <line dasharray="1,1,1,1" repeat-start="0" stroke="#eccc68" width="0.1"/>
- </m>
- </m>-->
</m>
<!--常规点限速-->
diff --git a/collect-library/src/main/assets/omdb/icon_1007_0.svg b/collect-library/src/main/assets/omdb/icon_1007_0.svg
new file mode 100644
index 00000000..37555e34
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_1007_0.svg
@@ -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>.h{fill:url(#f);}.i{fill:#eb0c00;}.j{fill:#fff;}.k,.l{fill:#535a60;}.m{fill:#262d34;isolation:isolate;opacity:.2;}.n{fill:url(#g);stroke:#8b9fae;stroke-miterlimit:10;stroke-width:1px;}.l{opacity:0;}</style><linearGradient id="f" x1="60.1" y1="50.7" x2="64.9" y2="50.7" 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="-33" y1="219.1" x2="13.4" y2="219.1" gradientTransform="translate(-144.3 -36.2) rotate(-76.1)" 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"><rect class="l" width="124.7" height="124.7"/><g><ellipse id="d" class="m" cx="62.4" cy="62.1" rx="14.4" ry="3.7"/><ellipse id="e" class="k" cx="62.4" cy="62.1" rx="7.5" ry="3"/><path class="h" d="M62.4,38.6h0c1.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"/><g><path class="n" d="M64.8,2.6l22.1,36.4c1.1,1.9-.2,4.3-2.4,4.3H40.3c-2.2,0-3.6-2.4-2.4-4.3L59.9,2.6c1.1-1.8,3.7-1.8,4.8,0Z"/><g><path class="j" d="M40.4,41.7c-.3,0-.4-.2-.5-.3,0-.1-.1-.4,0-.6L61.8,5.9c.1-.2,.3-.3,.5-.3s.4,0,.5,.3l21.8,34.9c.2,.2,0,.5,0,.6,0,.1-.2,.3-.5,.3H40.4Z"/><path class="i" d="M62.3,9.4l18.8,30.1H43.4L62.3,9.4m0-6c-.9,0-1.8,.4-2.4,1.3l-21.8,34.9c-1.2,1.9,.2,4.3,2.4,4.3h43.7c2.2,0,3.6-2.5,2.4-4.3L64.7,4.8c-.6-.9-1.5-1.3-2.4-1.3h0Z"/></g></g><g><circle cx="57" cy="36.7" r="1.3"/><circle cx="61.6" cy="36.7" r="1.3"/><circle cx="66.4" cy="36.7" r="1.3"/><path d="M65.4,20c-.3,0-.6,0-.9,.2-.4-.6-1-1-1.8-1s-1.5,.4-1.8,1.1c-.2,0-.4,0-.6,0-1.8,0-3.2,1.4-3.2,3.2s0,.8,.2,1.2c-.1,0-.3,0-.4,0-.8,0-1.4,.6-1.4,1.4s0,.2,0,.3c-.4,.1-.7,.5-.7,1s.5,1,1,1,1-.4,1-.9c0,0,0,0,0,0,.4,0,.8-.2,1.1-.5,.2,.5,.7,.9,1.4,.9s1.3-.5,1.4-1.1c1.3-.2,2.4-1.3,2.6-2.6,.4,.6,1.2,1,2,1,1.3,0,2.4-1.1,2.4-2.4,0-1.3-1.1-2.4-2.4-2.4Z"/><path d="M53.8,30.3s-.3,1.4-.3,2.5,.3,2.6,.3,2.6h-.4v.8h2.1v-1.1h12.4v1.1h3.4v-1.2h-.5v-5h.5v-.7h-5.2v1h-1.2v-.3c0-.4-.3-.7-.7-.7s-.7,.3-.7,.7v.3h-1.8c0-.4-.3-.7-.7-.7s-.7,.3-.7,.7h-3.9v-1.6h-1.7v1.6"/></g></g></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
index 539457f9..26e298de 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
@@ -4,6 +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_CHECKPOINT("检查点", "1012"),
OMDB_RD_LINK("道路线", "2001"),
OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"),
@@ -53,6 +55,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) {
OMDB_LINK_FORM2_11("风景路线", "2206-11"),
OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"),
OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"),
+ OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
OMDB_INTERSECTION("路口", "4001"),
OMDB_SPEEDLIMIT("常规点限速", "4002"),
OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),