From 697a80b6c9bef65dc587d72f14d47a9caeb2062e Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 15 Aug 2023 16:16:06 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0=E5=AF=BC=E6=B5=81?=
 =?UTF-8?q?=E5=8C=BA=E6=B8=B2=E6=9F=93=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json                       | 7 +++++++
 .../ui/fragment/personalcenter/PersonalCenterFragment.kt   | 2 +-
 collect-library/src/main/assets/editormarker.xml           | 7 +++++++
 .../collect/library/map/source/OMDBTileDataSource.java     | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index afeae85c..28c54d92 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -179,6 +179,13 @@
 			"zoomMax": 17,
 			"transformer2Code": ""
 		},
+		"3012":{
+			"table": "OMDB_FILL_AREA",
+			"code": 3012,
+			"name": "导流区",
+			"zoomMin": 16,
+			"zoomMax": 20
+		},
 		"4001": {
 			"table": "OMDB_INTERSECTION",
 			"code": 4001,
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 a5859a3d..6a8dcaa0 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
@@ -124,7 +124,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
 //                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
-                        .animateTo(GeoPoint( 39.91975038055932,116.35447089476969     ))
+                        .animateTo(GeoPoint( 40.45403725443716, 115.81488271796577))
                 }
 //                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 0f371ffa..ea357d12 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -113,6 +113,8 @@
 
     <style-area fill="#3742fa" id="sign-bg" />
 
+    <!-- 对象要素的默认样式 -->
+    <style-area fill="#00000000" stroke-width="2" stroke="#ffffff" id="obj-area" />
     <!--###### LINE styles ######-->
 
     <!-- base style for fixed width lines -->
@@ -2252,5 +2254,10 @@
                 <line use="s2e" />
             </m>
         </m>
+
+        <!-- 导流区 -->
+        <m v="OMDB_FILL_AREA">
+            <area use="obj-area" repeat="false" src="@text:人行横道"></area>
+        </m>
     </m>
 </rendertheme>
\ No newline at end of file
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 dc2d6868..87e0f7e6 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
@@ -42,7 +42,7 @@ public class OMDBTileDataSource implements ITileDataSource {
                 Realm.getDefaultInstance().refresh();
                 isUpdate = false;
             }
-            RealmQuery<RenderEntity> realmQuery = Realm.getDefaultInstance().where(RenderEntity.class).rawPredicate("taskId ="+RealmDBParamUtils.getTaskId() +" and tileX>=" + xStart + " and tileX<=" + xEnd + " and tileY>=" + yStart + " and tileY<=" + yEnd + " and enable>=1");
+            RealmQuery<RenderEntity> realmQuery = Realm.getDefaultInstance().where(RenderEntity.class).rawPredicate("taskId ="+RealmDBParamUtils.getTaskId() +" and tileX>=" + xStart + " and tileX<=" + xEnd + " and tileY>=" + yStart + " and tileY<=" + yEnd /*+ " and enable>=1"*/);
             // 筛选不显示的数据
             if (Constant.HAD_LAYER_INVISIABLE_ARRAY != null && Constant.HAD_LAYER_INVISIABLE_ARRAY.length > 0) {
                 realmQuery.beginGroup();