Merge changes

This commit is contained in:
crimean 2019-03-30 19:50:35 +03:00
commit d792267560
2 changed files with 3 additions and 2 deletions

View file

@ -3933,5 +3933,6 @@
<string name="poi_rtsa_scale_3b_asterisk">3Б*</string>
<string name="poi_flare">Gas flare;Flare stack</string>
<string name="poi_change_delete">Deleted object</string>
</resources>

View file

@ -586,7 +586,7 @@ public abstract class OsmandMapLayer {
Amenity res = null;
for (Amenity amenity : amenities) {
Long amenityId = amenity.getId() >> 1;
if (amenityId == id) {
if (amenityId == id && !amenity.isClosed()) {
res = amenity;
break;
}
@ -594,7 +594,7 @@ public abstract class OsmandMapLayer {
if (res == null && names != null && names.size() > 0) {
for (Amenity amenity : amenities) {
for (String name : names) {
if (name.equals(amenity.getName())) {
if (name.equals(amenity.getName()) && !amenity.isClosed()) {
res = amenity;
break;
}