diff options
| author | SammysHP <sven@sammyshp.de> | 2011-11-27 20:39:46 +0100 |
|---|---|---|
| committer | SammysHP <sven@sammyshp.de> | 2011-11-27 20:39:46 +0100 |
| commit | 929b5badb4b4690133ca04041a75032827fff381 (patch) | |
| tree | d0e071eedf28d95545d55246a3486e07a2c7c243 | |
| parent | 9da095a83b456826fd5f6297426fb6742e593381 (diff) | |
| download | cgeo-929b5badb4b4690133ca04041a75032827fff381.zip cgeo-929b5badb4b4690133ca04041a75032827fff381.tar.gz cgeo-929b5badb4b4690133ca04041a75032827fff381.tar.bz2 | |
Fix #819: Bad format for event coordinates when added to calendar
Also add seperator to coordinates as requested in #809.
| -rw-r--r-- | main/src/cgeo/geocaching/CacheDetailActivity.java | 2 | ||||
| -rw-r--r-- | main/src/cgeo/geocaching/geopoint/GeopointFormatter.java | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/main/src/cgeo/geocaching/CacheDetailActivity.java b/main/src/cgeo/geocaching/CacheDetailActivity.java index 7525c75..d880322 100644 --- a/main/src/cgeo/geocaching/CacheDetailActivity.java +++ b/main/src/cgeo/geocaching/CacheDetailActivity.java @@ -728,7 +728,7 @@ public class CacheDetailActivity extends AbstractActivity { event.put("description", description.toString()); String location = ""; if (cache.getCoords() != null) { - location += cache.getCoords(); + location += cache.getCoords().format(GeopointFormatter.Format.LAT_LON_DECMINUTE_RAW); } if (StringUtils.isNotBlank(cache.getLocation())) { boolean addParenteses = false; diff --git a/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java b/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java index 1bca4a6..c4cfb8c 100644 --- a/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java +++ b/main/src/cgeo/geocaching/geopoint/GeopointFormatter.java @@ -17,9 +17,12 @@ public class GeopointFormatter /** Example: "10.123456,-0.123456" (unlocalized) */ LAT_LON_DECDEGREE_COMMA, - /** Example: "N 10° 12,345 W 5° 12,345" */ + /** Example: "N 10° 12,345 · W 5° 12,345" */ LAT_LON_DECMINUTE, + /** Example: "N 10° 12.345 W 5° 12.345" */ + LAT_LON_DECMINUTE_RAW, + /** Example: "N 10° 12' 34" W 5° 12' 34"" */ LAT_LON_DECSECOND, @@ -76,11 +79,15 @@ public class GeopointFormatter return String.format((Locale) null, "%.6f,%.6f", latSigned, lonSigned); case LAT_LON_DECMINUTE: - return String.format("%c %02.0f° %06.3f %c %03.0f° %06.3f", + return String.format("%c %02.0f° %06.3f · %c %03.0f° %06.3f", + latDir, latFloor, latMin, lonDir, lonFloor, lonMin); + + case LAT_LON_DECMINUTE_RAW: + return String.format((Locale) null, "%c %02.0f° %06.3f %c %03.0f° %06.3f", latDir, latFloor, latMin, lonDir, lonFloor, lonMin); case LAT_LON_DECSECOND: - return String.format("%c %02.0f° %02.0f' %06.3f\" %c %03.0f° %02.0f' %06.3f\"", + return String.format("%c %02.0f° %02.0f' %06.3f\" · %c %03.0f° %02.0f' %06.3f\"", latDir, latFloor, latMinFloor, latSec, lonDir, lonFloor, lonMinFloor, lonSec); case LAT_DECDEGREE_RAW: |