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

Merge branch 'r3.4'

Browse source
This commit is contained in:
Victor Shcherb 2019-07-08 14:31:31 +02:00
commit fcb995926b
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
OsmAnd-java/src/main/java/net/osmand/LocationConvert.java
View file

@ -158,16 +158,14 @@ public class LocationConvert {
StringBuilder sb = new StringBuilder();
// Handle negative values and append cardinal directions if necessary
if (addCardinalDirection) {
sb.append(latitude < 0 ? 'S' : 'N');
} else if (latitude < 0) {
if (!addCardinalDirection && latitude < 0) {
sb.append('-');
}
if (latitude < 0) {
latitude = -latitude;
formatDegrees(latitude < 0 ? -latitude : latitude, outputType, sb);
if (addCardinalDirection) {
sb.append(' ').append(latitude < 0 ? 'S' : 'N');
}
return formatDegrees(latitude, outputType, sb);
return sb.toString();
}
public static String convertLongitude(double longitude, int outputType, boolean addCardinalDirection) {
@ -181,16 +179,14 @@ public class LocationConvert {
StringBuilder sb = new StringBuilder();
// Handle negative values and append cardinal directions if necessary
if (addCardinalDirection) {
sb.append(longitude < 0 ? 'W' : 'E');
} else if (longitude < 0) {
if (!addCardinalDirection && longitude < 0) {
sb.append('-');
}
if (longitude < 0) {
longitude = -longitude;
formatDegrees(longitude < 0 ? -longitude : longitude, outputType, sb);
if (addCardinalDirection) {
sb.append(' ').append(longitude < 0 ? 'W' : 'E');
}
return formatDegrees(longitude, outputType, sb);
return sb.toString();
}
private static double formatCoordinate(double coordinate, StringBuilder sb, char delimiter) {