Merge remote-tracking branch 'origin/master'

OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java

@@ -0,0 +1,356 @@
+package net.osmand.util;
+
+import java.net.URI;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class GeoPointParserUtil {
+
+	public static void main(String[] args) {
+		final double lat = 34.99, lon = -106.61;
+		final String name = "Treasure";
+		int z = GeoParsedPoint.NO_ZOOM;
+		String url;
+
+		// 0,0?q=34.99,-106.61(Treasure)
+		url = "geo:0,0?q=" + lat + "," + lon + "(" + name + ")";
+		System.out.println("url: " + url);
+		GeoParsedPoint actual = GeoPointParserUtil.parse("geo", url);
+		assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z, name));
+
+		// geo:0,0?z=11&q=34.99,-106.61(Treasure)
+		z = 11;
+		url = "geo:0,0?z=" + z + "&q=" + lat + "," + lon + "(" + name + ")";
+		System.out.println("url: " + url);
+		actual = GeoPointParserUtil.parse("geo", url);
+		assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z, name));
+
+		// geo:0,0?z=11&q=34.99,-106.61
+		z = 11;
+		url = "geo:0,0?z=" + z + "&q=" + lat + "," + lon;
+		System.out.println("url: " + url);
+		actual = GeoPointParserUtil.parse("geo", url);
+		assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
+
+		// geo:34.99,-106.61
+		z = -1;
+		url = "geo:" + lat + "," + lon;
+		System.out.println("url: " + url);
+		actual = GeoPointParserUtil.parse("geo", url);
+		assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
+
+		// geo:34.99,-106.61?z=11
+		z = 11;
+		url = "geo:" + lat + "," + lon + "?" + "z=" + z;
+		System.out.println("url: " + url);
+		actual = GeoPointParserUtil.parse("geo", url);
+		assertGeoPoint(actual, new GeoParsedPoint(lat, lon, z));
+
+		// geo:0,0?q=1600+Amphitheatre+Parkway,+CA
+		String qstr = "q=1600+Amphitheatre+Parkway,+CA";
+		url = "geo:0,0?" + qstr;
+		System.out.println("url: " + url);
+		actual = GeoPointParserUtil.parse("geo", url);
+		assertGeoPoint(actual, new GeoParsedPoint(qstr));
+
+		// geo:0,0?z=11&q=1600+Amphitheatre+Parkway,+CA
+		qstr = "q=1600+Amphitheatre+Parkway,+CA";
+		url = "geo:0,0?z=11&" + qstr;
+		System.out.println("url: " + url);
+		actual = GeoPointParserUtil.parse("geo", url);
+		assertGeoPoint(actual, new GeoParsedPoint(qstr));
+	}
+
+	private static void assertGeoPoint(GeoParsedPoint actual, GeoParsedPoint expected) {
+		if (expected.getQuery() != null) {
+			if (!expected.getQuery().equals(actual.getQuery()))
+				throw new RuntimeException("Query param not equal");
+		} else {
+			double aLat = actual.getLat(), eLat = expected.getLat(), aLon = actual.getLon(), eLon = expected.getLon();
+			int aZoom = actual.getZoom(), eZoom = expected.getZoom();
+			String aName = actual.getName(), eName = expected.getName();
+			if (eName != null) {
+				if (!aName.equals(eName)) {
+					throw new RuntimeException("Point name\\capture is not equal; actual=" + aName + ", expected="
+							+ eName);
+				}
+			}
+			if (eLat != aLat) {
+				throw new RuntimeException("Latitude is not equal; actual=" + aLat + ", expected=" + eLat);
+			}
+			if (eLon != aLon) {
+				throw new RuntimeException("Longitude is not equal; actual=" + aLon + ", expected=" + eLon);
+			}
+			if (eZoom != aZoom) {
+				throw new RuntimeException("Zoom is not equal; actual=" + aZoom + ", expected=" + aZoom);
+			}
+		}
+		System.out.println("Passed!");
+	}
+
+	private static String getQueryParameter(final String param, URI data) {
+		final String query = data.getQuery();
+		String value = null;
+		if (query.contains(param)) {
+			String[] params = query.split("&");
+			for (String p : params) {
+				if (p.contains(param)) {
+					value = p.substring(p.indexOf("=") + 1, p.length());
+					break;
+				}
+			}
+		}
+		return value;
+	}
+
+	/**
+	 * Parses geo and map intents:
+	 * 
+	 * @param scheme
+	 *            The intent scheme
+	 * @param data
+	 *            The URI object
+	 * @return {@link GeoParsedPoint}
+	 */
+	public static GeoParsedPoint parse(final String scheme, final String uri) {
+		final URI data = URI.create(uri.replaceAll("\\s+", ""));
+		if ("http".equals(scheme) || "https".equals(scheme)) {
+
+			final String schemeSpecific = data.getSchemeSpecificPart();
+
+			if (schemeSpecific == null) {
+				return null;
+			}
+
+			final String[] osmandNetSite = { "//download.osmand.net/go?" };
+
+			final String[] osmandNetPattern = { "lat=(-?\\d{1,3}.\\d+)&lon=(-?\\d{1,3}.\\d+)&z=(\\d{1,2})" };
+
+			final String[] openstreetmapOrgSite = { "//openstreetmap.org/", "//www.openstreetmap.org/" };
+
+			final String[] openstreetmapOrgPattern = { "(?:.*)(?:map=)(\\d{1,2})/(-?\\d{1,3}.\\d+)/(-?\\d{1,3}.\\d+)(?:.*)" };
+
+			final String[] openstreetmapDeSite = { "//openstreetmap.de/", "//www.openstreetmap.de/" };
+
+			final String[] openstreetmapDePattern = {
+					"(?:.*)zoom=(\\d{1,2})&lat=(-?\\d{1,3}.\\d+)&lon=(-?\\d{1,3}.\\d+)(?:.*)",
+					"(?:.*)lat=(-?\\d{1,3}.\\d+)&lon=(-?\\d{1,3}.\\d+)&z(?:oom)?=(\\d{1,2})(?:.*)" };
+
+			final String[] googleComSite = { "//www.google.com/maps/", "//maps.google.com/maps" };
+
+			final String[] googleComPattern = { "(?:.*)@(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+),(\\d{1,2})z(?:.*)",
+					"(?:.*)ll=(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+)(?:.+)z=(\\d{1,2})(?:.*)",
+					"(?:.*)q=([\\-+]?\\d{1,3}.\\d+),([\\-+]?\\d{1,3}.\\d+)(?:.*)&z=(\\d{1,2})",
+					"(?:.*)q=loc:(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+)&z=(\\d{1,2})(?:.*)" };
+
+			final String[] yandexRuSite = { "//maps.yandex.ru/" };
+
+			final String[] yandexRuPattern = { "(?:.*)ll=(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+)(?:.+)z=(\\d{1,2})(?:.*)" };
+
+			final String sites[][] = { osmandNetSite, openstreetmapOrgSite, openstreetmapDeSite, googleComSite,
+					yandexRuSite };
+
+			final String patterns[][] = { osmandNetPattern, openstreetmapOrgPattern, openstreetmapDePattern,
+					googleComPattern, yandexRuPattern };
+
+			for (int s = 0; s < sites.length; s++) {
+				for (int si = 0; si < sites[s].length; si++) {
+					if (schemeSpecific.startsWith(sites[s][si])) {
+						for (int p = 0; p < patterns[s].length; p++) {
+							String subString = schemeSpecific.substring(sites[s][si].length());
+
+							if (subString.equals("")) {
+								subString = data.getFragment();
+							}
+
+							final Matcher matcher = Pattern.compile(patterns[s][p]).matcher(subString);
+
+							if (matcher.matches()) {
+								try {
+
+									final double lat;
+									final double lon;
+									final int zoom;
+
+									// check sequence of values
+									if (!matcher.group(3).contains(".")) {
+										lat = Double.valueOf(matcher.group(1));
+										lon = Double.valueOf(matcher.group(2));
+										zoom = Integer.valueOf(matcher.group(3));
+									} else {
+										zoom = Integer.valueOf(matcher.group(1));
+										lat = Double.valueOf(matcher.group(2));
+										lon = Double.valueOf(matcher.group(3));
+									}
+
+									return new GeoParsedPoint(lat, lon, zoom);
+								} catch (NumberFormatException e) {
+									return null;
+								}
+							}
+						}
+						break;
+					}
+				}
+			}
+
+			String q = null;
+			String parameter = getQueryParameter("q", data);
+			if (parameter == null) {
+				parameter = getQueryParameter("daddr", data);
+			}
+			if (parameter != null) {
+				q = parameter.split(" ")[0];
+			}
+			if (q.indexOf(',') != -1) {
+				int i = q.indexOf(',');
+				String lat = q.substring(0, i);
+				String lon = q.substring(i + 1);
+				if (lat.indexOf(':') != -1) {
+					i = lat.indexOf(':');
+					lat = lat.substring(i + 1);
+				}
+				try {
+					double llat = Double.parseDouble(lat.trim());
+					double llon = Double.parseDouble(lon.trim());
+					return new GeoParsedPoint(llat, llon);
+				} catch (NumberFormatException e) {
+					return null;
+				}
+			} else {
+				return null;
+			}
+		}
+		if ("geo".equals(scheme) || "osmand.geo".equals(scheme)) {
+			final String schemeSpecific = data.getSchemeSpecificPart();
+			if (schemeSpecific == null) {
+				return null;
+			}
+			if (schemeSpecific.startsWith("0,0?")) {
+				// geo:0,0?q=34.99,-106.61(Treasure)
+				// geo:0,0?z=11&q=34.99,-106.61(Treasure)
+				String query = schemeSpecific.substring("0,0?".length());
+				final String pattern = "(?:z=([0-9]{1,2})?)?&?q=([\\-0-9\\.]+)?,([\\-0-9\\.]+)?\\s*(?:\\((.+?)\\))?";
+				final Matcher matcher = Pattern.compile(pattern).matcher(query);
+				if (matcher.matches()) {
+					final String z = matcher.group(1);
+					final String name = matcher.group(4);
+					final int zoom = z != null ? Integer.parseInt(z) : GeoParsedPoint.NO_ZOOM;
+					final double lat = Double.parseDouble(matcher.group(2));
+					final double lon = Double.parseDouble(matcher.group(3));
+					return new GeoParsedPoint(lat, lon, zoom, name);
+				} else {
+					// geo:0,0?q=1600+Amphitheatre+Parkway%2C+CA
+					// geo:0,0?z=11&q=1600+Amphitheatre+Parkway%2C+CA
+					// zoom parameter is not used in GeoAddressSearch
+					if (query.contains("z="))
+						query = query.substring(query.indexOf("&") + 1);
+					return new GeoParsedPoint(query);
+				}
+			} else {
+				// geo:47.6,-122.3
+				// geo:47.6,-122.3?z=11
+				// allow for http://tools.ietf.org/html/rfc5870 (geo uri) ,
+				// just
+				// ignore everything after ';'
+				final String pattern = "([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?z=([0-9]+))?(?:;.*)?";
+				int indexQ = schemeSpecific.indexOf("&q");
+				final Matcher matcher;
+				if (indexQ != -1) {
+					final String schemeQ = schemeSpecific.substring(0, indexQ);
+					matcher = Pattern.compile(pattern).matcher(schemeQ);
+				} else {
+					matcher = Pattern.compile(pattern).matcher(schemeSpecific);
+				}
+
+				final String pattern2 = "([\\-0-9.]+),([\\-0-9.]+)(?:.*)"; // c:geo
+				final Matcher matcher2 = Pattern.compile(pattern2).matcher(schemeSpecific);
+
+				if (matcher.matches()) {
+					final double lat = Double.valueOf(matcher.group(1));
+					final double lon = Double.valueOf(matcher.group(2));
+					if (matcher.group(4) == null) {
+						return new GeoParsedPoint(lat, lon);
+					} else {
+						return new GeoParsedPoint(lat, lon, Integer.valueOf(matcher.group(4)));
+					}
+				} else if (matcher2.matches()) {
+					final double lat = Double.valueOf(matcher2.group(1));
+					final double lon = Double.valueOf(matcher2.group(2));
+					return new GeoParsedPoint(lat, lon);
+				} else {
+					return null;
+				}
+			}
+		}
+		return null;
+	}
+
+	public static class GeoParsedPoint {
+		private static final int NO_ZOOM = -1;
+
+		private double lat;
+		private double lon;
+		private int zoom = NO_ZOOM;
+		private String name;
+		private String query;
+		private boolean geoPoint;
+		private boolean geoAddress;
+
+		public GeoParsedPoint(double lat, double lon) {
+			super();
+			this.lat = lat;
+			this.lon = lon;
+			this.geoPoint = true;
+		}
+
+		public GeoParsedPoint(double lat, double lon, String name) {
+			this(lat, lon);
+			this.name = name;
+		}
+
+		public GeoParsedPoint(double lat, double lon, int zoom) {
+			this(lat, lon);
+			this.zoom = zoom;
+		}
+
+		public GeoParsedPoint(double lat, double lon, int zoom, String name) {
+			this(lat, lon, zoom);
+			this.name = name;
+		}
+
+		public GeoParsedPoint(String query) {
+			super();
+			this.query = query;
+			this.geoAddress = true;
+		}
+
+		public double getLat() {
+			return lat;
+		}
+
+		public double getLon() {
+			return lon;
+		}
+
+		public int getZoom() {
+			return zoom;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public String getQuery() {
+			return query;
+		}
+
+		public boolean isGeoPoint() {
+			return geoPoint;
+		}
+
+		public boolean isGeoAddress() {
+			return geoAddress;
+		}
+	}
+}

