Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2014-08-31 23:10:27 +02:00
commit 2c4e11a9de
17 changed files with 570 additions and 469 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

356
OsmAnd-java/src/net/osmand/util/GeoPointParserUtil.java Normal file
View file

@ -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;
}
}
}

4
OsmAnd/.classpath
View file

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

2
OsmAnd/res/values-be/strings.xml
View file

@ -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> <resources><string name="auto_zoom_none">Без аўтаматычнага масштабіраваньня</string>
<string name="auto_zoom_close">Зачыніць</string> <string name="auto_zoom_close">Зачыніць</string>
<string name="auto_zoom_far">Для сярэдняга масштаба</string> <string name="auto_zoom_far">Для сярэдняга масштаба</string>

2
OsmAnd/res/values-ca/strings.xml
View file

@ -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> <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_fluorescent">Rutes amb fluorescència</string>
<string name="map_widget_show_ruler">Mostra el regle</string> <string name="map_widget_show_ruler">Mostra el regle</string>

2
OsmAnd/res/values-cs/strings.xml
View file

@ -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> <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 : <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í \n\t- Native rendering pro všechna zařízení

2
OsmAnd/res/values-es/strings.xml
View file

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

2
OsmAnd/res/values-fr/strings.xml
View file

@ -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> <resources><string name="offline_edition">Modifications hors-ligne</string>
<string name="offline_edition_descr">Toujours utiliser l\'édition 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 : <string name="tip_recent_changes_0_7_1_t">"Changements en 0.7.1 :

2
OsmAnd/res/values-ja/strings.xml
View file

@ -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> <resources><string name="installing_new_resources">新しいデータを展開中…</string>
<string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが <string name="internet_connection_required_for_online_route">オンライン経路案内を使用しようとしていますが
インターネット接続されていません。</string> インターネット接続されていません。</string>

2
OsmAnd/res/values-ko/strings.xml
View file

@ -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> <resources><string name="vector_maps_may_display_faster_on_some_devices">벡터 맵이 더욱 빠르게 표시됩니다. 하지만, 어떤 기기에서는 잘 작동하지 않을 수 있습니다.</string>
<string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string> <string name="play_commands_of_currently_selected_voice">현재 선택된 음성 명령을 재생합니다</string>

2
OsmAnd/res/values-pl/strings.xml
View file

@ -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> <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> <string name="use_transparent_map_theme">Przezroczysty styl</string>

2
OsmAnd/res/values-sc/strings.xml
View file

@ -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> <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="voice_pref_title">Boghe</string>
<string name="misc_pref_title">Mistura</string> <string name="misc_pref_title">Mistura</string>

2
OsmAnd/res/values-sv/strings.xml
View file

@ -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> <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="ChooseCountry">Välj land</string>
<string name="choose_city">Välj stad</string> <string name="choose_city">Välj stad</string>

2
OsmAnd/res/values-uk/strings.xml
View file

@ -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: <resources><string name="tip_recent_changes_0_8_1_t">Зміни в 0.8.1:
\n\t* Більш точні маршрути (трохи повільніше) \n\t* Більш точні маршрути (трохи повільніше)
\n\t* Розумний і швидкий перерахунок маршруту \n\t* Розумний і швидкий перерахунок маршруту

2
OsmAnd/res/values-zh-rCN/strings.xml
View file

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

2
OsmAnd/res/values-zh-rTW/strings.xml
View file

@ -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> <resources><string name="rendering_attr_roadColors_description">選擇道路的色彩調配：</string>
<string name="rendering_attr_roadColors_name">道路的色彩調配</string> <string name="rendering_attr_roadColors_name">道路的色彩調配</string>
<string name="map_widget_show_destination_arrow">顯示目的地方向</string> <string name="map_widget_show_destination_arrow">顯示目的地方向</string>

649
OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java
View file

