diff options
| author | Karsten Priegnitz <koem@petoria.de> | 2011-08-30 22:16:42 +0200 |
|---|---|---|
| committer | Karsten Priegnitz <koem@petoria.de> | 2011-08-30 22:16:42 +0200 |
| commit | 7c2cf7393c32d842fe60d0f1bd8032ccf3ac6517 (patch) | |
| tree | a5e0d2c0defa7feb494e3c74d95871abb3b91d8d /src/cgeo/geocaching/mapcommon/cgeomap.java | |
| parent | 800b93221ca80ca351820e63a1135bab45b38d3e (diff) | |
| parent | 5d0ae5674e92d70e97eea7e482ff861784332f95 (diff) | |
| download | cgeo-7c2cf7393c32d842fe60d0f1bd8032ccf3ac6517.zip cgeo-7c2cf7393c32d842fe60d0f1bd8032ccf3ac6517.tar.gz cgeo-7c2cf7393c32d842fe60d0f1bd8032ccf3ac6517.tar.bz2 | |
Merge commit 'upstream/master'
Diffstat (limited to 'src/cgeo/geocaching/mapcommon/cgeomap.java')
| -rw-r--r-- | src/cgeo/geocaching/mapcommon/cgeomap.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cgeo/geocaching/mapcommon/cgeomap.java b/src/cgeo/geocaching/mapcommon/cgeomap.java index 8500e1c..9360899 100644 --- a/src/cgeo/geocaching/mapcommon/cgeomap.java +++ b/src/cgeo/geocaching/mapcommon/cgeomap.java @@ -1280,7 +1280,7 @@ public class cgeomap extends MapBase { coordinates.add(coord); item = settings.getMapFactory().getCacheOverlayItem(coord, cacheOne.type); - icon = cgBase.getIcon(true, cacheOne.type, cacheOne.own, cacheOne.found, cacheOne.disabled || cacheOne.archived); + icon = cgBase.getMarkerIcon(true, cacheOne.type, cacheOne.own, cacheOne.found, cacheOne.disabled || cacheOne.archived); pin = null; if (iconsCache.containsKey(icon)) { @@ -1324,7 +1324,7 @@ public class cgeomap extends MapBase { coordinates.add(coord); item = settings.getMapFactory().getCacheOverlayItem(coord, null); - icon = cgBase.getIcon(false, oneWaypoint.type, false, false, false); + icon = cgBase.getMarkerIcon(false, oneWaypoint.type, false, false, false); if (iconsCache.containsKey(icon)) { pin = iconsCache.get(icon); } else { @@ -1480,7 +1480,7 @@ public class cgeomap extends MapBase { coordinates.add(coord); CacheOverlayItemImpl item = settings.getMapFactory().getCacheOverlayItem(coord, null); - final int icon = cgBase.getIcon(false, waypointTypeIntent, false, false, false); + final int icon = cgBase.getMarkerIcon(false, waypointTypeIntent, false, false, false); Drawable pin = null; if (iconsCache.containsKey(icon)) { pin = iconsCache.get(icon); |