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/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt index 99abeeb1..1aab1841 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -119,14 +119,28 @@ class ImportPreProcess { * 解析车道边线数据二级属性 * */ fun unpackingLaneBoundary(renderEntity: RenderEntity) { + var shape:JSONObject = JSONObject(mapOf( + "lateralOffset" to 0, + "markType" to 1, + "markColor" to 0, + "markMaterial" to 1, + "markSeqNum" to 1, + "markWidth" to 10, + "markingCount" to 1 + )) if (renderEntity.code == 2013&&!renderEntity.properties["shapeList"].isNullOrEmpty()&&renderEntity.properties["shapeList"]!="null") { // 解析shapeList,将数组中的属性放会properties val shapeList = JSONArray(renderEntity.properties["shapeList"]) - val shape = shapeList.getJSONObject(0) - for (key in shape.keys()) { - renderEntity.properties[key] = shape[key].toString() + for (i in 0 until shapeList.length()) { + shape = shapeList.getJSONObject(i) + if (shape.optInt("lateralOffset", 0) == 0) { + break + } } } + for (key in shape.keys()) { + renderEntity.properties[key] = shape[key].toString() + } } /** 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 28e6f58c..772108a9 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 @@ -112,7 +112,7 @@ class PersonalCenterFragment(private var backListener: (() -> Unit?)? = null) : viewModel.readRealmData() // 定位到指定位置 niMapController.mMapView.vtmMap.animator() - .animateTo(GeoPoint(40.031657799200346, 116.32207834810715)) + .animateTo(GeoPoint( 40.034842306317486, 116.31735963074652 )) } // 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 0b0f699b..1fe31923 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1,6 +1,7 @@ @@ -45,8 +46,8 @@ - + @@ -173,7 +174,7 @@ - + @@ -1479,19 +1480,18 @@ - + - + - + - + @@ -1503,7 +1503,7 @@ - + @@ -1514,7 +1514,7 @@ - + @@ -1538,20 +1538,19 @@ - + - + - + - + - + @@ -1561,89 +1560,77 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1653,69 +1640,65 @@ + + - - - - - - - - - - + + + + + + + + + - - - - - + + + + + - - - - + + + - + - - - + + + - - + - - + + + - + - + @@ -1728,19 +1711,19 @@ - + - + - + - + - + @@ -1748,32 +1731,31 @@ - + - + - + - + - + - + - - - - + + + + @@ -1782,33 +1764,30 @@ - - + + - + - + - + - + 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 d3348487..e3e4f8fa 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 @@ -105,7 +105,6 @@ class LayerManagerHandler(context: AppCompatActivity, mapView: NIMapView, traceP } private fun initOMDBVectorTileLayer() { - // 初始化OMDB参考相关图层 omdbReferenceTileLayer = VectorTileLayer(mMapView.vtmMap, omdbReferenceTileSource) omdbReferenceLabelLayer = LabelLayer(