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

Fix show personal parking point as Parking point

Browse source
This commit is contained in:
Dima-1 2020-01-02 17:50:43 +02:00
parent e5ee6bde78
commit c3637d72ca
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/activities/FavoritesTreeFragment.java
View file

@ -704,8 +704,14 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment implemen
selectedGroupPos = groupPos; selectedGroupPos = groupPos;
selectedChildPos = childPos; selectedChildPos = childPos;
LatLon location = new LatLon(point.getLatitude(), point.getLongitude()); LatLon location = new LatLon(point.getLatitude(), point.getLongitude());
String pointType;
if (point.isPersonal() && point.getName().equals(FavouritePoint.PointType.PARKING.getName())) {
pointType = PointDescription.POINT_TYPE_PARKING_MARKER;
} else {
pointType = PointDescription.POINT_TYPE_FAVORITE;
}
FavoritesActivity.showOnMap(requireActivity(), this, location.getLatitude(), location.getLongitude(), FavoritesActivity.showOnMap(requireActivity(), this, location.getLatitude(), location.getLongitude(),
settings.getLastKnownMapZoom(), new PointDescription(PointDescription.POINT_TYPE_FAVORITE, point.getName(app)), true, point); settings.getLastKnownMapZoom(), new PointDescription(pointType, point.getName(app)), true, point);
} }
@Override @Override

6
OsmAnd/src/net/osmand/plus/mapcontextmenu/MenuController.java
View file

@ -184,7 +184,11 @@ public abstract class MenuController extends BaseMenuController implements Colla
if (object instanceof Amenity) { if (object instanceof Amenity) {
menuController = new AmenityMenuController(mapActivity, pointDescription, (Amenity) object); menuController = new AmenityMenuController(mapActivity, pointDescription, (Amenity) object);
} else if (object instanceof FavouritePoint) { } else if (object instanceof FavouritePoint) {
menuController = new FavouritePointMenuController(mapActivity, pointDescription, (FavouritePoint) object); if (pointDescription.isParking()) {
menuController = new ParkingPositionMenuController(mapActivity, pointDescription);
} else {
menuController = new FavouritePointMenuController(mapActivity, pointDescription, (FavouritePoint) object);
}
} else if (object instanceof SearchHistoryHelper.HistoryEntry) { } else if (object instanceof SearchHistoryHelper.HistoryEntry) {
menuController = new HistoryMenuController(mapActivity, pointDescription, (SearchHistoryHelper.HistoryEntry) object); menuController = new HistoryMenuController(mapActivity, pointDescription, (SearchHistoryHelper.HistoryEntry) object);
} else if (object instanceof TargetPoint) { } else if (object instanceof TargetPoint) {

4
OsmAnd/src/net/osmand/plus/views/FavouritesLayer.java
View file

@ -204,7 +204,9 @@ public class FavouritesLayer extends OsmandMapLayer implements ContextMenuLayer.
int x = (int) tb.getPixXFromLatLon(n.getLatitude(), n.getLongitude()); int x = (int) tb.getPixXFromLatLon(n.getLatitude(), n.getLongitude());
int y = (int) tb.getPixYFromLatLon(n.getLatitude(), n.getLongitude()); int y = (int) tb.getPixYFromLatLon(n.getLatitude(), n.getLongitude());
if (calculateBelongs(ex, ey, x, y, r)) { if (calculateBelongs(ex, ey, x, y, r)) {
res.add(n); if (!n.getName().equals(FavouritePoint.PointType.PARKING.getName())) {
res.add(n);
}
} }
} }
} }