add labels for multiline elements

This commit is contained in:
Hannes Janetzek 2013-02-11 10:05:49 +01:00
parent 0aaca70a94
commit f77adb30ab

View File

@ -160,7 +160,6 @@ public class TileGenerator implements IRenderCallback, IMapDatabaseCallback {
.pixelYToLatitude(tile.pixelY, tile.zoomLevel)) * (Math.PI / 180))); .pixelYToLatitude(tile.pixelY, tile.zoomLevel)) * (Math.PI / 180)));
mLayers = new Layers(); mLayers = new Layers();
if (mMapDatabase.executeQuery(tile, this) != QueryResult.SUCCESS) { if (mMapDatabase.executeQuery(tile, this) != QueryResult.SUCCESS) {
//Log.d(TAG, "Failed loading: " + tile); //Log.d(TAG, "Failed loading: " + tile);
mLayers.clear(); mLayers.clear();
@ -473,9 +472,15 @@ public class TileGenerator implements IRenderCallback, IMapDatabaseCallback {
return; return;
if (text.textKey == mTagEmptyName.key && mTagName.value != null) { if (text.textKey == mTagEmptyName.key && mTagName.value != null) {
int offset = 0;
mLabels = WayDecorator.renderText(mCoords, mTagName.value, text, 0, for (int i = 0, n = mIndices.length; i < n; i++) {
mIndices[0], mLabels); int length = mIndices[i];
if (length < 4)
break;
mLabels = WayDecorator.renderText(mCoords, mTagName.value, text,
offset, length, mLabels);
offset += length;
}
} }
} }