From ab873e86afc9cdc11b8cc17496ca27d6e27d8731 Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Fri, 13 Oct 2023 17:39:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B918=E7=BA=A7overzoom?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=E6=B8=B2=E6=9F=93=E5=87=BA=E9=94=99?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/fragment/personalcenter/PersonalCenterFragment.kt | 2 +- .../collect/library/map/source/OMDBReferenceTileSource.java | 6 ++---- .../collect/library/map/source/OMDBTileDataSource.java | 4 ++-- .../navinfo/collect/library/map/source/OMDBTileSource.java | 5 ++--- vtm | 2 +- 5 files changed, 8 insertions(+), 11 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 64bcc9d6..dae68bc1 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 @@ -178,7 +178,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit? // 定位到指定位置 niMapController.mMapView.vtmMap.animator() // .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 )) - .animateTo(GeoPoint(40.07245537956604, 116.239638575623)) + .animateTo(GeoPoint(40.0882756, 116.3033581)) } R.id.personal_center_menu_open_all_layer -> { diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceTileSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceTileSource.java index 5f8b17c4..55001b7b 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceTileSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceTileSource.java @@ -1,10 +1,7 @@ package com.navinfo.collect.library.map.source; -import com.navinfo.collect.library.system.Constant; - import org.oscim.map.Viewport; import org.oscim.tiling.ITileDataSource; -import org.oscim.tiling.OverzoomTileDataSource; public class OMDBReferenceTileSource extends RealmDBTileSource { private OMDBReferenceDataSource omdbReferenceTileSource; @@ -18,7 +15,8 @@ public class OMDBReferenceTileSource extends RealmDBTileSource { @Override public ITileDataSource getDataSource() { //return new OverzoomTileDataSource(new OMDBReferenceDataSource(), Constant.OVER_ZOOM); - return new OverzoomTileDataSource(omdbReferenceTileSource, Constant.OVER_ZOOM); +// return new OverzoomTileDataSource(omdbReferenceTileSource, Constant.OVER_ZOOM); + return omdbReferenceTileSource; } @Override diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java index c6e5be22..9bc939e7 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java @@ -81,8 +81,8 @@ public class OMDBTileDataSource implements ITileDataSource { // 数据记录的tile号是以正外接tile号列表，此处过滤并未与当前tile相交的数据 if (!listResult.isEmpty()) { Polygon tilePolygon = GeometryTools.getTilePolygon(tile); - System.out.println("第一条数据的最小x值:" + listResult.get(0).getTileX().stream().min(Integer::compare).get()); - System.out.println("当前tile的:" + listResult.get(0).getTileX().stream().min(Integer::compare).get()); +// System.out.println("第一条数据的最小x值:" + listResult.get(0).getTileX().stream().min(Integer::compare).get()); +// System.out.println("当前tile的:" + listResult.get(0).getTileX().stream().min(Integer::compare).get()); listResult = listResult.stream().filter((RenderEntity renderEntity) -> renderEntity.getWkt().intersects(tilePolygon)) /*过滤数据，只有最小x（屏幕的最小x或数据的最小x会被渲染，跨Tile的其他数据不再重复渲染）*/ // .filter((RenderEntity renderEntity) -> MercatorProjection.longitudeToTileX(viewport.fromScreenPoint(0,0).getLongitude(), (byte) Constant.DATA_ZOOM) == currentTileX || renderEntity.getTileX().stream().min(Integer::compare).get() == currentTileX) diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileSource.java index 9cda466c..ab35f515 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileSource.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileSource.java @@ -3,11 +3,9 @@ package com.navinfo.collect.library.map.source; import android.util.Log; import com.navinfo.collect.library.data.entity.RenderEntity; -import com.navinfo.collect.library.system.Constant; import org.oscim.map.Viewport; import org.oscim.tiling.ITileDataSource; -import org.oscim.tiling.OverzoomTileDataSource; import io.realm.Realm; @@ -23,7 +21,8 @@ public class OMDBTileSource extends RealmDBTileSource { @Override public ITileDataSource getDataSource() { // return new OverzoomTileDataSource(new OMDBTileDataSource(), Constant.OVER_ZOOM); - return new OverzoomTileDataSource(omdbTileDataSource, Constant.OVER_ZOOM); +// return new OverzoomTileDataSource(omdbTileDataSource, Constant.OVER_ZOOM); + return omdbTileDataSource; } @Override diff --git a/vtm b/vtm index 50f7b028..6a6bb9ab 160000 --- a/vtm +++ b/vtm @@ -1 +1 @@ -Subproject commit 50f7b028e7f3934a8c330ea8a54046d7d368682d +Subproject commit 6a6bb9ab5eaf6bb4c05b3110c612c32ef4c6ef3d