From 3c8bf307a2de733d37c16fead8fe213b8af272fd Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 28 Jul 2023 11:04:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B8=B2=E6=9F=93=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          | 48 +++++++++----------
 .../main/java/com/navinfo/omqs/Constant.kt    |  2 +-
 .../src/main/assets/editormarker.xml          |  6 +--
 .../map/source/OMDBReferenceTileSource.java   |  3 +-
 .../library/map/source/OMDBTileSource.java    |  3 +-
 .../library/map/source/RealmDBTileSource.java |  3 +-
 .../collect/library/system/Constant.java      |  4 +-
 7 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index cada4484..5a4b1afa 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -5,42 +5,42 @@
 			"code": 1012,
 			"name": "检查点",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2001": {
 			"table": "OMDB_RD_LINK",
 			"code": 2001,
 			"name": "道路线",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2002": {
 			"table": "OMDB_RD_LINK_FUNCTION_CLASS",
 			"code": 2002,
 			"name": "道路功能等级",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2008": {
 			"table": "OMDB_RD_LINK_KIND",
 			"code": 2008,
 			"name": "道路种别",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2010": {
 			"table": "OMDB_LINK_DIRECT",
 			"code": 2010,
 			"name": "道路方向",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2011": {
 			"table": "OMDB_LINK_NAME",
 			"code": 2011,
 			"name": "道路名",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
@@ -54,8 +54,8 @@
 			"table": "OMDB_LANE_MARK_BOUNDARYTYPE",
 			"code": 2013,
 			"name": "车道边界类型",
-			"zoomMin": 18,
-			"zoomMax": 21,
+			"zoomMin": 19,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
@@ -70,21 +70,21 @@
 			"code": 2019,
 			"name": "常规线限速",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2020": {
 			"table": "OMDB_LINK_SPEEDLIMIT_COND",
 			"code": 2020,
 			"name": "条件线限速",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2021": {
 			"table": "OMDB_LINK_SPEEDLIMIT_VAR",
 			"code": 2021,
 			"name": "可变线限速",
 			"zoomMin": 16,
-			"zoomMax": 21
+			"zoomMax": 22
 		},
 		"2022": {
 			"table": "OMDB_CON_ACCESS",
@@ -110,8 +110,8 @@
 			"table": "OMDB_RDBOUND_BOUNDARYTYPE",
 			"code": 2083,
 			"name": "道路边界类型",
-			"zoomMin": 18,
-			"zoomMax": 21
+			"zoomMin": 19,
+			"zoomMax": 22
 		},
 		"2201":{
 			"table": "OMDB_BRIDGE",
@@ -123,7 +123,7 @@
 			"code": 2202,
 			"name": "隧道",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
@@ -138,7 +138,7 @@
             "code": 4001,
             "name": "路口",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
@@ -153,7 +153,7 @@
             "code": 4002,
             "name": "常规点限速",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "maxSpeed",
@@ -174,7 +174,7 @@
 			"code": 4003,
 			"name": "条件点限速",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "maxSpeed",
@@ -189,7 +189,7 @@
 			"code": 4004,
 			"name": "可变点限速",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "location",
@@ -216,7 +216,7 @@
 			"code": 4006,
 			"name": "普通交限",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
@@ -255,7 +255,7 @@
 			"code": 4010,
 			"name": "电子眼",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
@@ -288,7 +288,7 @@
 			"code": 4022,
 			"name": "交通灯",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 			]
 		},
@@ -297,7 +297,7 @@
 			"code": 4601,
 			"name": "车信",
 			"zoomMin": 16,
-			"zoomMax": 21,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
@@ -323,8 +323,8 @@
             "table": "OMDB_LANE_LINK_LG",
             "code": 5001,
             "name": "车道中心线",
