From 2f513c8b43fe26f64f82e2f684f068059bd12931 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Fri, 1 Dec 2023 17:55:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=89=A9=E7=90=86=E8=BD=A6?= =?UTF-8?q?=E9=81=93=E6=95=B0=E6=B8=B2=E6=9F=93=E5=8F=8A=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E7=89=A9=E7=90=86=E8=BD=A6=E9=81=93=E6=95=B0=E9=81=93=E8=B7=AF?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 17 ++++++++-- .../com/navinfo/omqs/db/ImportPreProcess.kt | 33 +++++++++++-------- .../omqs/ui/activity/map/MainViewModel.kt | 4 +-- .../java/com/navinfo/omqs/util/SignUtil.kt | 10 +++--- .../src/main/assets/editormarker.xml | 19 +++++++---- 5 files changed, 52 insertions(+), 31 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 5dd373d9..3e26a745 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -65,8 +65,8 @@ "table": "OMDB_LINK_NAME", "code": 2011, "name": "道路名", - "zoomMin": 18, - "zoomMax": 20, + "zoomMin": 15, + "zoomMax": 17, "checkLinkId": false, "transformer": [ { @@ -246,7 +246,18 @@ "2097": { "table": "OMDB_PHY_LANENUM", "code": 2097, - "name": "物理车道数" + "name": "物理车道数", + "zoomMin": 15, + "zoomMax": 18, + "catch": true, + "transformer": [ + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "generatePhyName()" + } + ] }, "2201": { "table": "OMDB_BRIDGE", diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index f0d8cee0..84920aa9 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -740,6 +740,15 @@ class ImportPreProcess { } } + /** + * 生成默认物理车道数据 + * */ + fun generatePhyName(renderEntity: RenderEntity) { + // 物理车道数 + if (renderEntity.properties.containsKey("laneS2e")&&renderEntity.properties.containsKey("laneE2s")) { + renderEntity.properties["name"] = "${renderEntity.properties["laneS2e"]}|${renderEntity.properties["laneE2s"]}" + } + } /** * 生成默认道路名数据 @@ -1224,6 +1233,8 @@ class ImportPreProcess { if (renderEntity.properties.containsKey("maxSpeed") && renderEntity.properties.containsKey("minSpeed")) { renderEntity.properties["ref"] = "${renderEntity.properties["maxSpeed"]}|${renderEntity.properties["minSpeed"]}" + renderEntity.propertiesDb = + DeflaterUtil.zipString(JSON.toJSONString(renderEntity.properties)) } } @@ -1243,13 +1254,11 @@ class ImportPreProcess { val linkGeometry = GeometryTools.createGeometry(zLevelObject.optString("linkGeometry")) val coordinates = linkGeometry!!.coordinates - val referenceEntityList = mutableListOf() // 判断当前数据的startEnd，如果是0则向前和向后都绘制线，如果是1（起点）则只绘制前两个点组成的线，如果是2（终点）则只绘制后两个点组成的线 if (startEnd == 0 || startEnd == 1) { // 处理向后的线 val zLevelReference = createZLevelReference(renderEntity) zLevelReference.properties["type"] = "zlevelLine" -// zLevelReference.properties["name"] = zLevel.toString() - // 根据shpSeqNum获取对应的点位 + zLevelReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(zLevelReference.properties)) if (shpSeqNum < coordinates.size - 1) { val currentCoordinate = coordinates[shpSeqNum] var nextCoordinate = coordinates[shpSeqNum + 1] @@ -1279,26 +1288,25 @@ class ImportPreProcess { ), GeoPoint(nextCoordinate.y, nextCoordinate.x) ) ).toString() - - referenceEntityList.add(zLevelReference) - + renderEntity.referenceEntitys.add(zLevelReference) val zLevelNameReference = createZLevelReference(renderEntity) zLevelNameReference.properties["type"] = "zlevelName" zLevelNameReference.properties["name"] = zLevel.toString() + zLevelNameReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(zLevelNameReference.properties)) zLevelNameReference.geometry = GeometryTools.createGeometry( GeoPoint( nextCoordinate.y, nextCoordinate.x ) ).toString() - referenceEntityList.add(zLevelNameReference) + renderEntity.referenceEntitys.add(zLevelNameReference) } } if (startEnd == 0 || startEnd == 2) { // 处理向前的线 val zLevelReference = createZLevelReference(renderEntity) zLevelReference.properties["type"] = "zlevelLine" -// zLevelReference.properties["name"] = zLevel.toString() + zLevelReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(zLevelReference.properties)) // 根据shpSeqNum获取对应的点位 if (shpSeqNum < coordinates.size && shpSeqNum > 0) { val currentCoordinate = coordinates[shpSeqNum] @@ -1320,7 +1328,6 @@ class ImportPreProcess { // 计算偏移后的点 preCoordinate = Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy) -// } zLevelReference.geometry = GeometryTools.createLineString( arrayListOf( GeoPoint( @@ -1329,19 +1336,17 @@ class ImportPreProcess { ), GeoPoint(preCoordinate.y, preCoordinate.x) ) ).toString() - referenceEntityList.add(zLevelReference) - + renderEntity.referenceEntitys.add(zLevelReference) val zLevelNameReference = createZLevelReference(renderEntity) zLevelNameReference.properties["type"] = "zlevelName" zLevelNameReference.properties["name"] = zLevel.toString() + zLevelNameReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(zLevelNameReference.properties)) zLevelNameReference.geometry = GeometryTools.createGeometry(GeoPoint(preCoordinate.y, preCoordinate.x)) .toString() - referenceEntityList.add(zLevelNameReference) + renderEntity.referenceEntitys.add(zLevelNameReference) } } - - insertData(referenceEntityList) // 移除zlevelList，减小原始数据大小 renderEntity.properties.remove("zlevelList") } 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 345841cb..fabd1827 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 @@ -804,7 +804,7 @@ class MainViewModel @Inject constructor( ) } } - DataCodeEnum.OMDB_PHY_LANENUM.code,//物理车道数 + //DataCodeEnum.OMDB_PHY_LANENUM.code,//物理车道数 DataCodeEnum.OMDB_LANE_NUM.code, //车道数 DataCodeEnum.OMDB_RD_LINK_KIND.code,//种别， DataCodeEnum.OMDB_RD_LINK_FUNCTION_CLASS.code, // 功能等级, @@ -960,7 +960,7 @@ class MainViewModel @Inject constructor( ) } } - DataCodeEnum.OMDB_PHY_LANENUM.code,//物理车道数 + //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 d0eb6560..47b8733f 100644 --- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt @@ -108,10 +108,10 @@ class SignUtil { } } //物理车道数OMDB_PHY_LANENUM - DataCodeEnum.OMDB_LANE_NUM.code, +/* DataCodeEnum.OMDB_LANE_NUM.code, DataCodeEnum.OMDB_PHY_LANENUM.code -> { "${data.properties["laneS2e"]}|${data.properties["laneE2s"]}" - } + }*/ //常规点限速,条件点限速 DataCodeEnum.OMDB_SPEEDLIMIT.code, DataCodeEnum.OMDB_SPEEDLIMIT_COND.code -> getSpeedLimitMaxText(data) @@ -304,7 +304,7 @@ class SignUtil { title = "逆方向车道数", text = "${data.properties["laneE2s"]}" ) ) - var str = when (data.properties["laneClass"]) { +/* var str = when (data.properties["laneClass"]) { "0" -> "未赋值" "1" -> "一条车道" "2" -> "两或三条" @@ -317,7 +317,7 @@ class SignUtil { TwoItemAdapterItem( title = "车道数等级", text = str ) - ) + )*/ } //路口 DataCodeEnum.OMDB_INTERSECTION.code -> { @@ -1928,7 +1928,7 @@ class SignUtil { */ fun getRoadInfoIndex(element: RenderEntity): Int { return when (element.code) { - DataCodeEnum.OMDB_PHY_LANENUM.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/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 6da9f562..cb6dea86 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1553,6 +1553,11 @@ + + + + + @@ -1621,22 +1626,22 @@ - + - + - + - + - + - + @@ -2171,7 +2176,7 @@ - +