Support SMTP URLs

[zxing.git] / core / src / com / google / zxing / client / result / GeoParsedResult.java

diff --git a/core/src/com/google/zxing/client/result/GeoParsedResult.java b/core/src/com/google/zxing/client/result/GeoParsedResult.java
index 97ff4f5..dc50e8a 100644 (file)
--- a/core/src/com/google/zxing/client/result/GeoParsedResult.java
+++ b/core/src/com/google/zxing/client/result/GeoParsedResult.java
@@ -21,55 +21,79 @@ package com.google.zxing.client.result;
  */
 public final class GeoParsedResult extends ParsedResult {
 
-  private final String geoURI;
-  private final float latitude;
-  private final float longitude;
-  private final float altitude;
+  private final double latitude;
+  private final double longitude;
+  private final double altitude;
+  private final String query;
 
-  GeoParsedResult(String geoURI, float latitude, float longitude, float altitude) {
+  GeoParsedResult(double latitude, double longitude, double altitude, String query) {
     super(ParsedResultType.GEO);
-    this.geoURI = geoURI;
     this.latitude = latitude;
     this.longitude = longitude;
     this.altitude = altitude;
+    this.query = query;
   }
 
   public String getGeoURI() {
-    return geoURI;
+    StringBuffer result = new StringBuffer();
+    result.append("geo:");
+    result.append(latitude);
+    result.append(',');
+    result.append(longitude);
+    if (altitude > 0) {
+      result.append(',');
+      result.append(altitude);
+    }
+    if (query != null) {
+      result.append('?');
+      result.append(query);
+    }
+    return result.toString();
   }
 
   /**
    * @return latitude in degrees
    */
-  public float getLatitude() {
+  public double getLatitude() {
     return latitude;
   }
 
   /**
    * @return longitude in degrees
    */
-  public float getLongitude() {
+  public double getLongitude() {
     return longitude;
   }
 
   /**
    * @return altitude in meters. If not specified, in the geo URI, returns 0.0
    */
-  public float getAltitude() {
+  public double getAltitude() {
     return altitude;
   }
 
+  /**
+   * @return query string associated with geo URI or null if none exists
+   */
+  public String getQuery() {
+    return query;
+  }
+
   public String getDisplayResult() {
-    StringBuffer result = new StringBuffer(50);
+    StringBuffer result = new StringBuffer(20);
     result.append(latitude);
-    result.append(" deg N, ");
+    result.append(", ");
     result.append(longitude);
-    result.append(" deg E");
-    if (altitude > 0.0f) {
+    if (altitude > 0.0) {
       result.append(", ");
       result.append(altitude);
       result.append('m');
     }
+    if (query != null) {
+      result.append(" (");
+      result.append(query);
+      result.append(')');
+    }
     return result.toString();
   }
 
@@ -88,8 +112,8 @@ public final class GeoParsedResult extends ParsedResult {
     if (altitude > 0.0f) {
       // Map altitude to zoom level, cleverly. Roughly, zoom level 19 is like a
       // view from 1000ft, 18 is like 2000ft, 17 like 4000ft, and so on.
-      float altitudeInFeet = altitude * 3.28f;
-      int altitudeInKFeet = (int) (altitudeInFeet / 1000.0f);
+      double altitudeInFeet = altitude * 3.28;
+      int altitudeInKFeet = (int) (altitudeInFeet / 1000.0);
       // No Math.log() available here, so compute log base 2 the old fashioned way
       // Here logBaseTwo will take on a value between 0 and 18 actually
       int logBaseTwo = 0;