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

Merge pull request #964 from Bars107/r1.9

Browse source 
R1.9
This commit is contained in:
vshcherb 2014-11-19 17:26:11 +01:00
commit f3fcc04f67
6 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
OsmAnd-java/src/net/osmand/router/RoutingConfiguration.java
View file

@ -114,8 +114,10 @@ public class RoutingConfiguration {
} }
public void addImpassableRoad(RouteDataObject r) { public void addImpassableRoad(RouteDataObject r) {
impassableRoadIds.add(r.id); if (!impassableRoadIds.contains(r.id)){
impassableRoads.add(r); impassableRoadIds.add(r.id);
impassableRoads.add(r);
}
} }

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

@ -298,6 +298,8 @@ public class MapActivityLayers {
if (!settings.SAVE_TRACK_TO_GPX.get() && ! if (!settings.SAVE_TRACK_TO_GPX.get() && !
settings.SAVE_GLOBAL_TRACK_TO_GPX.get()) { settings.SAVE_GLOBAL_TRACK_TO_GPX.get()) {
AccessibleToast.makeText(activity, R.string.gpx_monitoring_disabled_warn, Toast.LENGTH_SHORT).show(); AccessibleToast.makeText(activity, R.string.gpx_monitoring_disabled_warn, Toast.LENGTH_SHORT).show();
} else {
g.path = getString(R.string.show_current_gpx_title);
} }
break; break;
} }

17
OsmAnd/src/net/osmand/plus/download/DownloadActivity.java
View file

@ -18,6 +18,7 @@ import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Window; import com.actionbarsherlock.view.Window;
import net.osmand.IndexConstants; import net.osmand.IndexConstants;
import net.osmand.access.AccessibleAlertBuilder; import net.osmand.access.AccessibleAlertBuilder;
import net.osmand.map.OsmandRegions;
import net.osmand.plus.*; import net.osmand.plus.*;
import net.osmand.plus.activities.FavouritesActivity; import net.osmand.plus.activities.FavouritesActivity;
import net.osmand.plus.activities.LocalIndexInfo; import net.osmand.plus.activities.LocalIndexInfo;
@ -596,4 +597,20 @@ public class DownloadActivity extends SherlockFragmentActivity {
} }
} }
public static String getFullName(IndexItem e, OsmandApplication app, OsmandRegions osmandRegions) {
String eName;
List<IndexItem> forCat = new ArrayList<IndexItem>();
forCat.add(e);
List<IndexItemCategory> category = IndexItemCategory.categorizeIndexItems(app, forCat);
if (category.size() != 0){
eName = e.getVisibleDescription(app) + "\n"
+ category.get(0).name + " "
+ e.getVisibleName(app, osmandRegions);
} else {
eName = e.getVisibleDescription(app) + "\n"
+ e.getVisibleName(app, osmandRegions);
}
return eName;
}
} }

5
OsmAnd/src/net/osmand/plus/download/LocalIndexesFragment.java
View file

@ -961,8 +961,9 @@ public class LocalIndexesFragment extends OsmandExpandableListFragment {
private String getNameToDisplay(LocalIndexInfo child) { private String getNameToDisplay(LocalIndexInfo child) {
String mapDescr = getMapDescription(child.getFileName()); String mapDescr = getMapDescription(child.getFileName());
String mapName = FileNameTranslationHelper.getFileName(ctx, ((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(), child.getFileName()); String mapName = FileNameTranslationHelper.getFileName(ctx,
((OsmandApplication) getDownloadActivity().getApplication()).getResourceManager().getOsmandRegions(),
child.getFileName());
if (mapDescr.length() > 0){ if (mapDescr.length() > 0){
return mapDescr + " - " + mapName; return mapDescr + " - " + mapName;
} else { } else {

3
OsmAnd/src/net/osmand/plus/download/UpdatesIndexFragment.java
View file

@ -202,7 +202,8 @@ public class UpdatesIndexFragment extends SherlockListFragment {
TextView name = (TextView) v.findViewById(R.id.download_item); TextView name = (TextView) v.findViewById(R.id.download_item);
TextView description = (TextView) v.findViewById(R.id.download_descr); TextView description = (TextView) v.findViewById(R.id.download_descr);
IndexItem e = items.get(position); IndexItem e = items.get(position);
String eName = e.getVisibleDescription(getMyApplication()) + "\n" + e.getVisibleName(getMyApplication(), osmandRegions); String eName = DownloadActivity.getFullName(e, getMyApplication(), osmandRegions);
name.setText(eName.trim()); //$NON-NLS-1$ name.setText(eName.trim()); //$NON-NLS-1$
String d = e.getDate(format) + "\n" + e.getSizeDescription(getMyApplication()); String d = e.getDate(format) + "\n" + e.getSizeDescription(getMyApplication());
description.setText(d); description.setText(d);

6
OsmAnd/src/net/osmand/plus/helpers/GpxUiHelper.java
View file

@ -141,7 +141,8 @@ public class GpxUiHelper {
if(showCurrentGpx){ if(showCurrentGpx){
allGpxList.add(0, activity.getString(R.string.show_current_gpx_title)); allGpxList.add(0, activity.getString(R.string.show_current_gpx_title));
} }
final ContextMenuAdapter adapter = createGpxContextMenuAdapter(activity,allGpxList, selectedGpxList, multipleChoice); final ContextMenuAdapter adapter = createGpxContextMenuAdapter(activity, allGpxList, selectedGpxList, multipleChoice);
return createDialog(activity, showCurrentGpx, multipleChoice, callbackWithObject, allGpxList, adapter); return createDialog(activity, showCurrentGpx, multipleChoice, callbackWithObject, allGpxList, adapter);
} }
return null; return null;
@ -166,7 +167,8 @@ public class GpxUiHelper {
return null; return null;
} }
private static ContextMenuAdapter createGpxContextMenuAdapter(Activity activity, List<String> allGpxList, List<String> selectedGpxList, boolean multipleChoice) { private static ContextMenuAdapter createGpxContextMenuAdapter(Activity activity, List<String> allGpxList,
List<String> selectedGpxList, boolean multipleChoice) {
final ContextMenuAdapter adapter = new ContextMenuAdapter(activity); final ContextMenuAdapter adapter = new ContextMenuAdapter(activity);
//element position in adapter //element position in adapter
int i = 0; int i = 0;