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

MapDatabase: clean label position, fix #735

Browse Source
This commit is contained in:
Emux
2019-07-31 12:48:04 +03:00
parent f5815203c4
commit 72ba3d6429
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
vtm/src/org/oscim/tiling/source/mapfile/MapDatabase.java
View File

@@ -2,7 +2,7 @@
* Copyright 2010, 2011, 2012 mapsforge.org * Copyright 2010, 2011, 2012 mapsforge.org
* Copyright 2013, 2014 Hannes Janetzek * Copyright 2013, 2014 Hannes Janetzek
* Copyright 2014-2015 Ludwig M Brinckmann * Copyright 2014-2015 Ludwig M Brinckmann
* Copyright 2016-2018 devemux86 * Copyright 2016-2019 devemux86
* Copyright 2016 Andrey Novikov * Copyright 2016 Andrey Novikov
* Copyright 2017-2018 Gustl22 * Copyright 2017-2018 Gustl22
* Copyright 2018 Bezzu * Copyright 2018 Bezzu
@@ -23,13 +23,8 @@
package org.oscim.tiling.source.mapfile; package org.oscim.tiling.source.mapfile;
import org.oscim.backend.CanvasAdapter; import org.oscim.backend.CanvasAdapter;
import org.oscim.core.BoundingBox; import org.oscim.core.*;
import org.oscim.core.GeoPoint;
import org.oscim.core.GeometryBuffer.GeometryType; import org.oscim.core.GeometryBuffer.GeometryType;
import org.oscim.core.MapElement;
import org.oscim.core.MercatorProjection;
import org.oscim.core.Tag;
import org.oscim.core.Tile;
import org.oscim.layers.tile.MapTile; import org.oscim.layers.tile.MapTile;
import org.oscim.layers.tile.buildings.BuildingLayer; import org.oscim.layers.tile.buildings.BuildingLayer;
import org.oscim.tiling.ITileDataSink; import org.oscim.tiling.ITileDataSink;
@@ -968,6 +963,9 @@ public class MapDatabase implements ITileDataSource {
if (labelPosition != null && wayDataBlock == 0) if (labelPosition != null && wayDataBlock == 0)
e.setLabelPosition(e.points[0] + labelPosition[0], e.points[1] + labelPosition[1]); e.setLabelPosition(e.points[0] + labelPosition[0], e.points[1] + labelPosition[1]);
else
e.labelPosition = null;
mTileProjection.project(e); mTileProjection.project(e);
// Avoid clipping for buildings, which slows rendering. // Avoid clipping for buildings, which slows rendering.