OsmAnd/.classpath

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry excluding="net/osmand/LogUtil.java|net/osmand/PlatformUtil.java" kind="src" path="use"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

OsmAnd/res/values-be/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="auto_zoom_none">Без аўтаматычнага масштабіраваньня</string>
     <string name="auto_zoom_close">Зачыніць</string>
     <string name="auto_zoom_far">Для сярэдняга масштаба</string>

OsmAnd/res/values-ca/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="show_warnings_title">Mostra els missatges d\'avís…</string>
 <string name="map_widget_fluorescent">Rutes amb fluorescència</string>
 <string name="map_widget_show_ruler">Mostra el regle</string>

OsmAnd/res/values-cs/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="switch_to_raster_map_to_see">Vektorové mapy toto místo neobsahují. Mapová data můžete stáhnout v Nastaveních (Spravovat mapové soubory), nebo se přepněte na online mapy.</string>
   <string name="tip_recent_changes_0_7_2_t">"Změny ve verzi 0.7.2 :
 \n\t- Native rendering pro všechna zařízení

OsmAnd/res/values-es/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
   
   <string name="layer_map_appearance">Configura pantalla</string>

OsmAnd/res/values-fr/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="offline_edition">Modifications hors-ligne</string>
   <string name="offline_edition_descr">Toujours utiliser l\'édition hors-ligne</string>
   <string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :

