From 8fea0fb041b95a9aea37758d61815461c3cdfbed Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Fri, 3 Nov 2023 17:48:12 +0800
Subject: [PATCH 01/16] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0marker=E5=A4=96?=
 =?UTF-8?q?=E8=BE=B9=E6=A1=86=EF=BC=8C=E8=B0=83=E6=9F=A5=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E7=A8=80=E7=96=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/navinfo/omqs/db/ImportPreProcess.kt |  2 +-
 collect-library/src/main/assets/editormarker.xml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

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 81857102..2ba14f5f 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -1206,7 +1206,7 @@ class ImportPreProcess {
 
     private fun createZLevelReference(renderEntity: RenderEntity): ReferenceEntity {
         val zLevelReference = ReferenceEntity()
-        zLevelReference.renderEntityId = renderEntity.id
+//        zLevelReference.renderEntityId = renderEntity.id
         zLevelReference.name = "${renderEntity.name}参考点"
         zLevelReference.code = renderEntity.code
         zLevelReference.table = renderEntity.table
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index f3e26dc5..ec5cbee9 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -2077,20 +2077,20 @@
                 <line fix="true" width="3" stroke="#cccccc"></line>
             </m>
             <m k="type" v="s_acc">
-                <symbol src="assets:omdb/icon_2092_acc_s.svg" symbol-height="32"
-                    symbol-width="32" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_acc_s.svg" symbol-height="26"
+                    symbol-width="26" gland="true"></symbol>
             </m>
             <m k="type" v="e_acc">
-                <symbol src="assets:omdb/icon_2092_acc_e.svg" symbol-height="32"
-                    symbol-width="32" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_acc_e.svg" symbol-height="26"
+                    symbol-width="26" gland="true"></symbol>
             </m>
             <m k="type" v="s_dec">
-                <symbol src="assets:omdb/icon_2092_dec_s.svg" symbol-height="32"
-                    symbol-width="32" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_dec_s.svg" symbol-height="26"
+                    symbol-width="26" gland="true"></symbol>
             </m>
             <m k="type" v="e_dec">
-                <symbol src="assets:omdb/icon_2092_dec_e.svg" symbol-height="32"
-                    symbol-width="32" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_dec_e.svg" symbol-height="26"
+                    symbol-width="26" gland="true"></symbol>
             </m>
         </m>
 

From 35301e4c4889b1520f3774595adbd0ce162807d2 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 8 Nov 2023 15:50:17 +0800
Subject: [PATCH 02/16] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81marker=E6=98=BE=E7=A4=BA=E9=94=99=E4=B9=B1=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json                            | 1 +
 .../omqs/ui/fragment/personalcenter/PersonalCenterFragment.kt   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 0a684a78..0753131a 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -287,6 +287,7 @@
         "zoomMax": 20,
         "is3D": true,
         "catch": true,
+        "checkLinkId": false,
         "transformer": [
           {
             "k": "geometry",
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 51342551..9f933f8a 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
@@ -196,7 +196,7 @@ class PersonalCenterFragment(private var indoorDataListener: ((Boolean) -> Unit?
                     // 定位到指定位置
                     niMapController.mMapView.vtmMap.animator()
 //                        .animateTo(GeoPoint( 40.05108004733645, 116.29187746293708    ))
-                        .animateTo(GeoPoint(39.63769191655024, 115.58991663847937))
+                        .animateTo(GeoPoint(40.07290793293324, 116.24617660398738 ))
                 }
 
                 R.id.personal_center_menu_open_all_layer -> {

From 89b862a0cdb65acf8bc781bab5578de60e6f8673 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Fri, 17 Nov 2023 09:24:53 +0800
Subject: [PATCH 03/16] =?UTF-8?q?feat:=20=E5=8A=A8=E6=80=81marker=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=94=AF=E6=8C=81=E5=A4=9A=E5=9B=BE=E6=A0=87=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          |  8 ++-
 .../com/navinfo/omqs/db/ImportPreProcess.kt   | 62 +++++++++++--------
 collect-library/resources/rendertheme.xsd     |  2 +-
 .../src/main/assets/editormarker.xml          |  2 +-
 .../map/source/OMDBTileDataSource.java        |  7 +--
 vtm                                           |  2 +-
 6 files changed, 47 insertions(+), 36 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 0753131a..3bb6fe58 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -283,7 +283,7 @@
         "table": "OMDB_TRAFFIC_SIGN",
         "code": 3005,
         "name": "交通标牌",
-        "zoomMin": 18,
+        "zoomMin": 17,
         "zoomMax": 20,
         "is3D": true,
         "catch": true,
@@ -592,6 +592,12 @@
         "zoomMin": 15,
         "zoomMax": 17,
         "transformer": [
+          {
+            "k": "geometry",
+            "v": "~",
+            "klib": "geometry",
+            "vlib": "translateBack()"
+          },
           {
             "k": "geometry",
             "v": "~",
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 49e281ab..c9db611c 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -631,30 +631,40 @@ class ImportPreProcess {
                 val listResult = mutableListOf<ReferenceEntity>()
 
                 for (i in 0 until laneInfoDirectArray.length()) {
-                    // 根据后续的数据生成辅助表数据
-                    val referenceEntity = ReferenceEntity()
-//                    referenceEntity.renderEntityId = renderEntity.id
-                    referenceEntity.name = "${renderEntity.name}参考方向"
-                    referenceEntity.table = renderEntity.table
-                    referenceEntity.enable = renderEntity.enable
-                    referenceEntity.code = renderEntity.code
-                    referenceEntity.taskId = renderEntity.taskId
-                    referenceEntity.zoomMin = renderEntity.zoomMin
-                    referenceEntity.zoomMax = renderEntity.zoomMax
-                    // 与原数据使用相同的geometry
-                    referenceEntity.geometry = renderEntity.geometry
-                    referenceEntity.properties["qi_table"] = renderEntity.table
-                    referenceEntity.properties["currentDirect"] =
+                    val currentDirect =
                         laneInfoDirectArray[i].toString().split(",").distinct().joinToString("_")
-                    referenceEntity.properties["currentType"] =
+                    val currentType =
                         laneInfoTypeArray[i].toString()
                     val type =
-                        if (referenceEntity.properties["currentType"] == "0") "normal" else if (referenceEntity.properties["currentType"] == "1") "extend" else "bus"
-                    referenceEntity.properties["symbol"] =
-                        "assets:omdb/4601/${type}/1301_${referenceEntity.properties["currentDirect"]}.svg"
-                    Log.d("unpackingLaneInfo", referenceEntity.properties["symbol"].toString())
-                    referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
-                    renderEntity.referenceEntitys?.add(referenceEntity)
+                        if (currentType == "0") "normal" else if (currentType == "1") "extend" else "bus"
+                    val symbol =
+                        "assets:omdb/4601/${type}/1301_${currentDirect}.svg"
+                    renderEntity.properties["src"] = if(renderEntity.properties["src"].isNullOrEmpty()) symbol else "${renderEntity.properties["src"]}|${symbol}"
+
+//                    // 根据后续的数据生成辅助表数据
+//                    val referenceEntity = ReferenceEntity()
+////                    referenceEntity.renderEntityId = renderEntity.id
+//                    referenceEntity.name = "${renderEntity.name}参考方向"
+//                    referenceEntity.table = renderEntity.table
+//                    referenceEntity.enable = renderEntity.enable
+//                    referenceEntity.code = renderEntity.code
+//                    referenceEntity.taskId = renderEntity.taskId
+//                    referenceEntity.zoomMin = renderEntity.zoomMin
+//                    referenceEntity.zoomMax = renderEntity.zoomMax
+//                    // 与原数据使用相同的geometry
+//                    referenceEntity.geometry = renderEntity.geometry
+//                    referenceEntity.properties["qi_table"] = renderEntity.table
+//                    referenceEntity.properties["currentDirect"] =
+//                        laneInfoDirectArray[i].toString().split(",").distinct().joinToString("_")
+//                    referenceEntity.properties["currentType"] =
+//                        laneInfoTypeArray[i].toString()
+//                    val type =
+//                        if (referenceEntity.properties["currentType"] == "0") "normal" else if (referenceEntity.properties["currentType"] == "1") "extend" else "bus"
+//                    referenceEntity.properties["symbol"] =
+//                        "assets:omdb/4601/${type}/1301_${referenceEntity.properties["currentDirect"]}.svg"
+//                    Log.d("unpackingLaneInfo", referenceEntity.properties["symbol"].toString())
+//                    referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
+//                    renderEntity.referenceEntitys?.add(referenceEntity)
                    //listResult.add(referenceEntity)
                 }
                 //insertData(listResult)
@@ -1079,22 +1089,22 @@ class ImportPreProcess {
             // 解析accessCharacteristic，判断是否存在指定属性
             val accessCharacteristic = renderEntity.properties["accessCharacteristic"].toString().toInt()
             var str = ""
-            if (accessCharacteristic.and(4)>0) {
+            if (accessCharacteristic.and(0b100)>0) {
                 str += "公"
             }
-            if (accessCharacteristic.and(8)>0) {
+            if (accessCharacteristic.and(0b1000)>0) {
                 if (str.isNotEmpty()) {
                     str += "|"
                 }
-                str += "多"
+                str += "HOV"
             }
-            if (accessCharacteristic.and(64)>0) {
+            if (accessCharacteristic.and(0b1000000)>0) {
                 if (str.isNotEmpty()) {
                     str += "|"
                 }
                 str += "行"
             }
-            if (accessCharacteristic.and(128)>0) {
+            if (accessCharacteristic.and(0b10000000)>0) {
                 if (str.isNotEmpty()) {
                     str += "|"
                 }
diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd
index fa7348c9..150d511c 100644
--- a/collect-library/resources/rendertheme.xsd
+++ b/collect-library/resources/rendertheme.xsd
@@ -257,7 +257,7 @@
         <xs:attribute name="repeat-start" default="30" type="xs:float" use="optional"/>
         <xs:attribute name="rotate" default="true" type="xs:boolean" use="optional"/>
         <!-- 设置是否支持图标压盖，如果为true，则同点位图标不避让，允许压盖，否则支持自动避让 -->
-        <xs:attribute name="gland" default="true" type="xs:boolean" use="optional"/>
+        <xs:attribute name="gland" default="false" type="xs:boolean" use="optional"/>
         <!-- 原图标旋转角度，默认情况下应该使用以X轴为正方向的图标，此处可设置原图标的旋转角度，在渲染时自动对图标进行旋转，仅支持线要素 -->
         <xs:attribute name="degree" default="0" type="xs:float" use="optional"/>
         <!-- 图标在y轴方向上的偏移量 -->
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index ec5cbee9..320145f6 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1556,7 +1556,7 @@
         <!-- 车信 -->
         <m v="OMDB_LANEINFO" >
             <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                src="@symbol" symbol-height="24" degree="90"></symbol>
+                src="@src" symbol-height="24" degree="90"></symbol>
         </m>
         <!-- 杆状物 -->
         <m v="OMDB_POLE">
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
index 49112267..c4b8436f 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
@@ -1,7 +1,6 @@
 package com.navinfo.collect.library.map.source;
 
 import android.os.Build;
-import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
@@ -11,21 +10,17 @@ import com.navinfo.collect.library.utils.GeometryTools;
 import com.navinfo.collect.library.utils.MapParamUtils;
 
 import org.locationtech.jts.geom.Polygon;
-import org.oscim.core.MapPosition;
 import org.oscim.layers.tile.MapTile;
-import org.oscim.map.Map;
 import org.oscim.map.Viewport;
 import org.oscim.tiling.ITileDataSink;
 import org.oscim.tiling.ITileDataSource;
 import org.oscim.tiling.QueryResult;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import io.realm.Realm;
-import io.realm.RealmConfiguration;
 import io.realm.RealmQuery;
 
 public class OMDBTileDataSource implements ITileDataSource {
@@ -129,7 +124,7 @@ public class OMDBTileDataSource implements ITileDataSource {
                 realmQuery.endGroup();
             }
             long time = System.currentTimeMillis();
-            List<RenderEntity> listResult = realmQuery.findAll();
+            List<RenderEntity> listResult = realm.copyFromRealm(realmQuery.findAll());
             long newTime = System.currentTimeMillis() - time;
 
 //            Log.e("jingo", "当前OMDBTileDataSource " + Thread.currentThread().hashCode() + " 当前realm " + realm.hashCode() + " 查询耗时" + newTime + " 条数" + listResult.size());
diff --git a/vtm b/vtm
index ee88167c..3eb80a33 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit ee88167c7de989b3f7c71ae00d9580ff91fd3bf6
+Subproject commit 3eb80a33c6b54609a47083c38fe35fd4916edba9

From 2e0712ed2b208ce31d15a1c1ae1d2c987c7d418d Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Tue, 21 Nov 2023 17:06:24 +0800
Subject: [PATCH 04/16] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=BD=A6?=
 =?UTF-8?q?=E4=BF=A1=E5=AF=BC=E5=85=A5=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/db/ImportPreProcess.kt     | 17 +++++++++++++++--
 .../src/main/assets/editormarker.xml            |  6 ++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

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 41ec9cee..366115a7 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -626,8 +626,19 @@ class ImportPreProcess {
                 // 分别获取两个数组中的数据，取第一个作为主数据，另外两个作为辅助渲染数据
                 val laneInfoDirectArray = JSONArray(laneinfoGroup[0].toString())
                 val laneInfoTypeArray = JSONArray(laneinfoGroup[1].toString())
-                val listResult = mutableListOf<ReferenceEntity>()
 
+                val referenceEntity = ReferenceEntity()
+                referenceEntity.name = "${renderEntity.name}参考方向"
+                referenceEntity.table = renderEntity.table
+                referenceEntity.enable = renderEntity.enable
+                referenceEntity.code = renderEntity.code
+                referenceEntity.taskId = renderEntity.taskId
+                referenceEntity.zoomMin = renderEntity.zoomMin
+                referenceEntity.zoomMax = renderEntity.zoomMax
+                // 与原数据使用相同的geometry
+                referenceEntity.geometry = renderEntity.geometry
+                referenceEntity.properties["qi_table"] = renderEntity.table
+                referenceEntity.properties["symbol"] = "true"
                 for (i in 0 until laneInfoDirectArray.length()) {
                     val currentDirect =
                         laneInfoDirectArray[i].toString().split(",").distinct().joinToString("_")
@@ -637,7 +648,7 @@ class ImportPreProcess {
                         if (currentType == "0") "normal" else if (currentType == "1") "extend" else "bus"
                     val symbol =
                         "assets:omdb/4601/${type}/1301_${currentDirect}.svg"
-                    renderEntity.properties["src"] = if(renderEntity.properties["src"].isNullOrEmpty()) symbol else "${renderEntity.properties["src"]}|${symbol}"
+                    referenceEntity.properties["img-src"] = if(referenceEntity.properties["img-src"].isNullOrEmpty()) symbol else "${referenceEntity.properties["img-src"]}|${symbol}"
 
 //                    // 根据后续的数据生成辅助表数据
 //                    val referenceEntity = ReferenceEntity()
@@ -665,6 +676,8 @@ class ImportPreProcess {
 //                    renderEntity.referenceEntitys?.add(referenceEntity)
                    //listResult.add(referenceEntity)
                 }
+                referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
+                renderEntity.referenceEntitys?.add(referenceEntity)
                 //insertData(listResult)
             }
             //将主表线转化为单个点，按点要素实现捕捉
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 4152c484..548dc8b9 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1555,8 +1555,10 @@
 
         <!-- 车信 -->
         <m v="OMDB_LANEINFO" >
-            <symbol repeat="false" repeat-start="0" repeat-gap="2000"
-                src="@src" symbol-height="24" degree="90"></symbol>
+            <m k="symbol" v="true">
+                <symbol repeat="false" repeat-start="0" repeat-gap="2000"
+                    src="@img-src" symbol-height="24" degree="90"></symbol>
+            </m>
         </m>
         <!-- 杆状物 -->
         <m v="OMDB_POLE">

From 1043946c0b60abce6836631f7d1e48b44628086c Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Wed, 22 Nov 2023 09:54:07 +0800
Subject: [PATCH 05/16] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=86=E7=8A=B6?=
 =?UTF-8?q?=E9=9A=9C=E7=A2=8D=E7=89=A9=E5=9B=BE=E6=A0=87=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/assets/editormarker.xml          |   2 +-
 .../src/main/assets/omdb/icon_4006_0.svg      |  58 ++++++-
 .../main/assets/omdb/icon_pole_barrier.svg    | 148 +++++++-----------
 3 files changed, 118 insertions(+), 90 deletions(-)

diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 9e113d24..5ef8996a 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1987,7 +1987,7 @@
             </m>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true"
-                    src="assets:omdb/icon_arrow_right.svg" symbol-width="24"></symbol>
+                    src="assets:omdb/icon_arrow_right.svg" symbol-width="24" ></symbol>
             </m>
             <m k="type" v="s_2_e">
                 <line use="s2e" />
diff --git a/collect-library/src/main/assets/omdb/icon_4006_0.svg b/collect-library/src/main/assets/omdb/icon_4006_0.svg
index 5b844f39..af94a709 100644
--- a/collect-library/src/main/assets/omdb/icon_4006_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_4006_0.svg
@@ -1 +1,57 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="136" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 136"><defs><linearGradient id="e" x1="-2257" y1="-504.6" x2="-2257" y2="-504.2" gradientTransform="translate(166148.2 45512.3) scale(73.6 90.2)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#5f1508"/><stop offset="1" stop-color="#ef8673"/></linearGradient><radialGradient id="f" cx="-2254" cy="-528.2" fx="-2254" fy="-528.2" r=".9" gradientTransform="translate(122034 131049.2) rotate(38.9) scale(76 48) skewX(8.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ffd587"/><stop offset=".6" stop-color="#ed7b28"/><stop offset="1" stop-color="#a81705"/></radialGradient><radialGradient id="g" cx="-2246.7" cy="-496.6" fx="-2246.7" fy="-496.6" r=".3" gradientTransform="translate(123377.3 27295.5) scale(54.9)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><g id="d"><rect width="70" height="136" style="fill:none; stroke-width:0px;"/><ellipse cx="34.9" cy="68.8" rx="16.5" ry="5.8" style="fill:#ff8a4c; isolation:isolate; opacity:.3; stroke-width:0px;"/><ellipse cx="34.9" cy="68.8" rx="5.8" ry="2.2" style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;"/><path d="m26.4,54.1c-.4-.3-.7-.7-1.1-1-12.6-5.2-18.7-19.6-13.5-32.2,3.9-9.4,13.1-15.5,23.2-15.4,13.7-.1,24.8,10.7,25,24.4.1,10.2-6.1,19.4-15.6,23.3-.3.3-.5.6-.9,1-3.4,3.8-6.1,8-8.2,12.6,0,0-3.6-7.6-8.9-12.6Z" style="fill:url(#e); stroke-width:0px;"/><path d="m26.8,56.1l-1-1c-9-4.1-14.7-13-14.6-22.8,0-13.7,10.6-24.8,23.7-24.8s23.7,11.1,23.7,24.8-6.1,19.2-14.8,22.9c-.3.3-.5.6-.8,1-3.2,3.8-5.8,8.1-7.8,12.6,0,0-3.4-7.6-8.4-12.6h0Z" style="fill:url(#f); stroke-width:0px;"/><circle cx="34.7" cy="31.3" r="18.7" style="fill:url(#g); stroke-width:0px;"/><path d="m20.9,15.4c-.3,0-.5-.2-.5-.4,0-.2,0-.5.1-.6,1.2-1.2,2.6-2,4.1-2.7h.5c.1,0,.3.2.3.3.1.3,0,.7-.3.8-1.4.5-2.6,1.4-3.7,2.4-.1.1-.3.2-.5.1h0Zm-1.6,1.8c-.1,0-.2,0-.3-.1-.1,0-.2-.3-.3-.4,0-.1,0-.3.1-.5l.3-.3c.1-.1.3-.2.4-.2s.3,0,.5.1c.1,0,.2.3.3.4,0,.1,0,.3-.1.5l-.3.3c-.1.2-.3.3-.5.3" style="fill:#fff; stroke-width:0px;"/><path d="m34.4,49.3c-2.4,0-4.8-.5-7-1.4-2.2-.9-4.1-2.2-5.7-3.9s-2.9-3.6-3.9-5.7c-1-2.2-1.4-4.6-1.4-7s.5-4.8,1.4-7c.9-2.2,2.2-4.1,3.9-5.7,1.7-1.6,3.6-2.9,5.7-3.9,2.2-1,4.6-1.4,7-1.4s4.8.5,7,1.4c2.2.9,4.1,2.2,5.7,3.9s2.9,3.6,3.9,5.7c1,2.2,1.4,4.6,1.4,7s-.5,4.8-1.4,7c-.9,2.2-2.2,4.1-3.9,5.7s-3.6,2.9-5.7,3.9c-2.2,1-4.6,1.4-7,1.4Z" style="fill:#272727; stroke-width:0px;"/><path d="m34.4,14.3c-2.3,0-4.6.5-6.6,1.4s-3.9,2.1-5.4,3.7c-1.6,1.6-2.8,3.4-3.7,5.4-.9,2.1-1.4,4.4-1.4,6.6s.5,4.6,1.4,6.6,2.1,3.9,3.7,5.4c1.6,1.6,3.4,2.8,5.4,3.7,2.1.9,4.4,1.4,6.6,1.4s4.6-.5,6.6-1.4,3.9-2.1,5.4-3.7c1.6-1.6,2.8-3.4,3.7-5.4.9-2.1,1.4-4.4,1.4-6.6s-.5-4.6-1.4-6.6-2.1-3.9-3.7-5.4c-1.6-1.6-3.4-2.8-5.4-3.7-2.1-.9-4.4-1.4-6.6-1.4m0-2c10.5,0,19,8.5,19,19s-8.5,19-19,19-19-8.5-19-19,8.5-19,19-19Z" style="fill:#db4646; stroke-width:0px;"/><g style="isolation:isolate;"><text transform="translate(24.9 36.7)" style="fill:#fff; font-family:PingFangSC-Regular-GBpc-EUC-H, &apos;PingFang SC&apos;; font-size:19px; isolation:isolate;"><tspan x="0" y="0">限</tspan></text></g></g></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="136"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 136">
+    <defs>
+        <linearGradient id="e" x1="-2257" y1="-504.6" x2="-2257" y2="-504.2"
+            gradientTransform="translate(166148.2 45512.3) scale(73.6 90.2)"
+            gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#5f1508" />
+            <stop offset="1" stop-color="#ef8673" />
+        </linearGradient>
+        <radialGradient id="f" cx="-2254" cy="-528.2" fx="-2254" fy="-528.2" r=".9"
+            gradientTransform="translate(122034 131049.2) rotate(38.9) scale(76 48) skewX(8.4)"
+            gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#ffd587" />
+            <stop offset=".6" stop-color="#ed7b28" />
+            <stop offset="1" stop-color="#a81705" />
+        </radialGradient>
+        <radialGradient id="g" cx="-2246.7" cy="-496.6" fx="-2246.7" fy="-496.6" r=".3"
+            gradientTransform="translate(123377.3 27295.5) scale(54.9)"
+            gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#e75545" />
+            <stop offset=".8" stop-color="#c4483b" />
+            <stop offset="1" stop-color="#983b31" />
+        </radialGradient>
+    </defs>
+    <g id="c">
+        <g id="d">
+            <rect width="70" height="136" style="fill:none; stroke-width:0px;" />
+            <ellipse cx="34.9" cy="68.8" rx="16.5" ry="5.8"
+                style="fill:#ff8a4c; isolation:isolate; opacity:.3; stroke-width:0px;" />
+            <ellipse cx="34.9" cy="68.8" rx="5.8" ry="2.2"
+                style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;" />
+            <path
+                d="m26.4,54.1c-.4-.3-.7-.7-1.1-1-12.6-5.2-18.7-19.6-13.5-32.2,3.9-9.4,13.1-15.5,23.2-15.4,13.7-.1,24.8,10.7,25,24.4.1,10.2-6.1,19.4-15.6,23.3-.3.3-.5.6-.9,1-3.4,3.8-6.1,8-8.2,12.6,0,0-3.6-7.6-8.9-12.6Z"
+                style="fill:url(#e); stroke-width:0px;" />
+            <path
+                d="m26.8,56.1l-1-1c-9-4.1-14.7-13-14.6-22.8,0-13.7,10.6-24.8,23.7-24.8s23.7,11.1,23.7,24.8-6.1,19.2-14.8,22.9c-.3.3-.5.6-.8,1-3.2,3.8-5.8,8.1-7.8,12.6,0,0-3.4-7.6-8.4-12.6h0Z"
+                style="fill:url(#f); stroke-width:0px;" />
+            <circle cx="34.7" cy="31.3" r="18.7" style="fill:url(#g); stroke-width:0px;" />
+            <path
+                d="m20.9,15.4c-.3,0-.5-.2-.5-.4,0-.2,0-.5.1-.6,1.2-1.2,2.6-2,4.1-2.7h.5c.1,0,.3.2.3.3.1.3,0,.7-.3.8-1.4.5-2.6,1.4-3.7,2.4-.1.1-.3.2-.5.1h0Zm-1.6,1.8c-.1,0-.2,0-.3-.1-.1,0-.2-.3-.3-.4,0-.1,0-.3.1-.5l.3-.3c.1-.1.3-.2.4-.2s.3,0,.5.1c.1,0,.2.3.3.4,0,.1,0,.3-.1.5l-.3.3c-.1.2-.3.3-.5.3"
+                style="fill:#fff; stroke-width:0px;" />
+            <path
+                d="m34.4,49.3c-2.4,0-4.8-.5-7-1.4-2.2-.9-4.1-2.2-5.7-3.9s-2.9-3.6-3.9-5.7c-1-2.2-1.4-4.6-1.4-7s.5-4.8,1.4-7c.9-2.2,2.2-4.1,3.9-5.7,1.7-1.6,3.6-2.9,5.7-3.9,2.2-1,4.6-1.4,7-1.4s4.8.5,7,1.4c2.2.9,4.1,2.2,5.7,3.9s2.9,3.6,3.9,5.7c1,2.2,1.4,4.6,1.4,7s-.5,4.8-1.4,7c-.9,2.2-2.2,4.1-3.9,5.7s-3.6,2.9-5.7,3.9c-2.2,1-4.6,1.4-7,1.4Z"
+                style="fill:#272727; stroke-width:0px;" />
+            <path
+                d="m34.4,14.3c-2.3,0-4.6.5-6.6,1.4s-3.9,2.1-5.4,3.7c-1.6,1.6-2.8,3.4-3.7,5.4-.9,2.1-1.4,4.4-1.4,6.6s.5,4.6,1.4,6.6,2.1,3.9,3.7,5.4c1.6,1.6,3.4,2.8,5.4,3.7,2.1.9,4.4,1.4,6.6,1.4s4.6-.5,6.6-1.4,3.9-2.1,5.4-3.7c1.6-1.6,2.8-3.4,3.7-5.4.9-2.1,1.4-4.4,1.4-6.6s-.5-4.6-1.4-6.6-2.1-3.9-3.7-5.4c-1.6-1.6-3.4-2.8-5.4-3.7-2.1-.9-4.4-1.4-6.6-1.4m0-2c10.5,0,19,8.5,19,19s-8.5,19-19,19-19-8.5-19-19,8.5-19,19-19Z"
+                style="fill:#db4646; stroke-width:0px;" />
+            <g style="isolation:isolate;">
+                <text transform="translate(24.9 36.7)"
+                    style="fill:#fff; font-family:PingFangSC-Regular-GBpc-EUC-H, &apos;PingFang SC&apos;; font-size:19px; isolation:isolate;">
+                    <tspan x="0" y="0">限</tspan>
+                </text>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_pole_barrier.svg b/collect-library/src/main/assets/omdb/icon_pole_barrier.svg
index f57358c0..205cd84f 100644
--- a/collect-library/src/main/assets/omdb/icon_pole_barrier.svg
+++ b/collect-library/src/main/assets/omdb/icon_pole_barrier.svg
@@ -1,92 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 124">
-  <defs>
-    <style>
-      .cls-1 {
-        fill: #aa211a;
-        mix-blend-mode: multiply;
-      }
-
-      .cls-1, .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8, .cls-9 {
-        stroke-width: 0px;
-      }
-
-      .cls-2 {
-        fill: none;
-        opacity: 0;
-      }
-
-      .cls-10 {
-        isolation: isolate;
-      }
-
-      .cls-3 {
-        fill: url(#_铃琨眄沭噤桢眚_3);
-      }
-
-      .cls-4 {
-        fill: #721715;
-      }
-
-      .cls-5 {
-        fill: #d24f00;
-      }
-
-      .cls-6 {
-        fill: #dd2824;
-      }
-
-      .cls-7 {
-        fill: #bc1919;
-      }
-
-      .cls-8 {
-        fill: #ffe2d6;
-      }
-
-      .cls-9 {
-        fill: #ff4545;
-      }
-    </style>
-    <linearGradient id="_铃琨眄沭噤桢眚_3" data-name="铃琨眄沭噤桢眚 3" x1="-3198.91" y1="65.71" x2="-3176.55" y2="65.71" gradientTransform="translate(-3173.67) rotate(-180) scale(1 -1)" gradientUnits="userSpaceOnUse">
-      <stop offset="0" stop-color="#d87a1e"/>
-      <stop offset=".21" stop-color="#d87a1e"/>
-      <stop offset=".21" stop-color="#c4660a"/>
-      <stop offset=".79" stop-color="#9f3e00"/>
-      <stop offset=".79" stop-color="#913300"/>
-      <stop offset="1" stop-color="#9d3f00"/>
-    </linearGradient>
-  </defs>
-  <g class="cls-10">
-    <g id="_图层_2" data-name="图层 2">
-      <g id="_图层_1-2" data-name="图层 1">
-        <rect class="cls-2" width="28" height="124"/>
-        <g>
-          <g>
-            <path class="cls-3" d="m2.88,64.12v-1.9l22.36-.58v1.32c-.02,1.74-1.12,3.48-3.3,4.81-4.38,2.67-11.46,2.69-15.81.03-2.18-1.33-3.27-3.09-3.25-4.84v1.16Z"/>
-            <path class="cls-6" d="m6.13,67.06c4.35,2.66,11.43,2.64,15.81-.03,4.38-2.67,4.4-7,.05-9.66-4.35-2.66-11.43-2.64-15.81.03-4.38,2.67-4.4,7-.05,9.66Z"/>
-          </g>
-          <g>
-            <path class="cls-5" d="m7.52,54.02l3.57-32.53-3.62,32c0,.18.02.35.06.53Z"/>
-            <path class="cls-5" d="m6.99,58.87c-.04-.09-.07-.19-.1-.28l-.42,3.75s.08.09.13.14l.39-3.6Z"/>
-            <path class="cls-1" d="m10.41,21.64s-4.45,38.19-4.45,38.52c0,.8.1,1.33.3,1.97,0,0,.07.08.19.21l.42-3.75.58-5.09,3.62-32-.68.15Z"/>
-            <path class="cls-6" d="m14.8,62.49l-.08-4.63-.63-35.83h-1.41l-1.63,35.39-.21,4.61-.14,3.13c1.2.47,2.6.78,4.17.7l-.06-3.37Z"/>
-            <path class="cls-7" d="m11.09,21.49l-3.57,32.53-.53,4.85-.39,3.6c.61.61,2.04,1.9,4.09,2.71l.14-3.13.21-4.61,1.63-35.39-1.59-.55Z"/>
-            <path class="cls-5" d="m7.52,54.02c-.03-.18-.05-.35-.06-.53l-.58,5.09c.03.09.06.19.1.28l.53-4.85Z"/>
-            <path class="cls-7" d="m17.6,21.86l-.77.18,3.66,31.62.57,4.92.53,4.59c.31-.97.43-2.01.43-3.01l-4.42-38.29Z"/>
-            <path class="cls-9" d="m21.06,58.58l-.57-4.92-3.66-31.62h-2.75l.63,35.83.08,4.63.06,3.37c2-.11,4.28-.85,6.73-2.7l-.53-4.59Z"/>
-          </g>
-          <g>
-            <path class="cls-4" d="m16.56,23.23c-1.4.86-3.69.85-5.1,0-1.41-.86-1.42-2.26-.02-3.11,1.4-.86,3.69-.85,5.1,0,1.41.86,1.42,2.26.02,3.11Z"/>
-            <path class="cls-4" d="m16.3,23.12c-1.34.82-3.52.81-4.86,0-1.35-.82-1.35-2.15-.02-2.97,1.34-.82,3.52-.81,4.86,0,1.35.82,1.35,2.15.02,2.97Z"/>
-          </g>
-          <g>
-            <path class="cls-8" d="m19.24,52.34c-3.2,2.75-8.04,2.48-10.81-.59-.59-.66-1.04-1.39-1.35-2.16-.26,2.29-.5,4.35-.69,5.99.33,1.07.89,2.1,1.71,3,3,3.33,8.17,3.76,11.55.98.91-.75,1.59-1.66,2.04-2.64l-.77-6.65c-.42.76-.98,1.47-1.68,2.08Z"/>
-            <path class="cls-8" d="m19.34,47.54c.43-.36.8-.76,1.12-1.19l-.75-6.53c-.23.27-.48.54-.75.78-3.02,2.64-7.59,2.39-10.21-.57-.18-.2-.34-.41-.49-.63-.23,2.01-.47,4.04-.69,5.99.25.42.54.83.88,1.21,2.83,3.2,7.72,3.62,10.91.94Z"/>
-            <path class="cls-8" d="m19.18,35.21l-.68-5.9c-2.74,1.8-6.51,1.69-9.05-.22-.2,1.69-.41,3.56-.64,5.51,2.82,2.45,7.32,2.73,10.37.6Z"/>
-          </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="28" height="124"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 28 124">
+    <defs>
+        <linearGradient id="d" x1="2056" y1="65.7" x2="2078.3" y2="65.7"
+            gradientTransform="translate(2081.2) rotate(-180) scale(1 -1)"
+            gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#d87a1e" />
+            <stop offset=".2" stop-color="#d87a1e" />
+            <stop offset=".2" stop-color="#c4660a" />
+            <stop offset=".8" stop-color="#9f3e00" />
+            <stop offset=".8" stop-color="#913300" />
+            <stop offset="1" stop-color="#9d3f00" />
+        </linearGradient>
+    </defs>
+    <g style="isolation:isolate;">
+        <g id="b">
+            <g id="c">
+                <rect width="28" height="124" style="fill:none; opacity:0; stroke-width:0px;" />
+                <path
+                    d="m2.9,62.2l22.4-.6v1.3c0,1.7-1.1,3.5-3.3,4.8-4.4,2.7-11.5,2.7-15.8,0-2.2-1.3-3.3-3.1-3.2-4.8"
+                    style="fill:url(#d); stroke-width:0px;" />
+                <path
+                    d="m6.1,67.1c4.4,2.7,11.4,2.6,15.8,0,4.4-2.7,4.4-7,0-9.7-4.4-2.7-11.4-2.6-15.8,0-4.4,2.7-4.4,7,0,9.7Z"
+                    style="fill:#dd2824; stroke-width:0px;" />
+                <path d="m7.5,54l3.6-32.5-3.6,32c0,.2,0,.4,0,.5Z"
+                    style="fill:#aa211a; mix-blend-mode:multiply; stroke-width:0px;" />
+                <path d="m7,58.9c0,0,0-.2-.1-.3l-.4,3.7s0,0,.1.1l.4-3.6Z"
+                    style="fill:#aa211a; mix-blend-mode:multiply; stroke-width:0px;" />
+                <path
+                    d="m10.4,21.6s-4.4,38.2-4.4,38.5c0,.8.1,1.3.3,2,0,0,0,0,.2.2l.4-3.7.6-5.1,3.6-32h-.7Z"
+                    style="fill:#aa211a; mix-blend-mode:multiply; stroke-width:0px;" />
+                <path
+                    d="m14.8,62.5v-4.6c0,0-.7-35.8-.7-35.8h-1.4l-1.6,35.4-.2,4.6v3.1c1.1.5,2.5.8,4,.7v-3.4Z"
+                    style="fill:#dd2824; stroke-width:0px;" />
+                <path
+                    d="m11.1,21.5l-3.6,32.5-.5,4.8-.4,3.6c.6.6,2,1.9,4.1,2.7v-3.1c.1,0,.4-4.6.4-4.6l1.6-35.4-1.6-.5Z"
+                    style="fill:#bc1919; stroke-width:0px;" />
+                <path d="m7.5,54c0-.2,0-.4,0-.5l-.6,5.1c0,0,0,.2.1.3l.5-4.8Z"
+                    style="fill:#aa211a; mix-blend-mode:multiply; stroke-width:0px;" />
+                <path d="m17.6,21.9l-.8.2,3.7,31.6.6,4.9.5,4.6c.3-1,.4-2,.4-3l-4.4-38.3Z"
+                    style="fill:#bc1919; stroke-width:0px;" />
+                <path
+                    d="m21.1,58.6l-.6-4.9-3.7-31.6h-2.7l.6,35.8v4.6c0,0,.1,3.4.1,3.4,2-.1,4.3-.8,6.7-2.7l-.5-4.6Z"
+                    style="fill:#ff4545; stroke-width:0px;" />
+                <path
+                    d="m16.6,23.2c-1.4.9-3.7.9-5.1,0-1.4-.9-1.4-2.3,0-3.1,1.4-.9,3.7-.9,5.1,0,1.4.9,1.4,2.3,0,3.1Z"
+                    style="fill:#721715; stroke-width:0px;" />
+                <path
+                    d="m16.3,23.1c-1.3.8-3.5.8-4.9,0-1.3-.8-1.4-2.2,0-3,1.3-.8,3.5-.8,4.9,0,1.3.8,1.4,2.2,0,3Z"
+                    style="fill:#891515; stroke-width:0px;" />
+                <path
+                    d="m19.2,52.3c-3.2,2.7-8,2.5-10.8-.6-.6-.7-1-1.4-1.3-2.2-.3,2.3-.5,4.3-.7,6,.3,1.1.9,2.1,1.7,3,3,3.3,8.2,3.8,11.5,1,.9-.7,1.6-1.7,2-2.6l-.8-6.6c-.4.8-1,1.5-1.7,2.1Z"
+                    style="fill:#ffe2d6; stroke-width:0px;" />
+                <path
+                    d="m19.3,47.5c.4-.4.8-.8,1.1-1.2l-.8-6.5c-.2.3-.5.5-.8.8-3,2.6-7.6,2.4-10.2-.6-.2-.2-.3-.4-.5-.6-.2,2-.5,4-.7,6,.2.4.5.8.9,1.2,2.8,3.2,7.7,3.6,10.9.9Z"
+                    style="fill:#ffe2d6; stroke-width:0px;" />
+                <path
+                    d="m19.2,35.2l-.7-5.9c-2.7,1.8-6.5,1.7-9-.2-.2,1.7-.4,3.6-.6,5.5,2.8,2.5,7.3,2.7,10.4.6Z"
+                    style="fill:#ffe2d6; stroke-width:0px;" />
+            </g>
         </g>
-      </g>
     </g>
-  </g>
 </svg>
\ No newline at end of file

From 231d7c429d62e54c11acce062a03219ecc511632 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 24 Nov 2023 09:26:35 +0800
Subject: [PATCH 06/16] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          |  53 ++-
 .../com/navinfo/omqs/db/ImportPreProcess.kt   | 249 ++++++++----
 .../main/res/menu/personal_center_menu.xml    |   2 +-
 .../src/main/assets/editormarker.xml          |  39 +-
 .../src/main/assets/omdb/icon_2013_4.svg      | 137 ++++---
 .../src/main/assets/omdb/icon_2013_5.svg      |  43 +++
 .../src/main/assets/omdb/icon_2070_0.svg      | 353 ++++++++++++++++++
 .../src/main/assets/omdb/icon_2071_0.jpg      | Bin 0 -> 25228 bytes
 .../src/main/assets/omdb/icon_2071_0.svg      |   1 +
 .../src/main/assets/omdb/icon_2071_1.png      | Bin 0 -> 136 bytes
 .../src/main/assets/omdb/icon_2071_1.svg      |   1 +
 .../src/main/assets/omdb/icon_2071_2.png      | Bin 0 -> 128 bytes
 .../src/main/assets/omdb/icon_2071_2.svg      |   1 +
 .../src/main/assets/omdb/icon_4002_0.svg      |  34 +-
 .../src/main/assets/omdb/icon_4002_1.svg      |  42 +--
 .../src/main/assets/omdb/icon_4003_0.svg      |  40 +-
 .../src/main/assets/omdb/icon_4003_1.svg      |  48 +--
 .../src/main/assets/omdb/icon_4004_0.svg      |  36 +-
 .../assets/omdb/icon_arrow_right_bottom.svg   |  18 +
 .../collect/library/enums/DataCodeEnum.kt     |   2 +
 .../library/map/source/OMDBDataDecoder.java   |   4 +-
 vtm                                           |   2 +-
 22 files changed, 754 insertions(+), 351 deletions(-)
 create mode 100644 collect-library/src/main/assets/omdb/icon_2013_5.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_2070_0.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_2071_0.jpg
 create mode 100644 collect-library/src/main/assets/omdb/icon_2071_0.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_2071_1.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_2071_1.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_2071_2.png
 create mode 100644 collect-library/src/main/assets/omdb/icon_2071_2.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_arrow_right_bottom.svg

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 95339a0a..e7960171 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -101,7 +101,7 @@
         "code": 2017,
         "name": "道路施工",
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 15,
         "zoomMax": 17
       },
@@ -166,11 +166,38 @@
         "zoomMin": 15,
         "zoomMax": 17
       },
+      "2070": {
+        "table": "OMDB_LINK_SEPARATION",
+        "code": 2070,
+        "name": "设施分离",
+        "zoomMin": 18,
+        "zoomMax": 20,
+        "filterData": true,
+        "catch": true
+      },
+      "2071": {
+        "table": "OMDB_LINK_MEDIAN",
+        "code": 2071,
+        "name": "中央隔离带",
+        "zoomMin": 18,
+        "zoomMax": 20,
+        "isDependOnOtherTable": true,
+        "filterData": true,
+        "catch": true,
+        "transformer": [
+          {
+            "k": "geometry",
+            "v": "~",
+            "klib": "geometry",
+            "vlib": "generateLinkMedianToPolygon()"
+          }
+        ]
+      },
       "2083": {
         "table": "OMDB_RDBOUND_BOUNDARYTYPE",
         "code": 2083,
         "name": "道路边界类型",
-        "checkLinkId": false,
+        "checkLinkId": true,
         "filterData": true,
         "zoomMin": 18,
         "zoomMax": 20,
@@ -263,7 +290,7 @@
         "zoomMax": 20,
         "catch": true,
         "filterData": false,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "transformer": [
           {
             "k": "geometry",
@@ -280,7 +307,7 @@
         "zoomMin": 15,
         "zoomMax": 20,
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "transformer": [
           {
             "k": "geometry",
@@ -297,14 +324,14 @@
         "zoomMin": 18,
         "zoomMax": 20,
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "transformer": []
       },
       "3003": {
         "table": "OMDB_OBJECT_SYMBOL",
         "code": 3003,
         "name": "符号",
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 18,
         "zoomMax": 20,
         "catch": true,
@@ -314,7 +341,7 @@
         "table": "OMDB_OBJECT_ARROW",
         "code": 3004,
         "name": "箭头",
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 18,
         "zoomMax": 20,
         "catch": true,
@@ -367,7 +394,7 @@
         "code": 3012,
         "name": "导流区",
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 18,
         "zoomMax": 20
       },
@@ -376,7 +403,7 @@
         "code": 3014,
         "name": "人行横道",
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 18,
         "zoomMax": 20
       },
@@ -384,7 +411,7 @@
         "table": "OMDB_OBJECT_STOPLOCATION",
         "code": 3016,
         "name": "停止位置",
-        "checkLinkId": false,
+        "checkLinkId": true,
         "filterData": true,
         "zoomMin": 18,
         "catch": true,
@@ -395,7 +422,7 @@
         "code": 3027,
         "name": "路口内交通岛",
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 18,
         "zoomMax": 20
       },
@@ -630,7 +657,7 @@
         "zoomMax": 20,
         "filterData": true,
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "transformer": [
           {
             "k": "geometry",
@@ -695,7 +722,7 @@
         "name": "车道中心线",
         "catch": false,
         "isDependOnOtherTable": false,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 18,
         "zoomMax": 20,
         "transformer": [
diff --git a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
index cce06421..6537bf27 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -194,7 +194,8 @@ class ImportPreProcess {
         val coord = Coordinate(point.getX() - dx, point.getY() - dy)
 
         // 将这个点记录在数据中
-        val geometryTranslate: Geometry = GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y))
+        val geometryTranslate: Geometry =
+            GeometryTools.createGeometry(doubleArrayOf(coord.x, coord.y))
 
         renderEntity.geometry = geometryTranslate.toString()
     }
@@ -237,7 +238,8 @@ class ImportPreProcess {
             GeometryTools.createLineString(arrayOf<Coordinate>(pointStart, pointEnd)).toString()
         startEndReference.properties["qi_table"] = renderEntity.table
         startEndReference.properties["type"] = "s_2_e"
-        startEndReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(startEndReference.properties))
+        startEndReference.propertiesDb =
+            DeflaterUtil.zipString(JSON.toJSONString(startEndReference.properties))
         renderEntity.referenceEntitys.add(startEndReference)
     }
 
@@ -281,7 +283,8 @@ class ImportPreProcess {
             startReference.geometry =
                 GeometryTools.createGeometry(GeoPoint(pointStart.y, pointStart.x)).toString()
             startReference.properties["qi_table"] = renderEntity.table
-            startReference.properties["type"] = "s${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000)>0) "_dec" else "_acc"}"
+            startReference.properties["type"] =
+                "s${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}"
             startReference.properties["geometry"] = startReference.geometry
             listResult.add(startReference)
 
@@ -299,7 +302,8 @@ class ImportPreProcess {
             endReference.geometry =
                 GeometryTools.createGeometry(GeoPoint(pointEnd.y, pointEnd.x)).toString()
             endReference.properties["qi_table"] = renderEntity.table
-            endReference.properties["type"] = "e${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000)>0) "_dec" else "_acc"}"
+            endReference.properties["type"] =
+                "e${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}"
             endReference.properties["geometry"] = endReference.geometry
             renderEntity.referenceEntitys.add(endReference)
             //listResult.add(endReference)
@@ -351,7 +355,8 @@ class ImportPreProcess {
         Log.e("qj", "generateS2EReferencePoint===${startReference.geometry}")
 
         startReference.properties["geometry"] = startReference.geometry
-        startReference.propertiesDb =  DeflaterUtil.zipString(JSON.toJSONString(startReference.properties))
+        startReference.propertiesDb =
+            DeflaterUtil.zipString(JSON.toJSONString(startReference.properties))
         listResult.add(startReference)
 
         Log.e("qj", "generateS2EReferencePoint===1")
@@ -385,7 +390,8 @@ class ImportPreProcess {
             Log.e("qj", "generateS2EReferencePoint===e_2_p${renderEntity.name}")
         }
         endReference.properties["geometry"] = endReference.geometry
-        endReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(endReference.properties))
+        endReference.propertiesDb =
+            DeflaterUtil.zipString(JSON.toJSONString(endReference.properties))
         renderEntity.referenceEntitys.add(endReference)
         Log.e("qj", "generateS2EReferencePoint===4")
     }
@@ -482,7 +488,8 @@ class ImportPreProcess {
                 WKTWriter(3).write(GeometryTools.createLineString(arrayOf(pointStart, coorEnd)))
             angleReference.properties["qi_table"] = renderEntity.table
             angleReference.properties["type"] = "angle"
-            angleReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
+            angleReference.propertiesDb =
+                DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
             renderEntity.referenceEntitys.add(angleReference)
         }
         Log.e("qj", "generateDirectReferenceLine===1")
@@ -598,21 +605,21 @@ class ImportPreProcess {
                     if (listResult.size > 0) {
                         insertData(listResult)
                     }
-                }else if(boundaryType.toInt() == 9){//根据线型平分为点数据，用于渲染3D标
+                } else if (boundaryType.toInt() == 9) {//根据线型平分为点数据，用于渲染3D标
                     dengfenLineString(renderEntity)
                 }
             }
         }
     }
 
-    fun dengfenLineString(renderEntity: RenderEntity){
-        if (renderEntity.code == DataCodeEnum.OMDB_LANE_MARK_BOUNDARYTYPE.code||renderEntity.code == DataCodeEnum.OMDB_RDBOUND_BOUNDARYTYPE.code){
+    fun dengfenLineString(renderEntity: RenderEntity) {
+        if (renderEntity.code == DataCodeEnum.OMDB_LANE_MARK_BOUNDARYTYPE.code || renderEntity.code == DataCodeEnum.OMDB_RDBOUND_BOUNDARYTYPE.code) {
             val boundaryType = renderEntity.properties["boundaryType"]
             if (boundaryType != null) {
-                if(boundaryType.toInt()==9){
-                    Log.e("qj","杆状物转换开始")
-                    val geopointList = GeometryTools.getLineToDengGeoPints(renderEntity.wkt,5.0)
-                    geopointList.forEach{
+                if (boundaryType.toInt() == 9) {
+                    Log.e("qj", "杆状物转换开始")
+                    val geopointList = GeometryTools.getLineToDengGeoPints(renderEntity.wkt, 5.0)
+                    geopointList.forEach {
                         val referenceEntity = ReferenceEntity()
                         referenceEntity.name = "${renderEntity.name}线转点坐标"
                         referenceEntity.table = renderEntity.table
@@ -625,10 +632,11 @@ class ImportPreProcess {
                         referenceEntity.zoomMax = renderEntity.zoomMax
                         referenceEntity.taskId = renderEntity.taskId
                         referenceEntity.enable = renderEntity.enable
-                        referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
+                        referenceEntity.propertiesDb =
+                            DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
                         renderEntity.referenceEntitys.add(referenceEntity)
                     }
-                    Log.e("qj","杆状物转换结束")
+                    Log.e("qj", "杆状物转换结束")
                 }
             }
         }
@@ -673,7 +681,8 @@ class ImportPreProcess {
                     referenceEntity.properties["symbol"] =
                         "assets:omdb/4601/${type}/1301_${referenceEntity.properties["currentDirect"]}.svg"
                     Log.d("unpackingLaneInfo", referenceEntity.properties["symbol"].toString())
-                    referenceEntity.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
+                    referenceEntity.propertiesDb =
+                        DeflaterUtil.zipString(JSON.toJSONString(referenceEntity.properties))
                     renderEntity.referenceEntitys.add(referenceEntity)
                     Log.e("qj", "车信===插入车信箭头")
                 }
@@ -681,9 +690,10 @@ class ImportPreProcess {
             //将主表线转化为单个点，按点要素实现捕捉
             if (Geometry.TYPENAME_LINESTRING == renderEntity.wkt?.geometryType) {
                 var coordinates = renderEntity.wkt?.coordinates
-                if(coordinates!=null){
+                if (coordinates != null) {
                     val p1: Coordinate = coordinates[0]
-                    renderEntity.geometry = GeometryTools.createGeometry(GeoPoint(p1.y,p1.x)).toString()
+                    renderEntity.geometry =
+                        GeometryTools.createGeometry(GeoPoint(p1.y, p1.x)).toString()
                 }
             }
 
@@ -775,30 +785,79 @@ class ImportPreProcess {
      * 生成车道中心线面宽度
      * */
     fun generateAddWidthLine(renderEntity: RenderEntity) {
-        var newTime = 0L
         // 添加车道中心面渲染原则，根据车道宽度进行渲染
         val angleReference = ReferenceEntity()
-       // angleReference.renderEntityId = renderEntity.id
         angleReference.name = "${renderEntity.name}车道中线面"
         angleReference.table = renderEntity.table
         angleReference.code = renderEntity.code
-//        Log.e("jingo", "几何转换开始")
-        //angleReference.geometry = renderEntity.geometry
-        angleReference.geometry = GeometryTools.computeLine(0.000035,0.000035,renderEntity.geometry)
-//        Log.e("jingo", "几何转换结束")
+        angleReference.geometry =
+            GeometryTools.computeLine(0.000035, 0.000035, renderEntity.geometry)
         angleReference.properties["qi_table"] = renderEntity.table
         angleReference.properties["widthProperties"] = "3"
         angleReference.zoomMin = renderEntity.zoomMin
         angleReference.zoomMax = renderEntity.zoomMax
         angleReference.taskId = renderEntity.taskId
         angleReference.enable = renderEntity.enable
-        val listResult = mutableListOf<ReferenceEntity>()
-        angleReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
+        angleReference.propertiesDb =
+            DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
         renderEntity.referenceEntitys.add(angleReference)
-        //listResult.add(angleReference)
-        //insertData(listResult)
     }
 
+    /**
+     * 中央隔离带根据线几何生成面
+     * */
+    fun generateLinkMedianToPolygon(renderEntity: RenderEntity) {
+        if (renderEntity.code == DataCodeEnum.OMDB_LINK_MEDIAN.code) {
+            if (renderEntity.properties.containsKey("side") && renderEntity.properties.containsKey("median") && renderEntity.properties.containsKey(
+                    "medianSurface"
+                ) && renderEntity.properties.containsKey("medianWidth")&& renderEntity.properties.containsKey("direct")
+            ) {
+                //基于通行方向左右 0 左侧 1 右侧 （双方向不制作）
+                val side = renderEntity.properties["side"]
+                //1有中央隔离带，不与任何护栏共存 2有中央隔离带，与非固定护栏共存
+                val median = renderEntity.properties["median"]?.toInt()
+                //0 未铺设 1 铺设  2 混合
+                var medianSurface = renderEntity.properties["medianSurface"]?.toInt()
+                if(median==2){
+                    medianSurface = 3 + medianSurface!!
+                }
+                //宽度
+                val medianWidth = renderEntity.properties["medianWidth"]?.toDouble()
+                // 添加车道中心面渲染原则，根据车道宽度进行渲染
+                val angleReference = ReferenceEntity()
+                //方向 0\1\2顺方向 3逆方向
+                when(renderEntity.properties["direct"]?.toInt()){
+                    0,1,2->{
+                        if (medianWidth != null) {
+                            angleReference.geometry =
+                                GeometryTools.computeLine(medianWidth/100000000, 0.0, renderEntity.geometry)
+                            Log.e("qj","width==${medianWidth/100000000}")
+                        }
+                    }
+                    3->{
+                        if (medianWidth != null) {
+                            angleReference.geometry =
+                                GeometryTools.computeLine(0.0, medianWidth/100000000, renderEntity.geometry)
+                            Log.e("qj","width==${medianWidth/100000000}")
+                        }
+                    }
+                }
+                angleReference.name = "${renderEntity.name}面"
+                angleReference.table = renderEntity.table
+                angleReference.code = renderEntity.code
+                angleReference.properties["qi_table"] = renderEntity.table
+                angleReference.properties["medianSurface"] = medianSurface.toString()
+                angleReference.zoomMin = renderEntity.zoomMin
+                angleReference.zoomMax = renderEntity.zoomMax
+                angleReference.taskId = renderEntity.taskId
+                angleReference.enable = renderEntity.enable
+                angleReference.propertiesDb =
+                    DeflaterUtil.zipString(JSON.toJSONString(angleReference.properties))
+                renderEntity.referenceEntitys.add(angleReference)
+            }
+
+        }
+    }
 
     /**
      * 生成默认路口数据的参考数据
@@ -825,7 +884,8 @@ class ImportPreProcess {
                     GeometryTools.createGeometry(nodeJSONObject["geometry"].toString()).toString()
                 intersectionReference.properties["qi_table"] = renderEntity.table
                 intersectionReference.properties["type"] = "node"
-                intersectionReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(intersectionReference.properties))
+                intersectionReference.propertiesDb =
+                    DeflaterUtil.zipString(JSON.toJSONString(intersectionReference.properties))
                 renderEntity.referenceEntitys.add(intersectionReference)
                 //listResult.add(intersectionReference)
             }
@@ -838,13 +898,13 @@ class ImportPreProcess {
      * */
     fun sortGeometry(renderEntity: RenderEntity) {
         // 路口数据的其他点位，是保存在nodeList对应的数组下
-/*        if (renderEntity.properties.containsKey("linkPid")) {
-            val linkList = renderEntity.properties["linkPid"]?.split(",")
-            //几何较少时需要判断是否要计算判断长短边
-            if(linkList!=null&&linkList.size<3){
+        /*        if (renderEntity.properties.containsKey("linkPid")) {
+                    val linkList = renderEntity.properties["linkPid"]?.split(",")
+                    //几何较少时需要判断是否要计算判断长短边
+                    if(linkList!=null&&linkList.size<3){
 
-            }
-        }*/
+                    }
+                }*/
     }
 
 
@@ -1011,7 +1071,8 @@ class ImportPreProcess {
             dynamicSrcReference.properties["type"] = "dynamicSrc"
             val code = renderEntity.properties[codeName]
             dynamicSrcReference.properties["src"] = "${prefix}${code}${suffix}"
-            dynamicSrcReference.propertiesDb = DeflaterUtil.zipString(JSON.toJSONString(dynamicSrcReference.properties))
+            dynamicSrcReference.propertiesDb =
+                DeflaterUtil.zipString(JSON.toJSONString(dynamicSrcReference.properties))
             renderEntity.referenceEntitys.add(dynamicSrcReference)
             //listResult.add(dynamicSrcReference)
         }
@@ -1120,24 +1181,25 @@ class ImportPreProcess {
     fun generateLaneAccessType(renderEntity: RenderEntity): Boolean {
         if (renderEntity.properties.containsKey("accessCharacteristic")) {
             // 解析accessCharacteristic，判断是否存在指定属性
-            val accessCharacteristic = renderEntity.properties["accessCharacteristic"].toString().toInt()
+            val accessCharacteristic =
+                renderEntity.properties["accessCharacteristic"].toString().toInt()
             var str = ""
-            if (accessCharacteristic.and(4)>0) {
+            if (accessCharacteristic.and(4) > 0) {
                 str += "公"
             }
-            if (accessCharacteristic.and(8)>0) {
+            if (accessCharacteristic.and(8) > 0) {
                 if (str.isNotEmpty()) {
                     str += "|"
                 }
                 str += "多"
             }
-            if (accessCharacteristic.and(64)>0) {
+            if (accessCharacteristic.and(64) > 0) {
                 if (str.isNotEmpty()) {
                     str += "|"
                 }
                 str += "行"
             }
-            if (accessCharacteristic.and(128)>0) {
+            if (accessCharacteristic.and(128) > 0) {
                 if (str.isNotEmpty()) {
                     str += "|"
                 }
@@ -1155,8 +1217,9 @@ class ImportPreProcess {
      * 生成车道点限速的名称
      * */
     fun obtainLaneSpeedLimitName(renderEntity: RenderEntity) {
-        if (renderEntity.properties.containsKey("maxSpeed")&&renderEntity.properties.containsKey("minSpeed")) {
-            renderEntity.properties["ref"] = "${renderEntity.properties["maxSpeed"]}|${renderEntity.properties["minSpeed"]}"
+        if (renderEntity.properties.containsKey("maxSpeed") && renderEntity.properties.containsKey("minSpeed")) {
+            renderEntity.properties["ref"] =
+                "${renderEntity.properties["maxSpeed"]}|${renderEntity.properties["minSpeed"]}"
         }
     }
 
@@ -1164,7 +1227,7 @@ class ImportPreProcess {
      * 生成立交的辅助图层数据
      * */
     fun obtainZLevelReference(renderEntity: RenderEntity) {
-        if(renderEntity!=null&&renderEntity.properties.containsKey("zlevelList")) {
+        if (renderEntity != null && renderEntity.properties.containsKey("zlevelList")) {
             // 获取ZLevelList数据
             val zLevelList = JSONArray(renderEntity.properties["zlevelList"])
             for (i in 0 until zLevelList.length()) {
@@ -1173,7 +1236,8 @@ class ImportPreProcess {
                 val startEnd = zLevelObject.optInt("startEnd", 0)
                 val zLevel = zLevelObject.optInt("zlevel", 0)
                 val shpSeqNum = zLevelObject.optInt("shpSeqNum", 0)
-                val linkGeometry = GeometryTools.createGeometry(zLevelObject.optString("linkGeometry"))
+                val linkGeometry =
+                    GeometryTools.createGeometry(zLevelObject.optString("linkGeometry"))
                 val coordinates = linkGeometry!!.coordinates
                 val referenceEntityList = mutableListOf<ReferenceEntity>()
                 // 判断当前数据的startEnd，如果是0则向前和向后都绘制线，如果是1（起点）则只绘制前两个点组成的线，如果是2（终点）则只绘制后两个点组成的线
@@ -1182,35 +1246,47 @@ class ImportPreProcess {
                     zLevelReference.properties["type"] = "zlevelLine"
 //                    zLevelReference.properties["name"] = zLevel.toString()
                     // 根据shpSeqNum获取对应的点位
-                    if (shpSeqNum < coordinates.size-1) {
+                    if (shpSeqNum < coordinates.size - 1) {
                         val currentCoordinate = coordinates[shpSeqNum]
-                        var nextCoordinate = coordinates[shpSeqNum+1]
+                        var nextCoordinate = coordinates[shpSeqNum + 1]
                         // 计算两个点的距离，如果小于指定阈值，程序按照方向计算延长线
 //                        if (GeometryTools.getDistance(currentCoordinate.y, currentCoordinate.x, nextCoordinate.y, nextCoordinate.x) < 3.0) {
-                            // 获取当前点到下一个点的线方向
-                            val angle = Angle.angle(currentCoordinate, nextCoordinate)
-                            // 计算偏移距离
-                            val dx: Double = GeometryTools.convertDistanceToDegree(
-                                3.0,
-                                currentCoordinate.y!!
-                            ) * Math.cos(angle)
-                            val dy: Double = GeometryTools.convertDistanceToDegree(
-                                3.0,
-                                currentCoordinate.y!!
-                            ) * Math.sin(angle)
+                        // 获取当前点到下一个点的线方向
+                        val angle = Angle.angle(currentCoordinate, nextCoordinate)
+                        // 计算偏移距离
+                        val dx: Double = GeometryTools.convertDistanceToDegree(
+                            3.0,
+                            currentCoordinate.y!!
+                        ) * Math.cos(angle)
+                        val dy: Double = GeometryTools.convertDistanceToDegree(
+                            3.0,
+                            currentCoordinate.y!!
+                        ) * Math.sin(angle)
 
-                            // 计算偏移后的点
-                            nextCoordinate =
-                                Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
+                        // 计算偏移后的点
+                        nextCoordinate =
+                            Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
 //                        }
-                        zLevelReference.geometry = GeometryTools.createLineString(arrayListOf(GeoPoint(currentCoordinate.y, currentCoordinate.x), GeoPoint(nextCoordinate.y, nextCoordinate.x))).toString()
+                        zLevelReference.geometry = GeometryTools.createLineString(
+                            arrayListOf(
+                                GeoPoint(
+                                    currentCoordinate.y,
+                                    currentCoordinate.x
+                                ), GeoPoint(nextCoordinate.y, nextCoordinate.x)
+                            )
+                        ).toString()
 
                         referenceEntityList.add(zLevelReference)
 
                         val zLevelNameReference = createZLevelReference(renderEntity)
                         zLevelNameReference.properties["type"] = "zlevelName"
                         zLevelNameReference.properties["name"] = zLevel.toString()
-                        zLevelNameReference.geometry = GeometryTools.createGeometry(GeoPoint(nextCoordinate.y, nextCoordinate.x)).toString()
+                        zLevelNameReference.geometry = GeometryTools.createGeometry(
+                            GeoPoint(
+                                nextCoordinate.y,
+                                nextCoordinate.x
+                            )
+                        ).toString()
                         referenceEntityList.add(zLevelNameReference)
                     }
                 }
@@ -1220,34 +1296,43 @@ class ImportPreProcess {
                     zLevelReference.properties["type"] = "zlevelLine"
 //                    zLevelReference.properties["name"] = zLevel.toString()
                     // 根据shpSeqNum获取对应的点位
-                    if (shpSeqNum < coordinates.size&&shpSeqNum>0) {
+                    if (shpSeqNum < coordinates.size && shpSeqNum > 0) {
                         val currentCoordinate = coordinates[shpSeqNum]
-                        var preCoordinate = coordinates[shpSeqNum-1]
+                        var preCoordinate = coordinates[shpSeqNum - 1]
                         // 计算两个点的距离，如果小于指定阈值，程序按照方向计算延长线
 //                        if (GeometryTools.getDistance(currentCoordinate.y, currentCoordinate.x, preCoordinate.y, preCoordinate.x) < 3.0) {
-                            // 获取当前点到下一个点的线方向
-                            val angle = Angle.angle(currentCoordinate, preCoordinate)
-                            // 计算偏移距离
-                            val dx: Double = GeometryTools.convertDistanceToDegree(
-                                3.0,
-                                currentCoordinate.y!!
-                            ) * Math.cos(angle)
-                            val dy: Double = GeometryTools.convertDistanceToDegree(
-                                3.0,
-                                currentCoordinate.y!!
-                            ) * Math.sin(angle)
+                        // 获取当前点到下一个点的线方向
+                        val angle = Angle.angle(currentCoordinate, preCoordinate)
+                        // 计算偏移距离
+                        val dx: Double = GeometryTools.convertDistanceToDegree(
+                            3.0,
+                            currentCoordinate.y!!
+                        ) * Math.cos(angle)
+                        val dy: Double = GeometryTools.convertDistanceToDegree(
+                            3.0,
+                            currentCoordinate.y!!
+                        ) * Math.sin(angle)
 
-                            // 计算偏移后的点
-                            preCoordinate =
-                                Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
+                        // 计算偏移后的点
+                        preCoordinate =
+                            Coordinate(currentCoordinate.getX() + dx, currentCoordinate.getY() + dy)
 //                        }
-                        zLevelReference.geometry = GeometryTools.createLineString(arrayListOf(GeoPoint(currentCoordinate.y, currentCoordinate.x), GeoPoint(preCoordinate.y, preCoordinate.x))).toString()
+                        zLevelReference.geometry = GeometryTools.createLineString(
+                            arrayListOf(
+                                GeoPoint(
+                                    currentCoordinate.y,
+                                    currentCoordinate.x
+                                ), GeoPoint(preCoordinate.y, preCoordinate.x)
+                            )
+                        ).toString()
                         referenceEntityList.add(zLevelReference)
 
                         val zLevelNameReference = createZLevelReference(renderEntity)
                         zLevelNameReference.properties["type"] = "zlevelName"
                         zLevelNameReference.properties["name"] = zLevel.toString()
-                        zLevelNameReference.geometry = GeometryTools.createGeometry(GeoPoint(preCoordinate.y, preCoordinate.x)).toString()
+                        zLevelNameReference.geometry =
+                            GeometryTools.createGeometry(GeoPoint(preCoordinate.y, preCoordinate.x))
+                                .toString()
                         referenceEntityList.add(zLevelNameReference)
                     }
                 }
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index cc526bbd..d7252870 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -64,7 +64,7 @@
         <item
             android:id="@+id/personal_center_menu_version"
             android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：24QE1_V1.1.1_20231115_A" />
+            android:title="版本：24QE1_V1.2.1_20231124_A" />
     </group>
     <group android:checkableBehavior="single">
         <item android:title="小标题">
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 5ef8996a..c5b33766 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1616,12 +1616,34 @@
             </m>
         </m>
 
+        <!-- 中央隔离带 -->
+        <m v="OMDB_LINK_MEDIAN">
+            <m k="medianSurface" v="0">
+                <area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
+            </m>
+            <m k="medianSurface" v="1">
+                <area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
+            </m>
+            <m k="medianSurface" v="2">
+                <area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
+            </m>
+            <m k="medianSurface" v="3">
+                <area use="obj-area" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_0.svg"></area>
+            </m>
+            <m k="medianSurface" v="4">
+                <area use="obj-area" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_1.svg"></area>
+            </m>
+            <m k="medianSurface" v="5">
+                <area use="obj-area" stroke="#ffffff" stroke-width="1" src="assets:omdb/icon_2071_2.svg"></area>
+            </m>
+        </m>
+
         <!-- 道路边界类型 -->
         <m v="OMDB_RDBOUND_BOUNDARYTYPE">
             <outline-layer id="boundaryType" stroke="#8e44ad" width="0.1" />
             <!--护栏-->
             <m k="boundaryType" v="4">
-                <symbol repeat="true" repeat-gap="12" gland="true" repeat-start="0.01" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="36"></symbol>
+                <symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
             </m>
             <!--路牙-->
             <m k="boundaryType" v="3">
@@ -1629,7 +1651,7 @@
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="24" symbol-height="12"></symbol>
+                <line stroke="#495462" use="boundaryType" width="0.2"/>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">
@@ -1648,7 +1670,7 @@
 
             <!--护栏-->
             <m k="boundaryType" v="4">
-                <symbol repeat="true" repeat-gap="12" gland="true" repeat-start="0.01" src="assets:omdb/icon_2013_4.svg" symbol-width="16" symbol-height="36"></symbol>
+                <symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
             </m>
             <!--路牙-->
             <m k="boundaryType" v="3">
@@ -1656,7 +1678,7 @@
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="24" symbol-height="12"></symbol>
+                <line stroke="#495462" use="boundaryType" width="0.2"/>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">
@@ -1882,6 +1904,11 @@
             </m>
         </m>
 
+        <!-- 设施分离 -->
+        <m v="OMDB_LINK_SEPARATION">
+            <symbol repeat="true" repeat-gap="18" gland="true" repeat-start="0" src="assets:omdb/icon_2070_0.svg" symbol-width="32" symbol-height="32"></symbol>
+        </m>
+
         <!-- 停止位置 -->
         <m v="OMDB_OBJECT_STOPLOCATION">
 
@@ -1919,7 +1946,7 @@
             </m>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"
-                    src="assets:omdb/icon_arrow_right.svg" ></symbol>
+                    src="assets:omdb/icon_arrow_right_bottom.svg" ></symbol>
             </m>
             <m k="type" v="s_2_e">
                 <line use="s2e" />
@@ -1940,7 +1967,7 @@
             </m>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"
-                    src="assets:omdb/icon_arrow_right.svg" ></symbol>
+                    src="assets:omdb/icon_arrow_right_bottom.svg" ></symbol>
             </m>
             <m k="type" v="s_2_e">
                 <line use="s2e" />
diff --git a/collect-library/src/main/assets/omdb/icon_2013_4.svg b/collect-library/src/main/assets/omdb/icon_2013_4.svg
index 934f848e..bb0c9bfa 100644
--- a/collect-library/src/main/assets/omdb/icon_2013_4.svg
+++ b/collect-library/src/main/assets/omdb/icon_2013_4.svg
@@ -2,60 +2,95 @@
 <svg id="b" xmlns="http://www.w3.org/2000/svg" width="107.5" height="105.4"
     xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 107.5 105.4">
     <defs>
-        <style>.f{fill:url(#d);}.g{fill:url(#e);}.h{fill:none;}.i{fill:#fff;}</style>
-        <linearGradient id="d" x1="640.3" y1="-514.6" x2="633.9" y2="-514.6"
-            gradientTransform="translate(-610.3 579.1)" gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#989898" />
-            <stop offset=".1" stop-color="#c1c1c1" />
-            <stop offset=".3" stop-color="#e3e3e3" />
-            <stop offset=".4" stop-color="#f7f7f7" />
+        <style>
+            .p{fill:none;}.p,.q,.r,.s,.t,.u,.v,.w,.x,.y,.z,.aa,.ab{stroke-width:0px;}.q{fill:url(#e);}.r{fill:url(#f);}.s{fill:url(#d);}.t{fill:url(#j);}.u{fill:url(#i);}.v{fill:url(#h);}.w{fill:url(#m);}.x{fill:url(#g);}.y{fill:url(#o);}.z{fill:url(#k);}.aa{fill:url(#n);}.ab{fill:url(#l);}
+        </style>
+        <linearGradient id="d" x1="48.3" y1="52.7" x2="49.7" y2="52.7"
+            gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#231815" />
+            <stop offset="0" stop-color="#372d2a" />
+            <stop offset="0" stop-color="#655d5b" />
+            <stop offset=".1" stop-color="#8e8987" />
+            <stop offset=".2" stop-color="#b1adac" />
+            <stop offset=".2" stop-color="#cdcbca" />
+            <stop offset=".3" stop-color="#e3e2e1" />
+            <stop offset=".3" stop-color="#f2f2f2" />
+            <stop offset=".4" stop-color="#fcfbfb" />
             <stop offset=".5" stop-color="#fff" />
-            <stop offset=".6" stop-color="#fbfbfb" />
-            <stop offset=".6" stop-color="#f1f2f2" />
-            <stop offset=".7" stop-color="#e0e1e2" />
-            <stop offset=".8" stop-color="#c9c9cb" />
-            <stop offset=".8" stop-color="#aaabad" />
-            <stop offset=".9" stop-color="#848689" />
-            <stop offset="1" stop-color="#585b5e" />
-            <stop offset="1" stop-color="#3f4246" />
+            <stop offset=".7" stop-color="#fcfcfc" />
+            <stop offset=".7" stop-color="#f5f5f5" />
+            <stop offset=".8" stop-color="#e9e8e8" />
+            <stop offset=".8" stop-color="#d8d6d6" />
+            <stop offset=".9" stop-color="#c2bfbe" />
+            <stop offset=".9" stop-color="#a6a2a1" />
+            <stop offset=".9" stop-color="#85807e" />
+            <stop offset="1" stop-color="#605957" />
+            <stop offset="1" stop-color="#3a312f" />
+            <stop offset="1" stop-color="#453d3b" />
+            <stop offset="1" stop-color="#65605f" />
+            <stop offset="1" stop-color="#7f7c7b" />
+            <stop offset="1" stop-color="#91908f" />
+            <stop offset="1" stop-color="#9c9c9b" />
+            <stop offset="1" stop-color="#a0a0a0" />
         </linearGradient>
-        <linearGradient id="e" x1="77.7" y1="64.5" x2="84.1" y2="64.5"
-            gradientTransform="matrix(1, 0, 0, 1, 0, 0)" xlink:href="#d" />
+        <linearGradient id="e" x1="38.4" x2="39.8" xlink:href="#d" />
+        <linearGradient id="f" x1="68.2" x2="69.6" xlink:href="#d" />
+        <linearGradient id="g" x1="58.3" x2="59.6" xlink:href="#d" />
+        <linearGradient id="h" x1="101.9" y1="52.7" x2="103.3" y2="52.7" xlink:href="#d" />
+        <linearGradient id="i" x1="92" y1="52.7" x2="93.3" y2="52.7" xlink:href="#d" />
+        <linearGradient id="j" x1="14.4" y1="52.7" x2="15.8" y2="52.7" xlink:href="#d" />
+        <linearGradient id="k" x1="4.5" y1="52.7" x2="5.8" y2="52.7" xlink:href="#d" />
+        <linearGradient id="l" x1="407.3" y1="29.7" x2="408.6" y2="29.7"
+            gradientTransform="translate(-354.2 15.6)" xlink:href="#d" />
+        <linearGradient id="m" x1="392.6" y1="29.7" x2="393.9" y2="29.7"
+            gradientTransform="translate(-339.5 30.3)" xlink:href="#d" />
+        <linearGradient id="n" x1="406.7" y1="360.1" x2="411.5" y2="360.1"
+            gradientTransform="translate(-382 -307.4)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#989898" />
+            <stop offset="0" stop-color="#a3a3a3" />
+            <stop offset=".1" stop-color="#c4c5c5" />
+            <stop offset=".2" stop-color="#d8d9d9" />
+            <stop offset=".3" stop-color="#e0e1e1" />
+            <stop offset=".4" stop-color="#dbdcdc" />
+            <stop offset=".5" stop-color="#cccece" />
+            <stop offset=".6" stop-color="#b5b6b7" />
+            <stop offset=".7" stop-color="#949697" />
+            <stop offset=".8" stop-color="#6a6c6f" />
+            <stop offset=".8" stop-color="#3f4246" />
+            <stop offset="1" stop-color="#404247" />
+            <stop offset="1" stop-color="#43434a" />
+        </linearGradient>
+        <linearGradient id="o" x1="78.5" y1="52.7" x2="83.3" y2="52.7"
+            gradientTransform="matrix(1,0,0,1,0,0)" xlink:href="#n" />
     </defs>
     <g id="c">
-        <g>
-            <rect class="h" width="107.5" height="105.4" />
-            <g>
-                <g>
-                    <path class="i"
-                        d="M48.2,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M38.3,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M68.1,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M58.2,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M101.8,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M91.9,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M14.3,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M4.4,57.4h1.5c.1,0,.2,.1,.2,.2v14.6c0,0,0,.1-.1,.1h-1.8s0,0,0,0v-14.7c0-.1,.1-.2,.2-.2Z" />
-                    <path class="i"
-                        d="M52.8,3.3h1.8c.1,0,.2,.1,.2,.2V110.7c0,0,0,.1-.1,.1h-2.1s0,0,0,0V3.5c0-.1,.1-.2,.2-.2Z"
-                        transform="translate(-3.3 110.8) rotate(-90)" />
-                    <path class="i"
-                        d="M52.8,18h1.8c.1,0,.2,.1,.2,.2V125.4c0,0,0,.1-.1,.1h-2.1s0,0,0,0V18.2c0-.1,.1-.2,.2-.2Z"
-                        transform="translate(-18 125.5) rotate(-90)" />
-                </g>
-                <path class="f"
-                    d="M24.5,52.3h4.9c.6,0,1.1,.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-5.2c-.5,0-.9-.4-.9-.9v-22.3c0-.6,.5-1.1,1.1-1.1Z"
-                    transform="translate(54 129) rotate(180)" />
-                <path class="g"
-                    d="M78.3,52.3h4.9c.6,0,1.1,.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-5.2c-.5,0-.9-.4-.9-.9v-22.3c0-.6,.5-1.1,1.1-1.1Z" />
-            </g>
-        </g>
+        <rect class="p" width="107.5" height="105.4" />
+        <path class="s"
+            d="m48.6,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="q"
+            d="m38.6,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="r"
+            d="m68.4,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="x"
+            d="m58.5,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="v"
+            d="m102.1,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="u"
+            d="m92.2,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="t"
+            d="m14.6,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="z"
+            d="m4.7,45.2h.9c.1,0,.2.1.2.2v14.6c0,0,0,.1-.1.1h-1.2s0,0,0,0v-14.7c0-.1.1-.2.2-.2Z" />
+        <path class="ab"
+            d="m53.3-8.4h.9c.1,0,.2.1.2.2v107.1c0,0,0,.1-.1.1h-1.1s0,0,0,0V-8.1c0-.1.1-.2.2-.2Z"
+            transform="translate(8.4 99.1) rotate(-90)" />
+        <path class="w"
+            d="m53.3,6.3h.9c.1,0,.2.1.2.2v107.1c0,0,0,.1-.1.1h-1.1s0,0,0,0V6.6c0-.1.1-.2.2-.2Z"
+            transform="translate(-6.3 113.8) rotate(-90)" />
+        <path class="aa"
+            d="m25.4,40.6h3.1c.6,0,1.1.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-22.3c0-.6.5-1.1,1.1-1.1Z"
+            transform="translate(54 105.4) rotate(180)" />
+        <path class="y"
+            d="m79.2,40.6h3.1c.6,0,1.1.5,1.1,1.1v22.3c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-22.3c0-.6.5-1.1,1.1-1.1Z" />
     </g>
 </svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2013_5.svg b/collect-library/src/main/assets/omdb/icon_2013_5.svg
new file mode 100644
index 00000000..f8babad6
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2013_5.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="90" height="100"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 90 100">
+    <defs>
+        <style>
+            .e{fill:none;}.e,.f,.g,.h{stroke-width:0px;}.i{clip-path:url(#d);}.f{fill:#a28d92;}.g{fill:#f1eae9;}.h{fill:#fff;}
+        </style>
+        <clipPath id="d">
+            <rect class="e" width="90" height="100" />
+        </clipPath>
+    </defs>
+    <g id="c">
+        <g class="i">
+            <rect class="h" width="90" height="100" />
+            <path class="g"
+                d="m-10.8.2H29c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H-19c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L-11.8.6c.3-.3.6-.4,1-.4Z" />
+            <path class="g"
+                d="m35,.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H26.8c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L34.1.6c.3-.3.6-.4,1-.4Z" />
+            <path class="f"
+                d="m19.7,13.1c.7,0,1.3.6,1.3,1.4v17.1c0,.8-.6,1.4-1.3,1.4H-19.4c-.7,0-1.3-.6-1.3-1.4h0V14.5c0-.8.6-1.4,1.3-1.4H19.7Z" />
+            <path class="f"
+                d="m65,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H25.7c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="g"
+                d="m80.9.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4h-39.9c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L79.9.6c.3-.3.6-.4,1-.4Z" />
+            <path class="f"
+                d="m110,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m42.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m87.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m22.3,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H-17c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4H22.3Z" />
+            <path class="f"
+                d="m67.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H28.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m112.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m42.5,80c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m87.6,79.9c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2070_0.svg b/collect-library/src/main/assets/omdb/icon_2070_0.svg
new file mode 100644
index 00000000..8a03268f
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2070_0.svg
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="107.5" height="107.5"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 107.5 107.5">
+    <defs>
+        <style>
+            .bz,.ca{fill:none;}.bz,.cb,.cc,.cd,.ce,.cf,.cg,.ch,.ci,.cj,.ck,.cl,.cm,.cn,.co,.cp,.cq,.cr,.cs,.ct,.cu,.cv,.cw,.cx,.cy,.cz,.da,.db,.dc,.dd,.de,.df,.dg,.dh,.di,.dj,.dk,.dl,.dm,.dn,.do,.dp,.dq,.dr,.ds,.dt,.du,.dv,.dw,.dx,.dy,.dz,.ea,.eb,.ec,.ed,.ee,.ef,.eg,.eh,.ei,.ej,.ek,.el,.em,.en,.eo,.ep,.eq,.er,.es,.et,.eu,.ev,.ew{stroke-width:0px;}.ca{opacity:0;stroke:#00a4b1;stroke-miterlimit:10;stroke-width:.2px;}.cb{fill:url(#ah);}.cc{fill:url(#ag);}.cd{fill:url(#aa);}.ce{fill:url(#ao);}.cf{fill:url(#af);}.cg{fill:url(#ae);}.ch{fill:url(#ab);}.ci{fill:url(#aj);}.cj{fill:url(#ap);}.ck{fill:url(#ai);}.cl{fill:url(#ad);}.cm{fill:url(#an);}.cn{fill:url(#am);}.co{fill:url(#ac);}.cp{fill:url(#at);}.cq{fill:url(#as);}.cr{fill:url(#bi);}.cs{fill:url(#bd);}.ct{fill:url(#bg);}.cu{fill:url(#bj);}.cv{fill:url(#be);}.cw{fill:url(#bf);}.cx{fill:url(#bo);}.cy{fill:url(#bm);}.cz{fill:url(#bh);}.da{fill:url(#bn);}.db{fill:url(#ba);}.dc{fill:url(#bb);}.dd{fill:url(#bk);}.de{fill:url(#bc);}.df{fill:url(#bx);}.dg{fill:url(#bq);}.dh{fill:url(#br);}.di{fill:url(#bs);}.dj{fill:url(#by);}.dk{fill:url(#bt);}.dl{fill:url(#bl);}.dm{fill:url(#bw);}.dn{fill:url(#bp);}.do{fill:url(#bu);}.dp{fill:url(#bv);}.dq{fill:url(#ar);}.dr{fill:url(#ay);}.ds{fill:url(#az);}.dt{fill:url(#aw);}.du{fill:url(#aq);}.dv{fill:url(#ax);}.dw{fill:url(#ak);}.dx{fill:url(#al);}.dy{fill:url(#au);}.dz{fill:url(#av);}.ea{fill:url(#v);}.eb{fill:url(#e);}.ec{fill:url(#y);}.ed{fill:url(#z);}.ee{fill:url(#x);}.ef{fill:url(#w);}.eg{fill:url(#u);}.eh{fill:url(#t);}.ei{fill:url(#f);}.ej{fill:url(#d);}.ek{fill:url(#s);}.el{fill:url(#j);}.em{fill:url(#q);}.en{fill:url(#r);}.eo{fill:url(#i);}.ep{fill:url(#h);}.eq{fill:url(#m);}.er{fill:url(#g);}.es{fill:url(#o);}.et{fill:url(#p);}.eu{fill:url(#k);}.ev{fill:url(#n);}.ew{fill:url(#l);}
+        </style>
+        <linearGradient id="d" x1="13.7" y1="53.7" x2="15" y2="53.7" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#221714" />
+            <stop offset="0" stop-color="#372d2a" />
+            <stop offset="0" stop-color="#655d5b" />
+            <stop offset=".1" stop-color="#8e8987" />
+            <stop offset=".2" stop-color="#b1adac" />
+            <stop offset=".2" stop-color="#cdcbca" />
+            <stop offset=".3" stop-color="#e3e2e1" />
+            <stop offset=".3" stop-color="#f2f2f2" />
+            <stop offset=".4" stop-color="#fcfbfb" />
+            <stop offset=".5" stop-color="#fff" />
+            <stop offset=".7" stop-color="#fcfcfc" />
+            <stop offset=".7" stop-color="#f5f5f5" />
+            <stop offset=".8" stop-color="#e9e8e8" />
+            <stop offset=".8" stop-color="#d8d7d6" />
+            <stop offset=".9" stop-color="#c2bfbe" />
+            <stop offset=".9" stop-color="#a6a2a1" />
+            <stop offset=".9" stop-color="#85807e" />
+            <stop offset="1" stop-color="#605a57" />
+            <stop offset="1" stop-color="#39312e" />
+            <stop offset="1" stop-color="#443d3a" />
+            <stop offset="1" stop-color="#64605e" />
+            <stop offset="1" stop-color="#7e7b7a" />
+            <stop offset="1" stop-color="#908f8e" />
+            <stop offset="1" stop-color="#9b9b9a" />
+            <stop offset="1" stop-color="#9f9f9f" />
+        </linearGradient>
+        <linearGradient id="e" x1="3.7" x2="5.1" xlink:href="#d" />
+        <linearGradient id="f" x1="270.6" y1="-352.3" x2="272" y2="-352.3"
+            gradientTransform="translate(-266.3 383.8)" xlink:href="#d" />
+        <linearGradient id="g" x1="390.7" y1="-1286.3" x2="392.1" y2="-1286.3"
+            gradientTransform="translate(-385.2 816.6) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="h" x1="189.8" y1="-2181.7" x2="191.1" y2="-2181.7"
+            gradientTransform="translate(-182.5 1363.7) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="i" x1="-1617.7" y1="317" x2="-1616.3" y2="317"
+            gradientTransform="translate(1630.8 348.6) scale(1 -1)" xlink:href="#d" />
+        <linearGradient id="j" x1="-887.7" y1="1342.2" x2="-886.4" y2="1342.2"
+            gradientTransform="translate(899.5 850.8) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="k" x1="-261.1" y1="1004.8" x2="-259.8" y2="1004.8"
+            gradientTransform="translate(271.3 643.5) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="l" x1="-18.7" y1="1876.8" x2="-17.3" y2="1876.8"
+            gradientTransform="translate(27.4 695.4) scale(1 -.4)" xlink:href="#d" />
+        <linearGradient id="m" x1="28.5" x2="29.9" xlink:href="#d" />
+        <linearGradient id="n" x1="18.6" x2="19.9" xlink:href="#d" />
+        <linearGradient id="o" x1="284.7" y1="-357.1" x2="286" y2="-357.1"
+            gradientTransform="translate(-265.5 388.7)" xlink:href="#d" />
+        <linearGradient id="p" x1="399.8" y1="-1305.6" x2="401.1" y2="-1305.6"
+            gradientTransform="translate(-379.3 828.4) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="q" x1="193.2" y1="-2205.3" x2="194.6" y2="-2205.3"
+            gradientTransform="translate(-171.1 1378.2) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="r" x1="-1631.6" y1="322.1" x2="-1630.3" y2="322.1"
+            gradientTransform="translate(1659.6 353.6) scale(1 -1)" xlink:href="#d" />
+        <linearGradient id="s" x1="-897.2" y1="1360.9" x2="-895.8" y2="1360.9"
+            gradientTransform="translate(923.8 862.2) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="t" x1="-264.3" y1="1028.5" x2="-263" y2="1028.5"
+            gradientTransform="translate(289.3 658) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="u" x1="-18.7" y1="1918.6" x2="-17.3" y2="1918.6"
+            gradientTransform="translate(42.2 710.2) scale(1 -.4)" xlink:href="#d" />
+        <linearGradient id="v" x1="-1912" y1="127.5" x2="-1908.5" y2="127.5"
+            gradientTransform="translate(1927.1 -85.1)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#888" />
+            <stop offset="0" stop-color="#888" />
+            <stop offset="0" stop-color="#acacac" />
+            <stop offset=".1" stop-color="#cacaca" />
+            <stop offset=".2" stop-color="#e1e1e1" />
+            <stop offset=".3" stop-color="#f2f2f2" />
+            <stop offset=".4" stop-color="#fbfbfb" />
+            <stop offset=".5" stop-color="#fff" />
+            <stop offset=".7" stop-color="#fcfcfc" />
+            <stop offset=".8" stop-color="#f5f5f5" />
+            <stop offset=".9" stop-color="#e8e8e8" />
+            <stop offset=".9" stop-color="#d6d6d7" />
+            <stop offset="1" stop-color="#bfbfc0" />
+            <stop offset="1" stop-color="#b4b4b5" />
+        </linearGradient>
+        <linearGradient id="w" x1="43.3" y1="53.7" x2="44.7" y2="53.7" xlink:href="#d" />
+        <linearGradient id="x" x1="33.4" y1="53.7" x2="34.8" y2="53.7" xlink:href="#d" />
+        <linearGradient id="y" x1="298.7" y1="-362" x2="300" y2="-362"
+            gradientTransform="translate(-264.7 393.6)" xlink:href="#d" />
+        <linearGradient id="z" x1="408.8" y1="-1324.8" x2="410.1" y2="-1324.8"
+            gradientTransform="translate(-373.5 840.2) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="aa" x1="196.7" y1="-2228.8" x2="198" y2="-2228.8"
+            gradientTransform="translate(-159.8 1392.6) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="ab" x1="-1645.6" y1="327.1" x2="-1644.2" y2="327.1"
+            gradientTransform="translate(1688.3 358.7) scale(1 -1)" xlink:href="#d" />
+        <linearGradient id="ac" x1="-906.6" y1="1379.6" x2="-905.2" y2="1379.6"
+            gradientTransform="translate(948.1 873.7) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="ad" x1="-267.6" y1="1052.1" x2="-266.2" y2="1052.1"
+            gradientTransform="translate(307.4 672.5) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="ae" x1="-18.7" y1="1960.3" x2="-17.3" y2="1960.3"
+            gradientTransform="translate(57 725) scale(1 -.4)" xlink:href="#d" />
+        <linearGradient id="af" y1="142.3" y2="142.3" gradientTransform="translate(1941.9 -99.9)"
+            xlink:href="#v" />
+        <linearGradient id="ag" x1="58.1" y1="53.7" x2="59.5" y2="53.7" xlink:href="#d" />
+        <linearGradient id="ah" x1="48.2" y1="53.7" x2="49.6" y2="53.7" xlink:href="#d" />
+        <linearGradient id="ai" x1="312.7" y1="-366.9" x2="314" y2="-366.9"
+            gradientTransform="translate(-263.9 398.4)" xlink:href="#d" />
+        <linearGradient id="aj" x1="417.7" y1="-1344.1" x2="419.1" y2="-1344.1"
+            gradientTransform="translate(-367.7 852) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="ak" x1="200.1" y1="-2252.4" x2="201.5" y2="-2252.4"
+            gradientTransform="translate(-148.4 1407) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="al" x1="-1659.5" y1="332.2" x2="-1658.1" y2="332.2"
+            gradientTransform="translate(1717.1 363.7) scale(1 -1)" xlink:href="#d" />
+        <linearGradient id="am" x1="-916.1" y1="1398.2" x2="-914.7" y2="1398.2"
+            gradientTransform="translate(972.3 885.1) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="an" x1="-270.8" y1="1075.8" x2="-269.4" y2="1075.8"
+            gradientTransform="translate(325.4 686.9) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="ao" x1="-18.7" y1="2002" x2="-17.3" y2="2002"
+            gradientTransform="translate(71.8 739.9) scale(1 -.4)" xlink:href="#d" />
+        <linearGradient id="ap" y1="157.1" y2="157.1" gradientTransform="translate(1956.7 -114.7)"
+            xlink:href="#v" />
+        <linearGradient id="aq" x1="73" y1="53.7" x2="74.4" y2="53.7" xlink:href="#d" />
+        <linearGradient id="ar" x1="63.1" y1="53.7" x2="64.4" y2="53.7" xlink:href="#d" />
+        <linearGradient id="as" x1="326.7" y1="-371.7" x2="328.1" y2="-371.7"
+            gradientTransform="translate(-263.1 403.3)" xlink:href="#d" />
+        <linearGradient id="at" x1="426.8" y1="-1363.4" x2="428.1" y2="-1363.4"
+            gradientTransform="translate(-361.9 863.8) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="au" x1="203.6" y1="-2276" x2="205" y2="-2276"
+            gradientTransform="translate(-137 1421.5) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="av" x1="-1673.5" y1="337.2" x2="-1672.1" y2="337.2"
+            gradientTransform="translate(1745.9 368.8) scale(1 -1)" xlink:href="#d" />
+        <linearGradient id="aw" x1="-925.5" y1="1417" x2="-924.2" y2="1417"
+            gradientTransform="translate(996.7 896.5) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="ax" x1="-274" y1="1099.5" x2="-272.7" y2="1099.5"
+            gradientTransform="translate(343.5 701.5) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="ay" x1="-18.7" y1="2043.8" x2="-17.3" y2="2043.8"
+            gradientTransform="translate(86.7 754.7) scale(1 -.4)" xlink:href="#d" />
+        <linearGradient id="az" y1="172" y2="172" gradientTransform="translate(1971.6 -129.6)"
+            xlink:href="#v" />
+        <linearGradient id="ba" x1="87.8" y1="53.8" x2="89.2" y2="53.8" xlink:href="#d" />
+        <linearGradient id="bb" x1="77.9" y1="53.8" x2="79.3" y2="53.8" xlink:href="#d" />
+        <linearGradient id="bc" x1="340.7" y1="-376.6" x2="342.1" y2="-376.6"
+            gradientTransform="translate(-262.3 408.1)" xlink:href="#d" />
+        <linearGradient id="bd" x1="435.8" y1="-1382.6" x2="437.1" y2="-1382.6"
+            gradientTransform="translate(-356 875.6) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="be" x1="207" y1="-2299.6" x2="208.4" y2="-2299.6"
+            gradientTransform="translate(-125.6 1435.9) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="bf" x1="-1687.4" y1="342.3" x2="-1686" y2="342.3"
+            gradientTransform="translate(1774.7 373.8) scale(1 -1)" xlink:href="#d" />
+        <linearGradient id="bg" x1="-935" y1="1435.6" x2="-933.6" y2="1435.6"
+            gradientTransform="translate(1020.9 908) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="bh" x1="-277.2" y1="1123.1" x2="-275.9" y2="1123.1"
+            gradientTransform="translate(361.6 715.9) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="bi" x1="-18.6" y1="2085.5" x2="-17.3" y2="2085.5"
+            gradientTransform="translate(101.5 769.6) scale(1 -.4)" xlink:href="#d" />
+        <linearGradient id="bj" y1="186.8" y2="186.8" gradientTransform="translate(1986.4 -144.4)"
+            xlink:href="#v" />
+        <linearGradient id="bk" x1="102.7" y1="53.8" x2="104" y2="53.8" xlink:href="#d" />
+        <linearGradient id="bl" x1="92.7" y1="53.8" x2="94.1" y2="53.8" xlink:href="#d" />
+        <linearGradient id="bm" x1="354.7" y1="-381.4" x2="356.1" y2="-381.4"
+            gradientTransform="translate(-261.4 413)" xlink:href="#d" />
+        <linearGradient id="bn" x1="444.8" y1="-1401.9" x2="446.1" y2="-1401.9"
+            gradientTransform="translate(-350.2 887.4) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="bo" x1="210.5" y1="-2323.1" x2="211.9" y2="-2323.1"
+            gradientTransform="translate(-114.3 1450.3) scale(1 .6)" xlink:href="#d" />
+        <linearGradient id="bp" x1="-1701.3" y1="347.3" x2="-1700" y2="347.3"
+            gradientTransform="translate(1803.4 378.9) scale(1 -1)" xlink:href="#d" />
+        <linearGradient id="bq" x1="-944.4" y1="1454.3" x2="-943" y2="1454.3"
+            gradientTransform="translate(1045.2 919.4) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="br" x1="-280.5" y1="1146.8" x2="-279.1" y2="1146.8"
+            gradientTransform="translate(379.6 730.4) scale(1 -.6)" xlink:href="#d" />
+        <linearGradient id="bs" x1="-18.6" y1="2127.2" x2="-17.3" y2="2127.2"
+            gradientTransform="translate(116.3 784.4) scale(1 -.4)" xlink:href="#d" />
+        <linearGradient id="bt" y1="201.6" y2="201.6" gradientTransform="translate(2001.2 -159.2)"
+            xlink:href="#v" />
+        <linearGradient id="bu" x1="-709.6" y1="357.9" x2="-704.2" y2="357.9"
+            gradientTransform="translate(760.8 -286)" xlink:href="#d" />
+        <linearGradient id="bv" y1="215.5" y2="215.5" gradientTransform="translate(2015.2 -173.1)"
+            xlink:href="#v" />
+        <linearGradient id="bw" y1="113.5" y2="113.5" gradientTransform="translate(1913.1 -71.1)"
+            xlink:href="#v" />
+        <linearGradient id="bx" x1="-1014.3" y1="-422" x2="-1009.5" y2="-422"
+            gradientTransform="translate(1043.7 496.6)" gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#979797" />
+            <stop offset="0" stop-color="#a1a1a1" />
+            <stop offset=".1" stop-color="#c3c3c3" />
+            <stop offset=".2" stop-color="#d7d7d7" />
+            <stop offset=".3" stop-color="#dfdfdf" />
+            <stop offset=".4" stop-color="#dadada" />
+            <stop offset=".5" stop-color="#cbcccc" />
+            <stop offset=".6" stop-color="#b4b4b6" />
+            <stop offset=".7" stop-color="#939496" />
+            <stop offset=".8" stop-color="#696b6e" />
+            <stop offset=".8" stop-color="#3e4146" />
+            <stop offset="1" stop-color="#3f4147" />
+            <stop offset="1" stop-color="#424249" />
+        </linearGradient>
+        <linearGradient id="by" x1="-1058.7" x2="-1053.9"
+            gradientTransform="translate(1132.6 496.6)" xlink:href="#bx" />
+    </defs>
+    <g id="c">
+        <path class="ej"
+            d="m13.9,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <path class="eb"
+            d="m4,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <rect class="ei" x="4.3" y="29.7" width="1.4" height="3.7"
+            transform="translate(10.6 .1) rotate(19.1)" />
+        <rect class="er" x="5.6" y="28.4" width="1.4" height="2.2"
+            transform="translate(25.9 6.6) rotate(52.6)" />
+        <rect class="ep" x="7.3" y="27.5" width="1.4" height="2.2"
+            transform="translate(33.9 14.3) rotate(76.5)" />
+        <rect class="eo" x="13.1" y="29.7" width="1.4" height="3.7"
+            transform="translate(37.5 56.5) rotate(160.1)" />
+        <rect class="el" x="11.8" y="28.3" width="1.4" height="2.2"
+            transform="translate(43.1 38.6) rotate(129.6)" />
+        <rect class="eu" x="10.2" y="27.5" width="1.4" height="2.2"
+            transform="translate(41.1 24.3) rotate(102.6)" />
+        <rect class="ew" x="8.7" y="27.8" width="1.4" height="1.2"
+            transform="translate(37.8 19) rotate(90)" />
+        <path class="eq"
+            d="m28.7,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <path class="ev"
+            d="m18.8,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <rect class="es" x="19.1" y="29.7" width="1.4" height="3.7"
+            transform="translate(11.4 -4.8) rotate(19.1)" />
+        <rect class="et" x="20.4" y="28.4" width="1.4" height="2.2"
+            transform="translate(31.7 -5.2) rotate(52.6)" />
+        <rect class="em" x="22.1" y="27.5" width="1.4" height="2.2"
+            transform="translate(45.3 -.2) rotate(76.5)" />
+        <rect class="en" x="27.9" y="29.7" width="1.4" height="3.7"
+            transform="translate(66.2 51.5) rotate(160.1)" />
+        <rect class="ek" x="26.6" y="28.3" width="1.4" height="2.2"
+            transform="translate(67.4 27.1) rotate(129.6)" />
+        <rect class="eh" x="25" y="27.5" width="1.4" height="2.2"
+            transform="translate(59.2 9.8) rotate(102.6)" />
+        <rect class="eg" x="23.5" y="27.8" width="1.4" height="1.2"
+            transform="translate(52.6 4.2) rotate(90)" />
+        <rect class="ea" x="15" y="40.6" width="3.5" height="3.5"
+            transform="translate(-25.6 59.2) rotate(-90)" />
+        <path class="ef"
+            d="m43.6,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <path class="ee"
+            d="m33.6,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <rect class="ec" x="34" y="29.7" width="1.4" height="3.7"
+            transform="translate(12.3 -9.6) rotate(19.1)" />
+        <rect class="ed" x="35.2" y="28.4" width="1.4" height="2.2"
+            transform="translate(37.5 -17) rotate(52.6)" />
+        <rect class="cd" x="36.9" y="27.5" width="1.4" height="2.2"
+            transform="translate(56.7 -14.6) rotate(76.5)" />
+        <rect class="ch" x="42.7" y="29.7" width="1.4" height="3.7"
+            transform="translate(95 46.4) rotate(160.1)" />
+        <rect class="co" x="41.5" y="28.3" width="1.4" height="2.2"
+            transform="translate(91.7 15.7) rotate(129.6)" />
+        <rect class="cl" x="39.8" y="27.5" width="1.4" height="2.2"
+            transform="translate(77.2 -4.7) rotate(102.6)" />
+        <rect class="cg" x="38.4" y="27.8" width="1.4" height="1.2"
+            transform="translate(67.4 -10.6) rotate(90)" />
+        <rect class="cf" x="29.9" y="40.6" width="3.5" height="3.5"
+            transform="translate(-10.8 74) rotate(-90)" />
+        <path class="cc"
+            d="m58.4,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <path class="cb"
+            d="m48.4,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <rect class="ck" x="48.8" y="29.7" width="1.4" height="3.7"
+            transform="translate(13.1 -14.5) rotate(19.1)" />
+        <rect class="ci" x="50" y="28.4" width="1.4" height="2.2"
+            transform="translate(43.4 -28.7) rotate(52.6)" />
+        <rect class="dw" x="51.7" y="27.5" width="1.4" height="2.2"
+            transform="translate(68.1 -29) rotate(76.5)" />
+        <rect class="dx" x="57.6" y="29.7" width="1.4" height="3.7"
+            transform="translate(123.8 41.4) rotate(160.1)" />
+        <rect class="cn" x="56.3" y="28.3" width="1.4" height="2.2"
+            transform="translate(116 4.3) rotate(129.6)" />
+        <rect class="cm" x="54.6" y="27.5" width="1.4" height="2.2"
+            transform="translate(95.3 -19.1) rotate(102.6)" />
+        <rect class="ce" x="53.2" y="27.8" width="1.4" height="1.2"
+            transform="translate(82.3 -25.5) rotate(90)" />
+        <rect class="cj" x="44.7" y="40.6" width="3.5" height="3.5"
+            transform="translate(4.1 88.9) rotate(-90)" />
+        <path class="du"
+            d="m73.2,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <path class="dq"
+            d="m63.3,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <rect class="cq" x="63.6" y="29.7" width="1.4" height="3.7"
+            transform="translate(13.9 -19.3) rotate(19.1)" />
+        <rect class="cp" x="64.9" y="28.4" width="1.4" height="2.2"
+            transform="translate(49.2 -40.5) rotate(52.6)" />
+        <rect class="dy" x="66.6" y="27.5" width="1.4" height="2.2"
+            transform="translate(79.5 -43.4) rotate(76.5)" />
+        <rect class="dz" x="72.4" y="29.7" width="1.4" height="3.7"
+            transform="translate(152.6 36.3) rotate(160.1)" />
+        <rect class="dt" x="71.1" y="28.3" width="1.4" height="2.2"
+            transform="translate(140.3 -7.2) rotate(129.6)" />
+        <rect class="dv" x="69.5" y="27.5" width="1.4" height="2.2"
+            transform="translate(113.4 -33.6) rotate(102.6)" />
+        <rect class="dr" x="68" y="27.8" width="1.4" height="1.2"
+            transform="translate(97.1 -40.3) rotate(90)" />
+        <rect class="ds" x="59.5" y="40.6" width="3.5" height="3.5"
+            transform="translate(18.9 103.7) rotate(-90)" />
+        <path class="db"
+            d="m88.1,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <path class="dc"
+            d="m78.1,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <rect class="de" x="78.5" y="29.7" width="1.4" height="3.7"
+            transform="translate(14.7 -24.2) rotate(19.1)" />
+        <rect class="cs" x="79.7" y="28.4" width="1.4" height="2.2"
+            transform="translate(55.1 -52.3) rotate(52.6)" />
+        <rect class="cv" x="81.4" y="27.5" width="1.4" height="2.2"
+            transform="translate(90.9 -57.8) rotate(76.5)" />
+        <rect class="cw" x="87.2" y="29.7" width="1.4" height="3.7"
+            transform="translate(181.4 31.3) rotate(160.1)" />
+        <rect class="ct" x="86" y="28.3" width="1.4" height="2.2"
+            transform="translate(164.6 -18.6) rotate(129.6)" />
+        <rect class="cz" x="84.3" y="27.5" width="1.4" height="2.2"
+            transform="translate(131.4 -48.1) rotate(102.6)" />
+        <rect class="cr" x="82.9" y="27.8" width="1.4" height="1.2"
+            transform="translate(111.9 -55.1) rotate(90)" />
+        <rect class="cu" x="74.4" y="40.6" width="3.5" height="3.5"
+            transform="translate(33.7 118.5) rotate(-90)" />
+        <path class="dd"
+            d="m102.9,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <path class="dl"
+            d="m92.9,32.8h.9c.1,0,.2.1.2.2v41.5c0,0,0,.1-.1.1h-1.2s0,0,0,0v-41.6c0-.1.1-.2.2-.2Z" />
+        <rect class="cy" x="93.3" y="29.7" width="1.4" height="3.7"
+            transform="translate(15.5 -29) rotate(19.1)" />
+        <rect class="da" x="94.5" y="28.4" width="1.4" height="2.2"
+            transform="translate(60.9 -64.1) rotate(52.6)" />
+        <rect class="cx" x="96.2" y="27.5" width="1.4" height="2.2"
+            transform="translate(102.2 -72.3) rotate(76.5)" />
+        <rect class="dn" x="102.1" y="29.7" width="1.4" height="3.7"
+            transform="translate(210.1 26.2) rotate(160.1)" />
+        <rect class="dg" x="100.8" y="28.3" width="1.4" height="2.2"
+            transform="translate(188.8 -30) rotate(129.6)" />
+        <rect class="dh" x="99.1" y="27.5" width="1.4" height="2.2"
+            transform="translate(149.5 -62.6) rotate(102.6)" />
+        <rect class="di" x="97.7" y="27.8" width="1.4" height="1.2"
+            transform="translate(126.8 -70) rotate(90)" />
+        <rect class="dk" x="89.2" y="40.6" width="3.5" height="3.5"
+            transform="translate(48.6 133.4) rotate(-90)" />
+        <path class="do" d="m51.3,20h5.2c0,0,.1,0,.1.1v103.7h-5.4V20.2c0,0,0-.1.1-.1Z"
+            transform="translate(-18.1 125.8) rotate(-90)" />
+        <rect class="dp" x="103.1" y="41.5" width="3.5" height="1.8"
+            transform="translate(62.5 147.3) rotate(-90)" />
+        <rect class="dm" x="1.1" y="41.5" width="3.5" height="1.8"
+            transform="translate(-39.5 45.2) rotate(-90)" />
+        <path class="df"
+            d="m30.1,69.2h3.1c.6,0,1.1.5,1.1,1.1v8.8c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-8.8c0-.6.5-1.1,1.1-1.1Z"
+            transform="translate(63.3 149.3) rotate(180)" />
+        <path class="dj"
+            d="m74.6,69.2h3.1c.6,0,1.1.5,1.1,1.1v8.8c0,.5-.4,1-1,1h-3.4c-.5,0-.9-.4-.9-.9v-8.8c0-.6.5-1.1,1.1-1.1Z"
+            transform="translate(152.2 149.3) rotate(180)" />
+        <line class="ca" x1="2" y1="53.7" x2="105.8" y2="53.7" />
+        <line class="ca" x1="53.9" y1="102.6" x2="53.9" y2="4.9" />
+        <rect class="bz" width="107.5" height="107.5" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2071_0.jpg b/collect-library/src/main/assets/omdb/icon_2071_0.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c1cdee0be97b3a982b1d7091439d39822b56d52d
GIT binary patch
literal 25228
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
D-2Tr~

literal 0
HcmV?d00001

diff --git a/collect-library/src/main/assets/omdb/icon_2071_0.svg b/collect-library/src/main/assets/omdb/icon_2071_0.svg
new file mode 100644
index 00000000..62b423df
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2071_0.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><defs><style>.d{fill:#889b86;stroke-width:0px;}</style></defs><g id="c"><rect class="d" width="18" height="18"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2071_1.png b/collect-library/src/main/assets/omdb/icon_2071_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..53b887f8679e4daa1b6902104a592d7e90dac2f3
GIT binary patch
literal 136
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQ&H|6fVg?3oArNM~bhqvgP|(WL
z#WBR9H@W2fmhyyzgo1<xGByc~QX&4Vhxv>G4+>aFnC4vB5O~;)SK8rlgoK2IoPmLX
e%#x-^afVV0wl2ff4OT!?7(8A5T-G@yGywoY@*_w9

literal 0
HcmV?d00001

diff --git a/collect-library/src/main/assets/omdb/icon_2071_1.svg b/collect-library/src/main/assets/omdb/icon_2071_1.svg
new file mode 100644
index 00000000..6c162381
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2071_1.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><defs><style>.d{fill:#45aa04;stroke-width:0px;}</style></defs><g id="c"><rect class="d" width="18" height="18"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_2071_2.png b/collect-library/src/main/assets/omdb/icon_2071_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..924fda38a0ef954ec52ca87e836f6d24d7a57c1c
GIT binary patch
literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^!XV7S1|*9D%+3HQ&H|6fVg?3oArNM~bhqvgP|(QJ
z#WBR9H(BIcqV0hL2NKRZSZ1UwYEmpP$hxs2adBI(lvxZ<a$-V)MnXb@z=Eboeg><R
W%sG-<_7wniGkCiCxvX<aXaWG61S8@A

literal 0
HcmV?d00001

diff --git a/collect-library/src/main/assets/omdb/icon_2071_2.svg b/collect-library/src/main/assets/omdb/icon_2071_2.svg
new file mode 100644
index 00000000..b428533e
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_2071_2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><defs><style>.d{fill:#134c05;stroke-width:0px;}</style></defs><g id="c"><rect class="d" width="18" height="18"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4002_0.svg b/collect-library/src/main/assets/omdb/icon_4002_0.svg
index 4c7be369..8668a82b 100644
--- a/collect-library/src/main/assets/omdb/icon_4002_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_4002_0.svg
@@ -1,33 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
-    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
-    <defs>
-        <radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
-            gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#ff9287" />
-            <stop offset=".8" stop-color="#ff5f4c" />
-            <stop offset="1" stop-color="#ff5f4c" />
-        </radialGradient>
-        <radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
-            gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#e75545" />
-            <stop offset=".8" stop-color="#c4483b" />
-            <stop offset="1" stop-color="#983b31" />
-        </radialGradient>
-    </defs>
-    <g id="c">
-        <rect width="69.7" height="136" style="fill:rgba(255,255,255,0); stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
-            style="fill:#ff5f4c; isolation:isolate; opacity:.3; stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
-            style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;" />
-        <path
-            d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
-            style="fill:url(#d); stroke-width:0px;" />
-        <circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;stroke-width:2.1px;}.h,.i{fill:none;}.j{fill:#a74d4b;opacity:.7;}.j,.i,.k,.l,.m,.n{stroke-width:0px;}.j,.k{isolation:isolate;}.i{opacity:0;}.k{fill:#ff5f4c;opacity:.3;}.l{fill:#fff;}.m{fill:url(#f);}.n{fill:url(#g);}</style><radialGradient id="f" cx="263.2" cy="286.8" fx="263.2" fy="286.8" r=".9" gradientTransform="translate(-9405.4 -24647.8) rotate(38.2) scale(75.3 47.3) skewX(7.6)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9287"/><stop offset=".8" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="g" cx="259.6" cy="284" fx="259.6" fy="284" r=".4" gradientTransform="translate(-14219.7 -15164.5) scale(54.9 53.6)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><rect class="i" width="70" height="94"/><ellipse id="d" class="k" cx="35.8" cy="84.1" rx="14.4" ry="3.7"/><ellipse id="e" class="j" cx="35.8" cy="84.1" rx="7.5" ry="3"/><path class="m" d="m26.8,71.1l-1.1-1.1c-9.6-4.2-15.6-13.5-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.9-8.9-13h.1Z"/><ellipse class="n" cx="35.1" cy="45.5" rx="19.8" ry="19.3"/><ellipse class="l" cx="35.3" cy="45.3" rx="20.1" ry="19.6"/><ellipse class="h" cx="35.3" cy="45.3" rx="19" ry="18.6"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4002_1.svg b/collect-library/src/main/assets/omdb/icon_4002_1.svg
index b7c66fc1..21bbcb9c 100644
--- a/collect-library/src/main/assets/omdb/icon_4002_1.svg
+++ b/collect-library/src/main/assets/omdb/icon_4002_1.svg
@@ -1,41 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
-    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
-    <defs>
-        <radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
-            gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#b5b4b4" />
-            <stop offset=".7" stop-color="#6e6c6c" />
-            <stop offset="1" stop-color="#2f2f2f" />
-        </radialGradient>
-        <radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
-            gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#e75545" />
-            <stop offset=".8" stop-color="#c4483b" />
-            <stop offset="1" stop-color="#983b31" />
-        </radialGradient>
-    </defs>
-    <g id="c">
-        <rect x="0" width="69.7" height="136" style="fill:none; stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
-            style="fill:#4d4d4d; isolation:isolate; opacity:.3; stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
-            style="fill:#363333; isolation:isolate; opacity:.7; stroke-width:0px;" />
-        <path
-            d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
-            style="fill:url(#d); stroke-width:0px;" />
-        <circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
-        <circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#2f2f2f; stroke-width:3px;" />
-        <line x1="11" y1="79.4" x2="44.8" y2="45.3"
-            style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
-        <line x1="15.8" y1="85.9" x2="52.3" y2="49.5"
-            style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
-        <path d="m22.8,91.7l18.7-18.7,16.5-16.5"
-            style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;}.h,.i{stroke-width:2.1px;}.h,.i,.j,.k{fill:none;}.i,.k{stroke:#2f2f2f;}.l{fill:#363333;opacity:.7;}.l,.m{isolation:isolate;}.l,.m,.j,.n,.o,.p{stroke-width:0px;}.m{fill:#262d34;opacity:.2;}.j{opacity:0;}.k{stroke-linecap:round;stroke-width:1.4px;}.n{fill:#fff;}.o{fill:url(#f);}.p{fill:url(#g);}</style><radialGradient id="f" cx="-356.5" cy="276.3" fx="-356.5" fy="276.3" r="1.3" gradientTransform="translate(19417.3 3353.6) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b5b4b4"/><stop offset=".7" stop-color="#6e6c6c"/><stop offset="1" stop-color="#2f2f2f"/></radialGradient><radialGradient id="g" cx="-355.3" cy="282.7" fx="-355.3" fy="282.7" r=".5" gradientTransform="translate(14044.3 -10803.9) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><rect class="j" width="70" height="94"/><ellipse id="d" class="m" cx="35" cy="83.3" rx="14.4" ry="3.7"/><ellipse id="e" class="l" cx="35" cy="83.3" rx="7.5" ry="3"/><path class="o" d="m26.5,71l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="p" cx="34.8" cy="45.4" rx="19.8" ry="19.2"/><ellipse class="n" cx="35" cy="45.2" rx="20.1" ry="19.6"/><ellipse class="h" cx="35" cy="45.2" rx="19" ry="18.5"/><ellipse class="n" cx="35" cy="45.2" rx="20.1" ry="19.6"/><ellipse class="i" cx="35" cy="45.2" rx="19" ry="18.5"/><line class="k" x1="17.9" y1="53.1" x2="42.2" y2="29.3"/><line class="k" x1="21.4" y1="57.7" x2="47.6" y2="32.2"/><path class="k" d="m26.4,61.7l13.4-13.1,11.9-11.5"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4003_0.svg b/collect-library/src/main/assets/omdb/icon_4003_0.svg
index 932d090d..a4b0b73b 100644
--- a/collect-library/src/main/assets/omdb/icon_4003_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_4003_0.svg
@@ -1,39 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
-    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
-    <defs>
-        <radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
-            gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#ff9287" />
-            <stop offset=".8" stop-color="#ff5f4c" />
-            <stop offset="1" stop-color="#ff5f4c" />
-        </radialGradient>
-        <radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
-            gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#e75545" />
-            <stop offset=".8" stop-color="#c4483b" />
-            <stop offset="1" stop-color="#983b31" />
-        </radialGradient>
-    </defs>
-    <g id="c">
-        <rect x="0" width="69.7" height="136" style="fill:rgba(255,255,255,0); stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
-            style="fill:#ff5f4c; isolation:isolate; opacity:.3; stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
-            style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;" />
-        <path
-            d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
-            style="fill:url(#d); stroke-width:0px;" />
-        <circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="30" style="fill:#fff; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="28.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
-        <path
-            d="m34.8,92c-3.2,0-6.4-.6-9.3-1.9-2.9-1.2-5.4-2.9-7.6-5.1-2.2-2.2-3.9-4.8-5.1-7.6-1.3-3-1.9-6.1-1.9-9.3s.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6,2.2-2.2,4.8-3.9,7.6-5.1,3-1.3,6.1-1.9,9.3-1.9s6.4.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1,2.2,2.2,3.9,4.8,5.1,7.6,1.3,3,1.9,6.1,1.9,9.3s-.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6-2.2,2.2-4.8,3.9-7.6,5.1-3,1.3-6.1,1.9-9.3,1.9Z"
-            style="fill:#fff; stroke-width:0px;" />
-        <path
-            d="m34.8,46c-3,0-5.9.6-8.6,1.7-2.6,1.1-5,2.7-7,4.7-2,2-3.6,4.4-4.7,7-1.1,2.7-1.7,5.6-1.7,8.6s.6,5.9,1.7,8.6c1.1,2.6,2.7,5,4.7,7,2,2,4.4,3.6,7,4.7,2.7,1.1,5.6,1.7,8.6,1.7s5.9-.6,8.6-1.7c2.6-1.1,5-2.7,7-4.7,2-2,3.6-4.4,4.7-7,1.1-2.7,1.7-5.6,1.7-8.6s-.6-5.9-1.7-8.6c-1.1-2.6-2.7-5-4.7-7-2-2-4.4-3.6-7-4.7-2.7-1.1-5.6-1.7-8.6-1.7m0-4c14.4,0,26,11.6,26,26s-11.6,26-26,26-26-11.6-26-26,11.6-26,26-26Z"
-            style="fill:#2a23f5; stroke-width:0px;" />
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;stroke-width:2.1px;}.h,.i{fill:none;}.j{fill:#a74d4b;opacity:.7;}.j,.i,.k,.l,.m,.n,.o{stroke-width:0px;}.j,.k{isolation:isolate;}.i{opacity:0;}.k{fill:#ff5f4c;opacity:.3;}.l{fill:#2a23f5;}.m{fill:#fff;}.n{fill:url(#f);}.o{fill:url(#g);}</style><radialGradient id="f" cx="-3.7" cy="281" fx="-3.7" fy="281" r="1.3" gradientTransform="translate(4499.7 -8568.4) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9287"/><stop offset=".8" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="g" cx="-4.7" cy="282.1" fx="-4.7" fy="282.1" r=".5" gradientTransform="translate(218.3 -10783.8) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><ellipse id="d" class="k" cx="35" cy="83.9" rx="14.4" ry="3.7"/><ellipse id="e" class="j" cx="35" cy="83.9" rx="7.5" ry="3"/><path class="n" d="m26.2,71l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="o" cx="34.5" cy="45.4" rx="19.8" ry="19.2"/><ellipse class="m" cx="34.7" cy="45.2" rx="21.6" ry="21"/><ellipse class="h" cx="34.7" cy="45.2" rx="20.5" ry="19.9"/><path class="m" d="m34.7,61.9c-2.3,0-4.6-.4-6.7-1.3-2.1-.8-3.9-2-5.5-3.6-1.6-1.5-2.8-3.4-3.7-5.3-.9-2.1-1.4-4.3-1.4-6.5s.4-4.5,1.4-6.5c.9-2,2.1-3.8,3.7-5.3,1.6-1.5,3.4-2.7,5.5-3.6,2.2-.9,4.4-1.3,6.7-1.3s4.6.4,6.7,1.3c2.1.8,3.9,2,5.5,3.6s2.8,3.4,3.7,5.3c.9,2.1,1.4,4.3,1.4,6.5s-.4,4.5-1.4,6.5c-.9,2-2.1,3.8-3.7,5.3-1.6,1.5-3.4,2.7-5.5,3.6-2.2.9-4.4,1.3-6.7,1.3Z"/><path class="l" d="m34.7,29.8c-2.2,0-4.2.4-6.2,1.2-1.9.8-3.6,1.9-5,3.3s-2.6,3.1-3.4,4.9c-.8,1.9-1.2,3.9-1.2,6s.4,4.1,1.2,6c.8,1.8,1.9,3.5,3.4,4.9s3.2,2.5,5,3.3c1.9.8,4,1.2,6.2,1.2s4.2-.4,6.2-1.2c1.9-.8,3.6-1.9,5-3.3s2.6-3.1,3.4-4.9c.8-1.9,1.2-3.9,1.2-6s-.4-4.1-1.2-6c-.8-1.8-1.9-3.5-3.4-4.9s-3.2-2.5-5-3.3c-1.9-.8-4-1.2-6.2-1.2m0-2.8c10.3,0,18.7,8.1,18.7,18.2s-8.3,18.2-18.7,18.2-18.7-8.1-18.7-18.2,8.3-18.2,18.7-18.2Z"/><circle class="m" cx="34.8" cy="45.3" r="15.7"/><rect class="i" width="70" height="94"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4003_1.svg b/collect-library/src/main/assets/omdb/icon_4003_1.svg
index 14efe86d..656c30ea 100644
--- a/collect-library/src/main/assets/omdb/icon_4003_1.svg
+++ b/collect-library/src/main/assets/omdb/icon_4003_1.svg
@@ -1,47 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
-    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
-    <defs>
-        <radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
-            gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#b5b4b4" />
-            <stop offset=".7" stop-color="#6e6c6c" />
-            <stop offset="1" stop-color="#2f2f2f" />
-        </radialGradient>
-        <radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
-            gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#e75545" />
-            <stop offset=".8" stop-color="#c4483b" />
-            <stop offset="1" stop-color="#983b31" />
-        </radialGradient>
-    </defs>
-    <g id="c">
-        <rect x="0" width="69.7" height="136" style="fill:none; stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
-            style="fill:#4d4d4d; isolation:isolate; opacity:.3; stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
-            style="fill:#363333; isolation:isolate; opacity:.7; stroke-width:0px;" />
-        <path
-            d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
-            style="fill:url(#d); stroke-width:0px;" />
-        <circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="26.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
-        <circle cx="34.8" cy="68" r="30" style="fill:#fff; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="28.5" style="fill:none; stroke:#db4646; stroke-width:3px;" />
-        <path
-            d="m34.8,92c-3.2,0-6.4-.6-9.3-1.9-2.9-1.2-5.4-2.9-7.6-5.1-2.2-2.2-3.9-4.8-5.1-7.6-1.3-3-1.9-6.1-1.9-9.3s.6-6.4,1.9-9.3c1.2-2.9,2.9-5.4,5.1-7.6,2.2-2.2,4.8-3.9,7.6-5.1,3-1.3,6.1-1.9,9.3-1.9s6.4.6,9.3,1.9c2.9,1.2,5.4,2.9,7.6,5.1,2.2,2.2,3.9,4.8,5.1,7.6,1.3,3,1.9,6.1,1.9,9.3s-.6,6.4-1.9,9.3c-1.2,2.9-2.9,5.4-5.1,7.6-2.2,2.2-4.8,3.9-7.6,5.1-3,1.3-6.1,1.9-9.3,1.9Z"
-            style="fill:#fff; stroke-width:0px;" />
-        <path
-            d="m34.8,46c-3,0-5.9.6-8.6,1.7-2.6,1.1-5,2.7-7,4.7-2,2-3.6,4.4-4.7,7-1.1,2.7-1.7,5.6-1.7,8.6s.6,5.9,1.7,8.6c1.1,2.6,2.7,5,4.7,7,2,2,4.4,3.6,7,4.7,2.7,1.1,5.6,1.7,8.6,1.7s5.9-.6,8.6-1.7c2.6-1.1,5-2.7,7-4.7,2-2,3.6-4.4,4.7-7,1.1-2.7,1.7-5.6,1.7-8.6s-.6-5.9-1.7-8.6c-1.1-2.6-2.7-5-4.7-7-2-2-4.4-3.6-7-4.7-2.7-1.1-5.6-1.7-8.6-1.7m0-4c14.4,0,26,11.6,26,26s-11.6,26-26,26-26-11.6-26-26,11.6-26,26-26Z"
-            style="fill:#2f2f2f; stroke-width:0px;" />
-        <line x1="12.3" y1="77.5" x2="44.3" y2="45.5"
-            style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
-        <line x1="16.3" y1="84.5" x2="52.3" y2="50.5"
-            style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
-        <path d="m24,89.4l33.3-31.9"
-            style="fill:none; stroke:#2f2f2f; stroke-linecap:round; stroke-width:2px;" />
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{stroke:#db4646;stroke-width:2.1px;}.h,.i,.j{fill:none;}.k{fill:#363333;opacity:.7;}.k,.l{isolation:isolate;}.k,.l,.i,.m,.n,.o,.p{stroke-width:0px;}.l{fill:#262d34;opacity:.2;}.i{opacity:0;}.j{stroke:#2f2f2f;stroke-linecap:round;stroke-width:1.4px;}.m{fill:#2f2f2f;}.n{fill:#fff;}.o{fill:url(#e);}.p{fill:url(#d);}</style><radialGradient id="d" cx="-167.6" cy="279.9" fx="-167.6" fy="279.9" r="1.3" gradientTransform="translate(11449.3 -3063) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#b5b4b4"/><stop offset=".7" stop-color="#6e6c6c"/><stop offset="1" stop-color="#2f2f2f"/></radialGradient><radialGradient id="e" cx="-168" cy="283.4" fx="-168" fy="283.4" r=".5" gradientTransform="translate(6660.2 -10832.7) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><rect class="i" width="70" height="94"/><path class="p" d="m27.1,69.3l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="o" cx="35.4" cy="43.7" rx="19.8" ry="19.2"/><ellipse class="n" cx="35.6" cy="43.5" rx="20.1" ry="19.6"/><ellipse class="h" cx="35.6" cy="43.5" rx="19" ry="18.5"/><ellipse class="n" cx="35.6" cy="43.5" rx="21.6" ry="21"/><ellipse class="h" cx="35.6" cy="43.5" rx="20.5" ry="19.9"/><path class="n" d="m35.6,60.2c-2.3,0-4.6-.4-6.7-1.3-2.1-.8-3.9-2-5.5-3.6-1.6-1.5-2.8-3.4-3.7-5.3-.9-2.1-1.4-4.3-1.4-6.5s.4-4.5,1.4-6.5c.9-2,2.1-3.8,3.7-5.3,1.6-1.5,3.4-2.7,5.5-3.6,2.2-.9,4.4-1.3,6.7-1.3s4.6.4,6.7,1.3c2.1.8,3.9,2,5.5,3.6s2.8,3.4,3.7,5.3c.9,2.1,1.4,4.3,1.4,6.5s-.4,4.5-1.4,6.5c-.9,2-2.1,3.8-3.7,5.3-1.6,1.5-3.4,2.7-5.5,3.6-2.2.9-4.4,1.3-6.7,1.3Z"/><path class="m" d="m35.6,28.1c-2.2,0-4.2.4-6.2,1.2-1.9.8-3.6,1.9-5,3.3s-2.6,3.1-3.4,4.9c-.8,1.9-1.2,3.9-1.2,6s.4,4.1,1.2,6c.8,1.8,1.9,3.5,3.4,4.9s3.2,2.5,5,3.3c1.9.8,4,1.2,6.2,1.2s4.2-.4,6.2-1.2c1.9-.8,3.6-1.9,5-3.3s2.6-3.1,3.4-4.9c.8-1.9,1.2-3.9,1.2-6s-.4-4.1-1.2-6c-.8-1.8-1.9-3.5-3.4-4.9s-3.2-2.5-5-3.3c-1.9-.8-4-1.2-6.2-1.2m0-2.8c10.3,0,18.7,8.1,18.7,18.2s-8.3,18.2-18.7,18.2-18.7-8.1-18.7-18.2,8.3-18.2,18.7-18.2Z"/><line class="j" x1="19.5" y1="50.1" x2="42.4" y2="27.7"/><line class="j" x1="22.3" y1="55" x2="48.2" y2="31.2"/><path class="j" d="m27.9,58.4l23.9-22.3"/><ellipse id="f" class="l" cx="35.8" cy="82" rx="14.4" ry="3.7"/><ellipse id="g" class="k" cx="35.8" cy="82" rx="7.5" ry="3"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_4004_0.svg b/collect-library/src/main/assets/omdb/icon_4004_0.svg
index ada8b8eb..6f7cd500 100644
--- a/collect-library/src/main/assets/omdb/icon_4004_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_4004_0.svg
@@ -1,35 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="b" xmlns="http://www.w3.org/2000/svg" width="69.7" height="136"
-    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 69.7 136">
-    <defs>
-        <radialGradient id="d" cx="16.6" cy="167.7" fx="16.6" fy="167.7" r="1.3"
-            gradientTransform="translate(-4555.9 6707) rotate(38.9) scale(76 -48) skewX(-8.4)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#ff9287" />
-            <stop offset=".8" stop-color="#ff5f4c" />
-            <stop offset="1" stop-color="#ff5f4c" />
-        </radialGradient>
-        <radialGradient id="e" cx="16.4" cy="167.9" fx="16.4" fy="167.9" r=".5"
-            gradientTransform="translate(-867.4 9288.4) scale(54.9 -54.9)"
-            gradientUnits="userSpaceOnUse">
-            <stop offset="0" stop-color="#e75545" />
-            <stop offset=".8" stop-color="#c4483b" />
-            <stop offset="1" stop-color="#983b31" />
-        </radialGradient>
-    </defs>
-    <g id="c">
-        <rect x="0" width="69.7" height="136" style="fill:rgba(255,255,255,0); stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="24.2" ry="8.5"
-            style="fill:#ff5f4c; isolation:isolate; opacity:.3; stroke-width:0px;" />
-        <ellipse cx="34.8" cy="123.5" rx="8.5" ry="3.3"
-            style="fill:#a74d4b; isolation:isolate; opacity:.7; stroke-width:0px;" />
-        <path
-            d="m23,104.9c-.5-.5-1-1-1.5-1.5C8.2,97.4-.2,84.2,0,69.7,0,49.6,15.6,33.3,34.8,33.3s34.8,16.3,34.8,36.4-9,28.3-21.7,33.7c-.4.4-.8.9-1.2,1.4-4.7,5.6-8.6,11.9-11.5,18.6,0,0-5-11.2-12.4-18.6Z"
-            style="fill:url(#d); stroke-width:0px;" />
-        <circle cx="34.5" cy="68.4" r="27.5" style="fill:url(#e); stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="28" style="fill:#fff; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="24" style="fill:#2a23f5; stroke-width:0px;" />
-        <circle cx="34.8" cy="68" r="25.5"
-            style="fill:none; stroke:#db4646; stroke-dasharray:0 0 9 10; stroke-linecap:square; stroke-width:3px;" />
-    </g>
-</svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94"><defs><style>.h{fill:#a74d4b;opacity:.7;}.h,.i,.j,.k,.l,.m,.n{stroke-width:0px;}.h,.j{isolation:isolate;}.i{opacity:0;}.i,.o{fill:none;}.j{fill:#ff5f4c;opacity:.3;}.o{stroke:#db4646;stroke-dasharray:0 0 0 0 0 0 6.4 7.1;stroke-linecap:square;stroke-width:2.1px;}.k{fill:#2a23f5;}.l{fill:#fff;}.m{fill:url(#f);}.n{fill:url(#g);}</style><radialGradient id="f" cx="131.4" cy="284.8" fx="131.4" fy="284.8" r="1.3" gradientTransform="translate(-1182.6 -13193.2) rotate(38.1) scale(54 33.9) skewX(7.5)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#ff9287"/><stop offset=".8" stop-color="#ff5f4c"/><stop offset="1" stop-color="#ff5f4c"/></radialGradient><radialGradient id="g" cx="128.9" cy="283.6" fx="128.9" fy="283.6" r=".5" gradientTransform="translate(-5048.6 -10839.4) scale(39.4 38.4)" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#e75545"/><stop offset=".8" stop-color="#c4483b"/><stop offset="1" stop-color="#983b31"/></radialGradient></defs><g id="c"><ellipse id="d" class="j" cx="35.5" cy="84.1" rx="14.4" ry="3.7"/><ellipse id="e" class="h" cx="35.5" cy="84.1" rx="7.5" ry="3"/><path class="m" d="m26.7,71.1l-1.1-1c-9.6-4.2-15.6-13.4-15.4-23.6,0-14.1,11.2-25.5,25-25.5s25,11.4,25,25.5-6.5,19.8-15.6,23.6c-.3.3-.6.6-.9,1-3.4,3.9-6.2,8.3-8.3,13,0,0-3.6-7.8-8.9-13h.1Z"/><ellipse class="n" cx="35" cy="45.6" rx="19.8" ry="19.2"/><ellipse class="l" cx="35.2" cy="45.3" rx="20.1" ry="19.6"/><ellipse class="k" cx="35.2" cy="45.3" rx="17.2" ry="16.8"/><ellipse class="o" cx="35.2" cy="45.3" rx="18.3" ry="17.8"/><rect class="i" width="70" height="94"/></g></svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_arrow_right_bottom.svg b/collect-library/src/main/assets/omdb/icon_arrow_right_bottom.svg
new file mode 100644
index 00000000..6cb7a703
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_arrow_right_bottom.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="70" height="94"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 70 94">
+    <defs>
+        <style>.e{fill:none;opacity:0;}.e,.f{stroke-width:0px;}.f{fill:url(#d);}</style>
+        <linearGradient id="d" x1="399.5" y1="413.3" x2="399.5" y2="411.9"
+            gradientTransform="translate(-4397.7 -3927.6) rotate(90) scale(10 -10.8)"
+            gradientUnits="userSpaceOnUse">
+            <stop offset="0" stop-color="#ca4916" />
+            <stop offset="1" stop-color="#f7ad5d" />
+        </linearGradient>
+    </defs>
+    <g id="c">
+        <rect class="e" width="70" height="94" />
+        <path class="f"
+            d="m35,82.4h22.4v-4.1c0-.7.4-1.3,1-1.6.6-.3,1.3-.2,1.7.2l7.4,5.8c.8.6.9,1.7.2,2.5,0,0-.1.1-.2.2l-7.4,5.8c-.5.4-1.2.5-1.7.2-.6-.3-1-.9-1-1.6v-4.2h-22.3c0-.6,0-.7,0-1.4s0-1.1,0-1.9h0Z" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
index 4b834f83..95799a6c 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
@@ -35,6 +35,8 @@ public enum class DataCodeEnum(var tableName: String, var code: String) {
     OMDB_LANE_NUM("车道数", "2041"),
     OMDB_PHY_LANENUM("物理车道数", "2097"),
     OMDB_VIADUCT("高架", "2043"),
+    OMDB_LINK_SEPARATION("设施分离", "2070"),
+    OMDB_LINK_MEDIAN("中央隔离带", "2071"),
     OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"),
     OMDB_LANE_CONSTRUCTION("车道施工", "2090"),
     OMDB_LANE_TYPE_ACCESS("车道类型","2092"),
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 0db8f305..1e7c1472 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
@@ -91,7 +91,7 @@ public class OMDBDataDecoder extends TileDecoder {
             }
         });
         //增加交通标牌聚合显示
-        List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 5.0);
+        List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 3.0);
         if (list1 != null && list1.size() > 0) {
             Log.e("qj", "聚合交通标牌转换开始" + list.size());
             list1.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
@@ -105,7 +105,7 @@ public class OMDBDataDecoder extends TileDecoder {
             Log.e("qj", "聚合交通标牌转换结束" + list1.size());
         }
         //增加交通标牌聚合显示
-        List<RenderEntity> list2 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFICLIGHT.getCode(), traffList, 5.0);
+        List<RenderEntity> list2 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFICLIGHT.getCode(), traffList, 2.0);
         if (list2 != null && list2.size() > 0) {
             Log.e("qj", "聚合红绿灯转换开始" + traffList.size());
             list2.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
diff --git a/vtm b/vtm
index c046e788..024159af 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit c046e788f5c739612a31c308639fca2de639669a
+Subproject commit 024159afee2b9e438dd6c2a6419e034df287a8db

From 6563a413896d5b719e511bea71e9dd10e396cc22 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 24 Nov 2023 13:40:32 +0800
Subject: [PATCH 07/16] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt | 6 ++----
 collect-library/src/main/assets/editormarker.xml          | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

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 6537bf27..58f877ab 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -830,15 +830,13 @@ class ImportPreProcess {
                     0,1,2->{
                         if (medianWidth != null) {
                             angleReference.geometry =
-                                GeometryTools.computeLine(medianWidth/100000000, 0.0, renderEntity.geometry)
-                            Log.e("qj","width==${medianWidth/100000000}")
+                                GeometryTools.computeLine(0.000012, 0.0, renderEntity.geometry)
                         }
                     }
                     3->{
                         if (medianWidth != null) {
                             angleReference.geometry =
-                                GeometryTools.computeLine(0.0, medianWidth/100000000, renderEntity.geometry)
-                            Log.e("qj","width==${medianWidth/100000000}")
+                                GeometryTools.computeLine(0.0, 0.000012, renderEntity.geometry)
                         }
                     }
                 }
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index c5b33766..558f62de 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1651,7 +1651,7 @@
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <line stroke="#495462" use="boundaryType" width="0.2"/>
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">
@@ -1678,7 +1678,7 @@
             </m>
             <!--墙-->
             <m k="boundaryType" v="5">
-                <line stroke="#495462" use="boundaryType" width="0.2"/>
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
             </m>
             <!--铺设路面边缘-->
             <m k="boundaryType" v="6">

From 559f55f4989d22d0d7d56ec7be0b1ac0fff08de5 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Mon, 27 Nov 2023 09:36:28 +0800
Subject: [PATCH 08/16] =?UTF-8?q?=E8=A6=81=E7=B4=A0=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json                          | 4 ++--
 collect-library/src/main/assets/editormarker.xml              | 4 ++--
 .../navinfo/collect/library/map/source/OMDBDataDecoder.java   | 2 +-
 vtm                                                           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index 5a274375..d7c5d125 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -362,7 +362,7 @@
         "zoomMax": 20,
         "is3D": true,
         "catch": true,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "transformer": [
           {
             "k": "geometry",
@@ -712,7 +712,7 @@
         "name": "车信",
         "catch": true,
         "isDependOnOtherTable": false,
-        "checkLinkId": false,
+        "checkLinkId": true,
         "zoomMin": 15,
         "zoomMax": 17,
         "transformer": [
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 8618f0a7..09903d8e 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1939,12 +1939,12 @@
             <m k="speedFlag" v="0">
 <!--                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"-->
 <!--                    stroke-width="1.0"></caption>-->
-                <symbol background="assets:omdb/icon_4002_0.png" symbol-width="24" content-rect="20,80,20,60" src="@text-src"></symbol>
+                <symbol background="assets:omdb/icon_4002_0.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
             </m>
             <m k="speedFlag" v="1">
 <!--                <caption fill="#000000" k="maxSpeed" priority="0" size="10" stroke="#ffffff"-->
 <!--                    stroke-width="1.0"></caption>-->
-                <symbol background="assets:omdb/icon_4002_1.png" symbol-width="24" content-rect="20,80,20,60" src="@text-src"></symbol>
+                <symbol background="assets:omdb/icon_4002_1.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
             </m>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"
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 1e7c1472..824e0b09 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
@@ -91,7 +91,7 @@ public class OMDBDataDecoder extends TileDecoder {
             }
         });
         //增加交通标牌聚合显示
-        List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 3.0);
+        List<RenderEntity> list1 = GeometryTools.groupByDistance(DataCodeEnum.OMDB_TRAFFIC_SIGN.getCode(), list, 5.0);
         if (list1 != null && list1.size() > 0) {
             Log.e("qj", "聚合交通标牌转换开始" + list.size());
             list1.stream().iterator().forEachRemaining(new Consumer<RenderEntity>() {
diff --git a/vtm b/vtm
index 3eb80a33..0596b02c 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 3eb80a33c6b54609a47083c38fe35fd4916edba9
+Subproject commit 0596b02c53f3dad6dba98441820eb63667d9bd88

From 69849fee98e033d6d185b741b22f0abeaf580678 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Mon, 27 Nov 2023 15:10:48 +0800
Subject: [PATCH 09/16] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9vtm=E5=AD=90?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84git=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitmodules | 4 ++--
 vtm         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 48596a20..38527a15 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "vtm"]
 	path = vtm
-	url = git@github.com:xiaoyan159/vtm.git
-	branch = master
+	url = git@gitee.com:navinfo-mobile/vtm.git
+	branch = navinfo
 
diff --git a/vtm b/vtm
index 3eb80a33..30e94bcd 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 3eb80a33c6b54609a47083c38fe35fd4916edba9
+Subproject commit 30e94bcd06009bcb3f4c469ee7bb8062334d6124

From 32d3d1a76fd38a503b786ee58972e7e8a9562bd2 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 28 Nov 2023 09:22:10 +0800
Subject: [PATCH 10/16] merge code

---
 .../java/com/navinfo/omqs/util/SignUtil.kt    | 20 +++++++++++++++++++
 vtm                                           |  2 +-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
index 853115d1..7ac5fbea 100644
--- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
@@ -24,6 +24,9 @@ import org.locationtech.jts.geom.Point
 import org.oscim.core.GeoPoint
 import java.lang.reflect.Field
 
+/*
+* 要素详情解析类及左侧提前显示内容解析说明
+* */
 class SignUtil {
     companion object {
 
@@ -796,6 +799,23 @@ class SignUtil {
 
                     list.add(TwoItemAdapterItem(title = "车道类型", text = getLaneType(data)))
                 }
+                //设施分离
+                DataCodeEnum.OMDB_LINK_SEPARATION.code -> {
+                    list.add(TwoItemAdapterItem(title = "设施分离", text = when (data.properties["separation"]) {
+                        "1" -> "坚固护栏"
+                        "2" -> "非坚固护栏"
+                        else -> ""
+                    }))
+                }
+                //中央隔离带
+                DataCodeEnum.OMDB_LINK_MEDIAN.code -> {
+                    list.add(TwoItemAdapterItem(title = "设施分离", text = when (data.properties["medianSurface"]) {
+                        "0" -> "未铺设"
+                        "1" -> "铺设"
+                        "2" -> "混合"
+                        else -> ""
+                    }))
+                }
             }
             adapter.data = list
             return adapter
diff --git a/vtm b/vtm
index 30e94bcd..0596b02c 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 30e94bcd06009bcb3f4c469ee7bb8062334d6124
+Subproject commit 0596b02c53f3dad6dba98441820eb63667d9bd88

From 4a67fb10263e4e49cc67074ed9cf383d78199ed3 Mon Sep 17 00:00:00 2001
From: unknown <Administrator@DESKTOP-BUO29C6.navinfo.net>
Date: Tue, 28 Nov 2023 09:51:18 +0800
Subject: [PATCH 11/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vtm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vtm b/vtm
index 0596b02c..30e94bcd 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 0596b02c53f3dad6dba98441820eb63667d9bd88
+Subproject commit 30e94bcd06009bcb3f4c469ee7bb8062334d6124

From a93fe8695fcad61bf42f7ae916c97dec6f601a15 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 28 Nov 2023 14:47:39 +0800
Subject: [PATCH 12/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E7=B1=BB=E8=A6=81=E7=B4=A0=E5=AF=BC=E5=85=A5=E5=8F=8A=E6=B8=B2?=
 =?UTF-8?q?=E6=9F=93=E4=B8=9A=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/assets/omdb_config.json          | 60 ++++++++++++++++++-
 .../com/navinfo/omqs/db/ImportPreProcess.kt   | 12 ++++
 .../java/com/navinfo/omqs/util/SignUtil.kt    | 42 +++++++++++++
 .../src/main/assets/editormarker.xml          | 57 ++++++++++++++++--
 .../src/main/assets/omdb/icon_2071_0.svg      | 10 +++-
 .../src/main/assets/omdb/icon_3007_0.svg      |  9 +++
 .../src/main/assets/omdb/icon_3007_1.svg      |  9 +++
 .../src/main/assets/omdb/icon_3007_2.svg      |  9 +++
 .../src/main/assets/omdb/icon_3007_3.svg      |  9 +++
 .../collect/library/enums/DataCodeEnum.kt     |  6 +-
 vtm                                           |  2 +-
 11 files changed, 216 insertions(+), 9 deletions(-)
 create mode 100644 collect-library/src/main/assets/omdb/icon_3007_0.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_3007_1.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_3007_2.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_3007_3.svg

diff --git a/app/src/main/assets/omdb_config.json b/app/src/main/assets/omdb_config.json
index d7c5d125..5dd373d9 100644
--- a/app/src/main/assets/omdb_config.json
+++ b/app/src/main/assets/omdb_config.json
@@ -390,6 +390,52 @@
           }
         ]
       },
+      "3007": {
+        "table": "OMDB_OBJECT_WARNING_AREA",
+        "code": 3007,
+        "name": "警示区",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20
+      },
+      "3009": {
+        "table": "OMDB_OBJECT_BARRIER",
+        "code": 3009,
+        "name": "护栏",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20,
+        "transformer": [
+          {
+            "k": "geometry",
+            "v": "~",
+            "klib": "geometry",
+            "vlib": "generateMulToLine()"
+          }
+        ]
+      },
+      "3010": {
+        "table": "OMDB_OBJECT_WALL",
+        "code": 3010,
+        "name": "平行墙",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20,
+        "transformer": [
+          {
+            "k": "geometry",
+            "v": "~",
+            "klib": "geometry",
+            "vlib": "generateMulToLine()"
+          }
+        ]
+      },
       "3012": {
         "table": "OMDB_FILL_AREA",
         "code": 3012,
@@ -418,9 +464,19 @@
         "catch": true,
         "zoomMax": 20
       },
-      "3027": {
+      "3019": {
+        "table": "OMDB_OBJECT_CURB",
+        "code": 3019,
+        "name": "路牙",
+        "checkLinkId": true,
+        "filterData": true,
+        "zoomMin": 18,
+        "catch": true,
+        "zoomMax": 20
+      },
+      "3028": {
         "table": "OMDB_OBJECT_REFUGE_ISLAND",
-        "code": 3027,
+        "code": 3028,
         "name": "路口内交通岛",
         "catch": true,
         "checkLinkId": true,
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 0fff377c..6bc10a98 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -1373,4 +1373,16 @@ class ImportPreProcess {
             renderEntity.properties["text-src"] = "@text:${renderEntity.properties["maxSpeed"]}"
         }
     }
+
+    /**
+     * 多线转单线
+     * */
+    fun generateMulToLine(renderEntity: RenderEntity) {
+        val translateGeometry = renderEntity.wkt
+        if (translateGeometry != null) {
+            if (translateGeometry.geometryType == Geometry.TYPENAME_MULTILINESTRING) { // 如果是多线，只取第一条线
+                renderEntity.geometry =  renderEntity.wkt!!.getGeometryN(0).toString()
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
index 7ac5fbea..fc2be460 100644
--- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
@@ -816,6 +816,48 @@ class SignUtil {
                         else -> ""
                     }))
                 }
+                //路牙
+                DataCodeEnum.OMDB_OBJECT_CURB.code -> {
+                    list.add(TwoItemAdapterItem(title = "是否符合高精地图", text = when (data.properties["compliant"]) {
+                        "0" -> "否"
+                        "1" -> "是"
+                        else -> ""
+                    }))
+                }
+                //平行墙
+                DataCodeEnum.OMDB_OBJECT_WALL.code -> {
+                    list.add(TwoItemAdapterItem(title = "类型", text = when (data.properties["type"]) {
+                        "1" -> "隧道墙"
+                        "3" -> "其他墙"
+                        else -> ""
+                    }))
+                }
+                //警示区
+                DataCodeEnum.OMDB_OBJECT_WARNING_AREA.code -> {
+                    list.add(TwoItemAdapterItem(title = "颜色", text = when (data.properties["color"]) {
+                        "0" -> "未验证"
+                        "1" -> "白色"
+                        "2" -> "黄色"
+                        "3" -> "红色"
+                        else -> ""
+                    }))
+                    list.add(TwoItemAdapterItem(title = "材质", text = when (data.properties["material"]) {
+                        "1" -> "有突起的材质"
+                        "2" -> "喷漆材质"
+                        else -> ""
+                    }))
+                }
+                //护栏
+                DataCodeEnum.OMDB_OBJECT_BARRIER.code -> {
+                    list.add(TwoItemAdapterItem(title = "护栏类型", text = when (data.properties["barrierType"]) {
+                        "0" -> "护栏"
+                        "1" -> "新泽西护栏"
+                        "2" -> "安全护栏"
+                        "3" -> "围栏"
+                        "4" -> "其他护栏"
+                        else -> ""
+                    }))
+                }
             }
             adapter.data = list
             return adapter
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 09903d8e..1d0a272e 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1785,6 +1785,53 @@
             </m>
         </m>
 
+        <!-- 路牙 -->
+        <m v="OMDB_OBJECT_CURB">
+            <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_3.svg" symbol-width="16" symbol-height="10"></symbol>
+        </m>
+
+        <!-- 护栏 -->
+        <m v="OMDB_OBJECT_BARRIER">
+          <symbol repeat="true" repeat-gap="36" gland="true" repeat-start="5" src="assets:omdb/icon_2013_4.svg" symbol-width="56" symbol-height="56"></symbol>
+        </m>
+
+        <!-- 平行墙 -->
+        <m v="OMDB_OBJECT_WALL">
+            <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
+        </m>
+
+        <!-- 警示区 -->
+        <m v="OMDB_OBJECT_WARNING_AREA">
+            <m k="material" v="1">
+                <m k="color" v="0">
+                    <area use="obj-area" stroke="#FF00C800" stroke-width="1" src="assets:omdb/icon_3007_0.svg"></area>
+                </m>
+                <m k="color" v="1">
+                    <area use="obj-area" stroke="#FF00C800" stroke-width="1" src="assets:omdb/icon_3007_1.svg"></area>
+                </m>
+                <m k="color" v="2">
+                    <area use="obj-area" stroke="#FF00C800" stroke-width="1" src="assets:omdb/icon_3007_2.svg"></area>
+                </m>
+                <m k="color" v="3">
+                    <area use="obj-area" stroke="#FF00C800" stroke-width="1" src="assets:omdb/icon_3007_3.svg"></area>
+                </m>
+            </m>
+            <m k="material" v="2">
+                <m k="color" v="0">
+                    <area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_3007_0.svg"></area>
+                </m>
+                <m k="color" v="1">
+                    <area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_3007_1.svg"></area>
+                </m>
+                <m k="color" v="2">
+                    <area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_3007_2.svg"></area>
+                </m>
+                <m k="color" v="3">
+                    <area use="obj-area" stroke="#00000000" stroke-width="1" src="assets:omdb/icon_3007_3.svg"></area>
+                </m>
+            </m>
+        </m>
+
         <!-- 道路属性 -->
         <m v="OMDB_LINK_ATTRIBUTE">
 
@@ -1958,14 +2005,16 @@
         <!--条件点限速-->
         <m v="OMDB_SPEEDLIMIT_COND">
             <m k="speedFlag" v="0">
-                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
+<!--                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
-                <symbol src="assets:omdb/icon_4003_0.svg" symbol-width="24" symbol-height="48"></symbol>
+                <symbol src="assets:omdb/icon_4003_0.svg" symbol-width="24" symbol-height="48"></symbol>-->
+                <symbol background="assets:omdb/icon_4003_0.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
             </m>
             <m k="speedFlag" v="1">
-                <caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
+                <!--<caption fill="#000000" k="maxSpeed" priority="0" size="12" stroke="#ffffff"
                     stroke-width="1.0"></caption>
-                <symbol src="assets:omdb/icon_4003_1.svg" symbol-width="24" symbol-height="48"></symbol>
+                <symbol src="assets:omdb/icon_4003_1.svg" symbol-width="24" symbol-height="48"></symbol>-->
+                <symbol background="assets:omdb/icon_4003_1.png" symbol-width="24" content-rect="20,80,32,80" src="@text-src"></symbol>
             </m>
             <m k="type" v="angle">
                 <symbol repeat="false" repeat-gap="2000" repeat-start="0" rotate="true" symbol-width="24"
diff --git a/collect-library/src/main/assets/omdb/icon_2071_0.svg b/collect-library/src/main/assets/omdb/icon_2071_0.svg
index 62b423df..4f9f7fc0 100644
--- a/collect-library/src/main/assets/omdb/icon_2071_0.svg
+++ b/collect-library/src/main/assets/omdb/icon_2071_0.svg
@@ -1 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18"><defs><style>.d{fill:#889b86;stroke-width:0px;}</style></defs><g id="c"><rect class="d" width="18" height="18"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+    <defs>
+        <style>.d{fill:#889b86;stroke-width:0px;}</style>
+    </defs>
+    <g id="c">
+        <rect class="d" width="18" height="18" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_0.svg b/collect-library/src/main/assets/omdb/icon_3007_0.svg
new file mode 100644
index 00000000..5cd7a867
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_0.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+    <defs>
+        <style>.d{fill:#cccccc;stroke-width:0px;}</style>
+    </defs>
+    <g id="c">
+        <rect class="d" width="18" height="18" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_1.svg b/collect-library/src/main/assets/omdb/icon_3007_1.svg
new file mode 100644
index 00000000..92b42e64
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_1.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+    <defs>
+        <style>.d{fill:#ffffff;stroke-width:0px;}</style>
+    </defs>
+    <g id="c">
+        <rect class="d" width="18" height="18" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_2.svg b/collect-library/src/main/assets/omdb/icon_3007_2.svg
new file mode 100644
index 00000000..2ae3a4a2
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_2.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+    <defs>
+        <style>.d{fill:#FFB400;stroke-width:0px;}</style>
+    </defs>
+    <g id="c">
+        <rect class="d" width="18" height="18" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3007_3.svg b/collect-library/src/main/assets/omdb/icon_3007_3.svg
new file mode 100644
index 00000000..80f04c4a
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3007_3.svg
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+    <defs>
+        <style>.d{fill:#FF0000;stroke-width:0px;}</style>
+    </defs>
+    <g id="c">
+        <rect class="d" width="18" height="18" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
index 95799a6c..a89155ab 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
@@ -71,10 +71,14 @@ public enum class DataCodeEnum(var tableName: String, var code: String) {
     OMDB_OBJECT_ARROW("箭头", "3004"),
     OMDB_TRAFFIC_SIGN("交通标牌", "3005"),
     OMDB_POLE("杆状物", "3006"),
+    OMDB_OBJECT_WARNING_AREA("警示区", "3007"),
+    OMDB_OBJECT_BARRIER("护栏", "3009"),
+    OMDB_OBJECT_WALL("平行墙", "3010"),
     OMDB_FILL_AREA("导流区", "3012"),
     OMDB_CROSS_WALK("人行横道", "3014"),
     OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
-    OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛", "3027"),
+    OMDB_OBJECT_CURB("路牙", "3019"),
+    OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛", "3028"),
     OMDB_INTERSECTION("路口", "4001"),
     OMDB_SPEEDLIMIT("常规点限速", "4002"),
     OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),
diff --git a/vtm b/vtm
index 30e94bcd..c2d87b10 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 30e94bcd06009bcb3f4c469ee7bb8062334d6124
+Subproject commit c2d87b1095d493a70a6b3a7aa366f9e6042300db

From acd086c25500cc6d6239f7212b7f750589e2ff8f Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 28 Nov 2023 15:27:59 +0800
Subject: [PATCH 13/16] merge code

---
 app/src/main/res/values/colors.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 8b897586..ccd482b8 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,7 +4,6 @@
     <color name="lane_info_0" comment="车信普通道路">#FF2271FF</color>
     <color name="lane_info_1" comment="车信附加道路">#FF00C800</color>
     <color name="lane_info_2" comment="车信公交道路">#FFFFB400</color>
-
     <color name="white" comment="主要按钮，背景等颜色">#FFFFFF</color> <!--白色 -->
     <color name="button_press_color" comment="默认的按钮按下去时的背景颜色">#F1EBEB</color>
     <color name="default_button_blue_color" comment="蓝色到紫色的渐变开始颜色">#4954ED</color>
@@ -12,7 +11,6 @@
     <color name="default_blue_text_color" comment="蓝色字体的默认颜色">#2631DD</color>
     <color name="input_edit_hint_color" comment="输入框hint文字，icon的颜色">#C1C0C8</color>
     <color name="high_item_color" comment="选中高亮的颜色">#FFF5F7FE</color>
-
     <color name="line_gray" comment="轻度灰色，一般用于下划线，不可点击按钮的边框">#dadade</color>
     <color name="bg_left_pannel" comment="左侧弹出框背景颜色">#f4f4fc</color>
     <color name="colorPrimary">#6c14c4</color>

From 55fc6e8d800ced7c78fae947a43e3075c35de0e7 Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 28 Nov 2023 15:53:52 +0800
Subject: [PATCH 14/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=81=93=E8=B7=AF?=
 =?UTF-8?q?=E8=BE=B9=E7=95=8C=E7=B1=BB=E5=9E=8B=E8=AF=A6=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/navinfo/omqs/util/SignUtil.kt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
index fc2be460..11a6f87e 100644
--- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
@@ -793,6 +793,23 @@ class SignUtil {
                     list.add(TwoItemAdapterItem(title = "起终点标识", text = "${data.properties["startEnd"]}"))
                     list.add(TwoItemAdapterItem(title = "高度层次", text = "${data.properties["zlevel"]}"))
                 }
+                //道路边界类型
+                DataCodeEnum.OMDB_RDBOUND_BOUNDARYTYPE.code -> {
+                    list.add(TwoItemAdapterItem(title = "道路边界线ID", text = "${data.properties["roadBoundaryLinkPid"]}"))
+                    list.add(TwoItemAdapterItem(title = "道路边界类型", text = when (data.properties["boundaryType"]?.toInt()) {
+                        0 -> "不应用"
+                        1 -> "无标线无可区分边界"
+                        2 -> "标线"
+                        3 -> "路牙"
+                        4 -> "护栏"
+                        5 -> "墙"
+                        6 -> "铺设路面边缘"
+                        7 -> "虚拟三角岛"
+                        8 -> "障碍物"
+                        9 -> "杆状障碍物"
+                        else -> ""
+                    }))
+                }
                 //车道类型
                 DataCodeEnum.OMDB_LANE_TYPE_ACCESS.code -> {
                     list.add(TwoItemAdapterItem(title = "车道中心线ID", text = "${data.properties["laneLinkPid"]}"))

From edaf8b8784a04acc4e995a7ea2db591911ac39bc Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Tue, 28 Nov 2023 17:29:14 +0800
Subject: [PATCH 15/16] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E7=AE=80?=
 =?UTF-8?q?=E8=A6=81=E6=A0=87=E9=A2=98=E5=86=85=E5=AE=B9=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?2=E3=80=81=E5=A2=9E=E5=8A=A0=E5=85=A8=E5=B0=81=E9=97=AD?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=933=E3=80=81=E4=BF=AE=E6=94=B9=E8=B7=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=86=85=E4=BA=A4=E9=80=9A=E5=B2=9B=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E4=B8=BA3028?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/navinfo/omqs/util/SignUtil.kt    |   4 +-
 .../main/res/menu/personal_center_menu.xml    |   2 +-
 .../src/main/assets/editormarker.xml          |   2 +-
 .../collect/library/enums/DataCodeEnum.kt     | 188 +++++++++---------
 4 files changed, 102 insertions(+), 94 deletions(-)

diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
index 11a6f87e..3f23e271 100644
--- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
@@ -178,9 +178,9 @@ class SignUtil {
 
                 DataCodeEnum.OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_FORNTAGE.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_SA.code, DataCodeEnum.OMDB_LINK_ATTRIBUTE_PA.code -> "道路属性"
 
-                DataCodeEnum.OMDB_LINK_FORM1_1.code, DataCodeEnum.OMDB_LINK_FORM1_2.code, DataCodeEnum.OMDB_LINK_FORM1_3.code, DataCodeEnum.OMDB_LINK_FORM2_1.code, DataCodeEnum.OMDB_LINK_FORM2_2.code, DataCodeEnum.OMDB_LINK_FORM2_3.code, DataCodeEnum.OMDB_LINK_FORM2_4.code, DataCodeEnum.OMDB_LINK_FORM2_5.code, DataCodeEnum.OMDB_LINK_FORM2_6.code, DataCodeEnum.OMDB_LINK_FORM2_7.code, DataCodeEnum.OMDB_LINK_FORM2_8.code, DataCodeEnum.OMDB_LINK_FORM2_9.code, DataCodeEnum.OMDB_LINK_FORM2_10.code, DataCodeEnum.OMDB_LINK_FORM2_11.code, DataCodeEnum.OMDB_LINK_FORM2_12.code, DataCodeEnum.OMDB_LINK_FORM2_13.code -> "道路形态"
+                DataCodeEnum.OMDB_LINK_FORM1_1.code, DataCodeEnum.OMDB_LINK_FORM1_2.code, DataCodeEnum.OMDB_LINK_FORM1_3.code, DataCodeEnum.OMDB_LINK_FORM2_1.code, DataCodeEnum.OMDB_LINK_FORM2_2.code, DataCodeEnum.OMDB_LINK_FORM2_3.code, DataCodeEnum.OMDB_LINK_FORM2_4.code, DataCodeEnum.OMDB_LINK_FORM2_5.code, DataCodeEnum.OMDB_LINK_FORM2_6.code, DataCodeEnum.OMDB_LINK_FORM2_7.code, DataCodeEnum.OMDB_LINK_FORM2_8.code, DataCodeEnum.OMDB_LINK_FORM2_9.code, DataCodeEnum.OMDB_LINK_FORM2_10.code, DataCodeEnum.OMDB_LINK_FORM2_11.code, DataCodeEnum.OMDB_LINK_FORM2_12.code, DataCodeEnum.OMDB_LINK_FORM2_13.code -> "形态"
 
-                else -> DataCodeEnum.findTableNameByCode(data.code)
+                else -> DataCodeEnum.findTableSubNameByCode(data.code)
             }
         }
 
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index d7252870..ea501dd6 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -64,7 +64,7 @@
         <item
             android:id="@+id/personal_center_menu_version"
             android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：24QE1_V1.2.1_20231124_A" />
+            android:title="版本：24QE1_V1.2.2_20231128_A" />
     </group>
     <group android:checkableBehavior="single">
         <item android:title="小标题">
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 1d0a272e..5f831d59 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1866,7 +1866,7 @@
         </m>
 
         <!-- 全封闭 -->
-        <m v="OMDB_CON_ACESS">
+        <m v="OMDB_CON_ACCESS">
             <line use="road_morphology" />
         </m>
 
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
index a89155ab..6f94fe5b 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/enums/DataCodeEnum.kt
@@ -3,96 +3,96 @@ package com.navinfo.collect.library.enums
 /*
 * 要素枚举定义
 * */
-public enum class DataCodeEnum(var tableName: String, var code: String) {
-    OMDB_NODE_FORM("点形态", "1007-6"),
-    OMDB_NODE_PA("点形态PA", "1007-6"),
-    OMDB_CHECKPOINT("检查点", "1012"),
-    OMDB_RD_LINK("道路线", "2001"),
-    OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "2002"),
-    OMDB_LINK_ATTRIBUTE("道路属性", "2004"),
-    OMDB_LINK_ATTRIBUTE_SA("道路属性-SA", "2004-1"),
-    OMDB_LINK_ATTRIBUTE_PA("道路属性-PA", "2004-2"),
-    OMDB_LINK_ATTRIBUTE_FORNTAGE("道路属性-辅路", "2004-3"),
-    OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS("道路属性-主辅路出入口", "2004-4"),
-    OMDB_RD_LINK_KIND("道路种别", "2008"),
-    OMDB_LINK_DIRECT("道路方向", "2010"),
-    OMDB_LINK_NAME("道路名", "2011"),
-    OMDB_LANE_MARK_BOUNDARYTYPE("车道边界类型", "2013"),
-    OMDB_LINK_CONSTRUCTION("道路施工", "2017"),
-    OMDB_LINK_SPEEDLIMIT("常规线限速", "2019"),
-    OMDB_LINK_SPEEDLIMIT_COND("条件线限速", "2020"),
-    OMDB_LINK_SPEEDLIMIT_VAR("可变线限速", "2021"),
-    OMDB_CON_ACCESS("全封闭", "2022"),
-    OMDB_RAMP("匝道", "2037"),
-    OMDB_RAMP_1("普通路连接匝道", "2037-1"),
-    OMDB_RAMP_2("高速入口匝道", "2037-2"),
-    OMDB_RAMP_3("高速出口匝道", "2037-3"),
-    OMDB_RAMP_4("高速连接匝道", "2037-4"),
-    OMDB_RAMP_5("高速直连入口匝道", "2037-5"),
-    OMDB_RAMP_6("高速直连出口匝道", "2037-6"),
-    OMDB_RAMP_7("高速直连出口匝道高速出入口匝道", "2037-7"),
-    OMDB_MULTI_DIGITIZED("上下线分离", "2040"),
-    OMDB_LANE_NUM("车道数", "2041"),
-    OMDB_PHY_LANENUM("物理车道数", "2097"),
-    OMDB_VIADUCT("高架", "2043"),
-    OMDB_LINK_SEPARATION("设施分离", "2070"),
-    OMDB_LINK_MEDIAN("中央隔离带", "2071"),
-    OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "2083"),
-    OMDB_LANE_CONSTRUCTION("车道施工", "2090"),
-    OMDB_LANE_TYPE_ACCESS("车道类型","2092"),
-    OMDB_BRIDGE("桥", "2201"),
-    OMDB_BRIDGE_1("固定桥", "2201-1"),
-    OMDB_BRIDGE_2("可移动桥", "2201-2"),
-    OMDB_BRIDGE_3("跨线天桥", "2201-2"),
-    OMDB_TUNNEL("隧道", "2202"),
-    OMDB_ROUNDABOUT("环岛", "2204"),
-    OMDB_LINK_FORM1("道路形态1", "2205"),
-    OMDB_LINK_FORM1_1("U-Turn", "2205-1"),
-    OMDB_LINK_FORM1_2("提前右转", "2205-2"),
-    OMDB_LINK_FORM1_3("提前左转", "2205-3"),
-    OMDB_LINK_FORM2("道路形态2", "2206"),
-    OMDB_LINK_FORM2_1("IC", "2206-1"),
-    OMDB_LINK_FORM2_2("JCT", "2206-2"),
-    OMDB_LINK_FORM2_3("跨线地道", "2206-3"),
-    OMDB_LINK_FORM2_4("私道", "2206-4"),
-    OMDB_LINK_FORM2_5("步行街", "2206-5"),
-    OMDB_LINK_FORM2_6("公交专用道", "2206-6"),
-    OMDB_LINK_FORM2_7("POI 连接路", "2206-7"),
-    OMDB_LINK_FORM2_8("区域内道路", "2206-8"),
-    OMDB_LINK_FORM2_9("停车场出入口连接路", "2206-9"),
-    OMDB_LINK_FORM2_10("停车场内部虚拟连接路", "2206-10"),
-    OMDB_LINK_FORM2_11("风景路线", "2206-11"),
-    OMDB_LINK_FORM2_12("车辆测试路段", "2206-12"),
-    OMDB_LINK_FORM2_13("驾照考试路段", "2206-13"),
-    OMDB_LANE_ACCESS("通行车辆类型Lane", "2638"),
-    OMDB_OBJECT_OH_STRUCT("上方障碍物","3001"),
-    OMDB_OBJECT_TEXT("文字", "3002"),
-    OMDB_OBJECT_SYMBOL("符号", "3003"),
-    OMDB_OBJECT_ARROW("箭头", "3004"),
-    OMDB_TRAFFIC_SIGN("交通标牌", "3005"),
-    OMDB_POLE("杆状物", "3006"),
-    OMDB_OBJECT_WARNING_AREA("警示区", "3007"),
-    OMDB_OBJECT_BARRIER("护栏", "3009"),
-    OMDB_OBJECT_WALL("平行墙", "3010"),
-    OMDB_FILL_AREA("导流区", "3012"),
-    OMDB_CROSS_WALK("人行横道", "3014"),
-    OMDB_OBJECT_STOPLOCATION("停止位置", "3016"),
-    OMDB_OBJECT_CURB("路牙", "3019"),
-    OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛", "3028"),
-    OMDB_INTERSECTION("路口", "4001"),
-    OMDB_SPEEDLIMIT("常规点限速", "4002"),
-    OMDB_SPEEDLIMIT_COND("条件点限速", "4003"),
-    OMDB_SPEEDLIMIT_VAR("可变点限速", "4004"),
-    OMDB_LANE_SPEEDLIMIT("车道点限速", "4005"),
-    OMDB_RESTRICTION("普通交限", "4006"),
-    OMDB_WARNINGSIGN("警示信息", "4009"),
-    OMDB_ELECTRONICEYE("电子眼", "4010"),
-    OMDB_ZLEVEL("立交", "4016"),
-    OMDB_TRAFFICLIGHT("交通灯", "4022"),
-    OMDB_TOLLGATE("收费站", "4023"),
-    OMDB_LANEINFO("车信", "4601"),
-    OMDB_CLM_LANEINFO("车信CLM", "4602"),
-    OMDB_LANE_LINK_LG("车道中心线", "5001");
+public enum class DataCodeEnum(var tableName: String,var tableSubName: String, var code: String) {
+    OMDB_NODE_FORM("点形态","点形态", "1007-6"),
+    OMDB_NODE_PA("点形态PA","点形态PA", "1007-6"),
+    OMDB_CHECKPOINT("检查点","检查点", "1012"),
+    OMDB_RD_LINK("道路线","道路线", "2001"),
+    OMDB_RD_LINK_FUNCTION_CLASS("道路功能等级", "功能等级", "2002"),
+    OMDB_LINK_ATTRIBUTE("道路属性","道路属性", "2004"),
+    OMDB_LINK_ATTRIBUTE_SA("道路属性-SA","道路属性", "2004-1"),
+    OMDB_LINK_ATTRIBUTE_PA("道路属性-PA","道路属性", "2004-2"),
+    OMDB_LINK_ATTRIBUTE_FORNTAGE("道路属性-辅路","道路属性", "2004-3"),
+    OMDB_LINK_ATTRIBUTE_MAIN_SIDE_ACCESS("道路属性-主辅路出入口","道路属性", "2004-4"),
+    OMDB_RD_LINK_KIND("道路种别","道路种别", "2008"),
+    OMDB_LINK_DIRECT("道路方向","道路方向", "2010"),
+    OMDB_LINK_NAME("道路名","道路名", "2011"),
+    OMDB_LANE_MARK_BOUNDARYTYPE("车道边界类型","车道边界", "2013"),
+    OMDB_LINK_CONSTRUCTION("道路施工","道路施工", "2017"),
+    OMDB_LINK_SPEEDLIMIT("常规线限速","常规线限速", "2019"),
+    OMDB_LINK_SPEEDLIMIT_COND("条件线限速","条件线限速", "2020"),
+    OMDB_LINK_SPEEDLIMIT_VAR("可变线限速","可变线限速", "2021"),
+    OMDB_CON_ACCESS("全封闭","全封闭", "2022"),
+    OMDB_RAMP("匝道","匝道", "2037"),
+    OMDB_RAMP_1("普通路连接匝道","匝道", "2037-1"),
+    OMDB_RAMP_2("高速入口匝道","匝道", "2037-2"),
+    OMDB_RAMP_3("高速出口匝道","匝道", "2037-3"),
+    OMDB_RAMP_4("高速连接匝道","匝道", "2037-4"),
+    OMDB_RAMP_5("高速直连入口匝道","匝道", "2037-5"),
+    OMDB_RAMP_6("高速直连出口匝道", "匝道","2037-6"),
+    OMDB_RAMP_7("高速直连出口匝道高速出入口匝道", "匝道","2037-7"),
+    OMDB_MULTI_DIGITIZED("上下线分离", "上下线分离","2040"),
+    OMDB_LANE_NUM("车道数", "车道数","2041"),
+    OMDB_PHY_LANENUM("物理车道数", "物理车道数","2097"),
+    OMDB_VIADUCT("高架", "高架","2043"),
+    OMDB_LINK_SEPARATION("设施分离","设施分离", "2070"),
+    OMDB_LINK_MEDIAN("中央隔离带", "中央隔离带","2071"),
+    OMDB_RDBOUND_BOUNDARYTYPE("道路边界类型", "道路边界","2083"),
+    OMDB_LANE_CONSTRUCTION("车道施工", "车道施工","2090"),
+    OMDB_LANE_TYPE_ACCESS("车道类型","车道类型","2092"),
+    OMDB_BRIDGE("桥", "桥", "2201"),
+    OMDB_BRIDGE_1("固定桥", "固定桥","2201-1"),
+    OMDB_BRIDGE_2("可移动桥", "可移动桥", "2201-2"),
+    OMDB_BRIDGE_3("跨线天桥", "跨线天桥","2201-2"),
+    OMDB_TUNNEL("隧道","隧道",  "2202"),
+    OMDB_ROUNDABOUT("环岛", "环岛", "2204"),
+    OMDB_LINK_FORM1("道路形态1","形态", "2205"),
+    OMDB_LINK_FORM1_1("U-Turn", "形态","2205-1"),
+    OMDB_LINK_FORM1_2("提前右转","形态", "2205-2"),
+    OMDB_LINK_FORM1_3("提前左转", "形态","2205-3"),
+    OMDB_LINK_FORM2("道路形态2", "形态","2206"),
+    OMDB_LINK_FORM2_1("IC", "形态","2206-1"),
+    OMDB_LINK_FORM2_2("JCT", "形态","2206-2"),
+    OMDB_LINK_FORM2_3("跨线地道", "形态","2206-3"),
+    OMDB_LINK_FORM2_4("私道", "形态","2206-4"),
+    OMDB_LINK_FORM2_5("步行街", "形态","2206-5"),
+    OMDB_LINK_FORM2_6("公交专用道", "形态","2206-6"),
+    OMDB_LINK_FORM2_7("POI 连接路", "形态","2206-7"),
+    OMDB_LINK_FORM2_8("区域内道路", "形态","2206-8"),
+    OMDB_LINK_FORM2_9("停车场出入口连接路", "形态","2206-9"),
+    OMDB_LINK_FORM2_10("停车场内部虚拟连接路","形态", "2206-10"),
+    OMDB_LINK_FORM2_11("风景路线", "形态","2206-11"),
+    OMDB_LINK_FORM2_12("车辆测试路段", "形态","2206-12"),
+    OMDB_LINK_FORM2_13("驾照考试路段", "形态","2206-13"),
+    OMDB_LANE_ACCESS("通行车辆类型Lane","通行车辆", "2638"),
+    OMDB_OBJECT_OH_STRUCT("上方障碍物","上方障碍物","3001"),
+    OMDB_OBJECT_TEXT("文字", "文字", "3002"),
+    OMDB_OBJECT_SYMBOL("符号", "符号", "3003"),
+    OMDB_OBJECT_ARROW("箭头", "箭头", "3004"),
+    OMDB_TRAFFIC_SIGN("交通标牌", "交通标牌","3005"),
+    OMDB_POLE("杆状物", "杆状物","3006"),
+    OMDB_OBJECT_WARNING_AREA("警示区","警示区",  "3007"),
+    OMDB_OBJECT_BARRIER("护栏", "护栏","3009"),
+    OMDB_OBJECT_WALL("平行墙", "平行墙","3010"),
+    OMDB_FILL_AREA("导流区", "导流区","3012"),
+    OMDB_CROSS_WALK("人行横道", "人行横道","3014"),
+    OMDB_OBJECT_STOPLOCATION("停止位置", "停止位置", "3016"),
+    OMDB_OBJECT_CURB("路牙", "路牙","3019"),
+    OMDB_OBJECT_REFUGE_ISLAND("路口内交通岛", "交通岛", "3028"),
+    OMDB_INTERSECTION("路口", "路口","4001"),
+    OMDB_SPEEDLIMIT("常规点限速", "常规点限速","4002"),
+    OMDB_SPEEDLIMIT_COND("条件点限速", "条件点限速", "4003"),
+    OMDB_SPEEDLIMIT_VAR("可变点限速", "可变点限速","4004"),
+    OMDB_LANE_SPEEDLIMIT("车道点限速", "车道点限速", "4005"),
+    OMDB_RESTRICTION("普通交限", "普通交限", "4006"),
+    OMDB_WARNINGSIGN("警示信息", "警示信息", "4009"),
+    OMDB_ELECTRONICEYE("电子眼","电子眼",  "4010"),
+    OMDB_ZLEVEL("立交", "立交", "4016"),
+    OMDB_TRAFFICLIGHT("交通灯", "交通灯","4022"),
+    OMDB_TOLLGATE("收费站", "收费站","4023"),
+    OMDB_LANEINFO("车信", "车信","4601"),
+    OMDB_CLM_LANEINFO("车信CLM", "车信CLM","4602"),
+    OMDB_LANE_LINK_LG("车道中心线", "车道中心线","5001");
 
     companion object {
         fun findTableNameByCode(code: String): String {
@@ -103,6 +103,14 @@ public enum class DataCodeEnum(var tableName: String, var code: String) {
             }
             return "" // 若未找到匹配的 code，则返回 null 或其他适当的默认值
         }
+        fun findTableSubNameByCode(code: String): String {
+            for (enumInstance in DataCodeEnum.values()) {
+                if (enumInstance.code == code) {
+                    return enumInstance.tableSubName
+                }
+            }
+            return "" // 若未找到匹配的 code，则返回 null 或其他适当的默认值
+        }
     }
 }
 

From 1d0611b7e9e38b98be67037823594c4c29154d2a Mon Sep 17 00:00:00 2001
From: qiji4215 <qiji4215@navinfo.com>
Date: Fri, 1 Dec 2023 14:32:53 +0800
Subject: [PATCH 16/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=81=93?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=8D=E6=B8=B2=E6=9F=932=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8=E8=BF=9E=E7=BB=AD=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/navinfo/omqs/db/ImportPreProcess.kt   |  7 ++-
 .../http/taskdownload/TaskDownloadScope.kt    |  2 +
 .../java/com/navinfo/omqs/util/SignUtil.kt    |  2 +-
 .../main/res/menu/personal_center_menu.xml    |  2 +-
 .../src/main/assets/editormarker.xml          | 26 ++++++-----
 .../src/main/assets/omdb/icon_2092_acc_e.svg  | 25 ++++++++++-
 .../src/main/assets/omdb/icon_3010_0.svg      | 43 +++++++++++++++++++
 .../src/main/assets/omdb/icon_3010_1.svg      | 43 +++++++++++++++++++
 .../src/main/assets/omdb/icon_bike.svg        |  1 +
 9 files changed, 134 insertions(+), 17 deletions(-)
 create mode 100644 collect-library/src/main/assets/omdb/icon_3010_0.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_3010_1.svg
 create mode 100644 collect-library/src/main/assets/omdb/icon_bike.svg

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 6bc10a98..f0d8cee0 100644
--- a/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
+++ b/app/src/main/java/com/navinfo/omqs/db/ImportPreProcess.kt
@@ -286,10 +286,10 @@ class ImportPreProcess {
             startReference.properties["type"] =
                 "s${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}"
             startReference.properties["geometry"] = startReference.geometry
-            listResult.add(startReference)
+            startReference.propertiesDb =  DeflaterUtil.zipString(JSON.toJSONString(startReference.properties))
+            renderEntity.referenceEntitys.add(startReference)
 
             val endReference = ReferenceEntity()
-//            endReference.renderEntityId = renderEntity.id
             endReference.name = "${renderEntity.name}参考点"
             endReference.code = renderEntity.code
             endReference.table = renderEntity.table
@@ -305,9 +305,8 @@ class ImportPreProcess {
             endReference.properties["type"] =
                 "e${if (renderEntity.properties["laneType"]!!.toInt() and (0b1000) > 0) "_dec" else "_acc"}"
             endReference.properties["geometry"] = endReference.geometry
+            endReference.propertiesDb =  DeflaterUtil.zipString(JSON.toJSONString(endReference.properties))
             renderEntity.referenceEntitys.add(endReference)
-            //listResult.add(endReference)
-            //insertData(listResult)
         }
     }
 
diff --git a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
index 8e7a5889..4f682b40 100644
--- a/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
+++ b/app/src/main/java/com/navinfo/omqs/http/taskdownload/TaskDownloadScope.kt
@@ -177,6 +177,8 @@ class TaskDownloadScope(
                         override fun onComplete() {
                             taskBean.status = FileDownloadStatus.DONE
                             downloadData.postValue(taskBean)
+                            //移除当前任务，进行下一个任务下载逻辑
+                            downloadManager.launchNext(taskBean.id)
                             //任务与当前一致，需要更新渲染图层
                             if (MapParamUtils.getTaskId() == taskBean.id) {
                                 downloadManager.mapController.layerManagerHandler.updateOMDBVectorTileLayer()
diff --git a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
index 3f23e271..d0eb6560 100644
--- a/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
+++ b/app/src/main/java/com/navinfo/omqs/util/SignUtil.kt
@@ -85,7 +85,7 @@ class SignUtil {
                 }
                 //全封闭
                 DataCodeEnum.OMDB_CON_ACCESS.code -> {
-                    if (data.properties["conAccess"] === "1") "全封闭" else ""
+                    if (data.properties["conAccess"] == "1") "全封闭" else ""
                 }
                 //匝道
                 DataCodeEnum.OMDB_RAMP_1.code,
diff --git a/app/src/main/res/menu/personal_center_menu.xml b/app/src/main/res/menu/personal_center_menu.xml
index ea501dd6..f98ddb5f 100644
--- a/app/src/main/res/menu/personal_center_menu.xml
+++ b/app/src/main/res/menu/personal_center_menu.xml
@@ -64,7 +64,7 @@
         <item
             android:id="@+id/personal_center_menu_version"
             android:icon="@drawable/ic_baseline_layers_24"
-            android:title="版本：24QE1_V1.2.2_20231128_A" />
+            android:title="版本：24QE1_V1.2.3_20231201_A" />
     </group>
     <group android:checkableBehavior="single">
         <item android:title="小标题">
diff --git a/collect-library/src/main/assets/editormarker.xml b/collect-library/src/main/assets/editormarker.xml
index 5f831d59..6da9f562 100644
--- a/collect-library/src/main/assets/editormarker.xml
+++ b/collect-library/src/main/assets/editormarker.xml
@@ -1797,7 +1797,12 @@
 
         <!-- 平行墙 -->
         <m v="OMDB_OBJECT_WALL">
-            <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_2013_5.svg" symbol-width="16" symbol-height="10"></symbol>
+            <m k="type" v="-|1">
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_3010_0.svg" symbol-width="16" symbol-height="10"></symbol>
+            </m>
+            <m k="type" v="1">
+                <symbol repeat="true" gland="true" repeat-gap="12" repeat-start="0.01" src="assets:omdb/icon_3010_1.svg" symbol-width="16" symbol-height="10"></symbol>
+            </m>
         </m>
 
         <!-- 警示区 -->
@@ -2179,23 +2184,24 @@
         <!-- 车道类型 -->
         <m v="OMDB_LANE_TYPE_ACCESS">
             <m k="bike">
-                <line fix="true" width="3" stroke="#cccccc"></line>
+                <line fix="true" width="3" stroke="#e6e6e6"></line>
+                <symbol repeat-start="0" repeat="true" repeat-gap="128" src="assets:omdb/icon_bike.svg"></symbol>
             </m>
             <m k="type" v="s_acc">
-                <symbol src="assets:omdb/icon_2092_acc_s.svg" symbol-height="26"
-                    symbol-width="26" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_acc_s.svg"
+                    symbol-width="24" gland="true"></symbol>
             </m>
             <m k="type" v="e_acc">
-                <symbol src="assets:omdb/icon_2092_acc_e.svg" symbol-height="26"
-                    symbol-width="26" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_acc_e.svg"
+                    symbol-width="24" gland="true"></symbol>
             </m>
             <m k="type" v="s_dec">
-                <symbol src="assets:omdb/icon_2092_dec_s.svg" symbol-height="26"
-                    symbol-width="26" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_dec_s.svg"
+                    symbol-width="24" gland="true"></symbol>
             </m>
             <m k="type" v="e_dec">
-                <symbol src="assets:omdb/icon_2092_dec_e.svg" symbol-height="26"
-                    symbol-width="26" gland="true"></symbol>
+                <symbol src="assets:omdb/icon_2092_dec_e.svg"
+                    symbol-width="24" gland="true"></symbol>
             </m>
         </m>
 
diff --git a/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg b/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg
index 0dec78b2..dd758dd1 100644
--- a/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg
+++ b/collect-library/src/main/assets/omdb/icon_2092_acc_e.svg
@@ -1 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="b" xmlns="http://www.w3.org/2000/svg" width="51" height="51" viewBox="0 0 51 51"><g id="c"><circle cx="25.5" cy="25.5" r="24.5" style="fill:#0e992b; stroke-width:0px;"/><path d="m25.5,2c13,0,23.5,10.5,23.5,23.5s-10.5,23.5-23.5,23.5S2,38.5,2,25.5,12.5,2,25.5,2m0-2h0C11.4,0,0,11.4,0,25.5h0c0,14.1,11.4,25.5,25.5,25.5h0c14.1,0,25.5-11.4,25.5-25.5h0C51,11.4,39.6,0,25.5,0h0Z" style="fill:#02441e; stroke-width:0px;"/><path d="m6.4,16.1c.2.1.7.6,1.1.9l1.2-1.4,4,3.6c.7.7.6,1,0,1.8l-.3.4-.9-.4.3-.4c.3-.4.3-.6-.1-1-.3-.3-2.7-2.5-3-2.7l-.7.8c2.1,2,2.8,3,3.6,5l-.9.3c-.6-1.8-1.3-2.8-3.3-4.6l-.6.8-.7-.6.7-.8c-.4-.4-.9-.8-1.1-1l.6-.6Zm4.3-3.6l5.4,4.6-.6.6-.5-.4-.9,1.1.5.4-.6.7-5.4-4.6,2-2.4Zm3.7,4.3l-3.6-3-.9,1.1,3.6,3,.9-1.1Z" style="fill:#fff; stroke-width:0px;"/><path d="m17.1,10.6c-.3-.4-1.1-1.1-1.5-1.4l.5-.6c.4.3,1.1.9,1.5,1.3l-.5.7Zm7.4,2.8v.9c-1.2.4-2.4.7-3.6,1-1.1.3-1.7.2-2.5-.4-.2.5-.5,1-.7,1.4l-.7-.6c.3-.5.6-.9.8-1.4l-.6-2.3-.9.2-.2-.9,1.7-.5.8,3.1c.7.6,1.2.7,2.3.4,1.3-.3,2.5-.7,3.7-1.1Zm-5.8.4c.6-.5,1.2-1.3,1.5-2l-1.5.4-.6-2.3,1.8-.5-.2-.6-2,.5-.2-.8,2-.5-.2-.8.8-.2.2.7,2.1-.5.2.8-2.1.5.2.6,1.8-.5.6,2.3-1.8.5v.5c.1,0,.3-.5.3-.5.5.2,1.5.6,2.2.8l-.2.9c-.6-.3-1.5-.7-2.1-.9l.4,1.6-.8.2-.4-1.6c-.3.7-.8,1.3-1.3,1.8l-.7-.6Zm.6-2.5l1-.3-.2-.8-1,.3.2.8Zm1.6-1.3l.2.8,1.1-.3-.2-.8-1.1.3Z" style="fill:#fff; stroke-width:0px;"/><path d="m33.4,15.9l-2.9-1.1-.5,1.4-.8-.3.5-1.4-3.3-1.2.3-.8,3.3,1.2.4-1.1-2.4-.9.3-.8c.4-.3,1-.8,1.6-1.3l-1.4-.5.3-.8,1.8.7c.4-.4.7-.8.9-1.1l.8.6c-.2.3-.5.6-.7.8l3.6,1.4-.3.8-4-1.5c-.5.5-1.1,1-1.5,1.3l1.4.5.5-1.3.8.4-.5,1.2,2.2.8-.3.8-2.2-.8-.4,1.1,2.9,1.1-.3.8Z" style="fill:#fff; stroke-width:0px;"/><path d="m39.2,23.6l-.8.3c-.8-1-1.5-2-2.3-3.1-.6-1-.8-1.5-.5-2.5-.5,0-1,0-1.5-.2l.3-.9c.5,0,1.1.2,1.7.2l1.9-1.3-.5-.7.8-.5,1,1.4-2.6,1.8c-.4.9-.2,1.4.4,2.3.7,1.1,1.5,2.1,2.3,3.2Zm2.4-5.9l-1.2-1.7.6-.4.8,1.1c0-.3.2-.6.3-.9l.8.2c0,.4-.2.7-.3,1.1h-.5c0,0,.6.8.6.8.5,0,1.2,0,1.5,0v.9c-.2,0-.5,0-.9,0l.8,1.2-.6.4-1.4-2c-.2,0-.4.1-.5.2l1.1,1.6-3.5,2.5-2.5-3.5,3.5-2.5.8,1.2.6-.2Zm-2.4,3.9l.4-.3-1.5-2.1-.4.3,1.5,2.1Zm-.5-2.8l1.5,2.1.4-.3-1.5-2.1-.4.3Zm.6-3.1c.2-.5.6-1.4.8-2l.8.3c-.1.5-.5,1.4-.7,1.9l-.9-.2Zm2.3,4.2l-1.5-2.1-.4.3,1.5,2.1.4-.3Z" style="fill:#fff; stroke-width:0px;"/><path d="m23.4,37.1v.9c-.8.1-5.1.9-6,1.1v-1.7c.7-.1,5-.9,6-1.1v.8Zm-5.5-6.6l-.4-1.7c.3-.1.5-.3.6-.5.4-.5,1.6-2.7,2.3-4.7l1.5.6c-.6,1.5-1.7,3.5-2.4,4.5.3,0,1.1,0,1.7-.1.5-.9.9-1.7,1.2-2.4l1.4.6c-.9,2-2.6,4.9-3.4,6.2.6-.1,2-.4,2.4-.5v1.7c-.3,0-2.4.4-3.3.6-.4,0-.8.2-1.1.2l-.4-1.8c.6-.2.6-.3.9-.7.5-.6,1-1.5,1.5-2.4-.6,0-1.3,0-1.6.1-.3,0-.5,0-.8.1Zm16.1,2.2l-.6,1.8c-2.1-.8-3.7-1.7-5.1-2.8-.6.5-1.3,1-2.2,1.4,1.2.3,3.5,1.2,4.8,1.7l-.6,1.7c-1.1-.5-3.5-1.3-4.9-1.7l.4-1.4c-.7.4-1.4.7-2.2,1.1l-.8-1.6c1.8-.7,3.1-1.4,4.2-2.2-.6-.6-1.2-1.3-1.7-2.1-.4.7-1,1.3-1.5,1.9l-.9-1.2c1.4-1.5,2.8-4,3.4-5.7l1.5.4c-.2.4-.3.8-.5,1.3h5.2v1.7c-.9,1.5-1.7,2.6-2.8,3.8,1.2.8,2.6,1.5,4.4,2.1Zm-9.5,3.6c1.8.5,5.3,1.7,7.1,2.4l-.5,1.7c-1.8-.7-5.2-2-7.1-2.4l.5-1.7Zm1.7-9.2c.6.9,1.2,1.7,2,2.5.9-.8,1.6-1.7,2.2-2.7h-4.1v.3Z" style="fill:#fff; stroke-width:0px;"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="51" height="51" viewBox="0 0 51 51">
+    <g id="c">
+        <circle cx="25.5" cy="25.5" r="24.5" style="fill:#0e992b; stroke-width:0px;" />
+        <path
+            d="m25.5,2c13,0,23.5,10.5,23.5,23.5s-10.5,23.5-23.5,23.5S2,38.5,2,25.5,12.5,2,25.5,2m0-2h0C11.4,0,0,11.4,0,25.5h0c0,14.1,11.4,25.5,25.5,25.5h0c14.1,0,25.5-11.4,25.5-25.5h0C51,11.4,39.6,0,25.5,0h0Z"
+            style="fill:#02441e; stroke-width:0px;" />
+        <path
+            d="m6.4,16.1c.2.1.7.6,1.1.9l1.2-1.4,4,3.6c.7.7.6,1,0,1.8l-.3.4-.9-.4.3-.4c.3-.4.3-.6-.1-1-.3-.3-2.7-2.5-3-2.7l-.7.8c2.1,2,2.8,3,3.6,5l-.9.3c-.6-1.8-1.3-2.8-3.3-4.6l-.6.8-.7-.6.7-.8c-.4-.4-.9-.8-1.1-1l.6-.6Zm4.3-3.6l5.4,4.6-.6.6-.5-.4-.9,1.1.5.4-.6.7-5.4-4.6,2-2.4Zm3.7,4.3l-3.6-3-.9,1.1,3.6,3,.9-1.1Z"
+            style="fill:#fff; stroke-width:0px;" />
+        <path
+            d="m17.1,10.6c-.3-.4-1.1-1.1-1.5-1.4l.5-.6c.4.3,1.1.9,1.5,1.3l-.5.7Zm7.4,2.8v.9c-1.2.4-2.4.7-3.6,1-1.1.3-1.7.2-2.5-.4-.2.5-.5,1-.7,1.4l-.7-.6c.3-.5.6-.9.8-1.4l-.6-2.3-.9.2-.2-.9,1.7-.5.8,3.1c.7.6,1.2.7,2.3.4,1.3-.3,2.5-.7,3.7-1.1Zm-5.8.4c.6-.5,1.2-1.3,1.5-2l-1.5.4-.6-2.3,1.8-.5-.2-.6-2,.5-.2-.8,2-.5-.2-.8.8-.2.2.7,2.1-.5.2.8-2.1.5.2.6,1.8-.5.6,2.3-1.8.5v.5c.1,0,.3-.5.3-.5.5.2,1.5.6,2.2.8l-.2.9c-.6-.3-1.5-.7-2.1-.9l.4,1.6-.8.2-.4-1.6c-.3.7-.8,1.3-1.3,1.8l-.7-.6Zm.6-2.5l1-.3-.2-.8-1,.3.2.8Zm1.6-1.3l.2.8,1.1-.3-.2-.8-1.1.3Z"
+            style="fill:#fff; stroke-width:0px;" />
+        <path
+            d="m33.4,15.9l-2.9-1.1-.5,1.4-.8-.3.5-1.4-3.3-1.2.3-.8,3.3,1.2.4-1.1-2.4-.9.3-.8c.4-.3,1-.8,1.6-1.3l-1.4-.5.3-.8,1.8.7c.4-.4.7-.8.9-1.1l.8.6c-.2.3-.5.6-.7.8l3.6,1.4-.3.8-4-1.5c-.5.5-1.1,1-1.5,1.3l1.4.5.5-1.3.8.4-.5,1.2,2.2.8-.3.8-2.2-.8-.4,1.1,2.9,1.1-.3.8Z"
+            style="fill:#fff; stroke-width:0px;" />
+        <path
+            d="m39.2,23.6l-.8.3c-.8-1-1.5-2-2.3-3.1-.6-1-.8-1.5-.5-2.5-.5,0-1,0-1.5-.2l.3-.9c.5,0,1.1.2,1.7.2l1.9-1.3-.5-.7.8-.5,1,1.4-2.6,1.8c-.4.9-.2,1.4.4,2.3.7,1.1,1.5,2.1,2.3,3.2Zm2.4-5.9l-1.2-1.7.6-.4.8,1.1c0-.3.2-.6.3-.9l.8.2c0,.4-.2.7-.3,1.1h-.5c0,0,.6.8.6.8.5,0,1.2,0,1.5,0v.9c-.2,0-.5,0-.9,0l.8,1.2-.6.4-1.4-2c-.2,0-.4.1-.5.2l1.1,1.6-3.5,2.5-2.5-3.5,3.5-2.5.8,1.2.6-.2Zm-2.4,3.9l.4-.3-1.5-2.1-.4.3,1.5,2.1Zm-.5-2.8l1.5,2.1.4-.3-1.5-2.1-.4.3Zm.6-3.1c.2-.5.6-1.4.8-2l.8.3c-.1.5-.5,1.4-.7,1.9l-.9-.2Zm2.3,4.2l-1.5-2.1-.4.3,1.5,2.1.4-.3Z"
+            style="fill:#fff; stroke-width:0px;" />
+        <path
+            d="m23.4,37.1v.9c-.8.1-5.1.9-6,1.1v-1.7c.7-.1,5-.9,6-1.1v.8Zm-5.5-6.6l-.4-1.7c.3-.1.5-.3.6-.5.4-.5,1.6-2.7,2.3-4.7l1.5.6c-.6,1.5-1.7,3.5-2.4,4.5.3,0,1.1,0,1.7-.1.5-.9.9-1.7,1.2-2.4l1.4.6c-.9,2-2.6,4.9-3.4,6.2.6-.1,2-.4,2.4-.5v1.7c-.3,0-2.4.4-3.3.6-.4,0-.8.2-1.1.2l-.4-1.8c.6-.2.6-.3.9-.7.5-.6,1-1.5,1.5-2.4-.6,0-1.3,0-1.6.1-.3,0-.5,0-.8.1Zm16.1,2.2l-.6,1.8c-2.1-.8-3.7-1.7-5.1-2.8-.6.5-1.3,1-2.2,1.4,1.2.3,3.5,1.2,4.8,1.7l-.6,1.7c-1.1-.5-3.5-1.3-4.9-1.7l.4-1.4c-.7.4-1.4.7-2.2,1.1l-.8-1.6c1.8-.7,3.1-1.4,4.2-2.2-.6-.6-1.2-1.3-1.7-2.1-.4.7-1,1.3-1.5,1.9l-.9-1.2c1.4-1.5,2.8-4,3.4-5.7l1.5.4c-.2.4-.3.8-.5,1.3h5.2v1.7c-.9,1.5-1.7,2.6-2.8,3.8,1.2.8,2.6,1.5,4.4,2.1Zm-9.5,3.6c1.8.5,5.3,1.7,7.1,2.4l-.5,1.7c-1.8-.7-5.2-2-7.1-2.4l.5-1.7Zm1.7-9.2c.6.9,1.2,1.7,2,2.5.9-.8,1.6-1.7,2.2-2.7h-4.1v.3Z"
+            style="fill:#fff; stroke-width:0px;" />
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3010_0.svg b/collect-library/src/main/assets/omdb/icon_3010_0.svg
new file mode 100644
index 00000000..f8babad6
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3010_0.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="90" height="100"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 90 100">
+    <defs>
+        <style>
+            .e{fill:none;}.e,.f,.g,.h{stroke-width:0px;}.i{clip-path:url(#d);}.f{fill:#a28d92;}.g{fill:#f1eae9;}.h{fill:#fff;}
+        </style>
+        <clipPath id="d">
+            <rect class="e" width="90" height="100" />
+        </clipPath>
+    </defs>
+    <g id="c">
+        <g class="i">
+            <rect class="h" width="90" height="100" />
+            <path class="g"
+                d="m-10.8.2H29c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H-19c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L-11.8.6c.3-.3.6-.4,1-.4Z" />
+            <path class="g"
+                d="m35,.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H26.8c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L34.1.6c.3-.3.6-.4,1-.4Z" />
+            <path class="f"
+                d="m19.7,13.1c.7,0,1.3.6,1.3,1.4v17.1c0,.8-.6,1.4-1.3,1.4H-19.4c-.7,0-1.3-.6-1.3-1.4h0V14.5c0-.8.6-1.4,1.3-1.4H19.7Z" />
+            <path class="f"
+                d="m65,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H25.7c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="g"
+                d="m80.9.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4h-39.9c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L79.9.6c.3-.3.6-.4,1-.4Z" />
+            <path class="f"
+                d="m110,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m42.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m87.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m22.3,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H-17c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4H22.3Z" />
+            <path class="f"
+                d="m67.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H28.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m112.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m42.5,80c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m87.6,79.9c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_3010_1.svg b/collect-library/src/main/assets/omdb/icon_3010_1.svg
new file mode 100644
index 00000000..384bff2f
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_3010_1.svg
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="b" xmlns="http://www.w3.org/2000/svg" width="90" height="100"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 90 100">
+    <defs>
+        <style>
+            .e{fill:none;}.e,.f,.g,.h{stroke-width:0px;}.i{clip-path:url(#d);}.f{fill:#ff822e;}.g{fill:#fff;}.h{fill:#ffda9f;}
+        </style>
+        <clipPath id="d">
+            <rect class="e" width="90" height="100" />
+        </clipPath>
+    </defs>
+    <g id="c">
+        <g class="i">
+            <rect class="g" width="90" height="100" />
+            <path class="h"
+                d="m-10.8.2H29c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H-19c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L-11.8.6c.3-.3.6-.4,1-.4Z" />
+            <path class="h"
+                d="m35,.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4H26.8c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L34.1.6c.3-.3.6-.4,1-.4Z" />
+            <path class="f"
+                d="m19.7,13.1c.7,0,1.3.6,1.3,1.4v17.1c0,.8-.6,1.4-1.3,1.4H-19.4c-.7,0-1.3-.6-1.3-1.4h0V14.5c0-.8.6-1.4,1.3-1.4H19.7Z" />
+            <path class="f"
+                d="m65,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H25.7c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="h"
+                d="m80.9.2h39.9c.8,0,1.4.6,1.4,1.4,0,.4-.1.7-.4,1l-8.2,8.2c-.3.3-.6.4-1,.4h-39.9c-.8,0-1.4-.6-1.4-1.4,0-.4.1-.7.4-1L79.9.6c.3-.3.6-.4,1-.4Z" />
+            <path class="f"
+                d="m110,13.1c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0V14.5c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m42.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m87.5,35.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m22.3,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H-17c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4H22.3Z" />
+            <path class="f"
+                d="m67.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H28.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m112.5,57.4c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m42.5,80c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4H3.2c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+            <path class="f"
+                d="m87.6,79.9c.7,0,1.4.6,1.4,1.4v17.1c0,.8-.6,1.4-1.4,1.4h-39.3c-.7,0-1.4-.6-1.4-1.4h0v-17.1c0-.8.6-1.4,1.4-1.4h39.3Z" />
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/collect-library/src/main/assets/omdb/icon_bike.svg b/collect-library/src/main/assets/omdb/icon_bike.svg
new file mode 100644
index 00000000..3ad5d240
--- /dev/null
+++ b/collect-library/src/main/assets/omdb/icon_bike.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1701228237519" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5562" xmlns:xlink="http://www.w3.org/1999/xlink" width="32" height="32"><path d="M810.666667 512c117.333333 0 213.333333 96 213.333333 213.333333s-96 213.333333-213.333333 213.333334-213.333333-96-213.333334-213.333334c0-87.466667 53.333333-162.133333 128-196.266666l-23.466666-113.066667-294.4 219.733333c12.8 27.733333 19.2 57.6 19.2 89.6 0 117.333333-96 213.333333-213.333334 213.333334S0 842.666667 0 725.333333s96-213.333333 213.333333-213.333333c19.2 0 36.266667 2.133333 53.333334 6.4L238.933333 320H192c-23.466667 0-42.666667-19.2-42.666667-42.666667s19.2-42.666667 42.666667-42.666666h170.666667c23.466667 0 42.666667 19.2 42.666666 42.666666s-19.2 42.666667-42.666666 42.666667h-36.266667l32 245.333333 322.133333-238.933333L648.533333 170.666667H554.666667c-23.466667 0-42.666667-19.2-42.666667-42.666667s19.2-42.666667 42.666667-42.666667h128c19.2 0 38.4 14.933333 42.666666 34.133334l44.8 213.333333v2.133333L810.666667 512c-2.133333 0 0 0 0 0z m0 341.333333c70.4 0 128-57.6 128-128 0-64-49.066667-119.466667-110.933334-125.866666l25.6 117.333333c4.266667 23.466667-10.666667 44.8-32 51.2h-8.533333c-19.2 0-38.4-12.8-42.666667-34.133333l-25.6-117.333334C706.133333 640 682.666667 678.4 682.666667 725.333333c0 70.4 57.6 128 128 128z m-597.333334 0c70.4 0 128-57.6 128-128 0-12.8-2.133333-25.6-6.4-38.4l-96 72.533334c-8.533333 6.4-17.066667 8.533333-25.6 8.533333-12.8 0-25.6-6.4-34.133333-17.066667-14.933333-19.2-10.666667-44.8 8.533333-59.733333l96-72.533333c-21.333333-12.8-44.8-21.333333-72.533333-21.333334-70.4 0-128 57.6-128 128s59.733333 128 130.133333 128z" fill="#1296db" p-id="5563" data-spm-anchor-id="a313x.search_index.0.i12.313a3a814L2WEQ" class="selected"></path></svg>
\ No newline at end of file