From 09b3dd2f43b7e0610ed21f6d792f782cbc95f03c Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 1 Aug 2023 16:26:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=82=E9=85=8D3D=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect-library/src/main/assets/editormarker.xml            | 2 +-
 .../navinfo/collect/library/map/source/OMDBDataDecoder.java | 6 +++---
 .../collect/library/map/source/OMDBReferenceDecoder.java    | 2 +-
 vtm                                                         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 12dd63ab..4648923e 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1706,7 +1706,7 @@
         </m>
 
         <!--电子眼-->
-        <m v="OMDB_ELECTRONICEYE">
+        <m v="OMDB_ELECTRONICEYE" zoom-max="18">
             <caption dy="-30" fill="#000000" k="name" priority="0" size="14"
                 stroke="#ffffff" stroke-width="1.0"></caption>
             <m k="type" v="angle">
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 84d6f13f..d7c54a2c 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
@@ -4,6 +4,7 @@ import static org.oscim.core.MercatorProjection.latitudeToY;
 import static org.oscim.core.MercatorProjection.longitudeToX;
 
 import android.os.Build;
+import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
@@ -19,7 +20,6 @@ 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;
@@ -143,9 +143,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;
+//            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), 0);
         }
 
 //        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 c1607262..cc4d43dd 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
@@ -143,7 +143,7 @@ public class OMDBReferenceDecoder extends TileDecoder {
             // 将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);
+                    (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), 0);
         }
 
 //        int length = removeLast ? coordinates.length - 1 : coordinates.length;
diff --git a/vtm b/vtm
index c74bcd29..4c9926d1 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit c74bcd29c24cddf395fa9654ef0b69d0c88ac3ad
+Subproject commit 4c9926d105877fce305025e8f85651ccea947c4f