From 78482f0fa0a51bf5b253e1856baa9bd098731e1a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Thu, 2 Apr 2015 00:18:55 +0200 Subject: [PATCH] Fix capitalizing words for Favorites and add description --- OsmAnd/src/net/osmand/plus/OsmAndFormatter.java | 2 +- OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java index ef51de125c..7da167569c 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndFormatter.java @@ -197,7 +197,7 @@ public class OsmAndFormatter { String key = e.getKey(); String vl = e.getValue(); if(Amenity.DESCRIPTION.equals(key)) { - if(amenity.getType().isWiki() && shortDescription) { + if(shortDescription) { continue; } } else if(Amenity.OPENING_HOURS.equals(key)) { diff --git a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java index 2a3ddec71f..b5794ca4fb 100644 --- a/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/FavoritesLayer.java @@ -170,10 +170,7 @@ public class FavoritesLayer extends OsmandMapLayer implements ContextMenuLayer. public String getObjectDescription(Object o) { Class fcl = getFavoriteClass(); if(o!= null && fcl.isInstance(o)) { - String desciption = ((FavouritePoint)o).getDescription() != null ? - " " + ((FavouritePoint)o).getDescription() : ""; - return PointDescription.getSimpleName((LocationPoint) o, view.getContext()) + " " - + desciption; //$NON-NLS-1$ + return PointDescription.getSimpleName((LocationPoint) o, view.getContext()) ; } return null; }