diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index 5a274375..d7c5d125 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -362,7 +362,7 @@ "zoomMax": 20, "is3D": true, "catch": true, - "checkLinkId": false, + "checkLinkId": true, "transformer": [ { "k": "geometry", @@ -712,7 +712,7 @@ "name": "车信", "catch": true, "isDependOnOtherTable": false, - "checkLinkId": false, + "checkLinkId": true, "zoomMin": 15, "zoomMax": 17, "transformer": [ 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 a85f88c4..0fff377c 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -837,15 +837,13 @@ class ImportPreProcess { 0,1,2->{ if (medianWidth != null) { angleReference.geometry = - GeometryTools.computeLine(medianWidth/100000000, 0.0, renderEntity.geometry) - Log.e("qj","width==${medianWidth/100000000}") + GeometryTools.computeLine(0.000012, 0.0, renderEntity.geometry) } } 3->{ if (medianWidth != null) { angleReference.geometry = - GeometryTools.computeLine(0.0, medianWidth/100000000, renderEntity.geometry) - Log.e("qj","width==${medianWidth/100000000}") + GeometryTools.computeLine(0.0, 0.000012, renderEntity.geometry) } } } diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 903eeaae..09903d8e 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1653,7 +1653,7 @@ - + @@ -1680,7 +1680,7 @@ - + @@ -1939,12 +1939,12 @@ - + - + list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 3.0); + List list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 5.0); if (list1 != null && list1.size() > 0) { Log.e("qj", "聚合交通标牌转换开始" + list.size()); list1.stream().iterator().forEachRemaining(new Consumer() {