pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] MyPosition title.

Browse source
This commit is contained in:
Dmitry Yunitsky 2016-03-31 14:15:00 +03:00
parent 95ecadb6ec
commit 523e9c7307
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
android/jni/com/mapswithme/maps/UserMarkHelper.cpp
View file

@ -68,7 +68,7 @@ jobject CreateMapObject(JNIEnv * env, place_page::Info const & info)
// TODO(yunikkk): object can be POI + API + search result + bookmark simultaneously.
// TODO(yunikkk): Should we pass localized strings here and in other methods as byte arrays?
if (info.IsMyPosition())
return CreateMapObject(env, kMyPosition, "", "", ll.lat, ll.lon, address.FormatAddress(), {}, "");
return CreateMapObject(env, kMyPosition, info.GetTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), {}, "");
if (info.HasApiUrl())
return CreateMapObject(env, kApiPoint, info.GetTitle(), info.GetSubtitle(), ll.lat, ll.lon, address.FormatAddress(), info.GetMetadata(), info.GetApiUrl());

4
android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
View file

@ -442,7 +442,9 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
UiUtils.showIf(mMapObject != null && Editor.nativeIsFeatureEditable() &&
!RoutingController.get().isNavigating() && !MapManager.nativeIsLegacyMode(),
mEditor);
UiUtils.showIf(!RoutingController.get().isNavigating() && !MapManager.nativeIsLegacyMode(), mReport);
UiUtils.showIf(!RoutingController.get().isNavigating() && !MapManager.nativeIsLegacyMode() &&
!MapObject.isOfType(MapObject.MY_POSITION, mMapObject),
mReport);
}
private void refreshOpeningHours()