From aad0197f5cbd5344f2afd4b0f3dce482ec341262 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Thu, 31 Aug 2023 15:06:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E4=BA=BA=E8=A1=8C?=
=?UTF-8?q?=E6=A8=AA=E9=81=93=E5=92=8C=E6=96=87=E5=AD=97=E6=B8=B2=E6=9F=93?=
=?UTF-8?q?=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 | 2 +-
.../personalcenter/PersonalCenterFragment.kt | 2 +-
collect-library/resources/rendertheme.xsd | 2 +
.../src/main/assets/editormarker.xml | 50 +++----------------
4 files changed, 11 insertions(+), 45 deletions(-)
diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 38e638f3..bd7dcec7 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -227,7 +227,7 @@
"table": "OMDB_CROSS_WALK",
"code": 3014,
"name": "人行横道",
- "zoomMin": 18,
+ "zoomMin": 15,
"zoomMax": 20
},
"3016":{
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 151672d8..9539a3f1 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
@@ -129,7 +129,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
// 定位到指定位置
niMapController.mMapView.vtmMap.animator()
// .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 ))
- .animateTo(GeoPoint( 40.50716396962102, 115.80381067125272))
+ .animateTo(GeoPoint( 40.480633792652746, 115.99816629572948 ))
}
R.id.personal_center_menu_open_all_layer -> {
MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS)
diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd
index 52a05322..9f23ffe0 100644
--- a/collect-library/resources/rendertheme.xsd
+++ b/collect-library/resources/rendertheme.xsd
@@ -147,6 +147,8 @@
<xs:attribute name="repeat" default="true" type="xs:boolean" use="optional"/>
<!-- 长边坐标轴，默认为s -->
<xs:attribute name="longEdge" type="tns:text" default="s"/>
+ <!-- 是否包含方向，默认为false -->
+ <xs:attribute name="hasDirect" default="false" type="xs:boolean" use="optional" />
</xs:complexType>
<xs:complexType name="caption">
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 32370897..45f4d66f 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1491,10 +1491,10 @@
</m>
<m k="qi_table">
-<!-- <!– 道路线 –>-->
-<!-- <m v="OMDB_RD_LINK">-->
-<!-- <line stroke="#9c9c9c" width="1" />-->
-<!-- </m>-->
+ <!-- 道路线 -->
+ <m v="OMDB_RD_LINK">
+ <line stroke="#9c9c9c" width="1" />
+ </m>
<!--道路种别-->
<m v="OMDB_RD_LINK_KIND">
@@ -2332,52 +2332,16 @@
</m>
<!-- 文字 -->
<m v="OMDB_OBJECT_TEXT">
- <area use="obj-area" repeat="false" src="@text-src:textString" longEdge="t"></area>
-<!-- <m k="compliant" v="1">-->
-<!-- <area use="obj-area" repeat="false" fill="#eccc68" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="2">-->
-<!-- <area use="obj-area" repeat="false" fill="#ff7f50" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="3">-->
-<!-- <area use="obj-area" repeat="false" fill="#ff6b81" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="4">-->
-<!-- <area use="obj-area" repeat="false" fill="#a4b0be" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="5">-->
-<!-- <area use="obj-area" repeat="false" fill="#57606f" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="6">-->
-<!-- <area use="obj-area" repeat="false" fill="#7bed9f" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="7">-->
-<!-- <area use="obj-area" repeat="false" fill="#70a1ff" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="8">-->
-<!-- <area use="obj-area" repeat="false" fill="#5352ed" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="9">-->
-<!-- <area use="obj-area" repeat="false" fill="#30336b" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="10">-->
-<!-- <area use="obj-area" repeat="false" fill="#2c2c54" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="11">-->
-<!-- <area use="obj-area" repeat="false" fill="#ff0000" longEdge="t"></area>-->
-<!-- </m>-->
-<!-- <m k="compliant" v="12">-->
-<!-- <area use="obj-area" repeat="false" fill="#ff0000" longEdge="t"></area>-->
-<!-- </m>-->
+ <area use="obj-area" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
</m>
<!-- 符号 -->
<m v="OMDB_OBJECT_SYMBOL">
- <area use="obj-area" repeat="false" src="assets:omdb/tex_fill_area_3012.png" longEdge="t"></area>
+ <area use="obj-area" repeat="false" src="assets:omdb/tex_fill_area_3012.png" longEdge="t" hasDirect="true"></area>
</m>
<!-- 人行横道 -->
<m v="OMDB_CROSS_WALK">
- <area use="obj-area" fill="#00000000" stroke="#00000000" repeat="true" src="assets:omdb/tex_fill_area_3014_4.svg" longEdge="s"></area>
+ <area use="obj-area" stroke="#00000000" repeat="true" src="assets:omdb/tex_fill_area_3014_3.png" longEdge="s"></area>
</m>
<!-- 道路施工 -->