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

PolyLabel default disabled #402

Browse Source
This commit is contained in:
Emux
2017-09-15 21:13:31 +03:00
parent 0fbce21140
commit 4f78fed094
5 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
View File

@@ -34,9 +34,11 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager
static final Logger log = LoggerFactory.getLogger(LabelLayer.class);
public final static String LABEL_DATA = LabelLayer.class.getName();
static final String LABEL_DATA = LabelLayer.class.getName();
private final static long MAX_RELABEL_DELAY = 100;
private static final long MAX_RELABEL_DELAY = 100;
public static boolean POLY_LABEL;
private final LabelPlacement mLabelPlacer;
private final Worker mWorker;

26
vtm/src/org/oscim/layers/tile/vector/labeling/LabelTileLoaderHook.java
View File

@@ -1,6 +1,6 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016 devemux86
* Copyright 2016-2017 devemux86
* Copyright 2016 Andrey Novikov
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
@@ -90,10 +90,28 @@ public class LabelTileLoaderHook implements TileLoaderThemeHook {
return false;
}
if (label == null)
label = PolyLabel.get(element);
float x = 0;
float y = 0;
if (label == null) {
if (LabelLayer.POLY_LABEL) {
label = PolyLabel.get(element);
x = label.x;
y = label.y;
} else {
int n = element.index[0];
for (int i = 0; i < n; ) {
x += element.points[i++];
y += element.points[i++];
}
x /= (n / 2);
y /= (n / 2);
}
} else {
x = label.x;
y = label.y;
}
ld.labels.push(TextItem.pool.get().set(label.x, label.y, value, text));
ld.labels.push(TextItem.pool.get().set(x, y, value, text));
} else if (element.type == POINT) {
String value = element.tags.getValue(text.textKey);
if (value == null || value.length() == 0)