From ec5d0287bf7f467ea1710aecb2a7fbbee8ba580f Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Tue, 30 Jul 2013 21:28:19 +0200 Subject: [PATCH 001/145] OpeningHoursParser cleanup. --- .gitignore | 1 + .../net/osmand/util/OpeningHoursParser.java | 115 ++++++++++-------- 2 files changed, 65 insertions(+), 51 deletions(-) mode change 100755 => 100644 .gitignore diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 index 5f0f2adb6c..4b105c9803 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ h_*.png g_*.png mm_*.png mx_*.png +*.class diff --git a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java index 86b9934e8f..07da63338b 100644 --- a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java +++ b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java @@ -1,4 +1,5 @@ package net.osmand.util; +/* Has to be commented out in order to run the main function and test the package? */ @@ -272,10 +273,10 @@ public class OpeningHoursParser { public boolean containsPreviousDay(Calendar cal){ int i = cal.get(Calendar.DAY_OF_WEEK); int p = (i + 4) % 7; - if (days[p]) { - return true; + if (days[p]) { + return true; } - return false; + return false; } /** @@ -337,35 +338,34 @@ public class OpeningHoursParser { @Override public String toRuleString() { StringBuilder b = new StringBuilder(25); - { // Month - boolean dash = false; - boolean first = true; - for (int i = 0; i < 12; i++) { - if (months[i]) { - if (i > 0 && months[i - 1] && i < 11 && months[i + 1]) { - if (!dash) { - dash = true; - b.append("-"); //$NON-NLS-1$ - } - continue; - } - if (first) { - first = false; - } else if (!dash) { - b.append(", "); //$NON-NLS-1$ - } - b.append(monthsStr[i]); - dash = false; - } - } - if (b.length() != 0) { - b.append(": "); - } - } - // Day - boolean dash = false; + // Month + boolean dash = false; boolean first = true; + for (int i = 0; i < 12; i++) { + if (months[i]) { + if (i > 0 && months[i - 1] && i < 11 && months[i + 1]) { + if (!dash) { + dash = true; + b.append("-"); //$NON-NLS-1$ + } + continue; + } + if (first) { + first = false; + } else if (!dash) { + b.append(", "); //$NON-NLS-1$ + } + b.append(monthsStr[i]); + dash = false; + } + } + if (b.length() != 0) { + b.append(": "); + } + // Day boolean open24_7 = true; + dash = false; + first = true; for (int i = 0; i < 7; i++) { if (days[i]) { if (i > 0 && days[i - 1] && i < 6 && days[i + 1]) { @@ -423,16 +423,16 @@ public class OpeningHoursParser { public void addTimeRange(int startTime, int endTime) { int l = startTimes.length; int[] newStartTimes = new int[l + 1]; - int[] newEndTimes = new int[l + 1]; + int[] newEndTimes = new int[l + 1]; for (int i = 0; i < l; i++) { newStartTimes[i] = startTimes[i]; - newEndTimes[i] = endTimes[i]; + newEndTimes[i] = endTimes[i]; } newStartTimes[l] = startTime; - newEndTimes[l] = endTime; + newEndTimes[l] = endTime; startTimes = newStartTimes; - endTimes = newEndTimes; + endTimes = newEndTimes; } } @@ -449,14 +449,14 @@ public class OpeningHoursParser { r = r.replaceAll("sunrise", sunrise); // replace the '+' by an arbitrary value r = r.replaceAll("\\+", "-" + endOfDay); - int startDay = -1; - int previousDay = -1; - int startMonth = -1; + int startDay = -1; + int previousDay = -1; + int startMonth = -1; int previousMonth = -1; - int k = 0; + int k = 0; // Position in opening_hours string BasicOpeningHourRule basic = new BasicOpeningHourRule(); - boolean[] days = basic.getDays(); + boolean[] days = basic.getDays(); boolean[] months = basic.getMonths(); // check 24/7 if("24/7".equals(r)){ @@ -601,8 +601,8 @@ public class OpeningHoursParser { endHour = Integer.parseInt(stEnd[1].substring(0, i2).trim()); endMin = Integer.parseInt(stEnd[1].substring(i2 + 1).trim()); } - st = startHour * 60 + startMin; - end = endHour * 60 + endMin; + st = startHour * 60 + startMin; + end = endHour * 60 + endMin; } catch (NumberFormatException e) { return false; } @@ -624,15 +624,16 @@ public class OpeningHoursParser { public static OpeningHours parseOpenedHours(String format){ // split the OSM string in multiple rules String[] rules = format.split(";"); //$NON-NLS-1$ + // FIXME: What if the semicolon is inside a quoted string? OpeningHours rs = new OpeningHours(); for(String r : rules){ r = r.trim(); - if(r.length() == 0){ + if (r.length() == 0) { continue; } // check if valid boolean rule = parseRule(r, rs); - if(!rule){ + if (!rule) { return null; } } @@ -641,50 +642,62 @@ public class OpeningHoursParser { private static void formatTime(int h, int t, StringBuilder b){ - if(h < 10){ + if (h < 10) { b.append("0"); //$NON-NLS-1$ - } + } b.append(h).append(":"); //$NON-NLS-1$ - if(t < 10){ + if (t < 10) { b.append("0"); //$NON-NLS-1$ } b.append(t); } + /** + * test if the calculated opening hours are what you expect + * @param time the time to test in the format "dd.MM.yyyy HH:mm" + * @param hours the OpeningHours object + * @param expected the expected state + */ private static void testOpened(String time, OpeningHours hours, boolean expected) throws ParseException { Calendar cal = Calendar.getInstance(); cal.setTime(new SimpleDateFormat("dd.MM.yyyy HH:mm").parse(time)); - System.out.println("Expected " + time+": " + expected +" = " + hours.isOpenedForTime(cal)); + boolean isOpen = hours.isOpenedForTime(cal); + System.out.println(" " + (isOpen == expected ? "ok" : "not ok") + " - " + "state for " + time+": " + isOpen); } public static void main(String[] args) throws ParseException { - - - //Test basic case + // Test basic case OpeningHours hours = parseOpenedHours("Mo-Fr 08:30-14:40" ); //$NON-NLS-1$ System.out.println(hours); testOpened("09.08.2012 11:00", hours, true); testOpened("09.08.2012 16:00", hours, false); + // two time and date ranges hours = parseOpenedHours("Mo-We, Fr 08:30-14:40,15:00-19:00"); //$NON-NLS-1$ System.out.println(hours); testOpened("08.08.2012 14:00", hours, true); - testOpened("10.08.2012 15:00", hours, true); testOpened("08.08.2012 14:50", hours, false); + testOpened("10.08.2012 15:00", hours, true); + // test exception on general schema hours = parseOpenedHours("Mo-Sa 08:30-14:40; Tu 08:00 - 14:00"); //$NON-NLS-1$ System.out.println(hours); testOpened("07.08.2012 14:20", hours, false); + // test off value hours = parseOpenedHours("Mo-Sa 09:00-18:25; Th off"); //$NON-NLS-1$ System.out.println(hours); testOpened("08.08.2012 12:00", hours, true); testOpened("09.08.2012 12:00", hours, false); + //test 24/7 hours = parseOpenedHours("24/7"); //$NON-NLS-1$ System.out.println(hours); testOpened("08.08.2012 23:59", hours, true); + testOpened("08.08.2012 12:23", hours, true); + testOpened("08.08.2012 06:23", hours, true); + // some people seem to use the following syntax: hours = parseOpenedHours("Sa-Su 24/7"); System.out.println(hours); From 7901e95fac557e0efb3ca39067cbe4104a6e13d6 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Fri, 2 Aug 2013 21:12:21 -0300 Subject: [PATCH 002/145] Fix manual array copy --- .../src/net/osmand/plus/PoiFiltersHelper.java | 4 +--- .../views/mapwidgets/MapWidgetRegistry.java | 17 +++-------------- .../animation/PropertyValuesHolder.java | 4 +--- 3 files changed, 5 insertions(+), 20 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java b/OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java index 05e28bab4f..6d96c544c5 100644 --- a/OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java +++ b/OsmAnd/src/net/osmand/plus/PoiFiltersHelper.java @@ -78,9 +78,7 @@ public class PoiFiltersHelper { private void putValues(Map> types, AmenityType tp,String... vls){ LinkedHashSet list = new LinkedHashSet(); - for(String v: vls){ - list.add(v); - } + Collections.addAll(list, vls); types.put(tp, list); } diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java index 6af60622d5..4499c7d7f5 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java @@ -1,13 +1,6 @@ package net.osmand.plus.views.mapwidgets; -import java.util.Comparator; -import java.util.EnumSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; +import java.util.*; import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandSettings; @@ -63,9 +56,7 @@ public class MapWidgetRegistry { } else { LinkedHashSet set = new LinkedHashSet(); visibleElements.put(ms, set); - for(String s : mpf.split(";")){ - set.add(s); - } + Collections.addAll(set, mpf.split(";")); } } @@ -371,9 +362,7 @@ public class MapWidgetRegistry { } public MapWidgetRegInfo required(ApplicationMode... modes){ - for(ApplicationMode ms : modes) { - visibleModes.add(ms); - } + Collections.addAll(visibleModes, modes); return this; } diff --git a/SherlockBar/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/SherlockBar/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java index 84f7504abc..0aa1fece2c 100644 --- a/SherlockBar/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java +++ b/SherlockBar/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java @@ -337,9 +337,7 @@ public class PropertyValuesHolder implements Cloneable { int numKeyframes = values.length; Keyframe keyframes[] = new Keyframe[Math.max(numKeyframes,2)]; mValueType = values[0].getType(); - for (int i = 0; i < numKeyframes; ++i) { - keyframes[i] = values[i]; - } + System.arraycopy(values, 0, keyframes, 0, numKeyframes); mKeyframeSet = new KeyframeSet(keyframes); } From db7346ea5394767ce7c797a4cc038c7c2a070f12 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Fri, 2 Aug 2013 21:15:02 -0300 Subject: [PATCH 003/145] Fix redundant toString() on a String object --- OsmAnd/src/net/osmand/plus/OsmandApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandApplication.java b/OsmAnd/src/net/osmand/plus/OsmandApplication.java index f2707bf417..25dd830476 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandApplication.java +++ b/OsmAnd/src/net/osmand/plus/OsmandApplication.java @@ -583,7 +583,7 @@ public class OsmandApplication extends Application implements ClientContext { uiHandler.post(new Runnable() { @Override public void run() { - AccessibleToast.makeText(uiContext, b.toString(), Toast.LENGTH_LONG).show(); + AccessibleToast.makeText(uiContext, b, Toast.LENGTH_LONG).show(); } }); } From 20f18fd5a6dd79a17584820632ee9b6ad52e0dac Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Fri, 2 Aug 2013 21:17:53 -0300 Subject: [PATCH 004/145] Fix single character string argument These String literals may be replaced by equivalent character literals, gaining some performance enhancement. --- OsmAnd-java/src/net/osmand/map/TileSourceManager.java | 2 +- .../net/osmand/plus/activities/search/GeoIntentActivity.java | 4 ++-- .../src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java | 2 +- OsmAnd/src/net/osmand/plus/views/YandexTrafficAdapter.java | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/map/TileSourceManager.java b/OsmAnd-java/src/net/osmand/map/TileSourceManager.java index a7bf075c5f..ddb6c98fee 100644 --- a/OsmAnd-java/src/net/osmand/map/TileSourceManager.java +++ b/OsmAnd-java/src/net/osmand/map/TileSourceManager.java @@ -288,7 +288,7 @@ public class TileSourceManager { String fileName = file.getName(); if (fileName.endsWith(".tile")) { String substring = fileName.substring(0, fileName.length() - ".tile".length()); - int extInt = substring.lastIndexOf("."); + int extInt = substring.lastIndexOf('.'); if (extInt != -1) { return substring.substring(extInt, substring.length()); } diff --git a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java index 7864964e1e..1f25841d15 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java @@ -206,8 +206,8 @@ public class GeoIntentActivity extends OsmandListActivity { int i = q.indexOf(','); String lat = q.substring(0, i); String lon = q.substring(i + 1); - if (lat.indexOf(":") != -1) { - i = lat.indexOf(":"); + if (lat.indexOf(':') != -1) { + i = lat.indexOf(':'); lat = lat.substring(i + 1); } try { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java index d8404959f7..b8b4a97e87 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OpenstreetmapRemoteUtil.java @@ -265,7 +265,7 @@ public class OpenstreetmapRemoteUtil implements OpenstreetmapUtil { int i = res.indexOf("new_id=\""); //$NON-NLS-1$ if (i > 0) { i = i + "new_id=\"".length(); //$NON-NLS-1$ - int end = res.indexOf("\"", i); //$NON-NLS-1$ + int end = res.indexOf('\"', i); //$NON-NLS-1$ if (end > 0) { newId = Long.parseLong(res.substring(i, end)); // << 1; newN = new Node(n, newId); diff --git a/OsmAnd/src/net/osmand/plus/views/YandexTrafficAdapter.java b/OsmAnd/src/net/osmand/plus/views/YandexTrafficAdapter.java index 3d8f5faffa..79235106f4 100644 --- a/OsmAnd/src/net/osmand/plus/views/YandexTrafficAdapter.java +++ b/OsmAnd/src/net/osmand/plus/views/YandexTrafficAdapter.java @@ -66,8 +66,8 @@ public class YandexTrafficAdapter extends MapTileAdapter { String str = dataStream.toString(); // JSONObject json = new JSONObject(str.replace("YMaps.TrafficLoader.onLoad(\"stat\",", "").replace("});", "}")); int start = str.indexOf("timestamp:"); //$NON-NLS-1$ - start = str.indexOf("\"", start) + 1; //$NON-NLS-1$ - int end = str.indexOf("\"", start); //$NON-NLS-1$ + start = str.indexOf('\"', start) + 1; //$NON-NLS-1$ + int end = str.indexOf('\"', start); //$NON-NLS-1$ // exception case if (start < 0 || end < 0) { log.info("Timestamp wasn't updated " + str); //$NON-NLS-1$ From 4c90f4aef38d9c08f5f75cb46e28e4192b93d61b Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Fri, 2 Aug 2013 21:21:30 -0300 Subject: [PATCH 005/145] Replace StringBuffer.toString() in concatenation In addition to being confusing, this code performs String allocation and copying, which is unnecessary as of JDK1.4 --- .../src/net/osmand/plus/activities/LiveMonitoringHelper.java | 2 +- .../plus/activities/search/SearchAddressOnlineFragment.java | 2 +- .../net/osmand/plus/activities/search/SearchPOIActivity.java | 4 ++-- .../plus/activities/search/SearchTransportFragment.java | 2 +- OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java | 2 +- OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java | 4 ++-- OsmAnd/src/net/osmand/plus/routing/RouteProvider.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java b/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java index 76e09aed50..6efba25a22 100644 --- a/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java +++ b/OsmAnd/src/net/osmand/plus/activities/LiveMonitoringHelper.java @@ -166,7 +166,7 @@ public class LiveMonitoringHelper { is.close(); } httpclient.getConnectionManager().shutdown(); - log.info("Montior response : " + responseBody.toString()); + log.info("Montior response : " + responseBody); } diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java index 1b5bb0154d..8ed4783e84 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchAddressOnlineFragment.java @@ -161,7 +161,7 @@ public class SearchAddressOnlineFragment extends SherlockFragment implements Sea b.append("?format=xml&addressdetails=0&accept-language=").append(Locale.getDefault().getLanguage()); //$NON-NLS-1$ b.append("&q=").append(URLEncoder.encode(search, "UTF-8")); //$NON-NLS-1$ - log.info("Searching address at : " + b.toString()); //$NON-NLS-1$ + log.info("Searching address at : " + b); //$NON-NLS-1$ URL url = new URL(b.toString()); URLConnection conn = url.openConnection(); conn.setDoInput(true); diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index d927b1fe43..a0ca2d758e 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -811,8 +811,8 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa StringBuilder value = new StringBuilder(); MapRenderingTypes.getDefault().getAmenityTagValue(amenity.getType(), amenity.getSubType(), tag, value); - if(RenderingIcons.containsBigIcon(tag.toString() + "_" + value.toString())) { - icon.setImageResource(RenderingIcons.getBigIconResourceId(tag.toString() + "_" + value.toString())); + if(RenderingIcons.containsBigIcon(tag + "_" + value)) { + icon.setImageResource(RenderingIcons.getBigIconResourceId(tag + "_" + value)); } else if(RenderingIcons.containsBigIcon(value.toString())) { icon.setImageResource(RenderingIcons.getBigIconResourceId(value.toString())); } else { diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java index 1adca19e4f..332d6674b6 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchTransportFragment.java @@ -505,7 +505,7 @@ public class SearchTransportFragment extends SherlockFragment implements SearchA int dist = locationToStart == null ? 0 : (int) (MapUtils.getDistance(stop.getStart().getLocation(), locationToStart)); String distance = OsmAndFormatter.getFormattedDistance(dist, (ClientContext) getApplication()) + " "; //$NON-NLS-1$ - label.setText(distance + labelW.toString(), TextView.BufferType.SPANNABLE); + label.setText(distance + labelW, TextView.BufferType.SPANNABLE); ((Spannable) label.getText()).setSpan(new ForegroundColorSpan(getResources().getColor(R.color.color_distance)), 0, distance.length() - 1, 0); return (row); } diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java index b7a607847b..f199263a46 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java @@ -289,7 +289,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider b.append(",").append(rightLongitude); //$NON-NLS-1$ b.append(",").append(topLatitude); //$NON-NLS-1$ try { - log.info("Loading bugs " + b.toString()); //$NON-NLS-1$ + log.info("Loading bugs " + b); //$NON-NLS-1$ URL url = new URL(b.toString()); URLConnection connection = url.openConnection(); BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream())); diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java index b93055a249..bfd34b9b58 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsRemoteUtil.java @@ -107,11 +107,11 @@ public class OsmBugsRemoteUtil implements OsmBugsUtil { responseBody.append(s); } } - log.info("Response : " + responseBody.toString()); //$NON-NLS-1$ + log.info("Response : " + responseBody); //$NON-NLS-1$ } connection.disconnect(); if (!ok) { - return msg + "\n" + responseBody.toString(); + return msg + "\n" + responseBody; } } catch (NullPointerException e) { // that's tricky case why NPE is thrown to fix that problem httpClient could be used diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java index 702282637a..68a296776b 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java @@ -630,7 +630,7 @@ public class RouteProvider { // TODO if we would get instructions from the service, we could use this language setting // .append("&language=").append(Locale.getDefault().getLanguage()); - log.info("URL route " + request.toString()); + log.info("URL route " + request); URI uri = URI.create(request.toString()); URL url = uri.toURL(); URLConnection connection = url.openConnection(); From a6f9976973b346eb98bb76244cec9d8b02881869 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Fri, 2 Aug 2013 22:18:18 -0300 Subject: [PATCH 006/145] Fix buttons order Layout uses the wrong button order for API >= 14: Cancel button should be on the left (was "Save | Cancel", should be "Cancel | Save") --- OsmAnd/res/layout/editing_poi.xml | 2 +- OsmAnd/res/layout/save_directions_dialog.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/layout/editing_poi.xml b/OsmAnd/res/layout/editing_poi.xml index 9c9db12907..aef8b3823d 100644 --- a/OsmAnd/res/layout/editing_poi.xml +++ b/OsmAnd/res/layout/editing_poi.xml @@ -206,8 +206,8 @@ - + diff --git a/OsmAnd/res/layout/save_directions_dialog.xml b/OsmAnd/res/layout/save_directions_dialog.xml index 0c7d246183..ba047aaa3a 100644 --- a/OsmAnd/res/layout/save_directions_dialog.xml +++ b/OsmAnd/res/layout/save_directions_dialog.xml @@ -10,7 +10,7 @@ - + From bcab94e54f0b73d80d9618a85324a0df9ac4c03b Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Fri, 2 Aug 2013 22:29:16 -0300 Subject: [PATCH 007/145] Fix inefficient layout weight When only a single widget in a LinearLayout defines a weight, it is more efficient to assign a width/height of 0dp to it since it will absorb all the remaining space anyway. With a declared width/height of 0dp it does not have to measure its own size first. --- OsmAnd/res/layout-land/menu.xml | 10 +-- OsmAnd/res/layout-large-land/menu.xml | 10 +-- OsmAnd/res/layout-large/menu.xml | 10 +-- .../res/layout-large/route_info_list_item.xml | 2 +- OsmAnd/res/layout/change_order_item.xml | 49 ++++++------- .../res/layout/download_build_list_item.xml | 2 +- OsmAnd/res/layout/download_index.xml | 2 +- .../res/layout/download_index_list_item.xml | 2 +- OsmAnd/res/layout/favourites_list.xml | 2 +- .../res/layout/layers_list_activity_item.xml | 66 ++++++++--------- OsmAnd/res/layout/list_menu_item.xml | 72 ++++++++++--------- OsmAnd/res/layout/list_menu_item_native.xml | 70 +++++++++--------- OsmAnd/res/layout/local_index.xml | 2 +- OsmAnd/res/layout/local_index_list_item.xml | 2 +- .../layout/local_openstreetmap_list_item.xml | 2 +- OsmAnd/res/layout/menu.xml | 10 +-- OsmAnd/res/layout/open_hours_list_item.xml | 2 +- OsmAnd/res/layout/plugins.xml | 2 +- OsmAnd/res/layout/route_info_list_item.xml | 2 +- OsmAnd/res/layout/search_address_offline.xml | 2 +- OsmAnd/res/layout/search_address_online.xml | 4 +- .../res/layout/search_history_list_item.xml | 2 +- OsmAnd/res/layout/search_transport.xml | 2 +- .../layout/search_transport_route_item.xml | 2 +- OsmAnd/res/layout/searchpoifolder_list.xml | 2 +- OsmAnd/res/layout/tips_and_tricks.xml | 2 +- SherlockBar/res/layout/abs__search_view.xml | 4 +- 27 files changed, 173 insertions(+), 166 deletions(-) diff --git a/OsmAnd/res/layout-land/menu.xml b/OsmAnd/res/layout-land/menu.xml index eda7c41d68..d0a4c14f3a 100644 --- a/OsmAnd/res/layout-land/menu.xml +++ b/OsmAnd/res/layout-land/menu.xml @@ -12,7 +12,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b - - - - @@ -77,7 +77,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b android:layout_gravity="center|left" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - - @@ -49,7 +49,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b android:layout_gravity="center|left" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - @@ -80,7 +80,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b android:layout_gravity="center|left" android:layout_width="wrap_content" android:layout_height="wrap_content"/> - - + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> + android:layout_width="0dp" android:layout_height="wrap_content"> diff --git a/OsmAnd/res/layout/change_order_item.xml b/OsmAnd/res/layout/change_order_item.xml index 275a4de08a..013f7edb4f 100644 --- a/OsmAnd/res/layout/change_order_item.xml +++ b/OsmAnd/res/layout/change_order_item.xml @@ -1,25 +1,26 @@ - - - - - - + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/download_build_list_item.xml b/OsmAnd/res/layout/download_build_list_item.xml index 51d8431deb..a961c2f760 100644 --- a/OsmAnd/res/layout/download_build_list_item.xml +++ b/OsmAnd/res/layout/download_build_list_item.xml @@ -2,7 +2,7 @@ - diff --git a/OsmAnd/res/layout/download_index_list_item.xml b/OsmAnd/res/layout/download_index_list_item.xml index b0743c8839..eeaeea55f0 100644 --- a/OsmAnd/res/layout/download_index_list_item.xml +++ b/OsmAnd/res/layout/download_index_list_item.xml @@ -6,7 +6,7 @@ - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/list_menu_item.xml b/OsmAnd/res/layout/list_menu_item.xml index a562a39a46..6939d9963f 100644 --- a/OsmAnd/res/layout/list_menu_item.xml +++ b/OsmAnd/res/layout/list_menu_item.xml @@ -1,36 +1,38 @@ - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/list_menu_item_native.xml b/OsmAnd/res/layout/list_menu_item_native.xml index 2e4b7dc285..d754157797 100644 --- a/OsmAnd/res/layout/list_menu_item_native.xml +++ b/OsmAnd/res/layout/list_menu_item_native.xml @@ -1,35 +1,37 @@ - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/OsmAnd/res/layout/local_index.xml b/OsmAnd/res/layout/local_index.xml index 3e3c0887b6..ab2daae1d3 100644 --- a/OsmAnd/res/layout/local_index.xml +++ b/OsmAnd/res/layout/local_index.xml @@ -11,7 +11,7 @@ - diff --git a/OsmAnd/res/layout/local_openstreetmap_list_item.xml b/OsmAnd/res/layout/local_openstreetmap_list_item.xml index b795fa7e8e..9311406a47 100644 --- a/OsmAnd/res/layout/local_openstreetmap_list_item.xml +++ b/OsmAnd/res/layout/local_openstreetmap_list_item.xml @@ -2,6 +2,6 @@ - diff --git a/OsmAnd/res/layout/menu.xml b/OsmAnd/res/layout/menu.xml index 040d179997..0d79c24bee 100644 --- a/OsmAnd/res/layout/menu.xml +++ b/OsmAnd/res/layout/menu.xml @@ -12,7 +12,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:b - + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> + android:layout_weight="1" android:layout_width="wrap_content" android:layout_height="0dp"/> - - diff --git a/OsmAnd/res/layout/route_info_list_item.xml b/OsmAnd/res/layout/route_info_list_item.xml index df42d2494b..245f831ec8 100644 --- a/OsmAnd/res/layout/route_info_list_item.xml +++ b/OsmAnd/res/layout/route_info_list_item.xml @@ -6,7 +6,7 @@ + android:layout_width="0dp" android:layout_height="wrap_content"> diff --git a/OsmAnd/res/layout/search_address_offline.xml b/OsmAnd/res/layout/search_address_offline.xml index 3a73fab831..ac5e732bc5 100644 --- a/OsmAnd/res/layout/search_address_offline.xml +++ b/OsmAnd/res/layout/search_address_offline.xml @@ -8,7 +8,7 @@ android:id="@android:id/list" style="@style/OsmandListView" android:layout_width="fill_parent" - android:layout_height="wrap_content" + android:layout_height="0dp" android:layout_weight="1" > diff --git a/OsmAnd/res/layout/search_address_online.xml b/OsmAnd/res/layout/search_address_online.xml index 0354b4230c..e267e580fc 100644 --- a/OsmAnd/res/layout/search_address_online.xml +++ b/OsmAnd/res/layout/search_address_online.xml @@ -20,7 +20,7 @@ diff --git a/OsmAnd/res/layout/search_history_list_item.xml b/OsmAnd/res/layout/search_history_list_item.xml index 8f967ea812..2c22789476 100644 --- a/OsmAnd/res/layout/search_history_list_item.xml +++ b/OsmAnd/res/layout/search_history_list_item.xml @@ -7,7 +7,7 @@ diff --git a/OsmAnd/res/layout/search_transport_route_item.xml b/OsmAnd/res/layout/search_transport_route_item.xml index 48a8b9e4f9..fee1c31308 100644 --- a/OsmAnd/res/layout/search_transport_route_item.xml +++ b/OsmAnd/res/layout/search_transport_route_item.xml @@ -6,7 +6,7 @@ - - diff --git a/SherlockBar/res/layout/abs__search_view.xml b/SherlockBar/res/layout/abs__search_view.xml index 6ba319121c..8e5f8dd394 100644 --- a/SherlockBar/res/layout/abs__search_view.xml +++ b/SherlockBar/res/layout/abs__search_view.xml @@ -50,7 +50,7 @@ Date: Fri, 2 Aug 2013 22:43:13 -0300 Subject: [PATCH 008/145] Use wrap_content in ScrollView ScrollView children must set their layout_width or layout_height attributes to wrap_content rather than fill_parent or match_parent in the scrolling dimension. This LinearLayout should use android:layout_height="wrap_content" --- OsmAnd/res/layout/navigate_point.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/layout/navigate_point.xml b/OsmAnd/res/layout/navigate_point.xml index 82ce72aa7b..1374e002bc 100644 --- a/OsmAnd/res/layout/navigate_point.xml +++ b/OsmAnd/res/layout/navigate_point.xml @@ -4,7 +4,7 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" > + android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal"> From 650b6b23624c92013b0238cbaa22e1dc9e113535 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Fri, 2 Aug 2013 23:55:38 -0300 Subject: [PATCH 009/145] Replace concat() call with + Such calls can be replaced with the '+' operator for increased code clarity and possible increased performance if the method was invoked on a constant with a constant argument. --- OsmAnd/src/net/osmand/plus/views/SeekBarPreference.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/SeekBarPreference.java b/OsmAnd/src/net/osmand/plus/views/SeekBarPreference.java index 9ee016c98d..8300fffe06 100644 --- a/OsmAnd/src/net/osmand/plus/views/SeekBarPreference.java +++ b/OsmAnd/src/net/osmand/plus/views/SeekBarPreference.java @@ -149,7 +149,7 @@ public class SeekBarPreference extends DialogPreference implements public void onProgressChanged(final SeekBar seek, final int value, final boolean fromTouch) { final String t = String.valueOf(value); - valueTextView.setText(valueText == null ? t : t.concat(valueText)); + valueTextView.setText(valueText == null ? t : t + valueText); valueToSave = value; } From 0fe03b0f2108c47fc5d8527737819128c7f7f4fe Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 00:02:02 -0300 Subject: [PATCH 010/145] Remove unnecessary calls to String.valueOf() --- OsmAnd/src/net/osmand/access/NavigationInfo.java | 2 +- OsmAnd/src/net/osmand/plus/activities/MapActivity.java | 2 +- OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/src/net/osmand/access/NavigationInfo.java b/OsmAnd/src/net/osmand/access/NavigationInfo.java index 2e4f3ccec5..5aedefd122 100644 --- a/OsmAnd/src/net/osmand/access/NavigationInfo.java +++ b/OsmAnd/src/net/osmand/access/NavigationInfo.java @@ -87,7 +87,7 @@ public class NavigationInfo { return null; if (style == RelativeDirectionStyle.CLOCKWISE) { String result = NavigationInfo.this.getString(R.string.towards); - result += " " + String.valueOf((value != 0) ? value : 12); //$NON-NLS-1$ + result += " " + ((value != 0) ? value : 12); //$NON-NLS-1$ result += " " + NavigationInfo.this.getString(R.string.oclock); //$NON-NLS-1$ return result; } else { diff --git a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java index 18e0c7060d..3bcfc22689 100644 --- a/OsmAnd/src/net/osmand/plus/activities/MapActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/MapActivity.java @@ -365,7 +365,7 @@ public class MapActivity extends AccessibleActivity { boolean changeLocation = settings.AUTO_ZOOM_MAP.get(); mapView.getAnimatedDraggingThread().startZooming(newZoom, changeLocation); if (app.getInternalAPI().accessibilityEnabled()) - AccessibleToast.makeText(this, getString(R.string.zoomIs) + " " + String.valueOf(newZoom), Toast.LENGTH_SHORT).show(); //$NON-NLS-1$ + AccessibleToast.makeText(this, getString(R.string.zoomIs) + " " + newZoom, Toast.LENGTH_SHORT).show(); //$NON-NLS-1$ showAndHideMapPosition(); } diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java index 0389e3e46f..b6fefa8f0b 100644 --- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java +++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java @@ -808,7 +808,7 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall zoomPositionChanged(newZoom); if (application.getInternalAPI().accessibilityEnabled()) { if (newZoom != initialMultiTouchZoom) { - showMessage(getContext().getString(R.string.zoomIs) + " " + String.valueOf(newZoom)); //$NON-NLS-1$ + showMessage(getContext().getString(R.string.zoomIs) + " " + newZoom); //$NON-NLS-1$ } else { final LatLon p1 = getLatLonFromScreenPoint(x1, y1); final LatLon p2 = getLatLonFromScreenPoint(x2, y2); From eb1a8d2f46f7332c8709d029934329eaa4d5bc12 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 00:07:44 -0300 Subject: [PATCH 011/145] Fix duplicated branch --- OsmAnd/src/net/londatiga/android/QuickAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/londatiga/android/QuickAction.java b/OsmAnd/src/net/londatiga/android/QuickAction.java index 80a9ed1a48..3f4f505f3c 100644 --- a/OsmAnd/src/net/londatiga/android/QuickAction.java +++ b/OsmAnd/src/net/londatiga/android/QuickAction.java @@ -195,7 +195,7 @@ public class QuickAction extends CustomPopupWindow { } else if (arrowPos > screenWidth/4 && arrowPos < 3 * (screenWidth/4)) { window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Center : R.style.Animations_PopDownMenu_Center); } else { - window.setAnimationStyle((onTop) ? R.style.Animations_PopDownMenu_Right : R.style.Animations_PopDownMenu_Right); + window.setAnimationStyle((onTop) ? R.style.Animations_PopUpMenu_Right : R.style.Animations_PopDownMenu_Right); } break; From f5be65b96e7e97392df9cbc408c4d77e655c0b90 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 00:25:14 -0300 Subject: [PATCH 012/145] Simplify boolean expressions --- OsmAnd/src/net/osmand/plus/PoiFilter.java | 2 +- .../net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/PoiFilter.java b/OsmAnd/src/net/osmand/plus/PoiFilter.java index 90b2dd490d..e6bb8894bb 100644 --- a/OsmAnd/src/net/osmand/plus/PoiFilter.java +++ b/OsmAnd/src/net/osmand/plus/PoiFilter.java @@ -160,7 +160,7 @@ public class PoiFilter { @Override public boolean isCancelled() { - return false || (matcher != null && matcher.isCancelled()); + return (matcher != null && matcher.isCancelled()); } }; } diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java index c75ea3b57a..67b7a2b5ea 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/NextTurnInfoWidget.java @@ -112,7 +112,7 @@ public class NextTurnInfoWidget extends BaseMapWidget { String text = OsmAndFormatter.getFormattedDistance(nextTurnDirection, getClientContext()); String subtext = null; - if (makeUturnWhenPossible == true) { + if (makeUturnWhenPossible) { text = getResources().getString(R.string.asap); } From 45b43e431121346b2e6b64586b16dc8f9f092cc1 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 00:30:19 -0300 Subject: [PATCH 013/145] Remove unnecessary returns return is unnecessary as the last statement in a 'void' method --- .../net/osmand/plus/audionotes/AudioVideoNotesPlugin.java | 6 ++---- .../com/actionbarsherlock/widget/SuggestionsAdapter.java | 1 - 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index 002f685798..e84396b9a6 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -621,8 +621,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { runMediaRecorder(mapActivity, mr, f); } catch (Exception e) { logErr(e); - return; - } + } } @Override @@ -654,8 +653,7 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { private void logErr(Exception e) { log.error("Error starting recorder ", e); AccessibleToast.makeText(app, app.getString(R.string.recording_error) + " : " + e.getMessage(), Toast.LENGTH_LONG).show(); - return; - } + } protected Camera openCamera() { try { diff --git a/SherlockBar/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/SherlockBar/src/com/actionbarsherlock/widget/SuggestionsAdapter.java index 82d4f0c425..77cd1ca12d 100644 --- a/SherlockBar/src/com/actionbarsherlock/widget/SuggestionsAdapter.java +++ b/SherlockBar/src/com/actionbarsherlock/widget/SuggestionsAdapter.java @@ -281,7 +281,6 @@ class SuggestionsAdapter extends ResourceCursorAdapter implements OnClickListene if (extras != null && extras.getBoolean(SearchManager.CURSOR_EXTRA_KEY_IN_PROGRESS)) { // mSearchView.getWindow().getDecorView().post(mStartSpinnerRunnable); // TODO: - return; } // If cursor is null or is done, stop the spinner // mSearchView.getWindow().getDecorView().post(mStopSpinnerRunnable); // TODO: From dad7d53f435f51a3df0ef4c38a926739959683fc Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 00:52:24 -0300 Subject: [PATCH 014/145] Remove unnecessary boxing/unboxing --- OsmAnd-java/src/net/osmand/binary/BinaryInspector.java | 4 ++-- OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java | 2 +- .../src/net/osmand/plus/activities/LocalIndexesActivity.java | 2 +- .../net/osmand/plus/activities/SettingsGeneralActivity.java | 2 +- .../src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java | 4 ++-- .../net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java | 4 ++-- OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java | 2 +- .../net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java index d73b4a44e7..b5c0749f06 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspector.java @@ -465,7 +465,7 @@ public class BinaryInspector { int size = index.preloadStreets(c, null); List streets = new ArrayList(c.getStreets()); print(MessageFormat.format("\t\t''{0}'' [{1,number,#}], {2,number,#} street(s) size {3,number,#} bytes", - new Object[]{c.getEnName(), c.getId(), Integer.valueOf(streets.size()), Integer.valueOf(size)})); + new Object[]{c.getEnName(), c.getId(), streets.size(), size})); if(!verbose.vstreets) { println(""); @@ -483,7 +483,7 @@ public class BinaryInspector { final List intersections = t.getIntersectedStreets(); println(MessageFormat.format("\t\t\t''{0}'' [{1,number,#}], {2,number,#} building(s), {3,number,#} intersections(s)", - new Object[]{t.getEnName(), t.getId(), Integer.valueOf(buildings.size()), Integer.valueOf(intersections.size())})); + new Object[]{t.getEnName(), t.getId(), buildings.size(), intersections.size()})); if (buildings != null && !buildings.isEmpty() && verbose.vbuildings) { println("\t\t\t\tBuildings:"); diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java index 96cd134cdc..e500a6f09f 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java @@ -374,7 +374,7 @@ public class OsmAndLocationProvider implements SensorEventListener { private void updateCompassVal() { heading = (float) getAngle(avgValSin, avgValCos); for(OsmAndCompassListener c : compassListeners){ - c.updateCompassValue(heading.floatValue()); + c.updateCompassValue(heading); } } diff --git a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java index 328b6a58e8..ba7b835fc0 100644 --- a/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/LocalIndexesActivity.java @@ -741,7 +741,7 @@ public class LocalIndexesActivity extends OsmandExpandableListActivity { public void openSelectionMode(int stringRes, int darkIcon, int lightIcon, DialogInterface.OnClickListener listener, Boolean backup, LocalIndexType filter) { if (backup != null) { - listAdapter.filterCategories(backup.booleanValue()); + listAdapter.filterCategories(backup); } if (filter != null) { listAdapter.filterCategories(filter); diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 3a3f339067..5a3793cb63 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -226,7 +226,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { String id = preference.getKey(); super.onPreferenceChange(preference, newValue); if (id.equals(settings.SAFE_MODE.getId())) { - if (((Boolean) newValue).booleanValue()) { + if ((Boolean) newValue) { loadNativeLibrary(); } } else if (preference == applicationDir) { diff --git a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java index 002f685798..89fb822111 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/AudioVideoNotesPlugin.java @@ -247,8 +247,8 @@ public class AudioVideoNotesPlugin extends OsmandPlugin { Constructor c = exClass.getConstructor(new Class[] { String.class }); Object exInstance = c.newInstance(file.getAbsolutePath()); Method getAttributeInt = exClass.getMethod("getAttributeInt", new Class[] { String.class, Integer.TYPE }); - Integer it = (Integer) getAttributeInt.invoke(exInstance, "Orientation", new Integer(1)); - orientation = it.intValue(); + Integer it = (Integer) getAttributeInt.invoke(exInstance, "Orientation", 1); + orientation = it; } catch (Exception e) { e.printStackTrace(); log.error(e); diff --git a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java index 78711a28c5..43ee62ebf7 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/LocalOpenstreetmapActivity.java @@ -347,7 +347,7 @@ public class LocalOpenstreetmapActivity extends OsmandListActivity { } } - return Integer.valueOf(uploaded); + return uploaded; } @Override @@ -370,7 +370,7 @@ public class LocalOpenstreetmapActivity extends OsmandListActivity { listAdapter.notifyDataSetChanged(); if (result != null) { AccessibleToast.makeText(LocalOpenstreetmapActivity.this, - MessageFormat.format(getString(R.string.local_openstreetmap_were_uploaded), result.intValue()), Toast.LENGTH_LONG) + MessageFormat.format(getString(R.string.local_openstreetmap_were_uploaded), result), Toast.LENGTH_LONG) .show(); } removeDialog(DIALOG_PROGRESS_UPLOAD); diff --git a/OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java b/OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java index 74cb7c0cf7..d99e3d46d8 100644 --- a/OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java +++ b/OsmAnd/src/net/osmand/plus/srtmplugin/HillshadeLayer.java @@ -95,7 +95,7 @@ public class HillshadeLayer extends MapTileLayer { String filename = cursor.getString(0); long lastModified = cursor.getLong(1); Long read = fileModified.get(filename); - if(rs.containsKey(filename) && read != null && lastModified == read.longValue()) { + if(rs.containsKey(filename) && read != null && lastModified == read) { int left = cursor.getInt(2); int right = cursor.getInt(3); int top = cursor.getInt(4); diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java index 6af60622d5..fe946c99b2 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MapWidgetRegistry.java @@ -363,7 +363,7 @@ public class MapWidgetRegistry { if(preference != null) { Object value = preference.getModeValue(mode); if(value instanceof Boolean) { - return ((Boolean) value).booleanValue(); + return (Boolean) value; } return true; } From 8d3c8b6e9ea1da857035df4569e44343e5c0acac Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 09:59:26 -0300 Subject: [PATCH 015/145] Fix long literals ending with l These literals may be confusing, as lowercase 'l' looks very similar to '1' --- OsmAnd-java/src/net/osmand/util/MapAlgorithms.java | 4 ++-- OsmAnd-java/src/net/osmand/util/MapUtils.java | 12 ++++++------ .../plus/parkingpoint/ParkingPositionPlugin.java | 2 +- .../osmand/plus/render/MapRenderRepositories.java | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/util/MapAlgorithms.java b/OsmAnd-java/src/net/osmand/util/MapAlgorithms.java index 802c0ee19a..5858c5d6f9 100644 --- a/OsmAnd-java/src/net/osmand/util/MapAlgorithms.java +++ b/OsmAnd-java/src/net/osmand/util/MapAlgorithms.java @@ -16,7 +16,7 @@ public class MapAlgorithms { } // calculate middle Y - long mask = 0xffffffffl; + long mask = 0xffffffffL; long middleY = 0; for (int i = 0; i < c.size(); i++) { middleY = middleY + (long)(c.get(i) & mask); @@ -188,7 +188,7 @@ public class MapAlgorithms { by = outy; //return (((long) bx) << 32) | ((long) by); } - return -1l; + return -1L; } /** diff --git a/OsmAnd-java/src/net/osmand/util/MapUtils.java b/OsmAnd-java/src/net/osmand/util/MapUtils.java index 554fd020da..254d4ac224 100644 --- a/OsmAnd-java/src/net/osmand/util/MapUtils.java +++ b/OsmAnd-java/src/net/osmand/util/MapUtils.java @@ -124,13 +124,13 @@ public class MapUtils { public static int get31TileNumberX(double longitude){ longitude = checkLongitude(longitude); - long l = 1l << 31; + long l = 1L << 31; return (int)((longitude + 180d)/360d * l); } public static int get31TileNumberY( double latitude){ latitude = checkLatitude(latitude); double eval = Math.log( Math.tan(toRadians(latitude)) + 1/Math.cos(toRadians(latitude)) ); - long l = 1l << 31; + long l = 1L << 31; if(eval > Math.PI){ eval = Math.PI; } @@ -270,8 +270,8 @@ public class MapUtils { } public static String createShortLocString(double latitude, double longitude, int zoom) { - long lat = (long) (((latitude + 90d)/180d)*(1l << 32)); - long lon = (long) (((longitude + 180d)/360d)*(1l << 32)); + long lat = (long) (((latitude + 90d)/180d)*(1L << 32)); + long lon = (long) (((longitude + 180d)/360d)*(1L << 32)); long code = interleaveBits(lon, lat); String str = ""; // add eight to the zoom level, which approximates an accuracy of one pixel in a tile. @@ -321,8 +321,8 @@ public class MapUtils { x <<= (32 - z); y <<= (32 - z); // int zoom = z - 8 - ((3 + z_offset) % 3); - double dlat = (180d * (y) / ((double)(1l << 32))) - 90d; - double dlon = (360d * (x)/ ((double)(1l << 32))) - 180d; + double dlat = (180d * (y) / ((double)(1L << 32))) - 90d; + double dlon = (360d * (x)/ ((double)(1L << 32))) - 180d; return new LatLon(dlat, dlon); } diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java index 03238f3c16..f8d8401fd3 100644 --- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java +++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionPlugin.java @@ -121,7 +121,7 @@ public class ParkingPositionPlugin extends OsmandPlugin { public boolean setParkingType(boolean limited) { if (!limited) - parkingTime.set(-1l); + parkingTime.set(-1L); parkingType.set(limited); return true; } diff --git a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java index adf6835ff6..ffef43d5c4 100644 --- a/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java +++ b/OsmAnd/src/net/osmand/plus/render/MapRenderRepositories.java @@ -716,7 +716,7 @@ public class MapRenderRepositories { if (uncompletedRings.size() > 0) { unifyIncompletedRings(uncompletedRings, completedRings, leftX, rightX, bottomY, topY, dbId, zoom); } - long mask = 0xffffffffl; + long mask = 0xffffffffL; // draw uncompleted for debug purpose for (int i = 0; i < uncompletedRings.size(); i++) { TLongList ring = uncompletedRings.get(i); From c9dd6c069785d180bb07b4b1063dc40cff6b0a8e Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 10:09:27 -0300 Subject: [PATCH 016/145] Make some fields static A field may be static if it is declared final, and is initialized with a constant --- .../src/net/osmand/router/BinaryRoutePlanner.java | 6 +++--- .../net/osmand/router/BinaryRoutePlannerOld.java | 4 ++-- .../net/osmand/plus/OsmAndLocationProvider.java | 4 ++-- OsmAnd/src/net/osmand/plus/SQLiteTileSource.java | 8 ++++---- .../osmand/plus/download/DownloadFileHelper.java | 4 ++-- .../net/osmand/plus/download/DownloadTracker.java | 4 ++-- .../src/net/osmand/plus/osmedit/OsmBugsLayer.java | 2 +- .../src/net/osmand/plus/routing/RoutingHelper.java | 2 +- .../src/net/osmand/plus/routing/VoiceRouter.java | 14 +++++++------- .../net/osmand/plus/views/ContextMenuLayer.java | 6 +++--- OsmAnd/src/net/osmand/plus/views/MapTileLayer.java | 2 +- .../net/osmand/plus/views/OsmandMapTileView.java | 2 +- .../plus/views/mapwidgets/MiniMapWidget.java | 2 +- 13 files changed, 30 insertions(+), 30 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java index d031d63a8b..08ae25e093 100644 --- a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java +++ b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlanner.java @@ -20,9 +20,9 @@ import org.apache.commons.logging.Log; public class BinaryRoutePlanner { - private final int REVERSE_WAY_RESTRICTION_ONLY = 1024; - /*private*/ final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 220; - /*private */final int STANDARD_ROAD_VISITED_OVERHEAD = 150; + private static final int REVERSE_WAY_RESTRICTION_ONLY = 1024; + /*private*/ static final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 220; + /*private*/ static final int STANDARD_ROAD_VISITED_OVERHEAD = 150; protected static final Log log = PlatformUtil.getLog(BinaryRoutePlanner.class); diff --git a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlannerOld.java b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlannerOld.java index 01b1b2e911..d79653fc2d 100644 --- a/OsmAnd-java/src/net/osmand/router/BinaryRoutePlannerOld.java +++ b/OsmAnd-java/src/net/osmand/router/BinaryRoutePlannerOld.java @@ -21,8 +21,8 @@ import org.apache.commons.logging.Log; public class BinaryRoutePlannerOld { public static boolean PRINT_TO_CONSOLE_ROUTE_INFORMATION_TO_TEST = true; - private final int REVERSE_WAY_RESTRICTION_ONLY = 1024; - private final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 900; + private static final int REVERSE_WAY_RESTRICTION_ONLY = 1024; + private static final int STANDARD_ROAD_IN_QUEUE_OVERHEAD = 900; protected static final Log log = PlatformUtil.getLog(BinaryRoutePlannerOld.class); diff --git a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java index 96cd134cdc..9ca2a9dbaa 100644 --- a/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java +++ b/OsmAnd/src/net/osmand/plus/OsmAndLocationProvider.java @@ -58,8 +58,8 @@ public class OsmAndLocationProvider implements SensorEventListener { - private final boolean USE_KALMAN_FILTER = true; - private final float KALMAN_COEFFICIENT = 0.04f; + private static final boolean USE_KALMAN_FILTER = true; + private static final float KALMAN_COEFFICIENT = 0.04f; float avgValSin = 0; float avgValCos = 0; diff --git a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java index da1e654682..caeca76dad 100644 --- a/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java +++ b/OsmAnd/src/net/osmand/plus/SQLiteTileSource.java @@ -43,9 +43,9 @@ public class SQLiteTileSource implements ITileSource { private int maxZoom = 17; private int baseZoom = 17; //Default base zoom - final int margin = 1; - final int tileSize = 256; - final int minScaledSize = 8; + static final int margin = 1; + static final int tileSize = 256; + static final int minScaledSize = 8; private ClientContext ctx; public SQLiteTileSource(ClientContext ctx, File f, List toFindUrl){ @@ -355,7 +355,7 @@ public class SQLiteTileSource implements ITileSource { db.execSQL("DELETE FROM tiles WHERE x = ? AND y = ? AND z = ?", new String[] {x+"", y+"",(17 - zoom)+""}); //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$//$NON-NLS-4$ } - private final int BUF_SIZE = 1024; + private static final int BUF_SIZE = 1024; /** * Makes method synchronized to give a little more time for get methods and diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java b/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java index 7537be83ef..862e47c97e 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadFileHelper.java @@ -25,8 +25,8 @@ public class DownloadFileHelper { private final static Log log = PlatformUtil.getLog(DownloadFileHelper.class); private static final int BUFFER_SIZE = 32256; - protected final int TRIES_TO_DOWNLOAD = 15; - protected final long TIMEOUT_BETWEEN_DOWNLOADS = 8000; + protected static final int TRIES_TO_DOWNLOAD = 15; + protected static final long TIMEOUT_BETWEEN_DOWNLOADS = 8000; private final ClientContext ctx; private boolean interruptDownloading = false; diff --git a/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java b/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java index e21529c5e5..843f865791 100644 --- a/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java +++ b/OsmAnd/src/net/osmand/plus/download/DownloadTracker.java @@ -38,8 +38,8 @@ public class DownloadTracker { return (new Random(System.currentTimeMillis()).nextInt(100000000) + 100000000) + ""; } - final String beaconUrl = "http://www.google-analytics.com/__utm.gif"; - final String analyticsVersion = "4.3"; // Analytics version - AnalyticsVersion + static final String beaconUrl = "http://www.google-analytics.com/__utm.gif"; + static final String analyticsVersion = "4.3"; // Analytics version - AnalyticsVersion public void trackEvent(ClientContext a, String category, String action, String label, int value, String trackingAcount) { diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java index b7a607847b..cde8c10b1d 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java @@ -54,7 +54,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider private static final Log log = PlatformUtil.getLog(OsmBugsLayer.class); private final static int startZoom = 8; - private final int SEARCH_LIMIT = 100; + private static final int SEARCH_LIMIT = 100; private OsmandMapTileView view; private Handler handlerToLoop; diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 8e7c27ee87..53ef45f7d0 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -40,7 +40,7 @@ public class RoutingHelper { public void routeWasCancelled(); } - private final float POSITION_TOLERANCE = 60; + private static final float POSITION_TOLERANCE = 60; private List listeners = new ArrayList(); diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 977aceedff..fe0527237a 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -14,13 +14,13 @@ import net.osmand.util.Algorithms; public class VoiceRouter { - private final int STATUS_UTWP_TOLD = -1; - private final int STATUS_UNKNOWN = 0; - private final int STATUS_LONG_PREPARE = 1; - private final int STATUS_PREPARE = 2; - private final int STATUS_TURN_IN = 3; - private final int STATUS_TURN = 4; - private final int STATUS_TOLD = 5; + private static final int STATUS_UTWP_TOLD = -1; + private static final int STATUS_UNKNOWN = 0; + private static final int STATUS_LONG_PREPARE = 1; + private static final int STATUS_PREPARE = 2; + private static final int STATUS_TURN_IN = 3; + private static final int STATUS_TURN = 4; + private static final int STATUS_TOLD = 5; private final RoutingHelper router; private boolean mute = false; diff --git a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java index 18ffeddc84..0aa9ab0a47 100644 --- a/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/ContextMenuLayer.java @@ -44,9 +44,9 @@ public class ContextMenuLayer extends OsmandMapLayer { public String getObjectName(Object o); } - private final String KEY_LAT_LAN = "context_menu_lat_lon"; - private final String KEY_DESCRIPTION = "context_menu_description"; - private final String KEY_SELECTED_OBJECTS = "context_menu_selected_objects"; + private static final String KEY_LAT_LAN = "context_menu_lat_lon"; + private static final String KEY_DESCRIPTION = "context_menu_description"; + private static final String KEY_SELECTED_OBJECTS = "context_menu_selected_objects"; private LatLon latLon; private String description; private Map selectedObjects = new LinkedHashMap(); diff --git a/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java b/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java index 5c323e76a3..4964fa85a6 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapTileLayer.java @@ -18,7 +18,7 @@ import android.widget.Toast; public class MapTileLayer extends BaseMapLayer { - protected final int emptyTileDivisor = 16; + protected static final int emptyTileDivisor = 16; public static final int OVERZOOM_IN = 2; private final boolean mainMap; diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java index 0389e3e46f..1f084ad31f 100644 --- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java +++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java @@ -52,7 +52,7 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall protected final static int LOWEST_ZOOM_TO_ROTATE = 10; - protected final int emptyTileDivisor = 16; + protected static final int emptyTileDivisor = 16; public static final float ZOOM_DELTA = 3; public static final float ZOOM_DELTA_1 = 1/3f; diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MiniMapWidget.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MiniMapWidget.java index be077b5fea..66a8c15087 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/MiniMapWidget.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/MiniMapWidget.java @@ -17,7 +17,7 @@ import android.view.View; public class MiniMapWidget extends BaseMapWidget { private float scaleCoefficient = MapInfoLayer.scaleCoefficient; - private final float scaleMiniRoute = 0.15f; + private static final float scaleMiniRoute = 0.15f; private final float width = 96 * scaleCoefficient; private final float height = 96 * scaleCoefficient; private final float centerMiniRouteY = 3 * height / 4; From 17dce1efd83f0d3c8009b65820c460289df2f41c Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 10:11:16 -0300 Subject: [PATCH 017/145] Make some inner classes static An inner class may be static if it doesn't reference its enclosing class instance. A static inner class uses slightly less memory. --- .../net/osmand/plus/activities/search/GeoIntentActivity.java | 4 ++-- OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java | 2 +- OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java index 7864964e1e..e883fcfcb5 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java @@ -422,7 +422,7 @@ public class GeoIntentActivity extends OsmandListActivity { }); } - private class Empty implements MyService { + private static class Empty implements MyService { @Override public Collection execute() { @@ -431,7 +431,7 @@ public class GeoIntentActivity extends OsmandListActivity { } - private class GeoPointSearch implements MyService { + private static class GeoPointSearch implements MyService { private MapObject point; /** * geo:latitude,longitude geo:latitude,longitude?z=zoom diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index e0c0fb1197..a382b5bd42 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -745,7 +745,7 @@ public class MapInfoLayer extends OsmandMapLayer { return progressBar; } - private class ConfigLayout extends FrameLayout implements UpdateableWidget { + private static class ConfigLayout extends FrameLayout implements UpdateableWidget { private ImageViewWidget config; private ConfigLayout(Context c, ImageViewWidget config) { diff --git a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java index e943444e27..0a160c1481 100644 --- a/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java +++ b/OsmAnd/src/net/osmand/plus/voice/TTSCommandPlayerImpl.java @@ -31,7 +31,7 @@ import android.speech.tts.TextToSpeech.OnUtteranceCompletedListener; public class TTSCommandPlayerImpl extends AbstractPrologCommandPlayer { public final static String PEBBLE_ALERT = "PEBBLE_ALERT"; - private final class IntentStarter implements + private static final class IntentStarter implements DialogInterface.OnClickListener { private final Context ctx; private final String intentAction; From c479a91a074ed2cd39cd4b27cc5b7b9dd34d5c1d Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Sat, 3 Aug 2013 10:23:14 -0300 Subject: [PATCH 018/145] Fix possible wrong AND in comparison --- .../osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index a9690c8575..fae677a073 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -569,7 +569,7 @@ public class RouteInfoWidgetsFactory { RouteInfoLayer ls = view.getLayerByClass(RouteInfoLayer.class); if (ls != null) { int di = ls.getDirectionInfo(); - if (di >= 0 && ls.isVisible() & di < routingHelper.getRouteDirections().size()) { + if (di >= 0 && ls.isVisible() && di < routingHelper.getRouteDirections().size()) { RouteDirectionInfo next = routingHelper.getRouteDirections().get(di); if (next != null) { loclanes = next.getTurnType().getLanes(); From 8f5a30dbc7b9020a26c4aadda05a47d5e3c7c35d Mon Sep 17 00:00:00 2001 From: vshcherb Date: Sun, 4 Aug 2013 12:06:36 +0200 Subject: [PATCH 019/145] Create old-ndk-build.sh --- old-ndk-build.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 old-ndk-build.sh diff --git a/old-ndk-build.sh b/old-ndk-build.sh new file mode 100644 index 0000000000..d3b2e73510 --- /dev/null +++ b/old-ndk-build.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +NAME=$(basename $(dirname "${BASH_SOURCE[0]}") ) + + +if [ ! -d "$ANDROID_SDK" ]; then + echo "ANDROID_SDK is not set" + exit +fi +if [ ! -d "$ANDROID_NDK" ]; then + echo "ANDROID_NDK is not set" + exit +fi +export ANDROID_SDK_ROOT=$ANDROID_SDK +export ANDROID_NDK_ROOT=$ANDROID_NDK +export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 + +if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then + BUILD_ALL=1 + echo "BUILD_ALL set to true" +fi +export BUILD_ONLY_OLD_LIB=1 +"$SCRIPT_LOC/../../core/externals/configure.sh" +(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) From 5546e87b1fca1dda593522d1905dcc8e9e77deba Mon Sep 17 00:00:00 2001 From: vshcherb Date: Sun, 4 Aug 2013 12:09:13 +0200 Subject: [PATCH 020/145] Delete old-ndk-build.sh --- old-ndk-build.sh | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 old-ndk-build.sh diff --git a/old-ndk-build.sh b/old-ndk-build.sh deleted file mode 100644 index d3b2e73510..0000000000 --- a/old-ndk-build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -NAME=$(basename $(dirname "${BASH_SOURCE[0]}") ) - - -if [ ! -d "$ANDROID_SDK" ]; then - echo "ANDROID_SDK is not set" - exit -fi -if [ ! -d "$ANDROID_NDK" ]; then - echo "ANDROID_NDK is not set" - exit -fi -export ANDROID_SDK_ROOT=$ANDROID_SDK -export ANDROID_NDK_ROOT=$ANDROID_NDK -export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 - -if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - BUILD_ALL=1 - echo "BUILD_ALL set to true" -fi -export BUILD_ONLY_OLD_LIB=1 -"$SCRIPT_LOC/../../core/externals/configure.sh" -(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) From 88665c46136f03114780fe589faa2bfdbb8b52e0 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 12:11:34 +0200 Subject: [PATCH 021/145] Remains --- OsmAnd/{ndk-build.sh => full-ndk-build.sh} | 0 OsmAnd/jni/Application.mk | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename OsmAnd/{ndk-build.sh => full-ndk-build.sh} (100%) diff --git a/OsmAnd/ndk-build.sh b/OsmAnd/full-ndk-build.sh similarity index 100% rename from OsmAnd/ndk-build.sh rename to OsmAnd/full-ndk-build.sh diff --git a/OsmAnd/jni/Application.mk b/OsmAnd/jni/Application.mk index 0c575ab5ec..89cae01d03 100755 --- a/OsmAnd/jni/Application.mk +++ b/OsmAnd/jni/Application.mk @@ -1,7 +1,7 @@ APP_STL := gnustl_shared APP_CPPFLAGS := -std=c++11 -fexceptions -frtti -ifeq ($(wildcard $(ANDROID_NDK/toolchains/*-4.8)),) +ifeq ($(wildcard $(ANDROID_NDK)/toolchains/*-4.8),) NDK_TOOLCHAIN_VERSION := 4.7 else NDK_TOOLCHAIN_VERSION := 4.8 @@ -38,4 +38,4 @@ endif ifndef OSMAND_DEBUG_NATIVE # Force release compilation in release optimizations, even if application is debuggable by manifest APP_OPTIM := release -endif \ No newline at end of file +endif From f89cd246f062d2e2f3f83cdd2ee80c586365459e Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 13:24:00 +0200 Subject: [PATCH 022/145] Fix exceptions --- .../src/net/osmand/data/AmenityType.java | 11 +-- .../src/net/osmand/osm/MapRenderingTypes.java | 4 +- .../activities/search/SearchPOIActivity.java | 2 +- .../SettingsAudioVideoActivity.java | 86 +++++++++---------- 4 files changed, 52 insertions(+), 51 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/data/AmenityType.java b/OsmAnd-java/src/net/osmand/data/AmenityType.java index b865c09358..ca33c78a73 100644 --- a/OsmAnd-java/src/net/osmand/data/AmenityType.java +++ b/OsmAnd-java/src/net/osmand/data/AmenityType.java @@ -43,12 +43,13 @@ public enum AmenityType { this.defaultTag = defaultTag; } - public static AmenityType fromString(String s){ - try { - return AmenityType.valueOf(s.toUpperCase()); - } catch (IllegalArgumentException e) { - return AmenityType.OTHER; + public static AmenityType fromString(String s) { + for (AmenityType t : values()) { + if (t.name().equalsIgnoreCase(s)) { + return t; + } } + return OTHER; } public String getDefaultTag() { diff --git a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java index 73ec2ac6be..655e7069b0 100644 --- a/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java +++ b/OsmAnd-java/src/net/osmand/osm/MapRenderingTypes.java @@ -248,7 +248,7 @@ public class MapRenderingTypes { rtype.value = null; } if (poiParentCategory != null) { - rtype.poiCategory = AmenityType.valueOf(poiParentCategory.toUpperCase()); + rtype.poiCategory = AmenityType.fromString(poiParentCategory); rtype.poiSpecified = true; } if (poiParentPrefix != null) { @@ -305,7 +305,7 @@ public class MapRenderingTypes { String tag = parser.getAttributeValue("","poi_tag"); if (tag != null) { AmenityRuleType rtype = new AmenityRuleType(); - rtype.poiCategory = AmenityType.valueOf(poiParentCategory.toUpperCase()); + rtype.poiCategory = AmenityType.fromString(poiParentCategory); rtype.poiSpecified = true; rtype.relation = Boolean.parseBoolean(parser.getAttributeValue("", "relation")); rtype.poiPrefix = poiParentPrefix; diff --git a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java index d927b1fe43..245bce36fd 100644 --- a/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/search/SearchPOIActivity.java @@ -425,7 +425,7 @@ public class SearchPOIActivity extends OsmandListActivity implements OsmAndCompa if (location == null) { title = R.string.search_poi_location; enabled = false; - } else if (!isNameFinderFilter() && !isSearchByNameFilter()) { + } else if (filter != null && !isNameFinderFilter() && !isSearchByNameFilter()) { title = R.string.search_POI_level_btn; enabled = (taskAlreadyFinished || currentSearchTask.getStatus() != Status.RUNNING) && filter.isSearchFurtherAvailable(); } else if (filter != null) { diff --git a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java index 2227b60a2a..931a38d2ad 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java @@ -47,52 +47,52 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity { ListPreference defAct = createListPreference(p.AV_DEFAULT_ACTION, entries, intValues, R.string.av_widget_action, R.string.av_widget_action_descr); grp.addPreference(defAct); - - // camera type settings: - grp.addPreference(createCheckBoxPreference(p.AV_EXTERNAL_PHOTO_CAM, R.string.av_use_external_camera, - R.string.av_use_external_camera_descr)); - // focus mode settings: - // show in menu only suppoted modes: final Camera cam = openCamera(); - Parameters parameters = cam.getParameters(); - List sfm = parameters.getSupportedFocusModes(); - List items = new ArrayList(); - List itemsValues = new ArrayList(); - // filtering known types for translate and set index: - for (int index = 0; index < sfm.size(); index++) { - if (sfm.get(index).equals("auto")) { - items.add(getString(R.string.av_camera_focus_auto)); - itemsValues.add(AV_CAMERA_FOCUS_AUTO); - } else if (sfm.get(index).equals("fixed")) { - items.add(getString(R.string.av_camera_focus_hiperfocal)); - itemsValues.add(AV_CAMERA_FOCUS_HIPERFOCAL); - } else if (sfm.get(index).equals("edof")) { - items.add(getString(R.string.av_camera_focus_edof)); - itemsValues.add(AV_CAMERA_FOCUS_EDOF); - } else if (sfm.get(index).equals("infinity")) { - items.add(getString(R.string.av_camera_focus_infinity)); - itemsValues.add(AV_CAMERA_FOCUS_INFINITY); - } else if (sfm.get(index).equals("macro")) { - items.add(getString(R.string.av_camera_focus_macro)); - itemsValues.add(AV_CAMERA_FOCUS_MACRO); - } else if (sfm.get(index).equals("continuous-picture")) { - items.add(getString(R.string.av_camera_focus_continuous)); - itemsValues.add(AV_CAMERA_FOCUS_CONTINUOUS); + if (cam != null) { + // camera type settings: + grp.addPreference(createCheckBoxPreference(p.AV_EXTERNAL_PHOTO_CAM, R.string.av_use_external_camera, + R.string.av_use_external_camera_descr)); + // focus mode settings: + // show in menu only suppoted modes: + + Parameters parameters = cam.getParameters(); + List sfm = parameters.getSupportedFocusModes(); + List items = new ArrayList(); + List itemsValues = new ArrayList(); + // filtering known types for translate and set index: + for (int index = 0; index < sfm.size(); index++) { + if (sfm.get(index).equals("auto")) { + items.add(getString(R.string.av_camera_focus_auto)); + itemsValues.add(AV_CAMERA_FOCUS_AUTO); + } else if (sfm.get(index).equals("fixed")) { + items.add(getString(R.string.av_camera_focus_hiperfocal)); + itemsValues.add(AV_CAMERA_FOCUS_HIPERFOCAL); + } else if (sfm.get(index).equals("edof")) { + items.add(getString(R.string.av_camera_focus_edof)); + itemsValues.add(AV_CAMERA_FOCUS_EDOF); + } else if (sfm.get(index).equals("infinity")) { + items.add(getString(R.string.av_camera_focus_infinity)); + itemsValues.add(AV_CAMERA_FOCUS_INFINITY); + } else if (sfm.get(index).equals("macro")) { + items.add(getString(R.string.av_camera_focus_macro)); + itemsValues.add(AV_CAMERA_FOCUS_MACRO); + } else if (sfm.get(index).equals("continuous-picture")) { + items.add(getString(R.string.av_camera_focus_continuous)); + itemsValues.add(AV_CAMERA_FOCUS_CONTINUOUS); + } } + entries = items.toArray(entries); + intValues = itemsValues.toArray(intValues); + if (entries.length > 0) { + ListPreference camFocus = createListPreference(p.AV_CAMERA_FOCUS_TYPE, entries, intValues, R.string.av_camera_focus, + R.string.av_camera_focus_descr); + grp.addPreference(camFocus); + } + // play sound on success photo: + grp.addPreference(createCheckBoxPreference(p.AV_PHOTO_PLAY_SOUND, R.string.av_photo_play_sound, + R.string.av_photo_play_sound_descr)); + cam.release(); } - entries = items.toArray(entries); - intValues = itemsValues.toArray(intValues); - if (entries.length > 0) { - ListPreference camFocus = createListPreference(p.AV_CAMERA_FOCUS_TYPE, entries, intValues, R.string.av_camera_focus, - R.string.av_camera_focus_descr); - grp.addPreference(camFocus); - } - // play sound on success photo: - grp.addPreference(createCheckBoxPreference(p.AV_PHOTO_PLAY_SOUND, R.string.av_photo_play_sound, - R.string.av_photo_play_sound_descr)); - cam.release(); - - // video settings: grp.addPreference(createCheckBoxPreference(p.AV_EXTERNAL_RECORDER, R.string.av_use_external_recorder, R.string.av_use_external_recorder_descr)); From c7f352da989e2214a961cdfb86eb005b0e14b6a4 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 13:50:18 +0200 Subject: [PATCH 023/145] Fix exceptions --- OsmAnd/res/values-fa/strings.xml | 2 +- .../activities/EditPOIFilterActivity.java | 19 +++++++++++++------ .../SettingsAudioVideoActivity.java | 4 ++-- .../plus/base/MapViewTrackingUtilities.java | 4 +++- .../plus/resources/ResourceManager.java | 2 ++ 5 files changed, 21 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 508987b29f..32cb75fa9b 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -611,7 +611,7 @@ صدا/تصویر در حال ضبط میباشد. برای متوقف کردن آن ویجت AV را بزنید. صدایی از ضبط مورد نظر درحال پخش میباشد.\n%1$s آیا میخواهید این مورد ضبط شده را پاک کنید؟ - ضبط %1$s%2$ s از %3$s + ضبط %1$s%2$s از %3$s افزونه OsmAnd برای منحنی های همتراز آفلاین استفاده از حسگر مغناطیسی به جای سنسور جهت یابی برای استفاده در قطب نما نشان دادن POI diff --git a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java index d5d45e970f..1b0ee81f91 100644 --- a/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/EditPOIFilterActivity.java @@ -63,17 +63,21 @@ public class EditPOIFilterActivity extends OsmandListActivity { public void onCreate(final Bundle icicle) { Bundle bundle = this.getIntent().getExtras(); String filterId = bundle.getString(AMENITY_FILTER); - helper = ((OsmandApplication)getApplication()).getPoiFilters(); + helper = ((OsmandApplication) getApplication()).getPoiFilters(); filter = helper.getFilterById(filterId); super.onCreate(icicle); - - + setContentView(R.layout.editing_poi_filter); getSupportActionBar().setTitle(R.string.filterpoi_activity); getSupportActionBar().setIcon(R.drawable.tab_search_poi_icon); - - getSupportActionBar().setSubtitle(filter.getName()); - setListAdapter(new AmenityAdapter(AmenityType.getCategories())); + + if (filter != null) { + getSupportActionBar().setSubtitle(filter.getName()); + setListAdapter(new AmenityAdapter(AmenityType.getCategories())); + } else { + setListAdapter(new AmenityAdapter(new AmenityType[0])); + } + } @@ -94,6 +98,9 @@ public class EditPOIFilterActivity extends OsmandListActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { + if(filter == null) { + return super.onCreateOptionsMenu(menu); + } createMenuItem(menu, SAVE_FILTER, R.string.edit_filter_save_as_menu_item, R.drawable.ic_action_gsave_light, R.drawable.ic_action_gsave_dark , MenuItem.SHOW_AS_ACTION_IF_ROOM); diff --git a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java index 931a38d2ad..2622fef45b 100644 --- a/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java +++ b/OsmAnd/src/net/osmand/plus/audionotes/SettingsAudioVideoActivity.java @@ -81,8 +81,8 @@ public class SettingsAudioVideoActivity extends SettingsBaseActivity { itemsValues.add(AV_CAMERA_FOCUS_CONTINUOUS); } } - entries = items.toArray(entries); - intValues = itemsValues.toArray(intValues); + entries = items.toArray(new String[items.size()]); + intValues = itemsValues.toArray(new Integer[itemsValues.size()]); if (entries.length > 0) { ListPreference camFocus = createListPreference(p.AV_CAMERA_FOCUS_TYPE, entries, intValues, R.string.av_camera_focus, R.string.av_camera_focus_descr); diff --git a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java index 676a4be767..a8b4eccaee 100644 --- a/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java +++ b/OsmAnd/src/net/osmand/plus/base/MapViewTrackingUtilities.java @@ -259,7 +259,9 @@ public class MapViewTrackingUtilities implements OsmAndLocationListener, IMapLoc } app.showShortToastMessage(resId); updateSettings(); - mapView.refreshMap(); + if(mapView != null) { + mapView.refreshMap(); + } } } diff --git a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java index f3a6c82d6f..60b726594e 100644 --- a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java +++ b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java @@ -443,6 +443,8 @@ public class ResourceManager { context.getSettings().PREVIOUS_INSTALLED_VERSION.set(Version.getFullVersion(context)); context.getPoiFilters().updateFilters(false); + } catch (SQLiteException e) { + log.error(e.getMessage(), e); } catch (IOException e) { log.error(e.getMessage(), e); } catch (XmlPullParserException e) { From 75cb395fbabbde2136c336358e3c02db07aecfa0 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 07:48:27 +0300 Subject: [PATCH 024/145] ndk-build --- OsmAnd/ndk-build.sh | 23 ++++++++--------------- OsmAnd/old-ndk-build.sh | 25 ------------------------- 2 files changed, 8 insertions(+), 40 deletions(-) delete mode 100755 OsmAnd/old-ndk-build.sh diff --git a/OsmAnd/ndk-build.sh b/OsmAnd/ndk-build.sh index f4caa39dd6..4778fadb0d 100755 --- a/OsmAnd/ndk-build.sh +++ b/OsmAnd/ndk-build.sh @@ -1,8 +1,5 @@ #!/bin/bash -SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -NAME=$(basename $(dirname "${BASH_SOURCE[0]}") ) - if [ ! -d "$ANDROID_SDK" ]; then echo "ANDROID_SDK is not set" exit @@ -11,19 +8,15 @@ if [ ! -d "$ANDROID_NDK" ]; then echo "ANDROID_NDK is not set" exit fi -export ANDROID_SDK_ROOT=$ANDROID_SDK -export ANDROID_NDK_ROOT=$ANDROID_NDK -export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 -if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - export BUILD_ALL=1 - echo "BUILD_ALL set to true" +SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +if [ -z "$OSMAND_ARCHITECTURES_SET" ]; then + OSMAND_ARCHITECTURES_SET=(x86 mips arm armv5 armv7 armv7-neon) + export OSMAND_ARCHITECTURES_SET fi -if [ -d "$SCRIPT_LOC/../../core/avian/" ]; then - export BUILD_ONLY_OLD_LIB=1 -fi - -"$SCRIPT_LOC/../../core/android-configure.sh" - +OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-android skia) +"$SCRIPT_LOC/../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} +"$SCRIPT_LOC/../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} (cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) diff --git a/OsmAnd/old-ndk-build.sh b/OsmAnd/old-ndk-build.sh deleted file mode 100755 index 715b49cfb0..0000000000 --- a/OsmAnd/old-ndk-build.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -NAME=$(basename $(dirname "${BASH_SOURCE[0]}") ) - - -if [ ! -d "$ANDROID_SDK" ]; then - echo "ANDROID_SDK is not set" - exit -fi -if [ ! -d "$ANDROID_NDK" ]; then - echo "ANDROID_NDK is not set" - exit -fi -export ANDROID_SDK_ROOT=$ANDROID_SDK -export ANDROID_NDK_ROOT=$ANDROID_NDK -export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 - -if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - BUILD_ALL=1 - echo "BUILD_ALL set to true" -fi -export BUILD_ONLY_OLD_LIB=1 -"$SCRIPT_LOC/../../core/externals/configure.sh" -(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) \ No newline at end of file From 430cb2938ef24078dabd6047ae23a281556224fd Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 07:50:12 +0300 Subject: [PATCH 025/145] ndk-build --- OsmAnd/ndk-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/ndk-build.sh b/OsmAnd/ndk-build.sh index 4778fadb0d..9689fa5198 100755 --- a/OsmAnd/ndk-build.sh +++ b/OsmAnd/ndk-build.sh @@ -17,6 +17,6 @@ if [ -z "$OSMAND_ARCHITECTURES_SET" ]; then fi OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-android skia) -"$SCRIPT_LOC/../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} -"$SCRIPT_LOC/../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} +"$SCRIPT_LOC/../../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} +"$SCRIPT_LOC/../../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} (cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) From a89c7bbb1e4a24761be2dc9683f5862c14df6924 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 07:57:38 +0300 Subject: [PATCH 026/145] Generate SWIG wrapper just before build --- OsmAnd/ndk-build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/ndk-build.sh b/OsmAnd/ndk-build.sh index 9689fa5198..9a91a5367b 100755 --- a/OsmAnd/ndk-build.sh +++ b/OsmAnd/ndk-build.sh @@ -19,4 +19,5 @@ fi OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-android skia) "$SCRIPT_LOC/../../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$SCRIPT_LOC/../../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} +"$SCRIPT_LOC/../../jni/generate.sh" (cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) From c69d37c7f0b37c2e557801a4f5ee62486c15efb6 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 09:42:34 +0300 Subject: [PATCH 027/145] Modify android makefiles --- OsmAnd/jni/Android.mk | 30 +++++++++++----------- OsmAnd/jni/Application.mk | 52 ++++++++++++++++++++++++--------------- 2 files changed, 47 insertions(+), 35 deletions(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index 69cad438fa..69122094f7 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -2,23 +2,23 @@ ifdef BUILD_ONLY_OLD_LIB OSMAND_MAKEFILES := $(all-subdir-makefiles) $(call all-makefiles-under,$(call my-dir)/../../../core/targets/android) else OSMAND_MAKEFILES := \ - $(all-subdir-makefiles) \ - $(call my-dir)/../../../jni/Android.mk \ - $(call my-dir)/../../../core/Android.mk \ - $(call all-makefiles-under,$(call my-dir)/../../../core/externals) \ - $(call my-dir)/../../../core/utils/Android.mk + $(all-subdir-makefiles) \ + $(call my-dir)/../../../jni/Android.mk \ + $(call my-dir)/../../../core/Android.mk \ + $(call all-makefiles-under,$(call my-dir)/../../../core/externals) \ + $(call my-dir)/../../../core/utils/Android.mk endif # Protect from previous builds ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) - OSMAND_BUILDING_NEON_LIBRARY := false + OSMAND_BUILDING_NEON_LIBRARY := false endif # OSMAND_FORCE_NEON_SUPPORT is used to force only NEON support on ARMv7a ifdef OSMAND_FORCE_NEON_SUPPORT - ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) - OSMAND_BUILDING_NEON_LIBRARY := true - endif + ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) + OSMAND_BUILDING_NEON_LIBRARY := true + endif endif # By default, include makefiles only once @@ -27,12 +27,12 @@ include $(OSMAND_MAKEFILES) # If we're not asked not to support NEON and not asked to support only NEON ARMv7a, then # make additional build ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) - ifndef OSMAND_SKIP_NEON_SUPPORT - ifndef OSMAND_FORCE_NEON_SUPPORT + ifndef OSMAND_SKIP_NEON_SUPPORT + ifndef OSMAND_FORCE_NEON_SUPPORT - OSMAND_BUILDING_NEON_LIBRARY := true - include $(OSMAND_MAKEFILES) + OSMAND_BUILDING_NEON_LIBRARY := true + include $(OSMAND_MAKEFILES) - endif - endif + endif + endif endif diff --git a/OsmAnd/jni/Application.mk b/OsmAnd/jni/Application.mk index f567806296..0c575ab5ec 100755 --- a/OsmAnd/jni/Application.mk +++ b/OsmAnd/jni/Application.mk @@ -1,29 +1,41 @@ APP_STL := gnustl_shared -APP_ABI := all APP_CPPFLAGS := -std=c++11 -fexceptions -frtti -NDK_TOOLCHAIN_VERSION := 4.7 -ifdef OSMAND_X86_ONLY - APP_ABI := x86 -endif -ifdef OSMAND_MIPS_ONLY - APP_ABI := mips +ifeq ($(wildcard $(ANDROID_NDK/toolchains/*-4.8)),) + NDK_TOOLCHAIN_VERSION := 4.7 +else + NDK_TOOLCHAIN_VERSION := 4.8 endif -ifdef OSMAND_ARM_ONLY - APP_ABI := armeabi armeabi-v7a +APP_ABI := +ifneq ($(filter x86,$(OSMAND_ARCHITECTURES_SET)),) + APP_ABI += x86 +endif +ifneq ($(filter mips,$(OSMAND_ARCHITECTURES_SET)),) + APP_ABI += mips +endif +ifneq ($(filter arm,$(OSMAND_ARCHITECTURES_SET)),) + APP_ABI += armeabi armeabi-v7a + OSMAND_SKIP_NEON_SUPPORT := false + OSMAND_FORCE_NEON_SUPPORT := false else - -ifdef OSMAND_ARMv5_ONLY - APP_ABI := armeabi + ifneq ($(filter armv7,$(OSMAND_ARCHITECTURES_SET)),) + APP_ABI += armeabi-v7a + ifeq ($(filter armv7-neon,$(OSMAND_ARCHITECTURES_SET)),) + OSMAND_SKIP_NEON_SUPPORT := true + endif + OSMAND_FORCE_NEON_SUPPORT := false + endif + ifneq ($(filter armv7-neon,$(OSMAND_ARCHITECTURES_SET)),) + APP_ABI += armeabi-v7a + OSMAND_SKIP_NEON_SUPPORT := false + ifeq ($(filter armv7,$(OSMAND_ARCHITECTURES_SET)),) + OSMAND_FORCE_NEON_SUPPORT := true + endif + endif endif -ifdef OSMAND_ARMv7a_ONLY - APP_ABI := armeabi-v7a -endif - -endif - + ifndef OSMAND_DEBUG_NATIVE - # Force release compilation in release optimizations, even if application is debuggable by manifest - APP_OPTIM := release + # Force release compilation in release optimizations, even if application is debuggable by manifest + APP_OPTIM := release endif \ No newline at end of file From f902e16d75ded78bd23269d1981568b52a00bcaa Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Sun, 4 Aug 2013 03:26:25 +0200 Subject: [PATCH 028/145] Translated using Weblate. --- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 760e9064ba..c364c7e8a4 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -38,7 +38,7 @@ 餐廳 景區 汽車維修 - 美食店 + 食品店 旅遊點 加油站 顯示警示… From 1d1961103544089e89578dff899a8ad94122f378 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 10:28:21 +0300 Subject: [PATCH 029/145] Fix order --- OsmAnd/jni/Android.mk | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index 69122094f7..477e6d6cde 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -1,13 +1,9 @@ -ifdef BUILD_ONLY_OLD_LIB -OSMAND_MAKEFILES := $(all-subdir-makefiles) $(call all-makefiles-under,$(call my-dir)/../../../core/targets/android) -else OSMAND_MAKEFILES := \ - $(all-subdir-makefiles) \ - $(call my-dir)/../../../jni/Android.mk \ - $(call my-dir)/../../../core/Android.mk \ $(call all-makefiles-under,$(call my-dir)/../../../core/externals) \ - $(call my-dir)/../../../core/utils/Android.mk -endif + $(call my-dir)/../../../core/Android.mk \ + $(call my-dir)/../../../core/utils/Android.mk \ + $(all-subdir-makefiles) \ + $(call my-dir)/../../../jni/Android.mk # Protect from previous builds ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) From 7e496ff005f4c97b03cd7633d697854fd7b16ae0 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 10:58:16 +0300 Subject: [PATCH 030/145] Be verbose --- OsmAnd/jni/Android.mk | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index 477e6d6cde..d5b1c8c4e0 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -1,9 +1,16 @@ +LOCAL_PATH := $(call my-dir) +ROOT_PATH := $(LOCAL_PATH)/../../.. +$(info OsmAnd root: $(ROOT_PATH)) + +include $(CLEAR_VARS) + OSMAND_MAKEFILES := \ - $(call all-makefiles-under,$(call my-dir)/../../../core/externals) \ - $(call my-dir)/../../../core/Android.mk \ - $(call my-dir)/../../../core/utils/Android.mk \ + $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ + $(ROOT_PATH)/core/Android.mk \ + $(ROOT_PATH)/core/utils/Android.mk \ $(all-subdir-makefiles) \ - $(call my-dir)/../../../jni/Android.mk + $(ROOT_PATH)/jni/Android.mk +$(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) # Protect from previous builds ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) From 37816a7e5479c6436dd5f92ca95875d0eed4ad76 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 11:01:19 +0300 Subject: [PATCH 031/145] Remove uitls --- OsmAnd/jni/Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index d5b1c8c4e0..abef679c77 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -7,7 +7,6 @@ include $(CLEAR_VARS) OSMAND_MAKEFILES := \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ $(ROOT_PATH)/core/Android.mk \ - $(ROOT_PATH)/core/utils/Android.mk \ $(all-subdir-makefiles) \ $(ROOT_PATH)/jni/Android.mk $(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) From 09b5c39946ca34f765b0df9f628a98d1d64d7274 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 11:07:52 +0300 Subject: [PATCH 032/145] Control number of CPUs used for building --- OsmAnd/ndk-build.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/OsmAnd/ndk-build.sh b/OsmAnd/ndk-build.sh index 9a91a5367b..00378164cc 100755 --- a/OsmAnd/ndk-build.sh +++ b/OsmAnd/ndk-build.sh @@ -16,8 +16,19 @@ if [ -z "$OSMAND_ARCHITECTURES_SET" ]; then export OSMAND_ARCHITECTURES_SET fi +if [[ "$(uname -a)" =~ Linux ]]; then + if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then + OSMAND_BUILD_CPU_CORES_NUM=`nproc` + fi +fi +if [[ "$(uname -a)" =~ Darwin ]]; then + if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then + OSMAND_BUILD_CPU_CORES_NUM=`sysctl hw.ncpu | awk '{print $2}'` + fi +fi + OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-android skia) "$SCRIPT_LOC/../../core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$SCRIPT_LOC/../../core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$SCRIPT_LOC/../../jni/generate.sh" -(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) +(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j$OSMAND_BUILD_CPU_CORES_NUM) From 1c85fc6362264ccd12fb53f57e330c2c62353dd9 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 15:28:16 +0200 Subject: [PATCH 033/145] Add osm bug color for not uploaded bugs --- OsmAnd/res/values/colors.xml | 1 + OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values/colors.xml b/OsmAnd/res/values/colors.xml index cf1137dbfd..4b0733ccab 100644 --- a/OsmAnd/res/values/colors.xml +++ b/OsmAnd/res/values/colors.xml @@ -55,5 +55,6 @@ #C8FF0000 #C800FF00 + #C8FFFF00 \ No newline at end of file diff --git a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java index b7a607847b..cf1fa439af 100644 --- a/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java +++ b/OsmAnd/src/net/osmand/plus/osmedit/OsmBugsLayer.java @@ -62,6 +62,7 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider private List objects = new ArrayList(); private Paint pointClosedUI; private Paint pointOpenedUI; + private Paint pointNotSubmitedUI; private double cTopLatitude; private double cBottomLatitude; @@ -120,6 +121,9 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider pointOpenedUI = new Paint(); pointOpenedUI.setColor(activity.getResources().getColor(R.color.osmbug_opened)); pointOpenedUI.setAntiAlias(true); + pointNotSubmitedUI = new Paint(); + pointNotSubmitedUI.setColor(activity.getResources().getColor(R.color.osmbug_not_submitted)); + pointNotSubmitedUI.setAntiAlias(true); pointClosedUI = new Paint(); pointClosedUI.setColor(activity.getResources().getColor(R.color.osmbug_closed)); pointClosedUI.setAntiAlias(true); @@ -153,7 +157,8 @@ public class OsmBugsLayer extends OsmandMapLayer implements IContextMenuProvider for (OpenStreetNote o : objects) { int x = view.getMapXForPoint(o.getLongitude()); int y = view.getMapYForPoint(o.getLatitude()); - canvas.drawCircle(x, y, getRadiusBug(view.getZoom()), o.isOpened()? pointOpenedUI: pointClosedUI); + canvas.drawCircle(x, y, getRadiusBug(view.getZoom()), o.isLocal() ? pointNotSubmitedUI : (o.isOpened() ? pointOpenedUI + : pointClosedUI)); } } From 376dc545d36fa9ac55c40414b5f1ed716f4661dd Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 17:09:08 +0300 Subject: [PATCH 034/145] Select 4.7 first --- OsmAnd/jni/Application.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OsmAnd/jni/Application.mk b/OsmAnd/jni/Application.mk index 89cae01d03..27c1a9fbfb 100755 --- a/OsmAnd/jni/Application.mk +++ b/OsmAnd/jni/Application.mk @@ -1,10 +1,10 @@ APP_STL := gnustl_shared APP_CPPFLAGS := -std=c++11 -fexceptions -frtti -ifeq ($(wildcard $(ANDROID_NDK)/toolchains/*-4.8),) - NDK_TOOLCHAIN_VERSION := 4.7 -else +ifeq ($(wildcard $(ANDROID_NDK)/toolchains/*-4.7),) NDK_TOOLCHAIN_VERSION := 4.8 +else + NDK_TOOLCHAIN_VERSION := 4.7 endif APP_ABI := From 32a290878372023c4a413464025ed028eb5623ef Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 20:51:51 +0200 Subject: [PATCH 035/145] Fix build --- OsmAnd/jni/Application.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/jni/Application.mk b/OsmAnd/jni/Application.mk index 55f1dc3d65..27c1a9fbfb 100755 --- a/OsmAnd/jni/Application.mk +++ b/OsmAnd/jni/Application.mk @@ -1,7 +1,7 @@ APP_STL := gnustl_shared APP_CPPFLAGS := -std=c++11 -fexceptions -frtti -ifeq ($(wildcard $(ANDROID_NDK)/toolchains/*-4.8),) +ifeq ($(wildcard $(ANDROID_NDK)/toolchains/*-4.7),) NDK_TOOLCHAIN_VERSION := 4.8 else NDK_TOOLCHAIN_VERSION := 4.7 From cfb50fe95449fc5452ff7a03a743f1d13999369c Mon Sep 17 00:00:00 2001 From: Damjan Gerl Date: Sun, 4 Aug 2013 16:10:00 +0200 Subject: [PATCH 036/145] Translated using Weblate. --- OsmAnd/res/values-sl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 198a6e8ff5..7f92a1c0c4 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -469,7 +469,7 @@ Glasovno vodenje ni na voljo. V nastavitvah izberite in prenesite ustrezen glasovni paket. Izbrano ni nobeno glasovno vodenje Glas - Izberite glasovno vodenje za navigacijo + Izberite glasovno vodenje za navigacijo (koda jezika po ISO 639-1) Začenjanje podatkov govora … Nepodprta različica podatkov govora Izbrani podatki govora so pokvarjeni @@ -1442,7 +1442,7 @@ Približna pokritost zemljevidov in kakovost le-teh: Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, Angola, Angvila, Antigva in Barbuda, Argentina, Armenija, Aruba, Avstralija, Avstrija, Azerbajdžan, Bahami, Bahrajn, Bangladeš, Barbados, Belorusija, Belgija, Belize, Benin, Bermuda, Butan, Bolivija, Bonaire, Bosna in Hercegovina, Bocvana, Brazilija, Britanski Deviški otoki, Brunej, Bolgarija, Burkina Faso, Burundi, Kambodža, Kamerun, Kanada, Zelenortski otoki, Srednjeafriška republika, Čad, Čile, Kitajska, Kolumbija, Komori, Kongo, Kostarika, Slonokoščena obala, Hrvaška, Kuba, Curaçao, Ciper, Češka, Danska, Džibuti, Dominika, Dominikanska republika, Ekvador, Egipt, Salvador, Ekvatorialna Gvineja, Eritreja, Estonija, Etiopija, Fidži, Finska, Francija, Francoska Gvajana, Francoska Polinezija, Gabon, Gambija, Gruzija, Nemčija, Gana, Gibraltar, Grčija, Grenlandija, Grenada, Guadeloupe, Guam, Gvatemala, Guernsey, Gvineja, Gvineja Bissau, Gvajana, Haiti, Vatikan, Honduras, Hong Kong, Madžarska, Islandija, Indija, Indonezija, Iran, Irak, Irska, otok Man, Izrael, Italija, Jamajka, Japonska, Jersey, Jordanija, Kazahstan, Kenija, Kiribati, Severna Koreja in Južna Koreja, Kuvajt, Kirgizistan, Laos, Latvija, Libanon, Lesoto, Liberija, Libija, Liechtenstein, Litva, Luksemburg, Macao, Makedonija, Madagaskar, Malavi, Malezija, Maldivi, Mali, Malta, Martinique, Mavretanija, Mauritius, Mayotte, Mehika, Mikronezija, Moldavija, Monako, Mongolija, Črna gora, Montserrat, Maroko, Mozambik, Mjanmar, Namibija, Nauru, Nepal, Nizozemska, Nizozemski Antili, Nova Kaledonija, Nova Zelandija, Nikaragva, Niger, Nigerija, Norveška, Oman, Pakistan, Palau, Palestinsko ozemlje, Panama, Papua Nova Gvineja, Paragvaj, Peru, Filipini, Poljska, Portugalska, Portoriko, Katar, Romunija, Rusija, Ruanda, Saint Barthelemy, Saint Helena, Saint Kitts in Nevis, Sveta Lucija, Saint Martin, Saint Pierre in Miquelon, Saint Vincent in Grenadine, Samoa, San Marino, Saudska Arabija, Senegal, Srbija, Sejšeli, Sierra Leone, Singapur, Slovaška, Slovenija, Somalija, Južna Afrika, Južna Georgia, Južni Sudan, Španija, Šrilanka, Sudan, Surinam, Svazi, Švedska, Švica, Sirija, Tajvan, Tadžikistan, Tanzanija, Tajska, Vzhodni Timor, Togo, Tokelau, Tonga, Trinidad in Tobago, Tunizija, Turčija, Turkmenistan, Tuvalu, Uganda, Ukrajina, Združeni arabski emirati, Velika Britanija (UK), Združene države Amerike (ZDA), Urugvaj, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis in Fortuna, Zahodna Sahara, Jemen, Zambija, Zimbabve. \nČasovni razpon: %1$d:%2$02d:%3$02d - \nČas premika: %1$d:%2$02d:%3$02d + \nČas premikanja: %1$d:%2$02d:%3$02d Vrsta ostrenja kamere Izberite vrsto ostrenja vgrajene kamere Samodejno ostrenje From bf1571859adb645ce7157fcead7e41682b349887 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 21:21:01 +0200 Subject: [PATCH 037/145] Build old library --- OsmAnd/jni/Android.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index abef679c77..ab99f0a6a9 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -4,12 +4,16 @@ $(info OsmAnd root: $(ROOT_PATH)) include $(CLEAR_VARS) +ifdef BUILD_ONLY_OLD_LIB +OSMAND_MAKEFILES := $(all-subdir-makefiles) $(call all-makefiles-under,$(call my-dir)/../../../core/targets/android) +else OSMAND_MAKEFILES := \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ $(ROOT_PATH)/core/Android.mk \ $(all-subdir-makefiles) \ $(ROOT_PATH)/jni/Android.mk $(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) +endif # Protect from previous builds ifneq ($(TARGET_ARCH_ABI),armeabi-v7a) @@ -37,4 +41,4 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) endif endif -endif +endif \ No newline at end of file From 7a431911d18572c6860085b7292ae46f64fb71d0 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 21:26:23 +0200 Subject: [PATCH 038/145] Build old library --- OsmAnd/old-ndk-build.sh | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100755 OsmAnd/old-ndk-build.sh diff --git a/OsmAnd/old-ndk-build.sh b/OsmAnd/old-ndk-build.sh new file mode 100755 index 0000000000..39bcc376cc --- /dev/null +++ b/OsmAnd/old-ndk-build.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +NAME=$(basename $(dirname "${BASH_SOURCE[0]}") ) + + +if [ ! -d "$ANDROID_SDK" ]; then + echo "ANDROID_SDK is not set" + exit +fi +if [ ! -d "$ANDROID_NDK" ]; then + echo "ANDROID_NDK is not set" + exit +fi +export ANDROID_SDK_ROOT=$ANDROID_SDK +export ANDROID_NDK_ROOT=$ANDROID_NDK +export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 + +if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then + BUILD_ALL=1 + echo "BUILD_ALL set to true" +fi +export BUILD_ONLY_OLD_LIB=1 +"$SCRIPT_LOC/../../core/externals/configure.sh" +(cd "$SCRIPT_LOC" && "$ANDROID_NDK/ndk-build" -j`nproc`) From 749ea683af38044f8cad5a6aafabfc1c06399610 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 21:46:46 +0200 Subject: [PATCH 039/145] Fix exceptions --- OsmAnd/jni/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index ab99f0a6a9..edb8313012 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -5,7 +5,7 @@ $(info OsmAnd root: $(ROOT_PATH)) include $(CLEAR_VARS) ifdef BUILD_ONLY_OLD_LIB -OSMAND_MAKEFILES := $(all-subdir-makefiles) $(call all-makefiles-under,$(call my-dir)/../../../core/targets/android) + OSMAND_MAKEFILES := $(all-subdir-makefiles) $(call all-makefiles-under,$(call my-dir)/../../../core/targets/android) else OSMAND_MAKEFILES := \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ From f43a53755286396907533ffaf2b11340b217329a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 21:47:30 +0200 Subject: [PATCH 040/145] Fix exceptions --- OsmAnd/old-ndk-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/old-ndk-build.sh b/OsmAnd/old-ndk-build.sh index 39bcc376cc..1faf722f9c 100755 --- a/OsmAnd/old-ndk-build.sh +++ b/OsmAnd/old-ndk-build.sh @@ -17,7 +17,7 @@ export ANDROID_NDK_ROOT=$ANDROID_NDK export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - BUILD_ALL=1 + export OSMAND_ARCHITECTURES_SET=(arm x86 mips) echo "BUILD_ALL set to true" fi export BUILD_ONLY_OLD_LIB=1 From d1fd7bff35b046dd7cbf6fd7d4b877e8828eefcd Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 21:48:01 +0200 Subject: [PATCH 041/145] Fix exceptions --- OsmAnd/old-ndk-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/old-ndk-build.sh b/OsmAnd/old-ndk-build.sh index 1faf722f9c..52ef0b18eb 100755 --- a/OsmAnd/old-ndk-build.sh +++ b/OsmAnd/old-ndk-build.sh @@ -17,7 +17,7 @@ export ANDROID_NDK_ROOT=$ANDROID_NDK export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - export OSMAND_ARCHITECTURES_SET=(arm x86 mips) + export OSMAND_ARCHITECTURES_SET='arm x86 mips' echo "BUILD_ALL set to true" fi export BUILD_ONLY_OLD_LIB=1 From d451f35b5ae5187a4d3b87f5737ffb259777f64a Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 21:49:04 +0200 Subject: [PATCH 042/145] Fix exceptions --- OsmAnd/old-ndk-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/old-ndk-build.sh b/OsmAnd/old-ndk-build.sh index 52ef0b18eb..08c723ea1c 100755 --- a/OsmAnd/old-ndk-build.sh +++ b/OsmAnd/old-ndk-build.sh @@ -17,7 +17,7 @@ export ANDROID_NDK_ROOT=$ANDROID_NDK export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - export OSMAND_ARCHITECTURES_SET='arm x86 mips' + OSMAND_ARCHITECTURES_SET='arm x86 mips' echo "BUILD_ALL set to true" fi export BUILD_ONLY_OLD_LIB=1 From ab4868dd147a054e97bd5ef0c6b47985b39c6a06 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sun, 4 Aug 2013 21:49:22 +0200 Subject: [PATCH 043/145] Fix exceptions --- OsmAnd/old-ndk-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/old-ndk-build.sh b/OsmAnd/old-ndk-build.sh index 08c723ea1c..52ef0b18eb 100755 --- a/OsmAnd/old-ndk-build.sh +++ b/OsmAnd/old-ndk-build.sh @@ -17,7 +17,7 @@ export ANDROID_NDK_ROOT=$ANDROID_NDK export ANDROID_NDK_TOOLCHAIN_VERSION=4.7 if [ -z "$OSMAND_X86_ONLY" ] && [ -z "$OSMAND_ARM_ONLY" ] && [ -z "$OSMAND_ARMv5_ONLY" ] && [ -z "$OSMAND_ARMv7a_ONLY" ] && [ -z "$OSMAND_MIPS_ONLY" ]; then - OSMAND_ARCHITECTURES_SET='arm x86 mips' + export OSMAND_ARCHITECTURES_SET='arm x86 mips' echo "BUILD_ALL set to true" fi export BUILD_ONLY_OLD_LIB=1 From 440e28dd15c6445f9d21780aa8f99a3ce53d4478 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 22:54:25 +0300 Subject: [PATCH 044/145] Update Android.mk --- OsmAnd/jni/Android.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index edb8313012..6be32e7e9a 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -6,6 +6,7 @@ include $(CLEAR_VARS) ifdef BUILD_ONLY_OLD_LIB OSMAND_MAKEFILES := $(all-subdir-makefiles) $(call all-makefiles-under,$(call my-dir)/../../../core/targets/android) +$(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) else OSMAND_MAKEFILES := \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ @@ -41,4 +42,4 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) endif endif -endif \ No newline at end of file +endif From 669fbd5ac315ed854a7286bf58eaf14c7f0872ea Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Sun, 4 Aug 2013 22:58:35 +0300 Subject: [PATCH 045/145] Update Android.mk --- OsmAnd/jni/Android.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index 6be32e7e9a..3619592266 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -5,8 +5,8 @@ $(info OsmAnd root: $(ROOT_PATH)) include $(CLEAR_VARS) ifdef BUILD_ONLY_OLD_LIB - OSMAND_MAKEFILES := $(all-subdir-makefiles) $(call all-makefiles-under,$(call my-dir)/../../../core/targets/android) -$(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) + OSMAND_MAKEFILES := $(call all-subdir-makefiles) $(call all-makefiles-under,$(ROOT_PATH)/core/targets/android) + $(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) else OSMAND_MAKEFILES := \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ From be3d150b480614305ea1b8c8c5d3943956587c4f Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 00:29:56 +0200 Subject: [PATCH 046/145] Add setting driving region and link it to metric constants by default. Remove setting left hand driving --- OsmAnd/res/values/strings.xml | 4 ++ .../src/net/osmand/plus/OsmandSettings.java | 40 +++++++++++++++++-- .../activities/SettingsGeneralActivity.java | 11 ++++- .../osmand/plus/routing/RouteProvider.java | 2 +- .../osmand/plus/routing/RoutingHelper.java | 2 +- .../mapwidgets/RouteInfoWidgetsFactory.java | 2 +- 6 files changed, 53 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index ef016e98d9..4b3d02dc58 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -10,6 +10,10 @@ PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Japan + United States + Europe & Asia + UK, India, Australia & Others Stop OsMoDroid Start OsMoDroid Announce GPX waypoints diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 5eac5aa407..b022562cd9 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -562,10 +562,19 @@ public class OsmandSettings { public final OsmandPreference DEFAULT_APPLICATION_MODE = new EnumIntPreference( "default_application_mode", ApplicationMode.DEFAULT, ApplicationMode.values()).makeGlobal(); + public final OsmandPreference DRIVING_REGION = new EnumIntPreference( + "default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()).makeGlobal().cache(); + // this value string is synchronized with settings_pref.xml preference name // cache of metrics constants as they are used very often public final OsmandPreference METRIC_SYSTEM = new EnumIntPreference( - "default_metric_system", MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.values()).makeGlobal().cache(); + "default_metric_system", MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.values()){ + protected MetricsConstants getDefaultValue() { + return DRIVING_REGION.get().defMetrics; + }; + }.makeGlobal().cache(); + + // this value string is synchronized with settings_pref.xml preference name // cache of metrics constants as they are used very often @@ -656,8 +665,6 @@ public class OsmandSettings { SNAP_TO_ROAD.setModeDefaultValue(ApplicationMode.BICYCLE, true); } - public final CommonPreference LEFT_SIDE_NAVIGATION = new BooleanPreference("left_side_navigation", false).makeGlobal(); - // this value string is synchronized with settings_pref.xml preference name public static final String SAVE_CURRENT_TRACK = "save_current_track"; //$NON-NLS-1$ @@ -1501,4 +1508,31 @@ public class OsmandSettings { } + /** + * Class represents specific for driving region + * Signs, leftHandDriving + */ + public enum DrivingRegion { + + EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false, false), + US_CANADA(R.string.driving_region_us, MetricsConstants.MILES_AND_FOOTS, false, true), + UK_AND_OTHERS(R.string.driving_region_uk, MetricsConstants.MILES_AND_FOOTS, true, false), + JAPAN(R.string.driving_region_japan, MetricsConstants.KILOMETERS_AND_METERS, true, false) + ; + + public final boolean leftHandDriving; + public final boolean americanSigns; + public final MetricsConstants defMetrics; + public final int name; + + DrivingRegion(int name, MetricsConstants def, boolean leftHandDriving, boolean americanSigns) { + this.name = name; + defMetrics = def; + this.leftHandDriving = leftHandDriving; + this.americanSigns = americanSigns; + } + + } + + } diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 3a3f339067..575fbe7a00 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -9,6 +9,7 @@ import net.osmand.access.AccessibleToast; import net.osmand.plus.ApplicationMode; import net.osmand.plus.ClientContext; import net.osmand.plus.OsmandSettings; +import net.osmand.plus.OsmandSettings.DrivingRegion; import net.osmand.plus.OsmandSettings.MetricsConstants; import net.osmand.plus.R; import net.osmand.plus.Version; @@ -116,7 +117,6 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { screen.addPreference(createCheckBoxPreference(settings.USE_KALMAN_FILTER_FOR_COMPASS, R.string.use_kalman_filter_compass, R.string.use_kalman_filter_compass_descr)); registerBooleanPreference(settings.USE_ENGLISH_NAMES, screen); - registerBooleanPreference(settings.LEFT_SIDE_NAVIGATION, screen); // List preferences @@ -132,7 +132,14 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { settings.OSMAND_THEME, screen, new String[] { "Dark", "Light", "Dark ActionBar" }, new Integer[] { OsmandSettings.OSMAND_DARK_THEME, OsmandSettings.OSMAND_LIGHT_THEME, OsmandSettings.OSMAND_LIGHT_DARK_ACTIONBAR_THEME }); - MetricsConstants[] mvls = new MetricsConstants[] {MetricsConstants.KILOMETERS_AND_METERS, MetricsConstants.MILES_AND_FOOTS, MetricsConstants.MILES_AND_YARDS}; //MetricsConstants.values(); + DrivingRegion[] drs = DrivingRegion.values(); + entries = new String[drs.length]; + for (int i = 0; i < entries.length; i++) { + entries[i] = getString(drs[i].name); + } + registerListPreference(settings.DRIVING_REGION, screen, entries, drs); + + MetricsConstants[] mvls = MetricsConstants.values(); entries = new String[mvls.length]; for(int i=0; i wpt; public GPXRouteParams(GPXFile file, boolean reverse, boolean announceWaypoints, OsmandSettings settings){ - prepareEverything(file, reverse, announceWaypoints, settings.LEFT_SIDE_NAVIGATION.get()); + prepareEverything(file, reverse, announceWaypoints, settings.DRIVING_REGION.get().leftHandDriving); } public void setStartPoint(Location startPoint) { diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index bc764583c9..bd33ae399b 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -745,7 +745,7 @@ public class RoutingHelper { params.intermediates = intermediates; params.gpxRoute = gpxRoute; params.previousToRecalculate = previousRoute; - params.leftSide = settings.LEFT_SIDE_NAVIGATION.get(); + params.leftSide = settings.DRIVING_REGION.get().leftHandDriving; params.preciseRouting = settings.PRECISE_ROUTING_MODE.getModeValue(mode); params.optimal = settings.OPTIMAL_ROUTE_MODE.getModeValue(mode); params.fast = settings.FAST_ROUTE_MODE.getModeValue(mode); diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index a9690c8575..2d60b8ea58 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -62,7 +62,7 @@ public class RouteInfoWidgetsFactory { if (makeUturnWhenPossible) { visible = true; turnImminent = 0; - turnType = TurnType.valueOf(TurnType.TU, settings.LEFT_SIDE_NAVIGATION.get()); + turnType = TurnType.valueOf(TurnType.TU, settings.DRIVING_REGION.get().leftHandDriving); TurnPathHelper.calcTurnPath(pathForTurn, turnType, pathTransform); invalidate(); } else { From 4e30966dac90a01bf653726fa7084450996566f9 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 01:01:01 +0200 Subject: [PATCH 047/145] Add us specific sign --- .../drawable-hdpi/warnings_speed_limit_us.png | Bin 0 -> 1267 bytes .../drawable-large/warnings_speed_limit_us.png | Bin 0 -> 1267 bytes .../mapwidgets/RouteInfoWidgetsFactory.java | 11 +++++++---- 3 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png create mode 100644 OsmAnd/res/drawable-large/warnings_speed_limit_us.png diff --git a/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png b/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png new file mode 100644 index 0000000000000000000000000000000000000000..4eb97b9163908a207da14bbc87fded7fa8a0662a GIT binary patch literal 1267 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^bmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg4b24#^VNh?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))i1{HX^IEGZr zd3(#>LpfdI_{VgkLRsyMTRnY8>RmV+yBJkn1iDPymnxi1)sO4?GO1ZTm6JoL!}g29 z%8HN6nzpgO+_?OnO@$DX?TQwzMFANXrz}b_T&DK^^5Lw=i1f267pE-W&u_DwGymSh z*^=xsT#Mp zm=aVU7aM!C?!f!+)=>tNPX^e{Utby@psttp@9Ud4XTC8XK76=OOlPW>NdNJd%=Nb( zO1|`3Iq&1gkNRzGZE`h>^78YSzkQqQ-Yq95Hz}w~O|Kqpg z#w#=o1Sc-by!Y?lKl!AMH*S3T^yzq8qRq!^3*@x;YR;RS4PTa7XKrque)h~630+-X z|1G8~*pD}Mc9{5PoB4izy=~jJohw(a>~m52=$W7YUO0z8D>U>$`OdrV&j0%Td;iDZ ze-FNVnVD}QRcmNq5U~8MLpfdI_{VgkLRsyMTRnY8>RmV+yBJkn1iDPymnxi1)sO4?GO1ZTm6JoL!}g29 z%8HN6nzpgO+_?OnO@$DX?TQwzMFANXrz}b_T&DK^^5Lw=i1f267pE-W&u_DwGymSh z*^=xsT#Mp zm=aVU7aM!C?!f!+)=>tNPX^e{Utby@psttp@9Ud4XTC8XK76=OOlPW>NdNJd%=Nb( zO1|`3Iq&1gkNRzGZE`h>^78YSzkQqQ-Yq95Hz}w~O|Kqpg z#w#=o1Sc-by!Y?lKl!AMH*S3T^yzq8qRq!^3*@x;YR;RS4PTa7XKrque)h~630+-X z|1G8~*pD}Mc9{5PoB4izy=~jJohw(a>~m52=$W7YUO0z8D>U>$`OdrV&j0%Td;iDZ ze-FNVnVD}QRcmNq5U~8M 0) { + canvas.drawText(text, getWidth() / 2, getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient, ptext); + } } }; From 0d9e9d74a5b660a1736b9f102c36031e7fcb7aa1 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 01:03:22 +0200 Subject: [PATCH 048/145] Fix exception --- OsmAnd/res/values/strings.xml | 2 ++ OsmAnd/res/xml/general_settings.xml | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 4b3d02dc58..ed762b6a6d 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -10,6 +10,8 @@ PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy --> + Select Driving Region : US, Europe, UK, Asia and Others + Driving Region Japan United States Europe & Asia diff --git a/OsmAnd/res/xml/general_settings.xml b/OsmAnd/res/xml/general_settings.xml index d89f982794..0d3194e8f8 100644 --- a/OsmAnd/res/xml/general_settings.xml +++ b/OsmAnd/res/xml/general_settings.xml @@ -6,8 +6,7 @@ + - From d8928258cef2cf1fdc26bbeedfb677c0357c1220 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 01:36:33 +0200 Subject: [PATCH 049/145] Fix exception --- .../drawable-hdpi/warnings_speed_limit_us.png | Bin 1267 -> 3035 bytes .../warnings_speed_limit_us.png | Bin 1267 -> 3035 bytes .../src/net/osmand/plus/OsmandSettings.java | 7 ++++++- .../mapwidgets/RouteInfoWidgetsFactory.java | 6 +++++- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png b/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png index 4eb97b9163908a207da14bbc87fded7fa8a0662a..b721c082532a587164be7a8c3fc8dbfea76a4797 100644 GIT binary patch literal 3035 zcmdT`i93|t|9-sLvS%5Cv4jSZC0VnS2-B27uQf}Ir7(m`K0*(01&jbv2*}4 z=FjBi2EXm@@O?0GMp)Qh=LI947ySTS9}lx}jR1gS8h<9oKM!Gd!A+@1E0;*eQ2$8W z&2T>ehr?;!!URS5-VF283=Iz;u9!#z0Kbc^<;Cmx0%l^RfCS=7=B9R)Ri+Czn&x5bwQWye;VP z@NkDOLqkV|Cr`+yO-xKg1)6n?jg3bcjEd&it=rCj|NVDfah}Lu7Q908W(SpfdwYny zPP9^13~gitS`VHWC;8H=I*#JGL@bJ(DsZMdV-ZCfu2srVz%b`hXs8xuqUm_W@PGM} zwaw>!NKh7wWn*J=0fiC)KKqbHy1ToDCB?-LWUO=LdbObfmr_Mqu`v6JVf60$94DZ@ zQJk8VmRC2KNOaMFSn!@qI$)*EQPaihUzeBfQn3ii_GnO|m#X?ocXhwn6~i2*RFN+O z1E^!~oER5*Po6n*CeaI~K9t{Ywx1{Z24s^VZdK-ZhvI&Emd;x%GT>uCm!w@5x$L%X7uzRZIneVt*mbLKGVaqXp$^O zXmdRk4u>l$D^p7~yeKduBO~^7nmi}VItPZ8F|QAvXnLA!9<%;4izRHjDI%Y=GG=tK z$Wrm5lN01xp)uFp7VRZ-bsjY}H4KA>ai32P`u={JU@gZ%$Hu$c*$KzS#ug6-qFi0m zH#Z|G{kK0hT(!!&tVG%SPyL*M!R-EOGyR!f5CF{1&gzzF=Iw{*6P;NwdOh{~w{I_M zYav!vR_tv?D1kuGVdAUP`>D*yW_cL>q6WlwsO;*4++6FRAoYfZ25oKaOC%nhgV&32fOaz=s4a^r_t(b zxHvhzXWO$sFqjL=%Ty3eZ=KYi$NZA2si`5G`fIMG8&(WwY;Q*c$%xWcf|50xq8rdR zHC7*?s-=aC3%0jEk&%(XHl|}$)zt1FN>i@AYMYu;SoyT$Nl6-Shzi7Dw(%i@gM*$l z9xg5x3vAfy*RPW;N|FZysY7<=*|oL$oIE^nCKKal4H|`2G$8!J`ZB;2*bB(!r-Suw z_DbWb0>Q>aT3uUPWPfLMzOp4GB&530Me83M<&jTu27kH%kP{D$BaI8~er-7=%fv@#t7~fBcPOWR{tO7g z43m%X2q~O8#T641Gt!9DdaU6(vrR55gQupZu5D2$W(DR+a-XSNJ-Y%cOeXEQX&k%3 zp}fFpY-*}lA(5UV>zR2B9zA1#8B2Dm*xDOuYzdeV=i}<}*F_)@-shw_0OLX-aL{w* z>5tT%$1tbCK-t?*NB4a9N|G%pDT!#n*ts@Fp8<-itA|uJc9Ae`(jb0o*xBC0Bl}9e zW=TVXG(7KkTU%R4U*F|`02M_=MSqxzf&y^w-aS5PB>RW@Ny-Nn$oNIv&2j3F&8E%6fO5;-;KH(z~fS>=YrUTzY*Qtgt3 z17Mcf-;N-E-B7eMYij?XCq8##24DAq>u$ zV0|KkO_z&9hVlEqXLVkgdtsHiMw9fK+MO?wyfF)0P!>IDZZ7ZV=jW+1vvFr?%6pkn zCk)qZ0U9C`B`0^vmP7LfUd4C7fX@A3o_5<>Q&m8(krIVakXnP#vqqIL@hZ5 zgWMb?7oNw(>aE-tlxZ4;DxW%aQcbOMmJI?oX6syXfApiQAGFn(jLgiFj}X|+g+VFb z^Tx*DQy!k8bKyq+I;c&=F1=IBJzQ%O22Zf4Vs^Zv@(G*vHl+?R zvvS^1n8(!A6bgkVccT9S1Ox=gg}!I=LYMdWn=^@5@290|v6cRguAV6DFk&}}|iVz_ zK?jN1#E?j1S!o%W-B@R5Ny_do8T0pn7#GwGEFjJ8-7m)1+gsFE?yAU@SH2h1BbK4& zM+Xs50q!SAc!6o0(?A^xJQ}?`a%W*7Fe^8Ac5`vaFm77|2^VW^ZCz{S*J8)TRClF_ zsz5UBQ78alvuAU6uXeuoXf$c4z9zZ-la%CPiY>$HLrzPSsy|Ov`{wGeH!1xY* z`641Js)#Qm6&C|aN=oqwi(g7dnqsQEWvEh8Qc!8>XY2m2ea+^r#}E6qmcFlwSac9W zDV<5*TtLn)hvK!%<_AhHHAy~2UgkYX^&$PkRd2L={xj8{Ps~~k2`kmcK5YH}w;)Rd z=o1q@3AKwO=Tamkq0kP4Z(qL_S5yS8IMbdyK95_OI@sNaPpDGTp<^L{jjipp44qCV z6cl8E=Hso~$F8(1eufLHtJVn#roRt1>?pm{9l`p!FG2l&CSs8YDy*oCO!racS*Ksl zu1$EI#igY`CJGGA|Cr2Ae*vHqV6S&;kwC8(uq$95F`2MaQdK32#bSZv-@kv~2Y?r& zqobL2X1hPHdC&M&y?rat+uKWy*?_-ws*uk=*s;=pD4Chb-MV#4RYSwl#RUpns2J9V z8Aqzhq>2Rps5-U2KG$6YBE$V)OY4->kgq;5Bq}OOg72Q|4;ly zJRWZm7#KJP+Dx&z%1J|R@9H0y!FMLmXSek9^&eMUf8%C7nZ%(N=X5+oPtOcA;()Ey LHOu!F-YNeBxvsRJ literal 1267 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^bmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg4b24#^VNh?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))i1{HX^IEGZr zd3(#>LpfdI_{VgkLRsyMTRnY8>RmV+yBJkn1iDPymnxi1)sO4?GO1ZTm6JoL!}g29 z%8HN6nzpgO+_?OnO@$DX?TQwzMFANXrz}b_T&DK^^5Lw=i1f267pE-W&u_DwGymSh z*^=xsT#Mp zm=aVU7aM!C?!f!+)=>tNPX^e{Utby@psttp@9Ud4XTC8XK76=OOlPW>NdNJd%=Nb( zO1|`3Iq&1gkNRzGZE`h>^78YSzkQqQ-Yq95Hz}w~O|Kqpg z#w#=o1Sc-by!Y?lKl!AMH*S3T^yzq8qRq!^3*@x;YR;RS4PTa7XKrque)h~630+-X z|1G8~*pD}Mc9{5PoB4izy=~jJohw(a>~m52=$W7YUO0z8D>U>$`OdrV&j0%Td;iDZ ze-FNVnVD}QRcmNq5U~8Mm`K0*(01&jbv2*}4 z=FjBi2EXm@@O?0GMp)Qh=LI947ySTS9}lx}jR1gS8h<9oKM!Gd!A+@1E0;*eQ2$8W z&2T>ehr?;!!URS5-VF283=Iz;u9!#z0Kbc^<;Cmx0%l^RfCS=7=B9R)Ri+Czn&x5bwQWye;VP z@NkDOLqkV|Cr`+yO-xKg1)6n?jg3bcjEd&it=rCj|NVDfah}Lu7Q908W(SpfdwYny zPP9^13~gitS`VHWC;8H=I*#JGL@bJ(DsZMdV-ZCfu2srVz%b`hXs8xuqUm_W@PGM} zwaw>!NKh7wWn*J=0fiC)KKqbHy1ToDCB?-LWUO=LdbObfmr_Mqu`v6JVf60$94DZ@ zQJk8VmRC2KNOaMFSn!@qI$)*EQPaihUzeBfQn3ii_GnO|m#X?ocXhwn6~i2*RFN+O z1E^!~oER5*Po6n*CeaI~K9t{Ywx1{Z24s^VZdK-ZhvI&Emd;x%GT>uCm!w@5x$L%X7uzRZIneVt*mbLKGVaqXp$^O zXmdRk4u>l$D^p7~yeKduBO~^7nmi}VItPZ8F|QAvXnLA!9<%;4izRHjDI%Y=GG=tK z$Wrm5lN01xp)uFp7VRZ-bsjY}H4KA>ai32P`u={JU@gZ%$Hu$c*$KzS#ug6-qFi0m zH#Z|G{kK0hT(!!&tVG%SPyL*M!R-EOGyR!f5CF{1&gzzF=Iw{*6P;NwdOh{~w{I_M zYav!vR_tv?D1kuGVdAUP`>D*yW_cL>q6WlwsO;*4++6FRAoYfZ25oKaOC%nhgV&32fOaz=s4a^r_t(b zxHvhzXWO$sFqjL=%Ty3eZ=KYi$NZA2si`5G`fIMG8&(WwY;Q*c$%xWcf|50xq8rdR zHC7*?s-=aC3%0jEk&%(XHl|}$)zt1FN>i@AYMYu;SoyT$Nl6-Shzi7Dw(%i@gM*$l z9xg5x3vAfy*RPW;N|FZysY7<=*|oL$oIE^nCKKal4H|`2G$8!J`ZB;2*bB(!r-Suw z_DbWb0>Q>aT3uUPWPfLMzOp4GB&530Me83M<&jTu27kH%kP{D$BaI8~er-7=%fv@#t7~fBcPOWR{tO7g z43m%X2q~O8#T641Gt!9DdaU6(vrR55gQupZu5D2$W(DR+a-XSNJ-Y%cOeXEQX&k%3 zp}fFpY-*}lA(5UV>zR2B9zA1#8B2Dm*xDOuYzdeV=i}<}*F_)@-shw_0OLX-aL{w* z>5tT%$1tbCK-t?*NB4a9N|G%pDT!#n*ts@Fp8<-itA|uJc9Ae`(jb0o*xBC0Bl}9e zW=TVXG(7KkTU%R4U*F|`02M_=MSqxzf&y^w-aS5PB>RW@Ny-Nn$oNIv&2j3F&8E%6fO5;-;KH(z~fS>=YrUTzY*Qtgt3 z17Mcf-;N-E-B7eMYij?XCq8##24DAq>u$ zV0|KkO_z&9hVlEqXLVkgdtsHiMw9fK+MO?wyfF)0P!>IDZZ7ZV=jW+1vvFr?%6pkn zCk)qZ0U9C`B`0^vmP7LfUd4C7fX@A3o_5<>Q&m8(krIVakXnP#vqqIL@hZ5 zgWMb?7oNw(>aE-tlxZ4;DxW%aQcbOMmJI?oX6syXfApiQAGFn(jLgiFj}X|+g+VFb z^Tx*DQy!k8bKyq+I;c&=F1=IBJzQ%O22Zf4Vs^Zv@(G*vHl+?R zvvS^1n8(!A6bgkVccT9S1Ox=gg}!I=LYMdWn=^@5@290|v6cRguAV6DFk&}}|iVz_ zK?jN1#E?j1S!o%W-B@R5Ny_do8T0pn7#GwGEFjJ8-7m)1+gsFE?yAU@SH2h1BbK4& zM+Xs50q!SAc!6o0(?A^xJQ}?`a%W*7Fe^8Ac5`vaFm77|2^VW^ZCz{S*J8)TRClF_ zsz5UBQ78alvuAU6uXeuoXf$c4z9zZ-la%CPiY>$HLrzPSsy|Ov`{wGeH!1xY* z`641Js)#Qm6&C|aN=oqwi(g7dnqsQEWvEh8Qc!8>XY2m2ea+^r#}E6qmcFlwSac9W zDV<5*TtLn)hvK!%<_AhHHAy~2UgkYX^&$PkRd2L={xj8{Ps~~k2`kmcK5YH}w;)Rd z=o1q@3AKwO=Tamkq0kP4Z(qL_S5yS8IMbdyK95_OI@sNaPpDGTp<^L{jjipp44qCV z6cl8E=Hso~$F8(1eufLHtJVn#roRt1>?pm{9l`p!FG2l&CSs8YDy*oCO!racS*Ksl zu1$EI#igY`CJGGA|Cr2Ae*vHqV6S&;kwC8(uq$95F`2MaQdK32#bSZv-@kv~2Y?r& zqobL2X1hPHdC&M&y?rat+uKWy*?_-ws*uk=*s;=pD4Chb-MV#4RYSwl#RUpns2J9V z8Aqzhq>2Rps5-U2KG$6YBE$V)OY4->kgq;5Bq}OOg72Q|4;ly zJRWZm7#KJP+Dx&z%1J|R@9H0y!FMLmXSek9^&eMUf8%C7nZ%(N=X5+oPtOcA;()Ey LHOu!F-YNeBxvsRJ literal 1267 zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^bmSQK*5Dp-y;YjHK@;M7UB8!3Q zuY)k7lg4b24#^VNh?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))i1{HX^IEGZr zd3(#>LpfdI_{VgkLRsyMTRnY8>RmV+yBJkn1iDPymnxi1)sO4?GO1ZTm6JoL!}g29 z%8HN6nzpgO+_?OnO@$DX?TQwzMFANXrz}b_T&DK^^5Lw=i1f267pE-W&u_DwGymSh z*^=xsT#Mp zm=aVU7aM!C?!f!+)=>tNPX^e{Utby@psttp@9Ud4XTC8XK76=OOlPW>NdNJd%=Nb( zO1|`3Iq&1gkNRzGZE`h>^78YSzkQqQ-Yq95Hz}w~O|Kqpg z#w#=o1Sc-by!Y?lKl!AMH*S3T^yzq8qRq!^3*@x;YR;RS4PTa7XKrque)h~630+-X z|1G8~*pD}Mc9{5PoB4izy=~jJohw(a>~m52=$W7YUO0z8D>U>$`OdrV&j0%Td;iDZ ze-FNVnVD}QRcmNq5U~8M DRIVING_REGION = new EnumIntPreference( - "default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()).makeGlobal().cache(); + "default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()) { + protected boolean setValue(Object prefs, DrivingRegion val) { + ((CommonPreference)METRIC_SYSTEM).cachedValue = null; + return super.setValue(prefs, val); + }; + }.makeGlobal().cache(); // this value string is synchronized with settings_pref.xml preference name // cache of metrics constants as they are used very often diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index 3d9c921db4..eb879ff50b 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -622,6 +622,7 @@ public class RouteInfoWidgetsFactory { ptext.setTextAlign(Align.CENTER); final BaseMapWidget alarm = new BaseMapWidget(ma) { + private int textDy = 0; private String text = ""; private Bitmap img = null; private int imgId; @@ -646,11 +647,13 @@ public class RouteInfoWidgetsFactory { } if(alarm != null) { int locimgId = 0; + int textDy = 0; String text = null; if(alarm.getType() == AlarmInfo.SPEED_LIMIT) { text = alarm.getIntValue() +""; if(settings.DRIVING_REGION.get() == DrivingRegion.US_CANADA){ locimgId = R.drawable.warnings_speed_limit_us; + textDy = (int) (-12 * scaleCoefficient); } } else if(alarm.getType() == AlarmInfo.SPEED_CAMERA) { locimgId = R.drawable.warnings_speed_camera; @@ -683,6 +686,7 @@ public class RouteInfoWidgetsFactory { } if(text != null && !text.equals(this.text)) { this.text = text; + this.textDy = textDy; invalidate(); } } @@ -702,7 +706,7 @@ public class RouteInfoWidgetsFactory { canvas.drawBitmap(img, 0, 0, paintCircle); } if(text.length() > 0) { - canvas.drawText(text, getWidth() / 2, getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient, ptext); + canvas.drawText(text, getWidth() / 2 , getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient - textDy, ptext); } } From d1e4a2b3211f36d821df838a61fa358bd209f809 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 01:45:16 +0200 Subject: [PATCH 050/145] Update Countries --- OsmAnd/res/values/strings.xml | 1 + OsmAnd/src/net/osmand/plus/OsmandSettings.java | 3 ++- .../plus/activities/SettingsGeneralActivity.java | 11 ++++++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index ed762b6a6d..6f83c8f9bb 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -14,6 +14,7 @@ Driving Region Japan United States + Canada Europe & Asia UK, India, Australia & Others Stop OsMoDroid diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 869c594b9d..7e822ef21b 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -1520,7 +1520,8 @@ public class OsmandSettings { public enum DrivingRegion { EUROPE_ASIA(R.string.driving_region_europe_asia, MetricsConstants.KILOMETERS_AND_METERS, false, false), - US_CANADA(R.string.driving_region_us, MetricsConstants.MILES_AND_FOOTS, false, true), + US(R.string.driving_region_us, MetricsConstants.MILES_AND_FOOTS, false, true), + CANADA(R.string.driving_region_canada, MetricsConstants.KILOMETERS_AND_METERS, false, true), UK_AND_OTHERS(R.string.driving_region_uk, MetricsConstants.MILES_AND_FOOTS, true, false), JAPAN(R.string.driving_region_japan, MetricsConstants.KILOMETERS_AND_METERS, true, false) ; diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index 575fbe7a00..b1ce2d6626 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -43,6 +43,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { private Preference applicationDir; private ListPreference applicationModePreference; + private ListPreference drivingRegionPreference; + private ListPreference metricsAndConstantsPreference; @Override @@ -208,7 +210,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { applicationModePreference = (ListPreference) screen.findPreference(settings.APPLICATION_MODE.getId()); applicationModePreference.setOnPreferenceChangeListener(this); - + drivingRegionPreference = (ListPreference) screen.findPreference(settings.DRIVING_REGION.getId()); + metricsAndConstantsPreference = (ListPreference) screen.findPreference(settings.METRIC_SYSTEM.getId()); } @@ -226,6 +229,10 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { applicationModePreference.setTitle(getString(R.string.settings_preset) + " [" + settings.APPLICATION_MODE.get().toHumanString(getMyApplication()) + "]"); + drivingRegionPreference.setTitle(getString(R.string.driving_region) + " [" + + getString(settings.DRIVING_REGION.get().name) + "]"); + metricsAndConstantsPreference.setTitle(getString(R.string.unit_of_length) + " [" + + settings.METRIC_SYSTEM.get().toHumanString(getMyApplication()) + "]"); } @Override @@ -252,6 +259,8 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { Intent intent = getIntent(); finish(); startActivity(intent); + } else { + updateAllSettings(); } return true; } From 1c13370e6ad24f1ed50bb922ea0549f554f57bdc Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 01:45:20 +0200 Subject: [PATCH 051/145] Update Countries --- .../net/osmand/plus/activities/SettingsGeneralActivity.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java index b1ce2d6626..215478c749 100644 --- a/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java +++ b/OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java @@ -231,8 +231,9 @@ public class SettingsGeneralActivity extends SettingsBaseActivity { + settings.APPLICATION_MODE.get().toHumanString(getMyApplication()) + "]"); drivingRegionPreference.setTitle(getString(R.string.driving_region) + " [" + getString(settings.DRIVING_REGION.get().name) + "]"); - metricsAndConstantsPreference.setTitle(getString(R.string.unit_of_length) + " [" - + settings.METRIC_SYSTEM.get().toHumanString(getMyApplication()) + "]"); + // Too long +// metricsAndConstantsPreference.setTitle(getString(R.string.unit_of_length) + " [" +// + settings.METRIC_SYSTEM.get().toHumanString(getMyApplication()) + "]"); } @Override From 77c4067ffc9549d8b69b297c2d16513d123efba7 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 01:45:47 +0200 Subject: [PATCH 052/145] Update Countries --- .../osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java index eb879ff50b..8d278c41ae 100644 --- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java +++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java @@ -651,7 +651,7 @@ public class RouteInfoWidgetsFactory { String text = null; if(alarm.getType() == AlarmInfo.SPEED_LIMIT) { text = alarm.getIntValue() +""; - if(settings.DRIVING_REGION.get() == DrivingRegion.US_CANADA){ + if(settings.DRIVING_REGION.get().americanSigns){ locimgId = R.drawable.warnings_speed_limit_us; textDy = (int) (-12 * scaleCoefficient); } From 005306db7b00ea3d47ef2aac2c7f765c62651c0b Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Mon, 5 Aug 2013 00:34:04 +0200 Subject: [PATCH 053/145] Translated using Weblate. --- OsmAnd/res/values-pl/strings.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 24630768b4..cb51832d8a 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1310,4 +1310,8 @@ Punkty śladu GPX Zatrzymaj OsMoDroid Uruchom OsMoDroid - + Japonia + Stany Zjednoczone + Europa i Azja + Wielka Brytania, Indie, Australia i inne + From 49ae330a0e220d4e7ba9556f3e30865879ed6696 Mon Sep 17 00:00:00 2001 From: Sebatiao Silva Date: Mon, 5 Aug 2013 01:04:45 +0200 Subject: [PATCH 054/145] Translated using Weblate. --- OsmAnd/res/values-pt/strings.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index 1e7944115d..95ff781ab0 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -1,4 +1,5 @@ -Administrativo + +Administrativo Barreira Educação Emergência @@ -572,7 +573,7 @@ Online live tracking Specify live tracking interval Live tracking interval - Specify the web address with parameter syntax : lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6} + Especifique o endereço web com a sintaxe de parâmetros: lat={0}, lon={1}, data/hora={2}, hdop={3}, altitude={4}, velocidade={5}, bearing={6} Live tracking web address Please enable \'Log track to GPX\' Tracking settings. Mostrar rota atual @@ -1120,4 +1121,4 @@ Calculadora de Distância e Ferramenta de Planeamento "Criar caminhos (ou usar / modificar arquivos GPX existentes) para medir a distância entre pontos. Se guardar como GPX, pode ser usado para planear rotas GPX." Altitude - Corrigir a medição - \ No newline at end of file + From f79f7723d4ca369fa1c307fc26de6144d625f36e Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Mon, 5 Aug 2013 01:07:38 +0200 Subject: [PATCH 055/145] Translated using Weblate. --- OsmAnd/res/values-pl/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index cb51832d8a..0a91d77c2b 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1314,4 +1314,6 @@ Stany Zjednoczone Europa i Azja Wielka Brytania, Indie, Australia i inne + Wybierz region, w którym będziesz się poruszał: Stany Zjednoczone, Europa, Wielka Brytania, Azja i inne + Region poruszania się From f4814fb9b35f6d89fa040017da36149dbd432755 Mon Sep 17 00:00:00 2001 From: Sebatiao Silva Date: Mon, 5 Aug 2013 01:37:18 +0200 Subject: [PATCH 056/145] Translated using Weblate. --- OsmAnd/res/values-pt/strings.xml | 81 +++++++++++++++++++++++--------- 1 file changed, 60 insertions(+), 21 deletions(-) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index 95ff781ab0..926d30f6ba 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -22,7 +22,7 @@ Transporte Indexando endereço… Indexando mapa… - Indexando pontos de interesse… + Indexando POI… Indexando transporte… Erro de entrada/saída km @@ -37,7 +37,7 @@ Para turistas Combustível Pesquisa nome on-line - Leitura do cache de imagens… + Lendo cache de imagens… O índice \'\'{0}\'\' não coube na memória A versão do índice \'\'{0}\'\' não é suportada Instrução de voz não disponível. Por favor, vá até configurações e escolha os dados de voz para download. @@ -72,7 +72,7 @@ Mostrar processamento contínuo ao invés de imagem inteira de uma vez Erro ao exibir a área selecionada Não há memória suficiente para exibir a área selecionada - Usar localização... + Usar localização-… O motor de renderização foi carregado com sucesso Erro: O motor de renderização não foi carregado Renderizadores de vetor @@ -129,7 +129,7 @@ Favoritos Bugs OSM Paradas de transportes - Ponto de Interesse… + POI(Ponto de Interesse)… Fonte dos mapas… Definir exibição Encontre um Ponto de Interesse @@ -169,7 +169,7 @@ O cartão SD está inacessível. \n Será impossível ver mapas ou procurar coisas. O cartão SD está disponivel só para leitura. \nVocê não pode baixar da Internet, só pode visualizar os mapas pré-carregados. - Descomprimindo arquivo... + Descomprimindo arquivo… Virar à direita e continuar em frente Virar bruscamente à direita e continuar em frente Virar levemente à direita e continuar em frente @@ -281,7 +281,7 @@ Voltar ao mapa do OsmAnd Fechar Carregando dados… - Lendo os índices… + Lendo dados locais… Uma execução anterior da aplicação foi interrompida inesperadamente. O arquivo de log encontra-se em {0}. Por favor, informe o problema e inclua o arquivo de log. Salvando trilhas GPX no cartão SD… Concluído @@ -302,8 +302,8 @@ Zoom automático em função da sua velocidade Zoom automático do mapa Outras definições - Escolher ou definir padrões de uso. - Modo da aplicação + Vista do mapa e configurações de navegação são salvos por perfil. Ajuste o seu perfil padrão aqui. + Perfil padrão Configurações Salvar a trilha atual no cartão SD agora Salvar a trilha atual @@ -361,7 +361,7 @@ Escolher uma região na lista Escolher a rua transversal Locais mais próximos - Padrão (também define valores padrão) + Escolha mapa Carro Bicicleta Pedestre @@ -594,7 +594,7 @@ Oceania Mapas globais Worldwide Wikipedia - Pacotes de vozes (gravadas) + Pacotes de vozes (gravadas, funcionalidades limitadas) Pacotes de vozes (TTS) Wikipedia (offline) Definido pelo utilizador @@ -604,7 +604,7 @@ Configurações globais da aplicação Orientação do Mapa - Download successful.\n\t\n\tTo use activate \'Settings\' -> \'Map configuration\' -> \'Offline vector maps\'. + Download bem sucedido.\n\t\n\tAtive para usar: \'Configurações\' -> \'Configuração do Mapa\' -> \'Mapas Offline\'. Modo Dia/Noite Melhorar dados OSM @@ -619,7 +619,7 @@ Tema transparente Biblioteca Nativa não é compatível com este dispositivo. - A iniciar biblioteca nativa… + Inicializando biblioteca nativa… Auto-centrar visualização do mapa Tempo para o mapa ser centrado na posição actual Nunca @@ -653,13 +653,13 @@ Mudar o nome Mostrar no mapa Online Nominatim - A procurar posição… + Procurando posição… Position (Found) Endereço… Favoritos… Sem definir Fixo - Posição actual… + Posição atual… Última vista do mapa Search near : Pesquisar aqui perto @@ -720,7 +720,7 @@ Alterações recentes "Recent changes for 0.6.6 : \n\t- Text To Speech engine for voice navigation \n\t- Make map renderer more detailed \n\t- Basemap for whole world packaged with app \n\t- Tweak offline navigation (still experimental) \n\t- GPX navigation options \n\t- UI update and large bug fixing " Nenhum - A preparar novos dados… + Preparando novos dados… Para usar o serviço de navegação on-line, precisa de uma ligação à Internet. Linguagem não suportada The selected language is not supported by the installed Android TTS (text-to-speech) engine. Do you want to go to the Market to look for another TTS engine? Otherwise the preset TTS language will be used. @@ -728,8 +728,8 @@ No data for the selected language is installed. Do you want to go to the Market to install? Usar destino actual Percorrer toda a rota - Mapa vectorial Offline disponível para esta localização. -\n\t\n\tPara o usar, active \'Menu\' -> \'Definir Vista\' -> \'Origem de Mapa…\' -> \'Mapas Vectoriais Offline\'. + Mapa vetorial Offline disponível para esta localização. +\n\t\n\tPara usar, ative \'Menu\' -> \'Definir Vista\' -> \'Origem de Mapa…\' -> \'Mapas Vetoriais Offline\'. Saída para orientação por voz Escolha o canal para orientação por voz (dependente do sistema) Áudio da chamada de voz @@ -740,7 +740,7 @@ Transparência da Sobreposição Modificar transparência do mapa base Transparência do mapa base - mapa de camada inferior… + Uapa de camada inferior… Mapa de camada inferior Escolha mapa da camada inferior Mapa da camada superior… @@ -813,7 +813,7 @@ Downloading build… Você deseja instalar OsmAnd - {0} de {1} {2} MB ? Retrieving the list of OsmAnd builds failed - Loading OsmAnd builds… + Carregando OsmAnd builds… Select one of the OsmAnd builds to install Special activity for contribution version DDD.DD @@ -1078,7 +1078,8 @@ Aplicação ZXing Barcode Scanner não está instalada. Procurar no Market? Faça uma doação para ver novas funcionalidades implementadas nesta aplicação "\tVocê pode definir se, e como, o mapa será rotacionado clicando repetidamente no ícone da bússola na tela do mapa.\n\tAs opções são:\n\t\'Não girar\' - Mapa ficará fixo sempre com o norte para cima\n\t\'Na direção do movimento\' - Mapa será continuamente alinhado com a sua direção\n\t\'Na direção da bússola\' - Mapa será continuamente alinhado com a leitura da bússola do dispositivo " - "\tA aparência do mapa pode mudar em alguns mapas vetoriais entre os modos Dia (mais claro) e Noite (mais escuro).\n\tCores noturnas são mais seguras para dirigir à noite.\n\tVocê pode definir uma política para a mudança entre os modos Dia/Noite em \'Menu\' -> \'Diversos\' -> \'Modo Dia/Noite\'.\n\n\tAs opções são:\n\t\'Nascer/Pôr-do-Sol\' - modo automático, controlado pela posição do sol (padrão)\n\t\'Dia\' - sempre usar o modo diurno\n\t\'Noite\' - sempre usar o modo noturno\n\t\'Sensor de luz\' - aparência do mapa é controlada por sensor de luz do dispositivo (se equipado) " + "\tA aparência do mapa pode mudar em alguns mapas vetoriais entre os modos Dia (mais claro) e Noite (mais escuro).\n\tCores noturnas são mais seguras para dirigir à noite.\n\tVocê pode definir uma política para a mudança entre os modos Dia/Noite em \'Menu\' -> \'Diversos\' -> \'Modo Dia/Noite\'.\n\tAs opções são:\n\t\'Nascer/Pôr-do-Sol\' - modo automático, controlado pela posição do sol (padrão)\n\t\'Dia\' - sempre usar o modo diurno\n\t\'Noite\' - sempre usar o modo noturno\n\t\'Sensor de luz\' - aparência do mapa é controlada pelo sensor de luz do dispositivo (se houver) " + incompleto Rua Numero de casa @@ -1121,4 +1122,42 @@ Calculadora de Distância e Ferramenta de Planeamento "Criar caminhos (ou usar / modificar arquivos GPX existentes) para medir a distância entre pontos. Se guardar como GPX, pode ser usado para planear rotas GPX." Altitude - Corrigir a medição - + Selecione região: USA, Europa, UK, Asia e Outros + Região + Japão + Estados Unidos + Europa & Ásia + Reino Unido, Índia, Austrália e Outras + Parar OsMoDroid + Iniciar OsMoDroid + Anuncie waypoints GPX + Anuncie… + Configure para anunciar nomes das ruas, avisos de tráfego (paradas obrigatórias, lombadas), avisos de radares, limites de velocidade + Anuncie nome das ruas (TTS) + Anuncie limite de velocidade + Anuncie radares + Anuncie avisos de tráfego + Mudanças na versão 1.5: + \n\tAvisos de voz sobre limites de velocidade e câmeras + \n\tMais voice prompt capabilites(nome de ruas anunciados) + \n\tÍcones de mapas de alta densidade + \n\tMuitas mudanças na interface + \n\tCorreções no display de distância, analizador GPX, manuseio de waypoints, planejando widget, OSM uploading, manuseio em https + + Favor especificar usuário e senha em Configurações + Limpar pontos intermediários + Mantenha pontos intermediários + Você já definiu os pontos intermediários. + Direções Para + Direções a partir De + Mapa: + Lat %1$.3f, lon %2$.3f + Para: + Via: + A partir: + \nTempo em movimento: %1$d:%2$02d:%3$02d + \nTime parado: %1$d:%2$02d:%3$02d + Destino %1$s + Defina como destino + Selecione cidade ou rua primeiro + From b3f4f78bbc04b25d2a5b56bcbe0e63f7016fddd6 Mon Sep 17 00:00:00 2001 From: Ivan Cup Date: Mon, 5 Aug 2013 01:23:14 +0200 Subject: [PATCH 057/145] Translated using Weblate. --- OsmAnd/res/values-ru/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 8159a261d3..1133bf4ac3 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1257,4 +1257,12 @@ Карта: Пароль OSM (опционально) \nВремя в пути: %1$d:%2$02d:%3$02d - + Выберите регион: США, Европа, Англия, Азия и т.д. + Регион + Япония + США + Европа и Азия + Англия, Индия, Австралия и др. + Маршрут к + Маршрут от + From 536c0b9fd6dae15f90091f129b066263529f6b6d Mon Sep 17 00:00:00 2001 From: Sebatiao Silva Date: Mon, 5 Aug 2013 01:46:11 +0200 Subject: [PATCH 058/145] Translated using Weblate. --- OsmAnd/res/values-pt/strings.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index 926d30f6ba..72f1137aa6 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -1160,4 +1160,21 @@ Destino %1$s Defina como destino Selecione cidade ou rua primeiro + Mudanças na versão 1.4: + \n\t* Otimize ordenação de waypoints para visitá-los (vendedor itinerante, porta a porta) + \n\t* Procure rua por nome (na vizinhança) + \n\t* Planning mode plugin (carregue/edite/salve GPX tracks) + \n\t* Nova tela de download (download em background) + \n\t* Suporte de GPX subdiretórios (organize suas rotas GPX) + \n\t* Apague arquivos SRTM + \n\t* Suporte de Notas + + Procure rua nas cidades vizinhas + Waypoints intermediários reordenados para otimizar sua ordem no caminho para o destino. + Ordene(porta a porta) + Toque para marcar um pont.\n +Pressione e segure no mapa para apagar pontos anteriores.\n +Pressione e segure no ponto para ver e anexar descrição.\n +Clique no widget de medição para ver mais ações. + Não mostrar novamente From f8e10a18464731e2c74f43be3ca704410b4d65a3 Mon Sep 17 00:00:00 2001 From: Sebatiao Silva Date: Mon, 5 Aug 2013 01:46:38 +0200 Subject: [PATCH 059/145] Translated using Weblate. --- OsmAnd/res/values-pt/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index 72f1137aa6..380c4d9aaa 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -1177,4 +1177,5 @@ Pressione e segure no mapa para apagar pontos anteriores.\n Pressione e segure no ponto para ver e anexar descrição.\n Clique no widget de medição para ver mais ações. Não mostrar novamente + Comece edição From 52da4a00c37ff74da133442ce250d0a21cdcd67a Mon Sep 17 00:00:00 2001 From: Bennie D Date: Mon, 5 Aug 2013 11:59:00 +0200 Subject: [PATCH 060/145] Translated using Weblate. --- OsmAnd/res/values-af/strings.xml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml index 87b8aebb8c..3d4de0f0c8 100644 --- a/OsmAnd/res/values-af/strings.xml +++ b/OsmAnd/res/values-af/strings.xml @@ -222,8 +222,8 @@ Oseanië Wêreldwye en onderwerp kaarte Wêreldwye Wikipedia - Stem pakkette (opgeneem) - Stem pakkette (TTS) + Stem pakkette (opgeneem, beperkte funksies) + Stem pakkette (TTS-sintese, verkies) Wikipedia (aflyn) gebruiker gedefinieerde Lêer met voorheen uitgevoerde gunstelinge bestaan reeds. Wil jy dit vervang? @@ -446,7 +446,7 @@ Om die ligging te sien volg die webskakel %1$s of Android opsetskakel %2$s Deel ligging Deel ligging - Roetebaken \'\'{0}\'\' was suksesvol bygevoeg + GPX Roetebaken \'\'{0}\'\' was suksesvol bygevoeg Voeg roetebaken by tot opgeneemde GPX spoor Voeg GPX roetebaken by Administratief @@ -610,7 +610,7 @@ Filter Klank is aan Klank is af - Kies stem begeleiding vir navigasie + Kies stem begeleiding vir navigasie (taalkodes sien ISO 639-1) Stem begeleiding Stem inligting gereedmaak… Die weergawe van stem inligting word nie ondersteun nie @@ -1256,7 +1256,8 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass Kondig verkeerswaarskuwings aan Veranderings in 1.5: \n\t* Stem waarskuwings oor spoed beperkings en kameras - \n\t* Hoë ditheid kaart simbole + \n\t* Hoë digtheid kaart simbole + \n\t* Meer stem vermoëns (straat-naam aankondiging) \n\t* Baie UI veranderings \n\t* Bugfixes in afstand vertoon, GPX analiseerder, oorgangspunt hantering, beplanning funksie, OSM oplaai, https hantering @@ -1277,4 +1278,11 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass Kondig straatname aan(TTS) Staak OsMoDroid Begin OsMoDroid - + Kies Bestuur Streek: VSA, Europa, VK, Asië en Ander + Bestuur Streek + Japan + Verenigde State van Amerika + Kanada + Europa & Asië + VK, Indië, Australië & Ander + From 4df632b3490be1e6442f0550f9f2a5cf7b3ad6c9 Mon Sep 17 00:00:00 2001 From: Ludek M Date: Mon, 5 Aug 2013 08:43:38 +0200 Subject: [PATCH 061/145] Translated using Weblate. --- OsmAnd/res/values-cs/strings.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-cs/strings.xml b/OsmAnd/res/values-cs/strings.xml index 530b94eab8..76499f6653 100644 --- a/OsmAnd/res/values-cs/strings.xml +++ b/OsmAnd/res/values-cs/strings.xml @@ -1293,9 +1293,14 @@ Navigovat odsud \nČas pohybu: %1$d:%2$02d:%3$02d Zastavit OsMoDroid - Sppustit OsMoDroid + Spustit OsMoDroid Hlásit GPX body Hlásit… Konfigurace hlášení názvů ulic, dopravních upozornění, radarů, rychlostních omezení Hlásit názvy ulic (TTS) - + Japonsko + Spojené státy + Kanada + Evropa a Asie + Británie, Indie, Austrálie a ostatní + From 350b6de5a30c975f87539e14f74d390a760f5bed Mon Sep 17 00:00:00 2001 From: jan madsen Date: Mon, 5 Aug 2013 05:25:02 +0200 Subject: [PATCH 062/145] Translated using Weblate. --- OsmAnd/res/values-da/strings.xml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 0ea9cfc493..c567305242 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1245,7 +1245,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Gade By Vælg adresse - Vælg stemme til navigation + Vælg talevejledning til navigation (sprogkode se ISO 639-1) Stoppested Stoppesteder OsmAnd er et navigationsprogram med mange funktioner. @@ -1567,4 +1567,11 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Meddel om GPX-rutepunkter Start OsMoDroid Stop OsMoDroid - + Japan + USA + Canada + Europa & Asien + Storbritannien, Indien, Australien m.fl. + Kørselregion + Vælg kørselregion: USA, Europa, England, Asien m.fl. + From dc781cf47135017087561cca45e13ea59b632342 Mon Sep 17 00:00:00 2001 From: Rodolfo de Vries Date: Mon, 5 Aug 2013 09:24:05 +0200 Subject: [PATCH 063/145] Translated using Weblate. --- OsmAnd/res/values-nl/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index 755a74730f..d125857c06 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -1521,4 +1521,11 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Straatnamen aankondigen (TTS) OsMoDroid stoppen OsMoDroid starten - + Selecteer reis-regio: VS, Europa, GB, Azië en andere + Reis-regio + Japan + Verenigde Staten + Canada + Europa en Azië + GB, India, Australië en andere + From 8ee772237f78af26e2ff97e33784373f0d361e73 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 5 Aug 2013 10:13:39 +0200 Subject: [PATCH 064/145] Translated using Weblate. --- OsmAnd/res/values-it/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index e75c4f8a3f..0a24531fac 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1350,4 +1350,11 @@ Annuncia i punti GPX di passaggio Ferma OsMoDroid Avvia OsMoDroid - + Scegliete la regione di guida: USA, Europa, UK, Asia e Altre + Regione di guida + Giappone + Stati Uniti + Canada + Europa & Asia + UK, India, Australia e Altri + From a42958d2a0853447603662e0b46d6adb607fc1b3 Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Mon, 5 Aug 2013 02:01:37 +0200 Subject: [PATCH 065/145] Translated using Weblate. --- OsmAnd/res/values-pl/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 0a91d77c2b..03039aafed 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -377,7 +377,7 @@ Filtr Wyłącz dźwięk Włącz dźwięk - Wybierz głos nawigatora + Wybierz głos nawigatora (oznaczenia języków ISO 639-1) Głos nawigatora Inicjowanie danych głosowych… Niewspierana wersja danych głosowych @@ -1316,4 +1316,5 @@ Wielka Brytania, Indie, Australia i inne Wybierz region, w którym będziesz się poruszał: Stany Zjednoczone, Europa, Wielka Brytania, Azja i inne Region poruszania się + Kanada From 3296fdd557f6df56ba43bb66e7714b379db9f2f0 Mon Sep 17 00:00:00 2001 From: Sebatiao Silva Date: Mon, 5 Aug 2013 03:26:00 +0200 Subject: [PATCH 066/145] Translated using Weblate. --- OsmAnd/res/values-pt/strings.xml | 118 ++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index 380c4d9aaa..100ff1ecba 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -941,7 +941,9 @@ GPS intervalo de despertar: %s Contínuo e-mail -" OsmAnd (Direções OSM automatizados de navegação) O OsmAnd é uma aplicação de navegação livre com acesso a uma ampla variedade de dados OpenStreetMap (OSM) globais. Todos os dados de mapas (mapas vetoriais ou telha) podem ser armazenados no cartão de memória do telefone para uso offline. O OsmAnd também oferece roteamento offline e online, incluindo a funcionalidade de roteamento curva-a-curva com orientação por voz. Algumas das características principais: - Completa funcionalidade offline (guarda os mapas baixados, sejam eles vetoriais ou imagens, em uma pasta selecionável) - Mapas vetoriais compactados para o mundo inteiro disponíveis - Faça o download de mapas de países ou regiões diretamente do aplicativo - Sobreposição de camadas de mapas diversos, como GPX ou trilhas de navegação, Pontos de Interesse, favoritos, curvas de nível, paragens de transportes públicos, mapas adicionais com transparência personalizável - Pesquisa offline para endereços e locais (POIs) - Encaminhamento offline para distâncias curtas (experimental) - Carro, bicicleta, e os modos de pedestres com: - Opcional vista de dia/noite automático de comutação - Mapa em função da velocidade opcional zoom - Alinhamento mapa opcional de acordo com bússola ou direção do movimento - Orientação pista opcional, display de limite de velocidade, registradas e vozes TTS Limitações desta versão gratuita de OsmAnd: - Número de downloads de mapa limitado - Sem acesso a Wikipedia off-line POIs OsmAnd está sendo ativamente desenvolvida e nosso projeto e seu progresso depende ainda contribuições financeiras para financiar o desenvolvimento e testdriving novas funcionalidades. Por favor, considere a compra de OsmAnd, ou ajude a financiar novas funcionalidades específicas ou fazer uma doação no osmand.net." + + " OsmAnd (Direções OSM automatizados de navegação) O OsmAnd é uma aplicação de navegação livre com acesso a uma ampla variedade de dados OpenStreetMap (OSM) globais. Todos os dados de mapas (mapas vetoriais ou telha) podem ser armazenados no cartão de memória do telefone para uso offline. O OsmAnd também oferece roteamento offline e online, incluindo a funcionalidade de roteamento curva-a-curva com orientação por voz. Algumas das características principais: - Completa funcionalidade offline (guarda os mapas baixados, sejam eles vetoriais ou imagens, em uma pasta selecionável) - Mapas vetoriais compactados para o mundo inteiro disponíveis - Faça o download de mapas de países ou regiões diretamente do aplicativo - Sobreposição de camadas de mapas diversos, como GPX ou trilhas de navegação, Pontos de Interesse, favoritos, curvas de nível, paragens de transportes públicos, mapas adicionais com transparência personalizável - Pesquisa offline para endereços e locais (POIs) - Encaminhamento offline para distâncias curtas (experimental) - Carro, bicicleta, e os modos de pedestres com: - Opcional vista de dia/noite automático de comutação - Mapa em função da velocidade opcional zoom - Alinhamento mapa opcional de acordo com bússola ou direção do movimento - Orientação pista opcional, display de limite de velocidade, registradas e vozes TTS Limitações desta versão gratuita de OsmAnd: - Número de downloads de mapa limitado - Sem acesso a Wikipedia off-line POIs OsmAnd está sendo ativamente desenvolvida e nosso projeto e seu progresso depende ainda contribuições financeiras para financiar o desenvolvimento e testdriving novas funcionalidades. Por favor, considere a compra de OsmAnd, ou ajude a financiar novas funcionalidades específicas ou fazer uma doação no osmand.net." + Selecione um esquema de cores de estrada: Esquema de cores Ver direção para o destino @@ -1178,4 +1180,116 @@ Pressione e segure no ponto para ver e anexar descrição.\n Clique no widget de medição para ver mais ações. Não mostrar novamente Comece edição - + Finalize edição + Comece uma nova subrota + Apagar os pontos + Salve como GPX + Abrir GPX + Aguarde até que a tarefa esteja concluída + Use filtro Kalman para evitar aberrações na bússola + Use filtro Kalman + Modo de acessibilidade: selecione o destino primeiro + use o sensor magnético para determinar a direção da bússola em vez do sensor de orientação + Use sensor magnético + Outro + Dados de linhas de contorno + Plugin OsMoDroid é uma extensão do OsmAnd para aplicaçao OsModroid para online tracking. Mais informações sobre o serviço em http://esya.ru. + \tMaioria dos dispositivos GPS reportam medidas de altitude no sistema de referência elipsoidal WGS84, para o qual a conversão para sistemas usados localmente requerem a correção dependente de posição. + \n\tUma melhor aproximação para esses sistmas locais é a referêncai EGM96. OsmAnd agora tamb[em suporta a exibição automática de altitudes no sistema EGM96. + \n\tPara obtê-lo, façao o download do arquivo WW15MGH.DAC via Gerenciamento de Dados (original em http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC). + + GPX + Mapas OsmAnd & Navegação + +OsmAnd (OSM Automated Navigation Directions) is a map and navigation application with access to the free, worldwide, and high-quality OpenStreetMap (OSM) data. All map data can be stored on your device\'s memory card for offline use. Via your device\'s GPS, OsmAnd offers routing, with optical and voice guidance, for car, bike, and pedestrian. All the main functionalities work both online and offline (no internet needed). + +Algumas das principais funcionalidades: + +navegação + - Funciona online (rápido) ou offline (sem taxas de dados quando você está viajando) + - Turn-by-turn voice guidance (recorded and synthesized voices) + - Optional lane guidance, street name display, and estimated time of arrival + - Suporta pontos intermedi[arios em seu itinerário + - Automatic re-routing whenever you deviate from the route + - Search for places by address, by type (e.g.: restaurant, hotel, gas station, museum), or by geographical coordinates + +Map Viewing + - Display your position and orientation on the map + - Optionally align the map according to compass or your direction of motion + - Save your most important places as Favorites + - Display POIs (point of interests) around you + - Can display specialized online tile maps + - Can display satellite view (from Bing) + - Can display different overlays like touring/navigation GPX tracks and additional maps with customizable transparency + - Optionally display place names in English, local, or phonetic spelling + +Use OpenStreetMap and Wikipedia Data: + - High quality information from the best collaborative projects of the world + - Global maps from OpenStreetMap, available per country or region + - Wikipedia POIs, great for sightseeing (not available in free version) + - Unlimited free download, directly from the app (download limit 16 map files in free version) + - Always up-to-date maps (updated at least once a month) + - Compact offline vector maps + - Select between complete map data and just road network (Example: All of Japan is 700 MB, or 200 MB for the road network only) + - Also supports online or cached tile maps + +Safety Features + - Optional automated day/night view switching + - Optional speed limit display, with reminder if you exceed it + - Optional speed-dependent map zooming + - Share your location so that your friends can find you + +Bicycle and Pedestrian Features + - The maps include foot, hiking, and bike paths, great for outdoor activities + - Special routing and display modes for bike and pedestrian + - Optional public transport stops (bus, tram, train) including line names + - Optional trip recording to local GPX file or online service + - Optional speed and altitude display + - Display of contour lines and hill-shading (via additional plugin) + +Contribua para OpenStreetMap + - Reporte erros nos mapas + - Upload GPX tracks to OSM directly from the app + - Add POIs and directly upload them to OSM (or later if offline) + - Optional trip recording also in background mode (while device is in sleep mode) + +OsmAnd is open source and actively being developed. Everyone can contribute to the application by reporting bugs, improving translations, or coding new features. The project is in a lively state of continuous improvement by all these forms of developer and user interaction. The project progress also relies on financial contributions to fund the development, coding, and testing of new functionalities. By buying OsmAnd+ you help the application to be even more awesome! It is also possible to fund specific new features, or to make a general donation on osmand.net. + + +Cobertura de mapa e qualidade aproximada: + - Western Europe: **** + - Eastern Europe: *** + - Russia: *** + - North America: *** + - South America: ** + - Asia: ** + - Japan & Korea: *** + - Middle East: ** + - Africa: ** + - Antarctica: * + +Lista de países (basicamente, o mundo todo!): +Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bonaire, Bosnia and Herzegovina, Botswana, Brazil, British Virgin Islands, Brunei, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Central African Republic, Chad, Chile, China, Colombia, Comoros, Congo, Costa Rica, Ivory Coast, Croatia, Cuba, Curaçao, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Fiji, Finland, France, French Guiana, French Polynesia, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Vatican, Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, North Korea and South Korea, Kuwait, Kyrgyzstan, Laos, Latvia, Lebanon, Lesotho, Liberia, Libya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands, Netherlands Antilles, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Poland, Portugal, Puerto Rico, Qatar, Romania, Russia, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia, Slovenia, Somalia, South Africa, South Georgia, South Sudan, Spain, Sri Lanka, Sudan, Suriname, Swaziland, Sweden, Switzerland, Syria, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom (UK), United States of America (USA), Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe. + + Mapas OsmAnd+ & Navegação + \tO caminho dos mapas e camadas mostradas são mudados via \'Menu\' -> \'Definir vista\' em vista de mapa. +\n\tem \'Caminho dos maps…\' você pode escolhe usar os mapas vetoriais offline pré-carregados, predefined (online) tile sources (ative o plugin \'Online and tile maps\' para isso), ou mapas criados manualmente usando, por exemplo OsmAndMapCreator em um PC. +→→\n\tOsmAnd também suporta fontes customizadas. + + \tOsmAnd suporta diferentes (personalizáveis) perfis de aplicação para diferentes ussos. +\n\tVocê pode mudar os perfis via botão perfil no canto inferior esquerdo da tela do mapa (ícone do carro, bicicleta ou pedestre) ou quando criando uma rota. + + Fazendo o download… + Password do OSM (opcional) + Tipo de foco da câmera + Selecione o tipo de foco da câmera interna + Auto foco + Foco hiperfocal + Profundidade de visão estendida + Foco está definido no infinito + Foco Macro (close-up) + A câmera tenta focalizar continuamente + Emita som ao tirar foto + Escolha se emitir som quando tirar fotos +Canadá + From 6597f74c81e259a9728f6be71179b2199c69e170 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Mon, 5 Aug 2013 03:33:25 +0200 Subject: [PATCH 067/145] Translated using Weblate. --- OsmAnd/res/values-zh-rTW/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index c364c7e8a4..c24ea21e29 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1530,4 +1530,11 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 通報街道名稱 (TTS) 停止 OsMoDroid 啟動 OsMoDroid - + 選擇駕駛區域：美國、歐洲、英國、亞洲和其他 + 日本 + 美國 + 加拿大 + 歐洲和亞洲 + 英國、印度、澳大利亞和其他 + 駕駛區域 + From 981233232239f26b19d4642500aa8a2e54fe0ecb Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 18:30:49 +0200 Subject: [PATCH 068/145] Add name rendering --- .../RenderingRuleStorageProperties.java | 3 +++ .../net/osmand/plus/render/TextRenderer.java | 24 ++++++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java index 5ef95b1401..03073aeb57 100644 --- a/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java +++ b/OsmAnd-java/src/net/osmand/render/RenderingRuleStorageProperties.java @@ -18,6 +18,7 @@ public class RenderingRuleStorageProperties { public static final String TEXT_LENGTH = "textLength"; public static final String NAME_TAG = "nameTag"; + public static final String NAME_TAG2 = "nameTag2"; public static final String TEXT_SHIELD = "textShield"; public static final String SHADOW_RADIUS = "shadowRadius"; public static final String SHADOW_COLOR = "shadowColor"; @@ -76,6 +77,7 @@ public class RenderingRuleStorageProperties { public RenderingRuleProperty R_ATTR_STRING_VALUE; public RenderingRuleProperty R_TEXT_LENGTH; public RenderingRuleProperty R_NAME_TAG; + public RenderingRuleProperty R_NAME_TAG2; public RenderingRuleProperty R_TEXT_SHIELD; public RenderingRuleProperty R_SHADOW_RADIUS; public RenderingRuleProperty R_SHADOW_COLOR; @@ -159,6 +161,7 @@ public class RenderingRuleStorageProperties { R_TEXT_LENGTH = registerRuleInternal(RenderingRuleProperty.createInputIntProperty(TEXT_LENGTH)); R_NAME_TAG = registerRuleInternal(RenderingRuleProperty.createInputStringProperty(NAME_TAG)); + R_NAME_TAG2 = registerRuleInternal(RenderingRuleProperty.createOutputStringProperty(NAME_TAG2)); R_DISABLE = registerRuleInternal(RenderingRuleProperty.createOutputBooleanProperty(DISABLE)); R_ATTR_INT_VALUE = registerRuleInternal(RenderingRuleProperty.createOutputIntProperty(ATTR_INT_VALUE)); diff --git a/OsmAnd/src/net/osmand/plus/render/TextRenderer.java b/OsmAnd/src/net/osmand/plus/render/TextRenderer.java index c669e129b9..884e3f70e4 100644 --- a/OsmAnd/src/net/osmand/plus/render/TextRenderer.java +++ b/OsmAnd/src/net/osmand/plus/render/TextRenderer.java @@ -15,6 +15,7 @@ import net.osmand.data.QuadTree; import net.osmand.plus.render.OsmandRenderer.RenderingContext; import net.osmand.render.RenderingRuleSearchRequest; import net.osmand.render.RenderingRulesStorage; +import net.osmand.util.Algorithms; import net.sf.junidecode.Junidecode; import android.content.Context; import android.graphics.Bitmap; @@ -303,15 +304,32 @@ public class TextRenderer { } } - private void createTextDrawInfo(BinaryMapDataObject o, RenderingRuleSearchRequest render, RenderingContext rc, TagValuePair pair, float xMid, float yMid, - Path path, PointF[] points, String name, String tagName) { + private void createTextDrawInfo(final BinaryMapDataObject o, RenderingRuleSearchRequest render, RenderingContext rc, TagValuePair pair, final float xMid, float yMid, + Path path, final PointF[] points, String name, String tagName) { render.setInitialTagValueZoom(pair.tag, pair.value, rc.zoom, o); render.setIntFilter(render.ALL.R_TEXT_LENGTH, name.length()); render.setStringFilter(render.ALL.R_NAME_TAG, tagName); if(render.search(RenderingRulesStorage.TEXT_RULES)){ if(render.getIntPropertyValue(render.ALL.R_TEXT_SIZE) > 0){ - TextDrawInfo text = new TextDrawInfo(name); + final TextDrawInfo text = new TextDrawInfo(name); text.fillProperties(render, xMid, yMid); + final String tagName2 = render.getStringPropertyValue(render.ALL.R_NAME_TAG2); + if (!Algorithms.isEmpty(tagName2)) { + o.getObjectNames().forEachEntry(new TIntObjectProcedure() { + @Override + public boolean execute(int tagid, String nname) { + String tagNameN2 = o.getMapIndex().decodeType(tagid).tag; + if (tagName2.equals(tagNameN2)) { + if (nname != null && nname.trim().length() > 0) { + text.text += " " + nname; + } + return false; + } + return true; + } + }); + + } paintText.setTextSize(rc.getDensityValue(text.textSize)); Rect bs = new Rect(); paintText.getTextBounds(name, 0, name.length(), bs); From 879df0992ebd6778c15141ba145550d5ba2bfeaa Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 20:18:03 +0200 Subject: [PATCH 069/145] Add fps measurement --- .../net/osmand/plus/views/OsmandMapTileView.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java index f0f44f64b3..1a0cc9202c 100644 --- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java +++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java @@ -34,6 +34,7 @@ import android.graphics.Rect; import android.graphics.RectF; import android.os.Handler; import android.os.Message; +import android.os.SystemClock; import android.util.AttributeSet; import android.util.DisplayMetrics; import android.util.FloatMath; @@ -51,6 +52,9 @@ import android.widget.Toast; public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCallback, Callback { protected final static int LOWEST_ZOOM_TO_ROTATE = 10; + private static boolean MEASURE_FPS = true; + private int fpsMeasureCount = 0; + private int fpsMeasureMs = 0; protected static final int emptyTileDivisor = 16; @@ -489,7 +493,7 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall private void refreshMapInternal(boolean updateVectorRendering) { handler.removeMessages(1); - + long ms = SystemClock.elapsedRealtime(); // long time = System.currentTimeMillis(); boolean useInternet = getSettings().USE_INTERNET_TO_DOWNLOAD_TILES.get(); @@ -529,6 +533,15 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall } } } + if(MEASURE_FPS) { + fpsMeasureMs += SystemClock.elapsedRealtime() - ms; + fpsMeasureCount ++; + if(fpsMeasureCount > 4) { + log.debug("FPS speed " + (1000*fpsMeasureCount/fpsMeasureMs)); + fpsMeasureCount = 0; + fpsMeasureMs = 0; + } + } } private void drawOverMap(Canvas canvas, RectF latlonRect, RectF tilesRect, DrawSettings drawSettings) { From d183c2b8ae11d02754e447693d6114e3c514e940 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 20:43:13 +0200 Subject: [PATCH 070/145] Introduce measure fps widget --- OsmAnd/res/values/strings.xml | 2 +- .../development/OsmandDevelopmentPlugin.java | 39 +++++++++++++++++-- .../osmand/plus/views/OsmandMapTileView.java | 38 +++++++++++------- 3 files changed, 62 insertions(+), 17 deletions(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 6f83c8f9bb..aed3454584 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,7 +9,7 @@ 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 --> - + FPS info Select Driving Region : US, Europe, UK, Asia and Others Driving Region Japan diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java index a48b6a4d70..1971099072 100644 --- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java +++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java @@ -1,10 +1,18 @@ package net.osmand.plus.development; +import java.util.EnumSet; + +import net.osmand.plus.ApplicationMode; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.activities.SettingsActivity; +import net.osmand.plus.audionotes.AudioNotesLayer; +import net.osmand.plus.views.MapInfoLayer; +import net.osmand.plus.views.OsmandMapLayer.DrawSettings; +import net.osmand.plus.views.OsmandMapTileView; +import net.osmand.plus.views.mapwidgets.TextInfoWidget; import android.content.Intent; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; @@ -13,6 +21,7 @@ import android.preference.PreferenceScreen; public class OsmandDevelopmentPlugin extends OsmandPlugin { private static final String ID = "osmand.development"; private OsmandApplication app; + private TextInfoWidget fps; public OsmandDevelopmentPlugin(OsmandApplication app) { this.app = app; @@ -35,6 +44,33 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin { public String getName() { return app.getString(R.string.debugging_and_development); } + + @Override + public void registerLayers(MapActivity activity) { + registerWidget(activity); + } + + + private void registerWidget(MapActivity activity) { + MapInfoLayer mapInfoLayer = activity.getMapLayers().getMapInfoLayer(); + final OsmandMapTileView mv = activity.getMapView(); + if (mapInfoLayer != null) { + fps = new TextInfoWidget(activity, 0, mapInfoLayer.getPaintText(), mapInfoLayer.getPaintSubText()) { + @Override + public boolean updateInfo(DrawSettings drawSettings) { + if(!mv.isMeasureFPS()) { + mv.setMeasureFPS(true); + } + setText(Float.toString(mv.getFPS()), "FPS"); + return true; + } + }; + mapInfoLayer.getMapInfoControls().registerSideWidget(fps, 0, + R.string.map_widget_fps_info, "fps", false, EnumSet.allOf(ApplicationMode.class), + EnumSet.noneOf(ApplicationMode.class), 30); + mapInfoLayer.recreateControls(); + } + } @Override public void settingsActivityCreate(final SettingsActivity activity, PreferenceScreen screen) { @@ -51,7 +87,4 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin { screen.addPreference(grp); } - @Override - public void registerLayers(MapActivity activity) { - } } diff --git a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java index 1a0cc9202c..f716822829 100644 --- a/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java +++ b/OsmAnd/src/net/osmand/plus/views/OsmandMapTileView.java @@ -52,9 +52,11 @@ import android.widget.Toast; public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCallback, Callback { protected final static int LOWEST_ZOOM_TO_ROTATE = 10; - private static boolean MEASURE_FPS = true; + private boolean MEASURE_FPS = false; private int fpsMeasureCount = 0; private int fpsMeasureMs = 0; + private long fpsFirstMeasurement = 0; + private float fps; protected static final int emptyTileDivisor = 16; @@ -494,8 +496,6 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall private void refreshMapInternal(boolean updateVectorRendering) { handler.removeMessages(1); long ms = SystemClock.elapsedRealtime(); - // long time = System.currentTimeMillis(); - boolean useInternet = getSettings().USE_INTERNET_TO_DOWNLOAD_TILES.get(); if (useInternet) { if(application != null) { @@ -521,29 +521,41 @@ public class OsmandMapTileView extends SurfaceView implements IMapDownloaderCall latlonRect.left = (float) MapUtils.getLongitudeFromTile(nzoom, tilesRect.left); latlonRect.bottom = (float) MapUtils.getLatitudeFromTile(nzoom, tilesRect.bottom); latlonRect.right = (float) MapUtils.getLongitudeFromTile(nzoom, tilesRect.right); - if(nightMode){ + if (nightMode) { canvas.drawARGB(255, 100, 100, 100); } else { canvas.drawARGB(255, 225, 225, 225); } drawOverMap(canvas, latlonRect, tilesRect, new DrawSettings(nightMode, updateVectorRendering)); -// log.info("Draw with layers " + (System.currentTimeMillis() - time)); } finally { holder.unlockCanvasAndPost(canvas); } } - } - if(MEASURE_FPS) { - fpsMeasureMs += SystemClock.elapsedRealtime() - ms; - fpsMeasureCount ++; - if(fpsMeasureCount > 4) { - log.debug("FPS speed " + (1000*fpsMeasureCount/fpsMeasureMs)); - fpsMeasureCount = 0; - fpsMeasureMs = 0; + if (MEASURE_FPS) { + fpsMeasureMs += SystemClock.elapsedRealtime() - ms; + fpsMeasureCount++; + if (fpsMeasureCount > 10 || (ms - fpsFirstMeasurement) > 400) { + fpsFirstMeasurement = ms; + fps = (1000f * fpsMeasureCount / fpsMeasureMs); + fpsMeasureCount = 0; + fpsMeasureMs = 0; + } } } } + public boolean isMeasureFPS() { + return MEASURE_FPS; + } + + public void setMeasureFPS(boolean measureFPS) { + MEASURE_FPS = measureFPS; + } + + public float getFPS(){ + return fps; + } + private void drawOverMap(Canvas canvas, RectF latlonRect, RectF tilesRect, DrawSettings drawSettings) { int w = getCenterPointX(); int h = getCenterPointY(); From f1f9f6d498a174ee36c88a30fe9dc67d8c4441e0 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 20:45:06 +0200 Subject: [PATCH 071/145] Introduce measure fps widget --- .../net/osmand/plus/development/OsmandDevelopmentPlugin.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java index 1971099072..7451548ad0 100644 --- a/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java +++ b/OsmAnd/src/net/osmand/plus/development/OsmandDevelopmentPlugin.java @@ -61,12 +61,12 @@ public class OsmandDevelopmentPlugin extends OsmandPlugin { if(!mv.isMeasureFPS()) { mv.setMeasureFPS(true); } - setText(Float.toString(mv.getFPS()), "FPS"); + setText(Integer.toString((int) mv.getFPS()), "FPS"); return true; } }; mapInfoLayer.getMapInfoControls().registerSideWidget(fps, 0, - R.string.map_widget_fps_info, "fps", false, EnumSet.allOf(ApplicationMode.class), + R.string.map_widget_fps_info, "fps", false, EnumSet.noneOf(ApplicationMode.class), EnumSet.noneOf(ApplicationMode.class), 30); mapInfoLayer.recreateControls(); } From d2264e3b5b1dac75936751bb4020c0ca352d7b38 Mon Sep 17 00:00:00 2001 From: Kristian Dahl Date: Mon, 5 Aug 2013 18:06:04 +0200 Subject: [PATCH 072/145] Translated using Weblate. --- OsmAnd/res/values-nb/bidforfix.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-nb/bidforfix.xml b/OsmAnd/res/values-nb/bidforfix.xml index 81fcead2f0..dade9abe1e 100644 --- a/OsmAnd/res/values-nb/bidforfix.xml +++ b/OsmAnd/res/values-nb/bidforfix.xml @@ -1,3 +1,5 @@ - - - \ No newline at end of file + +Laster + %1$d Støttespillere + finansiert: %d%% + From 73a91a63401e4610aa845cd0225badae7f16f467 Mon Sep 17 00:00:00 2001 From: Bert Massop Date: Mon, 5 Aug 2013 18:03:26 +0200 Subject: [PATCH 073/145] Translated using Weblate. --- OsmAnd/res/values-nl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index d125857c06..27be5a5ac9 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -1521,8 +1521,8 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Straatnamen aankondigen (TTS) OsMoDroid stoppen OsMoDroid starten - Selecteer reis-regio: VS, Europa, GB, Azië en andere - Reis-regio + Selecteer reisregio: VS, Europa, GB, Azië en andere + Reisregio Japan Verenigde Staten Canada From 2338ec3587a75b7561c66da30e1ed35ec1c9103c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20B=C3=A1thory?= Date: Mon, 5 Aug 2013 18:33:29 +0200 Subject: [PATCH 074/145] Translated using Weblate. --- OsmAnd/res/values-hu/strings.xml | 53 ++++++++++++++++++++++---------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 6a9ee38161..604c1c7912 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1,4 +1,5 @@ -"A 0.7.2 kiadás változásai: + +"A 0.7.2 kiadás változásai: \n\t- Natív renderelő minden eszközre \n\t- Offline POI szerkesztés \n\t- Akadálymentesítés @@ -115,8 +116,8 @@ Óceánia Világtérkép, tematikus térképek Wikipédia - Hang csomagok (felvett) - Hang csomagok (gépi hang) + Hang csomagok (felvett, korlátozott lehetőségek) + Hang csomagok (TTS gépi hang, ajánlott) Wikipédia (offline) Személyre szabható A kedvencekből létezik már mentés. Le szeretnéd cserélni? @@ -346,10 +347,10 @@ mi Hely megosztásának módja Hely : %1$s\n%2$s - A hely megjelenítéséhez kattints a %1$s linkre a webböngészőben vagy az Androidra szánt linkre %2$s\n\nTo see location follow the web browser link %1$s or android intent link %2$s + A hely megjelenítéséhez kattints a %1$s linkre a webböngészőben vagy az Androidra szánt linkre %2$s Hely pozíció elküldése Hely megosztása - Sikeres útpont felvétel: \'\'{0}\'\' + Sikeres GPX útpont felvétel: \'\'{0}\'\' Útpont hozzáadása a felvett GPX útvonalhoz GPX útpont hozzáadás Adminisztráció @@ -358,7 +359,7 @@ Vészhelyzet Szórakoztatás Pénzügy - Geocache + Geocaching Egészségügy Történelem Terület @@ -417,7 +418,7 @@ Éjjel/nappali mód {0} fájl letöltés ({1} MB)? {0} elem lett kijelölve - Szűrő:\nletöltve + Letöltöttek Kijelölés megszüntetése Mindet kijelöl Újratölt @@ -458,7 +459,7 @@ GPX adat olvasási hiba Vektoros OSM térkép Közlekedés keresése a célnál - Hely:\n szélesség %1$.5f, hosszúság %2$.5f + Hely:\n szélesség %1$.5f\n hosszúság %2$.5f Hiba POI módosítás POI törlés @@ -514,7 +515,7 @@ Szűrő Hang bekapcsolva Némítva - Hangutasítás kiválasztása navigációhoz + Hangutasítás kiválasztása navigációhoz (nyelvkódokhoz lásd ISO 639-1) Hangutasítás Beszédadat előkészítése… Nem támogatott beszédadat @@ -568,8 +569,8 @@ Nem lehet a POI-kat frissíteni kis nagyítás mellett POI-k frissítése Biztos, hogy a helyi adatokat internetről frissíti? - Település:\n {0} - Utca:\n {0}, {1} + Település: {0} + Utca: {0}, {1} Kereszteződés: {0} és {1}, {2} Épület: {0}, {1}, {2} Kedvenc @@ -960,10 +961,12 @@ \n\t\'Napkelte/Napnyugta\' - automatikus mód, a Nap helyzetének megfelelően (alapértelmezett) \n\t\'Nappal\' - mindig a nappali színek használata \n\t\'Éjjel\' - mindig az éjjeli színek használata -\n\t\'Fényérzékelő szenzor\' - a térkép az eszköz fényérzékelője alapján vált a színek között (ha az eszköz tartalmaz ilyent) " +\n\t\'Fényérzékelő szenzor\' - a térkép az eszköz fényérzékelője alapján vált a színek között (ha az eszköz tartalmaz ilyent) " + "\tA térképforrás és a rétegek kicserélhetők a \'Menü\' -> \'Rétegek\' alatt. \n\tA \'Térképforrás…\' alatt kiválasztható az előre letöltött vektoros térkép, előre beállított (online) raszteres forrás (az \'Online térkép\' kiterjesztést be kell kapcsolni hozzá), vagy kézzel gyártott térkép pl. OsmAndMapCreatorral készítve PC-n. -\n\tAz OsmAnd saját forrásokat is támogat. " +\n\tAz OsmAnd saját forrásokat is támogat. " + Az OsmAnd egy nyílt forráskódú navigációs alkalmazás offline és online térképekkel OsmAnd (OSM Automated Navigation Directions) @@ -1187,7 +1190,8 @@ \n\t* Az OsmAnd már elfogadja a maps.google.com helyhivatkozásokat \n\t* Új GPX infó widget\n\t* Többablakos támogatás az újabb Samsung eszközökhöz \n\t* Iránytűhöz Kalman-szűrő -\n\t* Pebble óra támogatás " +\n\t* Pebble óra támogatás " + GPX nyomvonal\n mentése Utca Házszám @@ -1248,10 +1252,11 @@ \n\t* Új letöltőképernyő (letöltés a háttérben) \n\t* GPX alkönyvtárak támogatása a nyomvonalak rendezéséhez\n\t* SRTM fájlok törlése\n\t* OSM Jegyzetek támogatás " - Célpontok optimális sorrendbe rendezve a térképpozíciótól a célpont felé + Célpontok optimális sorrendbe rendezve a térképpozíciótól a célpont felé. Rendezés (háztól-házig) Az 1.5 kiadás újdonságai: \n\t* Hangos figyelmeztetések sebességhatárra és traffipaxra + \n\t* Több figyelmeztető hang lehetőség (utcanevek bemondása) \n\t* Nagy felbontású térkép ikonok \n\t* Sok változtatás a felhasználói felületen \n\t* Hibajavítások: távolságkijelzés, GPX analizálás, útpontkezelés, tervező widget, OSM feltöltés, https kezelés @@ -1270,7 +1275,7 @@ Közlekedési figyelmeztetések (stop, fekvőrendőr), traffipax, sebességhatár Sebességhatár bemondása Traffipax bemondása - Közlekedési figyelmeztetések bemondásaa + Közlekedési figyelmeztetések bemondása \nIdőtartam: %1$d:%2$02d:%3$02d \nHaladási idő: %1$d:%2$02d:%3$02d Célpont %1$s @@ -1287,4 +1292,18 @@ A kamera folyamatosan próbál fókuszálni Hangjelzés elsütéskor Válassz, hogy szeretnél-e hangjelzést fénykép készítésekor - \ No newline at end of file +Válassz vezetési területet: USA, Európa, UK, Ázsia, stb. + Vezetési terület + Japán + USA + Kanada + Európa és Ázsia + UK, India, Ausztrália & továbbiak + OsMoDroid leállítása + OsMoDroid indítása + GPX útpontok bemondása + Bemondás… + Utcanevek, közlekedési figyelmeztetések (megállás, fekvőrendőr), traffipax, sebességhatár bemondásának beállításai + Utcanevek bemondása (TTS) + OSM jelszó (opcionális) + From 9e0d6bb22a9093c036dea9e79140d8dafa4ce8cd Mon Sep 17 00:00:00 2001 From: Kristian Dahl Date: Mon, 5 Aug 2013 18:38:11 +0200 Subject: [PATCH 075/145] Translated using Weblate. --- OsmAnd/res/values-nb/strings.xml | 72 ++++++++++++++++++++++++++------ 1 file changed, 59 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/values-nb/strings.xml b/OsmAnd/res/values-nb/strings.xml index bd46245791..2a59a9ddff 100644 --- a/OsmAnd/res/values-nb/strings.xml +++ b/OsmAnd/res/values-nb/strings.xml @@ -1,4 +1,5 @@ -Velg fargeskjema for veier: + +Velg fargeskjema for veier: Veifargeskjema Vis retning til målet Aktiver GPS i innstillingene @@ -50,7 +51,7 @@ Dag/natt-kart Opptegningsattributter: Opptegningsstil - Still inn skjerm + Konfigurer skjerm Vis kjørefelt Unngå uasfalterte veier Unngå ferger @@ -204,13 +205,13 @@ Oseania Verdens- og emnekart Verdensomspennende Wikipedia - Talepakker (opptak) - Talepakker (TTS) + Talepakker (opptak, begrenset funksjonalitet) + Talepakker (TTS kunstig tale, foretrekk) Wikipedia (offline) Brukerdefinert Fil med tidligere eksporterte favoritter finnes allerede. Vil du erstatte den? Profilspesifikke innstillinger - Brukerprofil + Standardprofil Velg en brukerprofil med egendefinert kart og navigeringsinnstillinger. Navigering Spesifiser navigeringsalternativer @@ -230,7 +231,7 @@ Dag/natt-modus \tKartutseende kan for noen vektorkart endres mellom dag (lysere) og natt (mørkere). \n\tNattfarger er tryggere for mørkekjøring. - \n\tDag/natt-veksling kan velges i \'Meny\' -> \'Still inn skjerm...\' ->\'Dag/natt-kart\'. + \n\tDag/natt-veksling kan velges i \'Meny\' -> \'Konfigurer skjerm...\' ->\'Dag/natt-kart\'. \n\tValgene er: \n\t\'Soloppgang/-nedgang\' - automatisk modus, kontrollert av solens posisjon (standard) \n\t\'Dag\' - bruk alltid dagmodus @@ -300,7 +301,7 @@ Deaktiver Slett Last på nytt fra sd-kort - Last ned… + Last ned Flisdata: %1$s \nMinimum zoom: %2$d\nMaksimum zoom: %3$d\nNedlastbar: %4$s \nZoom nedlastet: %5$s Interessepunkt-data Adressedata @@ -463,7 +464,7 @@ Skjul filter Vis filter Filter - Velg taleveiledning for navigering + Velg taleveiledning for navigering (språkkoder se ISO 639-1) Taleveiledning Søk i nærheten av siste kartplassering Søk i nærheten @@ -482,8 +483,8 @@ Navigeringsprogrammet OsmAnd Oppdater interessepunkt Oppdatere lokaldata via internett? - By:\n {0} - Gate:\n {0}, {1} + By: {0} + Gate: {0}, {1} Veikryss: {0} x {1} i {2} Bygning: {0}, {1}, {2} Favoritt @@ -569,13 +570,13 @@ Søk Velg interessepunkt Finn mer - Søk etter by trinnvis. For å finne byer/postnummer, skriv inn de første tre eller flere tegn. + Søk etter by trinnvis Søk etter gate trinnvis Søk etter bygning trinnvis Velg region fra liste Velg kryssende gate Nærmeste fasiliteter - Standard + Se på kartet Bil Sykkel Fotgjenger @@ -645,4 +646,49 @@ Foretrekk motorveier ingen Vel tema for programmet - \ No newline at end of file + USA + Canada + Europa og Asia + England, India, Australia og andre + Velg region for bilkjøring: USA, England, Asia, eller andre + Japan + Region for bilkjøring + Stopp OsMoDroid + Start OsMoDroid + Fortell om GPX-rutepunkter + Les opp… + Konfigurér til å lese opp gatenavn, trafikkadvarsler (fartsdumper, etc.), fotoradaradvarsler, fartsgrenser + Les opp gatenavn (TTS) + Informer om fartsgrense + Informer om Radarkameraer + Les opp trafikkmeldinger + Endringer i 1.5:↵ +→\n\t* Stemmevarslinger om fartsgrenser og radarkameraer +↵ +→\n\t* Flere muligheter for opplesning (gatenavn blir lest opp) +↵ +→\n\t* Kartikoner i høy oppløsning +↵ +→\n\t* Flere endringer i brukergrensesnittet +↵ +→\n\t* Feilrettinger i avstandsvisningen, GPX-analyse, håndtering av rutepunkter, planleggingsmodulen, opplasting til OSM, https håndtering + + Oppgi OSM brukernavn og passord i Innstillinger + Slett mellomliggende rutepunkter + Behold mellomliggende rutepunkter + Mellomliggende rutepunkter er allerede angitt. + Kjøreveiledning til + Kjøreveiledning fra + Kart: + Hø %1$.3f, Le %2$.3f + Aktuell posisjon + Til: + Via: + Fra: + \nTotal tid: %1$d:%2$02d:%3$02d + \nTid i bevegelse: %1$d:%2$02d:%3$02d + Mål %1$s + Velg som mål + Velg by eller gate først + Søk etter gaten i nabobyer + From 6cd32038bb78f239a383127fd23d0f4f2e304ebd Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Mon, 5 Aug 2013 14:24:02 +0200 Subject: [PATCH 076/145] Translated using Weblate. --- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index c24ea21e29..3dac570f43 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1535,6 +1535,6 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 美國 加拿大 歐洲和亞洲 - 英國、印度、澳大利亞和其他 + 英國、印度、澳洲和其他 駕駛區域 From d761775286760e580291e432414db4e26440b3c6 Mon Sep 17 00:00:00 2001 From: Andriy Golovin Date: Mon, 5 Aug 2013 15:43:18 +0200 Subject: [PATCH 077/145] Translated using Weblate. --- OsmAnd/res/values-uk/strings.xml | 55 ++++++++++++++++++++++++++------ 1 file changed, 45 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml index d1aac824e1..f55ec4110f 100644 --- a/OsmAnd/res/values-uk/strings.xml +++ b/OsmAnd/res/values-uk/strings.xml @@ -234,7 +234,7 @@ Не вистачає місця на диску для завантаження %1$s MB (вільно: %2$s). Вільне місце {2} MB! Завантажити {0} файл(ів) ({1} MB)? Вибір точки прибуття - \tВи можете обрати пункт призначення на мапі, в результатах пошуку або точку із закладок через пункт \"Йти до\" в контекстному меню. + \tВи можете обрати пункт призначення на мапі, в результатах пошуку або точку із закладок через пункт \"Маршрути\" в контекстному меню. \n\tТочка призначення показується на мапі, як помаранчеве коло, напрямок до неї — помаранчевою стрілкою. Також, в правому верхньому куті показується відстань по прямій лінії до неї. Зміни в 0.6.9: @@ -267,10 +267,18 @@ POI мітки Закінчити моделювання Почати моделювання - "Changes in 0.6.8 : \n\t- Completely redesigned search (POI, Address)! Make address search much faster and more responsive. Create one Search interface with many different options. \n\t- Implement POI search by name in big areas (countries) \n\t- Fix flickering map screen for tablets (Issue 641) \n\t- Auto-center map view option (Issue 356) \n\t- GPX navigation moved to \'Directions\' and \'Save Directions\' moved to \'About route\' \n\t- POI data included in .obf file (all download indexes after 01/10/11) \n\t- Voice prompt fixes (GPS position fix, omitting first command) \n\t- Small improvements " + Зміни в 0.6.8: + \n\t- Повністю перероблений пошук (POI, Адреси)! Адресний пошук тепер значно швидшій та точний. Створено один загальний інтерфейс Пошуку з різними параметрами. + \n\t- Реалізовано пошук POI за назвою для великих ділянок (країн) + \n\t- Виправлено мерехтіння екрану на планшетах (Issue 641) + \n\t- Параметр авто-центрування мапи (Issue 356) + \n\t- GPX навігацію переміщено в \'Маршрут\', та \'Зберегти маршрут\' до \'Про маршрут\' + \n\t- Дані про POI включено до файлу .obf (для всіх мап після 01/10/11) + \n\t- Виправлення помилок в Голосових підказках (GPS-координати, пропуск першої підказки) + \n\t- Деякі покращення Файл не можна перейменувати. - Файл з таким ім\'ям вже існує. + Файл з таким ім’ям вже існує. GPX маршрут Деякі категорії POI відповідають запиту, можете використовувати їх для створення фільтра: Локальні дані для пошука POI за іменем не знайдено. @@ -412,7 +420,7 @@ Профіль Навігація - \tЩоб розпочати навігацію виберіть пункт призначення. Після цього натисніть \"Меню\" → \"Навігація\" на мапі і виберіть тип навігації. + \tЩоб розпочати навігацію виберіть пункт призначення. Після цього натисніть \"Меню\" → \"Маршрут\" на мапі і виберіть тип навігації. Пошук Контекстне меню мапи \tКонтекстне меню мапи доступне, якщо натиснути та утримувати мапу чи натиснути джойстик. @@ -602,7 +610,7 @@ Фільтр Звук увімкнено Звук вимкнено - Виберіть голос для навігації + Виберіть голос для навігації (коди мов за ISO 639-1) Голосові дані Ініціалізуються голосові дані… Голосові дані не підтримуються поточною версією програми @@ -691,10 +699,10 @@ Не існує збережених точок Замінити Тільки показати - Йти до + Маршрут Режим пересування: Вкажіть пункт призначення - Напрямки + Маршрут Показати GPS статус Робочі години Відкриття пакету правок… @@ -1464,7 +1472,7 @@ OsmAnd має відкриті сирці і активно розвиваєть Допоміжні можливості: будь ласка, спочатку оберіть пункт призначення Використовувати магнітометр для визначення сторін світу замість, датчику орієнтації \tВи можете шукати об’єкти роздивляючись мапу, використовуючи пошук за адресою, координатами, чи пошук POI, або обираючи із збережених точок. - \n\tВибір пункту «Пошук» в меню, дозволить перейти до завдання того, що ви бажаєте відшукати. У допомогу до всіх підказок, контекстне меню пропонує два варіанти: \'Встановити як пункт призначення\' чи \'Показати на мапі\' + \n\tВибір пункту «Пошук» в меню, дозволить перейти до завдання того, що ви бажаєте відшукати. У допомогу до всіх підказок, контекстне меню пропонує два варіанти: \'Маршрут\' чи \'Показати на мапі\' Пункт призначення %1$s \nПроміжок часу: %1$d:%2$02d:%3$02d @@ -1491,7 +1499,7 @@ OsmAnd має відкриті сирці і активно розвиваєть Очистити проміжні точки Ви вже задали проміжні точки. Напрямки до - Напрямки від + Маршрут від До: Попереджати про маршрутні точки GPX Попереджати… @@ -1525,4 +1533,31 @@ OsmAnd має відкриті сирці і активно розвиваєть Пароль OSM (необов’язково) Зупинити OsMoDroid Запустити OsMoDroid - + Виберіть регіон: США, Європа, Англія, Азія та інші + Регіон + Японія + США + Канада + Європа та Азія + Англія, Індія, Австралія та інші + Зміни в for 0.6.7: + \n\t- Менеджер локальних даних (завантаження. вилучення, активація/деактивація даних безпосередньо в OsmAnd) + \n\t- Закладки та групи (категоризація, вилучення, керування закладками) + \n\t- Огляд GPX в застосунку (перегляд інформації з треку, відстань, середня швидкість, висота, т.д.) + \n\t- Навігація GPX (більше параметрів, продовження навгації після збою, підкримка руху по колу) + \n\t- Можливість збереження маршруту як треку GPX для локального використання + \n\t- Покращено GPX-моніторинг (відкидання неточного положення та збереження точності/висоти/швидкості) + \n\t- Завантаження GPX для використання спільнотою OSM (http://download.osmand.net/gpx/) + \n\t- Покращення векторного рендерингу + \n\t- Покращення рушія TTS (повідомлення точної відстані, також можна і в милях) + \n\t- Виправлення помилок + + Зміни в версії 0.6.6: + \n\t- Рушій Text To Speech для голосової навігації + \n\t- Рендер створює більш детальну мапу + \n\t- Базова мапа всього світу постачається разом із застосунком + \n\t- Підлаштування оффлайнової навігації (ще експериментально) + \n\t- Параметри для GPX навігації + \n\t- Оновлення інтерфейсу та велика кількість виправлених помилок + + From fa73e3d365b509bb9ef36846062e551d9ced04b3 Mon Sep 17 00:00:00 2001 From: Kristian Dahl Date: Mon, 5 Aug 2013 18:32:36 +0200 Subject: [PATCH 078/145] Translated using Weblate. --- plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml index 81fcead2f0..2a0d7f83e5 100644 --- a/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml +++ b/plugins/Osmand-ParkingPlugin/res/values-nb/strings.xml @@ -1,3 +1,4 @@ - - - \ No newline at end of file + +Ja + Nei + From 3358f147bf3f3c55bd2b24882132d28130080b50 Mon Sep 17 00:00:00 2001 From: Rodolfo de Vries Date: Mon, 5 Aug 2013 20:28:28 +0200 Subject: [PATCH 079/145] Translated using Weblate. --- OsmAnd/res/values-nl/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index 27be5a5ac9..0b4a5fdcff 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -1088,7 +1088,7 @@ Positie op de weg uitlijnen Routepunt %1$s te ver van dichtstbijzijnde weg. Je bent aangekomen op je routepunt -Als routepunt toevoegen +Als routepunt\ntoevoegen Routepunt Eindpunt te ver van dichtstbijzijnde weg. Tag toevoegen @@ -1478,7 +1478,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Volgorde van de tussenpunten is aangepast voor de beste route naar de bestemming. Sorteer (kortste afstand) Kies eerst een stad of straat - Als bestemming instellen + Als bestemming\ninstellen Bestemming %1$s \nTijd in beweging: %1$d:%2$02d:%3$02d \nTijdspanne: %1$d:%2$02d:%3$02d From f01473c060812cbd3fdff112959ffe5be896b542 Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Mon, 5 Aug 2013 16:14:56 -0300 Subject: [PATCH 080/145] Fix typo --- plugins/OsmAnd-AddressPlugin/res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/OsmAnd-AddressPlugin/res/values/strings.xml b/plugins/OsmAnd-AddressPlugin/res/values/strings.xml index 7f24413cd7..27c8371abd 100644 --- a/plugins/OsmAnd-AddressPlugin/res/values/strings.xml +++ b/plugins/OsmAnd-AddressPlugin/res/values/strings.xml @@ -3,6 +3,6 @@ No Yes OsmAnd is not installed - OsmAnd Adress Book Plugin - OsmAnd Adress Book Plugin is installed. - \ No newline at end of file + OsmAnd Address Book Plugin + OsmAnd Address Book Plugin is installed. + From b98511b05541b7caa49b71e0d2262202ee13d1ea Mon Sep 17 00:00:00 2001 From: "Nelson A. de Oliveira" Date: Mon, 5 Aug 2013 16:36:44 -0300 Subject: [PATCH 081/145] Fix typos --- OsmAnd/res/values-pt/strings.xml | 24 ++++++++++++------------ OsmAnd/res/values/strings.xml | 28 ++++++++++++++-------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/OsmAnd/res/values-pt/strings.xml b/OsmAnd/res/values-pt/strings.xml index 100ff1ecba..99280c7a84 100644 --- a/OsmAnd/res/values-pt/strings.xml +++ b/OsmAnd/res/values-pt/strings.xml @@ -168,7 +168,7 @@ Dados de voz selecionados não estão acessíveis O cartão SD está inacessível. \n Será impossível ver mapas ou procurar coisas. - O cartão SD está disponivel só para leitura. \nVocê não pode baixar da Internet, só pode visualizar os mapas pré-carregados. + O cartão SD está disponível só para leitura. \nVocê não pode baixar da Internet, só pode visualizar os mapas pré-carregados. Descomprimindo arquivo… Virar à direita e continuar em frente Virar bruscamente à direita e continuar em frente @@ -223,11 +223,11 @@ Histórico Enviando dados… Enviando… - Nao foi encontrado nada + Não foi encontrado nada Pesquisando… Pesquisando endereço… Pesquisar endereço via OSM Nominatim - Numero, rua, cidade + Número, rua, cidade Offline Internet Nível de zoom máx @@ -567,7 +567,7 @@ Enviar a modificação OSM Apagar modificação Asynchronous OSM Editing: - POI/Bugs armazenados na memoria local + POI/Bugs armazenados na memória local Mostrar e gerir Pontos de Interesse e Erros guardados na memória local Enviar rota para um serviço na Internet Online live tracking @@ -872,7 +872,7 @@ Use compass in navigation when diretion is not detected Usar bússola Route will be recalculated when location will be found - A navegação anterior nao foi terminada, quer continua-la? (%1$s segundos) + A navegação anterior não foi terminada, quer continua-la? (%1$s segundos) @@ -993,9 +993,9 @@ Pesquisa por CEP - O plugin Dropbox permite sincronizar trilhos e notas de video/audio com a sua conta Dropbox. + O plugin Dropbox permite sincronizar trilhos e notas de vídeo/audio com a sua conta Dropbox. Quer usar o ficheiro GPX actual? - Gravar video + Gravar vídeo Gravar audio Escolha a acção widget padrão Ação widget padrão @@ -1021,7 +1021,7 @@ Preferir auto-estradas Preferir… Preferir Auto-Estradas - Correções em 1.2.1:\n\t* Corrigido o Geo Intent (Foursquare, c:geo)\n\t* Corrigidos os tremeliques de visor durante a navegação\n\t* Outras pequenas correções\n\nAlterações em 1.2:\n\t* Correções de bugs (acertos nas rotas, pesquisa, gravação de AV, comandos de voz, algumas melhorias de exibição)\n\t* Facilitada a configuração de sobreposições de Sombras de Colinas (requer plugin Curvas de Nivel)\n\t* Agora aceita links de localização maps.google.com\n\t* filtro de Kalman para a bússola\n\t* Suporte para relógio Pebble\n\t* Novo widget (Informações GPS)\n\t* Adicionado suporte multi-janela para dispositivos Samsung recentes + Correções em 1.2.1:\n\t* Corrigido o Geo Intent (Foursquare, c:geo)\n\t* Corrigidos os tremeliques de visor durante a navegação\n\t* Outras pequenas correções\n\nAlterações em 1.2:\n\t* Correções de bugs (acertos nas rotas, pesquisa, gravação de AV, comandos de voz, algumas melhorias de exibição)\n\t* Facilitada a configuração de sobreposições de Sombras de Colinas (requer plugin Curvas de Nível)\n\t* Agora aceita links de localização maps.google.com\n\t* filtro de Kalman para a bússola\n\t* Suporte para relógio Pebble\n\t* Novo widget (Informações GPS)\n\t* Adicionado suporte multi-janela para dispositivos Samsung recentes Nenhum OpenMaps UE Iniciar @@ -1084,11 +1084,11 @@ incompleto Rua - Numero de casa + Número de casa Mudanças em 1.0.0:\n\t* Melhorado cálculo de rota: mais rápido, mais preciso e até 250 km\n\t* Incluída opção de mapas apenas com estradas\n\t* Mapa não perde posição após interrupções\n\t* Permitido modo de serviço oculto durante a navegação Serviços de monitoramento e Serviço em segundo plano Escolha o tema da aplicação - Tema da aplicaçao + Tema da aplicação Opções de acessibilidade Selecione o endereço Selecione favorito @@ -1124,7 +1124,7 @@ Calculadora de Distância e Ferramenta de Planeamento "Criar caminhos (ou usar / modificar arquivos GPX existentes) para medir a distância entre pontos. Se guardar como GPX, pode ser usado para planear rotas GPX." Altitude - Corrigir a medição - Selecione região: USA, Europa, UK, Asia e Outros + Selecione região: USA, Europa, UK, Ásia e Outros Região Japão Estados Unidos @@ -1193,7 +1193,7 @@ Clique no widget de medição para ver mais ações. Use sensor magnético Outro Dados de linhas de contorno - Plugin OsMoDroid é uma extensão do OsmAnd para aplicaçao OsModroid para online tracking. Mais informações sobre o serviço em http://esya.ru. + Plugin OsMoDroid é uma extensão do OsmAnd para aplicação OsModroid para online tracking. Mais informações sobre o serviço em http://esya.ru. \tMaioria dos dispositivos GPS reportam medidas de altitude no sistema de referência elipsoidal WGS84, para o qual a conversão para sistemas usados localmente requerem a correção dependente de posição. \n\tUma melhor aproximação para esses sistmas locais é a referêncai EGM96. OsmAnd agora tamb[em suporta a exibição automática de altitudes no sistema EGM96. \n\tPara obtê-lo, façao o download do arquivo WW15MGH.DAC via Gerenciamento de Dados (original em http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm96/binary/WW15MGH.DAC). diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index aed3454584..cdef22d669 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -66,7 +66,7 @@ Search street in neighborhood cities Intermediate waypoints resorted to optimize their order on the way to the destination. Sort (door-to-door) - OSM change file succesfully generated %1$s + OSM change file successfully generated %1$s Backup OSM changes failed Backup as OSM change Delete Point @@ -76,7 +76,7 @@ elevation Point GPX file name - GPX file succesfully saved to {0} + GPX file successfully saved to {0} Create paths (or use / modify existing GPX files) to measure the distance between points. Save as GPX, can be used to plan GPX routes. Distance calculator & Planning Tool * Tap to mark a point.\n @@ -197,7 +197,7 @@ Use camera app Configure audio and video settings Audio/video settings - Error ocurred while recording + Error occurred while recording Camera is not available Audio/video is being recorded. To stop it press the AV widget. An audio from the specified recording is being played.\n%1$s @@ -1198,8 +1198,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Display continuous rendering instead of image-at-once Error occurred while rendering selected area Use location … - Renderer sucessfully loaded - Exception occured: renderer was not loaded + Renderer successfully loaded + Exception occurred: renderer was not loaded Vector renderer Choose rendering appearance Show POI website @@ -1232,9 +1232,9 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Select map screen alignment Map orientation Route details - Favorites succesfully imported + Favorites successfully imported GPX file containing favorites is not found at {0} - Favorites succesfully saved to {0} + Favorites successfully saved to {0} No favorite points to save Import Export @@ -1355,7 +1355,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Offline data for {0} already exists ({1}). Do you want to update it ({2}) ? Address Download successful - I/O error occured + I/O error occurred Downloading … Downloading… Downloading list of available regions… @@ -1495,10 +1495,10 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Edit favorite Delete favorite Remove favorite point \'%s\'? - Favorite point {0} was succesfully deleted. + Favorite point {0} was successfully deleted. Enter bug text Bug successfully created - Exception occured: bug was not created + Exception occurred: bug was not created OSM password (optional) Add comment Message @@ -1506,12 +1506,12 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Adding comment to bug Add comment Comment was successfully added - Exception occured: comment was not added + Exception occurred: comment was not added Close bug Closing bug Close bug Bug was successfully closed - Exception occured: bug was not closed + Exception occurred: bug was not closed Edit POI Create POI Node cannot be found or amenity is not a single node @@ -1522,8 +1522,8 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A add change Action {0} completed successfully. - Unexpected error occured while performing action {0}. - I/O error occured while performing action {0}. + Unexpected error occurred while performing action {0}. + I/O error occurred while performing action {0}. Info about node was not loaded Name Open From 5e62e7bba2d9d84edb4b22704bfc4d72b5a56a97 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 23:10:31 +0200 Subject: [PATCH 082/145] Small fix for compilation --- OsmAnd/jni/Android.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index 3619592266..e3a1fd536a 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -5,8 +5,9 @@ $(info OsmAnd root: $(ROOT_PATH)) include $(CLEAR_VARS) ifdef BUILD_ONLY_OLD_LIB - OSMAND_MAKEFILES := $(call all-subdir-makefiles) $(call all-makefiles-under,$(ROOT_PATH)/core/targets/android) - $(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) +OSMAND_MAKEFILES := $(call all-makefiles-under,$(LOCAL_PATH)/) \ + $(call all-makefiles-under,$(ROOT_PATH)/core/targets/android) +$(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) else OSMAND_MAKEFILES := \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ From 968c15a254db37f33e12f7ec9ffa26deab881acf Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Mon, 5 Aug 2013 23:19:35 +0200 Subject: [PATCH 083/145] Update mk --- OsmAnd/jni/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/jni/Android.mk b/OsmAnd/jni/Android.mk index e3a1fd536a..25df3a045f 100755 --- a/OsmAnd/jni/Android.mk +++ b/OsmAnd/jni/Android.mk @@ -12,7 +12,7 @@ else OSMAND_MAKEFILES := \ $(call all-makefiles-under,$(ROOT_PATH)/core/externals) \ $(ROOT_PATH)/core/Android.mk \ - $(all-subdir-makefiles) \ + $(call all-makefiles-under,$(LOCAL_PATH)/) \ $(ROOT_PATH)/jni/Android.mk $(info OsmAnd makefiles: $(OSMAND_MAKEFILES)) endif From a8bb953d2f93968715b6e297ba79b731e118c967 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 6 Aug 2013 00:22:03 +0200 Subject: [PATCH 084/145] Add osrm provider --- .../osmand/plus/routing/RouteProvider.java | 61 ++++++++++++++++++- 1 file changed, 60 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java index 819cc6839a..3ab0e3a1d6 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteProvider.java @@ -37,6 +37,7 @@ import net.osmand.plus.GPXUtilities.TrkSegment; import net.osmand.plus.GPXUtilities.WptPt; import net.osmand.plus.OsmandSettings; import net.osmand.plus.R; +import net.osmand.plus.Version; import net.osmand.router.GeneralRouter; import net.osmand.router.GeneralRouter.GeneralRouterProfile; import net.osmand.router.RoutePlannerFrontEnd; @@ -46,6 +47,7 @@ import net.osmand.router.RoutingContext; import net.osmand.router.TurnType; import net.osmand.util.MapUtils; +import org.json.JSONException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -60,7 +62,7 @@ public class RouteProvider { private static final String OSMAND_ROUTER = "OsmAndRouter"; public enum RouteService { - OSMAND("OsmAnd (offline)"), YOURS("YOURS"), ORS("OpenRouteService"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ + OSMAND("OsmAnd (offline)"), YOURS("YOURS"), ORS("OpenRouteService"), OSRM("OSRM (only car)"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ private final String name; private RouteService(String name){ this.name = name; @@ -178,6 +180,8 @@ public class RouteProvider { res = findYOURSRoute(params); } else if (params.type == RouteService.ORS) { res = findORSRoute(params); + } else if (params.type == RouteService.OSRM) { + res = findOSRMRoute(params); } else if (params.type == RouteService.OSMAND) { res = findVectorMapsRoute(params); } else { @@ -193,6 +197,8 @@ public class RouteProvider { log.error("Failed to find route ", e); //$NON-NLS-1$ } catch (SAXException e) { log.error("Failed to find route ", e); //$NON-NLS-1$ + } catch (JSONException e) { + log.error("Failed to find route ", e); //$NON-NLS-1$ } } return new RouteCalculationResult(null); @@ -285,6 +291,7 @@ public class RouteProvider { log.info("URL route " + uri); URL url = new URL(uri.toString()); URLConnection connection = url.openConnection(); + connection.setRequestProperty("User-Agent", Version.getFullVersion(params.ctx)); DocumentBuilder dom = DocumentBuilderFactory.newInstance().newDocumentBuilder(); Document doc = dom.parse(new InputSource(new InputStreamReader(connection.getInputStream()))); NodeList list = doc.getElementsByTagName("coordinates"); //$NON-NLS-1$ @@ -479,6 +486,7 @@ public class RouteProvider { log.info("URL route " + uri); URL url = new URL(uri.toString()); URLConnection connection = url.openConnection(); + connection.setRequestProperty("User-Agent", Version.getFullVersion(params.ctx)); GPXFile gpxFile = GPXUtilities.loadGPXFile(params.ctx, connection.getInputStream(), false); directions = parseCloudmadeRoute(res, gpxFile, false, params.leftSide, speed); @@ -634,6 +642,7 @@ public class RouteProvider { URI uri = URI.create(request.toString()); URL url = uri.toURL(); URLConnection connection = url.openConnection(); + connection.setRequestProperty("User-Agent", Version.getFullVersion(params.ctx)); DocumentBuilder dom = DocumentBuilderFactory.newInstance().newDocumentBuilder(); Document doc = dom.parse(new InputSource(new InputStreamReader(connection.getInputStream()))); @@ -721,5 +730,55 @@ public class RouteProvider { } return gpx; } + + + private void appendOSRMLoc(StringBuilder uri, LatLon il) { + uri.append("&loc=").append(String.valueOf(il.getLatitude())); + uri.append(",").append(String.valueOf(il.getLongitude())); + } + protected RouteCalculationResult findOSRMRoute(RouteCalculationParams params) + throws MalformedURLException, IOException, JSONException { + // http://router.project-osrm.org/viaroute?loc=52.28,4.83&loc=52.35,4.95&alt=false&output=gpx + List res = new ArrayList(); + StringBuilder uri = new StringBuilder(); + // possibly hide that API key because it is privacy of osmand + // A6421860EBB04234AB5EF2D049F2CD8F key is compromised + uri.append("http://router.project-osrm.org/viaroute?alt=false"); //$NON-NLS-1$ + uri.append("&loc=").append(String.valueOf(params.start.getLatitude())); + uri.append(",").append(String.valueOf(params.start.getLongitude())); + if(params.intermediates != null && params.intermediates.size() > 0) { + for(LatLon il : params.intermediates) { + appendOSRMLoc(uri, il); + } + } + appendOSRMLoc(uri, params.end); + uri.append("&output=gpx"); //$NON-NLS-1$ + + log.info("URL route " + uri); + + URL url = new URL(uri.toString()); + URLConnection connection = url.openConnection(); + connection.setRequestProperty("User-Agent", Version.getFullVersion(params.ctx)); + StringBuilder content = new StringBuilder(); +// BufferedReader rs = new BufferedReader(new InputStreamReader(connection.getInputStream())); +// String s; +// while((s = rs.readLine()) != null) { +// content.append(s); +// } +// JSONObject obj = new JSONObject(content.toString()); + GPXFile gpxFile = GPXUtilities.loadGPXFile(params.ctx, connection.getInputStream(), false); + if(gpxFile.routes.isEmpty()) { + return new RouteCalculationResult("Route is empty"); + } + for (WptPt pt : gpxFile.routes.get(0).points) { + res.add(createLocation(pt)); + } + return new RouteCalculationResult(res, null, params.start, params.end, null, null, null, + params.ctx, params.leftSide, true); + } + + + + } From 4447b06c034ac8dbb59f10f4fced43d014db8398 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 6 Aug 2013 00:26:33 +0200 Subject: [PATCH 085/145] Add osrm provider --- OsmAnd/src/net/osmand/plus/OsmandSettings.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java index 7e822ef21b..e76537e9f0 100644 --- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java +++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java @@ -662,7 +662,7 @@ public class OsmandSettings { // this value string is synchronized with settings_pref.xml preference name public final OsmandPreference ROUTER_SERVICE = new EnumIntPreference("router_service", RouteService.OSMAND, - new RouteService[] {RouteService.OSMAND, RouteService.YOURS, RouteService.ORS}).makeProfile(); + RouteService.values()).makeProfile(); public final CommonPreference SNAP_TO_ROAD = new BooleanPreference("snap_to_road", false).makeProfile().cache(); { From a0773edada63d98f4bdf46d2237387050810eff7 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Mon, 5 Aug 2013 21:12:32 +0200 Subject: [PATCH 086/145] Translated using Weblate. --- OsmAnd/res/values-sv/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index a01bac41f0..9f6adb1fcc 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1195,4 +1195,12 @@ Aktuella data på enheten (%1$s ledigt): Meddela vid GPX-waypoints Stoppa OsMoDroid Starta OsMoDroid - + FPS-info + Välj område: USA, Europa, UK, Asien och andra + Område + Japan + USA + Canada + Europa & Asien + UK, Indien, Australien & andra + From 86bfb670a6aadcae54be36867d3978002c9f0cb7 Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Mon, 5 Aug 2013 21:50:26 +0200 Subject: [PATCH 087/145] Translated using Weblate. --- OsmAnd/res/values-it/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 0a24531fac..714b2b57e2 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1323,7 +1323,7 @@ \nTempo trascorso: %1$d:%2$02d:%3$02d Configura gli avvisi del traffico (fermate forzate, dossi rallentatori) avvisi autovelox, limiti di velocità - Annuncia limite di velocità + Annuncia limiti di velocità Annuncia autovelox Annuncia avvisi di traffico Cambiamenti nella 1.5: @@ -1357,4 +1357,5 @@ Canada Europa & Asia UK, India, Australia e Altri + Informazioni FPS From e5a523dc949380641f7d7bdf8d99bb0ce73faa3d Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Mon, 5 Aug 2013 22:59:34 +0200 Subject: [PATCH 088/145] Translated using Weblate. --- OsmAnd/res/values-pl/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 03039aafed..160fe940ee 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -1317,4 +1317,5 @@ Wybierz region, w którym będziesz się poruszał: Stany Zjednoczone, Europa, Wielka Brytania, Azja i inne Region poruszania się Kanada + Informacje o FPS From 75e72f7f608443c214caa1e5d0da24a1397228ac Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Tue, 6 Aug 2013 00:03:38 +0200 Subject: [PATCH 089/145] Translated using Weblate. --- OsmAnd/res/values-sv/strings.xml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 9f6adb1fcc..5c68739f03 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1175,7 +1175,8 @@ Aktuella data på enheten (%1$s ledigt): precision Förändringar i 1.5: \n\t* Röstvarningar vid hastighetsbegränsningar och fartkameror - \n\t* Högkvalitativa kartikoner + \n\t* Fler röstprompter (uppläsning av gatunamn)↵ + \n\t* Högupplösta kartikoner \n\t* Många förändringar av gränssnittet \n\t* Buggfixar i avståndsvisning, GPX-analys, behandling av waypoints, planeringswidget, OSM-uppladdning, https-behandling @@ -1203,4 +1204,5 @@ Aktuella data på enheten (%1$s ledigt): Canada Europa & Asien UK, Indien, Australien & andra - + Ändrad OSM-fil skapad utan problem %1$s + From 5f95596d26a7493a2416e495295ef5a394bf23a7 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Tue, 6 Aug 2013 00:15:17 +0200 Subject: [PATCH 090/145] Translated using Weblate. --- OsmAnd/res/values-zh-rTW/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 3dac570f43..7063120c96 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1537,4 +1537,5 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 歐洲和亞洲 英國、印度、澳洲和其他 駕駛區域 + FPS 資訊 From 864edfaafd796ea4d8aa3d251cc930544ff6d8e1 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Tue, 6 Aug 2013 08:32:27 +0200 Subject: [PATCH 091/145] Translated using Weblate. --- OsmAnd/res/values-da/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index c567305242..6ded0e523e 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1572,6 +1572,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Canada Europa & Asien Storbritannien, Indien, Australien m.fl. - Kørselregion - Vælg kørselregion: USA, Europa, England, Asien m.fl. + Område + Vælg område: USA, Europa, England, Asien m.fl. + FPS-info From fa8138446f7a8c3ac5854bbd9bc0b61fb410d78c Mon Sep 17 00:00:00 2001 From: Brian Apor Date: Tue, 6 Aug 2013 10:03:10 +0200 Subject: [PATCH 092/145] Translated using Weblate. --- OsmAnd/res/values-ru/strings.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-ru/strings.xml b/OsmAnd/res/values-ru/strings.xml index 1133bf4ac3..80a428f178 100644 --- a/OsmAnd/res/values-ru/strings.xml +++ b/OsmAnd/res/values-ru/strings.xml @@ -1265,4 +1265,5 @@ Англия, Индия, Австралия и др. Маршрут к Маршрут от - + Канада + From 70e74ccd9c9d5e88dc13b39c0d6cbb46af01b41a Mon Sep 17 00:00:00 2001 From: Damjan Gerl Date: Tue, 6 Aug 2013 01:05:40 +0200 Subject: [PATCH 093/145] Translated using Weblate. --- OsmAnd/res/values-sl/strings.xml | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 7f92a1c0c4..8e7552d9ef 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -49,7 +49,7 @@ Briši priljubljeno lokacijo Priljubljena lokacija \'\'{0}\'\' je bila dodana. Odstrani priljubljeno lokacijo \'%s\'? - Priljubljena lokacija {0} je bila izbrisana. + Priljubljena točka {0} je bila izbrisana. Uredi POI Ustvari POI Točke ni mogoče najti ali pa usluga ni samostojna točka @@ -60,8 +60,8 @@ Dodajanje Popravljanje {0} je bilo uspešno. - {0} NI bilo uspešno (Nepričakovana napaka). - {0} NI bilo uspešno (I/O napaka). + Med izvajanjem dejanja {0} prišlo do nepričakovane napake. + Prišlo je do I/O napake pri izvajanju dejanja {0}. Informacije o točki niso bile naložene Ime Odprto @@ -638,7 +638,7 @@ Sporočilo Ime avtorja Napaka uspešno prijavljena - Napaka v programu: Napaka ni bila prijavljena + Prišlo je do napake: napaka ni bila prijavljena Dodaj komentar Dodaj opis napake Dodajanje opisa napake @@ -688,7 +688,7 @@ Spletno sledenje v živo Določi interval sledenja v živo Interval sledenja v živo - Navedite spletne naslove z naslednjo sintakso za parametre: lat={0}, lon={1}, timestamp={2}, hdop={3}, altitude={4}, speed={5}, bearing={6} + Navedite spletne naslove z naslednjo sintakso za parametre: geogr. šir.={0}, geogr. dolž.={1}, čas={2}, hdop={3}, višina={4}, hitrost={5}, usmeritev={6} Spletni naslov za sledenje v živo Omogočite nastavitev \'Beleži sled v datoteko GPX\'. Za profil določene nastavitve @@ -969,7 +969,7 @@ Pomembnejše lastnosti: \n\tPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku. \n\tOsmAnd podpira tudi vire po meri. - Priljubljeni uspešno shranjeni v {0} + Priljubljene točke uspešno shranjene v {0} Oblika delovnega časa ni podprta za urejanje Dodajanje novega pravila Poti @@ -1480,6 +1480,14 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Zaženi OsMoDroid Najavljanje GPX točk Najavi … - Nastavitve za najavljanje imena ulic, prometna opozorila (prisilne ustavitve, ležeči policaji), opozorila merilnikov hitrosti, omejitve hitrosti + Nastavitve za najavljanje imena ulic, prometna opozorila (ležeči policaji ipd.), opozorila merilnikov hitrosti, omejitve hitrosti Najavljanje imen ulic (TTS) - + Podatki FPS + Izbira področja vožnje: ZDA, Evropa, Velika Britanija, Azija in drugo + Področje vožnje + Japonska + Združene države + Kanada + Evropa in Azija + Velika Britanija, Indija, Avstralija in drugo + From d1f5c3b55071cc328519a4cbece4975cebf1acf5 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Aug 2013 12:42:08 +0200 Subject: [PATCH 094/145] Use correct wording for our 'map layers' configuration menu --- OsmAnd/res/values-de/strings.xml | 8 ++++---- OsmAnd/res/values/strings.xml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index b80412ebce..5a9a3b9647 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -323,7 +323,7 @@ \n\t\'Keine Rotation (Norden ist oben)\' - Die Ausrichtung wird nicht nachgeführt, Norden ist immer oben \n\t\'Nach Bewegungsrichtung\' - Die Karte wird gemäß Bewegungsrichtung ausgerichtet und nachgeführt \n\t\'Nach Kompass\' - Die Karte wird gemäß Kompass ausgerichtet und nachgeführt " - Download erfolgreich.\n\t\n\tAktivieren unter: \'Menü\' → \'Darstellung\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'. + Download erfolgreich.\n\t\n\tAktivieren unter: \'Menü\' → \'Kartenebenen\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'. Tag/Nacht-Modus "Die Anzeige von Offline-Vektor-Karten kann für einige Anzeigemodi zwischen Tag- (heller) und Nachtansicht (dunkler) umgeschaltet werden. Insbesondere bei nächtlichen Autofahrten ist die dunklere Nacht-Anzeige angenehmer und sicherer. \nDer Umschaltmechanismus kann in der Kartenansicht unter Menü → \'Anzeige konfigurieren\' → \'Tag/Nacht-Modus\' geändert werden. @@ -491,7 +491,7 @@ Gesamten Track durchlaufen Offline-Vektor-Karte ist für diesen Ort vorhanden. \n\t - \n\tZur Verwendung aktivieren: \'Menu\' → \'Darstellung\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'. + \n\tZur Verwendung aktivieren: \'Menu\' → \'Kartenebenen\' → \'Kartenquelle…\' → \'Offline-Vektor-Karten\'. Navi-Sprachausgabe Ausgabemodus für Sprachansagen wählen (Systemabhängig) wie Anrufe @@ -530,7 +530,7 @@ \n * Kopieren der Koordinaten in die Zwischenablage (Clipboard) Favoriten "Sie können jeden beliebigen Ort als Favoriten speichern.\n\nEinen Favoriten erstellen Sie im Karten-Kontextmenü via \'Als Favorit speichern\'. Name und Kategorie sind dabei frei wählbar. Gespeicherte Favoriten sind leicht zugänglich direkt im Hauptmenü unter \'Favoriten\'. Mittels Kontextmenü können Sie jeden Favoriten bearbeiten, löschen, als Ziel wählen oder einfach nur auf der Karte anzeigen lassen. -\n\nSie können sich auch alle Ihre Favoriten gleichzeitig auf der Karte anzeigen lassen. Dazu in der Kartenansicht unter \'Menü\' → \'Darstellung\' einen Haken bei \'Favoriten\' setzen. " +\n\nSie können sich auch alle Ihre Favoriten gleichzeitig auf der Karte anzeigen lassen. Dazu in der Kartenansicht unter \'Menü\' → \'Kartenebenen\' einen Haken bei \'Favoriten\' setzen. " " Online OSM Klassifizierung mit Bildern" Fehler in der Offlinesuche aufgetreten Konnte geointent nicht verarbeiten: \'%s\' @@ -722,7 +722,7 @@ ÖPNV-Haltestellen POI… Kartenquelle… - Darstellung + Kartenebenen Suche POI Trackball für Kartenbewegung benutzen diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index cdef22d669..4a282cc532 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -864,7 +864,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A \n\t\'To direction of movement\' - Map will continuously be aligned with your heading \n\t\'To compass\' - Map will continuously be aligned with device compass reading - Download successful.\n\t\n\tTo use activate \'Menu\' -> \'Define View\' -> \'Map source…\' -> \'Offline vector maps\'. + Download successful.\n\t\n\tTo use activate \'Menu\' -> \'Map layers\' -> \'Map source…\' -> \'Offline vector maps\'. Day/Night Mode \tThe map appearance can for some vector maps be changed between day (brighter) and night (darker). \n\tNight colors are safer for night driving. @@ -1037,7 +1037,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Reverse GPX direction Use current destination Pass along entire track - Offline vector map present for this location. \n\t\n\tTo use activate \'Menu\' -> \'Define view\' -> \'Map Source…\' -> \'Offline vector maps\'. + Offline vector map present for this location. \n\t\n\tTo use activate \'Menu\' -> \'Map layers\' -> \'Map Source…\' -> \'Offline vector maps\'. Voice guidance output Choose channel to play voice guidance (system-dependent) Voice call audio @@ -1071,7 +1071,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A \tFrequently used points can be saved as Favorites. \n\tTo save a point as Favorite go to the map context menu, select option \'Add to favorites\' and then enter a name for it. After saving a Favorite, it is accessible via \'Main Screen\' -> \'Favorites\'. \n\tLong pressing on a Favorite in the \'Favorites\' menu provides options to set it as desination, Edit or Delete it. - \n\tTo display all Favorite points directly on the map, on the map screen enable layer \'Favorites\' under \'Menu\' -> \'Define view\'. + \n\tTo display all Favorite points directly on the map, on the map screen enable layer \'Favorites\' under \'Menu\' -> \'Map layers\'. Online OSM map classification with images Error occurred in offline search @@ -1082,7 +1082,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Display language incomplete Map Source - \tThe map source and layers displayed are changed via \'Menu\' -> \'Define view\' in map view. + \tThe map source and layers displayed are changed via \'Menu\' -> \'Map layers\' in map view. \n\tUnder \'Map source…\' you can choose using the pre-loaded offline vector maps, predefined (online) tile sources (activate the \'Online and tile maps\' plugin for this), or maps manually created using e.g. OsmAndMapCreator on a PC. \n\tOsmAnd also supports custom sources. @@ -1252,7 +1252,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A Transportation stops POI… Map source… - Define view + Map layers Search POI Use trackball to move map Use trackball From 71cf39f018be4dee0588c87e348e66ea636aa957 Mon Sep 17 00:00:00 2001 From: "Mina G. Joolaee" Date: Tue, 6 Aug 2013 12:42:35 +0200 Subject: [PATCH 095/145] Translated using Weblate. --- OsmAnd/res/values-fa/strings.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index 32cb75fa9b..d151ef1994 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -1524,4 +1524,11 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. اعلام نقاط بین راهی GPX توقف OsMoDroid شروع OsMoDroid - + اطلاعات FPS + انتخاب منطقه رانندگی:آمریکا،اروپا،انگلستان،آسیا و سایر مناطق + ژاپن + ایالات متحده آمریکا + کانادا + اروپا و آسیا + انگلستان،هند،استرالیا و سایر کشورها + From 63798434529a705445c6d5093d8edba01717a643 Mon Sep 17 00:00:00 2001 From: sonora Date: Tue, 6 Aug 2013 12:59:42 +0200 Subject: [PATCH 096/145] one missing "map layers" change in de strings --- OsmAnd/res/values-de/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 5a9a3b9647..1a7415e7fe 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -539,7 +539,7 @@ Anzeigesprache wählen Anzeigesprache Kartenquelle - \tDie Kartenquelle und die angezeigten Ebenen können in der Katenansicht über das Menü \'Menü\' -> \'Anzeige konfigurieren\' verändert werden. + \tDie Kartenquelle und die angezeigten Ebenen können in der Katenansicht über das Menü \'Menü\' -> \'Kartenebenen\' verändert werden. \n\tIm Menü \'Kartenquelle…\' können Sie die Karte wählen: vorher heruntergeladene Offline-Vektor-Karten, vordefinierte Online-Kachel-Karten (aktivieren Sie das Plugin \'Online und Kachel-Karten\') oder manuell am Rechner (z.B. mit OsmAndMapCreator) erstellte Karten. \n\tOsmAnd unterstützt auch benutzerdefinierte Quellen. From b0412402cd2906dffe4bd9bb3da5f2c08573660a Mon Sep 17 00:00:00 2001 From: "Mina G. Joolaee" Date: Tue, 6 Aug 2013 12:58:24 +0200 Subject: [PATCH 097/145] Translated using Weblate. --- OsmAnd/res/values-fa/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-fa/strings.xml b/OsmAnd/res/values-fa/strings.xml index d151ef1994..175720a960 100644 --- a/OsmAnd/res/values-fa/strings.xml +++ b/OsmAnd/res/values-fa/strings.xml @@ -1530,5 +1530,5 @@ OsmAnd منبع باز است و فعالانه در حال توسعه است. ایالات متحده آمریکا کانادا اروپا و آسیا - انگلستان،هند،استرالیا و سایر کشورها + انگلستان، هند، استرالیا و سایر کشورها From 8025aeeac7bcd6c925236fb8d78ea89cbfc7d703 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Tue, 6 Aug 2013 19:53:25 +0200 Subject: [PATCH 098/145] transifex client config ready for transifex translations --- .tx/config | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .tx/config diff --git a/.tx/config b/.tx/config new file mode 100644 index 0000000000..6e9988a474 --- /dev/null +++ b/.tx/config @@ -0,0 +1,16 @@ +[main] +host = https://www.transifex.com + +[osmand.stringsxml] +file_filter = OsmAnd/res/values-/strings.xml +source_file = OsmAnd/res/values/strings.xml +source_lang = en +trans.zh-CN = OsmAnd/res/values-zh-rCN/strings.xml +trans.zh-TW = OsmAnd/res/values-zh-rTW/strings.xml + +[osmand.bidforfixxml] +file_filter = OsmAnd/res/values-/bidforfix.xml +source_file = OsmAnd/res/values/bidforfix.xml +source_lang = en +trans.zh-CN = OsmAnd/res/values-zh-rCN/bidforfix.xml +trans.zh-TW = OsmAnd/res/values-zh-rTW/bidforfix.xml From a43915f81d0a91c09051e5f0584c6c5d23e2b3e2 Mon Sep 17 00:00:00 2001 From: P P Date: Tue, 6 Aug 2013 13:13:39 +0200 Subject: [PATCH 099/145] Translated using Weblate. --- OsmAnd/res/values-bg/strings.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/OsmAnd/res/values-bg/strings.xml b/OsmAnd/res/values-bg/strings.xml index 8a40bd5b52..10822bfea4 100644 --- a/OsmAnd/res/values-bg/strings.xml +++ b/OsmAnd/res/values-bg/strings.xml @@ -1539,4 +1539,12 @@ OsmAnd е с отворен код и активно да се развива. Използване на филтър на Kalman Настройки за гласови напътствия - имена на улици, предупреждения за пътя (стопове, легнали полицаи), предупреждения за камери, ограничения на скоростта Парола за OSM (по желание) + кадри/сек + Изберете район: САЩ, Европа, Великобритания, Азия или друг + Район + Япония + САЩ + Канада + Европа и Азия + Великобритания, Индия, Австралия и други From f172b492093599d862eeba2c40b7219de2e8f5c9 Mon Sep 17 00:00:00 2001 From: jan madsen Date: Tue, 6 Aug 2013 20:34:02 +0200 Subject: [PATCH 100/145] Translated using Weblate. --- OsmAnd/res/values-da/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index 6ded0e523e..d10d06addf 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -513,7 +513,7 @@ Bruges for at køre OsmAnd mens skærmen er slukket Kortretning Hentning lykkedes. -\nAktiver under \'Menu\' -> \'Definer visning\' -> \'Vælg kortkilde…\' -> \'Offline vektorkort\'. +\nAktiver under \'Menu\' -> \'Kortlag\' -> \'Vælg kortkilde…\' -> \'Offline vektorkort\'. Dag/nat tilstand Format: Wikipedia (offline) @@ -929,7 +929,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Passere langs hele sporet Offline vektor-kort er tilgængelig for denne placering. -\n\nFor at anvende aktiver \'Menu\' -> \'Definer visning\' -> \'Vælg kortkilde…\' -> \'Offline vektor-kort\'. +\n\nFor at anvende aktiver \'Menu\' -> \'Kortlag\' -> \'Vælg kortkilde…\' -> \'Offline vektor-kort\'. Stemmeindstillinger Vælg audiokanal til at afspille talevejledning (system afhængig) Stemmeopkald lyd @@ -1051,7 +1051,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Ofte brugte steder kan gemmes som favoritter. \nFor at gemme et sted som favorit gå til genvejsmenu, vælg \'Tilføj til favoritter\' og indtast et navn. Når favoriten er gemt, er den tilgængelig via\'Start skær\' -> \'Favoritter\'. \nLangt tryk på en favorit i \'Favorit\' menuen åbner muligheder for at bruge den som destination, redigere eller slette den. -\nFor at vise alle favoritsteder direkte på kortet, aktiver kort overlejringen \'Favoritter\' under \'Menu\' -> \'Definer visning\'. +\nFor at vise alle favoritsteder direkte på kortet, aktiver kort overlejringen \'Favoritter\' under \'Menu\' -> \'Kortlag\'. Ændringer i 1.1.4: \n* Redesign af brugerflade @@ -1133,7 +1133,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, OSM-fejlbeskrivelse (online) Stoppesteder Vælg kortkilde… - Definer visning + Kortlag Søg interessepunkt Brug trackball for at flytte kortet @@ -1288,7 +1288,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Online søgning Maks. online zoom Vælg maksimum zoom niveau der hentes for online delkort - Kortkilden og lag der vises kan ændres via \'Menu\' -> \'Definer visning\' i kort visning. + Kortkilden og lag der vises kan ændres via \'Menu\' -> \'Kortlag\' i kort visning. \nUnder \'Kortkilde...\' vælges de forhåndsindlæste vektorkort, forhåndsdefinerede (online) delkortkilder (aktiver \'Online og delkort\' udvidelsen) eller kort der er manuelt oprettet f.eks. ved hjælp af OsmAndMapCreator på en PC. \nOsmAnd understøtter også brugerdefinerede kilder. \n From 83ac34ee07d0e625e052da37194fd9644cb73c10 Mon Sep 17 00:00:00 2001 From: Rodolfo de Vries Date: Tue, 6 Aug 2013 19:00:35 +0200 Subject: [PATCH 101/145] Translated using Weblate. --- OsmAnd/res/values-nl/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index 0b4a5fdcff..c47a224965 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -176,7 +176,7 @@ Dit is om OsmAnd te gebruiken als het scherm uit is kaartrotatie - Download succesvol.\n\t\n\tOm te gebruiken, activeer \'Menu\' -> \'Definieer beeld\' -> \'Kaarbron…\' -> \'Offline vectorkaarten\'. + Download succesvol.\n\t\n\tOm te gebruiken, activeer \'Menu\' -> \'Kaartlagen\' -> \'Kaartbron…\' -> \'Offline vectorkaarten\'. Dag/Nacht modus Verbeter openstreetmap gegevens @@ -326,7 +326,7 @@ Keer richting van GPX-route om Gebruik huidige bestemming Volg de gehele track - Offline vectorkaart aanwezig voor deze locatie. \n\t\n\tOm deze te gebruiken, activeer \'Menu\' -> \'Definieer beeld\' -> \'Kaartbron…\' -> \'Offline vectorkaarten\'. + Offline vectorkaart aanwezig voor deze locatie. \n\t\n\tOm deze te gebruiken, activeer \'Menu\' -> \'Kaartlagen\' -> \'Kaartbron…\' -> \'Offline vectorkaarten\'. Stembegeleiding audiokanaal Kies kanaal voor de stembegeleiding (systeemafhankelijk) als telefoongesprek @@ -367,7 +367,7 @@ \tVeelgebruikte punten kunnen worden bewaard als favorieten. \n\tOm een punt als favoriet te bewaren, ga naar het kaartcontextmenu, kies de optie \'Voeg toe aan favorieten\' en geef het dan een naam. Daarna is het toegankelijk via \'Hoofdmenu\' -> \'Favorieten\'. \n\tMet een lange druk op een favoriet in het menu \'Favorieten\' kan je deze als bestemming kiezen, bewerken of verwijderen. - \n\tJe kan alle favorieten tegelijk op de kaart weergeven door de laag \'Favorieten\' aan te zetten op het kaartscherm (\'Menu\' -> \'Definieer beeld\'. + \n\tJe kan alle favorieten tegelijk op de kaart weergeven door de laag \'Favorieten\' aan te zetten op het kaartscherm (\'Menu\' -> \'Kaartlagen\'. " Online OSM kaart classificatie met foto\'s" Fout bij offline zoeken @@ -550,7 +550,7 @@ OV-haltes Interessepunt… Kaartbron… - Definieer beeld + Kaartlagen Zoek interessepunt Gebruik trackball om de kaart te verschuiven @@ -1026,7 +1026,7 @@ \n\t\'Nacht\' - gebruik altijd de nacht modus↵ \n\t\'Lichtsensor\' - de kaartweergave wordt bepaald door de lichtsensor van he apparaat (indien aanwezig) " -"\tDe kaartbron en de kaartlagen kunnen vanuit het kaartscherm worden gewijzigd via \'Menu\' -> \'Definieer beeld\'.↵ +"\tDe kaartbron en de kaartlagen kunnen vanuit het kaartscherm worden gewijzigd via \'Menu\' -> \'Kaartlagen\'.↵ \n\tOnder \'Kaartbron…\' kan je kiezen uit gedownloade vectorkaarten, online kaartsegmenten (wan een website, activeer hiervoor de plugin \'Online kaarten\'), of kaarten die je gemaakt hebt met b.v. OsmAndMapCreator op een PC.↵ \n\tOsmAnd ondersteunt ook zelfgemaakte kaartbronnen. " From bb82960a1f78d73681c099afc9ebabf655f9503f Mon Sep 17 00:00:00 2001 From: stephan 75 Date: Tue, 6 Aug 2013 20:35:16 +0200 Subject: [PATCH 102/145] Translated using Weblate. --- OsmAnd/res/values-de/strings.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/OsmAnd/res/values-de/strings.xml b/OsmAnd/res/values-de/strings.xml index 1a7415e7fe..0293db546c 100644 --- a/OsmAnd/res/values-de/strings.xml +++ b/OsmAnd/res/values-de/strings.xml @@ -1,4 +1,4 @@ - + \nZeitspanne: %1$d:%2$02d:%3$02d \nZeit in Bewegung: %1$d:%2$02d:%3$02d Als Ziel wählen @@ -1356,4 +1356,12 @@ Ansagen … Einstellungen für Ansagen zu Straßennamen, Verkehrswarnungen, Blitzern oder Höchstgeschwindigkeit Straßennamen ansagen (TTS) + FPS-Info + Region zum Fahren wählen: USA, Europa, UK, Asien etc. + Japan + USA + Kanada + Europa und Asien + UK, Indien, Australien u.a. + GPX-Wegpunkte ansagen From 28a40056865f1d03f5cd31b7f42248d0192fdcb3 Mon Sep 17 00:00:00 2001 From: Yannis Gyftomitros Date: Tue, 6 Aug 2013 21:44:25 +0200 Subject: [PATCH 103/145] Translated using Weblate. --- OsmAnd/res/values-el/strings.xml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-el/strings.xml b/OsmAnd/res/values-el/strings.xml index 0bf770872b..e973f9263c 100644 --- a/OsmAnd/res/values-el/strings.xml +++ b/OsmAnd/res/values-el/strings.xml @@ -387,7 +387,7 @@ \n\t\'Χωρίς περιστροφή (ο βορράς επάνω)\' - Ο χάρτης δεν θα περιστρέφεται. Ο βορράς θα είναι πάντα επάνω \n\t\'Προς την κατεύθυνση κίνησης\' - Ο χάρτης συνεχώς θα συγχρονίζεται με την κατεύθυνσή σας \n\t\'Πυξίδα\' - Ο χάρτης συνεχώς θα συγχρονίζεται με την κατεύθυνση της πυξίδας " - Η λήψη ήταν επιτυχής.\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\' -> \'Ορισμός εμφάνισης\' -> \'Πηγή χάρτη…\' -> \'Offline διανυσματικοί χάρτες\'. + Η λήψη ήταν επιτυχής.\n\t\n\tΓια χρήση ενεργοποιήστε \'Μενού\' -> \'Επίπεδα χάρτη\' -> \'Πηγή χάρτη…\' -> \'Offline διανυσματικοί χάρτες\'. Λειτουργία ημέρας/νύχτας "\tΗ εμφάνιση μπορεί σε μερικούς διανυσματικούς χάρτες να αλλάξει μεταξύ ημέρας (πιο φωτεινό) και νύχτας (πιο σκοτεινό). \n\tΤα νυχτερινά χρώματα είναι πιο ασφαλή για νυχτερινή οδήγηση. @@ -558,7 +558,7 @@ Αντιστροφή κατεύθυνσης GPX Χρήση τρέχοντος προορισμού Πέρασμα κατά μήκος ολόκληρου του ίχνους - Υπάρχουν διαθέσιμοι offline διανυσματικοί χάρτες για αυτή την τοποθεσία.\n\nΓια χρήση ενεργοποιήστε \'Μενού\' -> \'Ορισμός εμφάνισης\' -> \'Πηγή χάρτη…\' -> \'Offline διανυσματικοί χάρτες\'. + Υπάρχουν διαθέσιμοι offline διανυσματικοί χάρτες για αυτή την τοποθεσία.\n\nΓια χρήση ενεργοποιήστε \'Μενού\' -> \'Επίπεδα χάρτη\' -> \'Πηγή χάρτη…\' -> \'Offline διανυσματικοί χάρτες\'. Έξοδος φωνητικής καθοδήγησης Επιλέξτε το κανάλι εκτέλεσης της φωνητικής καθοδήγησης (εξαρτώμενο από το σύστημα) Ήχος κλήσης φωνής @@ -591,7 +591,8 @@ "\tΤα σημεία που χρησιμοποιούνται συχνά μπορούν να αποθηκευτούν ως Αγαπημένα. \n\tΓια να αποθηκεύσετε ένα σημείο ως Αγαπημένο πηγαίνετε στο μενού περιβάλλοντος χάρτη, επιλέξτε \'Προσθήκη στα αγαπημένα\' δώστε του κάποιο όνομα. Μετά την αποθήκευση ενός Αγαπημένου, είναι προσβάσιμο μέσω του \'Κύρια Οθόνη\' -> \'Αγαπημένα\'. \n\tΠαρατεταμένο πάτημα ενός Αγαπημένου στο μενού \'Αγαπημένα\' παρέχει επιλογές να το ορίσετε ως προορισμό, να το Επεξεργαστείτε ή να το διαγράψετε. -\n\tΓια να εμφανιστούν όλα τα Αγαπημένα κατευθείαν στο χάρτη, στην οθόνη χάρτη ενεργοποιήστε το επίπεδο \'Αγαπημένα\' στο \'Μενού\' -> \'Ορισμός εμφάνισης\'. " +\n\tΓια να εμφανιστούν όλα τα Αγαπημένα κατευθείαν στο χάρτη, στην οθόνη χάρτη ενεργοποιήστε το επίπεδο \'Αγαπημένα\' στο \'Μενού\' -> \'Επίπεδα χάρτη\'. " + Προέκυψε σφάλμα κατά την offline αναζήτηση Δεν ήταν δυνατή η ανάλυση της γεωγρ πρόθεσης \'% s\' Αναζήτηση γεωγραφικής τοποθεσίας @@ -599,7 +600,7 @@ Επιλέξτε γλώσσα εμφάνισης Γλώσσα εμφάνισης Πηγή Χάρτη - "\tΗ πηγή χάρτη και οι στρώσεις που εμφανίζονται αλλάζουν μέσω του \'Μενού\' -> \'Ορισμός Εμφάνισης\' στην όψη χάρτη. + "\tΗ πηγή χάρτη και οι στρώσεις που εμφανίζονται αλλάζουν μέσω του \'Μενού\' -> \'Επίπεδα χάρτη\' στην όψη χάρτη. \n\tΚάτω από το \'Πηγή χάρτη…\' μπορείτε να επιλέξετε τη χρήση των εγκατεστημένων offline διανυσματικών χαρτών, προκαθορισμένων (online) πηγών πλακιδίων (ενεργοποιήστε το πρόσθετο \'Online χάρτες\' για αυτό), ή χάρτες που κατασκευάστηκαν χειροκίνητα χρησιμοποιώντας π.χ. το OsmAndMapCreator σε κάποιο PC. \n\tΟ OsmAnd επίσης υποστηρίζει προσαρμόσιμες πηγές. " @@ -768,7 +769,7 @@ Στάσεις ΜΜΜ Σημ Ενδ… Πηγή χάρτη… - Ορισμός εμφάνισης + Επίπεδα χάρτη Αναζήτηση ΣΕ Χρήση του trackball για μετακίνηση του χάρτη @@ -794,7 +795,7 @@ Φιλτράρισμα Ήχος ανοικτός Ήχος κλειστός - Επιλέξτε φωνητική καθοδήγηση για την πλοήγηση + Επιλέξτε φωνητική καθοδήγηση για την πλοήγηση (κωδικοί γλώσσας, δείτε το ISO 639-1) Φωνητική καθοδήγηση Αρχικοποίηση δεδομένων φωνής… Μη υποστηριζόμενη έκδοση των δεδομένων φωνής @@ -1310,4 +1311,9 @@ Επιλέξτε τον τύπο εστίασης της εσωτερικής κάμερας Παύση OsMoDroid Έναρξη OsMoDroid - + Ιαπωνία + ΗΠΑ + Καναδάς + Ευρώπη & Ασία + ΗΒ, Ινδία, Αυστραλία, Κύπρος κλπ + From f2ed87a5028779b580becd3b2d92d79ff38486c7 Mon Sep 17 00:00:00 2001 From: Damjan Gerl Date: Tue, 6 Aug 2013 19:32:23 +0200 Subject: [PATCH 104/145] Translated using Weblate. --- OsmAnd/res/values-sl/strings.xml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 8e7552d9ef..266847d2c8 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -439,7 +439,7 @@ Filter po meri Aplikacija GPS Status ni nameščena. Ali jo želite poiskati v trgovini Market? Uporabi mesto … - Nastavitve prikaza + Sloji zemljevida Kje sem? Skrij filter Prikaži filter @@ -697,7 +697,7 @@ Podatki brez povezave (prenos) Zmožnost načina spanja Uporabi za izvajanje OsmAnd, ko je zaslon izklopljen - Prejem je uspešen.\n\t\n\tZa uporabo omogočite \'Meni\'->\'Nastavitve prikaza\'->\'Vir zemljevidov …\'->Nepovezani vektorski zemljevidi\'. + Prejem je uspešen.\n\t\n\tZa uporabo omogočite \'Meni\'->\'Sloji zemljevida\'->\'Vir zemljevidov …\'->Nepovezani vektorski zemljevidi\'. Način dneva/noči Sončni vzhod / zahod Dnevni @@ -769,7 +769,7 @@ Obratna smer GPX Uporabi trenuten cilj Podaj celotno sled - Za to mesto so na voljo nepovezani vektorski zemljevidi.\n\t\n\tZa njihovo uporabi omogočite \'Meni\'->\'Nastavitve prikaza\'->\'Vir zemljevida …\'->\'Nepovezani vektorski zemljevidi\'. + Za to mesto so na voljo nepovezani vektorski zemljevidi.\n\t\n\tZa njihovo uporabi omogočite \'Meni\'->\'Sloji zemljevida\'->\'Vir zemljevida …\'->\'Nepovezani vektorski zemljevidi\'. Obvestilni zvok Zvok predstavnosti/glasbe Program ne more prejeti plasti zemljevida %1$s, poskusite jo ponovno namestiti. @@ -801,7 +801,11 @@ GPX točka \'\'{0}\'\' je bila uspešno dodana Dodaj navigacijsko točko posneti sledi GPX Dodaj navigacijsko točko sledi GPX - "\tPogosto uporabljene točke si lahko shranite kot Priljubljene.\n\tČe želite shraniti točko kot priljubljeno, pojdite v kontekstni meni zemljevida in izberite \'Dodaj med priljubljene\' in vnesite ime. Po shranjevanju priljubljene točke je ta dostopna preko \'Glavnega zaslona\' -> \'Priljubljene\'.\n\tDolg pritisk na priljubljeni točki v meniju \'Priljubljene\' nam ponudi možnost, da jo določimo kot cilj, uredimo ali brišemo.\n\tZa prikaz vseh priljubljenih točk na zemljevidu, omogočite sloj \'Priljubljene\' v \'Meni\' -> \'Nastavitve prikaza\'. " + \tPogosto uporabljene točke si lahko shranite kot Priljubljene. + \n\tČe želite shraniti točko kot priljubljeno, pojdite v kontekstni meni zemljevida in izberite \'Dodaj med priljubljene\' in vnesite ime. Po shranjevanju priljubljene točke je ta dostopna preko \'Glavnega zaslona\' -> \'Priljubljene\'. + \n\tDolg pritisk na priljubljeni točki v meniju \'Priljubljene\' nam ponudi možnost, da jo določimo kot cilj, uredimo ali brišemo. + \n\tZa prikaz vseh priljubljenih točk na zemljevidu, omogočite sloj \'Priljubljene\' v \'Meni\' -> \'Sloji zemljevida\'. + Prevoz Dodatne nastavitve Nastavitve @@ -965,9 +969,9 @@ Pomembnejše lastnosti: Prenos območij Iskanje znaka … Iskanje v bližini mesta zadnjega zemljevida - \tVir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' -> \'Določitev pogleda\' v pogledu zemljevida. - \n\tPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku. - \n\tOsmAnd podpira tudi vire po meri. + \tVir zemljevida in prikazane plasti lahko spreminjate preko \'Meni\' -> \'Sloji zemljevida\' v pogledu zemljevida. + \n\tPod \'Vir zemljevida …\' lahko izberete med uporabo prednaloženih vektorskih zemljevidov za delo brez povezave, vnaprej določenih spletnih zemljevidov (za to aktivirajte vtičnik \'Spletni zemljevidi\'), ali ročno ustvarjenih zemljevidov z uporabo npr. OsmAndMapCreator-ja na računalniku. + \n\tOsmAnd podpira tudi vire po meri. Priljubljene točke uspešno shranjene v {0} Oblika delovnega časa ni podprta za urejanje From 8852dd05ed4f53742ad7e30d18f2e0e21a80ad45 Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Tue, 6 Aug 2013 18:12:45 +0200 Subject: [PATCH 105/145] Translated using Weblate. --- OsmAnd/res/values-zh-rTW/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index 7063120c96..bbb3d03c25 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -389,7 +389,7 @@ \n\t\'行進方向\' - 地圖會不斷對準您的車頭方向 \n\t\'依羅盤\' - 地圖會不斷對準裝置的羅盤指示 - 下載完成。\n\t\n\t透過 \'選單\' -> \'定義檢視\' -> \'地圖來源…\' -> \'離線向量地圖\'啟動使用。 + 下載完成。\n\t\n\t透過 \'選單\' -> \'地圖圖層\' -> \'地圖來源…\' -> \'離線向量地圖\'啟動使用。 日/夜模式 \t部份的向量地圖的地圖顯示可在日間(較亮)與夜間(較暗)之間切換. \n\t夜間顏色是在夜間行駛比較安全。 @@ -523,7 +523,7 @@ 反轉 GPX 方向 使用目前的目的地 沿著整條行跡往前 - 指定以離線向量地圖顯示\n\t\n\t啟用方式\'選單\' -> \'定義檢視\' -> \'地圖來源…\' -> \'離線向量圖\'。 + 指定以離線向量地圖顯示\n\t\n\t啟用方式\'選單\' -> \'地圖圖層\' -> \'地圖來源…\' -> \'離線向量圖\'。 語音導航輸出 選擇播放語音導航輸出(依靠系統) 通話音訊 @@ -557,7 +557,7 @@ \t常用地點可記錄成我的最愛。 \n\叫出地圖的快顯功能表，選\'加到我的最愛\'，然後輸入名字即可將某一點位置設為我的最愛。事後可透由\'主畫面\' ->\'我的最愛\'找到它。 \n\t選按一個我的最愛會跳出一些選項，可設為目的地、編輯或刪除它。 - \n\t欲將我的最愛顯示在地圖上，只要在地圖畫面模式下由\'選單\' ->\'定義檢視\'開啟\'我的最愛\'即可。 + \n\t欲將我的最愛顯示在地圖上，只要在地圖畫面模式下由\'選單\' ->\'地圖圖層\'開啟\'我的最愛\'即可。 離線查尋發生錯誤 無法解析地理原意 \'%s\' @@ -566,7 +566,7 @@ 選擇顯示語言 顯示語言 地圖來源 - \t地圖來源與顯示圖層可透過在地圖畫面下的\'選單\'->\'定義檢視\'來改變。 + \t地圖來源與顯示圖層可透過在地圖畫面下的\'選單\'->\'地圖圖層\'來改變。 \n\t在\'地圖來源…\'您可以選擇使用預先載入的離線向量圖，預先定義的（線上）圖磚來源(在此啟動\'線上和地圖圖磚\'外掛元件)，或手動建立地圖，例如使用 PC 上的 OsmAndMapCreator。 \n\tOsmAnd 也支援自訂來源。 @@ -739,7 +739,7 @@ 車站、站牌 興趣點… 地圖來源… - 定義檢視 + 地圖圖層 查尋興趣點 使用軌跡球移動地圖 From ee0b703c920f524d44ec51893548338f3c06e552 Mon Sep 17 00:00:00 2001 From: vshcherb Date: Tue, 6 Aug 2013 22:49:39 +0200 Subject: [PATCH 106/145] Update RouteCalculationResult.java --- .../src/net/osmand/plus/routing/RouteCalculationResult.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java index cf487add9d..e0bd9a659d 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java +++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java @@ -837,7 +837,7 @@ public class RouteCalculationResult { while(aInfo < alarmInfo.size()) { AlarmInfo inf = alarmInfo.get(aInfo); int d = dist - listDistance[inf.locationIndex]; - if(d > 700){ + if(d > 250){ break; } float time = speed > 0 ? d / speed : Integer.MAX_VALUE; @@ -928,4 +928,4 @@ public class RouteCalculationResult { private int directionInfoInd; } -} \ No newline at end of file +} From de6c9549a459fb8ee71b38a78f5c0c2369ee5c17 Mon Sep 17 00:00:00 2001 From: Taras Andrusyak Date: Tue, 6 Aug 2013 21:58:24 +0200 Subject: [PATCH 107/145] Translated using Weblate. --- OsmAnd/res/values-uk/strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-uk/strings.xml b/OsmAnd/res/values-uk/strings.xml index f55ec4110f..312cf186aa 100644 --- a/OsmAnd/res/values-uk/strings.xml +++ b/OsmAnd/res/values-uk/strings.xml @@ -367,7 +367,7 @@ Виберіть зворотній напрямок Використовувати поточний пункт призначення Пройти увесь шлях спочатку - Для цього регіону доступні оффлайн векторні мапи\n\t\n\tДля їх використання виберіть пункт меню \"Мапа\" → \"Джерело мапи\" → \"Оффлайн векторні мапи\". + Для цього регіону доступні оффлайн векторні мапи\n\t\n\tДля їх використання виберіть пункт меню \"Шари мапи\" → \"Джерело мапи\" → \"Оффлайн векторні мапи\". Голосові інструкції Виберіть канал для голосових інструкцій (залежить від системи) Потік голосових дзвінків @@ -407,7 +407,7 @@ \tТочки, що часто використовуються можуть бути додані в Закладки. \n\tДля додавання точки до Закладок, відкрийте контекстне меню мапи, виберіть пункт \'Додати в Закладки\' та додайте назву закладки. Після додання до Закладок, вона буде доступна в меню \'Мапа\' -> \'Закладки\'. \n\tДовге натискання на закладку в меню \'Закладки\' надасть можливість встановити її в якості місця призначення. редагувати її чи вилучити. - \n\tДля показу всіх збережених точок на мапі, активуйте шар \'Закладки\' в \'Мапа\' -> \'Джерело мапи…\'. + \n\tДля показу всіх збережених точок на мапі, активуйте шар \'Закладки\' в \'Шари мапи\' -> \'Джерело мапи…\'. Помилка автономного пошуку Неможливо обробити запит \'%s\' @@ -584,7 +584,7 @@ Зупинки транспорту POI… Джерело мапи… - Мапа + Шари мапи Шукати POI Використовувати трекбол для руху мапи @@ -1323,7 +1323,7 @@ OsmAnd має відкриті сирці і активно розвиваєть \n\t\"Нічний\" - завжди використовується нічний режим \n\t\"Датчик освітленості\" - вигляд мапи змінюється автоматично в залежності від датчика освітленості (при його наявності) у вашому пристрої - \tМапи і шари можна змінювати вибравши \"Мапа\" (іконка глобуса) на екрані мапи + \tМапи і шари можна змінювати вибравши \"Шари мапи\" (іконка глобуса) на екрані мапи \n\tВ \"Джерела мап…\" можна вибрати попередньо завантажені векторі мапи, онлайн мапи з різних джерел (для використання потрібно увімкнути втулок \"Онлайн мапи\") або самостійно створені мапи (наприклад, за допомогою OsmAndMapCreator для ПК). \n\tOsmAnd також підтримує джерела користувача. From 2f2fac6cff2e1738d13247d365d93b89411cbb57 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Tue, 6 Aug 2013 23:25:05 +0200 Subject: [PATCH 108/145] Translated using Weblate. --- OsmAnd/res/values-be/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/OsmAnd/res/values-be/strings.xml b/OsmAnd/res/values-be/strings.xml index 940c142858..99e113d3ab 100644 --- a/OsmAnd/res/values-be/strings.xml +++ b/OsmAnd/res/values-be/strings.xml @@ -1,8 +1,8 @@ -\nTime span: %1$d:%2$02d:%3$02d - \nTime moving: %1$d:%2$02d:%3$02d - Browse map - Default profile +\nДыяпазон часу: %1$d:%2$02d:%3$02d + \nЧас руху: %1$d:%2$02d:%3$02d + Мапа + Прадвызначаны Map view and navigation settings are remembered per use profile. Set your default profile here. Destination %1$s Ужыць як прызначэньне @@ -206,7 +206,7 @@ Абмежаваньне хуткасьці GPX - Lat %1$.3f, lon %2$.3f + Ш %1$.3f, Д %2$.3f Гэтае месца From e9ca2089840d00a3a61f19aefd2d4fb52cdbe430 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Aug 2013 00:19:24 +0200 Subject: [PATCH 109/145] also replace ':' before prnouncing prompts --- OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 29d43950be..77d4b9a281 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -424,7 +424,12 @@ public class VoiceRouter { } else if(!Algorithms.isEmpty(i.getStreetName())) { res = i.getStreetName(); } - return res.replace('-', ' '); + // replace characters which may produce unwanted tts sounds: + if(res != null) { + res = res.replace('-', ' '); + res = res.replace(':', ' '); + } + return res; } private void playPrepareTurn(RouteDirectionInfo next, int dist) { From 7e5301af3df7a1cf745f71582ca8f474da625ca6 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Aug 2013 00:22:30 +0200 Subject: [PATCH 110/145] Fix UI feedback --- OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index a382b5bd42..b248a7b2db 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -619,9 +619,11 @@ public class MapInfoLayer extends OsmandMapLayer { mapInfoControls.changeVisibility(mi); } recreateControls(); + listAdapter.notifyDataSetInvalidated(); } else if(position == 0) { mapInfoControls.resetToDefault(); recreateControls(); + listAdapter.notifyDataSetInvalidated(); } } }); From d3c7a75ab09a97ec0e79d4eeec26c0f2482a2e6c Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Aug 2013 01:50:03 +0200 Subject: [PATCH 111/145] introduce getSpeakablePointName --- .../net/osmand/plus/routing/VoiceRouter.java | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java index 77d4b9a281..def1eafe29 100644 --- a/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java +++ b/OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java @@ -205,7 +205,7 @@ public class VoiceRouter { public void announceWaypoint(String w) { CommandBuilder p = getNewCommandPlayerToPlay(); if(p != null) { - p.arrivedAtWayPoint(w).play(); + p.arrivedAtWayPoint(getSpeakablePointName(w)).play(); } } @@ -277,7 +277,7 @@ public class VoiceRouter { if (repeat || currentStatus <= STATUS_UNKNOWN) { if (playGoAheadToDestination(nextInfo == null ? "" : getSpeakableStreetName(nextInfo.directionInfo), - nextInfo == null ? "" : nextInfo.pointName)) { + nextInfo == null ? "" : getSpeakablePointName(nextInfo.pointName))) { currentStatus = STATUS_TOLD; playGoAheadDist = 0; } @@ -286,7 +286,7 @@ public class VoiceRouter { } if(nextInfo.intermediatePoint){ if (repeat || currentStatus <= STATUS_UNKNOWN) { - if (playGoAheadToIntermediate(getSpeakableStreetName(nextInfo.directionInfo), nextInfo.pointName)) { + if (playGoAheadToIntermediate(getSpeakableStreetName(nextInfo.directionInfo), getSpeakablePointName(nextInfo.pointName))) { currentStatus = STATUS_TOLD; playGoAheadDist = 0; } @@ -383,7 +383,7 @@ public class VoiceRouter { private boolean playGoAheadToDestination(String strName, String destName) { CommandBuilder play = getNewCommandPlayerToPlay(); if(play != null){ - play.goAhead(router.getLeftDistance(), strName).andArriveAtDestination(destName).play(); + play.goAhead(router.getLeftDistance(), strName).andArriveAtDestination(getSpeakablePointName(destName)).play(); return true; } return false; @@ -392,7 +392,7 @@ public class VoiceRouter { private boolean playGoAheadToIntermediate(String strName, String iName) { CommandBuilder play = getNewCommandPlayerToPlay(); if(play != null){ - play.goAhead(router.getLeftDistanceNextIntermediate(), strName).andArriveAtIntermediatePoint(iName).play(); + play.goAhead(router.getLeftDistanceNextIntermediate(), strName).andArriveAtIntermediatePoint(getSpeakablePointName(iName)).play(); return true; } return false; @@ -413,7 +413,7 @@ public class VoiceRouter { play.goAhead(dist, streetName).play(); } } - + public String getSpeakableStreetName(RouteDirectionInfo i) { String res = ""; if(i == null || !router.getSettings().SPEAK_STREET_NAMES.get()){ @@ -432,6 +432,15 @@ public class VoiceRouter { return res; } + public String getSpeakablePointName(String pn) { + // replace characters which may produce unwanted tts sounds: + if(pn != null) { + pn = pn.replace('-', ' '); + pn = pn.replace(':', ' '); + } + return pn; + } + private void playPrepareTurn(RouteDirectionInfo next, int dist) { CommandBuilder play = getNewCommandPlayerToPlay(); if(play != null){ @@ -575,21 +584,21 @@ public class VoiceRouter { public void arrivedDestinationPoint(String name) { CommandBuilder play = getNewCommandPlayerToPlay(); if(play != null){ - play.arrivedAtDestination(name).play(); + play.arrivedAtDestination(getSpeakablePointName(name)).play(); } } public void arrivedIntermediatePoint(String name) { CommandBuilder play = getNewCommandPlayerToPlay(); if(play != null){ - play.arrivedAtIntermediatePoint(name).play(); + play.arrivedAtIntermediatePoint(getSpeakablePointName(name)).play(); } } public void arrivedWayPoint(String name) { CommandBuilder play = getNewCommandPlayerToPlay(); if(play != null){ - play.arrivedAtWayPoint(name).play(); + play.arrivedAtWayPoint(getSpeakablePointName(name)).play(); } } From 5b1609175e92cd6dc70952c8e82e1a58d91ffd63 Mon Sep 17 00:00:00 2001 From: sonora Date: Wed, 7 Aug 2013 09:19:17 +0200 Subject: [PATCH 112/145] explain debugging widget --- OsmAnd/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 4a282cc532..d8cbaf3f5e 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -9,7 +9,7 @@ 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 --> - FPS info + FPS debug info Select Driving Region : US, Europe, UK, Asia and Others Driving Region Japan From ecfd90e6d691b334e5ae94ec6fddfd2c6bdd3ac8 Mon Sep 17 00:00:00 2001 From: Unai Zalakain Date: Wed, 7 Aug 2013 14:21:39 +0200 Subject: [PATCH 113/145] use transifix-client's lang_map property to solve diff naming schemes problem --- .tx/config | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.tx/config b/.tx/config index 6e9988a474..a0d240db42 100644 --- a/.tx/config +++ b/.tx/config @@ -5,12 +5,10 @@ host = https://www.transifex.com file_filter = OsmAnd/res/values-/strings.xml source_file = OsmAnd/res/values/strings.xml source_lang = en -trans.zh-CN = OsmAnd/res/values-zh-rCN/strings.xml -trans.zh-TW = OsmAnd/res/values-zh-rTW/strings.xml +lang_map = zh-CN:zh-rCN, zh-TW:zh-rTW [osmand.bidforfixxml] file_filter = OsmAnd/res/values-/bidforfix.xml source_file = OsmAnd/res/values/bidforfix.xml source_lang = en -trans.zh-CN = OsmAnd/res/values-zh-rCN/bidforfix.xml -trans.zh-TW = OsmAnd/res/values-zh-rTW/bidforfix.xml +lang_map = zh-CN:zh-rCN, zh-TW:zh-rTW From 250d26749fd95e69951ef5ea52306f25fd8ad5a6 Mon Sep 17 00:00:00 2001 From: Robin Schneider Date: Wed, 7 Aug 2013 18:55:56 +0200 Subject: [PATCH 114/145] Improved readability with printf. --- OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java index bb93ab28e7..c0a410b2cf 100644 --- a/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java +++ b/OsmAnd-java/src/net/osmand/util/OpeningHoursParser.java @@ -661,11 +661,13 @@ public class OpeningHoursParser { private static void testOpened(String time, OpeningHours hours, boolean expected) throws ParseException { Calendar cal = Calendar.getInstance(); cal.setTime(new SimpleDateFormat("dd.MM.yyyy HH:mm").parse(time)); - boolean isOpen = hours.isOpenedForTime(cal); - System.out.println(" " + (isOpen == expected ? "ok" : "not ok") + " - " + "state for " + time+": " + isOpen); + boolean calculated = hours.isOpenedForTime(cal); + System.out.printf(" %sok: Expected %s: %b = %b\n", + ((calculated != expected) ? "NOT " : ""), time, expected, calculated); } public static void main(String[] args) throws ParseException { + // Test basic case OpeningHours hours = parseOpenedHours("Mo-Fr 08:30-14:40" ); //$NON-NLS-1$ System.out.println(hours); From a5744df1d61ba060da856f47f17e40835d478b07 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Aug 2013 19:12:01 +0200 Subject: [PATCH 115/145] Support for 1.1.4 lib --- OsmAnd-java/src/net/osmand/NativeLibrary.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/OsmAnd-java/src/net/osmand/NativeLibrary.java b/OsmAnd-java/src/net/osmand/NativeLibrary.java index 6116be16c8..e9e2531083 100644 --- a/OsmAnd-java/src/net/osmand/NativeLibrary.java +++ b/OsmAnd-java/src/net/osmand/NativeLibrary.java @@ -229,6 +229,12 @@ public class NativeLibrary { b &= load("OsmAndJNI", path); return b; } + + public static boolean loadOldLib(String path) { + boolean b = true; + b &= load("osmand", path); + return b; + } public static boolean load(String libBaseName, String path) { // look for a pre-installed library From ae707c7f9b12bf27015802d217dae4821a8c4e40 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Aug 2013 20:54:20 +0200 Subject: [PATCH 116/145] Add reroute function to plugin --- .../osmand/plus/osmodroid/OsMoDroidPlugin.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java b/OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java index bf20abf665..fe66b522a9 100644 --- a/OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java +++ b/OsmAnd/src/net/osmand/plus/osmodroid/OsMoDroidPlugin.java @@ -3,12 +3,14 @@ package net.osmand.plus.osmodroid; import java.util.ArrayList; import net.osmand.PlatformUtil; +import net.osmand.data.LatLon; import net.osmand.plus.ContextMenuAdapter; import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick; import net.osmand.plus.NavigationService; import net.osmand.plus.OsmandApplication; import net.osmand.plus.OsmandPlugin; import net.osmand.plus.R; +import net.osmand.plus.TargetPointsHelper; import net.osmand.plus.activities.MapActivity; import net.osmand.plus.views.MonitoringInfoControl; import net.osmand.plus.views.MonitoringInfoControl.MonitoringInfoControlServices; @@ -56,6 +58,19 @@ public class OsMoDroidPlugin extends OsmandPlugin implements MonitoringInfoContr } } + + public void reRouteTo(LatLon loc) { + OsmandApplication app = activity.getMyApplication(); + TargetPointsHelper targets = app.getTargetPointsHelper(); + // If we are in following mode then just update target point + targets.navigateToPoint(loc, true, -1); + if(!app.getRoutingHelper().isFollowingMode()) { + // If we are not in following mode then request new route to calculate + // Use default application mode + activity.followRoute(app.getSettings().getApplicationMode(), targets.getPointToNavigate(), targets.getIntermediatePoints(), + app.getLastKnownLocation(), null); + } + } }; From 1439a4406c1db127da066c9840bd988b1706feaf Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Aug 2013 21:25:15 +0200 Subject: [PATCH 117/145] Delete old impl --- .../osmand/binary/BinaryInspectorNative.java | 8 +- .../src/net/osmand/bridge/CoreOsmAnd.java | 56 ------------- .../src/net/osmand/bridge/CoreOsmAndJNI.java | 37 -------- .../src/net/osmand/bridge/ObfInspector.java | 46 ---------- .../src/net/osmand/bridge/StringVector.java | 84 ------------------- 5 files changed, 3 insertions(+), 228 deletions(-) delete mode 100644 OsmAnd-java/src/net/osmand/bridge/CoreOsmAnd.java delete mode 100644 OsmAnd-java/src/net/osmand/bridge/CoreOsmAndJNI.java delete mode 100644 OsmAnd-java/src/net/osmand/bridge/ObfInspector.java delete mode 100644 OsmAnd-java/src/net/osmand/bridge/StringVector.java diff --git a/OsmAnd-java/src/net/osmand/binary/BinaryInspectorNative.java b/OsmAnd-java/src/net/osmand/binary/BinaryInspectorNative.java index 1a948570cc..5fdd613fcc 100644 --- a/OsmAnd-java/src/net/osmand/binary/BinaryInspectorNative.java +++ b/OsmAnd-java/src/net/osmand/binary/BinaryInspectorNative.java @@ -5,8 +5,6 @@ import java.io.IOException; import java.util.Collections; import net.osmand.NativeLibrary; -import net.osmand.bridge.ObfInspector; -import net.osmand.bridge.StringVector; public class BinaryInspectorNative { @@ -21,9 +19,9 @@ public class BinaryInspectorNative { args = new String[]{"-vmap", "-bbox=11.3,47.1,11.6,47", "/home/victor/projects/OsmAnd/data/osm-gen/Austria_2.obf"}; // test cases show info NativeLibrary.loadAllLibs(null); - StringVector vector = new StringVector(); - Collections.addAll(vector, args); - ObfInspector.inspector(vector); +// StringVector vector = new StringVector(); +// Collections.addAll(vector, args); +// ObfInspector.inspector(vector); } public static void printUsage(String warning) { diff --git a/OsmAnd-java/src/net/osmand/bridge/CoreOsmAnd.java b/OsmAnd-java/src/net/osmand/bridge/CoreOsmAnd.java deleted file mode 100644 index f0c2c5ec6e..0000000000 --- a/OsmAnd-java/src/net/osmand/bridge/CoreOsmAnd.java +++ /dev/null @@ -1,56 +0,0 @@ -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.7 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -package net.osmand.bridge; - -public class CoreOsmAnd { - public static int get31TileNumberX(double longitude) { - return CoreOsmAndJNI.get31TileNumberX(longitude); - } - - public static int get31TileNumberY(double latitude) { - return CoreOsmAndJNI.get31TileNumberY(latitude); - } - - public static double get31LongitudeX(int x) { - return CoreOsmAndJNI.get31LongitudeX(x); - } - - public static double get31LatitudeY(int y) { - return CoreOsmAndJNI.get31LatitudeY(y); - } - - public static double getTileNumberX(float zoom, double longitude) { - return CoreOsmAndJNI.getTileNumberX(zoom, longitude); - } - - public static double getTileNumberY(float zoom, double latitude) { - return CoreOsmAndJNI.getTileNumberY(zoom, latitude); - } - - public static double checkLatitude(double latitude) { - return CoreOsmAndJNI.checkLatitude(latitude); - } - - public static double checkLongitude(double longitude) { - return CoreOsmAndJNI.checkLongitude(longitude); - } - - public static double getPowZoom(float zoom) { - return CoreOsmAndJNI.getPowZoom(zoom); - } - - public static double getLongitudeFromTile(float zoom, double x) { - return CoreOsmAndJNI.getLongitudeFromTile(zoom, x); - } - - public static double getLatitudeFromTile(float zoom, double y) { - return CoreOsmAndJNI.getLatitudeFromTile(zoom, y); - } - -} diff --git a/OsmAnd-java/src/net/osmand/bridge/CoreOsmAndJNI.java b/OsmAnd-java/src/net/osmand/bridge/CoreOsmAndJNI.java deleted file mode 100644 index 4eb1980bb6..0000000000 --- a/OsmAnd-java/src/net/osmand/bridge/CoreOsmAndJNI.java +++ /dev/null @@ -1,37 +0,0 @@ -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.7 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -package net.osmand.bridge; - -public class CoreOsmAndJNI { - public final static native long new_StringVector__SWIG_0(); - public final static native long new_StringVector__SWIG_1(long jarg1); - public final static native long StringVector_size(long jarg1, StringVector jarg1_); - public final static native long StringVector_capacity(long jarg1, StringVector jarg1_); - public final static native void StringVector_reserve(long jarg1, StringVector jarg1_, long jarg2); - public final static native boolean StringVector_isEmpty(long jarg1, StringVector jarg1_); - public final static native void StringVector_clear(long jarg1, StringVector jarg1_); - public final static native void StringVector_add(long jarg1, StringVector jarg1_, String jarg2); - public final static native String StringVector_get(long jarg1, StringVector jarg1_, int jarg2); - public final static native void StringVector_set(long jarg1, StringVector jarg1_, int jarg2, String jarg3); - public final static native void delete_StringVector(long jarg1); - public final static native int ObfInspector_inspector(long jarg1, StringVector jarg1_); - public final static native long new_ObfInspector(); - public final static native void delete_ObfInspector(long jarg1); - public final static native int get31TileNumberX(double jarg1); - public final static native int get31TileNumberY(double jarg1); - public final static native double get31LongitudeX(int jarg1); - public final static native double get31LatitudeY(int jarg1); - public final static native double getTileNumberX(float jarg1, double jarg2); - public final static native double getTileNumberY(float jarg1, double jarg2); - public final static native double checkLatitude(double jarg1); - public final static native double checkLongitude(double jarg1); - public final static native double getPowZoom(float jarg1); - public final static native double getLongitudeFromTile(float jarg1, double jarg2); - public final static native double getLatitudeFromTile(float jarg1, double jarg2); -} diff --git a/OsmAnd-java/src/net/osmand/bridge/ObfInspector.java b/OsmAnd-java/src/net/osmand/bridge/ObfInspector.java deleted file mode 100644 index 5ee23bd9d5..0000000000 --- a/OsmAnd-java/src/net/osmand/bridge/ObfInspector.java +++ /dev/null @@ -1,46 +0,0 @@ -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.7 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -package net.osmand.bridge; - -public class ObfInspector { - private long swigCPtr; - protected boolean swigCMemOwn; - - protected ObfInspector(long cPtr, boolean cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = cPtr; - } - - protected static long getCPtr(ObfInspector obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } - - protected void finalize() { - delete(); - } - - public synchronized void delete() { - if (swigCPtr != 0) { - if (swigCMemOwn) { - swigCMemOwn = false; - CoreOsmAndJNI.delete_ObfInspector(swigCPtr); - } - swigCPtr = 0; - } - } - - public static int inspector(StringVector argv) { - return CoreOsmAndJNI.ObfInspector_inspector(StringVector.getCPtr(argv), argv); - } - - public ObfInspector() { - this(CoreOsmAndJNI.new_ObfInspector(), true); - } - -} diff --git a/OsmAnd-java/src/net/osmand/bridge/StringVector.java b/OsmAnd-java/src/net/osmand/bridge/StringVector.java deleted file mode 100644 index 3fcdb9021c..0000000000 --- a/OsmAnd-java/src/net/osmand/bridge/StringVector.java +++ /dev/null @@ -1,84 +0,0 @@ -/* ---------------------------------------------------------------------------- - * This file was automatically generated by SWIG (http://www.swig.org). - * Version 2.0.7 - * - * Do not make changes to this file unless you know what you are doing--modify - * the SWIG interface file instead. - * ----------------------------------------------------------------------------- */ - -package net.osmand.bridge; - -import java.util.AbstractList; -import java.util.List; - -public class StringVector extends AbstractList { - private long swigCPtr; - protected boolean swigCMemOwn; - - protected StringVector(long cPtr, boolean cMemoryOwn) { - swigCMemOwn = cMemoryOwn; - swigCPtr = cPtr; - } - - protected static long getCPtr(StringVector obj) { - return (obj == null) ? 0 : obj.swigCPtr; - } - - protected void finalize() { - delete(); - } - - public synchronized void delete() { - if (swigCPtr != 0) { - if (swigCMemOwn) { - swigCMemOwn = false; - CoreOsmAndJNI.delete_StringVector(swigCPtr); - } - swigCPtr = 0; - } - } - - public StringVector() { - this(CoreOsmAndJNI.new_StringVector__SWIG_0(), true); - } - - public StringVector(long n) { - this(CoreOsmAndJNI.new_StringVector__SWIG_1(n), true); - } - - public int size() { - return (int) CoreOsmAndJNI.StringVector_size(swigCPtr, this); - } - - public long capacity() { - return CoreOsmAndJNI.StringVector_capacity(swigCPtr, this); - } - - public void reserve(long n) { - CoreOsmAndJNI.StringVector_reserve(swigCPtr, this, n); - } - - public boolean isEmpty() { - return CoreOsmAndJNI.StringVector_isEmpty(swigCPtr, this); - } - - public void clear() { - CoreOsmAndJNI.StringVector_clear(swigCPtr, this); - } - - public boolean add(String x) { - CoreOsmAndJNI.StringVector_add(swigCPtr, this, x); - return true; - } - - public String get(int i) { - return CoreOsmAndJNI.StringVector_get(swigCPtr, this, i); - } - - public String set(int i, String val) { - String prev = CoreOsmAndJNI.StringVector_get(swigCPtr, this, i); - CoreOsmAndJNI.StringVector_set(swigCPtr, this, i, val); - return prev; - } - -} From 24fb8a11cf45ef7aee6107cb12477e300a0c4212 Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Aug 2013 21:34:30 +0200 Subject: [PATCH 118/145] Add jni to OsmAnd-java --- OsmAnd-java/.gitignore | 2 ++ OsmAnd-java/Android.mk | 28 +++++++++++++++++++ OsmAnd-java/CMakeLists.txt | 53 ++++++++++++++++++++++++++++++++++++ OsmAnd-java/generate-swig.sh | 11 ++++++++ OsmAnd-java/jni.cmake | 3 ++ 5 files changed, 97 insertions(+) create mode 100644 OsmAnd-java/Android.mk create mode 100644 OsmAnd-java/CMakeLists.txt create mode 100755 OsmAnd-java/generate-swig.sh create mode 100644 OsmAnd-java/jni.cmake diff --git a/OsmAnd-java/.gitignore b/OsmAnd-java/.gitignore index e736691bd7..7c771eb8cc 100644 --- a/OsmAnd-java/.gitignore +++ b/OsmAnd-java/.gitignore @@ -1,2 +1,4 @@ bin +c-src OsmAnd-core.jar +src/net/osmand/core/jni/* diff --git a/OsmAnd-java/Android.mk b/OsmAnd-java/Android.mk new file mode 100644 index 0000000000..5ba260c0e5 --- /dev/null +++ b/OsmAnd-java/Android.mk @@ -0,0 +1,28 @@ +include $(CLEAR_VARS) + +LOCAL_PATH := $(call my-dir) + +ifneq ($(OSMAND_BUILDING_NEON_LIBRARY),true) + LOCAL_MODULE := OsmAndJNI +else + LOCAL_MODULE := OsmAndJNI_neon + LOCAL_ARM_NEON := true +endif + +ifeq ($(LOCAL_ARM_NEON),true) + OSMAND_BINARY_SUFFIX := _neon +else + OSMAND_BINARY_SUFFIX := +endif + +LOCAL_STATIC_LIBRARIES := OsmAndCore$(OSMAND_BINARY_SUFFIX) + +ifneq ($(OSMAND_USE_PREBUILT),true) + LOCAL_SRC_FILES := src/swig.c + + include $(BUILD_SHARED_LIBRARY) +else + LOCAL_SRC_FILES := \ + $(OSMAND_ANDROID_PREBUILT_ROOT)/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so + include $(PREBUILT_SHARED_LIBRARY) +endif diff --git a/OsmAnd-java/CMakeLists.txt b/OsmAnd-java/CMakeLists.txt new file mode 100644 index 0000000000..502189b997 --- /dev/null +++ b/OsmAnd-java/CMakeLists.txt @@ -0,0 +1,53 @@ +project(OsmAndJNI) + +set(target_specific_private_includes "") +if(CMAKE_TARGET_OS STREQUAL "windows") + set(target_specific_private_includes ${target_specific_private_includes} + "$ENV{JAVA_HOME}/include/win32" + ) +elseif(CMAKE_TARGET_OS STREQUAL "darwin") + set(target_specific_private_includes ${target_specific_private_includes} + "$ENV{JAVA_HOME}/include/darwin" + ) +elseif(CMAKE_TARGET_OS STREQUAL "linux") + set(target_specific_private_includes ${target_specific_private_includes} + "$ENV{JAVA_HOME}/include/linux" + ) +endif() + +if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET) + add_library(OsmAndJNI SHARED + "c-src/swig.cpp" + ) + target_compile_definitions(OsmAndJNI + PRIVATE + -DOSMAND_CORE_EXPORTS + ) + target_include_directories(OsmAndJNI + PRIVATE + "$ENV{JAVA_HOME}/include" + ${target_specific_private_includes} + ) + + if(CMAKE_STATIC_LIBS_ALLOWED_ON_TARGET) + add_dependencies(OsmAndJNI + OsmAndCore_static + OsmAndCoreUtils_static + ) + target_link_libraries(OsmAndJNI + LINK_PUBLIC + OsmAndCore_static + OsmAndCoreUtils_static + ) + else() + add_dependencies(OsmAndJNI + OsmAndCore_shared + OsmAndCoreUtils_shared + ) + target_link_libraries(OsmAndJNI + LINK_PUBLIC + OsmAndCore_shared + OsmAndCoreUtils_shared + ) + endif() +endif() \ No newline at end of file diff --git a/OsmAnd-java/generate-swig.sh b/OsmAnd-java/generate-swig.sh new file mode 100755 index 0000000000..e4de7fd774 --- /dev/null +++ b/OsmAnd-java/generate-swig.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +SRCLOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +rm -rf "$SRCLOC/src/net/osmand/core/jni" +mkdir -p "$SRCLOC/src/net/osmand/core/jni" + +rm -rf "$SRCLOC/c-src" +mkdir -p "$SRCLOC/c-src" + +swig -java -package net.osmand.core.jni -outdir "$SRCLOC/src/net/osmand/core/jni" -o "$SRCLOC/c-src/swig.cpp" -I"$SRCLOC/../../core/include" -c++ -v "$SRCLOC/../../core/core.swig" diff --git a/OsmAnd-java/jni.cmake b/OsmAnd-java/jni.cmake new file mode 100644 index 0000000000..848dcf0626 --- /dev/null +++ b/OsmAnd-java/jni.cmake @@ -0,0 +1,3 @@ +# OsmAnd JNI +add_subdirectory("${OSMAND_ROOT}/jni" "jni") +add_dependencies(OsmAndJNI OsmAndCore) From d7906a6410c88914722ded58248a8a142ad008bb Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Aug 2013 22:19:18 +0200 Subject: [PATCH 119/145] Fix script --- OsmAnd-java/collect_libs.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index acf4ad73cf..9292e6fede 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -14,14 +14,14 @@ function copyLibs { function compile { "$ROOT_LOC/core/externals/configure.sh" "$ROOT_LOC/core/externals/qtbase-desktop/build.sh" - if [ ! -d "$ROOT_LOC/baked/amd64-linux-gcc-amd64-linux-gcc" ]; then - "$ROOT_LOC/build/amd64-linux-gcc.sh" + if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then + "$ROOT_LOC/build/amd64-linux-gcc.sh" release fi - (cd "$ROOT_LOC/baked/amd64-linux-gcc-amd64-linux-gcc" && make -j`nproc`) - if [ ! -d "$ROOT_LOC/baked/i686-linux-gcc-i686-linux-gcc" ]; then - "$ROOT_LOC/build/i686-linux-gcc.sh" + (cd "$ROOT_LOC/baked/amd64-linux-gcc-release.makefile" && make -j`nproc`) + if [ ! -d "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" ]; then + "$ROOT_LOC/build/i686-linux-gcc.sh" release fi - (cd "$ROOT_LOC/baked/i686-linux-gcc-i686-linux-gcc" && make -j`nproc`) + (cd "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" && make -j`nproc`) } compile From 1555684fdabfdcce352d2cce6781b4c9bb9b8cea Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Wed, 7 Aug 2013 22:26:53 +0200 Subject: [PATCH 120/145] Fix script --- OsmAnd-java/collect_libs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index 9292e6fede..b83157c194 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -14,6 +14,7 @@ function copyLibs { function compile { "$ROOT_LOC/core/externals/configure.sh" "$ROOT_LOC/core/externals/qtbase-desktop/build.sh" + "$ROOT_LOC/tools/map-viewer/externals/freeglut/configure.sh" if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then "$ROOT_LOC/build/amd64-linux-gcc.sh" release fi From 535c8c890e70775358e730e4804f9247288fa38f Mon Sep 17 00:00:00 2001 From: Bennie D Date: Wed, 7 Aug 2013 09:19:23 +0200 Subject: [PATCH 121/145] Translated using Weblate. --- OsmAnd/res/values-af/strings.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml index 3d4de0f0c8..d0db28e78c 100644 --- a/OsmAnd/res/values-af/strings.xml +++ b/OsmAnd/res/values-af/strings.xml @@ -377,7 +377,7 @@ Keer GPX rigting om Gebruik die huidige bestemming Ry oor die hele spoor - Aflyn vektor kaart is teenwoordig vir hierdie ligging.\n\t\n\tOm te gebruik aktiveer \'Kieslys\' -> \'Definieer voorkoms\' -> \'Kaartbron...\' -> \'Aflyn vektor kaarte\'. + Aflyn vektor kaart is teenwoordig vir hierdie ligging.\n\t\n\tOm te gebruik aktiveer \'Kieslys\' -> \'Kaarte\' -> \'Kaartbron...\' -> \'Aflyn vektor kaarte\'. Stem begeleiding uitset Kies kanaal om stem begeleiding oor te speel (stelsel afhanklik) Stem oproep klank @@ -407,7 +407,7 @@ \tJy kan kan die ligging van interessante plekke op jou reis met familie of vriende deel.\n\tOm \'n ligging te deel:\n\tGebruik \'Kaart inhoud kieslys\' -> \'Deel ligging\' kieslys.\n\tKies dan \'n manier om jou ligging te deel. Die keuses is: E-pos, SMS (teks), of kopiëer net die koördinate na die knipbord. Gunsteling punte - \tDikwels gebruikte punte kan geberg word as gunstelinge.\n\tOm `n punt te berg as `n gunsteling, gaan na die kaart inhoud kieslys, Keuse\'Voeg by gunstelinge\' en tik dan \'n naam in daarvoor. Nadat jy \'n gunsteling geberg het,  is dit beskikbaar in \'Hoof Kieslys\' -> \'_gunstelinge\'.\n\tLank druk op \'n gunsteling, in die \'gunstelinge\' kieslys bied keuses om dit as bestemming te stel, te wysig of te skrap.\n\tOm al die gunsteling punte op die kaart te wys, skakel die \'gunstelinge\' vel aan in \'Kaart inhoud kieslys\' -> \'Definieer vertoon\'. + \tDikwels gebruikte punte kan geberg word as gunstelinge.\n\tOm `n punt te berg as `n gunsteling, gaan na die kaart inhoud kieslys, Keuse\'Voeg by gunstelinge\' en tik dan \'n naam in daarvoor. Nadat jy \'n gunsteling geberg het,  is dit beskikbaar in \'Hoof Kieslys\' -> \'_gunstelinge\'.\n\tLank druk op \'n gunsteling, in die \'gunstelinge\' kieslys bied keuses om dit as bestemming te stel, te wysig of te skrap.\n\tOm al die gunsteling punte op die kaart te wys, skakel die \'gunstelinge\' vel aan in \'Kaart inhoud kieslys\' -> \'Kaarte\'. " Aanlyn OSM kaart klassifikasie met prentjies" Fout het voorgekom tydens aflyn soek @@ -528,7 +528,7 @@ Vertoon deurlopende lewering in plaas van beeld-op-een-slag Fout het voorgekom tydens die lewering van gekose gebied Gebruik ligging… - verbeelder suksesvol gelaai + Verbeelder suksesvol gelaai Uitsondering voorgekom: verbeelder is nie gelaai nie vektor verbeelder Kies lewering voorkoms @@ -584,7 +584,7 @@ Vervoer stilhouplekke Interessante plek… Kaartbron… - Definieer uitsig + Kaarte Soek interessante plek Gebruik die trekbal om die kaart te skuif @@ -863,8 +863,8 @@ byvoeg verander Aksie {0} suksesvol voltooi. - Onverwagse fout het voorgekom, tydens die uitvoering van aksie {0}. - I/O fout het voorgekom tydens die uitvoering van aksie {0}. + Onverwagte fout het voorgekom tydens die uitvoering van aksie {0}. + I/O fout tydens die uitvoering van aksie {0}. Inligting oor node is nie gelaai nie Naam Open @@ -1006,7 +1006,7 @@ \n\t\'Nag\' - altyd nag kleure \n\t\'Ligsensor\' - Beheer deur toestel se ligsensor (indien beskikbaar) " - "→Die kaart bron en lae vertoon word verander in \'Keuselys\' -> \'Definieër voorkoms\' in kaart vertoon. ↵\n→Onder \'Kaart bron…\' kan jy kies tussen die gebruik van voorafgelaaide aflyn vektor kaarte, voorafgedefinieërde (aanlyn) teël bronne (aktiveer die \'aanlyn en teël kaarte\' inlasmodule hiervoor), of kaarte met die hand geskep met bv. OsmAndMapCreator op `n rekenaar. ↵\n→OsmAnd ondersteun ook persoonlike bronne. " + "→Die kaart bron en lae vertoon word verander in \'Keuselys\' -> \'Kaarte\' in kaart vertoon. ↵\n→Onder \'Kaart bron…\' kan jy kies tussen die gebruik van voorafgelaaide aflyn vektor kaarte, voorafgedefinieërde (aanlyn) teël bronne (aktiveer die \'aanlyn en teël kaarte\' inlasmodule hiervoor), of kaarte met die hand geskep met bv. OsmAndMapCreator op `n rekenaar. ↵\n→OsmAnd ondersteun ook persoonlike bronne. " "\tOsmAnd ondersteun verskillende (verstelbare) toepassingsprofiele vir verskillende gebruiksgevalle. \n\tJy kan profiele verander deur die profiel knoppie in linker onder hoek van die kaart skerm (simbool kar, fiets, of voetganger), of tydens die bou van `n roete. " @@ -1208,10 +1208,10 @@ OsmAnd (OSM Automated Navigation Directions) is \\\'n kaart en navigasie toepass hoogte Punt GPX lêernaam - GPX lêer suksesvol geberg na {0} + GPX lëer suksesvol geberg na {0} Skep paaie (of gebruik / pas bestaande GPX lêers aan) om die afstand tussen punte te meet. Berg as GPX, kan gebruik word om GPX roetes te beplan. Afstand rekenaar & beplanning gereedskap - OSM veranderingslêer %1$s suskesvol geskep + OSM veranderingslëer %1$s suskesvol geskep Bestemming %1$s Stel as bestemming Kies eers die stad of straat From b5b20fa87d892ddf283b1e6450bade1e38c6cfc6 Mon Sep 17 00:00:00 2001 From: Bennie D Date: Wed, 7 Aug 2013 09:20:33 +0200 Subject: [PATCH 122/145] Translated using Weblate. --- OsmAnd/res/values-af/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-af/strings.xml b/OsmAnd/res/values-af/strings.xml index d0db28e78c..b61a20d7a3 100644 --- a/OsmAnd/res/values-af/strings.xml +++ b/OsmAnd/res/values-af/strings.xml @@ -247,7 +247,7 @@ Gebruik om OsmAnd aan te hou terwyl skerm af is Kaart oriëntasie - Aflaai suksesvol.\n\t\n\tOm te gebruik aktiveer \'Keuselys\' -> \'Definieer uitsig\'-> \'Kaart bron\' -> \'aflyn vektor kaarte. + Aflaai suksesvol.\n\t\n\tOm te gebruik aktiveer \'Keuselys\' -> \'Kaarte\'-> \'Kaart bron\' -> \'aflyn vektor kaarte. Dag/nag gebruikswyse Verbetering van OSM inligting From 63d2c7ba0fbed49efb2b39b5c51daa16f3b4de85 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Wed, 7 Aug 2013 11:19:29 +0200 Subject: [PATCH 123/145] Translated using Weblate. --- OsmAnd/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 5c68739f03..72ccadb788 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1175,7 +1175,7 @@ Aktuella data på enheten (%1$s ledigt): precision Förändringar i 1.5: \n\t* Röstvarningar vid hastighetsbegränsningar och fartkameror - \n\t* Fler röstprompter (uppläsning av gatunamn)↵ + \n\t* Fler röstprompter (uppläsning av gatunamn) \n\t* Högupplösta kartikoner \n\t* Många förändringar av gränssnittet \n\t* Buggfixar i avståndsvisning, GPX-analys, behandling av waypoints, planeringswidget, OSM-uppladdning, https-behandling From cdb1fcc45c27e47b1b0ec7757b73a83dab9167be Mon Sep 17 00:00:00 2001 From: ezjerry liao Date: Wed, 7 Aug 2013 11:31:43 +0200 Subject: [PATCH 124/145] Translated using Weblate. --- OsmAnd/res/values-zh-rTW/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-zh-rTW/strings.xml b/OsmAnd/res/values-zh-rTW/strings.xml index bbb3d03c25..14a636a5d1 100644 --- a/OsmAnd/res/values-zh-rTW/strings.xml +++ b/OsmAnd/res/values-zh-rTW/strings.xml @@ -1537,5 +1537,5 @@ OsmAnd 是開放原始碼，而且正在積極的開發。應用程式從報告 歐洲和亞洲 英國、印度、澳洲和其他 駕駛區域 - FPS 資訊 + FPS 除錯資訊 From 0f0c4065fbe5b8b407008e9fdb5df3c88eb9be5a Mon Sep 17 00:00:00 2001 From: Harun Coban Date: Wed, 7 Aug 2013 11:59:09 +0200 Subject: [PATCH 125/145] Translated using Weblate. --- OsmAnd/res/values-tr/strings.xml | 45 +++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index 6ebe613ead..ccdd6d835c 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -1,5 +1,5 @@ - -Değişiklik listesini kapat + +Değişiklik listesini kapat ZXing Barcode Scanner uygulaması kurulu değil. Uygulama marketinde aramak ister misiniz? Yol renk şemasını seç: Yol renk şeması @@ -788,4 +788,43 @@ Yeni veriler açılıyor… Çevrimiçi navigasyon seçildi ancak İnternet bağlantısı kullanılabilir değil. Tepe gölge katmanı - \ No newline at end of file + FPS hata ayıklama bilgisi + Sürüş Bölgesi Seçimi : Amerika, Avrupa, Birleşik Krallık, Asya ve Diğerleri + Sürüş Bölgesi + Japonya + Amerika + Kanada + Avrupa ve Asya + Birleşik Krallık, Hindistan, Avustralya ve Diğerleri + OsMoDroid'i Durdur + OsMoDroid'i Başlat + Duyuru… + Sokak isimleri, trafik uyarıları (mecburi duruşlar, tümsekler), hız kamerası uyarıları, hız sınırları bildirimlerini ayarla + Sokak isimlerini bildir + Hız sınırlarını bildir + Hız kameralarını bildir + Trafik uyarılarını bildir + Lütfen OSM kullanıcı adı ve şifrenizi Ayarlar bölümünde belirtin + Varış yeri + Hareket yeri + Harita: + Buraya: + Üzerinden: + Buradan: + Zaman aralığı: + Seyahat süresi: + Hedef + Hedef olarak belirle + Önce şehir ya da sokak seç + Yakın şehirlerde sokak ara + Sırala (kapıdan kapıya) + OSM değişiklik dosyası başarıyla oluşturuldu + OSM değişikliklerinin yedeklemesi başarısız + Mevkiyi sil + süre + hassaslık + hız + rakım + Mevki + GPX dosya adı + From 7a62724809a64f1327a5cd1ec613d098f5f8aa5e Mon Sep 17 00:00:00 2001 From: Peter Gervai Date: Wed, 7 Aug 2013 12:50:16 +0200 Subject: [PATCH 126/145] Translated using Weblate. --- OsmAnd/res/values-hu/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd/res/values-hu/strings.xml b/OsmAnd/res/values-hu/strings.xml index 604c1c7912..d42f37bf1d 100644 --- a/OsmAnd/res/values-hu/strings.xml +++ b/OsmAnd/res/values-hu/strings.xml @@ -1306,4 +1306,5 @@ Utcanevek, közlekedési figyelmeztetések (megállás, fekvőrendőr), traffipax, sebességhatár bemondásának beállításai Utcanevek bemondása (TTS) OSM jelszó (opcionális) + FPS debug infó From 888bd9ecdb8d17d7c325414b15b5b1aba65baf9a Mon Sep 17 00:00:00 2001 From: Mirco Zorzo Date: Wed, 7 Aug 2013 15:32:42 +0200 Subject: [PATCH 127/145] Translated using Weblate. --- OsmAnd/res/values-it/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-it/strings.xml b/OsmAnd/res/values-it/strings.xml index 714b2b57e2..a309c22906 100644 --- a/OsmAnd/res/values-it/strings.xml +++ b/OsmAnd/res/values-it/strings.xml @@ -1159,7 +1159,7 @@ Utilizza il registratore di sistema Configura le impostazioni audio e video "Impostazioni audio/video " - "Errore durante la registrazione " + Errore durante la registrazione La fotocamera non è disponibile L\'audio/video sta per essere registrato. Per fermarlo seleziona il widget AV. L\'audio della registrazione specificata sta per essere riprodotto.\n%1$s From 00e97e0d58b454bb52193a101a845703ecca5b70 Mon Sep 17 00:00:00 2001 From: Leif Larsson Date: Wed, 7 Aug 2013 13:14:36 +0200 Subject: [PATCH 128/145] Translated using Weblate. --- OsmAnd/res/values-sv/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sv/strings.xml b/OsmAnd/res/values-sv/strings.xml index 72ccadb788..df17833d72 100644 --- a/OsmAnd/res/values-sv/strings.xml +++ b/OsmAnd/res/values-sv/strings.xml @@ -1196,7 +1196,7 @@ Aktuella data på enheten (%1$s ledigt): Meddela vid GPX-waypoints Stoppa OsMoDroid Starta OsMoDroid - FPS-info + FPS-avbuggningsinfo Välj område: USA, Europa, UK, Asien och andra Område Japan From c0e98954f4f84bcfad7343b6cd38718acc08af8a Mon Sep 17 00:00:00 2001 From: Harun Coban Date: Wed, 7 Aug 2013 13:51:46 +0200 Subject: [PATCH 129/145] Translated using Weblate. --- OsmAnd/res/values-tr/strings.xml | 147 +++++++++++++++++++------------ 1 file changed, 91 insertions(+), 56 deletions(-) diff --git a/OsmAnd/res/values-tr/strings.xml b/OsmAnd/res/values-tr/strings.xml index ccdd6d835c..8dfe75f825 100644 --- a/OsmAnd/res/values-tr/strings.xml +++ b/OsmAnd/res/values-tr/strings.xml @@ -105,66 +105,67 @@ \n\t* Bisikletler için bir yol tipi daha eklendi (bisikletyolu) \n\t* Hata düzeltmeleri " Ses/Video verisi - Navigasyonu durdurmak istediğinize emin misiniz? - Varış yerini iptal etmek istediğinize emin misiniz? - Hassas rota (alfa) + Navigasyonu durdurmak istediğinizden emin misiniz? + Varış noktasını temizlemek istediğinizden emin misiniz? + Hassas yönlendirme (alfa) Göster - %2$s fotoğrafdan %1$s cisi + %2$s fotoğrafın %1$s cisi Fotoğraf çek Fotoğraf çek - Dropbox eklentisi, parçaları ve ses/video notlarını dropbox hesabınızla senkronize etmenize olanak verir. + Dropbox eklentisi, yol tariflerini ve ses/video notlarını dropbox hesabınızla eşitlemenize olanak verir. Dropbox eklentisi - Varolan bir gpx dosyasını kullanmak istiyor musunuz? - Sırayı değiştir - Kontur çizgileri eklentisi daha geliştirme aşamasında, desteklemek için lütfen Market mağazasından satın alın. - Kontur çizgileri eklentisi - Video kaydet + Varolan bir GPX dosyasını kullanmak istiyor musunuz? + Sıralamayı değiştir + Programın geliştirilebilmesi için lütfen çevreleme çizgileri eklentisini Mağazadan almayı da düşünün. + Çevreleme çizgileri eklentisi + Video çek Ses kaydet Varsayılan eklenti eylemini seçin Varsayılan eklenti eylemi Video formatını seçin Video formatı - Video için sistem kaydedicisini kullan - Harici kaydediciyi kullan + Video için dahili kaydediciyi kullan + Dahili kaydediciyi kullan Ses ve video ayarlarını yapılandır - "Ses/Video ayarları " - "Kaydedilirken hata oluştu " - Kamera kullanılabilir değil. - Başlat - 1.2 deki değişiklikler: - OpenMaps AB + Ses/Video ayarları + Kaydedilirken hata oluştu + Kamera kullanılabilir değil + başlat + AB Açık haritası Tepe gölgelendirme 1.1.2 değişiklikler: \n\t* Ses / video eklentisi geliştirme (EXIF bilgileri ile fotoğrafları) \n\t* Kullanılabilirlik (suboptimal yönlendirme) sabit ve Kontur çizgileri eklenti Kontur hatları için \n\t* Tepe gölgelendirme paketleri eklentisi -\n\t* Hata düzeltmeleri yeniden +\n\t* Hata düzeltmeleri yeniden + Hatasız hassas rotaları hesaplamak için hassas yönlendirmeyi etkinleştirin. Bu mesafe çok sınırlıdır ve yerel kitaplık kullanmaz. - Fotoğraf için sistem uygulamasını kullanın - Kamera uygulamasını kullanın + Fotoğraf için dahili uygulamayı kullan + Kamera uygulamasını kullan Ses/Video kayıt ediliyor. Durdurmak için bu AV ikonuna basın. - Belirtilen kayıt arasından bir ses çalınıyor. %1$s - Dış sürücü aç + Belirtilen kayıttan bir ses çalınıyor.\n%1$s + Harici oynatıcı aç Bu kaydı kaldırmak istiyor musunuz? - 1.1.0 değişiklikler: + 1.1.0'daki değişiklikler: \n\t* Uzaklık hesap eklentisi -\n\t* Ses / video notları eklentisi -\n\t* Kontur çizgileri eklentisi +\n\t* Ses/video notları eklentisi +\n\t* Çevreleme çizgileri eklentisi \n\t* Hata düzeltmeleri -\n\t* &#39;Touring görünümü&#39; haritası stil seçeneği başka harita bilgilerini, yeni yol stilleri, daha fazla kontrast ve Alp yürüyüş (SAC skala) GPS yükseklik okuması için seçeneği -\n\t* EGM96 jeoit ofset düzeltme +\n\t* Daha fazla harita bilgileri, yeni yol stilleri, daha fazla zıtlık ve Alp doğa yürüyüşü (SAC skala) seçeneği olan tur görünümü harita stil seçeneği +\n\t* GPS yükseklik okuması için EGM96 denge düzeltmesi + kullanılamaz - Bir sesli not al + Sesli bir not al Bir video notu al Kayıt katmanı - Kayıt çalınamaz + Kayıt oynatılamaz Kayıt sil - Kayıt %1$s %2$s of %3$ + Kayıt %3$'nın %1$s %2$s kayıt durdur - Başlat + başlat Ses/video notları - Çevrimdışı kontur hatları için OsmAnd eklentisi + Çevrimdışı çevreleme çizgileri için OsmAnd eklentisi Bu eklenti OsmAnd adlı çevrimdışı haritalar gösterilebilir kontür çizgileri sağlar. Global veri (70 derece kuzey ve 70 derece güney arasındaki) SRTM (Mekik Radar Topografi Misyonu) ve ASTER (Gelişmiş Uzay Termal Yayılma ve Yansıma Radyometre), bir görüntüleme aracı onboard Terra, NASA&#39;nın Earth Gözlem amiral gemisi uydudan ölçümleri esas Sistemi. ASTER NASA arasında bir kooperatif çabadır, Ekonomi, Ticaret ve Sanayi Odası (METI) ve Japonya Uzay Sistemleri (J-spacesystems) Japonya Bakanlığı. @@ -172,23 +173,23 @@ Mesafe ölçümü Notu ile ilişkilendirmek Yer henüz tanımlanmamıştır. &quot;Konumu kullan ...&quot; Belirtilen yere not atamak - Durdur - Ses notları - Yolculuk sırasında ses / video notları alın - Ses / video notları - Bölümler - Kontur hatları - Çevrimdışı kontür hatları ve gölge tepeleri (-&gt; Veri Yönetimi -&gt; Download -&gt; seçin istenen harita türünü Ayarlar) indirmeden kolaylaştırır. - Kontur çizgileri eklentisi + durdur + Sesli notlar + Yolculuk sırasında ses/video notları alın + Ses/video notları + bölümler + Çevreleme çizgileri + Çevrimdışı çevreleme çizgileri indirmeyi ve tepe gölgelendirmeyi başlat (Ayarlar -> Veri Yönetim -> İndir -> İstenilen harita türünü seç). + Çevreleme çizgileri eklentisi Diğer haritalar Sadece yollar - Kontur çizgileri + Çevreleme çizgileri Düzenli haritalar - Yollar-sadece haritalar + "Sadece yol" haritaları Sınırları gizle - Bölgesel sınırların göstergesine bastır (admin düzeyleri 5-9) - OsMoDroid eklenti eski bir sürümünü sahiptir ve güncelleştirilmesi gerekmektedir. + Bölgesel sınırların gösterimini sakla (admin düzeyleri 5-9) + OsMoDroid eklentisi eski bir sürümünü sahip ve güncelleştirilmesi gerekmektedir. OsMoDroid eklenti canlı izleme özellikleri için OsModroid uygulama için, uzatma OsmAnd edilir. Hizmet hakkında bilgi http://esya.ru mevcuttur. OsMoDroid eklentisi Rakım Ekranı - Ofset Düzeltme @@ -249,7 +250,7 @@ Sonraki dönüş(küçük) İkinci sonraki dönüş Mini rota haritası - Tepe gölgelendirme bindirmeleri + Tepe gölgelendirme tabakaları e-posta Araba park edilmişti: Başlangıç noktası en yakın yoldan çok uzakta. @@ -363,7 +364,7 @@ En hızlı rota Haritayı indir Bu harita indirilemedi - telefon + Telefon Yüksek çözünürlüklü ekran İndir hiçbiri @@ -552,7 +553,6 @@ Çevrimiçi veya önbelleğe alınmış çini harita kaynaklarını yapılandırın Harita ekranını yapılandırma Altlık olarak veya tamamlayıcı / altlık haritaları gibi online veya önbelleğe kiremit haritalar çeşitli yapılandırmak için ayarları göster. Bu haritalar ayrıca çevrimdışı ve OsmAnd klasöre kopyalanır hazırlanabilir. - Periyodik GPS cihazı uyanma ile izleme ve uyku navigasyon (ekran kapalı) modunu etkinleştirmek için ayarları göster. Özel erişilebilirlik özellikleri için ayarları göster. GPX dosyaları için geziler kaydetmek için veya bir web hizmeti kullanarak parça yaşamayı kolaylaştıran ayarları göster. Gelişmiş harita yapılandırma (Artış harita detayları gibi) ve bazı aygıt özellikleri için ayarları görüntüleyin. @@ -728,16 +728,15 @@ POI etiketler Kaydet GPS Bilgisi - 1.1.4 deki değişiklikler Varış Zamanı - İşaretli - İşaretsiz + işaretli + işaretsiz Harita - Otoyol Tercihi - Tercihler - Otoyol Tercihi + Otoyol tercih et + Tercih et… + Otoyol tercih et Yok - İsteğe bağlı seçim + Talep üzerine seç OsmAnd Haritalar & Nevigasyon OsmAnd+ Haritalar & Navigasyon GPX Rotası @@ -787,7 +786,7 @@ Dönüştürme performansını göster Yeni veriler açılıyor… Çevrimiçi navigasyon seçildi ancak İnternet bağlantısı kullanılabilir değil. - Tepe gölge katmanı + Tepe gölgesi katmanı FPS hata ayıklama bilgisi Sürüş Bölgesi Seçimi : Amerika, Avrupa, Birleşik Krallık, Asya ve Diğerleri Sürüş Bölgesi @@ -827,4 +826,40 @@ rakım Mevki GPX dosya adı + Mesafe hesaplayıcı ve Planlama aracı + Tekrar gösterme + Düzenlemeye başla + Düzenlemeyi bitir + Yeni bir alt yola başla + Tüm mevkileri temizle + GPX olarak kaydet + Varolan GPX'i aç + Mevcut görev bitene kadar bekleyin lütfen + Pusula sapmalarından korunmak için Kalman filtresi kullan + Kalman filtresi kullan + Erişilebilirlik modu : lütfen önce varış noktası seçin + pusula değerini belirlemek için yönlendirme sensörü yerine manyetik sensörü kullan + Manyetik sensörü kullan + Diğer + Tam sürüm + Rotayı bırak + Navigasyonu durdur + Varış noktasını temizle + Şuanda Wifi ağına bağlı değil. Mevcut internet bağlantısı ile indirilsin mi? + Sokak + Bina numarası + İnternet sitesi + Kayıt servisleri ve Uyku modu + Seyahatlerin nasıl kaydedileceğini ve uyku modunu yapılandırın + Kayıt servisleri ve Uyku modu + Yükleme versiyonu + Uygulama teması seç + Uygulama teması + Erişilebilirlik ayarları + Adres seç + Favoriyi seç + OSM değişiklikleri + Diğer komutlar + Çevreleme çizgileri verisi + GPX yol işaretlerini söyle From 3d9ed0ba92af744f578d8f83ad14b804b15d232b Mon Sep 17 00:00:00 2001 From: Harun Coban Date: Wed, 7 Aug 2013 13:49:03 +0200 Subject: [PATCH 130/145] Translated using Weblate. --- OsmAnd/res/values-tr/bidforfix.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/OsmAnd/res/values-tr/bidforfix.xml b/OsmAnd/res/values-tr/bidforfix.xml index 4534164a4e..6f2f9cc631 100644 --- a/OsmAnd/res/values-tr/bidforfix.xml +++ b/OsmAnd/res/values-tr/bidforfix.xml @@ -1,6 +1,5 @@ - -Yükleniyor +Yükleniyor %1$d Destekçi - Finansör: %d%% + Bağışlanan: %d%% From 5ff32a06e5dfcb3a10ae73520055a1369220332a Mon Sep 17 00:00:00 2001 From: jan madsen Date: Wed, 7 Aug 2013 18:34:13 +0200 Subject: [PATCH 131/145] Translated using Weblate. --- OsmAnd/res/values-da/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-da/strings.xml b/OsmAnd/res/values-da/strings.xml index d10d06addf..1fe4597c14 100644 --- a/OsmAnd/res/values-da/strings.xml +++ b/OsmAnd/res/values-da/strings.xml @@ -1574,5 +1574,5 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda, Storbritannien, Indien, Australien m.fl. Område Vælg område: USA, Europa, England, Asien m.fl. - FPS-info + FPS-fejlsøgningssinfo From 688ceb6233ccadb5273f5426f500d4478e18705b Mon Sep 17 00:00:00 2001 From: Bert Massop Date: Wed, 7 Aug 2013 19:12:07 +0200 Subject: [PATCH 132/145] Translated using Weblate. --- OsmAnd/res/values-nl/strings.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/OsmAnd/res/values-nl/strings.xml b/OsmAnd/res/values-nl/strings.xml index c47a224965..a672cdad91 100644 --- a/OsmAnd/res/values-nl/strings.xml +++ b/OsmAnd/res/values-nl/strings.xml @@ -493,8 +493,8 @@ Continue kaartgeneratie inplaats van eenmalige generatie van de hele kaart Fout opgetreden bij kaartgeneratie van het geselecteerde gebied Gebruik locatie… - Kaartgenerator sucesvol geladen - Fout opgetreden: kaartgenerator niet geladen + Kaartgenerator succesvol geladen + Fout opgetreden: renderer niet geladen Vector kaartgenerator Kies kaartweergavestijl Toon website @@ -576,7 +576,7 @@ Filter Geluid is aan Geluid is uit - Kies stembegeleiding voor navigatie + Kies stembegeleiding voor navigatie (zie ISO 639-1 voor taalcodes) Stembegeleiding Initialisatie stemgegevens… Niet-ondersteunde versie van stemgegevens @@ -821,7 +821,7 @@ Bug wordt afgesloten Sluit bug Bug is afgesloten - Fout opgetreden: bug is niet afgesloten + Fout opgetreden: bug is niet gesloten Bewerk interessepunt Maak interessepunt Punt niet gevonden of voorziening is niet een enkel punt @@ -1528,4 +1528,5 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A Canada Europa en Azië GB, India, Australië en andere + FPS-debuginformatie From f709e86badb2a13cda138d381f06aee6acb05b4f Mon Sep 17 00:00:00 2001 From: Krystian Biesaga Date: Wed, 7 Aug 2013 18:03:42 +0200 Subject: [PATCH 133/145] Translated using Weblate. --- OsmAnd/res/values-pl/strings.xml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/OsmAnd/res/values-pl/strings.xml b/OsmAnd/res/values-pl/strings.xml index 160fe940ee..1575340be2 100644 --- a/OsmAnd/res/values-pl/strings.xml +++ b/OsmAnd/res/values-pl/strings.xml @@ -128,8 +128,8 @@ Orientacja mapy Obecna pozycja nie ma pokrycia w zainstalowanych mapach offline. Możesz pobrać nową w Ustawieniach lub przełączyć się na mapy online. - Wektorowa mapa offline jest dostępna dla tej lokalizacji. \n\t\n\tMożesz włączyć mapy offline używając menu (Zdefiniuj widok -> Źródło mapy… -> Wektorowe mapy offline). - Pobieranie zakończone.\n\t\n\tMożesz włączyć mapy offline używając menu (Zdefiniuj widok -> Źródło mapy… -> Wektorowe mapy offline). + Dla tej lokalizacji dostępna jest wektorowa mapa offline. \n\t\n\tAby użyć wybierz 'Menu' -> 'Warstwy mapy' -> 'Źródło mapy…' -> 'Wektorowe mapy offline'. + Pobieranie zakończone.\n\t\n\tAby użyć aktywuj 'Menu' -> 'Warstwy mapy' -> 'Źródło mapy…' -> 'Wektorowe mapy offline'. Wyjście głosu nawigatora Wybierz kanał do odtwarzania głosu nawigatora (zależne od możliwości systemu) Kanał głosowy @@ -165,10 +165,11 @@ \tMożesz podzielić się swoją pozycją GPS z rodziną lub znajomymi. \n\tAby to zrobić:: \n\tWybierz z menu kontekstowego mapy \'Opcje punktu\' -> \'Udostępnij pozycję GPS\'. \n\tNastępnie wybierz sposób udostępnienia. Do wyboru jest e-mail, SMS lub zwykłe skopiowanie koordynat do schowka. Ulubione punkty - "\tCzęsto używane punkty mogą zostać zapisane jako ulubione. + \tCzęsto używane punkty mogą zostać zapisane jako ulubione. \n\tAby zapisać punkt jako ulubiony przejdź do menu kontekstowego, wybierz \'Opcje punktu\' -> \'Dodaj do ulubionych\' i wprowadź jego nazwę. Po zapisaniu, punkt będzie można znaleźć w głównym menu -> \'Ulubione\'. \n\tDłuższe naciśnięcie pozycji w \'Ulubionych\' pokaże opcje dotyczące tego punktu. -\n\tAby wyświetlić wszystkie ulubione punkty bezpośrednio na mapie, włącz warstwę \'Ulubione\' w \'Zdefiniuj widok\'. " +\n\tAby wyświetlić wszystkie ulubione punkty bezpośrednio na mapie, włącz warstwę \'Ulubione\' w \'Warstwy mapy\'. + Wystąpił błąd podczas wyszukiwania offline Nie można zinterpretować \'%s\' Wyszukaj adres korzystając z map offline @@ -292,8 +293,8 @@ Wystąpił błąd podczas rysowania wybranej powierzchni Brak wystarczającej ilości pamięci, by wyświetlić wybrany obszar Użyj lokalizacji… - Render uruchomiony - Wystąpił błąd, render nie został uruchomiony + Renderer pomyślnie wczytany + Wystąpił błąd: renderer nie został wczytany Render wektorowy Wybierz wygląd mapy wektorowej offline Pokaż stronę WWW tego POI @@ -331,7 +332,7 @@ Szczegóły trasy Ulubione zostały zaimportowane Plik GPX zawierający punkty ulubione nie został znaleziony w {0} - Ulubione zostały zapisane {0} + Ulubione zostały zapisane do {0} Brak ulubionych punktów do zapisania Import Eksport @@ -349,7 +350,7 @@ Przystanki POI… Źródło mapy… - Zdefiniuj widok + Warstwy mapy Szukaj POI Użyj trackballa do przesuwania mapy @@ -617,19 +618,19 @@ Ulubiony punkt {0} został usunięty. Wprowadź opis błędu Błąd został zgłoszony - Wystąpił błąd, zgłoszenie nie zostało utworzone + Wystąpił błąd: zgłoszenie nie zostało utworzone Dodaj komentarz Wiadomość Nazwa autora Dodaj komentarz do błędu Dodaj komentarz Dodano komentarz - Wystąpił błąd, komentarz nie został dodany + Wystąpił błąd: komentarz nie został dodany Zamknij błąd Zamykanie błędu Zamknij błąd Błąd został zamknięty - Wystąpił problem, błąd nie został zamknięty + Wystąpił problem: błąd nie został zamknięty Edytuj POI Dodaj POI Nie mogę znaleźć węzła albo udogodnienie (amenity) nie jest pojedynczym węzłem @@ -1039,7 +1040,7 @@ \n\t\'Dzień\' - zawsze używaj trybu dziennego\n\t\'Noc\' - Zawsze używaj trybu nocnego \n\t\'Czujnik światła\' - wygląd mapy kontrolowany jest przez czujnik światła w Twoim urządzeni (jeśli taki posiadasz) - \tŹródło mapy oraz wyświetlane warstwy można zmienić przez \'Menu\' -> \'Zdefiniuj widok\' w widoku mapy.\n\tWskazując \'Źródło mapy…\' możesz wybrać wykorzystanie pobranych wcześniej map wektorowych, predefiniowanych map rastrowych (włącz wtyczkę \'Mapy online\') lub map utworzonych ręcznie z wykorzystaniem narzędzi takich jak OsmAndMapCreator na PC\n\tOsmAnd wspiera również własne źródła map. + \tŹródło mapy oraz wyświetlane warstwy można zmienić przez \'Menu\' -> \'Warstwy mapy\' w widoku mapy.\n\tWskazując \'Źródło mapy…\' możesz wybrać wykorzystanie pobranych wcześniej map wektorowych, predefiniowanych map rastrowych (włącz wtyczkę \'Mapy online\') lub map utworzonych ręcznie z wykorzystaniem narzędzi takich jak OsmAndMapCreator na PC\n\tOsmAnd wspiera również własne źródła map. "\tOsmAnd wspiera różne (konfigurowalne) profile aplikacji do różnych przypadków użycia.\n\tProfile można zmienić wybierając przycisk w lewym dolnym rogu ekranu (ikonka samochodu, roweru lub pieszego), lub podczas wybierania trasy. " email @@ -1317,5 +1318,5 @@ Wybierz region, w którym będziesz się poruszał: Stany Zjednoczone, Europa, Wielka Brytania, Azja i inne Region poruszania się Kanada - Informacje o FPS + Informacje debugowania FPS From 53de41052e713ca2896a1c3fe09359e322866fbe Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 07:14:32 +0300 Subject: [PATCH 134/145] Update collect_libs.sh --- OsmAnd-java/collect_libs.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index b83157c194..ed5980a4d6 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -18,11 +18,11 @@ function compile { if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then "$ROOT_LOC/build/amd64-linux-gcc.sh" release fi - (cd "$ROOT_LOC/baked/amd64-linux-gcc-release.makefile" && make -j`nproc`) + (cd "$ROOT_LOC/baked/amd64-linux-gcc-release.makefile" && make -j`nproc` OsmAndJNI) if [ ! -d "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" ]; then "$ROOT_LOC/build/i686-linux-gcc.sh" release fi - (cd "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" && make -j`nproc`) + (cd "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" && make -j`nproc` OsmAndJNI) } compile From acba5fd4e79fc0e5b8162d3083e8703d1491a97f Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 07:20:57 +0300 Subject: [PATCH 135/145] Update collect_libs.sh --- OsmAnd-java/collect_libs.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index ed5980a4d6..f48a3bcbd0 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -1,28 +1,39 @@ #!/bin/bash SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_LOC="$SCRIPT_LOC/../.." + +if [[ "$(uname -a)" =~ Linux ]]; then + if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then + OSMAND_BUILD_CPU_CORES_NUM=`nproc` + fi +fi +if [[ "$(uname -a)" =~ Darwin ]]; then + if [[ -z "$OSMAND_BUILD_CPU_CORES_NUM" ]]; then + OSMAND_BUILD_CPU_CORES_NUM=`sysctl hw.ncpu | awk '{print $2}'` + fi +fi + function copyLibs { if [ -d "$ROOT_LOC/binaries/$1/$2" ]; then echo "Copy binaries $1 $2"; cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndJNI.$4 bin/OsmAndJNI-$1-$3.lib cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndCoreUtils.$4 bin/OsmAndCoreUtils-$1-$3.lib cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndCore.$4 bin/OsmAndCore-$1-$3.lib - cp "$ROOT_LOC"/core/externals/qtbase-desktop/upstream.patched.$1.$2/lib/libQt5Core.$4.5.0.2 bin/Qt5Core-$1-$3.lib fi } function compile { - "$ROOT_LOC/core/externals/configure.sh" - "$ROOT_LOC/core/externals/qtbase-desktop/build.sh" - "$ROOT_LOC/tools/map-viewer/externals/freeglut/configure.sh" + OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-desktop skia) + "$ROOT_LOC/core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} + "$ROOT_LOC/core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then "$ROOT_LOC/build/amd64-linux-gcc.sh" release fi - (cd "$ROOT_LOC/baked/amd64-linux-gcc-release.makefile" && make -j`nproc` OsmAndJNI) + (cd "$ROOT_LOC/baked/amd64-linux-gcc-release.makefile" && make -j$OSMAND_BUILD_CPU_CORES_NUM OsmAndJNI) if [ ! -d "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" ]; then "$ROOT_LOC/build/i686-linux-gcc.sh" release fi - (cd "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" && make -j`nproc` OsmAndJNI) + (cd "$ROOT_LOC/baked/i686-linux-gcc-release.makefile" && make -j$OSMAND_BUILD_CPU_CORES_NUM OsmAndJNI) } compile From 7f69ea1c003767bce874a2d65aebdb05f3a1efb3 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 07:22:52 +0300 Subject: [PATCH 136/145] Update collect_libs.sh --- OsmAnd-java/collect_libs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index f48a3bcbd0..5d060165cf 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -17,8 +17,6 @@ function copyLibs { if [ -d "$ROOT_LOC/binaries/$1/$2" ]; then echo "Copy binaries $1 $2"; cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndJNI.$4 bin/OsmAndJNI-$1-$3.lib - cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndCoreUtils.$4 bin/OsmAndCoreUtils-$1-$3.lib - cp "$ROOT_LOC"/binaries/$1/$2/libOsmAndCore.$4 bin/OsmAndCore-$1-$3.lib fi } From e38aaa0ebc4255d50b03cf8f6258c5c72158137a Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 07:25:55 +0300 Subject: [PATCH 137/145] Update collect_libs.sh --- OsmAnd-java/collect_libs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index 5d060165cf..248baee833 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -21,7 +21,7 @@ function copyLibs { } function compile { - OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-desktop skia) + OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glew glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-desktop skia zlib) "$ROOT_LOC/core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$ROOT_LOC/core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then From d4726432fb8bccea7326ea54638fb59adb726d3f Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 07:54:40 +0300 Subject: [PATCH 138/145] Update collect_libs.sh --- OsmAnd-java/collect_libs.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index 248baee833..28ab7d2024 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -1,4 +1,7 @@ #!/bin/bash + +set -e + SCRIPT_LOC="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" ROOT_LOC="$SCRIPT_LOC/../.." From 22850a91200f1ac0b4a7112d7a4d298313ef554e Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 07:58:21 +0300 Subject: [PATCH 139/145] Update collect_libs.sh --- OsmAnd-java/collect_libs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index 28ab7d2024..cf208e952f 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -27,6 +27,7 @@ function compile { OSMAND_ANDROID_EXTERNAL_DEPENDENCIES=(expat freetype gdal giflib glew glm glsl-optimizer harfbuzz jpeg libpng protobuf qtbase-desktop skia zlib) "$ROOT_LOC/core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$ROOT_LOC/core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} + "$ROOT_LOC/tools/map-viewer/externals/configure.sh" if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then "$ROOT_LOC/build/amd64-linux-gcc.sh" release fi From dd9a5e16346fb776d811417b37bd1795d02649e4 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 08:03:52 +0300 Subject: [PATCH 140/145] Update jni.cmake --- OsmAnd-java/jni.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd-java/jni.cmake b/OsmAnd-java/jni.cmake index 848dcf0626..dc1cdb7b96 100644 --- a/OsmAnd-java/jni.cmake +++ b/OsmAnd-java/jni.cmake @@ -1,3 +1,3 @@ # OsmAnd JNI -add_subdirectory("${OSMAND_ROOT}/jni" "jni") +add_subdirectory("${OSMAND_ROOT}/android/OsmAnd-java/jni" "jni") add_dependencies(OsmAndJNI OsmAndCore) From b0c3323eb42d0664b9f82c9330198f475341a13e Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 08:04:53 +0300 Subject: [PATCH 141/145] Update jni.cmake --- OsmAnd-java/jni.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd-java/jni.cmake b/OsmAnd-java/jni.cmake index dc1cdb7b96..60dce27542 100644 --- a/OsmAnd-java/jni.cmake +++ b/OsmAnd-java/jni.cmake @@ -1,3 +1,3 @@ # OsmAnd JNI -add_subdirectory("${OSMAND_ROOT}/android/OsmAnd-java/jni" "jni") +add_subdirectory("${OSMAND_ROOT}/android/OsmAnd-java" "jni") add_dependencies(OsmAndJNI OsmAndCore) From ab41a627963a4bb34d3c42294475a8a166124416 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 08:06:03 +0300 Subject: [PATCH 142/145] Update collect_libs.sh --- OsmAnd-java/collect_libs.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd-java/collect_libs.sh b/OsmAnd-java/collect_libs.sh index cf208e952f..a1d72e3ad1 100644 --- a/OsmAnd-java/collect_libs.sh +++ b/OsmAnd-java/collect_libs.sh @@ -28,6 +28,7 @@ function compile { "$ROOT_LOC/core/externals/configure.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$ROOT_LOC/core/externals/build.sh" ${OSMAND_ANDROID_EXTERNAL_DEPENDENCIES[*]} "$ROOT_LOC/tools/map-viewer/externals/configure.sh" + "$ROOT_LOC/android/OsmAnd-java/generate-swig.sh" if [ ! -d "$ROOT_LOC/amd64-linux-gcc-release.makefile" ]; then "$ROOT_LOC/build/amd64-linux-gcc.sh" release fi From c1528d518dac41fb56f89c87d8a9f175886339cd Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 08:09:04 +0300 Subject: [PATCH 143/145] Update CMakeLists.txt --- OsmAnd-java/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/OsmAnd-java/CMakeLists.txt b/OsmAnd-java/CMakeLists.txt index 502189b997..73a4ef7bb9 100644 --- a/OsmAnd-java/CMakeLists.txt +++ b/OsmAnd-java/CMakeLists.txt @@ -1,6 +1,7 @@ project(OsmAndJNI) set(target_specific_private_includes "") +set(target_specific_public_libraries "") if(CMAKE_TARGET_OS STREQUAL "windows") set(target_specific_private_includes ${target_specific_private_includes} "$ENV{JAVA_HOME}/include/win32" @@ -13,6 +14,9 @@ elseif(CMAKE_TARGET_OS STREQUAL "linux") set(target_specific_private_includes ${target_specific_private_includes} "$ENV{JAVA_HOME}/include/linux" ) + set(target_specific_public_libraries ${target_specific_public_libraries} + rt + ) endif() if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET) @@ -48,6 +52,7 @@ if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET) LINK_PUBLIC OsmAndCore_shared OsmAndCoreUtils_shared + ${target_specific_public_libraries} ) endif() -endif() \ No newline at end of file +endif() From 057d8b150c41df18e4a5946c9c21108a512e5da5 Mon Sep 17 00:00:00 2001 From: Alexey Pelykh Date: Thu, 8 Aug 2013 08:11:00 +0300 Subject: [PATCH 144/145] Update CMakeLists.txt --- OsmAnd-java/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/OsmAnd-java/CMakeLists.txt b/OsmAnd-java/CMakeLists.txt index 73a4ef7bb9..0e39c565bc 100644 --- a/OsmAnd-java/CMakeLists.txt +++ b/OsmAnd-java/CMakeLists.txt @@ -42,6 +42,7 @@ if(CMAKE_SHARED_LIBS_ALLOWED_ON_TARGET) LINK_PUBLIC OsmAndCore_static OsmAndCoreUtils_static + ${target_specific_public_libraries} ) else() add_dependencies(OsmAndJNI From 39da63f7e5574ba59a8487dcbfb836549061fe9d Mon Sep 17 00:00:00 2001 From: Damjan Gerl Date: Thu, 8 Aug 2013 00:13:51 +0200 Subject: [PATCH 145/145] Translated using Weblate. --- OsmAnd/res/values-sl/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OsmAnd/res/values-sl/strings.xml b/OsmAnd/res/values-sl/strings.xml index 266847d2c8..a21c86c1fc 100644 --- a/OsmAnd/res/values-sl/strings.xml +++ b/OsmAnd/res/values-sl/strings.xml @@ -1486,7 +1486,7 @@ Seznam držav (praktično ves svet!): Afganistan, Albanija, Alžirija, Andora, A Najavi … Nastavitve za najavljanje imena ulic, prometna opozorila (ležeči policaji ipd.), opozorila merilnikov hitrosti, omejitve hitrosti Najavljanje imen ulic (TTS) - Podatki FPS + Podatki razhroščevanja FPS Izbira področja vožnje: ZDA, Evropa, Velika Britanija, Azija in drugo Področje vožnje Japonska