@ -1,6 +1,5 @@
package net.osmand.plus.activities.search; package net.osmand.plus.activities.search;
import android.os.AsyncTask;
import gnu.trove.map.hash.TLongObjectHashMap; import gnu.trove.map.hash.TLongObjectHashMap;
import java.util.ArrayList; import java.util.ArrayList;
@ -8,8 +7,6 @@ import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import net.osmand.ResultMatcher; import net.osmand.ResultMatcher;
import net.osmand.access.AccessibleToast; 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.activities.OsmandListActivity;
import net.osmand.plus.resources.RegionAddressRepository; import net.osmand.plus.resources.RegionAddressRepository;
import net.osmand.plus.resources.ResourceManager; import net.osmand.plus.resources.ResourceManager;
import net.osmand.util.GeoPointParserUtil;
import net.osmand.util.MapUtils; import net.osmand.util.MapUtils;
import android.app.Dialog; import android.app.Dialog;
import android.app.ProgressDialog; import android.app.ProgressDialog;
@ -34,6 +32,7 @@ import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener; import android.content.DialogInterface.OnCancelListener;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -45,125 +44,102 @@ import android.widget.Toast;
public class GeoIntentActivity extends OsmandListActivity { public class GeoIntentActivity extends OsmandListActivity {
private ProgressDialog progressDlg; private ProgressDialog progressDlg;
private LatLon location; private LatLon location;
private ProgressDialog startProgressDialog; private ProgressDialog startProgressDialog;
@Override @Override
protected void onCreate(Bundle savedInstanceState) protected void onCreate(Bundle savedInstanceState) {
{ super.onCreate(savedInstanceState);
super.onCreate(savedInstanceState); setContentView(R.layout.search_address_offline);
setContentView(R.layout.search_address_offline); getSupportActionBar().setTitle(R.string.search_osm_offline);
getSupportActionBar().setTitle(R.string.search_osm_offline); startProgressDialog = new ProgressDialog(this);
startProgressDialog = new ProgressDialog(this); getMyApplication().checkApplicationIsBeingInitialized(this, startProgressDialog);
getMyApplication().checkApplicationIsBeingInitialized(this, startProgressDialog); location = getMyApplication().getSettings().getLastKnownMapLocation();
location = getMyApplication().getSettings().getLastKnownMapLocation();
final Intent intent = getIntent(); 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); final GeoIntentTask task = new GeoIntentTask(progress, intent);
progress.setOnCancelListener(new OnCancelListener() progress.setOnCancelListener(new OnCancelListener() {
{ @Override
@Override public void onCancel(DialogInterface dialog) {
public void onCancel(DialogInterface dialog) task.cancel(true);
{ }
task.cancel(true); });
} progress.setCancelable(true);
});
progress.setCancelable(true);
task.execute(); task.execute();
setIntent(null); setIntent(null);
} }
} }
private class GeoIntentTask extends AsyncTask<Void,Void, ExecutionResult> private class GeoIntentTask extends AsyncTask<Void, Void, ExecutionResult> {
{ private final ProgressDialog progress;
private final ProgressDialog progress; private final Intent intent;
private final Intent intent;
private GeoIntentTask(final ProgressDialog progress, final Intent intent) private GeoIntentTask(final ProgressDialog progress, final Intent intent) {
{ this.progress = progress;
this.progress = progress; this.intent = intent;
this.intent = intent; }
}
@Override @Override
protected void onPreExecute() protected void onPreExecute() {
{ }
}
@Override @Override
protected ExecutionResult doInBackground(Void... nothing) protected ExecutionResult doInBackground(Void... nothing) {
{ try {
try while (getMyApplication().isApplicationInitializing()) {
{ Thread.sleep(200);
while (getMyApplication().isApplicationInitializing()) }
{ return extract(intent.getScheme(), intent.getData()).execute();
Thread.sleep(200); } catch (Exception e) {
} return null;
return extract(intent.getScheme(), intent.getData()).execute(); }
} }
catch (Exception e)
{
return null;
}
}
@Override @Override
protected void onPostExecute(ExecutionResult result) protected void onPostExecute(ExecutionResult result) {
{ progress.dismiss();
progress.dismiss(); if (result != null) {
if (result != null) if (result.isEmpty()) {
{ AccessibleToast.makeText(GeoIntentActivity.this, getString(R.string.search_nothing_found),
if (result.isEmpty()) Toast.LENGTH_LONG).show();
{ } else {
AccessibleToast.makeText(GeoIntentActivity.this, getString(R.string.search_nothing_found), Toast.LENGTH_LONG).show(); if (result.hasZoom()) {
} getMyApplication().getSettings().setLastKnownMapZoom(result.getZoom());
else }
{
if (result.hasZoom())
{
getMyApplication().getSettings().setLastKnownMapZoom(result.getZoom());
}
final List<MapObject> places = new ArrayList<MapObject>(result.getMapObjects()); final List<MapObject> places = new ArrayList<MapObject>(result.getMapObjects());
setListAdapter(new MapObjectAdapter(places)); 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, } else {
getListAdapter().getItemId(0) AccessibleToast.makeText(GeoIntentActivity.this,
); getString(R.string.search_offline_geo_error, intent.getData()), Toast.LENGTH_LONG).show();
} }
} }
}
else
{
AccessibleToast.makeText(GeoIntentActivity.this, getString(R.string.search_offline_geo_error, intent.getData()), Toast.LENGTH_LONG).show();
}
}
} }
@Override @Override
protected Dialog onCreateDialog(int id) { protected Dialog onCreateDialog(int id) {
if(id == OsmandApplication.PROGRESS_DIALOG){ if (id == OsmandApplication.PROGRESS_DIALOG) {
return startProgressDialog; return startProgressDialog;
} }
return super.onCreateDialog(id); return super.onCreateDialog(id);
} }
private class MapObjectAdapter extends ArrayAdapter<MapObject> { private class MapObjectAdapter extends ArrayAdapter<MapObject> {
public MapObjectAdapter(List<MapObject> places) { 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 @Override
@ -171,19 +147,15 @@ public class GeoIntentActivity extends OsmandListActivity {
View row = convertView; View row = convertView;
if (row == null) { if (row == null) {
LayoutInflater inflater = getLayoutInflater(); 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); MapObject model = getItem(position);
TextView label = (TextView) row.findViewById(R.id.label); 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) { 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())); .getLongitude()));
distanceLabel.setText(OsmAndFormatter.getFormattedDistance(dist,(OsmandApplication) getApplication())); distanceLabel.setText(OsmAndFormatter.getFormattedDistance(dist, (OsmandApplication) getApplication()));
} else { } else {
distanceLabel.setText(""); //$NON-NLS-1$ distanceLabel.setText(""); //$NON-NLS-1$
} }
@ -191,12 +163,12 @@ public class GeoIntentActivity extends OsmandListActivity {
return row; return row;
} }
} }
private String getString(MapObject o){ private String getString(MapObject o) {
if(o instanceof Amenity) { if (o instanceof Amenity) {
return OsmAndFormatter.getPoiSimpleFormat((Amenity) o, getMyApplication(), false); return OsmAndFormatter.getPoiSimpleFormat((Amenity) o, getMyApplication(), false);
} }
if(o instanceof Street) { if (o instanceof Street) {
return getString(R.string.address) + " " + ((Street) o).getCity().getName() + " " + o.getName(); return getString(R.string.address) + " " + ((Street) o).getCity().getName() + " " + o.getName();
} }
return getString(R.string.address) + " : " + o.toString(); return getString(R.string.address) + " : " + o.toString();
@ -207,7 +179,7 @@ public class GeoIntentActivity extends OsmandListActivity {
super.onListItemClick(l, v, position, id); super.onListItemClick(l, v, position, id);
MapObject item = ((MapObjectAdapter) getListAdapter()).getItem(position); MapObject item = ((MapObjectAdapter) getListAdapter()).getItem(position);
OsmandSettings settings = getMyApplication().getSettings(); OsmandSettings settings = getMyApplication().getSettings();
settings.setMapLocationToShow(item.getLocation().getLatitude(), item.getLocation().getLongitude(), settings.setMapLocationToShow(item.getLocation().getLatitude(), item.getLocation().getLongitude(),
settings.getLastKnownMapZoom(), getString(item)); //$NON-NLS-1$ settings.getLastKnownMapZoom(), getString(item)); //$NON-NLS-1$
MapActivity.launchMapActivityMoveToTop(this); MapActivity.launchMapActivityMoveToTop(this);
} }
@ -226,301 +198,90 @@ public class GeoIntentActivity extends OsmandListActivity {
} }
/** /**
* Extracts information from geo and map intents: * Extracts information from geo and map intents:
* *
* geo:47.6,-122.3<br/> * geo:47.6,-122.3<br/>
* geo:47.6,-122.3?z=11<br/> * geo:47.6,-122.3?z=11<br/>
* geo:0,0?q=34.99,-106.61(Treasure)<br/> * geo:0,0?q=34.99,-106.61(Treasure)<br/>
* geo:0,0?q=1600+Amphitheatre+Parkway%2C+CA<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 * @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) {
return new GeoPointSearch(p.getLat(), p.getLon(), p.getName(), p.getZoom());
}
return new GeoPointSearch(p.getLat(), p.getLon(), p.getZoom());
} else {
return new GeoAddressSearch(p.getQuery());
}
}
final String schemeSpecific = data.getSchemeSpecificPart(); private final class GeoAddressSearch implements MyService {
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 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);
}
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; private List<String> elements;
public GeoAddressSearch(String query) { 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(" ", ","); .replaceAll(" ", ",");
System.out.println(query); System.out.println(query);
//String is split on each comma // String is split on each comma
String[] s = query.split(","); String[] s = query.substring(query.indexOf("q=") + 2).split(",");
elements = new ArrayList<String>(); elements = new ArrayList<String>();
for (int i = 0; i<s.length; i++) { for (int i = 0; i < s.length; i++) {
if (s[i].isEmpty()) {
continue;
}
elements.add(s[i].replace('+', ' ').trim()); elements.add(s[i].replace('+', ' ').trim());
} }
} }
public MapObject checkGeoPoint() { public MapObject checkGeoPoint() {
double lat = Double.NaN; double lat = Double.NaN;
double lon = Double.NaN; double lon = Double.NaN;
for(String e : elements) { for (String e : elements) {
if(e.startsWith("S") || e.startsWith("N")) { if (e.startsWith("S") || e.startsWith("N")) {
try { try {
lat = Double.parseDouble(e.substring(1)); lat = Double.parseDouble(e.substring(1));
if(e.startsWith("S")) { if (e.startsWith("S")) {
lat = -lat; lat = -lat;
} }
} catch(NumberFormatException es) {} } catch (NumberFormatException es) {
} else if(e.startsWith("E") || e.startsWith("W")) { }
} else if (e.startsWith("E") || e.startsWith("W")) {
try { try {
lon = Double.parseDouble(e.substring(1)); lon = Double.parseDouble(e.substring(1));
if(e.startsWith("W")) { if (e.startsWith("W")) {
lon = -lon; lon = -lon;
} }
} catch(NumberFormatException es) {} } catch (NumberFormatException es) {
} else if(e.contains(".")) { }
} else if (e.contains(".")) {
try { try {
double n = Double.parseDouble(e); double n = Double.parseDouble(e);
if(Double.isNaN(lat)) { if (Double.isNaN(lat)) {
lat = n; lat = n;
} else { } else {
lon =n; lon = n;
} }
} catch(NumberFormatException es) {} } catch (NumberFormatException es) {
}
} }
} }
if(Double.isNaN(lat) || Double.isNaN(lon)) { if (Double.isNaN(lat) || Double.isNaN(lon)) {
return null; return null;
} }
Amenity point = new Amenity(); Amenity point = new Amenity();
((Amenity)point).setType(AmenityType.USER_DEFINED); ((Amenity) point).setType(AmenityType.USER_DEFINED);
((Amenity)point).setSubType(""); ((Amenity) point).setSubType("");
point.setLocation(lat, lon); point.setLocation(lat, lon);
point.setName("Lat: " + lat + ",Lon:" + lon); point.setName("Lat: " + lat + ",Lon:" + lon);
return point; return point;
@ -533,7 +294,7 @@ public class GeoIntentActivity extends OsmandListActivity {
} }
List<String> q = new ArrayList<String>(elements); List<String> q = new ArrayList<String>(elements);
MapObject geo = checkGeoPoint(); MapObject geo = checkGeoPoint();
if(geo != null) { if (geo != null) {
return new ExecutionResult(Collections.singleton(geo)); return new ExecutionResult(Collections.singleton(geo));
} }
@ -565,29 +326,29 @@ public class GeoIntentActivity extends OsmandListActivity {
} }
} }
} }
if(cityIds.isEmpty()) { if (cityIds.isEmpty()) {
return new ExecutionResult(allStreets); return new ExecutionResult(allStreets);
} }
final List<MapObject> connectedStreets = new ArrayList<MapObject>(); final List<MapObject> connectedStreets = new ArrayList<MapObject>();
Iterator<Street> p = allStreets.iterator(); Iterator<Street> p = allStreets.iterator();
while(p.hasNext()) { while (p.hasNext()) {
Street s = p.next(); Street s = p.next();
if(cityIds.contains(s.getCity().getId())) { if (cityIds.contains(s.getCity().getId())) {
connectedStreets.add(s); connectedStreets.add(s);
} else { } else {
boolean tooFar = true; boolean tooFar = true;
for(City c : cityIds.valueCollection()) { for (City c : cityIds.valueCollection()) {
if(MapUtils.getDistance(c.getLocation(), s.getLocation()) < 50000) { if (MapUtils.getDistance(c.getLocation(), s.getLocation()) < 50000) {
tooFar = false; tooFar = false;
break; break;
} }
} }
if(tooFar) { if (tooFar) {
p.remove(); p.remove();
} }
} }
} }
if(connectedStreets.isEmpty()) { if (connectedStreets.isEmpty()) {
List<MapObject> all = new ArrayList<MapObject>(); List<MapObject> all = new ArrayList<MapObject>();
all.addAll(cityIds.valueCollection()); all.addAll(cityIds.valueCollection());
all.addAll(allStreets); all.addAll(allStreets);
@ -604,7 +365,7 @@ public class GeoIntentActivity extends OsmandListActivity {
List<RegionAddressRepository> foundCountries = new ArrayList<RegionAddressRepository>(); List<RegionAddressRepository> foundCountries = new ArrayList<RegionAddressRepository>();
RegionAddressRepository country; RegionAddressRepository country;
Iterator<String> it = q.iterator(); Iterator<String> it = q.iterator();
while(it.hasNext()) { while (it.hasNext()) {
String maybeCountry = it.next(); String maybeCountry = it.next();
country = resourceManager.getRegionRepository(maybeCountry); country = resourceManager.getRegionRepository(maybeCountry);
if (country != null) { if (country != null) {
@ -620,41 +381,37 @@ public class GeoIntentActivity extends OsmandListActivity {
return countriesToSearch; return countriesToSearch;
} }
} }
private static class GeoPointSearch implements MyService { @SuppressWarnings("unused")
private final MapObject point; private static class GeoPointSearch implements MyService {
private final int zoom; 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);
this(lat, lon, ExecutionResult.NO_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 )
{
this(lat, lon, name,ExecutionResult.NO_ZOOM);
}
public GeoPointSearch(double lat , double lon, String name, int zoom )
{
final Amenity amenity = new Amenity();
amenity.setLocation(lat, lon);
amenity.setName(name);
amenity.setType(AmenityType.USER_DEFINED);
amenity.setSubType("");
this.point = amenity;
this.zoom = zoom;
} }
@Override public GeoPointSearch(double lat, double lon, int zoom) {
this(lat, lon, "Lat: " + lat + ",Lon: " + lon, zoom);
}
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) {
final Amenity amenity = new Amenity();
amenity.setLocation(lat, lon);
amenity.setName(name);
amenity.setType(AmenityType.USER_DEFINED);
amenity.setSubType("");
this.point = amenity;
this.zoom = zoom;
}
@Override
public ExecutionResult execute() { public ExecutionResult execute() {
if (point != null) { if (point != null) {
return new ExecutionResult(Collections.singletonList(point), zoom); return new ExecutionResult(Collections.singletonList(point), zoom);
@ -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 int NO_ZOOM = -1; public static final ExecutionResult EMPTY = new ExecutionResult(new ArrayList<MapObject>(), NO_ZOOM);
public static final ExecutionResult EMPTY = new ExecutionResult(new ArrayList<MapObject>(), NO_ZOOM);
private final Collection<? extends MapObject> mapObjects; private final Collection<? extends MapObject> mapObjects;
private final int zoom; private final int zoom;
public ExecutionResult(final Collection<? extends MapObject> mapObjects) public ExecutionResult(final Collection<? extends MapObject> mapObjects) {
{ this(mapObjects, NO_ZOOM);
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.mapObjects = mapObjects; this.zoom = zoom;
this.zoom = zoom; }
}
public boolean isEmpty() public boolean isEmpty() {
{ return mapObjects.isEmpty();
return mapObjects.isEmpty(); }
}
public boolean hasZoom() public boolean hasZoom() {
{ return zoom != NO_ZOOM;
return zoom != NO_ZOOM; }
}
public Collection<? extends MapObject> getMapObjects() public Collection<? extends MapObject> getMapObjects() {
{ return mapObjects;
return mapObjects; }
}
public int getZoom() public int getZoom() {
{ return zoom;
return zoom; }
}
@Override @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(); public ExecutionResult execute();
} }
} }

4
SherlockBar/.classpath
View file

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