diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index c09fe454..1060acc8 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -170,6 +170,11 @@
"table": "OMDB_LANE_LINK_LG",
"code": 5001,
"name": "车道中心线"
- }
+ },
+ "5002":{
+ "table": "OMDB_AREA",
+ "code": 5002,
+ "name": "面测试"
+ }
}
}
\ No newline at end of file
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 5d53c83a..8d1dffd3 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
@@ -111,7 +111,7 @@ class PersonalCenterFragment : BaseFragment(), FSAFActivityCallbacks {
viewModel.readRealmData()
// 定位到指定位置
niMapController.mMapView.vtmMap.animator()
- .animateTo(GeoPoint(40.031657799200346, 116.32207834810715 ))
+ .animateTo(GeoPoint(40.0 ,100.0 ))
}
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 0729b68a..8351cfe4 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1793,13 +1793,19 @@
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/area_test.jpg b/collect-library/src/main/assets/omdb/area_test.jpg
new file mode 100644
index 00000000..5e274dc1
Binary files /dev/null and b/collect-library/src/main/assets/omdb/area_test.jpg differ
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
index 75aafa44..01295323 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/handler/LayerManagerHandler.kt
@@ -103,16 +103,6 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa
}
private fun initOMDBVectorTileLayer() {
- // 初始化OMDB相关图层
- omdbVectorTileLayer = VectorTileLayer(mMapView.vtmMap, omdbTileSource)
- omdbLabelLayer = LabelLayer(mMapView.vtmMap, omdbVectorTileLayer, LabelTileLoaderHook(), Constant.OMDB_MIN_ZOOM)
- if(omdbVectorTileLayer!=null){
- addLayer(omdbVectorTileLayer,NIMapView.LAYER_GROUPS.VECTOR_TILE)
- }
- if(omdbLabelLayer!=null){
- addLayer(omdbLabelLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE)
- }
-
// 初始化OMDB参考相关图层
omdbReferenceTileLayer = VectorTileLayer(mMapView.vtmMap, omdbReferenceTileSource)
omdbReferenceLabelLayer = LabelLayer(mMapView.vtmMap, omdbReferenceTileLayer, LabelTileLoaderHook(), Constant.OMDB_MIN_ZOOM)
@@ -122,6 +112,16 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView,tracePa
if(omdbReferenceLabelLayer!=null){
addLayer(omdbReferenceLabelLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE)
}
+
+ // 初始化OMDB相关图层
+ omdbVectorTileLayer = VectorTileLayer(mMapView.vtmMap, omdbTileSource)
+ omdbLabelLayer = LabelLayer(mMapView.vtmMap, omdbVectorTileLayer, LabelTileLoaderHook(), Constant.OMDB_MIN_ZOOM)
+ if(omdbVectorTileLayer!=null){
+ addLayer(omdbVectorTileLayer,NIMapView.LAYER_GROUPS.VECTOR_TILE)
+ }
+ if(omdbLabelLayer!=null){
+ addLayer(omdbLabelLayer, NIMapView.LAYER_GROUPS.VECTOR_TILE)
+ }
}
/**
diff --git a/vtm b/vtm
index fb0b88e9..6a91e63b 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit fb0b88e916c51754baedfb7c5b42aa86b9dc337d
+Subproject commit 6a91e63b0c9f65fd68f8aa4972b1b7bf20a5a962