xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS

Browse Source
This commit is contained in:
qiji4215 2023-08-31 15:20:04 +08:00
commit 87190c90ae
4 changed files with 11 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/omdb_config.json
View File

@ -227,7 +227,7 @@
"table": "OMDB_CROSS_WALK",
"code": 3014,
"name": "人行横道",
"zoomMin": 18,
"zoomMin": 15,
"zoomMax": 20
},
"3016":{

2
app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt
View File

@ -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)

2
collect-library/resources/rendertheme.xsd
View File

@ -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">

50
collect-library/src/main/assets/editormarker.xml
View File

@ -1491,10 +1491,10 @@
</m>
<m k="qi_table">
<!-- &lt;!&ndash; 道路线 &ndash;&gt;-->
<!-- <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">
@ -2329,52 +2329,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>
<!-- 道路施工 -->