From c9fd44f16e10741404431226fe0a654b3ac1df6c Mon Sep 17 00:00:00 2001 From: sonora Date: Thu, 13 Jun 2013 01:37:19 +0200 Subject: [PATCH] insert comments --- .../plus/activities/MapActivityActions.java | 2 +- .../plus/activities/NavigatePointFragment.java | 16 ++++++++-------- .../activities/search/SearchAddressFragment.java | 16 ++++++++-------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java index 44ea7884f2..a2b1ebec6b 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java @@ -1269,7 +1269,7 @@ public class MapActivityActions implements DialogProvider { if (onShow != null) { onShow.onClick(v); } - // Issue 1929: Check where this dialohue appears and replace by IntermediatePointsDialog + // Issue 1929 TODO: Check where this dialogue appears and replace by IntermediatePointsDialog navigatePointDialogAndLaunchMap(activity, location.getLatitude(), location.getLongitude(), name); qa.dismiss(); } diff --git a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java index 066a1d3d8b..1151f71651 100644 --- a/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/NavigatePointFragment.java @@ -259,15 +259,15 @@ public class NavigatePointFragment extends SherlockFragment implements SearchAct targetPointsHelper.setSingleDestination(lat, lon, getString(R.string.point_on_map, lat, lon)); MapActivity.launchMapActivityMoveToTop(getActivity()); } else if (mode == ADD_WAYPOINT) { - //MapActivityActions.navigatePointDialogAndLaunchMap(getActivity(), lat, lon, getString(R.string.point_on_map, lat, lon)); + MapActivityActions.navigatePointDialogAndLaunchMap(getActivity(), lat, lon, getString(R.string.point_on_map, lat, lon)); // Issue 1929 TODO: show IntermediatePointsDialog here instead of navigatePointDialog, without subsequent Directions - if (targetPointsHelper.getIntermediatePoints().size() == 0) { - targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, -1); - } else { - targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, targetPointsHelper.getIntermediatePoints().size()); - } - IntermediatePointsDialog.openIntermediatePointsDialog(getActivity()); - MapActivity.launchMapActivityMoveToTop(getActivity()); + //if (targetPointsHelper.getIntermediatePoints().size() == 0) { + // targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, -1); + //} else { + // targetPointsHelper.navigateToPoint(new LatLon(lat, lon), true, targetPointsHelper.getIntermediatePoints().size()); + //} + //IntermediatePointsDialog.openIntermediatePointsDialog(getActivity()); + //MapActivity.launchMapActivityMoveToTop(getActivity()); } else if (mode == SHOW_ON_MAP){ OsmandApplication app = (OsmandApplication) getActivity().getApplication(); app.getSettings().setMapLocationToShow(lat, lon, Math.max(12, app.getSettings().getLastKnownMapZoom()), diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java index e8c0c6a661..3f2dc4b322 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressFragment.java @@ -297,15 +297,15 @@ public class SearchAddressFragment extends SherlockFragment { targetPointsHelper.setSingleDestination(searchPoint.getLatitude(), searchPoint.getLongitude(), historyName); MapActivity.launchMapActivityMoveToTop(getActivity()); } else if (mode == ADD_WAYPOINT) { - //MapActivityActions.navigatePointDialogAndLaunchMap(getActivity(), searchPoint.getLatitude(), searchPoint.getLongitude(), historyName); + MapActivityActions.navigatePointDialogAndLaunchMap(getActivity(), searchPoint.getLatitude(), searchPoint.getLongitude(), historyName); // Issue 1929 TODO: show IntermediatePointsDialog here instead of navigatePointDialog, without subsequent Directions - if (targetPointsHelper.getIntermediatePoints().size() == 0) { - targetPointsHelper.navigateToPoint(searchPoint, true, -1); - } else { - targetPointsHelper.navigateToPoint(searchPoint, true, targetPointsHelper.getIntermediatePoints().size()); - } - IntermediatePointsDialog.openIntermediatePointsDialog(getActivity()); - MapActivity.launchMapActivityMoveToTop(getActivity()); + //if (targetPointsHelper.getIntermediatePoints().size() == 0) { + // targetPointsHelper.navigateToPoint(searchPoint, true, -1); + //} else { + // targetPointsHelper.navigateToPoint(searchPoint, true, targetPointsHelper.getIntermediatePoints().size()); + //} + //IntermediatePointsDialog.openIntermediatePointsDialog(getActivity()); + //MapActivity.launchMapActivityMoveToTop(getActivity()); } else if (mode == SHOW_ON_MAP) { osmandSettings.setMapLocationToShow(searchPoint.getLatitude(), searchPoint.getLongitude(), zoom, historyName); MapActivity.launchMapActivityMoveToTop(getActivity());