Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Next version

- `ThemeCallback.getText` method [#1225](https://github.com/mapsforge/vtm/pull/1225)
- Motorider map theme improvements [#1183](https://github.com/mapsforge/vtm/issues/1183)
- Biker map theme improvements [#1192](https://github.com/mapsforge/vtm/issues/1192)
- Minor improvements and bug fixes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ public boolean process(MapTile tile, RenderBuckets buckets, MapElement element,
String value = element.tags.getValue(text.textKey);
if (value == null || value.length() == 0)
return false;
if (style.themeCallback != null)
value = style.themeCallback.getText(element, value);

LabelTileData ld = get(tile);
if (element.type == LINE) {
Expand Down
6 changes: 6 additions & 0 deletions vtm/src/org/oscim/theme/ThemeCallback.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package org.oscim.theme;

import org.oscim.backend.canvas.Bitmap;
import org.oscim.core.MapElement;
import org.oscim.theme.styles.RenderStyle;

/**
Expand All @@ -30,4 +31,9 @@ public interface ThemeCallback {
* @return the color-int
*/
int getColor(RenderStyle origin, int color);

/**
* @return the text
*/
String getText(MapElement element, String text);
}
2 changes: 2 additions & 0 deletions vtm/src/org/oscim/theme/styles/RenderStyle.java
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ public interface Callback {
RenderStyle mNext;
boolean update;

public ThemeCallback themeCallback;

public T setCat(String cat) {
this.cat = cat;
return self();
Expand Down
2 changes: 2 additions & 0 deletions vtm/src/org/oscim/theme/styles/TextStyle.java
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ public TextBuilder<?> set(TextStyle text) {
bgFill.setColor(b.themeCallback != null ? b.themeCallback.getColor(this, b.bgFillColor) : b.bgFillColor);
} else
bgFill = null;

themeCallback = b.themeCallback;
}

public final String style;
Expand Down