Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix poi description tags

Browse source
This commit is contained in:
Victor Shcherb 2015-08-01 23:15:43 +02:00
parent a3b1a04cbd
commit 617ad7716b
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/OsmAndFormatter.java
View file

@ -6,6 +6,8 @@ import java.util.Map.Entry;
import net.osmand.data.Amenity;
import net.osmand.data.City.CityType;
import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.MapPoiTypes;
import net.osmand.osm.PoiCategory;
import net.osmand.osm.PoiType;
import net.osmand.plus.OsmandSettings.MetricsConstants;
@ -183,11 +185,12 @@ public class OsmAndFormatter {
return nm + " " + n; //$NON-NLS-1$
}
public static String getAmenityDescriptionContent(Context ctx, Amenity amenity, boolean shortDescription) {
public static String getAmenityDescriptionContent(OsmandApplication ctx, Amenity amenity, boolean shortDescription) {
StringBuilder d = new StringBuilder();
if(amenity.getType().isWiki()) {
return "";
}
MapPoiTypes poiTypes = ctx.getPoiTypes();
for(Entry<String, String> e : amenity.getAdditionalInfo().entrySet()) {
String key = e.getKey();
String vl = e.getValue();
@ -205,8 +208,7 @@ public class OsmAndFormatter {
d.append(ctx.getString(R.string.website) + ": ");
} else {
PoiCategory pc = amenity.getType();
PoiType pt = pc.getPoiTypeByKeyName(e.getKey());
AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(e.getKey());
if (pt != null) {
vl = pt.getTranslation();
} else {