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

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

Browse Source 
 Conflicts:
	app/src/main/java/com/navinfo/omqs/db/RealmOperateHelper.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt
	app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt
	vtm
This commit is contained in:
squallzhjch
2023-09-20 09:59:34 +08:00
parent 607d4c290a 03c778c1ec
commit 427e36bb8a
21 changed files with 30724 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1566,12 +1566,10 @@
</m>
<!-- 交通标牌 -->
<!-- <m v="OMDB_TRAFFIC_SIGN">-->
<!-- <area use="sign-bg" repeat="false" stroke="#ff0000" stroke-width="2"></area>-->
<!-- <m k="type" v="angle">-->
<!-- <line stroke="#00ff00" width="0.1"></line>-->
<!-- </m>-->
<!-- </m>-->
<m v="OMDB_TRAFFIC_SIGN">
<symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
src="@src" symbol-height="24" symbol-width="24" degree="-90"></symbol>
</m>
<m v="OMDB_AREA">
<!-- <area use="sign-bg" repeat="false" src="assets:omdb/veer_side_walk.jpg" stroke="#ff0000" stroke-width="2"></area>
@@ -1598,7 +1596,7 @@
</m>
<!-- 检查点 -->
<m v="OMDB_NODE_FORM">
<m v="OMDB_CHECKPOINT">
<symbol src="assets:omdb/icon_1012_0.svg" symbol-height="56"
symbol-width="56"></symbol>
</m>
@@ -1703,7 +1701,7 @@
</m>
<!--路牙-->
<m k="boundaryType" v="3">
<symbol repeat="true" repeat-gap="4" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="10" symbol-height="8"></symbol>
<symbol repeat="true" repeat-gap="10" repeat-start="0" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
</m>
<m k="boundaryType" v="5|7">
<line stroke="#ffffff" use="boundaryType" />
@@ -1774,7 +1772,7 @@
</m>
<m k="type" v="e_2_p">
<symbol repeat="false" repeat-start="0" rotate="false" gland="true"
src="assets:omdb/icon_2202_1.svg" symbol-height="24" symbol-width="24"></symbol>
src="assets:omdb/icon_2202_0.svg" symbol-height="24" symbol-width="24"></symbol>
</m>
</m>
@@ -1790,7 +1788,7 @@
</m>
<m k="type" v="e_2_p_1">
<symbol gland="true"
src="assets:omdb/icon_2201_1_2.svg" symbol-height="56" symbol-width="56"></symbol>
src="assets:omdb/icon_2201_1_1.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="s_2_p_2">
<symbol gland="true"
@@ -1798,7 +1796,7 @@
</m>
<m k="type" v="e_2_p_2">
<symbol gland="true"
src="assets:omdb/icon_2201_2_2.svg" symbol-height="56" symbol-width="56"></symbol>
src="assets:omdb/icon_2201_2_1.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
<m k="type" v="s_2_p_3">
<symbol gland="true"
@@ -1806,14 +1804,14 @@
</m>
<m k="type" v="e_2_p_3">
<symbol gland="true"
src="assets:omdb/icon_2201_3_2.svg" symbol-height="56" symbol-width="56"></symbol>
src="assets:omdb/icon_2201_3_1.svg" symbol-height="56" symbol-width="56"></symbol>
</m>
</m>
<!-- 环岛 -->
<m v="OMDB_ROUNDABOUT">
<line stroke="#fcba5a" width="0.5" />
<symbol repeat="true" repeat-start="0" repeat-gap="32" src="assets:omdb/icon_2204_0.svg"></symbol>
<symbol repeat="false" repeat-start="0" gland="false" repeat-gap="32" src="assets:omdb/icon_2204_0.svg"></symbol>
</m>
<!-- 停止位置 -->
@@ -1932,7 +1930,24 @@
</m>
<!-- 文字 -->
<m v="OMDB_OBJECT_TEXT">
<area use="obj-area" stroke="#00000000" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
<m k="color" v="0">
<area use="obj-area" stroke="#00000000" fill="#dfe4ea" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
</m>
<m k="color" v="1">
<area use="obj-area" stroke="#00000000" fill="#ffffff" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
</m>
<m k="color" v="2">
<area use="obj-area" stroke="#00000000" fill="#ffff00" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
</m>
<m k="color" v="3">
<area use="obj-area" stroke="#00000000" fill="#ff0000" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
</m>
<m k="color" v="4">
<area use="obj-area" stroke="#00000000" fill="#00ff00" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
</m>
<m k="color" v="9">
<area use="obj-area" stroke="#00000000" fill="#0000ff" repeat="false" src="@text-src:textString" longEdge="t" hasDirect="true"></area>
</m>
</m>
<!-- 符号 -->
<m v="OMDB_OBJECT_SYMBOL">
@@ -1955,7 +1970,7 @@
<!-- 人行横道 -->
<m v="OMDB_CROSS_WALK">
<area use="obj-area" stroke="#00000000" repeat="true" src="assets:omdb/object_crosswalk_3014.svg" longEdge="s"></area>
<area use="obj-area" stroke="#ffffff" repeat="true" src="assets:omdb/object_crosswalk_3014.svg" longEdge="s"></area>
</m>
<!-- 箭头 -->

1574
collect-library/src/main/assets/omdb/icon_2013_3.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 793 B

After

Width:  |  Height:  |  Size: 683 KiB

28953
collect-library/src/main/assets/omdb/icon_2013_3_1.svg Normal file
View File

File diff suppressed because it is too large Load Diff
Side by Side

After

Width:  |  Height:  |  Size: 2.9 MiB

2
collect-library/src/main/java/com/navinfo/collect/library/map/NIMapView.java
View File

@@ -262,7 +262,7 @@ public final class NIMapView extends RelativeLayout {
// 增加比例尺图层
NaviMapScaleBar naviMapScaleBar = new NaviMapScaleBar(getVtmMap());
mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 10, 0);
mapScaleBarLayer = naviMapScaleBar.initScaleBarLayer(GLViewport.Position.BOTTOM_LEFT, 256, 60);
// if (gridLayer == null) {
// gridLayer = new TileGridLayer(getVtmMap());

4
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDataSource.java
View File

@@ -74,11 +74,11 @@ public class OMDBReferenceDataSource implements ITileDataSource {
mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult);
mapDataSink.completed(QueryResult.SUCCESS);
} else {
mapDataSink.completed(QueryResult.TILE_NOT_FOUND);
mapDataSink.completed(QueryResult.SUCCESS);
}
Realm.getInstance(MapParamUtils.getTaskConfig()).close();
} else {
mapDataSink.completed(QueryResult.TILE_NOT_FOUND);
mapDataSink.completed(QueryResult.SUCCESS);
}
}

4
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
View File

@@ -72,11 +72,11 @@ public class OMDBTileDataSource implements ITileDataSource {
mThreadLocalDecoders.get().decode(tile.zoomLevel, tile, mapDataSink, listResult);
mapDataSink.completed(QueryResult.SUCCESS);
} else {
mapDataSink.completed(QueryResult.TILE_NOT_FOUND);
mapDataSink.completed(QueryResult.SUCCESS);
}
Realm.getInstance(MapParamUtils.getTaskConfig()).close();
} else {
mapDataSink.completed(QueryResult.TILE_NOT_FOUND);
mapDataSink.completed(QueryResult.SUCCESS);
}
}