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

Update android version

Browse source
This commit is contained in:
Victor Shcherb 2016-04-24 21:12:21 +02:00
parent a0d875c76b
commit 219f1c9038
5 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
OsmAnd-java/src/net/osmand/binary/BinaryInspector.java
View file

@ -59,6 +59,7 @@ public class BinaryInspector {
public static final int BUFFER_SIZE = 1 << 20;
private static final int SHIFT_ID = 6;
private VerboseInfo vInfo;
public static void main(String[] args) throws IOException {
@ -898,7 +899,7 @@ public class BinaryInspector {
b.append("]");
}
b.append(" id ").append((obj.getId() >> 1));
b.append(" id ").append((obj.getId() >> (SHIFT_ID + 1)));
if (vmapCoordinates) {
b.append(" lat/lon : ");
for (int i = 0; i < obj.getPointsLength(); i++) {
@ -948,7 +949,7 @@ public class BinaryInspector {
}
}
tags.append("\t<tag k=\'").append("original_id").append("' v='").append(obj.getId() >> 1).append("'/>\n");
tags.append("\t<tag k=\'").append("original_id").append("' v='").append(obj.getId() >> (SHIFT_ID + 1)).append("'/>\n");
if(point) {
float lon= (float) MapUtils.get31LongitudeX(obj.getPoint31XTile(0));
float lat = (float) MapUtils.get31LatitudeY(obj.getPoint31YTile(0));

2
OsmAnd/no_translate.xml
View file

@ -11,7 +11,7 @@
-->
<!-- Not translatable -->
<string name="osm_live">OSM Live</string>
<string name="osm_live">OSM Live (Beta)</string>
<string name="ga_api_key">UA-28342846-2</string>
<string name="ga_dispatchPeriod">10</string>
<string name="ga_debug">true</string>

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

@ -9,7 +9,8 @@
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
-->
<string name="use_osm_live_routing_description">Enable navigation for OSM Live changes (Beta)</string>
<string name="use_osm_live_routing">OSM Live navigation</string>
<string name="access_no_destination">Destination is not set</string>
<string name="map_widget_magnetic_bearing">Magnetic bearing</string>
<string name="map_widget_bearing">Relative bearing</string>

12
OsmAnd/src/net/osmand/plus/development/SettingsDevelopmentActivity.java
View file

@ -72,14 +72,20 @@ public class SettingsDevelopmentActivity extends SettingsBaseActivity {
}
});
cat.addPreference(firstRunPreference);
cat.addPreference(createCheckBoxPreference(settings.USE_OSM_LIVE_FOR_ROUTING,
R.string.use_osm_live_routing,
R.string.use_osm_live_routing_description));
cat.addPreference(createCheckBoxPreference(settings.SHOULD_SHOW_FREE_VERSION_BANNER,
R.string.show_free_version_banner,
R.string.show_free_version_banner_description));
cat.addPreference(createCheckBoxPreference(settings.USE_MAP_MARKERS,
R.string.map_markers,
R.string.show_map_markers_description));
// FIXME delete USE_MAP_MARKERS
// cat.addPreference(createCheckBoxPreference(settings.USE_MAP_MARKERS,
// R.string.map_markers,
// R.string.show_map_markers_description));
Preference pref = new Preference(this);
final Preference simulate = pref;

2
OsmAnd/src/net/osmand/plus/download/DownloadActivityType.java
View file

@ -194,7 +194,7 @@ public class DownloadActivityType {
if (this== DownloadActivityType.ROADS_FILE) {
return "&road=yes";
} else if (this == DownloadActivityType.LIVE_UPDATES_FILE) {
return "&osmc=yes";
return "&aosmc=yes";
} else if (this == DownloadActivityType.SRTM_COUNTRY_FILE) {
return "&srtmcountry=yes";
} else if (this == DownloadActivityType.WIKIPEDIA_FILE) {