From d05222e65f6ad1a612c8bbe8a818a09a9b27ce61 Mon Sep 17 00:00:00 2001
From: xiaoyan <xiaoyan159@163.com>
Date: Wed, 23 Aug 2023 13:57:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0marker=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=8E=8B=E7=9B=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 collect-library/resources/rendertheme.xsd                     | 2 ++
 .../collect/library/map/cluster/ClusterMarkerRenderer.kt      | 4 ++--
 vtm                                                           | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/collect-library/resources/rendertheme.xsd b/collect-library/resources/rendertheme.xsd
index 299bd87c..84aa0c05 100644
--- a/collect-library/resources/rendertheme.xsd
+++ b/collect-library/resources/rendertheme.xsd
@@ -254,6 +254,8 @@
         <xs:attribute name="repeat-gap" default="200" type="xs:float" use="optional"/>
         <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="false" type="xs:boolean" use="optional"/>
     </xs:complexType>
 
     <xs:complexType name="extrusion">
diff --git a/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt b/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt
index 878482ea..d9711c6b 100644
--- a/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt
+++ b/collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt
@@ -317,7 +317,7 @@ open class ClusterMarkerRenderer : MarkerRenderer {
                 // this item will act as a cluster, just use a proper bitmap
                 // depending on cluster size, instead of its marker
                 val bitmap = getClusterBitmap(it.clusterSize + 1)
-                s.set(it.x, it.y, bitmap, true)
+                s.set(it.x, it.y, bitmap, true, false)
                 s.offset = PointF(0.5f, 0.5f)
                 s.billboard = true // could be a parameter
             } else {
@@ -325,7 +325,7 @@ open class ClusterMarkerRenderer : MarkerRenderer {
                 var symbol: MarkerSymbol? = it.item.marker
                 if (symbol == null) symbol = mDefaultMarker
                 symbol?.let { symbol ->
-                    s.set(it.x, it.y, symbol.bitmap, true)
+                    s.set(it.x, it.y, symbol.bitmap, true, false)
                     s.offset = symbol.hotspot
                     s.billboard = symbol.isBillboard
                 }
diff --git a/vtm b/vtm
index 33ba2c17..f9efeaf0 160000
--- a/vtm
+++ b/vtm
@@ -1 +1 @@
-Subproject commit 33ba2c17cea19d445f71d2e78fda6ad459aa4822
+Subproject commit f9efeaf09d3d912e2e21c7ebf8a6ad043c16f80c