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

Merge branch 'master' of https://github.com/osmandapp/Osmand

Browse source
This commit is contained in:
GaidamakUA 2016-01-13 16:09:39 +02:00
commit a32abcce59
8 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values-da/phrases.xml
View file

@ -2626,7 +2626,7 @@
<string name="poi_seamark_dyke">Sømærke dige</string>
<string name="poi_dolphin">Delfin</string>
<string name="poi_forestry_compartment">Vejskilt: skovbrugshytte</string>
<string name="poi_forestry_compartment">Vejskilt: skovbrug rum</string>
<string name="poi_forestry_allotment">Vejskilt: skovbrug tildeling</string>
<string name="poi_inscription_n">Inskription: N</string>
<string name="poi_inscription_nw">Inskription: NV</string>

2
OsmAnd/res/values-de/strings.xml
View file

@ -1996,6 +1996,6 @@
<string name="shared_string_type">Typ</string>
<string name="starting_point">Startpunkt</string>
<string name="shared_string_undo_all">Alles rückgängig machen</string>
<string name="rendering_attr_hideIcons_name">Symbole ausblenden</string>
<string name="rendering_attr_hideIcons_name">POI Symbole ausblenden</string>
<string name="switch_start_finish">Startpunkt und Ziel vertauschen</string>
</resources>

2
OsmAnd/res/values-fr/strings.xml
View file

@ -2112,5 +2112,5 @@
<string name="rec_split_storage_size_desc">Espace maximum alloué pour tous les enregistrements</string>
<string name="shared_string_type">Type</string>
<string name="switch_start_finish">Inverser Départ et Destination</string>
<string name="rendering_attr_hideIcons_name">Masquer les icônes de PI</string>
<string name="rendering_attr_hideIcons_name">Masquer les icônes des PI</string>
</resources>

3
OsmAnd/res/values-sv/strings.xml
View file

@ -2064,5 +2064,6 @@
<string name="item_deleted">post raderad</string>
<string name="n_items_deleted">poster raderade</string>
<string name="shared_string_undo_all">ÅNGRA ALLA</string>
<string name="rendering_attr_hideIcons_name">Dölj ikonerna</string>
<string name="rendering_attr_hideIcons_name">Dölj POI-ikoner</string>
<string name="switch_start_finish">Skifta startpunkt och destination</string>
</resources>

4
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -2071,6 +2071,6 @@
<string name="item_deleted">項目已刪除</string>
<string name="n_items_deleted">項目已刪除</string>
<string name="shared_string_undo_all">全部取消</string>
<string name="rendering_attr_hideIcons_name">隱藏圖示</string>
<string name="switch_start_finish">切換開始以及結束</string>
<string name="rendering_attr_hideIcons_name">隱藏 POI 圖示</string>
<string name="switch_start_finish">起始點與目的地對調</string>
</resources>

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

@ -11,6 +11,7 @@ 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;
@ -226,6 +227,11 @@ public class TargetPointsHelper {
}
public void updateRouteAndReferesh(boolean updateRoute) {
//Fix for Issue 2136(b-d) (i.e. after Destination has been deleted)
if (pointToNavigate == null) {
mapActivity.getMapActions().stopNavigationWithoutConfirm();
}
if(updateRoute && ( routingHelper.isRouteBeingCalculated() || routingHelper.isRouteCalculated() ||
routingHelper.isFollowingMode() || routingHelper.isRoutePlanningMode())) {
updateRoutingHelper();

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

@ -1185,6 +1185,11 @@ public class DashboardOnMap implements ObservableScrollViewCallbacks, DynamicLis
newRouteIsCalculated(false, new ValueHolder<Boolean>());
getMyApplication().getTargetPointsHelper().updateRouteAndReferesh(true);
//Fix for Issue 2136(b), but see more global fix in TargetPointsHelper
//if (mapActivity.getMyApplication().getTargetPointsHelper().getPointToNavigate() == null) {
// mapActivity.getMapActions().stopNavigationWithoutConfirm();
//}
if (swipeDismissListener != null) {
swipeDismissListener.setEnabled(true);
}

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

@ -611,6 +611,10 @@ public class MapRouteInfoMenu implements IRouteInformationListener {
if (switched) {
mapControlsLayer.switchToRouteFollowingLayout();
}
//Fix for Issue 2136(a)
if (getTargets().getPointToNavigate() == null) {
mapActivity.getMapActions().stopNavigationWithoutConfirm();
}
}
public void show() {