diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 1adbb1ba..fd12c971 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -130,6 +130,11 @@ "code": 2041, "name": "车道数" }, + "2097":{ + "table": "OMDB_PHY_LANENUM", + "code": 2097, + "name": "物理车道数" + }, "2083":{ "table": "OMDB_RDBOUND_BOUNDARYTYPE", "code": 2083, @@ -145,6 +150,7 @@ "code": 2090, "name": "车道施工", "existSubCode": true, + "checkLinkId": false, "catch":true, "zoomMin": 18, "zoomMax": 20 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 789f897f..5bffc6d3 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -443,7 +443,7 @@ class ImportOMDBHelper @AssistedInject constructor( } } - } else if (renderEntity.code.toInt() == DataCodeEnum.OMDB_INTERSECTION.code.toInt()||renderEntity.code.toInt() == DataCodeEnum.OMDB_LINK_CONSTRUCTION.code.toInt() && renderEntity.properties.containsKey( + } else if (renderEntity.code.toInt() == DataCodeEnum.OMDB_INTERSECTION.code.toInt()||renderEntity.code.toInt() == DataCodeEnum.OMDB_LANE_CONSTRUCTION.code.toInt() && renderEntity.properties.containsKey( "linkList" ) ) { diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index 7e78aec5..de2cde10 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -696,7 +696,7 @@ class MainViewModel @Inject constructor( ) } } - + DataCodeEnum.OMDB_PHY_LANENUM.code,//物理车道数 DataCodeEnum.OMDB_LANE_NUM.code, //车道数 DataCodeEnum.OMDB_RD_LINK_KIND.code,//种别, DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code, // 功能等级, @@ -848,7 +848,7 @@ class MainViewModel @Inject constructor( ) } } - + DataCodeEnum.OMDB_PHY_LANENUM.code,//物理车道数 DataCodeEnum.OMDB_LANE_NUM.code, //车道数 DataCodeEnum.OMDB_RD_LINK_KIND.code,//种别, DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code, // 功能等级, diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt index 14f84764..6ff34752 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -104,10 +104,12 @@ class SignUtil { else -> "" } } - //车道数 - DataCodeEnum.OMDB_LANE_NUM.code -> { + //物理车道数OMDB_PHY_LANENUM + DataCodeEnum.OMDB_LANE_NUM.code, + DataCodeEnum.OMDB_PHY_LANENUM.code -> { "${data.properties["laneNum"]}|${data.properties["laneS2e"]}|${data.properties["laneE2s"]}" } + //常规点限速,条件点限速 DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getSpeedLimitMaxText( data @@ -282,7 +284,8 @@ class SignUtil { DataCodeEnum.OMDB_LINK_SPEEDLIMIT.code -> { list.addAll(getLinkSpeedLimitMoreInfo(data)) } - //车道数 + //车道数//增加物理车道数DataCodeEnum.OMDB_PHY_LANENUM.code + DataCodeEnum.OMDB_PHY_LANENUM.code, DataCodeEnum.OMDB_LANE_NUM.code -> { list.add( TwoItemAdapterItem( @@ -1424,6 +1427,7 @@ class SignUtil { ) DataCodeEnum.OMDB_RD_LINK_KIND.code -> stringBuffer.append("种别${item.iconText},") DataCodeEnum.OMDB_LINK_DIRECT.code -> stringBuffer.append("${item.iconText},") + DataCodeEnum.OMDB_PHY_LANENUM.code,//物理车道数 DataCodeEnum.OMDB_LANE_NUM.code -> stringBuffer.append( "${ item.iconText.substringBefore( @@ -1751,6 +1755,7 @@ class SignUtil { */ fun getRoadInfoIndex(element: RenderEntity): Int { return when (element.code) { + DataCodeEnum.OMDB_PHY_LANENUM.code,//物理车道数 DataCodeEnum.OMDB_LANE_NUM.code -> 0 DataCodeEnum.OMDB_RD_LINK_KIND.code -> 1 DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code -> 2 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 0cdad7bc..511c9b77 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 @@ -33,6 +33,7 @@ enum class DataCodeEnum(var tableName: String, var code: String) { OMDB_RAMP_7("高速直连出口匝道高速出入口匝道", "2037-7"), OMDB_MULTI_DIGITIZED("上下线分离", "2040"), OMDB_LANE_NUM("车道数", "2041"), + OMDB_PHY_LANENUM("物理车道数", "2097"), OMDB_VIADUCT("高架", "2043"), OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"), OMDB_LANE_CONSTRUCTION("车道施工", "2090"),