OsmAnd/res/values-ja/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="installing_new_resources">新しいデータを展開中…</string>
      <string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
 インターネット接続されていません。</string>

OsmAnd/res/values-ko/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
 	
 	<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>

OsmAnd/res/values-pl/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="tip_recent_changes_0_6_9_t">"Zmiany w 0.6.9: \n\t- poprawiono renderowanie map offline \n\t- szybkie renderowanie natywne (wersja eksperymentalna - może nie działać na niektórych urządzeniach) \n\t- poprawki w interfejsie \n\t- dodano wyświetlanie informacji o wysokości (altitude) \n\t- nowe tłumaczenia (polskie, wietnamskie) \n\t- inne, mniejsze poprawki "</string>
   
   <string name="use_transparent_map_theme">Przezroczysty styl</string>

OsmAnd/res/values-sc/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="always_center_position_on_map">Ammustra sa positzione semper a su tzentru</string>
     <string name="voice_pref_title">Boghe</string>
     <string name="misc_pref_title">Mistura</string>

OsmAnd/res/values-sv/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="screen_is_locked">För att låsa upp skärmen tryck på låsikonen</string>
 <string name="ChooseCountry">Välj land</string>
 <string name="choose_city">Välj stad</string>

OsmAnd/res/values-uk/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
 		\n\t* Більш точні маршрути (трохи повільніше)
 		\n\t* Розумний і швидкий перерахунок маршруту

