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

Fix icons

Browse source
This commit is contained in:
PavelRatushny 2017-11-20 15:57:16 +02:00
parent ccda609fa9
commit ab9771b2b1
1 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
OsmAnd/src/net/osmand/plus/osmedit/OsmEditsAdapter.java
View file

@ -11,12 +11,14 @@ import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.TextView;
import net.osmand.osm.PoiType;
import net.osmand.plus.OsmandApplication;
import net.osmand.plus.R;
import net.osmand.plus.render.RenderingIcons;
import net.osmand.util.Algorithms;
import java.util.List;
import java.util.Map;
public class OsmEditsAdapter extends ArrayAdapter<OsmPoint> {
@ -119,15 +121,26 @@ public class OsmEditsAdapter extends ArrayAdapter<OsmPoint> {
private Drawable getIcon(OsmPoint point) {
if (point.getGroup() == OsmPoint.Group.POI) {
OpenstreetmapPoint osmPoint = (OpenstreetmapPoint) point;
String type = osmPoint.getType();
String subtype = osmPoint.getSubtype();
int iconResId = RenderingIcons.getBigIconResourceId(type);
if (iconResId == 0) {
iconResId = RenderingIcons.getBigIconResourceId(type + "_" + subtype);
if (iconResId == 0) {
iconResId = R.drawable.ic_type_info;
int iconResId = 0;
String poiTranslation = osmPoint.getEntity().getTag(EditPoiData.POI_TYPE_TAG);
if (poiTranslation != null) {
Map<String, PoiType> poiTypeMap = app.getPoiTypes().getAllTranslatedNames(false);
PoiType poiType = poiTypeMap.get(poiTranslation.toLowerCase());
if (poiType != null) {
String id = null;
if (RenderingIcons.containsBigIcon(poiType.getIconKeyName())) {
id = poiType.getIconKeyName();
} else if (RenderingIcons.containsBigIcon(poiType.getOsmTag() + "_" + poiType.getOsmValue())) {
id = poiType.getOsmTag() + "_" + poiType.getOsmValue();
}
if (id != null) {
iconResId = RenderingIcons.getBigIconResourceId(id);
}
}
}
if (iconResId == 0) {
iconResId = R.drawable.ic_type_info;
}
int colorResId = R.color.color_distance;
if (point.getAction() == OsmPoint.Action.CREATE) {
colorResId = R.color.color_osm_edit_create;