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

Fixed typo

Browse source
This commit is contained in:
GaidamakUA 2016-01-13 18:17:34 +02:00
parent dd85aa3e68
commit 45199b395d
7 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
OsmAnd/src/net/osmand/plus/TargetPointsHelper.java
View file

@ -1,8 +1,7 @@
package net.osmand.plus;
import java.util.ArrayList;
import java.util.List;
import android.content.Context;
import net.osmand.Location;
import net.osmand.StateChangedListener;
@ -11,9 +10,10 @@ import net.osmand.data.LocationPoint;
import net.osmand.data.PointDescription;
import net.osmand.plus.routing.RouteProvider.RouteService;
import net.osmand.plus.routing.RoutingHelper;
import net.osmand.plus.activities.MapActivity;
import net.osmand.util.MapUtils;
import android.content.Context;
import java.util.ArrayList;
import java.util.List;
public class TargetPointsHelper {
@ -188,7 +188,7 @@ public class TargetPointsHelper {
pointToStart = null;
intermediatePoints.clear();
readFromSettings(settings);
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
/**
@ -200,7 +200,7 @@ public class TargetPointsHelper {
pointToNavigate.pointDescription);
pointToNavigate.intermediate = false;
settings.deleteIntermediatePoint(index);
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
public void removeWayPoint(boolean updateRoute, int index){
@ -223,10 +223,10 @@ public class TargetPointsHelper {
tp.index = ind++;
}
}
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
public void updateRouteAndReferesh(boolean updateRoute) {
public void updateRouteAndRefresh(boolean updateRoute) {
if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() ||
routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) {
updateRoutingHelper();
@ -285,13 +285,13 @@ public class TargetPointsHelper {
settings.clearIntermediatePoints();
intermediatePoints.clear();
readFromSettings(settings);
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
public void clearStartPoint(boolean updateRoute) {
settings.clearPointToStart();
readFromSettings(settings);
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
@ -312,7 +312,7 @@ public class TargetPointsHelper {
settings.clearIntermediatePoints();
}
readFromSettings(settings);
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
@ -360,7 +360,7 @@ public class TargetPointsHelper {
settings.clearIntermediatePoints();
}
readFromSettings(settings);
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
public void setStartPoint(LatLon startPoint, boolean updateRoute, PointDescription name) {
@ -370,7 +370,7 @@ public class TargetPointsHelper {
settings.clearPointToStart();
}
readFromSettings(settings);
updateRouteAndReferesh(updateRoute);
updateRouteAndRefresh(updateRoute);
}
public boolean checkPointToNavigate(){

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

@ -437,7 +437,7 @@ public class FavoritesTreeFragment extends OsmandExpandableListFragment {
new PointDescription(PointDescription.POINT_TYPE_FAVORITE, fp.getName()));
}
if(getMyApplication().getRoutingHelper().isRouteCalculated()) {
targetPointsHelper.updateRouteAndReferesh(true);
targetPointsHelper.updateRouteAndRefresh(true);
}
IntermediatePointsDialog.openIntermediatePointsDialog(getActivity(), getMyApplication(), true);
//MapActivity.launchMapActivityMoveToTop(getActivity());

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -457,7 +457,7 @@ public class MapActivity extends AccessibleActivity implements DownloadEvents,
if (routingHelper.isFollowingMode()
&& (!Algorithms.objectEquals(targets.getPointToNavigate().point, routingHelper.getFinalLocation()) || !Algorithms
.objectEquals(targets.getIntermediatePointsLatLonNavigation(), routingHelper.getIntermediatePoints()))) {
targets.updateRouteAndReferesh(true);
targets.updateRouteAndRefresh(true);
}
app.getLocationProvider().resumeAllUpdates();

2
OsmAnd/src/net/osmand/plus/activities/MapActivityActions.java
View file

@ -422,7 +422,7 @@ public class MapActivityActions implements DialogProvider {
// then set gpx
setGPXRouteParams(gpxFile);
// then update start and destination point
targets.updateRouteAndReferesh(true);
targets.updateRouteAndRefresh(true);
mapActivity.getMapViewTrackingUtilities().switchToRoutePlanningMode();
mapActivity.getMapView().refreshMap(true);

2
OsmAnd/src/net/osmand/plus/base/FailSafeFuntions.java
View file

@ -171,7 +171,7 @@ public class FailSafeFuntions {
app.getTargetPointsHelper().setStartPoint(null, false, null);
app.getSettings().FOLLOW_THE_ROUTE.set(true);
routingHelper.setFollowingMode(true);
app.getTargetPointsHelper().updateRouteAndReferesh(true);
app.getTargetPointsHelper().updateRouteAndRefresh(true);
app.initVoiceCommandPlayer(ma);
if(ma.getDashboard().isVisible()) {
ma.getDashboard().hideDashboard();

2
OsmAnd/src/net/osmand/plus/dashboard/DashboardOnMap.java
View file

@ -1183,7 +1183,7 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
}
getMyApplication().getTargetPointsHelper().reorderAllTargetPoints(allTargets, false);
newRouteIsCalculated(false, new ValueHolder<Boolean>());
getMyApplication().getTargetPointsHelper().updateRouteAndReferesh(true);
getMyApplication().getTargetPointsHelper().updateRouteAndRefresh(true);
if (swipeDismissListener != null) {
swipeDismissListener.setEnabled(true);

4
OsmAnd/src/net/osmand/plus/mapcontextmenu/other/RoutePreferencesMenu.java
View file

@ -474,7 +474,7 @@ public class RoutePreferencesMenu {
update = true;
}
if (update) {
tg.updateRouteAndReferesh(true);
tg.updateRouteAndRefresh(true);
}
}
} else if (gpxParam.id == R.string.gpx_option_calculate_first_last_segment) {
@ -572,7 +572,7 @@ public class RoutePreferencesMenu {
@Override
public boolean processResult(GPXUtilities.GPXFile[] result) {
mapActivity.getMapActions().setGPXRouteParams(result[0]);
app.getTargetPointsHelper().updateRouteAndReferesh(true);
app.getTargetPointsHelper().updateRouteAndRefresh(true);
updateSpinnerItems(gpxSpinner);
updateParameters();
mapActivity.getRoutingHelper().recalculateRouteDueToSettingsChange();