Fixed a bug in geo coordinate display, where we were always tacking on "deg N" and...

I also bumped the Android client to v2.4 final.

git-svn-id: http://zxing.googlecode.com/svn/trunk@776 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index 4be86f8..3be7d3a 100755 (executable)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -20,8 +20,8 @@ version to be published. The next versionCode will be 7, regardless of whether t
 versionName is 2.31, 2.4, or 3.0. -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.google.zxing.client.android"
-          android:versionName="2.4b2"
-          android:versionCode="8">
+          android:versionName="2.4"
+          android:versionCode="9">
   <application android:icon="@drawable/launcher_icon"
                android:label="@string/app_name">
     <activity android:name=".CaptureActivity"

diff --git a/core/src/com/google/zxing/client/result/GeoParsedResult.java b/core/src/com/google/zxing/client/result/GeoParsedResult.java
index 97ff4f5..6adf0fb 100644 (file)
--- a/core/src/com/google/zxing/client/result/GeoParsedResult.java
+++ b/core/src/com/google/zxing/client/result/GeoParsedResult.java
@@ -62,9 +62,8 @@ public final class GeoParsedResult extends ParsedResult {
   public String getDisplayResult() {
     StringBuffer result = new StringBuffer(50);
     result.append(latitude);
-    result.append(" deg N, ");
+    result.append(", ");
     result.append(longitude);
-    result.append(" deg E");
     if (altitude > 0.0f) {
       result.append(", ");
       result.append(altitude);