From 7b603e6af3cb2b08dc7ccccf9f2615d3a0ab38b6 Mon Sep 17 00:00:00 2001 From: qiji4215 Date: Wed, 27 Sep 2023 16:20:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E8=B7=AF=E8=BE=B9?= =?UTF-8?q?=E7=95=8C=E7=B1=BB=E5=9E=8B=E8=B7=AF=E7=89=99=E3=80=81=E6=8A=A4?= =?UTF-8?q?=E6=A0=8F=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 2 +- .../com/navinfo/omqs/db/ImportPreProcess.kt | 2 +- .../src/main/assets/editormarker.xml | 20 ++++++++++++------ .../src/main/assets/omdb/icon_2083_8.svg | 1 + .../src/main/assets/omdb/icon_2083_81.svg | 1 + .../src/main/assets/omdb/icon_5001_1.png | Bin 3755 -> 1264 bytes 6 files changed, 17 insertions(+), 9 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/icon_2083_8.svg create mode 100644 collect-library/src/main/assets/omdb/icon_2083_81.svg diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt index ea4befcf..f1a83914 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -346,7 +346,7 @@ class ImportOMDBHelper @AssistedInject constructor( renderEntity.properties["boundaryType"] if (boundaryType != null) { when (boundaryType.toInt()) { - 0, 3, 4, 5, 7, 9 -> { + 0, 1, 5, 7, 9 -> { renderEntity.enable = 0 Log.e( "qj", 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 8c2a6b53..487b62af 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -582,7 +582,7 @@ class ImportPreProcess { angleReference.renderEntityId = renderEntity.id angleReference.name = "${renderEntity.name}车道中线面" angleReference.table = renderEntity.table - angleReference.geometry = GeometryTools.computeLine(0.00002,0.00002,renderEntity.geometry) + angleReference.geometry = GeometryTools.computeLine(0.00003,0.00003,renderEntity.geometry) angleReference.properties["qi_table"] = renderEntity.table angleReference.properties["widthProperties"] = "3" angleReference.zoomMin = renderEntity.zoomMin diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 8ac29097..d0a5f0c6 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -1622,15 +1622,21 @@ - + + + + + + + + + + - - - - + + + diff --git a/collect-library/src/main/assets/omdb/icon_2083_8.svg b/collect-library/src/main/assets/omdb/icon_2083_8.svg new file mode 100644 index 00000000..a5e7bda8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2083_8.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_2083_81.svg b/collect-library/src/main/assets/omdb/icon_2083_81.svg new file mode 100644 index 00000000..d23d1847 --- /dev/null +++ b/collect-library/src/main/assets/omdb/icon_2083_81.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/icon_5001_1.png b/collect-library/src/main/assets/omdb/icon_5001_1.png index 1bf39a45b3b0c601e3a93ba421936490f97b8839..74e11ad6a42ea1de16c44eb7de85d500a6180dee 100644 GIT binary patch delta 431 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