Merget with master
This commit is contained in:
Denis
commit
defe2e552f
39 changed files with 633 additions and 331 deletions
|
|
@ -244,7 +244,7 @@ public class RenderingRulesStorage {
|
|||
|
||||
public void startElement(String name) throws XmlPullParserException, IOException {
|
||||
boolean stateChanged = false;
|
||||
if("filter".equals(name)){ //$NON-NLS-1$
|
||||
if(isCase(name)){ //$NON-NLS-1$
|
||||
attrsMap.clear();
|
||||
if (stack.size() > 0 && stack.peek() instanceof GroupRules) {
|
||||
GroupRules parent = ((GroupRules) stack.peek());
|
||||
|
|
@ -263,7 +263,7 @@ public class RenderingRulesStorage {
|
|||
registerGlobalRule(renderingRule, state, attrsMap);
|
||||
}
|
||||
stack.push(renderingRule);
|
||||
} else if("groupFilter".equals(name)){ //$NON-NLS-1$
|
||||
} else if(isApply(name)){ //$NON-NLS-1$
|
||||
attrsMap.clear();
|
||||
parseAttributes(attrsMap);
|
||||
RenderingRule renderingRule = new RenderingRule(attrsMap, RenderingRulesStorage.this);
|
||||
|
|
@ -273,10 +273,10 @@ public class RenderingRulesStorage {
|
|||
} else if (stack.size() > 0 && stack.peek() instanceof RenderingRule) {
|
||||
((RenderingRule) stack.peek()).addIfChildren(renderingRule);
|
||||
} else {
|
||||
throw new XmlPullParserException("Group filter without parent");
|
||||
throw new XmlPullParserException("Apply (groupFilter) without parent");
|
||||
}
|
||||
stack.push(renderingRule);
|
||||
} else if("group".equals(name)){ //$NON-NLS-1$
|
||||
} else if(isSwitch(name)){ //$NON-NLS-1$
|
||||
GroupRules groupRules = new GroupRules();
|
||||
if (stack.size() > 0 && stack.peek() instanceof GroupRules) {
|
||||
GroupRules parent = ((GroupRules) stack.peek());
|
||||
|
|
@ -352,6 +352,18 @@ public class RenderingRulesStorage {
|
|||
|
||||
}
|
||||
|
||||
protected boolean isCase(String name) {
|
||||
return "filter".equals(name) || "case".equals(name);
|
||||
}
|
||||
|
||||
protected boolean isApply(String name) {
|
||||
return "groupFilter".equals(name) || "apply".equals(name) || "apply_if".equals(name);
|
||||
}
|
||||
|
||||
protected boolean isSwitch(String name) {
|
||||
return "group".equals(name) || "switch".equals(name);
|
||||
}
|
||||
|
||||
private Map<String, String> parseAttributes(Map<String, String> m) {
|
||||
for(int i=0; i< parser.getAttributeCount(); i++) {
|
||||
String name = parser.getAttributeName(i);
|
||||
|
|
@ -370,14 +382,14 @@ public class RenderingRulesStorage {
|
|||
|
||||
|
||||
public void endElement(String name) throws XmlPullParserException {
|
||||
if ("filter".equals(name)) { //$NON-NLS-1$
|
||||
if (isCase(name)) { //$NON-NLS-1$
|
||||
stack.pop();
|
||||
} else if("group".equals(name)){ //$NON-NLS-1$
|
||||
} else if(isSwitch(name)){ //$NON-NLS-1$
|
||||
GroupRules group = (GroupRules) stack.pop();
|
||||
if (stack.size() == 0) {
|
||||
group.registerGlobalRules(state);
|
||||
}
|
||||
} else if("groupFilter".equals(name)){ //$NON-NLS-1$
|
||||
} else if(isApply(name)){ //$NON-NLS-1$
|
||||
stack.pop();
|
||||
} else if("renderingAttribute".equals(name)){ //$NON-NLS-1$
|
||||
stack.pop();
|
||||
|
|
@ -456,7 +468,7 @@ public class RenderingRulesStorage {
|
|||
storage.parseRulesFromXmlInputStream(is, resolver);
|
||||
|
||||
printAllRules(storage);
|
||||
// testSearch(storage);
|
||||
testSearch(storage);
|
||||
}
|
||||
|
||||
protected static void testSearch(RenderingRulesStorage storage) {
|
||||
|
|
@ -464,8 +476,8 @@ public class RenderingRulesStorage {
|
|||
// int count = 100000;
|
||||
// for (int i = 0; i < count; i++) {
|
||||
RenderingRuleSearchRequest searchRequest = new RenderingRuleSearchRequest(storage);
|
||||
searchRequest.setStringFilter(storage.PROPS.R_TAG, "landuse");
|
||||
searchRequest.setStringFilter(storage.PROPS.R_VALUE, "wood");
|
||||
searchRequest.setStringFilter(storage.PROPS.R_TAG, "building");
|
||||
searchRequest.setStringFilter(storage.PROPS.R_VALUE, "yes");
|
||||
searchRequest.setIntFilter(storage.PROPS.R_LAYER, 1);
|
||||
searchRequest.setIntFilter(storage.PROPS.R_MINZOOM, 15);
|
||||
searchRequest.setIntFilter(storage.PROPS.R_MAXZOOM, 15);
|
||||
|
|
|
|||
|
|
@ -7,71 +7,71 @@ import java.util.regex.Pattern;
|
|||
public class GeoPointParserUtil {
|
||||
|
||||
public static void main(String[] args) {
|
||||
final double lat = 34.99, lon = -106.61;
|
||||
final int ilat = 34, ilon = -106;
|
||||
final double dlat = 34.99, dlon = -106.61;
|
||||
final String name = "Treasure Island";
|
||||
int z = GeoParsedPoint.NO_ZOOM;
|
||||
String url;
|
||||
|
||||
// geo:34.99,-106.61
|
||||
url = "geo:" + lat + "," + lon;
|
||||
// geo:34,-106
|
||||
url = "geo:" + ilat + "," + ilon;
|
||||
System.out.println("url: " + url);
|
||||
GeoParsedPoint actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon));
|
||||
|
||||
// geo:34.99,-106.61
|
||||
url = "geo:" + dlat + "," + dlon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon));
|
||||
|
||||
// geo:34.99,-106.61?z=11
|
||||
z = 11;
|
||||
url = "geo:" + lat + "," + lon + "?z=" + z;
|
||||
url = "geo:" + dlat + "," + dlon + "?z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// geo:34.99,-106.61 (Treasure Island)
|
||||
url = "geo:" + lat + "," + lon + " (" + name + ")";
|
||||
url = "geo:" + dlat + "," + dlon + " (" + name + ")";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, name));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, name));
|
||||
|
||||
// geo:34.99,-106.61?z=11 (Treasure Island)
|
||||
z = 11;
|
||||
url = "geo:" + lat + "," + lon + "?z=" + z + " (" + name + ")";
|
||||
url = "geo:" + dlat + "," + dlon + "?z=" + z + " (" + name + ")";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z, name));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z, name));
|
||||
|
||||
// 0,0?q=34,-106(Treasure Island)
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "geo:0,0?q=" + ilat + "," + ilon + " (" + name + ")";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z, name));
|
||||
|
||||
// 0,0?q=34.99,-106.61(Treasure Island)
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "geo:0,0?q=" + lat + "," + lon + " (" + name + ")";
|
||||
url = "geo:0,0?q=" + dlat + "," + dlon + " (" + name + ")";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z, name));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z, name));
|
||||
|
||||
// geo:0,0?z=11&q=34.99,-106.61(Treasure Island)
|
||||
z = 11;
|
||||
url = "geo:0,0?z=" + z + "&q=" + lat + "," + lon + " (" + name + ")";
|
||||
url = "geo:0,0?z=" + z + "&q=" + dlat + "," + dlon + " (" + name + ")";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z, name));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z, name));
|
||||
|
||||
// geo:0,0?z=11&q=34.99,-106.61
|
||||
z = 11;
|
||||
url = "geo:0,0?z=" + z + "&q=" + lat + "," + lon;
|
||||
url = "geo:0,0?z=" + z + "&q=" + dlat + "," + dlon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
|
||||
// geo:34.99,-106.61
|
||||
z = -1;
|
||||
url = "geo:" + lat + "," + lon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
|
||||
// geo:34.99,-106.61?z=11
|
||||
z = 11;
|
||||
url = "geo:" + lat + "," + lon + "?" + "z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// google calendar
|
||||
// geo:0,0?q=760 West Genesee Street Syracuse NY 13204
|
||||
|
|
@ -88,82 +88,153 @@ public class GeoPointParserUtil {
|
|||
actual = GeoPointParserUtil.parse("geo", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(qstr));
|
||||
|
||||
// http://download.osmand.net/go?lat=34.99&lon=-106.61&z=11
|
||||
url = "http://download.osmand.net/go?lat=" + lat + "&lon=" + lon + "&z=" + z;
|
||||
// http://download.osmand.net/go?lat=34&lon=-106&z=11
|
||||
url = "http://download.osmand.net/go?lat=" + ilat + "&lon=" + ilon + "&z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://download.osmand.net/go?lat=34.99&lon=-106.61&z=11
|
||||
url = "http://download.osmand.net/go?lat=" + dlat + "&lon=" + dlon + "&z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://openstreetmap.org/map=11/34/-106
|
||||
url = "http://openstreetmap.org/map=" + z + "/" + ilat + "/" + ilon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://openstreetmap.org/map=11/34.99/-106.61
|
||||
url = "http://openstreetmap.org/map=" + z + "/" + lat + "/" + lon;
|
||||
url = "http://openstreetmap.org/map=" + z + "/" + dlat + "/" + dlon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://openstreetmap.de/zoom=11&lat=34&lon=-106
|
||||
url = "http://openstreetmap.de/zoom=" + z + "&lat=" + ilat + "&lon=" + ilon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://openstreetmap.de/zoom=11&lat=34.99&lon=-106.61
|
||||
url = "http://openstreetmap.de/zoom=" + z + "&lat=" + lat + "&lon=" + lon;
|
||||
url = "http://openstreetmap.de/zoom=" + z + "&lat=" + dlat + "&lon=" + dlon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://openstreetmap.de/lat=34.99&lon=-106.61&zoom=11
|
||||
url = "http://openstreetmap.de/lat=" + lat + "&lon=" + lon + "&zoom=" + z;
|
||||
url = "http://openstreetmap.de/lat=" + dlat + "&lon=" + dlon + "&zoom=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://maps.google.com/maps/@34,-106,11z
|
||||
url = "http://maps.google.com/maps/@" + ilat + "," + ilon + "," + z + "z";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://maps.google.com/maps/@34.99,-106.61,11z
|
||||
url = "http://maps.google.com/maps/@" + lat + "," + lon + "," + z + "z";
|
||||
url = "http://maps.google.com/maps/@" + dlat + "," + dlon + "," + z + "z";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://maps.google.com/maps/ll=34,-106,z=11
|
||||
url = "http://maps.google.com/maps/ll=" + ilat + "," + ilon + ",z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://maps.google.com/maps/ll=34.99,-106.61,z=11
|
||||
url = "http://maps.google.com/maps/ll=" + lat + "," + lon + ",z=" + z;
|
||||
url = "http://maps.google.com/maps/ll=" + dlat + "," + dlon + ",z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://maps.google.com/maps/q=loc:34,-106&z=11
|
||||
url = "http://maps.google.com/maps/q=loc:" + ilat + "," + ilon + "&z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://maps.google.com/maps/q=loc:34.99,-106.61&z=11
|
||||
url = "http://maps.google.com/maps/q=loc:" + lat + "," + lon + "&z=" + z;
|
||||
url = "http://maps.google.com/maps/q=loc:" + dlat + "," + dlon + "&z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// whatsapp
|
||||
// http://maps.google.com/maps/q=loc:34,-106 (You)
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://maps.google.com/maps/q=loc:" + ilat + "," + ilon + " (You)";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// whatsapp
|
||||
// http://maps.google.com/maps/q=loc:34.99,-106.61 (You)
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://maps.google.com/maps/q=loc:" + lat + "," + lon + " (You)";
|
||||
url = "http://maps.google.com/maps/q=loc:" + dlat + "," + dlon + " (You)";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://www.google.com/maps/search/food/34,-106,14z
|
||||
url = "http://www.google.com/maps/search/food/" + ilat + "," + ilon + "," + z + "z";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://www.google.com/maps/search/food/34.99,-106.61,14z
|
||||
url = "http://www.google.com/maps/search/food/" + lat + "," + lon + "," + z + "z";
|
||||
url = "http://www.google.com/maps/search/food/" + dlat + "," + dlon + "," + z + "z";
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://maps.google.com?saddr=Current+Location&daddr=34,-106
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://maps.google.com?saddr=Current+Location&daddr=" + ilat + "," + ilon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://maps.google.com?saddr=Current+Location&daddr=34.99,-106.61
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://maps.google.com?saddr=Current+Location&daddr=" + lat + "," + lon;
|
||||
url = "http://maps.google.com?saddr=Current+Location&daddr=" + dlat + "," + dlon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://www.google.com/maps/dir/Current+Location/34,-106
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://www.google.com/maps/dir/Current+Location/" + ilat + "," + ilon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://www.google.com/maps/dir/Current+Location/34.99,-106.61
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://www.google.com/maps/dir/Current+Location/" + lat + "," + lon;
|
||||
url = "http://www.google.com/maps/dir/Current+Location/" + dlat + "," + dlon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://maps.google.com/maps?q=34,-106
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://maps.google.com/maps?q=" + ilat + "," + ilon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://maps.google.com/maps?q=34.99,-106.61
|
||||
z = GeoParsedPoint.NO_ZOOM;
|
||||
url = "http://maps.google.com/maps?q=" + lat + "," + lon;
|
||||
url = "http://maps.google.com/maps?q=" + dlat + "," + dlon;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
|
||||
// http://www.google.com/maps/place/760+West+Genesee+Street+Syracuse+NY+13204
|
||||
qstr = "760+West+Genesee+Street+Syracuse+NY+13204";
|
||||
|
|
@ -193,13 +264,19 @@ public class GeoPointParserUtil {
|
|||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(qstr));
|
||||
|
||||
// http://maps.yandex.ru/?ll=34.99,-106.61&z=11
|
||||
// http://maps.yandex.ru/?ll=34,-106&z=11
|
||||
z = 11;
|
||||
url = "http://maps.yandex.ru/?ll=" + lat + "," + lon + "&z=" + z;
|
||||
url = "http://maps.yandex.ru/?ll=" + ilat + "," + ilon + "&z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
|
||||
assertGeoPoint(actual, new GeoParsedPoint(ilat, ilon, z));
|
||||
|
||||
// http://maps.yandex.ru/?ll=34.99,-106.61&z=11
|
||||
z = 11;
|
||||
url = "http://maps.yandex.ru/?ll=" + dlat + "," + dlon + "&z=" + z;
|
||||
System.out.println("url: " + url);
|
||||
actual = GeoPointParserUtil.parse("http", url);
|
||||
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
|
||||
}
|
||||
|
||||
private static void assertGeoPoint(GeoParsedPoint actual, GeoParsedPoint expected) {
|
||||
|
|
@ -265,32 +342,33 @@ public class GeoPointParserUtil {
|
|||
|
||||
final String[] osmandNetSite = { "//download.osmand.net/go?" };
|
||||
|
||||
final String[] osmandNetPattern = { "lat=(-?\\d{1,3}\\.\\d+)&lon=(-?\\d{1,3}\\.\\d+)&z=(\\d{1,2})" };
|
||||
final String[] osmandNetPattern = { "lat=([+-]?\\d+(?:\\.\\d+)?)&lon=([+-]?\\d+(?:\\.\\d+)?)&?(z=\\d{1,2})" };
|
||||
|
||||
final String[] openstreetmapOrgSite = { "//openstreetmap.org/", "//www.openstreetmap.org/" };
|
||||
|
||||
final String[] openstreetmapOrgPattern = { "(?:.*)(?:map=)(\\d{1,2})/(-?\\d{1,3}\\.\\d+)/(-?\\d{1,3}\\.\\d+)(?:.*)" };
|
||||
final String[] openstreetmapOrgPattern = { "(?:.*)(?:map=)(\\d{1,2})/([+-]?\\d+(?:\\.\\d+)?)/([+-]?\\d+(?:\\.\\d+)?)(?:.*)" };
|
||||
|
||||
final String[] openstreetmapDeSite = { "//openstreetmap.de/", "//www.openstreetmap.de/" };
|
||||
|
||||
final String[] openstreetmapDePattern = {
|
||||
"(?:.*)zoom=(\\d{1,2})&lat=(-?\\d{1,3}\\.\\d+)&lon=(-?\\d{1,3}\\.\\d+)(?:.*)",
|
||||
"(?:.*)lat=(-?\\d{1,3}\\.\\d+)&lon=(-?\\d{1,3}\\.\\d+)&z(?:oom)?=(\\d{1,2})(?:.*)" };
|
||||
"(?:.*)zoom=(\\d{1,2})&lat=([+-]?\\d+(?:\\.\\d+)?)&lon=([+-]?\\d+(?:\\.\\d+)?)(?:.*)",
|
||||
"(?:.*)lat=([+-]?\\d+(?:\\.\\d+)?)&lon=([+-]?\\d+(?:\\.\\d+)?)&?(z(?:oom)?=\\d{1,2})(?:.*)" };
|
||||
|
||||
final String[] googleComSite = { "//www.google.com/maps/", "//maps.google.com/maps", "//maps.google.com" };
|
||||
|
||||
final String[] googleComPattern = { "(?:.*)[@/](-?\\d{1,3}\\.\\d+),(-?\\d{1,3}\\.\\d+),(\\d{1,2})z(?:.*)",
|
||||
"(?:.*)ll=(-?\\d{1,3}\\.\\d+),(-?\\d{1,3}\\.\\d+)(?:.+)z=(\\d{1,2})(?:.*)",
|
||||
"(?:.*)q=([\\-+]?\\d{1,3}\\.\\d+),([\\-+]?\\d{1,3}\\.\\d+)(?:.*)&z=(\\d{1,2})",
|
||||
"(?:.*)(q=)(-?\\d{1,3}\\.\\d+),(-?\\d{1,3}\\.\\d+)(?:.*)",
|
||||
"(?:.*)q=loc:(-?\\d{1,3}\\.\\d+),(-?\\d{1,3}\\.\\d+)&z=(\\d{1,2})(?:.*)",
|
||||
"(?:.*)(q=loc:)(-?\\d{1,3}\\.\\d+),(-?\\d{1,3}\\.\\d+)(?:.*)",
|
||||
"(.*)daddr=(-?\\d{1,3}\\.\\d+),(-?\\d{1,3}\\.\\d+)(?:.*)",
|
||||
"(.*)/(-?\\d{1,3}\\.\\d+),(-?\\d{1,3}\\.\\d+)(?:.*)" };
|
||||
final String[] googleComPattern = {
|
||||
"(?:.*)[@/]([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?),(\\d{1,2}z)(?:.*)",
|
||||
"(?:.*)ll=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:.+)(z=\\d{1,2})(?:.*)",
|
||||
"(?:.*)q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:.*)&?(z=\\d{1,2})",
|
||||
"(?:.*)(q=)([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:.*)",
|
||||
"(?:.*)q=loc:([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)&?(z=\\d{1,2})(?:.*)",
|
||||
"(?:.*)(q=loc:)([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:.*)",
|
||||
"(.*)daddr=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:.*)",
|
||||
"(.*)/([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:.*)" };
|
||||
|
||||
final String[] yandexRuSite = { "//maps.yandex.ru/" };
|
||||
|
||||
final String[] yandexRuPattern = { "(?:.*)ll=(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+)(?:.+)z=(\\d{1,2})(?:.*)" };
|
||||
final String[] yandexRuPattern = { "(?:.*)ll=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:.+)(z=\\d{1,2})(?:.*)" };
|
||||
|
||||
final String sites[][] = { osmandNetSite, openstreetmapOrgSite, openstreetmapDeSite, googleComSite,
|
||||
yandexRuSite };
|
||||
|
|
@ -318,10 +396,19 @@ public class GeoPointParserUtil {
|
|||
int zoom;
|
||||
|
||||
// check sequence of values
|
||||
if (!matcher.group(3).contains(".")) {
|
||||
if (matcher.group(3).contains("z=")) {
|
||||
lat = Double.valueOf(matcher.group(1));
|
||||
lon = Double.valueOf(matcher.group(2));
|
||||
zoom = Integer.valueOf(matcher.group(3));
|
||||
zoom = Integer.valueOf(matcher.group(3).substring("z=".length()));
|
||||
} else if (matcher.group(3).contains("zoom=")) {
|
||||
lat = Double.valueOf(matcher.group(1));
|
||||
lon = Double.valueOf(matcher.group(2));
|
||||
zoom = Integer.valueOf(matcher.group(3).substring("zoom=".length()));
|
||||
} else if (matcher.group(3).contains("z")) {
|
||||
lat = Double.valueOf(matcher.group(1));
|
||||
lon = Double.valueOf(matcher.group(2));
|
||||
zoom = Integer.valueOf(matcher.group(3).substring(0,
|
||||
matcher.group(3).length() - 1));
|
||||
} else {
|
||||
lat = Double.valueOf(matcher.group(2));
|
||||
lon = Double.valueOf(matcher.group(3));
|
||||
|
|
@ -364,7 +451,7 @@ public class GeoPointParserUtil {
|
|||
// geo:0,0?q=34.99,-106.61(Treasure Island)
|
||||
// geo:0,0?z=11&q=34.99,-106.61(Treasure Island)
|
||||
String query = schemeSpecific.substring("0,0?".length());
|
||||
final String pattern = "(?:z=([0-9]{1,2}))?&?q=([\\-0-9\\.]+)?,([\\-0-9\\.]+)?[\\+]*(?:\\((.+?)\\))?";
|
||||
final String pattern = "(?:z=(\\d{1,2}))?&?q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)[\\+]?(?:\\((.+?)\\))?";
|
||||
final Matcher matcher = Pattern.compile(pattern).matcher(query);
|
||||
if (matcher.matches()) {
|
||||
final String z = matcher.group(1);
|
||||
|
|
@ -382,7 +469,7 @@ public class GeoPointParserUtil {
|
|||
} else {
|
||||
// geo:47.6,-122.3
|
||||
// geo:47.6,-122.3?z=11 (Treasure Island)
|
||||
final String pattern = "([\\-\\d{1,2}\\.\\d]+),([\\-\\d{1,3}\\.\\d]+)(?:\\?z=(\\d{1,2}))?[\\+]?(?:\\((.*?)\\))?";
|
||||
final String pattern = "([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?)(?:\\?z=(\\d{1,2}))?[\\+]?(?:\\((.*?)\\))?";
|
||||
final Matcher matcher = Pattern.compile(pattern).matcher(schemeSpecific);
|
||||
if (matcher.matches()) {
|
||||
final double lat = Double.valueOf(matcher.group(1));
|
||||
|
|
|
|||
BIN
OsmAnd/res/drawable-hdpi/list_speed_bump.png
Normal file
BIN
OsmAnd/res/drawable-hdpi/list_speed_bump.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
OsmAnd/res/drawable-hdpi/list_stop_sign.png
Normal file
BIN
OsmAnd/res/drawable-hdpi/list_stop_sign.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.6 KiB |
BIN
OsmAnd/res/drawable-hdpi/warnings_border_control.png
Normal file
BIN
OsmAnd/res/drawable-hdpi/warnings_border_control.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
BIN
OsmAnd/res/drawable-hdpi/warnings_stop_sign.png
Normal file
BIN
OsmAnd/res/drawable-hdpi/warnings_stop_sign.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.9 KiB |
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="auto_zoom_none">Без аўтаматычнага масштабіраваньня</string>
|
||||
<string name="auto_zoom_close">Зачыніць</string>
|
||||
<string name="auto_zoom_far">Для сярэдняга масштаба</string>
|
||||
|
|
@ -1937,9 +1937,9 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
|
|||
<string name="more">Больш...</string>
|
||||
<string name="flat_list_waypoitns">Усе</string>
|
||||
<string name="waypoints">Кропкі шляху</string>
|
||||
<string name="way_alarms">Перашкоды</string>
|
||||
<string name="speak_favorites">Абвяшчаць выбраныя</string>
|
||||
<string name="speak_poi">Абвяшчаць POI</string>
|
||||
<string name="way_alarms">Дарожныя папярэджаньні</string>
|
||||
<string name="speak_favorites">Абвяшчаць выбраныя паблізу</string>
|
||||
<string name="speak_poi">Абвяшчаць навакольныя POI</string>
|
||||
<string name="targets">Цэлі</string>
|
||||
<string name="flat_list_waypoints">Усе</string>
|
||||
<string name="index_tours">Паездкі</string>
|
||||
|
|
@ -1955,4 +1955,11 @@ OsmAnd мае адкрыты зыходны код і актыўна разві
|
|||
<string name="confirm_every_run">Пытацца заўсёды</string>
|
||||
<string name="save_global_track_interval_descr">Выберыце інтэрвал рэгістравання для запісвання агульнага шляху (ўмыкаецца віджэтам запісу GPX на мапе)</string>
|
||||
<string name="save_global_track_interval">Агульны інтарвал запісвання</string>
|
||||
<string name="traffic_warning_speed_limit">Абмежаваньне хуткасьці</string>
|
||||
<string name="traffic_warning_border_control">Памежны кантроль</string>
|
||||
<string name="traffic_warning_payment">Платны праезд</string>
|
||||
<string name="traffic_warning_stop">Знак STOP</string>
|
||||
<string name="traffic_warning_calming">Зьнізьце хуткасьць</string>
|
||||
<string name="traffic_warning_speed_camera">Фотарадар</string>
|
||||
<string name="traffic_warning">Абмежаваньне хуткасьці</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1047,11 +1047,8 @@ OsmAnd е с отворен код и активно да се развива.
|
|||
\n\nСлед това изберете начина по който да споделите - по ел.поща, чрез SMS (като текст) или да копирате координатите в клипборда.
|
||||
</string>
|
||||
<string name="tip_favorites">Любими места</string>
|
||||
<string name="tip_favorites_t">Често използваните места могат да бъдат записани като \'Любими\', последния начин:
|
||||
\n\nЗа да запишете дадено място като любимо, отидете в контекстното меню, изберете \'Добави в любими\' и му въведете име. Вашите любими места са достъпни от \'Любими\' в контекстното меню.
|
||||
\n\nПродължително натискане върху любимо място в меню \'Любими\' извиква помощно меню, чрез което можете да зададете даденото място като крайна цел, да го редактирате или да го изтриете.
|
||||
\n\nЗа показването на всички любими места директно върху картата, разрешете слоя \'Любими\' в \'Меню\' -> \'Настройки изглед\'.
|
||||
</string>
|
||||
<string name="tip_favorites_t">"Често използваните места могат да бъдат записани като \'Любими\', по следния начин:
|
||||
\n\nВ контекстното меню за дадена точка от картата, изберете \'Добави в любими\' и въведете име.\n\nСлед като дадено място е записано в папката \'Любими\', можете да го използвате като влезете в \'Меню\'->\'Моите места\' и в раздела \'Любими\' натискайки върху елемент от списъка със запазени места можете да извършвате различни действия - навигация, редактиране, изтриване и др.\n\nЗа показването на всички любими места директно върху картата, разрешете слоя \'Любими\' в \'Меню\' -> \'Настройки слоеве\'. "</string>
|
||||
<string name="error_doing_search">Възникна грешка при търсенето офлайн</string>
|
||||
<string name="search_offline_geo_error">Заявката не може да бъде анализирана - \'%s\'</string>
|
||||
<string name="search_osm_offline">Търсене на адрес в локалните карти</string>
|
||||
|
|
@ -1438,7 +1435,7 @@ OsmAnd е с отворен код и активно да се развива.
|
|||
<string name="exit_Button">Изход</string>
|
||||
<string name="map_Button">Карта</string>
|
||||
<string name="settings_Button">Настройки</string>
|
||||
<string name="favorites_Button">Любими</string>
|
||||
<string name="favorites_Button">Моите места</string>
|
||||
<string name="search_button">Търсене</string>
|
||||
<string name="search_activity">Търсене</string>
|
||||
<string name="searchpoi_activity">Избор на POI</string>
|
||||
|
|
@ -1707,4 +1704,37 @@ OsmAnd е с отворен код и активно да се развива.
|
|||
<string name="map_preferred_locale_descr">Предпочитан език за наименованията по картата (ако този език не е наличен, ще се имената ще се изписват на английски или на местния език)</string>
|
||||
<string name="map_preferred_locale">Предпочитан език за картата</string>
|
||||
<string name="live_monitoring_m">Онлайн следа (изисква се GPX)</string>
|
||||
<string name="my_data_Button">Моите места</string>
|
||||
<string name="my_data_activity">Моите места</string>
|
||||
<string name="live_monitoring_m_descr">Изпращане на следата онлайн до определен уеб адрес, при условие, че записът в GPX е включен.</string>
|
||||
<string name="live_monitoring_start">Старт на онлайн следата</string>
|
||||
<string name="live_monitoring_stop">Стоп на онлайн следата</string>
|
||||
<string name="rendering_attr_hideAccess_name">Скриване на ограниченията за достъп</string>
|
||||
<string name="rendering_attr_showAccess_name">Показване ограниченията за достъп</string>
|
||||
<string name="rendering_attr_showSurfaceGrade_name">Показване състоянието на пътната настилка</string>
|
||||
<string name="rendering_attr_showSurfaces_name">Показване вида на пътната настилка</string>
|
||||
<string name="rendering_attr_showCycleRoutes_name">Показване велосипедни маршрути</string>
|
||||
<string name="osmo_auth_error_short">Невалидни входни данни</string>
|
||||
<string name="osmo_auth_error">Грешка при влизане в OsMo : %1$s.\n Възможно е, това да е временен проблем със сървъра или вашата регистрация да е изтекла.\n Искате ли нова регистрация?</string>
|
||||
<string name="osmo_group_by_invite">Вход чрез покана</string>
|
||||
<string name="osmo_group_information">Моля, прочетете преди да създадете нова група!</string>
|
||||
<string name="osmo_not_signed_in">Влизането в OsMo се провали</string>
|
||||
<string name="osmo_gpx_points_downloaded">Свалени точки от OsMo - %1$s.</string>
|
||||
<string name="osmo_auto_connect_descr">Автоматично включване в услугата след стартиране на приложението</string>
|
||||
<string name="osmo_auto_connect">Автоматично свързване</string>
|
||||
<string name="osmo_start_service">OsMo услуга</string>
|
||||
<string name="local_index_unselect_gpx_file">Отмени избора</string>
|
||||
<string name="local_index_select_gpx_file">Избери за показване</string>
|
||||
<string name="gpx_split_interval">Интервал</string>
|
||||
<string name="sort_by_distance">Сортирай по дистанция</string>
|
||||
<string name="sort_by_name">Сортирай по име</string>
|
||||
<string name="visible_element">Покажи на картата</string>
|
||||
<string name="show_zoom_buttons_navigation_descr">Показвай бутоните за мащаб по време на навигация</string>
|
||||
<string name="show_zoom_buttons_navigation">Показвай бутоните за мащаб</string>
|
||||
<string name="select_destination_and_intermediate_points">Избор на междинни точки</string>
|
||||
<string name="layer_amenity_label">Етикети на точките</string>
|
||||
<string name="loading_smth">Зареждане %1$s …</string>
|
||||
<string name="map_widget_plain_time">Текущо време</string>
|
||||
<string name="gpx_wpt">Междинна точка</string>
|
||||
<string name="selected_gpx_info_show">\n\nНатиснете и задръжте за показване на картата</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
|
||||
<string name="map_widget_fluorescent">Rutes amb fluorescència</string>
|
||||
<string name="map_widget_show_ruler">Mostra el regle</string>
|
||||
|
|
@ -747,7 +747,7 @@
|
|||
<string name="osmand_background_plugin_description">Mostra els paràmetres per habilitar el seguiment i la navegació en segon pla (pantalla apagada) mitjançant l\'activació periòdica del dispositiu GPS.</string>
|
||||
<string name="accessibility_preferences_descr">Preferències d\'accessibilitat</string>
|
||||
<string name="trace_rendering_descr">Mostra el rendiment de la renderització</string>
|
||||
<string name="tip_navigation_t">"Per obtenir indicacions de com anar a un lloc, podeu mantenir recolzat un punt en el mapa, (llavors omplireu la seva descripció i la triareu amb \'Indicacions a\') o podeu seleccionar \'Indicacions\' després de triar un resultat d\'una llista de recerca o de la vostra llista de favorits.
|
||||
<string name="tip_navigation_t">"Per obtenir indicacions de com anar a un lloc, podeu mantenir recolzat un punt en el mapa, (llavors omplireu la seva descripció i la triareu amb \'Indicacions a\') o podeu seleccionar \'Indicacions a\' després de triar un resultat d\'una llista de recerca o de la vostra llista de favorits.
|
||||
\n\nEl destí es destaca amb un marcador amb forma de bandera sobre el mapa i OsmAnd mostra tant la distància com la direcció a ell (triangle taronja).
|
||||
\n\nPots triar \'Inicia navegació\', que vol dir que OsmAnd et guiarà, et donarà instruccions de veu (si es configura), etc. O també pots seleccionar \'Mostra la ruta\', indicant una ruta estàtica sense cap guia o correccions al teu moviment.
|
||||
\n\nPer mostrar una ruta fins la destinació seleccionada des qualsevol punt diferent al que tu et trobes, selecciona el punt d\'inici en el mapa i prem \'Indicacions des\'.
|
||||
|
|
@ -791,15 +791,13 @@
|
|||
<string name="overlay_transparency">Opacitat de la capa superposada</string>
|
||||
<string name="layer_underlay">Mapa de base…</string>
|
||||
<string name="preferred_locale">Llengua de visualització</string>
|
||||
<string name="tip_search_t">Podeu cercar llocs directament al mapa via \'Usar posició\' → \'Buscar prop d\'aquí\', o amb la pantalla dedicada a les cerques via \'Menú\' → \'Cerca\'.
|
||||
\n\nLa pantalla de cerca admet diferents formats de cerca:
|
||||
\n\t* per adreça
|
||||
<string name="tip_search_t">"Podeu cercar llocs directament al mapa via \'Usar posició\' → \'Buscar prop d\'aquí\', o amb la pantalla dedicada a les cerques via \'Menú\' → \'Cerca\'.
|
||||
\n\nLa pantalla de cerca admet diferents formats de cerca:\n\t* per adreça
|
||||
\n\t* amb coordenades
|
||||
\n\t* com PDI (per tipus o per nom)
|
||||
\n\t* dins el teu històric de cerques
|
||||
\n\t* o entre els teus preferits ja predefinits
|
||||
\n\n Per qualsevol selecció un menú de context o una barra d\'accions ofereix opcions com \'Indicacions\' or \'Mostra al mapa\', etc.
|
||||
</string>
|
||||
\n\n Per qualsevol selecció un menú de context o una barra d\'accions ofereix opcions com \'Indicacions a\' or \'Mostra al mapa\', etc. "</string>
|
||||
<string name="add_waypoint_dialog_added">La fita «{0}» de la traça GPX s\'ha afegit correctament</string>
|
||||
<string name="add_waypoint_dialog_title">Afegeix una fita a la traça GPX enregistrada</string>
|
||||
<string name="version_index_is_big_for_memory">L\'índex «{0}» no cap a la memòria</string>
|
||||
|
|
@ -858,7 +856,7 @@
|
|||
\n\nLa caixa de diàleg s\'amaga altre cop prement i aguantant dins seu.
|
||||
</string>
|
||||
<string name="tip_initial_t">"OsmAnd és una aplicació de navegació amb moltes funcionalitats.
|
||||
\n\nEs disposa d\'una introducció bàsica, de consells d\'ús i d\'una ajuda avançada via «Menú» → «Ajuda» des la pantalla del mapa. "</string>
|
||||
\n\nEs disposa d\'una introducció bàsica, de consells d\'ús i de trucs via «Menú» → «Ajuda» des la pantalla del mapa. "</string>
|
||||
<string name="send_location_way_choose_title">Comparteix l\'ubicació usant</string>
|
||||
<string name="old_map_index_is_not_supported">Format de mapa discontinuat «{0}» no esta suportat</string>
|
||||
<string name="select_max_zoom_preload_area">Selecciona el màxim zoom per precarregar</string>
|
||||
|
|
@ -1872,9 +1870,9 @@ La llista de països inclosos (bàsicament tot el món!): Afganistan, Albània,
|
|||
<string name="flat_list_waypoitns">Totes</string>
|
||||
<string name="waypoints">Fites</string>
|
||||
<string name="targets">Destinacions</string>
|
||||
<string name="way_alarms">Obstacles</string>
|
||||
<string name="speak_favorites">Indica els preferits</string>
|
||||
<string name="speak_poi">Indica els PDI</string>
|
||||
<string name="way_alarms">Notificacions de tràfic</string>
|
||||
<string name="speak_favorites">Indica els preferits propers</string>
|
||||
<string name="speak_poi">Indica els PDI propers</string>
|
||||
<string name="index_tours">Itineraris</string>
|
||||
<string name="flat_list_waypoints">Totes</string>
|
||||
<string name="record_plugin_description">Enregistreu el vostre trajecte prement un botó sobre la pantalla del mapa. Reviseu la configuració de gravació dels vostres recorreguts a arxius locals GPX o a la xarxa utilitzant un servei web.</string>
|
||||
|
|
|
|||
|
|
@ -696,7 +696,7 @@
|
|||
<string name="save_track_interval_descr">Vyberte interval pro ukládání trasy během navigace</string>
|
||||
<string name="save_track_interval">Interval ukládání trasy během navigace</string>
|
||||
<string name="save_track_to_gpx_descrp">Během navigace budou trasy ukládány do adresáře s trasami</string>
|
||||
<string name="save_track_to_gpx">Záznam trasy do GPX během navigace</string>
|
||||
<string name="save_track_to_gpx">Zaznamenat trasu do GPX během navigace</string>
|
||||
<string name="update_tile">Aktualizovat mapu</string>
|
||||
<string name="reload_tile">Načíst znovu dlaždici</string>
|
||||
<string name="mark_point">Cíl</string>
|
||||
|
|
|
|||
|
|
@ -1038,7 +1038,7 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
|
|||
\n* Redesign af brugerflade
|
||||
\n* Fejlrettelser
|
||||
</string>
|
||||
<string name="tip_navigation_t">"For at få kørselsvejledning til et sted, enten langt tryk på direkte på kortet, (tryk derefter på beskrivelsemarkøren, og vælg \'Kørselsvejledning til\'), eller vælg \'Kørselsvejledning\' efter at have trykket på et resultat på liste med søgeresultater eller favoritliste.
|
||||
<string name="tip_navigation_t">"For at få kørselsvejledning til et sted, enten langt tryk på direkte på kortet, (tryk derefter på beskrivelsemarkøren, og vælg \'Kørselsvejledning til\'), eller vælg \'Kørselsvejledning til\' efter at have trykket på et resultat på liste med søgeresultater eller favoritliste.
|
||||
\n\nDestinationen er markeret som et målflag på kortet og OsmAnd viser afstand og retning til det (orange trekant).
|
||||
\n\nFor at få kørselsvejledning til destinationen fra et andet punkt end den aktuelle position, vælges det på kortet, og tryk \'Kørselsvejledning fra\'.
|
||||
\n\nVælg enten \'Begynd navigation\', hvilket betyder, at OsmAnd giver vejledning og talte instruktioner (hvis aktiveret) mv. Eller vælg \'Vis rute\', hvilket resulterer i statisk rute uden vejledning eller justeringer, mens du flytter.
|
||||
|
|
@ -1279,15 +1279,14 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
|
|||
<string name="tip_app_mode_t_v2">OsmAnd understøtter forskellige profiler (kan konfigureres) til forskellige brugstilfælde.
|
||||
\n\nSkift profil via profilknappen i nederste venstre hjørne af skærmen (bil, cykel eller fodgænger) eller når en rute oprettes (\'Transportform\').
|
||||
</string>
|
||||
<string name="tip_search_t">Søg efter steder direkte på kortet via \'Brug placeringer\' → \'Søg i nærheden\ , eller ved at bruge søgeskærmen via \'Menu\' → \'Søg\'.
|
||||
<string name="tip_search_t">"Søg efter steder direkte på kortet via \'Brug placeringer\' → \'Søg i nærheden , eller ved at bruge søgeskærmen via \'Menu\' → \'Søg\'.
|
||||
\n\nSøgeskærmen indeholder skabeloner for søgning
|
||||
\n * efter adresse
|
||||
\n * via koordinater
|
||||
\n * som IP (efter type eller navn)
|
||||
\n * via søgehistorik
|
||||
\n * eller via foruddefinerede favoritter
|
||||
\n\nFor alle fundne resultater tilbyder genvejsmenuen: \'Kørselsvejledning\' eller \'Vis på kort\' osv.
|
||||
</string>
|
||||
\n\nFor alle fundne resultater tilbyder genvejsmenuen: \'Kørselsvejledning til\' eller \'Vis på kort\' osv. "</string>
|
||||
<string name="tip_map_context_menu_t">\'Brug placering\' menuen indeholder alle handlinger, der henviser til et punkt (placering).
|
||||
\n\nDen er tilgængelig ved at trykke og holde på ethvert punkt på kortet (derefter trykkes på markøren), eller ved at trykke på trackball knappen, eller ved at vælge \'Menu\' → \'Brug placering\' (de to sidste metoder bruger kortcenter som reference).
|
||||
\n\nEn markør boks kan skjules igen med et langt tryk.
|
||||
|
|
@ -1965,9 +1964,9 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
|
|||
<string name="flat_list_waypoitns">Alle</string>
|
||||
<string name="waypoints">Rutepunkter</string>
|
||||
<string name="targets">Destinationer</string>
|
||||
<string name="way_alarms">Forhindringer</string>
|
||||
<string name="speak_favorites">Favoritter</string>
|
||||
<string name="speak_poi">Interessepunkt (IP)</string>
|
||||
<string name="way_alarms">Trafikadvarsler</string>
|
||||
<string name="speak_favorites">Nærliggende favoritter</string>
|
||||
<string name="speak_poi">Nærliggende interessepunkt (IP)</string>
|
||||
<string name="flat_list_waypoints">Alle</string>
|
||||
<string name="index_tours">Ture</string>
|
||||
<string name="distance">Afstand</string>
|
||||
|
|
@ -1982,4 +1981,11 @@ Afghanistan, Albanien, Algeriet, Andorra, Angola, Anguilla, Antigua og Barbuda,
|
|||
<string name="confirm_every_run">Spørg altid</string>
|
||||
<string name="save_global_track_interval_descr">Vælg logningsinterval for den almindelige sporregistrering (aktiveres via \'GPX optagelse\' på hovedskærmen)</string>
|
||||
<string name="save_global_track_interval">Generelt logningsinterval</string>
|
||||
<string name="traffic_warning_speed_limit">Hastighedsgrænse</string>
|
||||
<string name="traffic_warning_border_control">Grænsekontrol</string>
|
||||
<string name="traffic_warning_payment">Betalingsveje</string>
|
||||
<string name="traffic_warning_stop">Stop</string>
|
||||
<string name="traffic_warning_calming">Hastighedsnedsættende</string>
|
||||
<string name="traffic_warning_speed_camera">Fotofælde</string>
|
||||
<string name="traffic_warning">Trafikadvarsel</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,14 @@
|
|||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
<string name="traffic_warning_speed_limit">Geschwindigkeitsbegrenzung</string>
|
||||
<string name="traffic_warning_border_control">Grenzkontrolle</string>
|
||||
<string name="traffic_warning_payment">Mautstelle</string>
|
||||
<string name="traffic_warning_stop">Stoppzeichen</string>
|
||||
<string name="traffic_warning_calming">Verkehrsberuhigung</string>
|
||||
<string name="traffic_warning_speed_camera">Geschwindigkeitskontrolle</string>
|
||||
<string name="traffic_warning">Verkehrswarnung</string>
|
||||
<string name="speak_favorites">Nahegelegene Favoriten ankündigen</string>
|
||||
<string name="speak_poi">Nahegelegene POI ankündigen</string>
|
||||
<string name="tip_navigation">Navigation starten</string>
|
||||
<string name="tip_navigation_t">Die Route zu einem Ziel erhält man entweder durch direktes lang-anklicken eines Punktes in der Karte, (dann Kurzklick auf den Positionsmarker und das Auswählen des Menüpunktes \'Navigiere zu\'), oder über die Funktion \'Navigiere zu\' bei Klick auf ein Ergebnis einer Such-Liste oder einen Favoriten.
|
||||
\n\nDer Zielpunkt wird als orangefarbener Punkt auf der Karte markiert. Zu einem gewählten Ziel zeigt OsmAnd auf der Karte die Entfernung und die Richtung (orangefarbenes Dreieck) an.
|
||||
|
|
@ -50,7 +59,7 @@
|
|||
<string name="rendering_attr_coloredBuildings_name">Gefärbte Gebäude</string>
|
||||
<string name="continue_navigation">Navigation fortsetzen</string>
|
||||
<string name="pause_navigation">Navigation pausieren</string>
|
||||
<string name="keep_navigation_service">Aktiv lassen</string>
|
||||
<string name="keep_navigation_service">Aktiv erhalten</string>
|
||||
<string name="stop_navigation_service">Unterbrechen</string>
|
||||
<string name="rendering_attr_alpineHiking_name">Alpine Tourenskala (SAC)</string>
|
||||
<string name="rendering_attr_alpineHiking_description">Wege entsprechend der SAC-Wanderskala darstellen</string>
|
||||
|
|
@ -1448,7 +1457,7 @@
|
|||
|
||||
<string name="speak_speed_limit">Höchstgeschwindigkeit ansagen</string>
|
||||
<string name="speak_cameras">Blitzer ansagen</string>
|
||||
<string name="speak_traffic_warnings">Verkehrsmeldungen ansagen</string>
|
||||
<string name="speak_traffic_warnings">Verkehrswarnungen ansagen</string>
|
||||
<string name="osb_author_or_password_not_specified">Bitte OSM-Nutzername und Passwort in den Einstellungen eingeben</string>
|
||||
<string name="clear_intermediate_points">Zwischenziele löschen</string>
|
||||
<string name="keep_intermediate_points">Zwischenziele behalten</string>
|
||||
|
|
@ -1612,7 +1621,7 @@
|
|||
<string name="map_preferred_locale">Bevorzugte Sprache für Karten-Beschriftung</string>
|
||||
<string name="local_map_names">Lokale Namen</string>
|
||||
<string name="rendering_attr_subwayMode_name">U-Bahn-Modus</string>
|
||||
<string name="gps_wake_up_timer">GPS Aufwach-Intervall</string>
|
||||
<string name="gps_wake_up_timer">GPS-Aufwach-Intervall</string>
|
||||
<string name="forward">Weiter</string>
|
||||
<string name="hide_all_waypoints">alle löschen</string>
|
||||
|
||||
|
|
@ -1961,11 +1970,9 @@ Afghanistan, Ägypten, Albanien, Algerien, Andorra, Angola, Anguilla, Antigua an
|
|||
<string name="distance">Distanz</string>
|
||||
<string name="index_tours">Touren</string>
|
||||
<string name="flat_list_waypoints">Alle</string>
|
||||
<string name="waypoints">GPX-Wegpunkte</string>
|
||||
<string name="waypoints">Wegpunkte</string>
|
||||
<string name="targets">Ziele</string>
|
||||
<string name="way_alarms">Hindernisse</string>
|
||||
<string name="speak_favorites">Favoriten ansagen</string>
|
||||
<string name="speak_poi">POI ansagen</string>
|
||||
<string name="way_alarms">Verkehrswarnungen</string>
|
||||
<string name="record_plugin_description">Speichern Sie Ihre Tracks mit einem Klick. Zeigt die Einstellung, wie Strecken aufgezeichnet werden – in lokale GPX-Dateien oder online via Web-Service.</string>
|
||||
<string name="route_descr_destination"/>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -635,26 +635,25 @@
|
|||
\n\nΜπορείτε να αλλάξετε τα προφίλ μέσω του κουμπιού προφίλ στην κάτω αριστερή γωνία της οθόνης χάρτη (εικονίδιο αυτοκίνητο, ποδήλατο, ή πεζός), ή κατά τη δημιουργία κάποιου δρομολογίου.
|
||||
</string>
|
||||
<string name="tip_navigation">Πλοήγηση</string>
|
||||
<string name="tip_navigation_t">"Για να πάρετε οδηγίες προς κάποιο μέρος, πατήστε παρατεταμένα στο σημείο πάνω στο χάρτη, (κατόπιν πατήστε στην περιγραφή και επιλέξτε \'Οδηγίες προς\'), ή επιλέξτε \'Οδηγίες\' μετά το πάτημα σε κάποια καταχώρηση λίστας αναζήτησης ή λίστα αγαπημένων.
|
||||
<string name="tip_navigation_t">"Για να πάρετε οδηγίες προς κάποιο μέρος, πατήστε παρατεταμένα στο σημείο πάνω στο χάρτη, (κατόπιν πατήστε στην περιγραφή και επιλέξτε \'Οδηγίες προς\'), ή επιλέξτε \'Οδηγίες προς\' μετά το πάτημα σε κάποια καταχώρηση λίστας αναζήτησης ή λίστα αγαπημένων.
|
||||
\n\nΟ προορισμός σημειώνεται ως δείκτης με σημαία στόχο πάνω στο χάρτη και ο OsmAnd εμφανίζει την απόσταση και την κατεύθυνση προς αυτόν (πορτοκαλί τρίγωνο).
|
||||
\n\nΓια να δείτε ένα δρομολόγιο προς τον προορισμό από κάποιο άλλο σημείο πέρα από την τρέχουσα θέση σας, ακολούθως επιλέξτε το στο χάρτη και πατήστε \'Οδηγίες από\'. "</string>
|
||||
<string name="tip_search">Αναζήτηση</string>
|
||||
<string name="tip_search_t">Μπορείτε να αναζητήσετε τόπους κατευθείαν στο χάρτη μέσω του \'Χρήση τοποθεσίας\' → \'Αναζήτηση εδώ κοντά\', ή καλώντας την οθόνη αναζήτησης μέσω του \'Μενού\' → \'Αναζήτηση\'.
|
||||
<string name="tip_search_t">"Μπορείτε να αναζητήσετε τόπους κατευθείαν στο χάρτη μέσω του \'Χρήση τοποθεσίας\' → \'Αναζήτηση εδώ κοντά\', ή καλώντας την οθόνη αναζήτησης μέσω του \'Μενού\' → \'Αναζήτηση\'.
|
||||
\n\nΗ οθόνη αναζήτησης παρέχει πρότυπα για αναζήτηση
|
||||
\n\t* με διεύθυνση
|
||||
\n\t* μέσω συντεταγμένων
|
||||
\n\t* ως Σημ Ενδ (κατά τύπο ή όνομα)
|
||||
\n\t* μέσω του ιστορικού αναζήτησης
|
||||
\n\t* ή μέσω των προκαθορισμένων αγαπημένων σας.
|
||||
\n\nΓια όλα τα χτυπήματα ένα μενού περιβάλλοντος ή πλαίσιο δραστηριοτήτων σας προσφέρει επιλογές όπως: \'Οδηγίες\' ή \'Εμφάνιση στο χάρτη\', κλπ.
|
||||
</string>
|
||||
\n\nΓια όλα τα χτυπήματα ένα μενού περιβάλλοντος ή πλαίσιο δραστηριοτήτων σας προσφέρει επιλογές όπως: \'Οδηγίες προς\' ή \'Εμφάνιση στο χάρτη\', κλπ. "</string>
|
||||
<string name="tip_map_context_menu">Μενού \'χρήση τοποθεσίας\'</string>
|
||||
<string name="tip_map_context_menu_t">Το \'Χρήση τοποθεσίας\' μενού περιβάλλοντος περιέχει όλες τις ενέργειες που αφορούν το σημείο (τοποθεσία).
|
||||
\n\nΕίναι διαθέσιμο πατώντας παρατεταμένα πάνω στο χάρτη (μετά πατήστε τον δείκτη του), ή πατώντας το κουμπί του trackball, ή επιλέγοντας \'Μενού\' → \'Χρήση τοποθεσίας\' (οι δύο τελευταίοι τρόποι παίρνουν το κέντρο του χάρτη σαν σημείο αναφοράς).
|
||||
\n\nΤο πλαίσιο μπορεί να κρυφτεί ξανά πατώντας παρατεταμένα πάνω του.
|
||||
</string>
|
||||
<string name="tip_initial">Βοήθεια</string>
|
||||
<string name="tip_initial_t">"Ο OsmAnd είναι μια εφαρμογή πλοήγησης με αρκετά χαρακτηριστικά.\n\nΜια βασική εισαγωγή, συμβουλές χρήσης, και προηγμένη βοήθεια είναι συνδεδεμένα μέσω του \'Μενού\'→\'Βοήθεια\' στην οθόνη χάρτη. "</string>
|
||||
<string name="tip_initial_t">"Ο OsmAnd είναι μια εφαρμογή πλοήγησης με αρκετά χαρακτηριστικά.\n\nΩς μια βασική εισαγωγή, μερικές συμβουλές χρήσης και κόλπα είναι συνδεδεμένα μέσω του \'Μενού\'→\'Βοήθεια\' στην οθόνη χάρτη. "</string>
|
||||
<string name="next_button">Επόμενο</string>
|
||||
<string name="previous_button">Προηγούμενο</string>
|
||||
<string name="unit_of_length_descr">Αλλαγή μονάδων μήκους και ταχύτητας</string>
|
||||
|
|
@ -1653,9 +1652,9 @@
|
|||
<string name="osmo_settings">Παρακολούθηση OpenStreetMap</string>
|
||||
<string name="flat_list_waypoints">Όλα</string>
|
||||
<string name="targets">Προορισμοί</string>
|
||||
<string name="way_alarms">Εμπόδια</string>
|
||||
<string name="speak_favorites">Ανακοίνωση Αγαπημένων</string>
|
||||
<string name="speak_poi">Ανακοίνωση ΣΕ</string>
|
||||
<string name="way_alarms">Προειδοποιήσεις κυκλοφορίας</string>
|
||||
<string name="speak_favorites">Ανακοίνωση κοντινών Αγαπημένων</string>
|
||||
<string name="speak_poi">Ανακοίνωση κοντινών ΣΕ</string>
|
||||
<string name="record_plugin_name">Καταγράψτε τα ταξίδια σας</string>
|
||||
<string name="int_hour">ω</string>
|
||||
<string name="duration">Διάρκεια</string>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources>
|
||||
|
||||
<string name="layer_map_appearance">Configura pantalla</string>
|
||||
|
|
@ -279,28 +279,27 @@
|
|||
<string name="tip_app_mode">Perfil de uso</string>
|
||||
|
||||
<string name="tip_navigation">Navegación</string>
|
||||
<string name="tip_navigation_t">"Para recibir indicaciones hasta un lugar, o bien mantén pulsado sobre el mismo en el mapa, luego pulsa sobre su descripción y selecciona \'Indicaciones a\', o bien selecciona \'Indicaciones\' después de pulsar sobre una entrada en una lista de resultados de búsqueda o de favoritos.
|
||||
<string name="tip_navigation_t">"Para recibir indicaciones hasta un lugar, o bien mantén pulsado sobre el mismo en el mapa, (luego pulsa sobre su descripción y selecciona \'Indicaciones a\'), o selecciona \'Indicaciones a\' después de pulsar sobre una entrada en una lista de resultados de búsqueda o de favoritos.
|
||||
\n\nEl destino se marca en el mapa como una bandera y OsmAnd muestra la distancia y la dirección al mismo (triángulo naranja).
|
||||
\n\nPuedes elegir \'Seguir\', lo que implica que OsmAnd te guiará, te dará indicaciones vocales (si están activas), etc. O puedes elegir \'Sólo mostrar\', lo que solamente te mostrará la ruta, sin indicaciones ni reajustes según te muevas.
|
||||
\n\nPuedes elegir \'Iniciar Navegación\', lo que implica que OsmAnd te guiará, te dará indicaciones vocales (si están activas), etc. O puedes elegir \'Mostrar ruta\', lo que solamente te mostrará la ruta, sin indicaciones ni reajustes según te muevas.
|
||||
\n\nPara mostrar una ruta al destino desde cualquier punto diferente de la posición actual, selecciónalo posteriormente en el mapa y pulsa \'Indicaciones desde\'.
|
||||
\n\nSi usas \'Indicaciones desde\' y luego \'Seguir\', OsmAnd cambiará a tu posición actual tan pronto como la conozca (por lo que se puede usar para iniciar la ruta antes de conocer la posición real). Por otro lado, \'Indicaciones desde\' y \'Sólo mostrar\' no realizará actualizaciones de la ruta mostrada. "</string>
|
||||
\n\nSi usas \'Indicaciones desde\' y luego \'Iniciar Navegación\', OsmAnd cambiará a tu posición actual tan pronto como la conozca (por lo que se puede usar para iniciar la ruta antes de conocer la posición real). Por otro lado, \'Indicaciones desde\' y \'Mostrar ruta\' no realizará actualizaciones de la ruta mostrada. "</string>
|
||||
<string name="tip_search">Buscando</string>
|
||||
<string name="tip_search_t">Puedes buscar lugares directamente en el mapa vía \'Usar localización…\'→\'Buscar cerca de aquí\', o mediante la pantalla de búsqueda vía \'Menú\'→\'Buscar\'.
|
||||
<string name="tip_search_t">"Puedes buscar lugares directamente en el mapa vía \'Usar localización\'→\'Buscar cerca de aquí\', o mediante la pantalla de búsqueda vía \'Menú\'→\'Buscar\'.
|
||||
\n\nLa pantalla de búsqueda proporciona plantillas para buscar:
|
||||
\n\t* por dirección
|
||||
\n\t* vía coordenadas
|
||||
\n\t* como PDI (por tipo o por nombre)
|
||||
\n\t* vía tu historial de búsquedas
|
||||
\n\t* o en tus favoritos predefinidos.
|
||||
\n\nPara los puntos encontrados, se ofrece un menú contextual o barra de acciones con opciones como \'Indicaciones\' o \'Mostrar en mapa\'.
|
||||
</string>
|
||||
\n\nPara los puntos encontrados, se ofrece un menú contextual o barra de acciones con opciones como \'Indicaciones a\' o \'Mostrar en mapa\'. "</string>
|
||||
<string name="tip_map_context_menu">Menú \'Usar localización…\'</string>
|
||||
<string name="tip_map_context_menu_t">El menú contextual \'Usar localización…\' contiene todas las acciones relacionadas con el punto (localización).
|
||||
\n\nAparece bien con una pulsación larga en un punto del mapa y luego pulsando sobre su marcador, bien pulsando el botón del trackball, o bien seleccionando \'Menú\'→\'Usar localización…\' (los dos últimos modos toman el cenro del mapa como referencia).
|
||||
\n\nUna caja marcador puede ser ocultada con una pulsación larga sobre ella.
|
||||
</string>
|
||||
<string name="tip_initial">Ayuda</string>
|
||||
<string name="tip_initial_t">"OsmAnd es una aplicación de navegación con muchas características.\n\nAlguna introducción básica, consejos de uso, y la ayuda avanzada están enlazados en el \'Menú\' → \'Ayuda\' desde la pantalla del mapa. "</string>
|
||||
<string name="tip_initial_t">"OsmAnd es una aplicación de navegación con muchas características.\n\nComo una introducción básica, algunos consejos de uso y trucos están enlazados en el \'Menú\' → \'Ayuda\' desde la pantalla del mapa. "</string>
|
||||
<string name="next_button">Siguiente</string>
|
||||
<string name="previous_button">Anterior</string>
|
||||
<string name="unit_of_length_descr">Cambia las unidades de longitud y velocidad</string>
|
||||
|
|
@ -1086,7 +1085,7 @@ Para poder usar muchas características de la aplicación necesitas algunos dato
|
|||
<string name="rendering_attr_roadColors_name">Esquema de color de carreteras</string>
|
||||
<string name="zxing_barcode_scanner_not_found">La aplicación ZXing Barcode Scanner no está instalada. ¿Buscarla en el Market?</string>
|
||||
<string name="close_changeset">Cerrar conjunto de cambios</string>
|
||||
<string name="background_service_is_enabled_question">El servicio de fondo aún está funcionando. ¿Quieres cancelarlo?</string>
|
||||
<string name="background_service_is_enabled_question">El servicio de fondo aún está funcionando. ¿Quieres interrumpirlo también?</string>
|
||||
<string name="tip_recent_changes_1_0_0_t">"Cambios en 1.0:\n\t* Mejorado el enrutamiento: más rápido y más preciso (hasta 250 km)\n\t* Introduce mapas sólo de carreteras\n\t* El mapa no pierde el bloqueo de posición después de interrupciones\n\t* Activa el servicio de fondo durante la navegación "
|
||||
</string>
|
||||
<string name="safe_mode_description">Ejecutar la aplicación en modo seguro (Usando código de Android, más lento, en vez del nativo).</string>
|
||||
|
|
@ -1799,10 +1798,10 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
|
|||
<string name="osmo_start_service">Servicio OsMo</string>
|
||||
<string name="osmo_gpx_track_downloaded">Pista OsMo %1$s descargada.</string>
|
||||
<string name="keep_navigation_service">Mantener</string>
|
||||
<string name="stop_navigation_service">Parar</string>
|
||||
<string name="stop_navigation_service">Interrumpir</string>
|
||||
<string name="enable_sleep_mode">Habilita modo reposo del GPS</string>
|
||||
<string name="gps_wake_up_timer">Intervalo para despertar GPS</string>
|
||||
<string name="sleep_mode_stop_dialog">¿Apagar el modo reposo del GPS?</string>
|
||||
<string name="sleep_mode_stop_dialog">¿Interrumpir el modo reposo del GPS?</string>
|
||||
<string name="map_preferred_locale_descr">Idioma preferido para las etiquetas en el mapa (si no se indica se cambiará a inglés o a nombres locales)</string>
|
||||
<string name="map_preferred_locale">Idioma preferido del mapa</string>
|
||||
<string name="local_map_names">Nombres locales</string>
|
||||
|
|
@ -1853,9 +1852,9 @@ Afganistán, Albania, Alemania, Andorra, Angola, Anguila, Antigua y Barbuda, Ant
|
|||
<string name="flat_list_waypoitns">Todos</string>
|
||||
<string name="waypoints">Puntos de ruta</string>
|
||||
<string name="targets">Destinos</string>
|
||||
<string name="way_alarms">Obstáculos</string>
|
||||
<string name="speak_favorites">Anunciar Favoritos</string>
|
||||
<string name="speak_poi">Anunciar PDI</string>
|
||||
<string name="way_alarms">Advertencias de tráfico</string>
|
||||
<string name="speak_favorites">Anunciar favoritos cercanos</string>
|
||||
<string name="speak_poi">Anunciar PDI cercano</string>
|
||||
<string name="flat_list_waypoints">Todos</string>
|
||||
<string name="index_tours">Excursiones</string>
|
||||
<string name="int_hour">h</string>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="offline_edition">Modifications hors-ligne</string>
|
||||
<string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
|
||||
<string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :
|
||||
|
|
@ -294,15 +294,14 @@
|
|||
<string name="tip_navigation_t">"La navigation vers un point peut être lancée soit directement par un appui long à son emplacement sur la carte (une bulle apparaît alors, sur laquelle un appui court ouvre le menu contextuel avec le choix \'Aller vers le point\'), soit par un appui court sur un favori ou un résultat de recherche (en choisissant alors \'Navigation\').
|
||||
\n\tLa destination est alors indiquée par un point et un drapeau à damier. OsmAnd affiche la distance qui vous en sépare, et sa direction (par une flèche orange). "</string>
|
||||
<string name="tip_search">Recherche</string>
|
||||
<string name="tip_search_t">\tVous pouvez rechercher un lieu via l\'option \'Rechercher autour du point\' dans le menu contextuel de la carte, ou via \'Menu\' → \'Rechercher\'.
|
||||
<string name="tip_search_t">"Vous pouvez rechercher un lieu via l\'option \'Rechercher autour du point\' dans le menu contextuel de la carte, ou via \'Menu\' → \'Rechercher\'.
|
||||
\n\nVous pouvez alors rechercher :
|
||||
\n\t* un point d\'intérêt (par type ou par nom)
|
||||
\n\t* une adresse
|
||||
\n\t* des coordonnées
|
||||
\n\t* un favori prédéfini
|
||||
\n\t* dans l\'historique des recherches
|
||||
\n\tDans chacun des cas, il vous sera proposé un choix entre \'Navigation\' (vers le point) ou \'Voir sur la carte\', etc.
|
||||
</string>
|
||||
\n\tDans chacun des cas, il vous sera proposé un choix entre \'Aller vers le point\' ou \'Voir sur la carte\', etc. "</string>
|
||||
<string name="tip_map_context_menu">Menu \'Utiliser position\'</string>
|
||||
<string name="tip_map_context_menu_t">\tLe menu contextuel de la carte regroupe les actions possibles au niveau d\'un point (un lieu).
|
||||
\n\tIl est disponible par un appui long au niveau du point sur la carte, suivi d\'un appui court sur la bulle apparue avec les coordonnées du point (un appui long sur la bulle la fait disparaître).
|
||||
|
|
@ -1804,9 +1803,9 @@ Afghanistan, Albanie, Algérie, Allemagne, Andorre, Angola, Anguilla, Antigua-et
|
|||
<string name="flat_list_waypoitns">Tous</string>
|
||||
<string name="waypoints">Points de cheminement</string>
|
||||
<string name="targets">Destinations</string>
|
||||
<string name="way_alarms">Obstacles</string>
|
||||
<string name="speak_favorites">Annoncer les favoris</string>
|
||||
<string name="speak_poi">Annoncer les points d\'intérêt</string>
|
||||
<string name="way_alarms">Alertes de circulation</string>
|
||||
<string name="speak_favorites">Annoncer les favoris proches</string>
|
||||
<string name="speak_poi">Annoncer les points d\'intérêt proches</string>
|
||||
<string name="flat_list_waypoints">Tous</string>
|
||||
<string name="index_tours">Tours</string>
|
||||
<string name="record_plugin_description">Enregistrer vos traces en touchant le bouton de l\'écran principal. Monter les paramètres pour l\'enregistrement des traces dans des fichiers GPX locaux ou en ligne avec un service Web.</string>
|
||||
|
|
|
|||
|
|
@ -556,7 +556,7 @@
|
|||
<string name="tip_navigation">Navigacija</string>
|
||||
<string name="tip_app_mode">Koristi profil</string>
|
||||
<string name="tip_search">Pretraživanje</string>
|
||||
<string name="tip_initial">Savjeti i trikovi</string>
|
||||
<string name="tip_initial">Pomoć</string>
|
||||
<string name="tip_map_context_menu">\'Koristite lokaciju\' Izbornik</string>
|
||||
<string name="system_locale">Sistem</string>
|
||||
<string name="tip_location_sharing">Podijeli lokaciju</string>
|
||||
|
|
@ -959,7 +959,7 @@
|
|||
<string name="base_world_map">Osnovna karta svijeta</string>
|
||||
<string name="about_version">Inačica :</string>
|
||||
<string name="about_settings_descr">Podaci o inačici, licence, članovi projekta</string>
|
||||
<string name="tips_and_tricks">Savjeti</string>
|
||||
<string name="tips_and_tricks">Pomoć</string>
|
||||
<string name="edit_tilesource_choose_existing">Odaberite postojeće…</string>
|
||||
<string name="edit_tilesource_name">Ime</string>
|
||||
<string name="maps_define_edit">Definiraj/Uredi…</string>
|
||||
|
|
@ -1183,7 +1183,7 @@
|
|||
<string name="osmo_specify_tracker_id">Molimo vas da u postavkama navedete OSM korisničko ime i lozinku</string>
|
||||
<string name="continue_navigation">Nastavi navigaciju</string>
|
||||
<string name="pause_navigation">Pauziraj navigaciju</string>
|
||||
<string name="enable_sleep_mode">Omogućite stanje mirovanja</string>
|
||||
<string name="enable_sleep_mode">Omogućite stanje mirovanja GPS-a</string>
|
||||
<string name="gps_wake_up_timer">Interval uključivanja GPS-a</string>
|
||||
<string name="sleep_mode_stop_dialog">Ostaviti GPS uključen?</string>
|
||||
<string name="map_preferred_locale_descr">Izaberite jezik za oznake na karti(ako jezik nije dostupan prebaciti će se na Engleski ili lokalni jezik)</string>
|
||||
|
|
@ -1193,4 +1193,57 @@
|
|||
<string name="lang_he">Hebrejski</string>
|
||||
<string name="forward">Naprijed</string>
|
||||
<string name="home">Početna</string>
|
||||
<string name="save_track_to_gpx_globally">Spremi rutu kao GPX trag</string>
|
||||
<string name="duration">Trajanje</string>
|
||||
<string name="distance">Udaljenost</string>
|
||||
<string name="flat_list_waypoints">Sve</string>
|
||||
<string name="targets">Destinacije</string>
|
||||
<string name="way_alarms">Prepreke</string>
|
||||
<string name="speak_favorites">Najavi favorite</string>
|
||||
<string name="speak_poi">Najavi POI</string>
|
||||
<string name="download_additional_maps">Preuzeti karte koje nedostaju %1$s (%2$d MB)?</string>
|
||||
<string name="live_monitoring_start">Započnite online praćenje</string>
|
||||
<string name="live_monitoring_stop">Zaustavi online praćenje</string>
|
||||
<string name="gpx_monitoring_start">Započni GPX bilježenje položaja</string>
|
||||
<string name="gpx_monitoring_stop">Zaustavi GPX bilježenje položaja</string>
|
||||
<string name="rendering_attr_hideBuildings_name">Sakrij zgrade</string>
|
||||
<string name="rendering_attr_hideText_name">Sakrij tekst</string>
|
||||
<string name="rendering_attr_hideWoodScrubs_name">Sakrij šume i šikare</string>
|
||||
<string name="rendering_attr_moreDetailed_name">Više detalja</string>
|
||||
<string name="rendering_attr_lessDetailed_name">Manje detalja</string>
|
||||
<string name="rendering_attr_hideAccess_name">Sakrij ograničenja pristupa</string>
|
||||
<string name="rendering_attr_showAccess_name">Prikaži ograničenja pristupa</string>
|
||||
<string name="rendering_attr_showSurfaceGrade_name">Prikaži kvalitetu cesta</string>
|
||||
<string name="rendering_attr_showSurfaces_name">Prikaži površine ceste</string>
|
||||
<string name="rendering_attr_showCycleRoutes_name">Prikaži biciklističke staze</string>
|
||||
<string name="osmo_group_information">Molimo pročitajte prije stvaranja grupe!</string>
|
||||
<string name="no_index_file_to_download">Ništa za preuzimanje, provjerite internetsku vezu.</string>
|
||||
<string name="local_index_unselect_gpx_file">Ukloni odabir</string>
|
||||
<string name="local_index_select_gpx_file">Odaberite za prikaz</string>
|
||||
<string name="sort_by_distance">Poredaj prema udaljenosti</string>
|
||||
<string name="sort_by_name">Poredaj po nazivu</string>
|
||||
<string name="visible_element">Prikaži na karti</string>
|
||||
<string name="select_destination_and_intermediate_points">Odaberite međutočke</string>
|
||||
<string name="loading_smth">Učitavanje %1$s …</string>
|
||||
<string name="map_widget_plain_time">Trenutno vrijeme</string>
|
||||
<string name="selected_gpx_info_show">\n\nPritisnite i držite za prikaz na karti</string>
|
||||
<string name="delay_navigation_start">Započni turn-by-turn navođenje automatski</string>
|
||||
<string name="selected">odabrano</string>
|
||||
<string name="gpx_info_distance">"Udaljenost: %1$s (%2$s points) "</string>
|
||||
<string name="gpx_info_start_time">"Vrijeme Početka: %1$tF, %1$tT "</string>
|
||||
<string name="gpx_info_average_speed">"Prosječna brzina: %1$s "</string>
|
||||
<string name="gpx_info_maximum_speed">"Maksimalna brzina: %1$s "</string>
|
||||
<string name="gpx_info_avg_altitude">Prosječna visina: %1$s</string>
|
||||
<string name="gpx_info_asc_altitude">Nizbrdica/uspon: %1$s</string>
|
||||
<string name="gpx_timespan">Vrijeme trajanja: %1$s</string>
|
||||
<string name="gpx_timemoving">Vrijeme u pokretu: %1$s</string>
|
||||
<string name="gpx_selection_number_of_points">" %1$s točke"</string>
|
||||
<string name="gpx_selection_point">Točka %1$s</string>
|
||||
<string name="gpx_selection_current_track">bilježenje</string>
|
||||
<string name="osmo_user_joined">Korisnik %1$s se pridružio grupi %2$s</string>
|
||||
<string name="osmo_user_left">Korisnik %1$s je napustio grupu %2$s</string>
|
||||
<string name="osmo_show_group_notifications">Prikaži obavjesti grupe</string>
|
||||
<string name="osmo_follow">Prati</string>
|
||||
<string name="osmo_sign_in">Prijavite se</string>
|
||||
<string name="osmo_create_groups_confirm">Kako bi stvorili grupu morate biti registrirani Osmo korisnik.</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1740,9 +1740,9 @@
|
|||
<string name="flat_list_waypoints">Összes</string>
|
||||
<string name="waypoints">Útpontok</string>
|
||||
<string name="targets">Úti célok</string>
|
||||
<string name="way_alarms">Akadályok</string>
|
||||
<string name="speak_favorites">Kedvenc helyek</string>
|
||||
<string name="speak_poi">Érdekes helyek (POI)</string>
|
||||
<string name="way_alarms">Forgalmi figyelmeztetések</string>
|
||||
<string name="speak_favorites">Közeli kedvenc helyek</string>
|
||||
<string name="speak_poi">Közeli érdekes helyek (POI)</string>
|
||||
<string name="download_additional_maps">Letöltöd a hiányzó térképeket %1$s (%2$d MB)?</string>
|
||||
<string name="rendering_value_browse_map_name">Térképböngészés</string>
|
||||
<string name="rendering_value_car_name">Autó</string>
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
<string name="user_name_descr">Necessario per inviare contributi a openstreetmap.org</string>
|
||||
<string name="user_password">Password in OSM</string>
|
||||
<string name="user_password_descr">Necessaria per inviare contributi a openstreetmap.org</string>
|
||||
<string name="osmand_service">Servizio in background</string>
|
||||
<string name="osmand_service">Modalità sleep</string>
|
||||
<string name="osmand_service_descr">Usato per eseguire OsmAnd con lo schermo spento</string>
|
||||
<string name="tip_rotation_switching">Orientamento della mappa</string>
|
||||
|
||||
|
|
@ -1471,7 +1471,7 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
<string name="use_kalman_filter_compass_descr">Usare il filtro di Kalman per evitare aberrazioni della bussola</string>
|
||||
<string name="use_kalman_filter_compass">Uso del filtro di Kalman</string>
|
||||
<string name="access_mark_final_location_first">Modalità di accesso facilitato: selezionare prima la destinazione</string>
|
||||
<string name="wait_current_task_finished">Prego attendere il termine del presente lavoro</string>
|
||||
<string name="wait_current_task_finished">Prego attendere il termine dell\'operazione</string>
|
||||
<string name="downloading_file_new">In download …</string>
|
||||
<string name="plugin_distance_point_time">orario</string>
|
||||
<string name="plugin_distance_point_hdop">precisione</string>
|
||||
|
|
@ -1901,8 +1901,8 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="rendering_attr_hideText_name">Nascondi il testo</string>
|
||||
<string name="rendering_attr_hideWoodScrubs_name">Nascondi foreste e boscaglie</string>
|
||||
<string name="rendering_attr_buildings15zoom_name">Edifici dal zoom 15</string>
|
||||
<string name="rendering_attr_moreDetailed_name">Più dettagliato</string>
|
||||
<string name="rendering_attr_lessDetailed_name">Meno dettagliato</string>
|
||||
<string name="rendering_attr_moreDetailed_name">Più dettagli</string>
|
||||
<string name="rendering_attr_lessDetailed_name">Meno dettagli</string>
|
||||
<string name="rendering_attr_hideAccess_name">Nascondi le limitazioni di accesso</string>
|
||||
<string name="rendering_attr_showAccess_name">Mostra le limitazioni di accesso</string>
|
||||
<string name="rendering_attr_showSurfaceGrade_name">Mostra la qualità delle strade</string>
|
||||
|
|
@ -1927,7 +1927,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="keep_navigation_service">Mantieni</string>
|
||||
<string name="stop_navigation_service">Interrompi</string>
|
||||
<string name="enable_sleep_mode">Abilita la modalità GPS quiescente</string>
|
||||
<string name="gps_wake_up_timer">Intervallo risveglio GPS</string>
|
||||
<string name="gps_wake_up_timer">Intervallo di risveglio del GPS</string>
|
||||
<string name="sleep_mode_stop_dialog">Interrompere la modalità GPS quiescente?</string>
|
||||
<string name="lang_al">Albanese</string>
|
||||
<string name="lang_ar">Arabo</string>
|
||||
|
|
@ -1944,7 +1944,7 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="rendering_attr_alpineHiking_name">Vista escursionismo alpino</string>
|
||||
<string name="rendering_attr_alpineHiking_description">Disegna i sentieri in base alla scala SAC</string>
|
||||
<string name="rendering_attr_osmcTraces_name">Strato simboli escursionistici</string>
|
||||
<string name="rendering_attr_osmcTraces_description">Disegna i sentieri in base alle tracce OSMC</string>
|
||||
<string name="rendering_attr_osmcTraces_description">Disegna i percorsi in base alle tracce OSMC</string>
|
||||
|
||||
<string name="rendering_attr_coloredBuildings_name">Edifici colorati</string>
|
||||
<string name="arrival_distance_factor_early">Presto</string>
|
||||
|
|
@ -1960,13 +1960,13 @@ Si consiglia di aggiungere uno o più punti intermedi per migliorarne le prestaz
|
|||
<string name="rendering_value_bicycle_name">Bicicletta</string>
|
||||
<string name="rendering_value_pedestrian_name">Pedone</string>
|
||||
<string name="more">Altro...</string>
|
||||
<string name="download_additional_maps">Download mappe mancanti %1$s (%2$d MB)?</string>
|
||||
<string name="download_additional_maps">Scaricare le mappe mancanti %1$s (%2$d MB)?</string>
|
||||
<string name="flat_list_waypoitns">Tutti</string>
|
||||
<string name="waypoints">Punti intermedi</string>
|
||||
<string name="targets">Destinazioni</string>
|
||||
<string name="way_alarms">Ostacoli</string>
|
||||
<string name="speak_favorites">Annuncia Preferiti</string>
|
||||
<string name="speak_poi">Annuncia PDI</string>
|
||||
<string name="way_alarms">Avvisi del traffico</string>
|
||||
<string name="speak_favorites">Annuncia i preferiti nelle vicinanze</string>
|
||||
<string name="speak_poi">Annuncia PDI nelle vicinanze</string>
|
||||
<string name="index_tours">Itinerari</string>
|
||||
<string name="flat_list_waypoints">Tutto</string>
|
||||
<string name="record_plugin_description">Registrate le vostre tracce con il pulsante dedicato nello schermo della mappa. Mostra le impostazioni per la registrazione dei vostri viaggi in file GPX localmente o online utilizzando un servizio web.</string>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
|
||||
|
||||
<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>
|
||||
|
|
@ -2092,9 +2092,9 @@ Vanuatu, Venezuela, Vietnam, Wallis and Futuna, Western Sahara, Yemen, Zambia, Z
|
|||
<string name="flat_list_waypoints">모두</string>
|
||||
<string name="waypoints">포인트</string>
|
||||
<string name="targets">목적지</string>
|
||||
<string name="way_alarms">도로장애</string>
|
||||
<string name="speak_favorites">즐겨찾기를 알리다</string>
|
||||
<string name="speak_poi">POI 알리기</string>
|
||||
<string name="way_alarms">교통 경고</string>
|
||||
<string name="speak_favorites">가까운 즐겨찾기 알리기</string>
|
||||
<string name="speak_poi">가까운 POI 알리기</string>
|
||||
<string name="rendering_attr_publicTransportMode_name">대중 교통 모드</string>
|
||||
<string name="save_track_to_gpx_globally">트랙을 GPX파일로 저장</string>
|
||||
<string name="save_track_to_gpx_globally_descr">GPX 파일에 기록하는 일반적인 위치는 지도 화면에 GPX 기록 위젯을 사용하여 켜거나 끌 수 있습니다</string>
|
||||
|
|
|
|||
|
|
@ -484,21 +484,20 @@
|
|||
<string name="tip_app_mode">Naudoti profilį</string>
|
||||
|
||||
<string name="tip_navigation">Navigacija</string>
|
||||
<string name="tip_navigation_t">"Norėdami gauti nuorodas į pageidaujamą vietą galite ilgai paspaudę žemėlapyje ant pageidaujamos vietos ir ant jos atsiradusiame žymeklyje pasirinkti \'Maršrutas į\', arba pasirinkti \'Nuorodos\' paspaudę ant reikiamo įrašu paieškos rezultatų sąraše.
|
||||
<string name="tip_navigation_t">"Norėdami gauti nuorodas į pageidaujamą vietą galite ilgai paspaudę žemėlapyje ant pageidaujamos vietos ir ant jos atsiradusiame žymeklyje pasirinkti \'Kelionės nuorodos iki\', arba pasirinkti \'Kelionės nuorodos\' paspaudę ant reikiamo įrašu paieškos rezultatų sąraše.
|
||||
\n\nKelionės tikslas žymimas tikslo vėliavėle žemėlapyje ir OsmAnd rodo atstumą ir kryptį iki jo (oranžinis trikampis).
|
||||
\n\nGalite pasirinkti \'Pradėti navigaciją\' - OsmAnd jums duos nuorodas, taip pat ir balsu (jei įdiegta) arba galite pasirinkti \'Rodyti maršrutą\' ir matysite savo pasirinktą maršrutą, tačiau be nurodymų ar pataisymų jums judant
|
||||
\n\nNorėdami gauti nuorodas iš bet kurios vietos (išskyrus jūsų dabartinę) turite ją pažymėti žemėlapyje ir pasirinkti \'Nuorodos iš\'.
|
||||
\n\nJei pasirinksite \'Nuorodos iš\' kartu su \'Pradėti navigaciją\', OsmAnd persijungs į jūsų esamą poziciją kai tik ją apsakičiuos (taip galima pradėti navigaciją dar prieš įranginiui apskaičiavus jūsų dabartinę poziciją), o \'Nuorodos iš\' kartu su \'Rodyti maršrutą\' tik parodys jūsų maršrutą nuo jūsų pasirinkto taško be tolesnių atnaujinimų. "</string>
|
||||
<string name="tip_search">Paieška</string>
|
||||
<string name="tip_search_t">Vietų ieškoti galitie tiesiog žemėlapyje per \'Naudoti vietą\' → \'Ieškoti netoliese\', arba atverdami paiesškos langą per \'Meniu\' → \'Ieškoti\'.
|
||||
<string name="tip_search_t">"Vietų ieškoti galitie tiesiog žemėlapyje per \'Naudoti vietą\' → \'Ieškoti netoliese\', arba atverdami paiesškos langą per \'Meniu\' → \'Ieškoti\'.
|
||||
\n\nPasieškos langas pateikia paieškos įvedimo formas
|
||||
\n\t* pagal adresą
|
||||
\n\t* pagal koordinates
|
||||
\n\t* LV (pagal tipą ar pavadinimą)
|
||||
\n\t* jūsų ieškotų vietų istorijai
|
||||
\n\t* arba jūsų įsimintoms vietoms.
|
||||
\n\nVisiems rastiems įrašams kontekstinis meniu arba veiksmų sąrašas siūlo pasirinkimą \'Nuorodos\' arba \'Rodyti žemėlapyje\' ir kt.
|
||||
</string>
|
||||
\n\nVisiems rastiems įrašams kontekstinis meniu arba veiksmų sąrašas siūlo pasirinkimą \'Kelionės nuorodos\' arba \'Rodyti žemėlapyje\' ir kt. "</string>
|
||||
<string name="tip_map_context_menu">\'Naudoti vietą\' meniu</string>
|
||||
<string name="tip_map_context_menu_t">\'Naudoti vietą\' kontekstinis meniu pateikia visus veiksmus, kurie yra skirti vietai (taškui žemėlapyje).
|
||||
\n\nJį galima pasiekti paspaudus ir laikant ant žemėlapio arba paspaudus valdymo rutulį arba pasirinkus \'Meniu\' → \'Naudoti vietą\' (paskutiniai du būdai naudoja žemėlapio centrą kaip pasirinktą vietą).
|
||||
|
|
@ -1817,9 +1816,9 @@ OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas pri
|
|||
<string name="flat_list_waypoints">Visi</string>
|
||||
<string name="targets">Tikslai</string>
|
||||
<string name="waypoints">Tarpiniai taškai</string>
|
||||
<string name="way_alarms">Kliūtys</string>
|
||||
<string name="speak_favorites">Paskelbti įsimintas vietas</string>
|
||||
<string name="speak_poi">Paskelbti lankytinas vietas</string>
|
||||
<string name="way_alarms">Eismo perspėjimai</string>
|
||||
<string name="speak_favorites">Paskelbti artimiausias įsimintas vietas</string>
|
||||
<string name="speak_poi">Paskelbti artimiausias lankytinas vietas</string>
|
||||
<string name="record_plugin_name">Įrašyti savo keliones</string>
|
||||
<string name="int_hour">val</string>
|
||||
<string name="duration">Trukmė</string>
|
||||
|
|
@ -1832,4 +1831,11 @@ OsmAnd yra aktyviai tobulinama ir mūsų projektas bei jo tolesnis progresas pri
|
|||
<string name="confirm_every_run">Visada klausti</string>
|
||||
<string name="save_global_track_interval_descr">Pasirinkite bendrojo maršruto įrašymo intervalą (įjungiama per GPX valdiklį žemėlapio rodinyje)</string>
|
||||
<string name="save_global_track_interval">Bendras įrašymo intervalas</string>
|
||||
<string name="traffic_warning_speed_limit">Greičio ribojimas</string>
|
||||
<string name="traffic_warning_border_control">Pasienio kontrolė</string>
|
||||
<string name="traffic_warning_payment">Mokamas pravažiavimas</string>
|
||||
<string name="traffic_warning_stop">\"Stop\" ženklas</string>
|
||||
<string name="traffic_warning_calming">Eismo greičio ribojimas</string>
|
||||
<string name="traffic_warning_speed_camera">Greičio matavimo kamera</string>
|
||||
<string name="traffic_warning">Eismo perspėjimas</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -388,15 +388,13 @@
|
|||
\n\nJe kan een ander startpunt kiezen door het punt te selecteren op de kaart en \'Aanwijzingen vanaf\' te kiezen. Met navigatie wordt de route dan automatisch opnieuw berekend zodra je echte positie bekend is. Zo kan je snel starten op een plaats zonder GPS-ontvangst. Als je \'Toon route\' kiest wordt de route niet herberekend.
|
||||
</string>
|
||||
<string name="tip_search">Zoeken</string>
|
||||
<string name="tip_search_t">\tJe kan direct op de kaart naar plaatsen zoeken of zoeken naar een locatie (\'Kaartcontextmenu\' → \'Zoek hier dichtbij\'), of met het zoekscherm met \'Menu\' → \'Zoeken\'.
|
||||
<string name="tip_search_t">"Je kan direct op de kaart naar plaatsen zoeken of zoeken naar een locatie (\'Kaartcontextmenu\' → \'Zoek hier dichtbij\'), of met het zoekscherm met \'Menu\' → \'Zoeken\'.
|
||||
\n\nOp het zoekscherm kan je zoeken:
|
||||
\n\t* op adres
|
||||
\n\t* op coördinaten
|
||||
\n\t* interessepunten (op categorie of op naam)
|
||||
\n\t* uit de zoekgeschiedenis
|
||||
\n\t* in de favorieten
|
||||
Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de favorieten toe te voegen.
|
||||
</string>
|
||||
\n\t* in de favorieten\n\nKies daarna om er heen te navigeren, op de kaart te tonen, of aan een route of de favorieten toe te voegen. "</string>
|
||||
<string name="tip_map_context_menu">Menu \'Gebruik locatie\'</string>
|
||||
<string name="tip_map_context_menu_t">\tHet contextmenu op de kaart biedt alle acties die te maken hebben met een punt op de kaart.
|
||||
\n\nHet wordt getoond als je (lang) op een punt op de kaart drukt en dan op de markering tikt, of door op de trackball-knop te drukken, of via \'Menu\' → \'Gebruik locatie\'.
|
||||
|
|
@ -404,7 +402,7 @@ Kies daarna om er heen te navigeren, op de kaart te tonen, aan een route of de f
|
|||
\n\tEen markering kan worden gesloten door er lang op te drukken.
|
||||
</string>
|
||||
<string name="tip_initial">Help</string>
|
||||
<string name="tip_initial_t">"OsmAnd is een navigatieprogramma met vele mogelijkheden.\n\nEen inleiding, tips en uitgebreide hulp zijn te vinden onder \'Menu\' → \'Help\', in het kaartscherm. "</string>
|
||||
<string name="tip_initial_t">"OsmAnd is een navigatieprogramma met vele mogelijkheden.\n\nEen inleiding, tips en hulp zijn te vinden onder \'Menu\' → \'Help\', in het kaartscherm. "</string>
|
||||
<string name="next_button">Volgende</string>
|
||||
<string name="previous_button">Vorige</string>
|
||||
<string name="unit_of_length_descr">Wijzig eenheden van afstand en snelheid</string>
|
||||
|
|
@ -1947,7 +1945,7 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
|
|||
<string name="flat_list_waypoitns">alle</string>
|
||||
<string name="waypoints">Routepunt(en)</string>
|
||||
<string name="targets">Bestemming(en)</string>
|
||||
<string name="way_alarms">Obstakel(s)</string>
|
||||
<string name="way_alarms">Filemeldingen</string>
|
||||
<string name="speak_favorites">Meld favorieten</string>
|
||||
<string name="speak_poi">Meld interessepunt (POI)</string>
|
||||
<string name="flat_list_waypoints">Alle</string>
|
||||
|
|
@ -1964,4 +1962,11 @@ Afghanistan, Albanie, Algerije, Andorra, Angola, Anguilla, Antigua en Barbuda, A
|
|||
<string name="confirm_every_run">Altijd vragen</string>
|
||||
<string name="save_global_track_interval_descr">Selecteer de loggings-interval voor de standaard track opname (te starten via de GPX opname widget in het scherm)</string>
|
||||
<string name="save_global_track_interval">Standaard loggings-interval</string>
|
||||
<string name="traffic_warning_speed_limit">Maximum snelheid</string>
|
||||
<string name="traffic_warning_border_control">Grenscontrole</string>
|
||||
<string name="traffic_warning_payment">Tolpoortje</string>
|
||||
<string name="traffic_warning_stop">Stopbord</string>
|
||||
<string name="traffic_warning_calming">Verkeersdrempel</string>
|
||||
<string name="traffic_warning_speed_camera">Snelheidscontrole</string>
|
||||
<string name="traffic_warning">Filemelding</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
|
||||
|
||||
<string name="use_transparent_map_theme">Przezroczysty styl</string>
|
||||
|
|
@ -185,21 +185,20 @@
|
|||
<string name="tip_app_mode">Wybierz Profil</string>
|
||||
|
||||
<string name="tip_navigation">Nawigacja</string>
|
||||
<string name="tip_navigation_t">"W celu wyznaczenia trasy do miejsca, kliknij na nie na mapie, (a następnie wybierz \'Trasa do tego miejsca\'), lub wybierz \'Nawigacja\' po wybraniu dowolnego wpisu w liście wyników wyszukiwania lub liści Ulubionych.↵
|
||||
<string name="tip_navigation_t">"W celu wyznaczenia trasy do miejsca, kliknij na nie na mapie, (a następnie wybierz \'Trasa do tego miejsca\'), lub wybierz \'Nawiguj do\' po wybraniu dowolnego wpisu w liście wyników wyszukiwania lub liści Ulubionych.↵
|
||||
\n\nCel oznaczony jest na mapie jako znacznik flagi i OsmAnd wyświetla odległość do niego oraz kierunek do niego (pomarańczowy trójkąt).
|
||||
\n\nMożesz wybrać opcję \'Uruchom nawigację\', co oznacza, że OsmAnd będzie poprowadzić Cię, dając instrukcje głosowe (jeśli są włączone), itp. Można też wybrać \'Tylko pokaż\' w celu wyświetlenia trasy bez możliwości nawigowania.
|
||||
\n\nAby wyświetlić trasę do wybranego celu z każdego innego miejsca niż aktualna pozycja, wybierz punkt początkowy na mapie i Wybierz \'Dojazd z \'.
|
||||
\n\nJeśli wybierzesz \'Dojazd z \' oraz \'Nawiguj\' OsmAnd przełączy się do Twojej aktualnej pozycji, jak tylko zostanie znaleziona, natomiast \'Dojazd z \' w połączeniu z trasy \'Tylko pokaż\' tylko pokazuje trasę bez aktualizacji położenia na trasie. "</string>
|
||||
<string name="tip_search">Wyszukiwanie</string>
|
||||
<string name="tip_search_t">Możesz wyszukać miejsca bezpośrednio na mapie poprzez \'Użyj lokalizacji...\' → \'Szukaj w pobliżu tutaj\', lub wywołując ekran wyszukiwania poprzez \'Menu\' → \'Szukaj\'.↵
|
||||
<string name="tip_search_t">"Możesz wyszukać miejsca bezpośrednio na mapie poprzez \'Użyj lokalizacji...\' → \'Szukaj w pobliżu tutaj\', lub wywołując ekran wyszukiwania poprzez \'Menu\' → \'Szukaj\'.↵
|
||||
\n\nEkran wyszukiwania zapewnia szablony wyszukiwania
|
||||
\n\t* przez podanie adresu
|
||||
\n\t* przez podanie współrzędnych
|
||||
\n\t* wyszukiwanie POI (po typie lub nazwie)
|
||||
\n\t* przez historię wyszukiwania
|
||||
\n\t* przez zdefiniowane Ulubione
|
||||
\n\nDla wszystkich wyników możesz wybrać opcję \'Nawigacja\' lub \'Pokaż na mapie\'.
|
||||
</string>
|
||||
\n\nDla wszystkich wyników możesz wybrać opcję \'Nawiguj do\' lub \'Pokaż na mapie\'. "</string>
|
||||
<string name="tip_map_context_menu">Menu \'Użyj lokalizacji..\'</string>
|
||||
<string name="tip_map_context_menu_t">\'Użyj lokalizacji...\' zawiera wszystkie opcje odnoszące się do punktu (lokalizacji).
|
||||
\n\nSą one dostępny przez długie naciśnięcie dowolnego punktu na mapie (następnie dotykając jego znacznik), lub przez naciśnięcie przycisku trackball lub wybierając \'Menu\' → \'Użyj lokalizacji...\' (dwa ostatnie sposoby pobierają centrum mapy jako odniesienie).↵
|
||||
|
|
@ -1111,7 +1110,7 @@
|
|||
<string name="safe_mode_description">Uruchom program w trybie bezpiecznym (używa wolniejszego kodu Androida zamiast natywnego).</string>
|
||||
<string name="safe_mode">Tryb bezpieczny</string>
|
||||
<string name="native_library_not_running">Program działa w trybie bezpiecznym (wyłącz go w ustawieniach).</string>
|
||||
<string name="background_service_is_enabled_question">Usługa w tle jest nadal aktywna. Czy chcesz ją zatrzymać?</string>
|
||||
<string name="background_service_is_enabled_question">Usługa w tle jest nadal aktywna. Czy chcesz ją także zatrzymać?</string>
|
||||
<string name="tip_recent_changes_1_0_0_t">Zmiany w 1.0.0:
|
||||
\n\t* Poprawiony routing: szybszy, dokładniejszy, do 250 km
|
||||
\n\t* Wprowadzenie map tylko samochodowych
|
||||
|
|
@ -1858,10 +1857,10 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="osmo_auth_error_short">Błąd autoryzacji</string>
|
||||
<string name="osmo_auth_error">Wystąpił błąd autoryzacji OsMo: %1$s.\n To może być przerwa w działaniu usługi lub twoja rejestracja straciła ważność.\n Chcesz kontynuować z nową rejestracją?</string>
|
||||
<string name="keep_navigation_service">Utrzymuj</string>
|
||||
<string name="stop_navigation_service">Stop</string>
|
||||
<string name="stop_navigation_service">Wyłącz</string>
|
||||
<string name="enable_sleep_mode">Włącz tryb uśpienia GPS</string>
|
||||
<string name="gps_wake_up_timer">Odstęp czasu wybudzania GPS</string>
|
||||
<string name="sleep_mode_stop_dialog">Wyłączyć tryb uśpienia GPS?</string>
|
||||
<string name="sleep_mode_stop_dialog">Czy wyłączyć tryb uśpienia GPS?</string>
|
||||
<string name="map_preferred_locale_descr">Preferowany język dla etykiet na mapie (jeśli niedostępny, zostanie wybrany język angielski lub lokalna nazwa)</string>
|
||||
<string name="map_preferred_locale">Preferowany język map</string>
|
||||
<string name="local_map_names">Nazwy lokalne</string>
|
||||
|
|
@ -1883,8 +1882,8 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="rendering_attr_buildings15zoom_name">Budynki na przybliżeniu 15</string>
|
||||
<string name="rendering_attr_moreDetailed_name">Więcej szczegółów</string>
|
||||
<string name="rendering_attr_lessDetailed_name">Mniej szczegółów</string>
|
||||
<string name="rendering_attr_hideAccess_name">Ukryj typ dostępu</string>
|
||||
<string name="rendering_attr_showAccess_name">Pokaż typ dostępu</string>
|
||||
<string name="rendering_attr_hideAccess_name">Ukryj ograniczenia dostępu</string>
|
||||
<string name="rendering_attr_showAccess_name">Pokaż ograniczenia dostępu</string>
|
||||
<string name="rendering_attr_showSurfaceGrade_name">Pokaż jakość dróg</string>
|
||||
<string name="rendering_attr_showSurfaces_name">Pokaż nawierzchnię dróg</string>
|
||||
<string name="rendering_attr_showCycleRoutes_name">Pokaż ścieżki rowerowe</string>
|
||||
|
|
@ -1908,7 +1907,7 @@ Afganistan, Afryka Południowa, Albania, Algieria, Andora, Angola, Anguilla, Ant
|
|||
<string name="osmo_specify_tracker_id">Określ id</string>
|
||||
<string name="continue_navigation">Kontynuuj nawigację</string>
|
||||
<string name="pause_navigation">Wstrzymaj nawigację</string>
|
||||
<string name="rendering_attr_alpineHiking_name">Widok wspinaczki alpinistycznej</string>
|
||||
<string name="rendering_attr_alpineHiking_name">Skala wspinaczki alpinistycznej (SAC)</string>
|
||||
<string name="rendering_attr_alpineHiking_description">Renderuj ścieżki według skali SAC</string>
|
||||
<string name="rendering_attr_osmcTraces_name">Symbol nakładki wędrówek</string>
|
||||
<string name="rendering_attr_osmcTraces_description">Renderuj ścieżki według śladów OSMC</string>
|
||||
|
|
|
|||
|
|
@ -1744,9 +1744,9 @@
|
|||
<string name="flat_list_waypoitns">Все</string>
|
||||
<string name="waypoints">Путевые точки</string>
|
||||
<string name="targets">Пункты назначения</string>
|
||||
<string name="way_alarms">Препятствия</string>
|
||||
<string name="speak_favorites">Объявлять избранные</string>
|
||||
<string name="speak_poi">Объявлять POI</string>
|
||||
<string name="way_alarms">Дорожные предупреждения</string>
|
||||
<string name="speak_favorites">Объявлять близлежащие избранные</string>
|
||||
<string name="speak_poi">Объявлять близлежащие POI</string>
|
||||
<string name="index_tours">Туры</string>
|
||||
<string name="flat_list_waypoints">Все</string>
|
||||
<string name="distance">Расстояние</string>
|
||||
|
|
@ -1763,4 +1763,11 @@
|
|||
<string name="confirm_every_run">Всегда спрашивать</string>
|
||||
<string name="save_global_track_interval_descr">Выберите интервал журналирования для записи общего трека (включается через виджет записи GPX на карте)</string>
|
||||
<string name="save_global_track_interval">Общий интервал журналирования</string>
|
||||
<string name="traffic_warning_speed_limit">Ограничение скорости</string>
|
||||
<string name="traffic_warning_border_control">Пограничный контроль</string>
|
||||
<string name="traffic_warning_payment">Платный проезд</string>
|
||||
<string name="traffic_warning_stop">Знак остановки</string>
|
||||
<string name="traffic_warning_calming">Снизьте скорость</string>
|
||||
<string name="traffic_warning_speed_camera">Скоростной радар</string>
|
||||
<string name="traffic_warning">Ограничение скорости</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
|
||||
<string name="voice_pref_title">Boghe</string>
|
||||
<string name="misc_pref_title">Mistura</string>
|
||||
|
|
@ -1110,7 +1110,7 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
|
|||
<string name="gpx_option_reverse_route">Furria diretzione GPX</string>
|
||||
<string name="rotate_map_bearing_opt">In sa diretzione de sa mòvida</string>
|
||||
<string name="show_view_angle">Ammustra diretzione de osservatzione de abbaidadura</string>
|
||||
<string name="tip_navigation_t">"Pro otènnere indicatziones, mantène carcau in supra de su logu de destinatzione (pustis carca sa descritzione sua e ischerta \'Indicatziones pro\'), o ischerta \'Diretziones\' a pustis de àere carcau unu resurtau o unu prefèrridu.
|
||||
<string name="tip_navigation_t">"Pro otènnere indicatziones, mantène carcau in supra de su logu de destinatzione (pustis carca sa descritzione sua e ischerta \'Indicatziones pro\'), o ischerta \'Indicatziones\' a pustis de àere carcau unu resurtau o unu prefèrridu.
|
||||
\n\nSa destinatzione est sinnada in sa mapa cun una bandera e OsmAnd at a ammustrare sa distàntzia de lòmpida e sa diretzione pro la segudare in lìnia d\'àera (cun unu triàngulu arantzu).
|
||||
\n\nPodes ischertare \'Avia nàvigu\' pro pedire ad OsmAnd de ti ghiare finas a sa destinatzione impreande avisos vocales (si sunt abilitados), etc. Si nono ischerta \'Ammustra àndala\' pro otènnere una ghia fissa sena agiornamentos.
|
||||
\n\nPro ammustrare un\'àndala pro sa destinatzione ischertada dae unu puntu diferente dae su in su cale ses, ischerta su puntu in sa mapa e carca \'Diretziones dae\'.
|
||||
|
|
@ -1715,9 +1715,9 @@ Si cussigiat de annànghere unu o prus puntos intermedios pro megiorare sas pres
|
|||
<string name="flat_list_waypoitns">Totus</string>
|
||||
<string name="waypoints">Puntos mesanos</string>
|
||||
<string name="targets">Destinatziones</string>
|
||||
<string name="way_alarms">Impèigos</string>
|
||||
<string name="speak_favorites">Annùntzia Prefèrridos</string>
|
||||
<string name="speak_poi">Annùntzia PDI</string>
|
||||
<string name="way_alarms">Avisos de tràficu</string>
|
||||
<string name="speak_favorites">Annùntzia Prefèrridos a curtzu</string>
|
||||
<string name="speak_poi">Annùntzia PDI a curtzu</string>
|
||||
<string name="flat_list_waypoints">Totus</string>
|
||||
<string name="index_tours">Itineràrios</string>
|
||||
<string name="record_plugin_description">Registra sas rastas tuas carcande su pursante in s\'ischermu de sa mapa. Ammustra sas impostaduras pro sa registratzione de sos biàgios tuos in documentos GPX localmente o in lìnia impreande unu servìtziu web.</string>
|
||||
|
|
|
|||
|
|
@ -482,15 +482,14 @@
|
|||
|
||||
<string name="tip_navigation">Navigácia</string>
|
||||
<string name="tip_search">Vyhľadávanie</string>
|
||||
<string name="tip_search_t">Môžete vyhľadať miesto priamo na mape pomocou "Kontextové menu mapy" → "Hľadať v okolí" alebo cez "Menu" → "Hľadať".
|
||||
<string name="tip_search_t">"Môžete vyhľadať miesto priamo na mape pomocou Kontextové menu mapy → Hľadať v okolí alebo cez Menu → Hľadať.
|
||||
\n\nVyhľadávacia obrazovka obsahuje pomôcky pre hľadanie
|
||||
\n\t* podľa adresy
|
||||
\n\t* podľa súradníc
|
||||
\n\t* bodu záujmu (POI) podľa názvu alebo typu
|
||||
\n\t* z histórie hľadaní
|
||||
\n\t* z obľúbených miest
|
||||
\n\nPre všetky výsledky ponúka kontextové menu alebo panel akcií možnosti ako "Pokyny" alebo "Zobraziť na mape, atď.
|
||||
</string>
|
||||
\n\nPre všetky výsledky ponúka kontextové menu alebo panel akcií možnosti ako \"Pokyny sem\" alebo Zobraziť na mape, atď. "</string>
|
||||
<string name="tip_map_context_menu">Kontextové menu mapy</string>
|
||||
<string name="tip_map_context_menu_t">Kontextové menu mapy obsahuje všetky funkcie pre prácu s bodom (pozíciou).
|
||||
\n\nJe dostupné dlhším podržaním na mape (a potom stlačením zobrazeného obdĺžnika). Alebo stlačením track ball tlačidla alebo zvolením "Menu" → "Použiť umiestnenie…" (posledné 2 spôsoby použijú stred obrazovky ako zvolený bod).
|
||||
|
|
@ -498,7 +497,7 @@
|
|||
</string>
|
||||
<string name="tip_initial">Pomoc</string>
|
||||
<string name="tip_initial_t">"OsmAnd je navigačná aplikácia s rozmanitými funkciami.
|
||||
\n\nNa jej lepšie využitie môžete využiť základný úvod, tipy a triky aj pokročilú pomoc, ktoré sú dostupné z mapy cez Menu → Pomoc. "</string>
|
||||
\n\nAko základný úvod môžete použiť tipy a triky dostupné z mapy cez Menu → Pomoc. "</string>
|
||||
<string name="next_button">Ďalší</string>
|
||||
<string name="previous_button">Predošlý</string>
|
||||
<string name="unit_of_length_descr">Zmena jednotiek dĺžky a rýchlosti</string>
|
||||
|
|
@ -1609,7 +1608,7 @@ Afganistan, Albánsko, Alžírsko, Andora, Angola, Anguilla, Antigua a Barbuda,
|
|||
\n\t* Kalmanov filter pre kompas
|
||||
\n\t* Podpora pre hodinky Pebble
|
||||
</string>
|
||||
<string name="tip_navigation_t">"Pre získanie pokynov k cieľovému bodu buď podržte miesto na mape (potom kliknite na jeho popis a vyberte Pokyny sem) alebo vyberte Pokyny po kliknutí na výsledok hľadania alebo obľúbeného bodu.
|
||||
<string name="tip_navigation_t">"Pre získanie pokynov k cieľovému bodu buď podržte miesto na mape (potom kliknite na jeho popis a vyberte \"Pokyny sem\") alebo vyberte \"Pokyny sem\" po kliknutí na výsledok hľadania alebo obľúbeného bodu.
|
||||
\n\nCieľ je vyznačený ako cieľová vlajka na mape a OsmAnd zobrazí vzdialenosť k nemu a smer k nemu (oranžový trojuholník).
|
||||
\n\nMôžete zvoliť Pokyny a OsmAnd bude navigovať, podávať hlasové inštrukcie (ak sú povolené), atď. Alebo môžete zvoliť Zobraziť trasu, čo spôsobí zobrazenie statickej trasy bez navigácie a prispôsobenia vášmu pohybu.
|
||||
\n\nPre zobrazenie trasy k cieľu z iného bodu ako vašej súčasnej polohy, zvoľte východzí bod na mape a kliknite Pokyny odtiaľto.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
|
||||
<string name="ChooseCountry">Välj land</string>
|
||||
<string name="choose_city">Välj stad</string>
|
||||
|
|
@ -367,7 +367,7 @@
|
|||
<string name="user_name_descr">Behövs för ändringar i openstreetmap.org</string>
|
||||
<string name="user_password">Ditt OSM-lösenord</string>
|
||||
<string name="user_password_descr">Behövs för ändringar i openstreetmap.org</string>
|
||||
<string name="osmand_service">Vilolägesfunktionalitet</string>
|
||||
<string name="osmand_service">Viloläge</string>
|
||||
<string name="osmand_service_descr">Används för att köra OsmAnd medan skärmen är avstängd</string>
|
||||
<string name="tip_rotation_switching">Kartorientering</string>
|
||||
<string name="tip_rotation_switching_t_v2">Du kan växla mellan om och hur kartbilden roteras genom att upprepade gånger klicka på kartskärmens kompassikon.
|
||||
|
|
@ -556,8 +556,8 @@
|
|||
<string name="previous_button">Föregående</string>
|
||||
<string name="unit_of_length_descr">Ändra enheter för avstånd och hastighet</string>
|
||||
<string name="unit_of_length">Måttenhet</string>
|
||||
<string name="si_mi_foots">Miles/fot</string>
|
||||
<string name="si_mi_yard">Eng. mile/yard</string>
|
||||
<string name="si_mi_foots">Eng. mil/fot</string>
|
||||
<string name="si_mi_yard">Eng. mil/yard</string>
|
||||
<string name="si_km_m">Kilometer/meter</string>
|
||||
<string name="yard">yd</string>
|
||||
<string name="send_location_way_choose_title">Dela platsen med</string>
|
||||
|
|
@ -623,7 +623,7 @@
|
|||
<string name="replace_destination_point">Byt destination</string>
|
||||
<string name="new_destination_point_dialog">Du har redan en angiven destination.</string>
|
||||
<string name="target_point">Waypoint %1$s</string>
|
||||
<string name="target_points">Vägpunkter</string>
|
||||
<string name="target_points">Waypoints</string>
|
||||
<string name="intermediate_point_too_far">Waypointen %1$s för långt från närmaste väg.</string>
|
||||
<string name="arrived_at_intermediate_point">Du har anlänt till din waypoint</string>
|
||||
<string name="context_menu_item_intermediate_point">Lägg till som waypoint</string>
|
||||
|
|
@ -751,7 +751,7 @@
|
|||
<string name="gps_provider">GPS</string>
|
||||
<string name="int_seconds">sekunder</string>
|
||||
<string name="background_service_int_descr">Ange väckningsintervall som används under viloläget</string>
|
||||
<string name="background_service_int">Väckningsintervall</string>
|
||||
<string name="background_service_int">GPS-väckningsintervall</string>
|
||||
<string name="background_service_provider_descr">Välj platsleverantör när du kör i viloläge</string>
|
||||
<string name="background_service_provider">Platsleverantör</string>
|
||||
<string name="background_router_service_descr">Kör OsmAnd i bakgrunden för att spåra din position medan skärmen är avstängd</string>
|
||||
|
|
@ -902,7 +902,7 @@
|
|||
<string name="safe_mode_description">Kör program i felsäkert läge (för långsammare Android istället för inbyggd kod).</string>
|
||||
<string name="safe_mode">Felsäkert läge</string>
|
||||
<string name="native_library_not_running">Programmet körs i felsäkert läge (inaktivera det i Inställningar).</string>
|
||||
<string name="background_service_is_enabled_question">Vilolägestjänsten körs fortfarande. Vill du avbryta den?</string>
|
||||
<string name="background_service_is_enabled_question">Vilolägestjänsten körs fortfarande. Vill du avbryta den också?</string>
|
||||
<string name="osmodroid_plugin_name">OsMoDroid-plugin</string>
|
||||
<string name="edit_filter_create_message">Filter {0} har skapats</string>
|
||||
<string name="poi_error_info_not_loaded">Info om noden laddades inte</string>
|
||||
|
|
@ -1603,10 +1603,10 @@
|
|||
<string name="osmo_group_information_desc">" - Alla skapade grupper är offentliga! Om du vill vara anonym, anslut enheter direkt via Tracker-id-\n- Upp till 16 personer kan vara registrerade i gruppen.\n- Grupper tas bort i fall av inaktivitet eller aktivitet av endast 1 person under två veckor.\n- Du kan begränsa inträde i grupp (som t.ex. endast via inbjudan) men för att kontrollera gruppen måste du gå till adminkonsollen.\n- Om du behöver skapa en grupp med andra villkor kontakta http://osmo.mobi"</string>
|
||||
<string name="osmo_group_information">Läs detta innan du skapar en grupp!</string>
|
||||
<string name="keep_navigation_service">Behåll</string>
|
||||
<string name="stop_navigation_service">Stoppa</string>
|
||||
<string name="enable_sleep_mode">Aktivera viloläge</string>
|
||||
<string name="stop_navigation_service">Avbryta</string>
|
||||
<string name="enable_sleep_mode">Aktivera GPS-viloläge</string>
|
||||
<string name="gps_wake_up_timer">Väckningsintervall för GPS</string>
|
||||
<string name="sleep_mode_stop_dialog">Behålla GPS på?</string>
|
||||
<string name="sleep_mode_stop_dialog">Avbryta GPS-viloläget?</string>
|
||||
<string name="map_preferred_locale_descr">Föredraget språk för etiketter på kartan (växlar till engelska eller lokala namn om ej tillgängligt)</string>
|
||||
<string name="map_preferred_locale">Föredraget språk på kartan</string>
|
||||
<string name="local_map_names">Lokala namn</string>
|
||||
|
|
@ -1628,8 +1628,8 @@
|
|||
<string name="rendering_attr_buildings15zoom_name">Byggnader vid zoom 15</string>
|
||||
<string name="rendering_attr_moreDetailed_name">Fler detaljer</string>
|
||||
<string name="rendering_attr_lessDetailed_name">Färre detaljer</string>
|
||||
<string name="rendering_attr_hideAccess_name">Dölj typ av tillfart</string>
|
||||
<string name="rendering_attr_showAccess_name">Visa typ av tillfart</string>
|
||||
<string name="rendering_attr_hideAccess_name">Dölj tillfartsinskränkningar</string>
|
||||
<string name="rendering_attr_showAccess_name">Visa tillfartsinskränkningar</string>
|
||||
<string name="rendering_attr_showSurfaceGrade_name">Visa vägkvalitet</string>
|
||||
<string name="rendering_attr_showSurfaces_name">Visa vägbeläggning</string>
|
||||
<string name="rendering_attr_showCycleRoutes_name">Visa cykelrutter</string>
|
||||
|
|
@ -1645,7 +1645,7 @@
|
|||
<string name="rendering_attr_subwayMode_name">Tunnelbaneläge</string>
|
||||
<string name="continue_navigation">Fortsätt navigera</string>
|
||||
<string name="pause_navigation">Pausa navigeringen</string>
|
||||
<string name="rendering_attr_alpineHiking_name">Alpvandringsvy</string>
|
||||
<string name="rendering_attr_alpineHiking_name">Alpvandringsskala (SAC)</string>
|
||||
<string name="rendering_attr_alpineHiking_description">Återge stigar enligt SAC-skala</string>
|
||||
<string name="rendering_attr_osmcTraces_name">Vandringssymbolöverlägg</string>
|
||||
<string name="rendering_attr_osmcTraces_description">Återge stigar enligt OSMC-spår</string>
|
||||
|
|
@ -1671,9 +1671,9 @@
|
|||
<string name="flat_list_waypoitns">Alla</string>
|
||||
<string name="waypoints">Waypoints</string>
|
||||
<string name="targets">Mål</string>
|
||||
<string name="way_alarms">Hinder</string>
|
||||
<string name="speak_favorites">Meddela favoriter</string>
|
||||
<string name="speak_poi">Meddela POI</string>
|
||||
<string name="way_alarms">Trafikskyltar</string>
|
||||
<string name="speak_favorites">Meddela om närbelägna favoriter</string>
|
||||
<string name="speak_poi">Meddela om närbelägna POI</string>
|
||||
<string name="index_tours">Rundturer</string>
|
||||
<string name="flat_list_waypoints">Alla</string>
|
||||
<string name="record_plugin_description">Spara dina spår med ett tryck på en knapp på kartskärmen. Visa inställningar som underlättar inspelningen av dina resor till lokala GPX-filer eller online via en webbtjänst.</string>
|
||||
|
|
@ -1685,4 +1685,14 @@
|
|||
<string name="save_track_to_gpx_globally">Logga spår till GPX-fil</string>
|
||||
<string name="save_track_to_gpx_globally_descr">Allmän loggning av position till en GPX-fil kan slås på/av via GPX-inspelningswidgeten på kartskärmen</string>
|
||||
<string name="save_track_interval_globally">Loggningsintervall</string>
|
||||
<string name="confirm_every_run">Fråga alltid</string>
|
||||
<string name="save_global_track_interval_descr">Välj loggningsintervall för den allmänna spårinspelningen (aktiverad via widgeten GPX-inspelning på kartan)</string>
|
||||
<string name="save_global_track_interval">Allmänt loggningsintervall</string>
|
||||
<string name="traffic_warning_speed_limit">Hastighetsbegränsning</string>
|
||||
<string name="traffic_warning_border_control">Gränskontroll</string>
|
||||
<string name="traffic_warning_payment">Vägavgiftshytt</string>
|
||||
<string name="traffic_warning_stop">Stopp</string>
|
||||
<string name="traffic_warning">Trafikvarning</string>
|
||||
<string name="traffic_warning_speed_camera">Fartkamera</string>
|
||||
<string name="traffic_warning_calming">Trafikdämpning</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version='1.0' encoding='utf-8'?>
|
||||
<resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
|
||||
<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
|
||||
<string name="map_widget_show_destination_arrow">顯示目的地方向</string>
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<string name="poi_filter_for_tourists">旅遊點</string>
|
||||
<string name="poi_filter_fuel">加油站</string>
|
||||
<string name="show_warnings_title">顯示警示…</string>
|
||||
<string name="show_warnings_descr">組態交通提醒(速限、強制停車、減速)、測速照相提醒、車道資訊</string>
|
||||
<string name="show_warnings_descr">組態交通警示(速限、強制停車、減速)、測速照相警示、車道資訊</string>
|
||||
<string name="use_compass_navigation_descr">使用電子羅盤的地圖，正北朝上</string>
|
||||
<string name="use_compass_navigation">使用電子羅盤</string>
|
||||
<string name="avoid_motorway">避開高速公路</string>
|
||||
|
|
@ -157,7 +157,7 @@
|
|||
<string name="bg_service_screen_lock_toast">螢幕已鎖</string>
|
||||
<string name="bg_service_interval">設定喚醒間隔：</string>
|
||||
<string name="show_cameras">顯示測速照相</string>
|
||||
<string name="show_traffic_warnings">顯示交通狀況提醒</string>
|
||||
<string name="show_traffic_warnings">顯示交通狀況警示</string>
|
||||
<string name="avoid_toll_roads">避開付費道路</string>
|
||||
<string name="continue_follow_previous_route_auto">先前的導航未完成。要按照它繼續嗎？ (%1$s 秒)</string>
|
||||
<string name="route_updated_loc_found">一旦找到定位時，導航路線將重新規劃</string>
|
||||
|
|
@ -1808,9 +1808,9 @@
|
|||
<string name="flat_list_waypoitns">全部</string>
|
||||
<string name="waypoints">中途點</string>
|
||||
<string name="targets">目的地</string>
|
||||
<string name="way_alarms">障礙</string>
|
||||
<string name="speak_favorites">通報我的最愛</string>
|
||||
<string name="speak_poi">通報 POI</string>
|
||||
<string name="way_alarms">交通狀況提醒</string>
|
||||
<string name="speak_favorites">通報附近我的最愛</string>
|
||||
<string name="speak_poi">通報附近 POI</string>
|
||||
<string name="flat_list_waypoints">全部</string>
|
||||
<string name="index_tours">旅遊</string>
|
||||
<string name="record_plugin_description">在地圖螢幕上透過點觸按鈕儲存您的軌跡。顯示設定，便於記錄您到當地旅程的 GPX 檔案或在線上使用網站的服務。</string>
|
||||
|
|
@ -1825,4 +1825,11 @@
|
|||
<string name="confirm_every_run">始終詢問</string>
|
||||
<string name="save_global_track_interval_descr">為通常的軌跡記錄選擇記錄間隔（透過在地圖上的 GPX 記錄小工具啟用）</string>
|
||||
<string name="save_global_track_interval">通常的記錄間隔</string>
|
||||
<string name="traffic_warning_speed_limit">速限</string>
|
||||
<string name="traffic_warning_border_control">邊境管制</string>
|
||||
<string name="traffic_warning_payment">收費站</string>
|
||||
<string name="traffic_warning_stop">停止</string>
|
||||
<string name="traffic_warning_calming">交通寧靜區</string>
|
||||
<string name="traffic_warning_speed_camera">測速照相</string>
|
||||
<string name="traffic_warning">交通流量警示</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,16 @@
|
|||
3. All your modified/created strings are in the top of the file (to make easier find what\'s translated).
|
||||
PLEASE: Have a look at http://code.google.com/p/osmand/wiki/UIConsistency, it may really improve your and our work :-) Thx - Hardy
|
||||
-->
|
||||
<string name="traffic_warning_speed_limit">Speed limit</string>
|
||||
<string name="traffic_warning_border_control">Border control</string>
|
||||
<string name="traffic_warning_payment">Toll booth</string>
|
||||
<string name="traffic_warning_stop">Stop</string>
|
||||
<string name="traffic_warning_calming">Traffic calming</string>
|
||||
<string name="traffic_warning_speed_camera">Speed camera</string>
|
||||
<string name="traffic_warning">Traffic warning</string>
|
||||
<string name="speak_favorites">Announce nearby Favorites</string>
|
||||
<string name="speak_poi">Announce nearby POI</string>
|
||||
<string name="way_alarms">Traffic warnings</string>
|
||||
<string name="tip_navigation">Navigation</string>
|
||||
<string name="tip_navigation_t">To get directions to a place, either directly long-click on it on the map, (then tap its description marker and select \'Directions to\'), or select \'Directions to\' after tapping any entry in a search results list or favorite list.
|
||||
\n\nThe destination is marked as a target flag marker on the map and OsmAnd displays the distance to it and the direction to it (orange triangle).
|
||||
|
|
@ -63,9 +73,6 @@
|
|||
<string name="flat_list_waypoints">All</string>
|
||||
<string name="waypoints">Waypoints</string>
|
||||
<string name="targets">Destinations</string>
|
||||
<string name="way_alarms">Obstacles</string>
|
||||
<string name="speak_favorites">Announce Favorites</string>
|
||||
<string name="speak_poi">Announce POI</string>
|
||||
<string name="announce_gpx_waypoints">Announce GPX waypoints</string>
|
||||
<string name="download_additional_maps">Download missing maps %1$s (%2$d MB)?</string>
|
||||
<string name="more">More...</string>
|
||||
|
|
@ -416,7 +423,6 @@
|
|||
<string name="about_settings">About</string>
|
||||
<string name="about_settings_descr">Version info, licenses, project members</string>
|
||||
|
||||
<string name="tips_and_tricks">Help</string>
|
||||
<string name="tip_recent_changes_1_6_t">Changes in 1.6:
|
||||
\n\t* Support of Full HD devices
|
||||
\n\t* Support transparent map background
|
||||
|
|
@ -1524,10 +1530,6 @@ Afghanistan, Albania, Algeria, Andorra, Angola, Anguilla, Antigua and Barbuda, A
|
|||
\n\nIt is available by long-pressing any point on the map (then tapping its marker), or by pressing the trackball button, or by selecting \'Menu\' → \'Use location\' (the last two ways take the map center as reference).
|
||||
\n\nA marker box can be hidden again by long-clicking on it.
|
||||
</string>
|
||||
<string name="tip_initial">Help</string>
|
||||
<string name="tip_initial_t">OsmAnd is a navigation application with many features.
|
||||
\n\nSome basic introduction, usage tips, and advanced help is linked via \'Menu\' → \'Help\' from the map screen.
|
||||
</string>
|
||||
<string name="next_button">Next</string>
|
||||
<string name="previous_button">Previous</string>
|
||||
<string name="unit_of_length_descr">Change units of length and speed</string>
|
||||
|
|
|
|||
|
|
@ -825,7 +825,7 @@ public class OsmandSettings {
|
|||
public final OsmandPreference<Boolean> ANNOUNCE_NEARBY_POI = new BooleanPreference("announce_nearby_poi", false).makeProfile().cache();
|
||||
public final OsmandPreference<Boolean> SHOW_WPT = new BooleanPreference("show_gpx_wpt", true).makeGlobal().cache();
|
||||
public final OsmandPreference<Boolean> SHOW_NEARBY_POI = new BooleanPreference("show_nearby_poi", false).makeGlobal().cache();
|
||||
public final OsmandPreference<Boolean> SHOW_NEARBY_FAVORIES = new BooleanPreference("show_nearby_favorites", false).makeGlobal().cache();
|
||||
public final OsmandPreference<Boolean> SHOW_NEARBY_FAVORITES = new BooleanPreference("show_nearby_favorites", false).makeGlobal().cache();
|
||||
|
||||
public final OsmandPreference<Boolean> AVOID_TOLL_ROADS = new BooleanPreference("avoid_toll_roads", false).makeProfile().cache();
|
||||
public final OsmandPreference<Boolean> AVOID_MOTORWAY = new BooleanPreference("avoid_motorway", false).makeProfile().cache();
|
||||
|
|
|
|||
|
|
@ -237,13 +237,13 @@ public class SettingsNavigationActivity extends SettingsBaseActivity {
|
|||
settings.SHOW_CAMERAS, settings.SHOW_LANES }, preference.getTitle());
|
||||
return true;
|
||||
} else if (preference == speakAlarms) {
|
||||
showBooleanSettings(new String[] { getString(R.string.speak_street_names), getString(R.string.speak_traffic_warnings), getString(R.string.speak_cameras),
|
||||
getString(R.string.speak_speed_limit),
|
||||
showBooleanSettings(new String[] { getString(R.string.speak_street_names), getString(R.string.speak_traffic_warnings),
|
||||
getString(R.string.speak_speed_limit), getString(R.string.speak_cameras),
|
||||
getString(R.string.speak_favorites),
|
||||
getString(R.string.speak_poi),
|
||||
getString(R.string.announce_gpx_waypoints)},
|
||||
new OsmandPreference[] { settings.SPEAK_STREET_NAMES, settings.SPEAK_TRAFFIC_WARNINGS,
|
||||
settings.SPEAK_SPEED_CAMERA , settings.SPEAK_SPEED_LIMIT,
|
||||
settings.SPEAK_SPEED_LIMIT, settings.SPEAK_SPEED_CAMERA,
|
||||
settings.ANNOUNCE_NEARBY_FAVORITES, settings.ANNOUNCE_NEARBY_POI, settings.ANNOUNCE_WPT}, preference.getTitle());
|
||||
return true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,8 +15,11 @@ import com.actionbarsherlock.view.*;
|
|||
import net.osmand.IProgress;
|
||||
import net.osmand.IndexConstants;
|
||||
import net.osmand.access.AccessibleToast;
|
||||
import net.osmand.plus.*;
|
||||
import net.osmand.plus.ContextMenuAdapter;
|
||||
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandPlugin;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.activities.*;
|
||||
import net.osmand.plus.activities.LocalIndexHelper.LocalIndexType;
|
||||
import net.osmand.plus.helpers.FileNameTranslationHelper;
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@ public class WaypointHelper {
|
|||
private int searchDeviationRadius = 500;
|
||||
private static final int LONG_ANNOUNCE_RADIUS = 700;
|
||||
private static final int SHORT_ANNOUNCE_RADIUS = 150;
|
||||
private static final int ALARMS_ANNOUNCE_RADIUS = 150;
|
||||
|
||||
OsmandApplication app;
|
||||
// every time we modify this collection, we change the reference (copy on write list)
|
||||
|
|
@ -193,13 +194,17 @@ public class WaypointHelper {
|
|||
|
||||
public void enableWaypointType(int type, boolean enable) {
|
||||
if(type == ALARMS) {
|
||||
app.getSettings().SHOW_TRAFFIC_WARNINGS.set(enable);
|
||||
app.getSettings().SPEAK_TRAFFIC_WARNINGS.set(enable);
|
||||
} else if(type == POI) {
|
||||
app.getSettings().SHOW_NEARBY_POI.set(enable);
|
||||
app.getSettings().ANNOUNCE_NEARBY_POI.set(enable);
|
||||
} else if(type == FAVORITES) {
|
||||
app.getSettings().SHOW_NEARBY_FAVORIES.set(enable);
|
||||
app.getSettings().SHOW_NEARBY_FAVORITES.set(enable);
|
||||
app.getSettings().ANNOUNCE_NEARBY_FAVORITES.set(enable);
|
||||
} else if(type == WAYPOINTS) {
|
||||
app.getSettings().SHOW_WPT.set(enable);
|
||||
app.getSettings().ANNOUNCE_WPT.set(enable);
|
||||
}
|
||||
recalculatePoints(route, type, locationPoints);
|
||||
}
|
||||
|
|
@ -221,13 +226,19 @@ public class WaypointHelper {
|
|||
|
||||
public boolean isTypeEnabled(int type) {
|
||||
if(type == ALARMS) {
|
||||
return showAlarms();
|
||||
return showAlarms() || announceAlarms();
|
||||
} else if (type == POI) {
|
||||
return showPOI();
|
||||
//no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
|
||||
//return showPOI() || announcePOI();
|
||||
return announcePOI();
|
||||
} else if (type == FAVORITES) {
|
||||
return showFavorites();
|
||||
//no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
|
||||
//return showFavorites() || announceFavorites();
|
||||
return announceFavorites();
|
||||
} else if (type == WAYPOINTS) {
|
||||
return showGPXWaypoints();
|
||||
//no SHOW item in nav settings, hence only query ANNOUNCE here (makes inital Waypoint dialogue consistent with nav settings)
|
||||
//return showGPXWaypoints() || announceGPXWaypoints();
|
||||
return announceGPXWaypoints();
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
@ -302,17 +313,19 @@ public class WaypointHelper {
|
|||
break;
|
||||
}
|
||||
LocationPoint point = lwp.point;
|
||||
double d1 = MapUtils.getDistance(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude(),
|
||||
point.getLatitude(), point.getLongitude()) + lwp.getDeviationDistance();
|
||||
double d1 = Math.max(0.0, MapUtils.getDistance(lastKnownLocation.getLatitude(), lastKnownLocation.getLongitude(),
|
||||
point.getLatitude(), point.getLongitude()) - lwp.getDeviationDistance());
|
||||
Integer state = locationPointsStates.get(point);
|
||||
if (state != null && state.intValue() == ANNOUNCED_ONCE
|
||||
&& getVoiceRouter()
|
||||
.isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS)) {
|
||||
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, SHORT_ANNOUNCE_RADIUS)) {
|
||||
locationPointsStates.put(point, ANNOUNCED_DONE);
|
||||
announcePoints.add(lwp);
|
||||
} else if ((state == null || state == NOT_ANNOUNCED)
|
||||
&& getVoiceRouter()
|
||||
.isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS)) {
|
||||
} else if (type != ALARMS && (state == null || state == NOT_ANNOUNCED)
|
||||
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, LONG_ANNOUNCE_RADIUS)) {
|
||||
locationPointsStates.put(point, ANNOUNCED_ONCE);
|
||||
approachPoints.add(lwp);
|
||||
} else if (type == ALARMS && (state == null || state == NOT_ANNOUNCED)
|
||||
&& getVoiceRouter().isDistanceLess(lastKnownLocation.getSpeed(), d1, ALARMS_ANNOUNCE_RADIUS)) {
|
||||
locationPointsStates.put(point, ANNOUNCED_ONCE);
|
||||
approachPoints.add(lwp);
|
||||
}
|
||||
|
|
@ -336,7 +349,7 @@ public class WaypointHelper {
|
|||
getVoiceRouter().approachPoi(lastKnownLocation, approachPoints);
|
||||
} else if (type == ALARMS) {
|
||||
EnumSet<AlarmInfoType> ait = EnumSet.noneOf(AlarmInfoType.class);
|
||||
for(LocationPointWrapper pw : announcePoints) {
|
||||
for(LocationPointWrapper pw : approachPoints) {
|
||||
ait.add(((AlarmInfo) pw.point).getType());
|
||||
}
|
||||
for(AlarmInfoType t : ait) {
|
||||
|
|
@ -406,6 +419,11 @@ public class WaypointHelper {
|
|||
|
||||
|
||||
protected void recalculatePoints(RouteCalculationResult route, int type, List<List<LocationPointWrapper>> locationPoints) {
|
||||
//sync SHOW settings not otherwise accessible in settings menu (needed so that waypoint dialogue correctly inflates selected categories upon startup)
|
||||
app.getSettings().SHOW_NEARBY_POI.set(app.getSettings().ANNOUNCE_NEARBY_POI.get());
|
||||
app.getSettings().SHOW_NEARBY_FAVORITES.set(app.getSettings().ANNOUNCE_NEARBY_FAVORITES.get());
|
||||
app.getSettings().SHOW_WPT.set(app.getSettings().ANNOUNCE_WPT.get());
|
||||
|
||||
boolean all = type == -1;
|
||||
if (route != null && !route.isEmpty()) {
|
||||
if ((type == FAVORITES || all)) {
|
||||
|
|
@ -523,13 +541,13 @@ public class WaypointHelper {
|
|||
private void calculateAlarms(RouteCalculationResult route, List<LocationPointWrapper> array) {
|
||||
for(AlarmInfo i : route.getAlarmInfo()) {
|
||||
if(i.getType() == AlarmInfoType.SPEED_CAMERA) {
|
||||
if(app.getSettings().SHOW_CAMERAS.get()){
|
||||
if(app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SPEAK_SPEED_CAMERA.get()){
|
||||
LocationPointWrapper lw = new LocationPointWrapper(route, ALARMS, i, 0, i.getLocationIndex());
|
||||
lw.setAnnounce(app.getSettings().SPEAK_SPEED_CAMERA.get());
|
||||
array.add(lw);
|
||||
}
|
||||
} else {
|
||||
if(app.getSettings().SHOW_TRAFFIC_WARNINGS.get()){
|
||||
if(app.getSettings().SHOW_TRAFFIC_WARNINGS.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get()){
|
||||
LocationPointWrapper lw = new LocationPointWrapper(route, ALARMS, i, 0, i.getLocationIndex());
|
||||
lw.setAnnounce(app.getSettings().SPEAK_TRAFFIC_WARNINGS.get());
|
||||
array.add(lw);
|
||||
|
|
@ -587,18 +605,26 @@ public class WaypointHelper {
|
|||
}
|
||||
|
||||
public boolean showFavorites() {
|
||||
return app.getSettings().SHOW_NEARBY_FAVORIES.get();
|
||||
}
|
||||
|
||||
public boolean showAlarms() {
|
||||
return app.getSettings().SPEAK_SPEED_CAMERA.get() ||
|
||||
app.getSettings().SPEAK_TRAFFIC_WARNINGS.get();
|
||||
return app.getSettings().SHOW_NEARBY_FAVORITES.get();
|
||||
}
|
||||
|
||||
public boolean announceFavorites() {
|
||||
return app.getSettings().ANNOUNCE_NEARBY_FAVORITES.get();
|
||||
}
|
||||
|
||||
public boolean showAlarms() {
|
||||
//I think here only traffic warnings other than the speed cam are needed. speed cam setting is a separate setting for explicit allow/disallow by user.
|
||||
//return app.getSettings().SHOW_CAMERAS.get() || app.getSettings().SHOW_TRAFFIC_WARNINGS.get();
|
||||
return app.getSettings().SHOW_TRAFFIC_WARNINGS.get();
|
||||
}
|
||||
|
||||
public boolean announceAlarms() {
|
||||
//I think here only traffic warnings other than the speed cam are needed. speed cam setting is a separate setting for explicit allow/disallow by user.
|
||||
//return app.getSettings().SPEAK_SPEED_CAMERA.get() || app.getSettings().SPEAK_TRAFFIC_WARNINGS.get();
|
||||
return app.getSettings().SPEAK_TRAFFIC_WARNINGS.get();
|
||||
}
|
||||
|
||||
|
||||
public class LocationPointWrapper {
|
||||
LocationPoint point;
|
||||
float deviationDistance;
|
||||
|
|
@ -645,8 +671,12 @@ public class WaypointHelper {
|
|||
return uiCtx.getResources().getDrawable(
|
||||
!((TargetPoint)point).intermediate? R.drawable.list_destination:
|
||||
R.drawable.list_intermediate);
|
||||
} else {
|
||||
} else if(type == FAVORITES || type == WAYPOINTS) {
|
||||
return FavoriteImageDrawable.getOrCreate(uiCtx, point.getColor());
|
||||
} else if(type == ALARMS) {
|
||||
return null;
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import android.content.Context;
|
|||
import net.osmand.Location;
|
||||
import net.osmand.binary.BinaryMapRouteReaderAdapter.RouteTypeRule;
|
||||
import net.osmand.data.LocationPoint;
|
||||
import net.osmand.plus.R;
|
||||
|
||||
public class AlarmInfo implements LocationPoint {
|
||||
public enum AlarmInfoType {
|
||||
|
|
@ -25,6 +26,24 @@ public class AlarmInfo implements LocationPoint {
|
|||
return priority;
|
||||
}
|
||||
|
||||
|
||||
public String getVisualName(Context ctx) {
|
||||
switch (priority) {
|
||||
case 1:
|
||||
return ctx.getString(R.string.traffic_warning_speed_camera);
|
||||
case 2:
|
||||
return ctx.getString(R.string.traffic_warning_speed_limit);
|
||||
case 3:
|
||||
return ctx.getString(R.string.traffic_warning_border_control);
|
||||
case 4:
|
||||
return ctx.getString(R.string.traffic_warning_calming);
|
||||
case 5:
|
||||
return ctx.getString(R.string.traffic_warning_payment);
|
||||
case 6:
|
||||
return ctx.getString(R.string.traffic_warning_stop);
|
||||
}
|
||||
return ctx.getString(R.string.traffic_warning);
|
||||
}
|
||||
}
|
||||
|
||||
private AlarmInfoType type;
|
||||
|
|
@ -97,7 +116,7 @@ public class AlarmInfo implements LocationPoint {
|
|||
if(alarmInfo != null) {
|
||||
alarmInfo.setLatLon(loc.getLatitude(), loc.getLongitude());
|
||||
}
|
||||
return null;
|
||||
return alarmInfo;
|
||||
}
|
||||
|
||||
public int updateDistanceAndGetPriority(float time, float distance) {
|
||||
|
|
@ -120,7 +139,7 @@ public class AlarmInfo implements LocationPoint {
|
|||
|
||||
@Override
|
||||
public String getName(Context ctx) {
|
||||
return type.name();
|
||||
return type.getVisualName(ctx);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -10,26 +10,24 @@ import java.util.List;
|
|||
import java.util.Map;
|
||||
import java.util.TreeSet;
|
||||
|
||||
import android.os.Environment;
|
||||
import android.widget.Toast;
|
||||
import net.osmand.IProgress;
|
||||
import net.osmand.IndexConstants;
|
||||
import net.osmand.Location;
|
||||
import net.osmand.data.LatLon;
|
||||
import net.osmand.data.LocationPoint;
|
||||
import net.osmand.plus.ApplicationMode;
|
||||
import net.osmand.plus.ContextMenuAdapter;
|
||||
import net.osmand.plus.ContextMenuAdapter.OnContextMenuClick;
|
||||
import net.osmand.plus.GPXUtilities;
|
||||
import net.osmand.plus.GPXUtilities.GPXFile;
|
||||
import net.osmand.plus.GPXUtilities.WptPt;
|
||||
import net.osmand.plus.GpxSelectionHelper.SelectedGpxFile;
|
||||
import net.osmand.plus.ApplicationMode;
|
||||
import net.osmand.plus.OsmAndAppCustomization;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.OsmandSettings;
|
||||
import net.osmand.plus.TargetPointsHelper;
|
||||
import net.osmand.plus.OsmandSettings.CommonPreference;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.TargetPointsHelper;
|
||||
import net.osmand.plus.Version;
|
||||
import net.osmand.plus.download.DownloadIndexFragment;
|
||||
import net.osmand.plus.activities.MapActivity;
|
||||
|
|
@ -54,11 +52,13 @@ import android.content.DialogInterface;
|
|||
import android.content.Intent;
|
||||
import android.os.AsyncTask;
|
||||
import android.os.Bundle;
|
||||
import android.os.Environment;
|
||||
import android.support.v4.app.DialogFragment;
|
||||
import android.support.v4.app.FragmentActivity;
|
||||
import android.support.v4.app.FragmentManager;
|
||||
import android.view.Window;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.actionbarsherlock.app.ActionBar;
|
||||
import com.actionbarsherlock.app.SherlockFragmentActivity;
|
||||
|
|
@ -275,6 +275,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
}
|
||||
|
||||
public StageInformation selectNextAvailableStage(final TourInformation tourInformation) {
|
||||
if(selectedStagePref == null) {
|
||||
return selectedStage;
|
||||
}
|
||||
Integer it = selectedStagePref.get();
|
||||
while(it >= 0 && isStageVisited(it) ){
|
||||
it++;
|
||||
|
|
@ -286,6 +289,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
}
|
||||
|
||||
public StageInformation getNextAvailableStage(final TourInformation tourInformation) {
|
||||
if(selectedStagePref == null){
|
||||
return null;
|
||||
}
|
||||
int it = selectedStagePref.get();
|
||||
while(it >= 0 && isStageVisited(it) ){
|
||||
it++;
|
||||
|
|
@ -297,11 +303,17 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
}
|
||||
|
||||
public boolean isStageVisited(int stageOrder) {
|
||||
if(visitedStagesPref == null) {
|
||||
return false;
|
||||
}
|
||||
Integer gi = visitedStagesPref.get();
|
||||
return (gi & (1 << stageOrder)) > 0;
|
||||
}
|
||||
|
||||
public void markStageAsCompleted(StageInformation si) {
|
||||
if(visitedStagesPref == null) {
|
||||
return;
|
||||
}
|
||||
Integer gi = visitedStagesPref.get();
|
||||
gi |= (1 << si.getOrder());
|
||||
visitedStagesPref.set(gi);
|
||||
|
|
@ -309,6 +321,9 @@ public class SherpafyCustomization extends OsmAndAppCustomization {
|
|||
}
|
||||
|
||||
public void markStageAsNotCompleted(StageInformation si) {
|
||||
if(visitedStagesPref == null) {
|
||||
return;
|
||||
}
|
||||
Integer gi = visitedStagesPref.get();
|
||||
if((gi & (1 << si.getOrder())) > 0) {
|
||||
gi = gi - (1 << si.getOrder());
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package net.osmand.plus.sherpafy;
|
|||
import java.lang.reflect.Field;
|
||||
import java.util.ArrayList;
|
||||
|
||||
import android.widget.Toast;
|
||||
import net.osmand.plus.OsmandApplication;
|
||||
import net.osmand.plus.R;
|
||||
import net.osmand.plus.sherpafy.TourInformation.StageFavoriteGroup;
|
||||
|
|
|
|||
|
|
@ -287,9 +287,10 @@ public class GPXLayer extends OsmandMapLayer implements ContextMenuLayer.IContex
|
|||
|
||||
private List<WptPt> getListStarPoints(SelectedGpxFile g) {
|
||||
List<WptPt> pts = g.getGpxFile().points;
|
||||
if(pts.isEmpty() & !g.getGpxFile().routes.isEmpty()) {
|
||||
pts = g.getGpxFile().routes.get(0).points;
|
||||
}
|
||||
// don't display points here
|
||||
// if(pts.isEmpty() & !g.getGpxFile().routes.isEmpty()) {
|
||||
// pts = g.getGpxFile().routes.get(0).points;
|
||||
// }
|
||||
return pts;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -289,8 +289,8 @@ public class MapInfoLayer extends OsmandMapLayer {
|
|||
statusBar.setLayoutParams(flp);
|
||||
|
||||
flp = new FrameLayout.LayoutParams((int)(78 * scaleCoefficient),
|
||||
(int)(78 * scaleCoefficient), Gravity.RIGHT | Gravity.BOTTOM);
|
||||
flp.rightMargin = (int) (10*scaleCoefficient);
|
||||
(int)(78 * scaleCoefficient), Gravity.LEFT | Gravity.BOTTOM);
|
||||
flp.leftMargin = (int) (10*scaleCoefficient);
|
||||
flp.bottomMargin = (int) (85*scaleCoefficient);
|
||||
alarmControl.setLayoutParams(flp);
|
||||
|
||||
|
|
|
|||
|
|
@ -680,15 +680,18 @@ public class RouteInfoWidgetsFactory {
|
|||
locimgId = R.drawable.warnings_speed_camera;
|
||||
text = "";
|
||||
} else if(alarm.getType() == AlarmInfoType.BORDER_CONTROL) {
|
||||
text = "CLO";
|
||||
locimgId = R.drawable.warnings_border_control;
|
||||
text = "";
|
||||
//text = "CLO";
|
||||
} else if(alarm.getType() == AlarmInfoType.TOLL_BOOTH) {
|
||||
text = "$";
|
||||
} else if(alarm.getType() == AlarmInfoType.TRAFFIC_CALMING) {
|
||||
locimgId = R.drawable.warnings_speed_bump;
|
||||
text = "";
|
||||
} else if(alarm.getType() == AlarmInfoType.STOP) {
|
||||
// text = "STOP";
|
||||
locimgId = R.drawable.warnings_stop_sign;
|
||||
text = "";
|
||||
//text = "STOP";
|
||||
}
|
||||
visible = (text != null && text.length() > 0) || locimgId != 0;
|
||||
if (visible) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue