xiaoyan159/OneMapQS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: 增加marker支持压盖

Browse Source
This commit is contained in:
xiaoyan 2023-08-23 13:57:17 +08:00
parent b3bb83032b
commit d05222e65f
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
collect-library/resources/rendertheme.xsd
View File

@ -254,6 +254,8 @@
<xs:attribute name="repeat-gap" default="200" type="xs:float" use="optional"/> <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="repeat-start" default="30" type="xs:float" use="optional"/>
<xs:attribute name="rotate" default="true" type="xs:boolean" 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>
<xs:complexType name="extrusion"> <xs:complexType name="extrusion">

4
collect-library/src/main/java/com/navinfo/collect/library/map/cluster/ClusterMarkerRenderer.kt
View File

@ -317,7 +317,7 @@ open class ClusterMarkerRenderer : MarkerRenderer {
// this item will act as a cluster, just use a proper bitmap // this item will act as a cluster, just use a proper bitmap
// depending on cluster size, instead of its marker // depending on cluster size, instead of its marker
val bitmap = getClusterBitmap(it.clusterSize + 1) 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.offset = PointF(0.5f, 0.5f)
s.billboard = true // could be a parameter s.billboard = true // could be a parameter
} else { } else {
@ -325,7 +325,7 @@ open class ClusterMarkerRenderer : MarkerRenderer {
var symbol: MarkerSymbol? = it.item.marker var symbol: MarkerSymbol? = it.item.marker
if (symbol == null) symbol = mDefaultMarker if (symbol == null) symbol = mDefaultMarker
symbol?.let { symbol -> 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.offset = symbol.hotspot
s.billboard = symbol.isBillboard s.billboard = symbol.isBillboard
} }

2
vtm

@ -1 +1 @@
Subproject commit 33ba2c17cea19d445f71d2e78fda6ad459aa4822 Subproject commit f9efeaf09d3d912e2e21c7ebf8a6ad043c16f80c