geo: URI more robust parsing about osmand

[rdoeffinger]

No way to attach patches? So here it is a plain text...

From 311e9c48e31629bca0d88e1f628ac0f0f63a12bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reimar=20D=C3=B6ffinger?= <[email protected]>
Date: Sun, 15 Sep 2013 22:12:38 +0200
Subject: [PATCH] Make geo: URI parsing more resilient.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In particular accept URIs with altitude and parameters like
geo:52,0,123;u=5?something
While e.g. Google maps seems to fail with those, apps like
QR droid accept them.

Signed-off-by: Reimar Döffinger <[email protected]>
---
 .../src/net/osmand/plus/activities/search/GeoIntentActivity.java  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java
index dcadb2b..3e7e116 100644
--- a/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java
@@ -232,9 +232,13 @@ public class GeoIntentActivity extends OsmandListActivity {
                                showErrorMessage("");
                        } else {
                                int latIndex = geo.indexOf(',');
-                               int lonIndex = geo.indexOf('?');
-                               lonIndex = lonIndex > 0 ? lonIndex : geo.length();
                                if (latIndex > 0) {
+                                       int lonIndex = geo.indexOf(',', latIndex + 1);
+                                       int altIndex = geo.indexOf(';', latIndex + 1);
+                                       int paramIndex = geo.indexOf('?', latIndex + 1);
+                                       paramIndex = paramIndex > 0 ? paramIndex : geo.length();
+                                       altIndex = altIndex > 0 && altIndex < paramIndex ? altIndex : paramIndex;
+                                       lonIndex = lonIndex > 0 && lonIndex < altIndex ? lonIndex : altIndex;
                                        try {
                                                double lat = Double.parseDouble(geo.substring(0, latIndex).trim());
                                                double lon = Double.parseDouble(geo.substring(latIndex + 1, lonIndex).trim());
-- 
1.8.4.rc3