From 5a9cbd09e6deb8bab2e3c7ecd6f942a3c6ecd2af Mon Sep 17 00:00:00 2001 From: xiaoyan Date: Thu, 24 Aug 2023 14:27:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E8=AD=A6=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=9B=BE=E6=A0=87=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/omdb_config.json | 33 ++++++++ .../com/navinfo/omqs/bean/ImportConfig.kt | 2 +- .../com/navinfo/omqs/db/ImportOMDBHelper.kt | 3 +- .../com/navinfo/omqs/db/ImportPreProcess.kt | 81 +++++++++++++++++++ .../personalcenter/PersonalCenterFragment.kt | 2 +- .../personalcenter/PersonalCenterViewModel.kt | 2 +- collect-library/resources/rendertheme.xsd | 2 + .../src/main/assets/editormarker.xml | 11 +++ .../assets/omdb/appendix/1105_00101_0.svg | 30 +++++++ .../assets/omdb/appendix/1105_00202_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00203_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00204_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00205_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00206_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00207_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00208_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00209_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00210_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00211_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00212_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00213_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00214_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00215_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00216_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00217_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00219_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00221_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00223_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00225_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00302_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00303_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00304_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00305_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00306_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00307_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00308_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00309_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00310_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00311_0.svg | 1 + .../assets/omdb/appendix/1105_00312_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00313_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00314_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00315_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00316_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00317_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00319_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00321_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00323_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00325_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00402_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00403_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00404_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00405_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00406_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00407_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00408_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00409_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00410_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00411_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00412_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00413_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00414_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00415_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00416_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00417_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00419_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00421_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00423_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00425_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_00502_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00503_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00504_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00505_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00506_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00507_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00508_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00509_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00510_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00511_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00512_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00513_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00514_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00515_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00516_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00517_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00518_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00519_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00520_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00521_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00522_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00523_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00524_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00525_0.svg | 18 +++++ .../assets/omdb/appendix/1105_00602_0.svg | 28 +++++++ .../assets/omdb/appendix/1105_00702_0.svg | 37 +++++++++ .../assets/omdb/appendix/1105_00802_0.svg | 16 ++++ .../assets/omdb/appendix/1105_00902_0.svg | 23 ++++++ .../assets/omdb/appendix/1105_00903_0.svg | 23 ++++++ .../assets/omdb/appendix/1105_01002_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_01003_0.svg | 33 ++++++++ .../assets/omdb/appendix/1105_01004_0.svg | 32 ++++++++ .../assets/omdb/appendix/1105_01102_0.svg | 28 +++++++ .../assets/omdb/appendix/1105_01103_0.svg | 35 ++++++++ .../assets/omdb/appendix/1105_01203_0.svg | 37 +++++++++ .../assets/omdb/appendix/1105_01302_0.svg | 36 +++++++++ .../assets/omdb/appendix/1105_01402_0.svg | 27 +++++++ .../assets/omdb/appendix/1105_01403_0.svg | 27 +++++++ .../assets/omdb/appendix/1105_01602_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_01702_0.svg | 23 ++++++ .../assets/omdb/appendix/1105_01703_0.svg | 44 ++++++++++ .../assets/omdb/appendix/1105_02002_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_02003_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_02004_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_02102_0.svg | 29 +++++++ .../assets/omdb/appendix/1105_02202_0.svg | 37 +++++++++ .../assets/omdb/appendix/1105_02302_0.svg | 31 +++++++ .../assets/omdb/appendix/1105_02517_0.svg | 15 ++++ .../assets/omdb/appendix/1105_02902_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_03102_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03103_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03104_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03105_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03106_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03107_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03108_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03109_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03110_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03111_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03112_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03113_0.svg | 18 +++++ .../assets/omdb/appendix/1105_03114_0.svg | 19 +++++ .../assets/omdb/appendix/1105_03202_0.svg | 28 +++++++ .../assets/omdb/appendix/1105_03203_0.svg | 17 ++++ .../assets/omdb/appendix/1105_03302_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_03402_0.svg | 23 ++++++ .../assets/omdb/appendix/1105_03403_0.svg | 23 ++++++ .../assets/omdb/appendix/1105_03502_0.svg | 23 ++++++ .../assets/omdb/appendix/1105_03602_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_03702_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_03802_0.svg | 33 ++++++++ .../assets/omdb/appendix/1105_03902_0.svg | 33 ++++++++ .../assets/omdb/appendix/1105_04002_0.svg | 29 +++++++ .../assets/omdb/appendix/1105_04102_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_04103_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_04202_0.svg | 46 +++++++++++ .../assets/omdb/appendix/1105_04203_0.svg | 47 +++++++++++ .../assets/omdb/appendix/1105_04302_0.svg | 27 +++++++ .../assets/omdb/appendix/1105_04402_0.svg | 20 +++++ .../assets/omdb/appendix/1105_04502_0.svg | 33 ++++++++ .../assets/omdb/appendix/1105_04602_0.svg | 22 +++++ .../assets/omdb/appendix/1105_04702_0.svg | 22 +++++ .../assets/omdb/appendix/1105_04802_0.svg | 19 +++++ .../assets/omdb/appendix/1105_04902_0.svg | 19 +++++ .../assets/omdb/appendix/1105_05002_0.svg | 34 ++++++++ .../assets/omdb/appendix/1105_05102_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_05103_0.svg | 42 ++++++++++ .../assets/omdb/appendix/1105_05202_0.svg | 18 +++++ .../assets/omdb/appendix/1105_05302_0.svg | 43 ++++++++++ .../assets/omdb/appendix/1105_05502_0.svg | 24 ++++++ .../assets/omdb/appendix/1105_05503_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_05504_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_05602_0.svg | 22 +++++ .../assets/omdb/appendix/1105_05603_0.svg | 21 +++++ .../assets/omdb/appendix/1105_05604_0.svg | 20 +++++ .../assets/omdb/appendix/1105_05605_0.svg | 16 ++++ .../assets/omdb/appendix/1105_05702_0.svg | 29 +++++++ .../assets/omdb/appendix/1105_05802_0.svg | 39 +++++++++ .../assets/omdb/appendix/1105_05902_0.svg | 40 +++++++++ .../assets/omdb/appendix/1105_06002_0.svg | 35 ++++++++ .../assets/omdb/appendix/1105_06102_0.svg | 34 ++++++++ .../assets/omdb/appendix/1105_06103_0.svg | 32 ++++++++ .../assets/omdb/appendix/1105_06202_0.svg | 20 +++++ .../assets/omdb/appendix/1105_06203_0.svg | 20 +++++ .../assets/omdb/appendix/1105_06502_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_06602_0.svg | 21 +++++ .../assets/omdb/appendix/1105_06802_0.svg | 25 ++++++ .../assets/omdb/appendix/1105_07302_0.svg | 21 +++++ .../assets/omdb/appendix/1105_07502_0.svg | 19 +++++ .../assets/omdb/appendix/1105_07602_0.svg | 32 ++++++++ .../assets/omdb/appendix/1105_08501_0.svg | 21 +++++ .../assets/omdb/appendix/1105_09102_0.svg | 21 +++++ .../assets/omdb/appendix/1105_09103_0.svg | 27 +++++++ .../assets/omdb/appendix/1105_09202_0.svg | 23 ++++++ .../assets/omdb/appendix/1105_09302_0.svg | 26 ++++++ .../assets/omdb/appendix/1105_09402_0.svg | 28 +++++++ .../assets/omdb/appendix/1105_09402_2.svg | 28 +++++++ .../assets/omdb/appendix/1105_09502_0.svg | 30 +++++++ .../assets/omdb/appendix/1105_09601_0.svg | 41 ++++++++++ .../assets/omdb/appendix/1105_09702_0.svg | 48 +++++++++++ .../library/map/source/OMDBDataDecoder.java | 2 +- .../map/source/OMDBReferenceDecoder.java | 2 +- 191 files changed, 4313 insertions(+), 6 deletions(-) create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00202_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00203_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00204_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00205_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00206_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00207_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00208_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00209_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00210_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00211_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00212_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00213_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00214_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00215_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00216_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00217_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00219_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00221_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00223_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00225_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00303_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00304_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00305_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00306_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00307_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00308_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00309_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00310_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00311_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00312_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00313_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00314_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00315_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00316_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00317_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00319_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00321_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00323_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00325_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00402_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00403_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00404_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00405_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00406_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00407_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00408_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00409_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00410_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00411_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00412_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00413_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00414_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00415_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00416_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00417_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00419_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00421_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00423_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00425_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00502_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00503_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00504_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00505_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00506_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00507_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00508_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00509_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00510_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00511_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00512_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00513_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00514_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00515_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00516_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00517_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00518_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00519_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00520_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00521_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00522_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00523_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00524_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00525_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00602_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00702_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00802_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00902_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_00903_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01002_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01003_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01004_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01102_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01103_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01203_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01402_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01403_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01602_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01702_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_01703_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02002_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02003_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02004_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02102_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02202_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02517_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_02902_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03102_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03103_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03104_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03105_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03106_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03107_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03108_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03109_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03110_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03111_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03112_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03113_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03114_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03202_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03203_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03402_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03403_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03502_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03602_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03702_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03802_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_03902_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04002_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04102_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04103_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04202_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04203_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04402_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04502_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04602_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04702_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04802_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_04902_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05002_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05102_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05103_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05202_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05502_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05503_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05504_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05602_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05603_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05604_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05605_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05702_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05802_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_05902_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06002_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06102_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06103_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06202_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06203_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06502_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06602_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_06802_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_07302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_07502_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_07602_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_08501_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09102_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09103_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09202_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09302_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09402_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09402_2.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09502_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09601_0.svg create mode 100644 collect-library/src/main/assets/omdb/appendix/1105_09702_0.svg diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json index cf436fe1..08bf4e2b 100644 --- a/app/src/main/assets/omdb_config.json +++ b/app/src/main/assets/omdb_config.json @@ -325,6 +325,39 @@ } ] }, + "4009":{ + "table": "OMDB_WARNINGSIGN", + "code": 4009, + "name": "警示信息", + "zoomMin": 15, + "zoomMax": 20, + "transformer": [ + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "translateRight()" + }, + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "generateS2EReferenceLine()" + }, + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "generateDirectReferenceLine('',3)" + }, + { + "k": "geometry", + "v": "~", + "klib": "geometry", + "vlib": "obtainReferenceDynamicSrc('assets:omdb/appendix/1105_','_0.svg','typeCode')" + } + ] + }, "4010":{ "table": "OMDB_ELECTRONICEYE", "code": 4010, diff --git a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt index 43adbc9f..b2cd1aa5 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/ImportConfig.kt @@ -57,7 +57,7 @@ class ImportConfig { for ((index, value) in params.withIndex()) { // 前2个参数确定为对象本身和RenderEntity，因此自定义参数从index+2开始设置 if (methodParams.size>index+2) { - callByParams[methodParams[index+2]] = value + callByParams[methodParams[index+2]] = value.replace("'", "") } } when(val result = method.callBy(callByParams)) { // 如果方法返回的数据类型是boolean，且返回为false，则该数据不处理 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 978f7352..ff43946c 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportOMDBHelper.kt @@ -146,6 +146,7 @@ class ImportOMDBHelper @AssistedInject constructor( val realm = Realm.getDefaultInstance() // 先获取当前配置的所有图层的个数，方便后续计算数据解析进度 var tableNum = 0 + var processIndex = 0 for (importConfig in importConfigList) { tableNum += importConfig.tableMap.size } @@ -457,7 +458,7 @@ class ImportOMDBHelper @AssistedInject constructor( } } // 1个文件发送一次flow流 - emit("${index + 1}/${tableNum}") + emit("${++processIndex}/${tableNum}") // 如果当前解析的是OMDB_RD_LINK数据，将其缓存在预处理类中，以便后续处理其他要素时使用 if (currentConfig.table == "OMDB_RD_LINK") { importConfig.preProcess.cacheRdLink = 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 774e1120..1a62c9b0 100644 --- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt +++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt @@ -661,4 +661,85 @@ class ImportPreProcess { WKTWriter(3).write(GeometryTools.getPolygonGeometry(geometry.coordinates)) } } + + /** + * 生成动态src字段-辅助图层，一般用于显示带角度的图标 + * @param renderEntity 要被处理的RenderEntity + * @param prefix 图片的前缀（一般还需要指定图片对应的文件夹） + * @param suffix 图片的后缀（根据codeName获取到的code后，匹配图片的后缀，还包含code码后的其他字符串内容） + * @param codeName 数据对应的code字段的字段名 + * */ + fun obtainReferenceDynamicSrc(renderEntity: RenderEntity, prefix: String, suffix: String, codeName: String) { + if (codeName.isNullOrBlank()) { + return + } + + // 根据数据或angle计算方向对应的角度和偏移量 + val geometry = renderEntity.wkt + var radian = 0.0 // geometry的角度，如果是点，获取angle，如果是线，获取最后两个点的方向 + var pointStartArray = mutableListOf() + if (Geometry.TYPENAME_POINT == geometry?.geometryType) { + val point = Coordinate(geometry?.coordinate) + pointStartArray.add(point) + var angle = + if (renderEntity?.properties?.get("angle") == null) 0.0 else renderEntity?.properties?.get( + "angle" + )?.toDouble()!! + // angle角度为与正北方向的顺时针夹角，将其转换为与X轴正方向的逆时针夹角，即为正东方向的夹角 + angle = (450 - angle) % 360 + radian = Math.toRadians(angle) + } else if (Geometry.TYPENAME_LINESTRING == geometry?.geometryType) { + var coordinates = geometry.coordinates + val p1: Coordinate = coordinates.get(coordinates.size - 2) + val p2: Coordinate = coordinates.get(coordinates.size - 1) + // 计算线段的方向 + radian = Angle.angle(p1, p2) + pointStartArray.add(p1) + } else if (Geometry.TYPENAME_POLYGON == geometry?.geometryType) { + // 记录下面数据的每一个点位 + pointStartArray.addAll(geometry.coordinates) + // 获取当前的面数据对应的方向信息 + var angle = if (renderEntity?.properties?.get("angle") == null) { + if (renderEntity?.properties?.get("heading") == null) { + 0.0 + } else { + renderEntity?.properties?.get("heading")?.toDouble()!! + } + } else renderEntity?.properties?.get("angle")?.toDouble()!! + + angle = (450 - angle) % 360 + radian = Math.toRadians(angle) + } + + // 计算偏移距离 + var dx: Double = GeometryTools.convertDistanceToDegree( + defaultTranslateDistance, + geometry?.coordinate?.y!! + ) * Math.cos(radian) + var dy: Double = GeometryTools.convertDistanceToDegree( + defaultTranslateDistance, + geometry?.coordinate?.y!! + ) * Math.sin(radian) + + for (pointStart in pointStartArray) { + val coorEnd = Coordinate(pointStart.getX() + dx, pointStart.getY() + dy, pointStart.z) + + val dynamicSrcReference = ReferenceEntity() + dynamicSrcReference.renderEntityId = renderEntity.id + dynamicSrcReference.name = "${renderEntity.name}动态icon" + dynamicSrcReference.table = renderEntity.table + dynamicSrcReference.zoomMin = renderEntity.zoomMin + dynamicSrcReference.zoomMax = renderEntity.zoomMax + dynamicSrcReference.taskId = renderEntity.taskId + dynamicSrcReference.enable = renderEntity.enable + // 与原有方向指向平行的线 + dynamicSrcReference.geometry = + WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd))) + dynamicSrcReference.properties["qi_table"] = renderEntity.table + dynamicSrcReference.properties["type"] = "dynamicSrc" + val code = renderEntity.properties[codeName] + dynamicSrcReference.properties["src"] = "${prefix}${code}${suffix}" + Realm.getDefaultInstance().insert(dynamicSrcReference) + } + } } \ 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 4aaf660a..eeafd079 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 @@ -129,7 +129,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit? // 定位到指定位置 niMapController.mMapView.vtmMap.animator() // .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708 )) - .animateTo(GeoPoint( 40.45403725443716, 115.81488271796577)) + .animateTo(GeoPoint( 40.45250049995882, 115.85967482434108 )) } R.id.personal_center_menu_open_all_layer -> { MapParamUtils.setDataLayerEnum(DataLayerEnum.SHOW_ALL_LAYERS) diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt index 40ce76a4..6d4ab7ba 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/personalcenter/PersonalCenterViewModel.kt @@ -171,7 +171,7 @@ class PersonalCenterViewModel @Inject constructor( } } else { val newTask = TaskBean() - newTask.id = 9999 + newTask.id = -1 importOMDBHelper.importOmdbZipFile(importOMDBHelper.omdbFile, newTask).collect { Log.d("importOMDBData", it) } diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd index 84aa0c05..52a05322 100644 --- a/collect-library/resources/rendertheme.xsd +++ b/collect-library/resources/rendertheme.xsd @@ -256,6 +256,8 @@ + + diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml index 07064918..2bceef42 100644 --- a/collect-library/src/main/assets/editormarker.xml +++ b/collect-library/src/main/assets/editormarker.xml @@ -2348,5 +2348,16 @@ + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg new file mode 100644 index 00000000..7e87f75d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00101_0.svg @@ -0,0 +1,30 @@ + + + + qita_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00202_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00202_0.svg new file mode 100644 index 00000000..bff240e7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00202_0.svg @@ -0,0 +1,18 @@ + + + + 5 + Created with Sketch. + + + + + + + 5 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00203_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00203_0.svg new file mode 100644 index 00000000..9bfa2209 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00203_0.svg @@ -0,0 +1,18 @@ + + + + 10 + Created with Sketch. + + + + + + + 10 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00204_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00204_0.svg new file mode 100644 index 00000000..7e315d1e --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00204_0.svg @@ -0,0 +1,18 @@ + + + + 15 + Created with Sketch. + + + + + + + 15 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00205_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00205_0.svg new file mode 100644 index 00000000..e8612af9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00205_0.svg @@ -0,0 +1,18 @@ + + + + 20 + Created with Sketch. + + + + + + + 20 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00206_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00206_0.svg new file mode 100644 index 00000000..8f921718 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00206_0.svg @@ -0,0 +1,18 @@ + + + + 25 + Created with Sketch. + + + + + + + 25 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00207_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00207_0.svg new file mode 100644 index 00000000..50c4bb82 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00207_0.svg @@ -0,0 +1,18 @@ + + + + 30 + Created with Sketch. + + + + + + + 30 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00208_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00208_0.svg new file mode 100644 index 00000000..8d6e9067 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00208_0.svg @@ -0,0 +1,18 @@ + + + + 35 + Created with Sketch. + + + + + + + 35 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00209_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00209_0.svg new file mode 100644 index 00000000..6c34a3b9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00209_0.svg @@ -0,0 +1,18 @@ + + + + 40 + Created with Sketch. + + + + + + + 40 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00210_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00210_0.svg new file mode 100644 index 00000000..ff4828c9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00210_0.svg @@ -0,0 +1,18 @@ + + + + 45 + Created with Sketch. + + + + + + + 45 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00211_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00211_0.svg new file mode 100644 index 00000000..4e96b91d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00211_0.svg @@ -0,0 +1,18 @@ + + + + 50 + Created with Sketch. + + + + + + + 50 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00212_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00212_0.svg new file mode 100644 index 00000000..7f157620 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00212_0.svg @@ -0,0 +1,18 @@ + + + + 55 + Created with Sketch. + + + + + + + 55 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00213_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00213_0.svg new file mode 100644 index 00000000..4ace59d8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00213_0.svg @@ -0,0 +1,18 @@ + + + + 60 + Created with Sketch. + + + + + + + 60 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00214_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00214_0.svg new file mode 100644 index 00000000..39d7bdfe --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00214_0.svg @@ -0,0 +1,18 @@ + + + + 65 + Created with Sketch. + + + + + + + 65 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00215_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00215_0.svg new file mode 100644 index 00000000..f1553c54 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00215_0.svg @@ -0,0 +1,18 @@ + + + + 70 + Created with Sketch. + + + + + + + 70 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00216_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00216_0.svg new file mode 100644 index 00000000..cda62769 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00216_0.svg @@ -0,0 +1,18 @@ + + + + 75 + Created with Sketch. + + + + + + + 75 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00217_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00217_0.svg new file mode 100644 index 00000000..3b6ed314 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00217_0.svg @@ -0,0 +1,18 @@ + + + + 80 + Created with Sketch. + + + + + + + 80 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00219_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00219_0.svg new file mode 100644 index 00000000..b65be5f7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00219_0.svg @@ -0,0 +1,18 @@ + + + + 90 + Created with Sketch. + + + + + + + 90 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00221_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00221_0.svg new file mode 100644 index 00000000..5719804c --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00221_0.svg @@ -0,0 +1,18 @@ + + + + 100 + Created with Sketch. + + + + + + + 100 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00223_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00223_0.svg new file mode 100644 index 00000000..71a9cd3a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00223_0.svg @@ -0,0 +1,18 @@ + + + + 110 + Created with Sketch. + + + + + + + 110 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00225_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00225_0.svg new file mode 100644 index 00000000..c6cf1b54 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00225_0.svg @@ -0,0 +1,18 @@ + + + + 120 + Created with Sketch. + + + + + + + 120 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00302_0.svg new file mode 100644 index 00000000..fe1924e1 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00302_0.svg @@ -0,0 +1,18 @@ + + + + 5 + Created with Sketch. + + + + + + + 5 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00303_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00303_0.svg new file mode 100644 index 00000000..3fd61853 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00303_0.svg @@ -0,0 +1,18 @@ + + + + 10 + Created with Sketch. + + + + + + + 10 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00304_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00304_0.svg new file mode 100644 index 00000000..8cccfaf2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00304_0.svg @@ -0,0 +1,18 @@ + + + + 15 + Created with Sketch. + + + + + + + 15 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00305_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00305_0.svg new file mode 100644 index 00000000..99a6f31b --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00305_0.svg @@ -0,0 +1,18 @@ + + + + 20 + Created with Sketch. + + + + + + + 20 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00306_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00306_0.svg new file mode 100644 index 00000000..297f6e4d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00306_0.svg @@ -0,0 +1,18 @@ + + + + 25 + Created with Sketch. + + + + + + + 25 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00307_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00307_0.svg new file mode 100644 index 00000000..47225c57 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00307_0.svg @@ -0,0 +1,18 @@ + + + + 30 + Created with Sketch. + + + + + + + 30 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00308_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00308_0.svg new file mode 100644 index 00000000..3b53dd72 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00308_0.svg @@ -0,0 +1,18 @@ + + + + 35 + Created with Sketch. + + + + + + + 35 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00309_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00309_0.svg new file mode 100644 index 00000000..a3b2904c --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00309_0.svg @@ -0,0 +1,18 @@ + + + + 40 + Created with Sketch. + + + + + + + 40 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00310_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00310_0.svg new file mode 100644 index 00000000..10203443 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00310_0.svg @@ -0,0 +1,18 @@ + + + + 45 + Created with Sketch. + + + + + + + 45 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00311_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00311_0.svg new file mode 100644 index 00000000..516d7d19 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00311_0.svg @@ -0,0 +1 @@ +50 \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00312_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00312_0.svg new file mode 100644 index 00000000..d106b2a5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00312_0.svg @@ -0,0 +1,18 @@ + + + + 55 + Created with Sketch. + + + + + + + 55 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00313_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00313_0.svg new file mode 100644 index 00000000..6bf4f79b --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00313_0.svg @@ -0,0 +1,18 @@ + + + + 60 + Created with Sketch. + + + + + + + 60 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00314_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00314_0.svg new file mode 100644 index 00000000..8b5ebab7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00314_0.svg @@ -0,0 +1,18 @@ + + + + 65 + Created with Sketch. + + + + + + + 65 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00315_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00315_0.svg new file mode 100644 index 00000000..ae128900 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00315_0.svg @@ -0,0 +1,18 @@ + + + + 70 + Created with Sketch. + + + + + + + 70 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00316_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00316_0.svg new file mode 100644 index 00000000..f094221f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00316_0.svg @@ -0,0 +1,18 @@ + + + + 75 + Created with Sketch. + + + + + + + 75 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00317_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00317_0.svg new file mode 100644 index 00000000..ddf59b25 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00317_0.svg @@ -0,0 +1,18 @@ + + + + 80 + Created with Sketch. + + + + + + + 80 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00319_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00319_0.svg new file mode 100644 index 00000000..2b3cc653 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00319_0.svg @@ -0,0 +1,18 @@ + + + + 90 + Created with Sketch. + + + + + + + 90 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00321_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00321_0.svg new file mode 100644 index 00000000..4316b1fe --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00321_0.svg @@ -0,0 +1,18 @@ + + + + 100 + Created with Sketch. + + + + + + + 100 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00323_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00323_0.svg new file mode 100644 index 00000000..7a477213 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00323_0.svg @@ -0,0 +1,18 @@ + + + + 110 + Created with Sketch. + + + + + + + 110 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00325_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00325_0.svg new file mode 100644 index 00000000..3a72d160 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00325_0.svg @@ -0,0 +1,18 @@ + + + + 120 + Created with Sketch. + + + + + + + 120 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00402_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00402_0.svg new file mode 100644 index 00000000..cb72ddc7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00402_0.svg @@ -0,0 +1,24 @@ + + + + 5 + Created with Sketch. + + + + + + + 5 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00403_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00403_0.svg new file mode 100644 index 00000000..f3d6aaae --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00403_0.svg @@ -0,0 +1,24 @@ + + + + 10 + Created with Sketch. + + + + + + + 10 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00404_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00404_0.svg new file mode 100644 index 00000000..e55f25f4 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00404_0.svg @@ -0,0 +1,24 @@ + + + + 15 + Created with Sketch. + + + + + + + 15 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00405_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00405_0.svg new file mode 100644 index 00000000..a32556d1 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00405_0.svg @@ -0,0 +1,24 @@ + + + + 20 + Created with Sketch. + + + + + + + 20 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00406_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00406_0.svg new file mode 100644 index 00000000..4903727f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00406_0.svg @@ -0,0 +1,24 @@ + + + + 25 + Created with Sketch. + + + + + + + 25 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00407_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00407_0.svg new file mode 100644 index 00000000..fec0a258 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00407_0.svg @@ -0,0 +1,24 @@ + + + + 30 + Created with Sketch. + + + + + + + 30 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00408_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00408_0.svg new file mode 100644 index 00000000..030eb003 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00408_0.svg @@ -0,0 +1,24 @@ + + + + 35 + Created with Sketch. + + + + + + + 35 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00409_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00409_0.svg new file mode 100644 index 00000000..e96cc3fb --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00409_0.svg @@ -0,0 +1,24 @@ + + + + 40 + Created with Sketch. + + + + + + + 40 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00410_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00410_0.svg new file mode 100644 index 00000000..1b73ec5a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00410_0.svg @@ -0,0 +1,24 @@ + + + + 45 + Created with Sketch. + + + + + + + 45 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00411_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00411_0.svg new file mode 100644 index 00000000..f473e1a0 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00411_0.svg @@ -0,0 +1,24 @@ + + + + 50 + Created with Sketch. + + + + + + + 50 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00412_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00412_0.svg new file mode 100644 index 00000000..becb06bc --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00412_0.svg @@ -0,0 +1,24 @@ + + + + 55 + Created with Sketch. + + + + + + + 55 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00413_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00413_0.svg new file mode 100644 index 00000000..f1c311bb --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00413_0.svg @@ -0,0 +1,24 @@ + + + + 60 + Created with Sketch. + + + + + + + 60 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00414_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00414_0.svg new file mode 100644 index 00000000..889e13c8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00414_0.svg @@ -0,0 +1,24 @@ + + + + 65 + Created with Sketch. + + + + + + + 65 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00415_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00415_0.svg new file mode 100644 index 00000000..fdaa41d5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00415_0.svg @@ -0,0 +1,24 @@ + + + + 70 + Created with Sketch. + + + + + + + 70 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00416_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00416_0.svg new file mode 100644 index 00000000..c52a556f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00416_0.svg @@ -0,0 +1,24 @@ + + + + 75 + Created with Sketch. + + + + + + + 75 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00417_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00417_0.svg new file mode 100644 index 00000000..55ae0c12 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00417_0.svg @@ -0,0 +1,24 @@ + + + + 80 + Created with Sketch. + + + + + + + 80 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00419_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00419_0.svg new file mode 100644 index 00000000..c63105e0 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00419_0.svg @@ -0,0 +1,24 @@ + + + + 90 + Created with Sketch. + + + + + + + 90 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00421_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00421_0.svg new file mode 100644 index 00000000..f0cc600b --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00421_0.svg @@ -0,0 +1,24 @@ + + + + 100 + Created with Sketch. + + + + + + + 100 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00423_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00423_0.svg new file mode 100644 index 00000000..ea911c6d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00423_0.svg @@ -0,0 +1,24 @@ + + + + 110 + Created with Sketch. + + + + + + + 110 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00425_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00425_0.svg new file mode 100644 index 00000000..993a68a6 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00425_0.svg @@ -0,0 +1,24 @@ + + + + 120 + Created with Sketch. + + + + + + + 120 + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00502_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00502_0.svg new file mode 100644 index 00000000..fb176866 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00502_0.svg @@ -0,0 +1,18 @@ + + + + 5 + Created with Sketch. + + + + + + + 5 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00503_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00503_0.svg new file mode 100644 index 00000000..0ab39aee --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00503_0.svg @@ -0,0 +1,18 @@ + + + + 10 + Created with Sketch. + + + + + + + 10 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00504_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00504_0.svg new file mode 100644 index 00000000..d240755c --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00504_0.svg @@ -0,0 +1,18 @@ + + + + 15 + Created with Sketch. + + + + + + + 15 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00505_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00505_0.svg new file mode 100644 index 00000000..8ff6eee6 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00505_0.svg @@ -0,0 +1,18 @@ + + + + 20 + Created with Sketch. + + + + + + + 20 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00506_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00506_0.svg new file mode 100644 index 00000000..d35c8d6c --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00506_0.svg @@ -0,0 +1,18 @@ + + + + 25 + Created with Sketch. + + + + + + + 25 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00507_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00507_0.svg new file mode 100644 index 00000000..b79f3a67 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00507_0.svg @@ -0,0 +1,18 @@ + + + + 30 + Created with Sketch. + + + + + + + 30 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00508_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00508_0.svg new file mode 100644 index 00000000..c21730e0 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00508_0.svg @@ -0,0 +1,18 @@ + + + + 35 + Created with Sketch. + + + + + + + 35 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00509_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00509_0.svg new file mode 100644 index 00000000..a42aba43 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00509_0.svg @@ -0,0 +1,18 @@ + + + + 40 + Created with Sketch. + + + + + + + 40 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00510_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00510_0.svg new file mode 100644 index 00000000..7e8b1876 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00510_0.svg @@ -0,0 +1,18 @@ + + + + 45 + Created with Sketch. + + + + + + + 45 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00511_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00511_0.svg new file mode 100644 index 00000000..1241d539 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00511_0.svg @@ -0,0 +1,18 @@ + + + + 50 + Created with Sketch. + + + + + + + 50 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00512_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00512_0.svg new file mode 100644 index 00000000..5390908a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00512_0.svg @@ -0,0 +1,18 @@ + + + + 55 + Created with Sketch. + + + + + + + 55 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00513_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00513_0.svg new file mode 100644 index 00000000..77804efc --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00513_0.svg @@ -0,0 +1,18 @@ + + + + 60 + Created with Sketch. + + + + + + + 60 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00514_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00514_0.svg new file mode 100644 index 00000000..e30c17c8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00514_0.svg @@ -0,0 +1,18 @@ + + + + 65 + Created with Sketch. + + + + + + + 65 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00515_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00515_0.svg new file mode 100644 index 00000000..01bddeb7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00515_0.svg @@ -0,0 +1,18 @@ + + + + 70 + Created with Sketch. + + + + + + + 70 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00516_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00516_0.svg new file mode 100644 index 00000000..bc44da8f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00516_0.svg @@ -0,0 +1,18 @@ + + + + 75 + Created with Sketch. + + + + + + + 75 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00517_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00517_0.svg new file mode 100644 index 00000000..12ca4014 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00517_0.svg @@ -0,0 +1,18 @@ + + + + 80 + Created with Sketch. + + + + + + + 80 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00518_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00518_0.svg new file mode 100644 index 00000000..022a511a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00518_0.svg @@ -0,0 +1,18 @@ + + + + 85 + Created with Sketch. + + + + + + + 85 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00519_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00519_0.svg new file mode 100644 index 00000000..96d27cae --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00519_0.svg @@ -0,0 +1,18 @@ + + + + 90 + Created with Sketch. + + + + + + + 90 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00520_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00520_0.svg new file mode 100644 index 00000000..67a5c85f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00520_0.svg @@ -0,0 +1,18 @@ + + + + 95 + Created with Sketch. + + + + + + + 95 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00521_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00521_0.svg new file mode 100644 index 00000000..567e4108 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00521_0.svg @@ -0,0 +1,18 @@ + + + + 100 + Created with Sketch. + + + + + + + 100 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00522_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00522_0.svg new file mode 100644 index 00000000..cb4516d8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00522_0.svg @@ -0,0 +1,18 @@ + + + + 105 + Created with Sketch. + + + + + + + 105 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00523_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00523_0.svg new file mode 100644 index 00000000..cf010303 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00523_0.svg @@ -0,0 +1,18 @@ + + + + 110 + Created with Sketch. + + + + + + + 110 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00524_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00524_0.svg new file mode 100644 index 00000000..cec0054f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00524_0.svg @@ -0,0 +1,18 @@ + + + + 115 + Created with Sketch. + + + + + + + 115 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00525_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00525_0.svg new file mode 100644 index 00000000..94dd4ffa --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00525_0.svg @@ -0,0 +1,18 @@ + + + + 120 + Created with Sketch. + + + + + + + 120 + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00602_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00602_0.svg new file mode 100644 index 00000000..f91574d3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00602_0.svg @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00702_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00702_0.svg new file mode 100644 index 00000000..32552175 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00702_0.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00802_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00802_0.svg new file mode 100644 index 00000000..2ef7ffd7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00802_0.svg @@ -0,0 +1,16 @@ + + + + jinzhishiru-icon + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00902_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00902_0.svg new file mode 100644 index 00000000..6037b248 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00902_0.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_00903_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_00903_0.svg new file mode 100644 index 00000000..1a387447 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_00903_0.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01002_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01002_0.svg new file mode 100644 index 00000000..28dceab5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01002_0.svg @@ -0,0 +1,26 @@ + + + + zhuyiyeshengdonwu_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01003_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01003_0.svg new file mode 100644 index 00000000..7ece269c --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01003_0.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01004_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01004_0.svg new file mode 100644 index 00000000..ea40913a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01004_0.svg @@ -0,0 +1,32 @@ + + + + zhuyibaohudonwu_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01102_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01102_0.svg new file mode 100644 index 00000000..6ca4cdfa --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01102_0.svg @@ -0,0 +1,28 @@ + + + + zhuyifeijidonche_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01103_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01103_0.svg new file mode 100644 index 00000000..e15c8fdc --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01103_0.svg @@ -0,0 +1,35 @@ + + + + 1 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01203_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01203_0.svg new file mode 100644 index 00000000..55e165c5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01203_0.svg @@ -0,0 +1,37 @@ + + + + 1105_06802_0复制 2 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01302_0.svg new file mode 100644 index 00000000..ca11f6cc --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01302_0.svg @@ -0,0 +1,36 @@ + + + + G15 + Created with Sketch. + + + + + + + + + G + 1 + 5 + + + + + 国 家 高 速 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01402_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01402_0.svg new file mode 100644 index 00000000..7e5de978 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01402_0.svg @@ -0,0 +1,27 @@ + + + + 01402 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01403_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01403_0.svg new file mode 100644 index 00000000..39e9f70d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01403_0.svg @@ -0,0 +1,27 @@ + + + + 01403 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01602_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01602_0.svg new file mode 100644 index 00000000..cab037a3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01602_0.svg @@ -0,0 +1,26 @@ + + + + 01602 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01702_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01702_0.svg new file mode 100644 index 00000000..47efce0e --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01702_0.svg @@ -0,0 +1,23 @@ + + + + 01702 + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_01703_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_01703_0.svg new file mode 100644 index 00000000..23c59c59 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_01703_0.svg @@ -0,0 +1,44 @@ + + + + zuocechedaojieshu_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02002_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02002_0.svg new file mode 100644 index 00000000..6d36daa9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02002_0.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02003_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02003_0.svg new file mode 100644 index 00000000..07211c0d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02003_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02004_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02004_0.svg new file mode 100644 index 00000000..ea91784f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02004_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02102_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02102_0.svg new file mode 100644 index 00000000..5699366a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02102_0.svg @@ -0,0 +1,29 @@ + + + + 02102 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02202_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02202_0.svg new file mode 100644 index 00000000..3e9f93b8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02202_0.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02302_0.svg new file mode 100644 index 00000000..f184b6bf --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02302_0.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02517_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02517_0.svg new file mode 100644 index 00000000..d02c6579 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02517_0.svg @@ -0,0 +1,15 @@ + + + + 1 + Created with Sketch. + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_02902_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_02902_0.svg new file mode 100644 index 00000000..fab722af --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_02902_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03102_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03102_0.svg new file mode 100644 index 00000000..185f86ae --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03102_0.svg @@ -0,0 +1,18 @@ + + + + 03103 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03103_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03103_0.svg new file mode 100644 index 00000000..32d245b5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03103_0.svg @@ -0,0 +1,18 @@ + + + + 03103 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03104_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03104_0.svg new file mode 100644 index 00000000..0224ce81 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03104_0.svg @@ -0,0 +1,18 @@ + + + + 03104 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03105_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03105_0.svg new file mode 100644 index 00000000..e59b9a59 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03105_0.svg @@ -0,0 +1,18 @@ + + + + 03105 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03106_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03106_0.svg new file mode 100644 index 00000000..96e6a3eb --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03106_0.svg @@ -0,0 +1,18 @@ + + + + 03106 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03107_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03107_0.svg new file mode 100644 index 00000000..c53fd5b5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03107_0.svg @@ -0,0 +1,18 @@ + + + + 03107 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03108_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03108_0.svg new file mode 100644 index 00000000..36a3c892 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03108_0.svg @@ -0,0 +1,18 @@ + + + + 03108 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03109_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03109_0.svg new file mode 100644 index 00000000..928febc3 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03109_0.svg @@ -0,0 +1,18 @@ + + + + 03109 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03110_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03110_0.svg new file mode 100644 index 00000000..5354f5bd --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03110_0.svg @@ -0,0 +1,18 @@ + + + + 编组 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03111_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03111_0.svg new file mode 100644 index 00000000..9f6878e5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03111_0.svg @@ -0,0 +1,18 @@ + + + + 编组 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03112_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03112_0.svg new file mode 100644 index 00000000..171d5c30 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03112_0.svg @@ -0,0 +1,18 @@ + + + + 1 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03113_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03113_0.svg new file mode 100644 index 00000000..d7e41032 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03113_0.svg @@ -0,0 +1,18 @@ + + + + 2 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03114_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03114_0.svg new file mode 100644 index 00000000..532711d9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03114_0.svg @@ -0,0 +1,19 @@ + + + + 3 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03202_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03202_0.svg new file mode 100644 index 00000000..cb4c1d06 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03202_0.svg @@ -0,0 +1,28 @@ + + + + 1105_03202_0复制 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03203_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03203_0.svg new file mode 100644 index 00000000..3f6fb92c --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03203_0.svg @@ -0,0 +1,17 @@ + + + + 1105_03203_0复制 + Created with Sketch. + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03302_0.svg new file mode 100644 index 00000000..6dae91f1 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03302_0.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03402_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03402_0.svg new file mode 100644 index 00000000..486c1f70 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03402_0.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03403_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03403_0.svg new file mode 100644 index 00000000..1c0cbc26 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03403_0.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03502_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03502_0.svg new file mode 100644 index 00000000..12cccb29 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03502_0.svg @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03602_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03602_0.svg new file mode 100644 index 00000000..32ca9b2a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03602_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03702_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03702_0.svg new file mode 100644 index 00000000..054f4c41 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03702_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03802_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03802_0.svg new file mode 100644 index 00000000..f65759f5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03802_0.svg @@ -0,0 +1,33 @@ + + + + zhuyixingren + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_03902_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_03902_0.svg new file mode 100644 index 00000000..b1a62fac --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_03902_0.svg @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04002_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04002_0.svg new file mode 100644 index 00000000..4f313c22 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04002_0.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04102_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04102_0.svg new file mode 100644 index 00000000..f6ebf360 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04102_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04103_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04103_0.svg new file mode 100644 index 00000000..3199c6cb --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04103_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04202_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04202_0.svg new file mode 100644 index 00000000..8033dbf0 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04202_0.svg @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04203_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04203_0.svg new file mode 100644 index 00000000..d9ee18b1 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04203_0.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04302_0.svg new file mode 100644 index 00000000..0c346be9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04302_0.svg @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04402_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04402_0.svg new file mode 100644 index 00000000..9892d25d --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04402_0.svg @@ -0,0 +1,20 @@ + + + + 04402 + Created with Sketch. + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04502_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04502_0.svg new file mode 100644 index 00000000..69d4905e --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04502_0.svg @@ -0,0 +1,33 @@ + + + + 04502 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04602_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04602_0.svg new file mode 100644 index 00000000..716ccfb4 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04602_0.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04702_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04702_0.svg new file mode 100644 index 00000000..64209a28 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04702_0.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04802_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04802_0.svg new file mode 100644 index 00000000..8d604df2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04802_0.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_04902_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_04902_0.svg new file mode 100644 index 00000000..2df1d003 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_04902_0.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05002_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05002_0.svg new file mode 100644 index 00000000..4e2b2438 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05002_0.svg @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05102_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05102_0.svg new file mode 100644 index 00000000..a4573ae7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05102_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05103_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05103_0.svg new file mode 100644 index 00000000..3836252b --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05103_0.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05202_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05202_0.svg new file mode 100644 index 00000000..b49a57df --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05202_0.svg @@ -0,0 +1,18 @@ + + + + 05202 + Created with Sketch. + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05302_0.svg new file mode 100644 index 00000000..1bf9f5a8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05302_0.svg @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05502_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05502_0.svg new file mode 100644 index 00000000..f0b655f2 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05502_0.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05503_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05503_0.svg new file mode 100644 index 00000000..8d23dffa --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05503_0.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05504_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05504_0.svg new file mode 100644 index 00000000..53c8fc20 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05504_0.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05602_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05602_0.svg new file mode 100644 index 00000000..4d1b2282 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05602_0.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05603_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05603_0.svg new file mode 100644 index 00000000..33c8fbac --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05603_0.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05604_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05604_0.svg new file mode 100644 index 00000000..fe15c0fc --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05604_0.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05605_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05605_0.svg new file mode 100644 index 00000000..517d8778 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05605_0.svg @@ -0,0 +1,16 @@ + + + + 05605 + Created with Sketch. + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05702_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05702_0.svg new file mode 100644 index 00000000..4e9f65b7 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05702_0.svg @@ -0,0 +1,29 @@ + + + + 05702 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05802_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05802_0.svg new file mode 100644 index 00000000..9a7bd694 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05802_0.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_05902_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_05902_0.svg new file mode 100644 index 00000000..729f8f05 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_05902_0.svg @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06002_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06002_0.svg new file mode 100644 index 00000000..f2259761 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06002_0.svg @@ -0,0 +1,35 @@ + + + + 06002 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06102_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06102_0.svg new file mode 100644 index 00000000..98a49c25 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06102_0.svg @@ -0,0 +1,34 @@ + + + + 06102 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06103_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06103_0.svg new file mode 100644 index 00000000..0359c2f8 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06103_0.svg @@ -0,0 +1,32 @@ + + + + 06103 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06202_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06202_0.svg new file mode 100644 index 00000000..01ab2f7b --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06202_0.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06203_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06203_0.svg new file mode 100644 index 00000000..515e9094 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06203_0.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06502_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06502_0.svg new file mode 100644 index 00000000..ef890a71 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06502_0.svg @@ -0,0 +1,26 @@ + + + + 06502 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06602_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06602_0.svg new file mode 100644 index 00000000..353ae23f --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06602_0.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_06802_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_06802_0.svg new file mode 100644 index 00000000..6c569e5e --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_06802_0.svg @@ -0,0 +1,25 @@ + + + + jinzhiminglaba + Created with Sketch. + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_07302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_07302_0.svg new file mode 100644 index 00000000..2ab0e2a9 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_07302_0.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + diff --git a/collect-library/src/main/assets/omdb/appendix/1105_07502_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_07502_0.svg new file mode 100644 index 00000000..19a094be --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_07502_0.svg @@ -0,0 +1,19 @@ + + + + 07502 + Created with Sketch. + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_07602_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_07602_0.svg new file mode 100644 index 00000000..7aa86158 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_07602_0.svg @@ -0,0 +1,32 @@ + + + + renxinghengdao_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_08501_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_08501_0.svg new file mode 100644 index 00000000..cd0312d5 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_08501_0.svg @@ -0,0 +1,21 @@ + + + + 3 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09102_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09102_0.svg new file mode 100644 index 00000000..ebc1a15e --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09102_0.svg @@ -0,0 +1,21 @@ + + + + 09102 + Created with Sketch. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09103_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09103_0.svg new file mode 100644 index 00000000..1e308f46 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09103_0.svg @@ -0,0 +1,27 @@ + + + + zuocechedaozengjia_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09202_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09202_0.svg new file mode 100644 index 00000000..7c63a509 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09202_0.svg @@ -0,0 +1,23 @@ + + + + huandao_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09302_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09302_0.svg new file mode 100644 index 00000000..f515adc1 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09302_0.svg @@ -0,0 +1,26 @@ + + + + qianfnaglukouyouchecheliangxianxing_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09402_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09402_0.svg new file mode 100644 index 00000000..951108d4 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09402_0.svg @@ -0,0 +1,28 @@ + + + + qitajingshipai_1 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09402_2.svg b/collect-library/src/main/assets/omdb/appendix/1105_09402_2.svg new file mode 100644 index 00000000..619f03eb --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09402_2.svg @@ -0,0 +1,28 @@ + + + + qitajingshipai_2 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09502_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09502_0.svg new file mode 100644 index 00000000..70a7c312 --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09502_0.svg @@ -0,0 +1,30 @@ + + + + zhongjianchedaohebing_icon + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09601_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09601_0.svg new file mode 100644 index 00000000..92d082de --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09601_0.svg @@ -0,0 +1,41 @@ + + + + 2 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + 3 + + + 2 + + + 1 + + + 米 + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/assets/omdb/appendix/1105_09702_0.svg b/collect-library/src/main/assets/omdb/appendix/1105_09702_0.svg new file mode 100644 index 00000000..35038d7a --- /dev/null +++ b/collect-library/src/main/assets/omdb/appendix/1105_09702_0.svg @@ -0,0 +1,48 @@ + + + + 1 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java index 892764bb..a84895ab 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java @@ -146,7 +146,7 @@ public class OMDBDataDecoder extends TileDecoder { for (int i = 0; i < length; i++) { // double z = longitudeToX(MercatorProjection.pixelXToLongitudeWithScale(MercatorProjection.metersToPixelsWithScale((float) coordinates[i].z, coordinates[i].y, mTileScale), mTileScale))* mTileScale/8; mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale), - (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float) coordinates[i].z); + (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), /*(float) coordinates[i].z*/0); } // int length = removeLast ? coordinates.length - 1 : coordinates.length; diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java index 9eedf666..3ade4b72 100644 --- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java +++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java @@ -143,7 +143,7 @@ public class OMDBReferenceDecoder extends TileDecoder { // 将Z坐标的米转换为屏幕像素坐标 // double z = longitudeToX(MercatorProjection.pixelXToLongitudeWithScale(MercatorProjection.metersToPixelsWithScale((float) coordinates[i].z, coordinates[i].y, mTileScale), mTileScale))* mTileScale/8; mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale), - (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float) coordinates[i].z); + (float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), /*(float) coordinates[i].z*/0); } // int length = removeLast ? coordinates.length - 1 : coordinates.length;