From 2292fbc6d8a4d3280377f6374d2ac386895c4f85 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Thu, 21 Sep 2023 15:05:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8F=AF=E5=8F=98?= =?UTF-8?q?=E7=82=B9=E9=99=90=E9=80=9F=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 8 ++++---- .../personalcenter/PersonalCenterFragment.kt | 2 +- collect-library/src/main/assets/editormarker.xml | 16 ++++------------ .../collect/library/utils/GeometryTools.java | 4 ++-- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 370a37b2..5335a0d4 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -35,7 +35,7 @@ "zoomMin": 15, "zoomMax": 17, "catch":true, - "checkLinkId": true + "checkLinkId": false }, "2002": { "table": "OMDB_RD_LINK_FUNCTION_CLASS", @@ -339,19 +339,19 @@ { "k": "location", "v": "1", - "klib": "location", + "klib": "ref", "vlib": "左" }, { "k": "location", "v": "2", - "klib": "locationlib", + "klib": "ref", "vlib": "右" }, { "k": "location", "v": "3", - "klib": "location", + "klib": "ref", "vlib": "上" } ] 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 855790d8..2e277dd8 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.09819324139729,116.53123207733361 )) + .animateTo(GeoPoint(40.5016054261786, 115.82381251427815)) } 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 4689d6bc..0396c8e6 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1871,18 +1871,10 @@ - - - - - - - - + + diff --git a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java index 003e494a..6dcbdd1e 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/utils/GeometryTools.java @@ -1470,8 +1470,8 @@ public class GeometryTools { double startLatitude = MercatorProjection.tileYToLatitude(tile.tileY, tile.zoomLevel); double endLongitude = MercatorProjection.tileXToLongitude(tile.tileX + 1, tile.zoomLevel); double endLatitude = MercatorProjection.tileYToLatitude(tile.tileY + 1, tile.zoomLevel); - return GeometryTools.createPolygonFromCoords(new Coordinate[]{new Coordinate(startLongitude, startLongitude), new Coordinate(endLongitude, startLatitude), - new Coordinate(endLongitude, endLatitude), new Coordinate(startLongitude, endLatitude), new Coordinate(startLongitude, startLongitude)}); + return GeometryTools.createPolygonFromCoords(new Coordinate[]{new Coordinate(startLongitude, startLatitude), new Coordinate(endLongitude, startLatitude), + new Coordinate(endLongitude, endLatitude), new Coordinate(startLongitude, endLatitude), new Coordinate(startLongitude, startLatitude)}); } /** * 经纬度转墨卡托