OsmAnd/res/values-zh-rCN/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="email">電子郵件</string>
 <string name="poi_dialog_name">名稱</string>
 	<string name="poi_dialog_opening_hours">打開</string>

OsmAnd/res/values-zh-rTW/strings.xml

@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
 <resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
 	<string name="rendering_attr_roadColors_name">道路的色彩調配</string>
     <string name="map_widget_show_destination_arrow">顯示目的地方向</string>

OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java

@@ -1,6 +1,5 @@
 package net.osmand.plus.activities.search;
 
-import android.os.AsyncTask;
 import gnu.trove.map.hash.TLongObjectHashMap;
 
 import java.util.ArrayList;
@@ -8,8 +7,6 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import net.osmand.ResultMatcher;
 import net.osmand.access.AccessibleToast;
@@ -27,6 +24,7 @@ import net.osmand.plus.activities.MapActivity;
 import net.osmand.plus.activities.OsmandListActivity;
 import net.osmand.plus.resources.RegionAddressRepository;
 import net.osmand.plus.resources.ResourceManager;
+import net.osmand.util.GeoPointParserUtil;
 import net.osmand.util.MapUtils;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -34,6 +32,7 @@ import android.content.DialogInterface;
 import android.content.DialogInterface.OnCancelListener;
 import android.content.Intent;
 import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -50,8 +49,7 @@ public class GeoIntentActivity extends OsmandListActivity {
 	private ProgressDialog startProgressDialog;
 
 	@Override
-    protected void onCreate(Bundle savedInstanceState)
+	protected void onCreate(Bundle savedInstanceState) {
-    {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.search_address_offline);
 		getSupportActionBar().setTitle(R.string.search_osm_offline);
@@ -60,16 +58,14 @@ public class GeoIntentActivity extends OsmandListActivity {
 		location = getMyApplication().getSettings().getLastKnownMapLocation();
 
 		final Intent intent = getIntent();
-        if (intent != null)
+		if (intent != null) {
-        {
+			final ProgressDialog progress = ProgressDialog.show(GeoIntentActivity.this, getString(R.string.searching),
-            final ProgressDialog progress = ProgressDialog.show(GeoIntentActivity.this, getString(R.string.searching), getString(R.string.searching_address));
+					getString(R.string.searching_address));
 			final GeoIntentTask task = new GeoIntentTask(progress, intent);
 
-            progress.setOnCancelListener(new OnCancelListener()
+			progress.setOnCancelListener(new OnCancelListener() {
-            {
 				@Override
-                public void onCancel(DialogInterface dialog)
+				public void onCancel(DialogInterface dialog) {
-                {
 					task.cancel(true);
 				}
 			});
@@ -80,72 +76,53 @@ public class GeoIntentActivity extends OsmandListActivity {
 		}
 	}
 
-    private class GeoIntentTask extends AsyncTask<Void,Void, ExecutionResult>
+	private class GeoIntentTask extends AsyncTask<Void, Void, ExecutionResult> {
-    {
 		private final ProgressDialog progress;
 		private final Intent intent;
 
-        private GeoIntentTask(final ProgressDialog progress, final Intent intent)
+		private GeoIntentTask(final ProgressDialog progress, final Intent intent) {
-        {
 			this.progress = progress;
 			this.intent = intent;
 		}
 
 		@Override
-        protected void onPreExecute()
+		protected void onPreExecute() {
-        {
 		}
 
 		@Override
-        protected ExecutionResult doInBackground(Void... nothing)
+		protected ExecutionResult doInBackground(Void... nothing) {
-        {
+			try {
-            try
+				while (getMyApplication().isApplicationInitializing()) {
-            {
-                while (getMyApplication().isApplicationInitializing())
-                {
 					Thread.sleep(200);
 				}
 				return extract(intent.getScheme(), intent.getData()).execute();
-            }
+			} catch (Exception e) {
-            catch (Exception e)
-            {
 				return null;
 			}
 		}
 
 		@Override
-        protected void onPostExecute(ExecutionResult result)
+		protected void onPostExecute(ExecutionResult result) {
-        {
 			progress.dismiss();
-            if (result != null)
+			if (result != null) {
-            {
+				if (result.isEmpty()) {
-                if (result.isEmpty())
+					AccessibleToast.makeText(GeoIntentActivity.this, getString(R.string.search_nothing_found),
-                {
+							Toast.LENGTH_LONG).show();
-                    AccessibleToast.makeText(GeoIntentActivity.this, getString(R.string.search_nothing_found), Toast.LENGTH_LONG).show();
+				} else {
-                }
+					if (result.hasZoom()) {
-                else
-                {
-                    if (result.hasZoom())
-                    {
 						getMyApplication().getSettings().setLastKnownMapZoom(result.getZoom());
 					}
 
 					final List<MapObject> places = new ArrayList<MapObject>(result.getMapObjects());
 					setListAdapter(new MapObjectAdapter(places));
-					if (places.size() == 1)
+					if (places.size() == 1) {
-                    {
+						onListItemClick(getListView(), getListAdapter().getView(0, null, null), 0, getListAdapter()
-                        onListItemClick(
+								.getItemId(0));
-                                getListView(),
-                                getListAdapter().getView(0, null, null),
-                                0,
-                                getListAdapter().getItemId(0)
-                        );
 					}
 				}
-            }
+			} else {
-            else
+				AccessibleToast.makeText(GeoIntentActivity.this,
-            {
+						getString(R.string.search_offline_geo_error, intent.getData()), Toast.LENGTH_LONG).show();
-                AccessibleToast.makeText(GeoIntentActivity.this, getString(R.string.search_offline_geo_error, intent.getData()), Toast.LENGTH_LONG).show();
 			}
 		}
 
@@ -162,8 +139,7 @@ public class GeoIntentActivity extends OsmandListActivity {
 	private class MapObjectAdapter extends ArrayAdapter<MapObject> {
 
 		public MapObjectAdapter(List<MapObject> places) {
-			super(GeoIntentActivity.this,
+			super(GeoIntentActivity.this, R.layout.search_address_offline_list_item, places);
-					R.layout.search_address_offline_list_item, places);
 		}
 
 		@Override
@@ -171,17 +147,13 @@ public class GeoIntentActivity extends OsmandListActivity {
 			View row = convertView;
 			if (row == null) {
 				LayoutInflater inflater = getLayoutInflater();
-				row = inflater.inflate(
+				row = inflater.inflate(R.layout.search_address_offline_list_item, parent, false);
-						R.layout.search_address_offline_list_item, parent,
-						false);
 			}
 			MapObject model = getItem(position);
 			TextView label = (TextView) row.findViewById(R.id.label);
-			TextView distanceLabel = (TextView) row
+			TextView distanceLabel = (TextView) row.findViewById(R.id.distance_label);
-					.findViewById(R.id.distance_label);
 			if (location != null) {
-				int dist = (int) (MapUtils.getDistance(location, model
+				int dist = (int) (MapUtils.getDistance(location, model.getLocation().getLatitude(), model.getLocation()
-						.getLocation().getLatitude(), model.getLocation()
 						.getLongitude()));
 				distanceLabel.setText(OsmAndFormatter.getFormattedDistance(dist, (OsmandApplication) getApplication()));
 			} else {
@@ -233,253 +205,39 @@ public class GeoIntentActivity extends OsmandListActivity {
 	 * geo:0,0?q=34.99,-106.61(Treasure)<br/>
 	 * geo:0,0?q=1600+Amphitheatre+Parkway%2C+CA<br/>
 	 * 
-	 * @param scheme The intent scheme
+	 * @param scheme
-	 * @param data The intent uri
+	 *            The intent scheme
+	 * @param data
+	 *            The intent uri
 	 * @return
 	 */
-    private MyService extract(final String scheme, final Uri data)
+	private MyService extract(final String scheme, final Uri data) {
-    {
+		GeoPointParserUtil.GeoParsedPoint p = GeoPointParserUtil.parse(scheme, data.toString());
-    	if ("http".equals(scheme) || "https".equals(scheme)) {
+		if (p.isGeoPoint()) {
-
+			if (p.getName() != null) {
-    		final String schemeSpecific = data.getSchemeSpecificPart();
+				return new GeoPointSearch(p.getLat(), p.getLon(), p.getName(), p.getZoom());
-
-    		if (schemeSpecific == null) {
-    			return null;
 			}
-
+			return new GeoPointSearch(p.getLat(), p.getLon(), p.getZoom());
-    		final String[] osmandNetSite = {
-    				"//download.osmand.net/go?"
-    		};
-
-    		final String[] osmandNetPattern = {
-    				"lat=(-?\\d{1,3}.\\d+)&lon=(-?\\d{1,3}.\\d+)&z=(\\d{1,2})"
-    		};
-
-    		final String[] openstreetmapOrgSite = {
-    				"//openstreetmap.org/",
-    				"//www.openstreetmap.org/"
-    		};
-
-    		final String[] openstreetmapOrgPattern = {
-    				"(?:.*)(?:map=)(\\d{1,2})/(-?\\d{1,3}.\\d+)/(-?\\d{1,3}.\\d+)(?:.*)"
-    		};
-
-    		final String[] openstreetmapDeSite = {
-    				"//openstreetmap.de/",
-    				"//www.openstreetmap.de/"
-    		};
-
-    		final String[] openstreetmapDePattern = {
-    				"(?:.*)zoom=(\\d{1,2})&lat=(-?\\d{1,3}.\\d+)&lon=(-?\\d{1,3}.\\d+)(?:.*)",
-    				"(?:.*)lat=(-?\\d{1,3}.\\d+)&lon=(-?\\d{1,3}.\\d+)&z(?:oom)?=(\\d{1,2})(?:.*)"
-    		};
-
-    		final String[] googleComSite = {
-    				"//www.google.com/maps/",
-    				"//maps.google.com/maps"
-    		};
-
-    		final String[] googleComPattern = {
-    				"(?:.*)@(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+),(\\d{1,2})z(?:.*)",
-    				"(?:.*)ll=(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+)(?:.+)z=(\\d{1,2})(?:.*)",
-    				"(?:.*)q=([\\-+]?\\d{1,3}.\\d+),([\\-+]?\\d{1,3}.\\d+)(?:.*)&z=(\\d{1,2})",
-    				"(?:.*)q=loc:(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+)&z=(\\d{1,2})(?:.*)"
-    		};
-
-    		final String[] yandexRuSite = {
-    				"//maps.yandex.ru/"
-    		};
-
-    		final String[] yandexRuPattern = {
-    				"(?:.*)ll=(-?\\d{1,3}.\\d+),(-?\\d{1,3}.\\d+)(?:.+)z=(\\d{1,2})(?:.*)"
-    		};
-
-    		final String sites[][] = {
-    				osmandNetSite,
-    				openstreetmapOrgSite,
-    				openstreetmapDeSite,
-    				googleComSite,
-    				yandexRuSite
-    		};
-
-    		final String patterns[][] = {
-    				osmandNetPattern,
-    				openstreetmapOrgPattern,
-    				openstreetmapDePattern,
-    				googleComPattern,
-    				yandexRuPattern
-    		};
-
-    		for (int s = 0; s < sites.length; s++)
-    		{
-    			for (int si = 0; si < sites[s].length; si++)
-    			{
-    				if (schemeSpecific.startsWith(sites[s][si])) {
-    					for (int p = 0; p < patterns[s].length; p++)
-    					{
-    						String subString = schemeSpecific.substring(sites[s][si].length());
-    						
-    						if (subString.equals(""))
-    						{
-    							subString = data.getFragment();
-    						}
-    						
-    						final Matcher matcher = Pattern.compile(patterns[s][p]).matcher(subString);
-
-    						if (matcher.matches()) {
-    							try {
-
-    								final double lat;
-    								final double lon;
-    								final int zoom;
-
-    								//check sequence of values
-    								if (!matcher.group(3).contains("."))
-    								{
-    									lat = Double.valueOf(matcher.group(1));
-    									lon = Double.valueOf(matcher.group(2));
-    									zoom = Integer.valueOf(matcher.group(3));
-    								}
-    								else
-    								{
-    									zoom = Integer.valueOf(matcher.group(1));
-    									lat = Double.valueOf(matcher.group(2));
-    									lon = Double.valueOf(matcher.group(3));
-    								}
-
-    								return new GeoPointSearch(lat, lon, zoom);
-    							}
-    							catch (NumberFormatException e)
-    							{
-    								return null;
-    							}
-    						}
-    					}
-    					break;
-    				}
-    			}
-    		}
-    		
-            String q = null;
-            String parameter = data.getQueryParameter("q");
-            if (parameter == null)
-            {
-                parameter = data.getQueryParameter("daddr");
-            }
-            if (parameter != null)
-            {
-                q = parameter.split(" ")[0];
-            }
-            if (q.indexOf(',') != -1)
-            {
-                int i = q.indexOf(',');
-                String lat = q.substring(0, i);
-                String lon = q.substring(i + 1);
-                if (lat.indexOf(':') != -1)
-                {
-                    i = lat.indexOf(':');
-                    lat = lat.substring(i + 1);
-                }
-                try
-                {
-                    double llat = Double.parseDouble(lat.trim());
-                    double llon = Double.parseDouble(lon.trim());
-                    return new GeoPointSearch(llat, llon);
-                }
-                catch (NumberFormatException e)
-                {
-                    return null;
-                }
-            }
-            else
-            {
-                return null;
-            }
-        }
-        if ("geo".equals(scheme) || "osmand.geo".equals(scheme))
-        {
-            //geo:
-            final String schemeSpecific = data.getSchemeSpecificPart();
-            if (schemeSpecific == null)
-            {
-                return null;
-            }
-            if (schemeSpecific.startsWith("0,0?q="))
-            {
-                //geo:0,0?q=34.99,-106.61(Treasure)
-                //geo:0,0?q=1600+Amphitheatre+Parkway%2C+CA
-                final String query = schemeSpecific.substring("0,0?q=".length());
-
-                final Matcher matcher = Pattern.compile("([\\-0-9.]+),([\\-0-9.]+)(?:,[\\-0-9.]+)?\\((.+?)\\)").matcher(query);
-                if (matcher.matches())
-                {
-                    final double lat = Double.valueOf(matcher.group(1));
-                    final double lon = Double.valueOf(matcher.group(2));
-                    final String name = matcher.group(3);
-
-                    return new GeoPointSearch(lat, lon, name);
-                }
-                else
-                {
-                    //we suppose it's a search
-                    return new GeoAddressSearch(query);
-                }
-            }
-            else
-            {
-                //geo:47.6,-122.3
-                //geo:47.6,-122.3?z=11
-                //allow for http://tools.ietf.org/html/rfc5870 (geo uri) , just ignore everything after ';'
-                final String pattern = "([\\-0-9.]+),([\\-0-9.]+)(?:,([\\-0-9.]+))?(?:\\?z=([0-9]+))?(?:;.*)?";
-				int indexQ = schemeSpecific.indexOf("&q");
-				final Matcher matcher;
-				if (indexQ != -1){
-					final String schemeQ = schemeSpecific.substring(0,indexQ);
-					matcher = Pattern.compile(pattern).matcher(schemeQ);
 		} else {
-					matcher = Pattern.compile(pattern).matcher(schemeSpecific);
+			return new GeoAddressSearch(p.getQuery());
 		}
-				
-				final String pattern2 = "([\\-0-9.]+),([\\-0-9.]+)(?:.*)"; //c:geo
-				final Matcher matcher2 = Pattern.compile(pattern2).matcher(schemeSpecific);
-
-                if (matcher.matches())
-                {
-                    final double lat = Double.valueOf(matcher.group(1));
-                    final double lon = Double.valueOf(matcher.group(2));
-                    if (matcher.group(4) == null)
-                    {
-                        return new GeoPointSearch(lat, lon);
-                    }
-                    else
-                    {
-                        return new GeoPointSearch(lat, lon, Integer.valueOf(matcher.group(4)));
-                    }
-                } else if (matcher2.matches()) {
-                    final double lat = Double.valueOf(matcher2.group(1));
-                    final double lon = Double.valueOf(matcher2.group(2));
-                    return new GeoPointSearch(lat, lon);
-                } else {
-                    return null;
-                }
-            }
-        }
-        return null;
 	}
 
 	private final class GeoAddressSearch implements MyService {
 		private List<String> elements;
 
 		public GeoAddressSearch(String query) {
-			query = query.replaceAll("%20", ",").replaceAll("%0A",",")
+			query = query.replaceAll("%20", ",").replaceAll("%0A", ",").replaceAll("\n", ",").replaceAll("\t", ",")
-					.replaceAll("\n",",").replaceAll("\t",",")
 					.replaceAll(" ", ",");
 			System.out.println(query);
 			// String is split on each comma
-			String[] s = query.split(",");
+			String[] s = query.substring(query.indexOf("q=") + 2).split(",");
 
 			elements = new ArrayList<String>();
 			for (int i = 0; i < s.length; i++) {
+				if (s[i].isEmpty()) {
+					continue;
+				}
 				elements.add(s[i].replace('+', ' ').trim());
 			}
 		}
@@ -494,14 +252,16 @@ public class GeoIntentActivity extends OsmandListActivity {
 						if (e.startsWith("S")) {
 							lat = -lat;
 						}
-					} catch(NumberFormatException es) {}
+					} catch (NumberFormatException es) {
+					}
 				} else if (e.startsWith("E") || e.startsWith("W")) {
 					try {
 						lon = Double.parseDouble(e.substring(1));
 						if (e.startsWith("W")) {
 							lon = -lon;
 						}
-					} catch(NumberFormatException es) {}
+					} catch (NumberFormatException es) {
+					}
 				} else if (e.contains(".")) {
 					try {
 						double n = Double.parseDouble(e);
@@ -510,7 +270,8 @@ public class GeoIntentActivity extends OsmandListActivity {
 						} else {
 							lon = n;
 						}
-					} catch(NumberFormatException es) {}
+					} catch (NumberFormatException es) {
+					}
 				}
 
 			}
@@ -620,30 +381,26 @@ public class GeoIntentActivity extends OsmandListActivity {
 			return countriesToSearch;
 		}
 
-
 	}
 
+	@SuppressWarnings("unused")
 	private static class GeoPointSearch implements MyService {
 		private final MapObject point;
 		private final int zoom;
 
-        public GeoPointSearch(double lat , double lon)
+		public GeoPointSearch(double lat, double lon) {
-        {
 			this(lat, lon, ExecutionResult.NO_ZOOM);
 		}
 
-        public GeoPointSearch(double lat , double lon, int zoom)
+		public GeoPointSearch(double lat, double lon, int zoom) {
-        {
 			this(lat, lon, "Lat: " + lat + ",Lon: " + lon, zoom);
 		}
 
-        public GeoPointSearch(double lat , double lon, String name )
+		public GeoPointSearch(double lat, double lon, String name) {
-        {
 			this(lat, lon, name, ExecutionResult.NO_ZOOM);
 		}
 
-        public GeoPointSearch(double lat , double lon, String name, int zoom )
+		public GeoPointSearch(double lat, double lon, String name, int zoom) {
-        {
 			final Amenity amenity = new Amenity();
 			amenity.setLocation(lat, lon);
 			amenity.setName(name);
@@ -665,57 +422,45 @@ public class GeoIntentActivity extends OsmandListActivity {
 
 	}
 
-    private static class ExecutionResult
+	private static class ExecutionResult {
-    {
 		public static final int NO_ZOOM = -1;
 		public static final ExecutionResult EMPTY = new ExecutionResult(new ArrayList<MapObject>(), NO_ZOOM);
 
 		private final Collection<? extends MapObject> mapObjects;
 		private final int zoom;
 
-        public ExecutionResult(final Collection<? extends MapObject> mapObjects)
+		public ExecutionResult(final Collection<? extends MapObject> mapObjects) {
-        {
 			this(mapObjects, NO_ZOOM);
 		}
 
-        public ExecutionResult(final Collection<? extends MapObject> mapObjects, final int zoom)
+		public ExecutionResult(final Collection<? extends MapObject> mapObjects, final int zoom) {
-        {
 			this.mapObjects = mapObjects;
 			this.zoom = zoom;
 		}
 
-        public boolean isEmpty()
+		public boolean isEmpty() {
-        {
 			return mapObjects.isEmpty();
 		}
 
-        public boolean hasZoom()
+		public boolean hasZoom() {
-        {
 			return zoom != NO_ZOOM;
 		}
 
-        public Collection<? extends MapObject> getMapObjects()
+		public Collection<? extends MapObject> getMapObjects() {
-        {
 			return mapObjects;
 		}
 
-        public int getZoom()
+		public int getZoom() {
-        {
 			return zoom;
 		}
 
 		@Override
-        public String toString()
+		public String toString() {
-        {
+			return "ExecutionResult{" + "mapObjects=" + mapObjects + ", zoom=" + zoom + '}';
-            return "ExecutionResult{" +
-                    "mapObjects=" + mapObjects +
-                    ", zoom=" + zoom +
-                    '}';
 		}
 	}
 
-	private static interface MyService
+	private static interface MyService {
-    {
 		public ExecutionResult execute();
 	}
 }

SherlockBar/.classpath

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>