From 1a19dc1cfae73b001e30ebb6471010d3c6f2f090 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Wed, 26 Jul 2023 14:45:16 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9D=86=E7=8A=B6=E7=89=A9=E3=80=81?= =?UTF-8?q?=E4=BA=A4=E9=80=9A=E9=9D=A2=E6=9D=BF3D=E5=8C=96=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 10 ++++++++++ .../fragment/personalcenter/PersonalCenterFragment.kt | 2 +- collect-library/src/main/assets/editormarker.xml | 10 +++++++++- .../collect/library/map/source/OMDBDataDecoder.java | 4 +++- .../library/map/source/OMDBReferenceDecoder.java | 2 ++ vtm | 2 +- 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 20ae5c30..7788238c 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -275,6 +275,16 @@ "table": "OMDB_AREA", "code": 5002, "name": "面测试" + }, + "3005":{ + "table": "OMDB_TRAFFIC_SIGN", + "code": 3005, + "name": "交通标牌" + }, + "3006":{ + "table": "OMDB_POLE", + "code": 3006, + "name": "杆状物" } } } \ No newline at end of file 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 e78ff100..ffc5e1f1 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 @@ -115,7 +115,7 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) : viewModel.readRealmData() // 定位到指定位置 niMapController.mMapView.vtmMap.animator() - .animateTo(GeoPoint( 39.7991980627346, 116.50936676873703 )) + .animateTo(GeoPoint( 39.7991980627346,116.50936676873703 )) } // R.id.personal_center_menu_task_list -> { // findNavController().navigate(R.id.TaskManagerFragment) diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index f6ef4f7a..608943e6 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2234,10 +2234,18 @@ - + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java index 69ee70b6..f125df58 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java @@ -19,6 +19,7 @@ import org.locationtech.jts.geom.MultiPolygon; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; import org.oscim.core.MapElement; +import org.oscim.core.MercatorProjection; import org.oscim.core.Tag; import org.oscim.core.Tile; import org.oscim.tiling.ITileDataSink; @@ -139,8 +140,9 @@ public class OMDBDataDecoder extends TileDecoder { private void processCoordinateArray(Coordinate[] coordinates, boolean removeLast) { int length = removeLast ? coordinates.length - 1 : coordinates.length; for (int i = 0; i < length; i++) { + double z = longitudeToX(MercatorProjection.pixelXToLongitudeWithScale(MercatorProjection.metersToPixelsWithScale((float) coordinates[i].z, coordinates[i].y, mTileScale), mTileScale))* mTileScale/8; mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale), - (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float)coordinates[i].z); + (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float) coordinates[i].z); } // int length = removeLast ? coordinates.length - 1 : coordinates.length; diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java index 075f465c..ee8d2fdb 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java @@ -139,6 +139,8 @@ public class OMDBReferenceDecoder extends TileDecoder { private void processCoordinateArray(Coordinate[] coordinates, boolean removeLast) { int length = removeLast ? coordinates.length - 1 : coordinates.length; for (int i = 0; i < length; i++) { + // 将Z坐标的米转换为屏幕像素坐标 +// double z = longitudeToX(MercatorProjection.pixelXToLongitudeWithScale(MercatorProjection.metersToPixelsWithScale((float) coordinates[i].z, coordinates[i].y, mTileScale), mTileScale))* mTileScale/8; mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale), (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float)coordinates[i].z); } diff --git a/vtm b/vtm index 24467eb5..ee931403 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 24467eb56e3a4eafe8a5747bec7590ab234569fb +Subproject commit ee9314039e20ccdec4c126353e6136903ba01d08