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

refactor: IRenderCallback -> IRenderTheme.Callback

Browse Source 
- more consistent function names
This commit is contained in:
Hannes Janetzek
2013-09-15 19:50:18 +02:00
parent 1137f48882
commit 876b8b6d37
12 changed files with 120 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
vtm-gdx-html/src/org/oscim/gdx/emu/org/oscim/layers/tile/vector/VectorTileLoader.java
View File

@@ -30,7 +30,6 @@ import org.oscim.renderer.elements.LineTexLayer;
import org.oscim.renderer.elements.PolygonLayer;
import org.oscim.renderer.elements.SymbolItem;
import org.oscim.renderer.elements.TextItem;
import org.oscim.theme.IRenderCallback;
import org.oscim.theme.IRenderTheme;
import org.oscim.theme.renderinstruction.Area;
import org.oscim.theme.renderinstruction.Circle;
@@ -58,7 +57,7 @@ import org.oscim.utils.pool.Inlist;
* 5. RenderTheme calls IRenderCallback functions with style information
* 6. Styled items become added to MapTile.layers... roughly
*/
public class VectorTileLoader extends TileLoader implements IRenderCallback, ITileDataSink {
public class VectorTileLoader extends TileLoader implements IRenderTheme.Callback, ITileDataSink {
private static final String TAG = VectorTileLoader.class.getName();
@@ -472,7 +471,7 @@ public class VectorTileLoader extends TileLoader implements IRenderCallback, ITi
}
@Override
public void renderAreaCaption(Text text) {
public void renderAreaText(Text text) {
// TODO place somewhere on polygon
String value = textValueForKey(text);
@@ -486,7 +485,7 @@ public class VectorTileLoader extends TileLoader implements IRenderCallback, ITi
}
@Override
public void renderPointOfInterestCaption(Text text) {
public void renderPointText(Text text) {
String value = textValueForKey(text);
if (value == null)
return;
@@ -517,11 +516,11 @@ public class VectorTileLoader extends TileLoader implements IRenderCallback, ITi
}
@Override
public void renderPointOfInterestCircle(Circle circle, int level) {
public void renderPointCircle(Circle circle, int level) {
}
@Override
public void renderPointOfInterestSymbol(Symbol symbol) {
public void renderPointSymbol(Symbol symbol) {
if (symbol.texture == null) {
Log.d(TAG, "missing symbol for " + mElement.tags.asString());
return;