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

Merge branch 'master' of https://gitlab.navinfo.com/CollectVehicle/OneMapQS

Browse Source 
 Conflicts:
	vtm
This commit is contained in:
qiji4215
2023-08-23 14:11:40 +08:00
parent 5614f513f7 e30e824a1b
commit 7e297dbb73
8 changed files with 62 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
collect-library/src/main/java/com/navinfo/collect/library/data/entity/RenderEntity.kt
View File

@@ -25,8 +25,7 @@ open class RenderEntity() : RealmObject(), Parcelable {
lateinit var name: String //要素名
lateinit var table: String //要素表名
var code: String = "0" // 要素编码
var geometry: String =
"" // 要素渲染参考的geometry，该数据可能会在导入预处理环节被修改，原始geometry会保存在properties的geometry字段下
var geometry: String = "" // 要素渲染参考的geometry，该数据可能会在导入预处理环节被修改，原始geometry会保存在properties的geometry字段下
get() {
wkt = GeometryTools.createGeometry(field)
return field

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
// 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
}

2
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBDataDecoder.java
View File

@@ -146,7 +146,7 @@ public class OMDBDataDecoder extends TileDecoder {
for (int i = 0; i < length; i++) {
// double z = longitudeToX(MercatorProjection.pixelXToLongitudeWithScale(MercatorProjection.metersToPixelsWithScale((float) coordinates[i].z, coordinates[i].y, mTileScale), mTileScale))* mTileScale/8;
mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale),
(float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), 0);
(float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float) coordinates[i].z);
}
// int length = removeLast ? coordinates.length - 1 : coordinates.length;

2
collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBReferenceDecoder.java
View File

@@ -143,7 +143,7 @@ public class OMDBReferenceDecoder extends TileDecoder {
// 将Z坐标的米转换为屏幕像素坐标
// double z = longitudeToX(MercatorProjection.pixelXToLongitudeWithScale(MercatorProjection.metersToPixelsWithScale((float) coordinates[i].z, coordinates[i].y, mTileScale), mTileScale))* mTileScale/8;
mMapElement.addPoint((float) ((longitudeToX(coordinates[i].x) - mTileX) * mTileScale),
(float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), 0);
(float) ((latitudeToY(coordinates[i].y) - mTileY) * mTileScale), (float) coordinates[i].z);
}
// int length = removeLast ? coordinates.length - 1 : coordinates.length;