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

 Conflicts:

	vtm

app/src/main/assets/omdb_config.json

@@ -167,6 +167,22 @@
 					}
 				]
 			},
+			"3002":{
+				"table": "OMDB_OBJECT_TEXT",
+				"code": 3002,
+				"name": "文字",
+				"zoomMin": 15,
+				"zoomMax": 20,
+				"transformer2Code": ""
+			},
+			"3003":{
+				"table": "OMDB_OBJECT_SYMBOL",
+				"code": 3003,
+				"name": "符号",
+				"zoomMin": 15,
+				"zoomMax": 20,
+				"transformer2Code": ""
+			},
 			"3005":{
 				"table": "OMDB_TRAFFIC_SIGN",
 				"code": 3005,
@@ -211,7 +227,7 @@
 				"table": "OMDB_CROSS_WALK",
 				"code": 3014,
 				"name": "人行横道",
-				"zoomMin": 18,
+				"zoomMin": 15,
 				"zoomMax": 20
 			},
 			"3016":{

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.45250049995882, 115.85967482434108 ))
+                        .animateTo(GeoPoint( 40.480633792652746, 115.99816629572948 ))
                 }
                 R.id.personal_center_menu_open_all_layer -> {
                     MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS)