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

Fix order of entities

Browse source
This commit is contained in:
Victor Shcherb 2016-07-31 20:16:18 +02:00
parent 2c08623541
commit 963014b8f4
4 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
OsmAnd-java/src/net/osmand/data/Amenity.java
View file

@ -251,7 +251,11 @@ public class Amenity extends MapObject {
public int compareTo(MapObject o) { public int compareTo(MapObject o) {
int cmp = super.compareTo(o); int cmp = super.compareTo(o);
if(cmp == 0 && o instanceof Amenity) { if(cmp == 0 && o instanceof Amenity) {
return ((Amenity) o).getType().getKeyName().compareTo(getType().getKeyName()); int kn = ((Amenity) o).getType().getKeyName().compareTo(getType().getKeyName());
if(kn == 0) {
kn = ((Amenity) o).getSubType().compareTo(getSubType());
}
return kn;
} }
return cmp; return cmp;
} }
@ -260,7 +264,8 @@ public class Amenity extends MapObject {
public boolean equals(Object o) { public boolean equals(Object o) {
boolean res = super.equals(o); boolean res = super.equals(o);
if (res && o instanceof Amenity) { if (res && o instanceof Amenity) {
return ((Amenity) o).getType().getKeyName().equals(getType().getKeyName()); return Algorithms.stringsEqual(((Amenity) o).getType().getKeyName(), getType().getKeyName())
&& Algorithms.stringsEqual(((Amenity) o).getSubType(), getSubType());
} }
return res; return res;
} }

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

@ -42,6 +42,9 @@ public class PoiType extends AbstractPoiType {
if(isReference()) { if(isReference()) {
return referenceType.getOsmTag(); return referenceType.getOsmTag();
} }
if(osmTag != null && osmTag.startsWith("osmand_amenity")) {
return "amenity";
}
return osmTag; return osmTag;
} }

2
OsmAnd/src/net/osmand/plus/osmedit/EditPoiDialogFragment.java
View file

@ -503,10 +503,12 @@ public class EditPoiDialogFragment extends BaseOsmAndDialogFragment {
for (PoiType s : ct.getPoiTypes()) { for (PoiType s : ct.getPoiTypes()) {
if (!s.isReference() && !s.isNotEditableOsm() && s.getBaseLangType() == null) { if (!s.isReference() && !s.isNotEditableOsm() && s.getBaseLangType() == null) {
addMapEntryAdapter(subCategories, s.getTranslation(), s); addMapEntryAdapter(subCategories, s.getTranslation(), s);
if(!s.getKeyName().contains("osmand")) {
addMapEntryAdapter(subCategories, s.getKeyName().replace('_', ' '), s); addMapEntryAdapter(subCategories, s.getKeyName().replace('_', ' '), s);
} }
} }
} }
}
for (Map.Entry<String, PoiType> s : editPoiData.getAllTranslatedSubTypes().entrySet()) { for (Map.Entry<String, PoiType> s : editPoiData.getAllTranslatedSubTypes().entrySet()) {
addMapEntryAdapter(subCategories, s.getKey(), s.getValue()); addMapEntryAdapter(subCategories, s.getKey(), s.getValue());
} }

6
OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
View file

@ -242,6 +242,12 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
}, lat, lon, lat, lon, -1, null); }, lat, lon, lat, lon, -1, null);
MapPoiTypes types = app.getPoiTypes(); MapPoiTypes types = app.getPoiTypes();
for (Amenity amenity : amenities) {
String poiSimpleFormat = OsmAndFormatter.getPoiStringWithoutType(amenity, lang);
if (poiSimpleFormat.equals(name)) {
return amenity;
}
}
for (Amenity amenity : amenities) { for (Amenity amenity : amenities) {
String amenityName = amenity.getName(lang, true); String amenityName = amenity.getName(lang, true);
if (Algorithms.isEmpty(amenityName)) { if (Algorithms.isEmpty(amenityName)) {