From baf223dc390998680738fb07d01dd79d238fe6d3 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Tue, 19 Sep 2023 14:09:57 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=B8=B2=E6=9F=93=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8C=89=E6=95=B0=E6=8D=AE=E9=A2=9C=E8=89=B2=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../personalcenter/PersonalCenterFragment.kt | 2 +- .../src/main/assets/editormarker.xml | 21 +++++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt index 334dc98d..c09ca51a 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt @@ -166,7 +166,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit? // 定位到指定位置 niMapController.mMapView.vtmMap.animator() // .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 )) - .animateTo(GeoPoint(40.51850916836801, 115.78801387178642)) + .animateTo(GeoPoint(40.09848700000006, 116.53088699999999)) } R.id.personal_center_menu_open_all_layer -> { diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 6b5f15ba..2a0b77ff 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1932,7 +1932,24 @@ - + + + + + + + + + + + + + + + + + + @@ -1955,7 +1972,7 @@ - + From 10e8f32070b5e6ed27659f1a898ec0e4e2198556 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Tue, 19 Sep 2023 15:03:52 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=96=87=E5=AD=97?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=BE=B9?= =?UTF-8?q?=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- collect-library/src/main/assets/editormarker.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 2a0b77ff..a8b6b4ed 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1933,22 +1933,22 @@ - + - + - + - + - + - + From ad95095433c64370d581970a603eed4fe5d89cbf Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Tue, 19 Sep 2023 15:05:03 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E9=81=93=E8=B7=AF=E6=A0=87=E7=89=8C?= =?UTF-8?q?=E9=A2=84=E5=A4=84=E7=90=86=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E7=82=B9=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 5 +++-- .../main/java/com/navinfo/omqs/db/ImportPreProcess.kt | 10 ++++++++++ vtm | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 29393a0b..152e1ad2 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -226,8 +226,9 @@ "k": "geometry", "v": "~", "klib": "geometry", - "vlib": "normalizationTrafficSignHeight()" - },{ + "vlib": "obtainCenterPoint()" + }, + { "k": "geometry", "v": "~", "klib": "geometry", 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 7cf7dca1..be66945f 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -815,4 +815,14 @@ class ImportPreProcess { val code = renderEntity.properties[codeName] renderEntity.properties["src"] = "${prefix}${code}${suffix}" } + + /** + * 获取当前数据的中心点坐标 + * */ + fun obtainCenterPoint(renderEntity: RenderEntity) { + // 获取中心坐标点，将中心坐标作为数据的新的geometry位置 + val centerPoint = renderEntity.wkt?.centroid + // 根据heading方向自动生成新的Geometry + + } } \ No newline at end of file diff --git a/vtm b/vtm index d1ac330c..f2af87c6 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit d1ac330cf7a8727bb2065093e72d60521775ba6d +Subproject commit f2af87c6a012ac41d6f22a77d6b45853b250ed3e From 0bacea8259c2ecf0d14f2c213b18c2ea67334bac Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Tue, 19 Sep 2023 16:19:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=BA=A4=E9=80=9A=E6=A0=87?= =?UTF-8?q?=E7=89=8C2D=E5=8C=96=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 8 +----- .../com/navinfo/omqs/db/ImportPreProcess.kt | 28 ++++++++++++++++++- .../src/main/assets/editormarker.xml | 10 +++---- 3 files changed, 32 insertions(+), 14 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index cad8c316..ed45859f 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -222,13 +222,7 @@ "k": "geometry", "v": "~", "klib": "geometry", - "vlib": "obtainCenterPoint()" - }, - { - "k": "geometry", - "v": "~", - "klib": "geometry", - "vlib": "generateDirectReferenceLine('', 0.2)" + "vlib": "obtainTrafficSignCenterPoint()" } ] }, 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 be66945f..9dc13333 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -819,10 +819,36 @@ class ImportPreProcess { /** * 获取当前数据的中心点坐标 * */ - fun obtainCenterPoint(renderEntity: RenderEntity) { + fun obtainTrafficSignCenterPoint(renderEntity: RenderEntity) { // 获取中心坐标点，将中心坐标作为数据的新的geometry位置 val centerPoint = renderEntity.wkt?.centroid // 根据heading方向自动生成新的Geometry + var radian = 0.0 + val pointStart = Coordinate(centerPoint!!.x, centerPoint.y) + var angle = + if (renderEntity?.properties?.get("heading") == null) 0.0 else renderEntity?.properties?.get( + "heading" + )?.toDouble()!! + // angle角度为与正北方向的顺时针夹角，将其转换为与X轴正方向的逆时针夹角，即为正东方向的夹角 + angle = ((450 - angle) % 360) + radian = Math.toRadians(angle) + // 计算偏移距离 + var dx: Double = GeometryTools.convertDistanceToDegree( + defaultTranslateDistance, + centerPoint.y + ) * Math.cos(radian) + var dy: Double = GeometryTools.convertDistanceToDegree( + defaultTranslateDistance, + centerPoint.y + ) * Math.sin(radian) + val listResult = mutableListOf() + + val coorEnd = Coordinate(pointStart.getX() + dx, pointStart.getY() + dy, pointStart.z) + renderEntity.geometry = + WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd))) + + val code = renderEntity.properties["signType"] + renderEntity.properties["src"] = "assets:omdb/appendix/1105_${code}_0.svg" } } \ No newline at end of file diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index ac5a3bf4..ba0119c7 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1566,12 +1566,10 @@ - - - - - - + + +