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

Fix poi types sorting in context menu

Browse source
This commit is contained in:
Alexey Kulish 2015-11-30 19:06:23 +03:00
parent 7c33c46bdd
commit 5addc2de16
2 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/net/osmand/osm/PoiType.java
View file

@ -18,7 +18,7 @@ public class PoiType extends AbstractPoiType {
private boolean text; private boolean text;
private boolean nameOnly; private boolean nameOnly;
private boolean relation; private boolean relation;
private int order; private int order = 90;
public PoiType(MapPoiTypes poiTypes, PoiCategory category, String name) { public PoiType(MapPoiTypes poiTypes, PoiCategory category, String name) {

33
OsmAnd/src/net/osmand/plus/mapcontextmenu/builders/AmenityMenuBuilder.java
View file

@ -23,7 +23,6 @@ import net.osmand.util.Algorithms;
import net.osmand.util.OpeningHoursParser; import net.osmand.util.OpeningHoursParser;
import java.util.Calendar; import java.util.Calendar;
import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.LinkedList; import java.util.LinkedList;
@ -164,7 +163,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
boolean isWiki = false; boolean isWiki = false;
boolean isText = false; boolean isText = false;
boolean needLinks = !"population".equals(key); boolean needLinks = !"population".equals(key);
int order = 0; int poiTypeOrder = 0;
String poiTypeKeyName = "";
if (amenity.getType().isWiki()) { if (amenity.getType().isWiki()) {
if (!hasWiki) { if (!hasWiki) {
@ -216,7 +216,8 @@ public class AmenityMenuBuilder extends MenuBuilder {
AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(key); AbstractPoiType pt = poiTypes.getAnyPoiAdditionalTypeByKey(key);
if (pt != null) { if (pt != null) {
PoiType pType = (PoiType) pt; PoiType pType = (PoiType) pt;
order = pType.getOrder(); poiTypeOrder = pType.getOrder();
poiTypeKeyName = pType.getKeyName();
if (pType.getParentType() != null && pType.getParentType() instanceof PoiType) { if (pType.getParentType() != null && pType.getParentType() instanceof PoiType) {
icon = getRowIcon(view.getContext(), ((PoiType) pType.getParentType()).getOsmTag() + "_" + pType.getOsmTag().replace(':', '_') + "_" + pType.getOsmValue()); icon = getRowIcon(view.getContext(), ((PoiType) pType.getParentType()).getOsmTag() + "_" + pType.getOsmTag().replace(':', '_') + "_" + pType.getOsmValue());
} }
@ -235,18 +236,27 @@ public class AmenityMenuBuilder extends MenuBuilder {
} }
if (isText && iconId == R.drawable.ic_action_note_dark) { if (isText && iconId == R.drawable.ic_action_note_dark) {
descriptions.add(new AmenityInfoRow(key, R.drawable.ic_action_note_dark, textPrefix, vl, 0, false, true, true, 0)); descriptions.add(new AmenityInfoRow(key, R.drawable.ic_action_note_dark, textPrefix,
vl, 0, false, true, true, 0, ""));
} else if (icon != null) { } else if (icon != null) {
infoRows.add(new AmenityInfoRow(key, icon, textPrefix, vl, textColor, isWiki, isText, needLinks, order)); infoRows.add(new AmenityInfoRow(key, icon, textPrefix, vl, textColor, isWiki, isText,
needLinks, poiTypeOrder, poiTypeKeyName));
} else { } else {
infoRows.add(new AmenityInfoRow(key, iconId, textPrefix, vl, textColor, isWiki, isText, needLinks, order)); infoRows.add(new AmenityInfoRow(key, iconId, textPrefix, vl, textColor, isWiki, isText,
needLinks, poiTypeOrder, poiTypeKeyName));
} }
} }
Collections.sort(infoRows, new Comparator<AmenityInfoRow>() { Collections.sort(infoRows, new Comparator<AmenityInfoRow>() {
@Override @Override
public int compare(AmenityInfoRow row1, AmenityInfoRow row2) { public int compare(AmenityInfoRow row1, AmenityInfoRow row2) {
return row1.order < row2.order ? -1 : (row1.order == row2.order ? 0 : 1); if (row1.order < row2.order) {
return -1;
} else if (row1.order == row2.order) {
return row1.name.compareTo(row2.name);
} else {
return 1;
}
} }
}); });
@ -292,9 +302,11 @@ public class AmenityMenuBuilder extends MenuBuilder {
private boolean isText; private boolean isText;
private boolean needLinks; private boolean needLinks;
private int order; private int order;
private String name;
public AmenityInfoRow(String key, Drawable icon, String textPrefix, String text, public AmenityInfoRow(String key, Drawable icon, String textPrefix, String text,
int textColor, boolean isWiki, boolean isText, boolean needLinks, int order) { int textColor, boolean isWiki, boolean isText, boolean needLinks,
int order, String name) {
this.key = key; this.key = key;
this.icon = icon; this.icon = icon;
this.textPrefix = textPrefix; this.textPrefix = textPrefix;
@ -304,10 +316,12 @@ public class AmenityMenuBuilder extends MenuBuilder {
this.isText = isText; this.isText = isText;
this.needLinks = needLinks; this.needLinks = needLinks;
this.order = order; this.order = order;
this.name = name;
} }
public AmenityInfoRow(String key, int iconId, String textPrefix, String text, public AmenityInfoRow(String key, int iconId, String textPrefix, String text,
int textColor, boolean isWiki, boolean isText, boolean needLinks, int order) { int textColor, boolean isWiki, boolean isText, boolean needLinks,
int order, String name) {
this.key = key; this.key = key;
this.iconId = iconId; this.iconId = iconId;
this.textPrefix = textPrefix; this.textPrefix = textPrefix;
@ -317,6 +331,7 @@ public class AmenityMenuBuilder extends MenuBuilder {
this.isText = isText; this.isText = isText;
this.needLinks = needLinks; this.needLinks = needLinks;
this.order = order; this.order = order;
this.name = name;
} }
} }
} }