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

started work on labeling

Browse Source
This commit is contained in:
Hannes Janetzek
2012-08-17 04:38:16 +02:00
parent 331aa6bf68
commit 7f573f0ac4
39 changed files with 2839 additions and 907 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/org/mapsforge/android/swrenderer/MapGenerator.java
View File

@@ -22,6 +22,7 @@ import org.mapsforge.android.mapgenerator.MapGeneratorJob;
import org.mapsforge.android.rendertheme.IRenderCallback;
import org.mapsforge.android.rendertheme.RenderTheme;
import org.mapsforge.android.rendertheme.renderinstruction.Area;
import org.mapsforge.android.rendertheme.renderinstruction.Caption;
import org.mapsforge.android.rendertheme.renderinstruction.Line;
import org.mapsforge.core.Tag;
import org.mapsforge.core.Tile;
@@ -218,8 +219,7 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
}
@Override
public void renderAreaCaption(String textKey, float verticalOffset, Paint paint,
Paint stroke) {
public void renderAreaCaption(Caption caption) {
// mapDatabase.readTag(caption);
// if (caption.value != null) {
// float[] centerPosition = GeometryUtils
@@ -241,7 +241,8 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
}
@Override
public void renderPointOfInterest(byte layer, int latitude, int longitude, Tag[] tags) {
public void renderPointOfInterest(byte layer, float latitude, float longitude,
Tag[] tags) {
mDrawingLayer = mWays[getValidLayer(layer)];
mPoiX = scaleLongitude(longitude);
mPoiY = scaleLatitude(latitude);
@@ -249,8 +250,7 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
}
@Override
public void renderPointOfInterestCaption(String textKey, float verticalOffset,
Paint paint, Paint stroke) {
public void renderPointOfInterestCaption(Caption caption) {
// mapDatabase.readTag(caption);
// if (caption.value != null) {
// nodes.add(new PointTextContainer(caption.value, poiX, poiY + verticalOffset, paint, stroke));
@@ -298,7 +298,7 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
// private byte mPrevLayer = 0;
@Override
public void renderWay(byte layer, Tag[] tags, float[] wayNodes, int[] wayLengths,
public void renderWay(byte layer, Tag[] tags, float[] wayNodes, short[] wayLengths,
boolean changed) {
// if (mCoords == null)
// mCoords = mMapDatabase.getCoordinates();
@@ -526,4 +526,10 @@ public class MapGenerator implements IMapGenerator, IRenderCallback,
// TODO Auto-generated method stub
}
@Override
public boolean checkWay(Tag[] tags, boolean closed) {
// TODO Auto-generated method stub
return false;
}
}