-			"zoomMin": 18,
-			"zoomMax": 21,
+			"zoomMin": 19,
+			"zoomMax": 22,
 			"transformer": [
 				{
 					"k": "geometry",
diff --git a/app/src/main/java/com/navinfo/omqs/Constant.kt b/app/src/main/java/com/navinfo/omqs/Constant.kt
index 30e53f7a..b4042a1f 100644
--- a/app/src/main/java/com/navinfo/omqs/Constant.kt
+++ b/app/src/main/java/com/navinfo/omqs/Constant.kt
@@ -67,7 +67,7 @@ class Constant {
         /**
          * 地图最多缩放级别23
          */
-        const val MAX_ZOOM = 23
+        const val MAX_ZOOM = 22
 
         /**
          * 是否自动定位
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 276a60d7..030d0b62 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1537,7 +1537,7 @@
 
         <!-- 道路名 -->
         <m v="OMDB_LINK_NAME">
-            <text use="road"></text>
+            <text use="road" size="16"></text>
         </m>
 
         <!-- 车信 -->
@@ -1962,7 +1962,7 @@
         <!--隧道-->
         <m v="OMDB_TUNNEL">
             <m k="formOfWay">
-                <line dasharray="4,4"  stroke="#4624FF" width="0.6" />
+                <line dasharray="4,4"  stroke="#4624FF" width="0.4" />
             </m>
             <m k="type" v="s_2_p">
                 <symbol repeat="false" repeat-start="0" rotate="false"
@@ -2129,7 +2129,7 @@
 
         <!--电子眼-->
         <m v="OMDB_ELECTRONICEYE">
-            <caption dy="-30" fill="#000000" k="name" priority="0" size="14"
+            <caption dy="-30" fill="#0000FF" k="name" priority="0" size="12"
                 stroke="#ffffff" stroke-width="1.0"></caption>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
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 aa661822..ba4d8f8d 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
@@ -10,7 +10,8 @@ public class OMDBReferenceTileSource extends TileSource {
 
     @Override
     public ITileDataSource getDataSource() {
-        return new OverzoomTileDataSource(new OMDBReferenceDataSource(), Constant.OVER_ZOOM);
+        //return new OverzoomTileDataSource(new OMDBReferenceDataSource(), Constant.OVER_ZOOM);
+        return new OMDBReferenceDataSource();
     }
 
     @Override
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 2ac45ac9..811e5d52 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
@@ -10,7 +10,8 @@ public class OMDBTileSource extends TileSource {
 
     @Override
     public ITileDataSource getDataSource() {
-        return new OverzoomTileDataSource(new OMDBTileDataSource(), Constant.OVER_ZOOM);
+       // return new OverzoomTileDataSource(new OMDBTileDataSource(), Constant.OVER_ZOOM);
+        return new OMDBTileDataSource();
     }
 
     @Override
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/RealmDBTileSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/RealmDBTileSource.java
index 4e23c643..617f9300 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/RealmDBTileSource.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/RealmDBTileSource.java
@@ -12,7 +12,8 @@ public class RealmDBTileSource extends TileSource {
 
     @Override
     public ITileDataSource getDataSource() {
-        return new OverzoomTileDataSource(new RealmDBTileDataSource(), Constant.OVER_ZOOM);
+        //return new OverzoomTileDataSource(new RealmDBTileDataSource(), Constant.OVER_ZOOM);
+        return new RealmDBTileDataSource();
     }
 
     @Override
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java
index a09727ba..3f45cf37 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/system/Constant.java
@@ -29,8 +29,8 @@ public class Constant {
         HAD_LAYER_INVISIABLE_ARRAY = HD_LAYER_VISIABLE_MAP.keySet().toArray(new String[HD_LAYER_VISIABLE_MAP.keySet().size()]);
     }
     public static String[] HAD_LAYER_INVISIABLE_ARRAY;
-    public static final int OVER_ZOOM = 21;
-    public static final int MAX_ZOOM = 23;
+    public static final int OVER_ZOOM = 22;
+    public static final int MAX_ZOOM = 22;
     public static final int OMDB_MIN_ZOOM = 16;
 
     /**