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

Fix #9532

Browse source
This commit is contained in:
sergdevosm 2020-08-16 18:02:07 +03:00
parent dedbbb4c26
commit 4a24787da3
5 changed files with 35 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd-java/src/main/java/net/osmand/search/core/SearchResult.java
View file

@ -32,7 +32,7 @@ public class SearchResult {
public double priorityDistance; public double priorityDistance;
public LatLon location; public LatLon location;
public int preferredZoom = 15; public double preferredZoom = 15;
public String localeName; public String localeName;
public String alternateName; public String alternateName;

49
OsmAnd-java/src/main/java/net/osmand/util/GeoPointParserUtil.java
View file

@ -13,7 +13,7 @@ import java.util.regex.Pattern;
public class GeoPointParserUtil { public class GeoPointParserUtil {
private static String getQueryParameter(final String param, URI uri) { private static String getQueryParameter(final String param, URI uri) {
final String query = uri.getQuery(); final String query = uri.getQuery();
String value = null; String value = null;
@ -82,7 +82,7 @@ public class GeoPointParserUtil {
// amap.com uses | in their URLs, which is an illegal character for a URL // amap.com uses | in their URLs, which is an illegal character for a URL
uri = URI.create(uriString.replaceAll("\\s+", "+") uri = URI.create(uriString.replaceAll("\\s+", "+")
.replaceAll("%20", "+") .replaceAll("%20", "+")
.replaceAll("%2C", ",") .replaceAll("%2F", ",")
.replaceAll("\\|", ";") .replaceAll("\\|", ";")
.replaceAll("\\(\\(\\S+\\)\\)", "")); .replaceAll("\\(\\(\\S+\\)\\)", ""));
} catch (IllegalArgumentException e) { } catch (IllegalArgumentException e) {
@ -103,7 +103,7 @@ public class GeoPointParserUtil {
if(uri.getSchemeSpecificPart() == null) { if(uri.getSchemeSpecificPart() == null) {
return null; return null;
} else if(!uri.getSchemeSpecificPart().contains("=")) { } else if(!uri.getSchemeSpecificPart().contains("=")) {
params = getQueryParameters("q="+uri.getSchemeSpecificPart()); params = getQueryParameters("q="+uri.getSchemeSpecificPart());
} else { } else {
params = getQueryParameters(uri.getSchemeSpecificPart()); params = getQueryParameters(uri.getSchemeSpecificPart());
} }
@ -142,7 +142,7 @@ public class GeoPointParserUtil {
} else { // data in the query and/or feature strings } else { // data in the query and/or feature strings
double lat = 0; double lat = 0;
double lon = 0; double lon = 0;
int zoom = GeoParsedPoint.NO_ZOOM; double zoom = GeoParsedPoint.NO_ZOOM;
Map<String, String> queryMap = getQueryParameters(uri); Map<String, String> queryMap = getQueryParameters(uri);
if (fragment != null) { if (fragment != null) {
if (fragment.startsWith("map=")) { if (fragment.startsWith("map=")) {
@ -181,13 +181,13 @@ public class GeoPointParserUtil {
} }
} else if (host.startsWith("map.baidu.")) { // .com and .cn both work } else if (host.startsWith("map.baidu.")) { // .com and .cn both work
/* Baidu Map uses a custom format for lat/lon., it is basically standard lat/lon /* Baidu Map uses a custom format for lat/lon., it is basically standard lat/lon
* multiplied by 100,000, then rounded to an integer */ * multiplied by 100,000, then rounded to an integer */
String zm = params.get("l"); String zm = params.get("l");
String[] vls = silentSplit(params.get("c"), ","); String[] vls = silentSplit(params.get("c"), ",");
if (vls != null && vls.length >= 2) { if (vls != null && vls.length >= 2) {
double lat = parseSilentInt(vls[0]) / 100000.; double lat = parseSilentInt(vls[0]) / 100000.;
double lon = parseSilentInt(vls[1]) / 100000.; double lon = parseSilentInt(vls[1]) / 100000.;
int zoom = parseZoom(zm); double zoom = parseZoom(zm);
return new GeoParsedPoint(lat, lon, zoom); return new GeoParsedPoint(lat, lon, zoom);
} }
} else if (simpleDomains.contains(host)) { } else if (simpleDomains.contains(host)) {
@ -198,7 +198,7 @@ public class GeoPointParserUtil {
if (params.containsKey("lat") && params.containsKey("lon")) { if (params.containsKey("lat") && params.containsKey("lon")) {
final double lat = parseSilentDouble(params.get("lat")); final double lat = parseSilentDouble(params.get("lat"));
final double lon = parseSilentDouble(params.get("lon")); final double lon = parseSilentDouble(params.get("lon"));
int zoom = GeoParsedPoint.NO_ZOOM; double zoom = GeoParsedPoint.NO_ZOOM;
if (params.containsKey("z")) { if (params.containsKey("z")) {
zoom = parseZoom(params.get("z")); zoom = parseZoom(params.get("z"));
} else if (params.containsKey("zoom")) { } else if (params.containsKey("zoom")) {
@ -219,7 +219,7 @@ public class GeoPointParserUtil {
String latString = null; String latString = null;
String lonString = null; String lonString = null;
String z = String.valueOf(GeoParsedPoint.NO_ZOOM); String z = String.valueOf(GeoParsedPoint.NO_ZOOM);
if (params.containsKey("q")) { if (params.containsKey("q")) {
System.out.println("q=" + params.get("q")); System.out.println("q=" + params.get("q"));
Matcher matcher = commaSeparatedPairPattern.matcher(params.get("q")); Matcher matcher = commaSeparatedPairPattern.matcher(params.get("q"));
@ -279,7 +279,7 @@ public class GeoPointParserUtil {
Pattern p; Pattern p;
Matcher matcher; Matcher matcher;
final String[] patterns = { final String[] patterns = {
/* though this looks like Query String, it is also used as part of the Fragment */ /* though this looks like Query String, it is also used as part of the Fragment */
".*q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?).*&radius=(\\d+).*", ".*q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?).*&radius=(\\d+).*",
".*q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?).*", ".*q=([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?).*",
".*p=(?:[A-Z0-9]+),([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?).*",}; ".*p=(?:[A-Z0-9]+),([+-]?\\d+(?:\\.\\d+)?),([+-]?\\d+(?:\\.\\d+)?).*",};
@ -297,7 +297,7 @@ public class GeoPointParserUtil {
} }
} }
} }
} else if (host.equals("here.com") || host.endsWith(".here.com")) { // www.here.com, share.here.com, here.com } else if (host.equals("here.com") || host.endsWith(".here.com")) { // www.here.com, share.here.com, here.com
String z = String.valueOf(GeoParsedPoint.NO_ZOOM); String z = String.valueOf(GeoParsedPoint.NO_ZOOM);
String label = null; String label = null;
if (params.containsKey("msg")) { if (params.containsKey("msg")) {
@ -459,7 +459,7 @@ public class GeoPointParserUtil {
lon = Double.valueOf(positionMatcher.group(2)); lon = Double.valueOf(positionMatcher.group(2));
} }
int zoom = GeoParsedPoint.NO_ZOOM; double zoom = GeoParsedPoint.NO_ZOOM;
String searchRequest = null; String searchRequest = null;
for (String param : queryPart.split("&")) { for (String param : queryPart.split("&")) {
String paramName; String paramName;
@ -474,7 +474,8 @@ public class GeoPointParserUtil {
} }
if ("z".equals(paramName) && paramValue != null) { if ("z".equals(paramName) && paramValue != null) {
zoom = Integer.parseInt(paramValue); // zoom = Double.valueOf(paramValue).intValue();
zoom = Double.valueOf(paramValue);
} else if ("q".equals(paramName) && paramValue != null) { } else if ("q".equals(paramName) && paramValue != null) {
searchRequest = URLDecoder.decode(paramValue); searchRequest = URLDecoder.decode(paramValue);
} }
@ -540,7 +541,7 @@ public class GeoPointParserUtil {
if (vls.length >= 2) { if (vls.length >= 2) {
double lat = parseSilentDouble(vls[0], Double.NaN); double lat = parseSilentDouble(vls[0], Double.NaN);
double lon = parseSilentDouble(vls[1], Double.NaN); double lon = parseSilentDouble(vls[1], Double.NaN);
int zoom = GeoParsedPoint.NO_ZOOM; double zoom = GeoParsedPoint.NO_ZOOM;
if (vls.length >= 3 || zmPart.length() > 0) { if (vls.length >= 3 || zmPart.length() > 0) {
if (zmPart.length() == 0) { if (zmPart.length() == 0) {
zmPart = vls[2]; zmPart = vls[2];
@ -566,10 +567,10 @@ public class GeoPointParserUtil {
return vl.split(split); return vl.split(split);
} }
private static int parseZoom(String zoom) { private static double parseZoom(String zoom) {
try { try {
if (zoom != null) { if (zoom != null) {
return Integer.valueOf(zoom); return Double.valueOf(zoom);
} }
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
} }
@ -579,7 +580,7 @@ public class GeoPointParserUtil {
private static double parseSilentDouble(String zoom) { private static double parseSilentDouble(String zoom) {
return parseSilentDouble(zoom, 0); return parseSilentDouble(zoom, 0);
} }
private static double parseSilentDouble(String zoom, double vl) { private static double parseSilentDouble(String zoom, double vl) {
try { try {
if (zoom != null) { if (zoom != null) {
@ -601,11 +602,11 @@ public class GeoPointParserUtil {
} }
public static class GeoParsedPoint { public static class GeoParsedPoint {
public static final int NO_ZOOM = -1; public static final double NO_ZOOM = -1;
private double lat = 0; private double lat = 0;
private double lon = 0; private double lon = 0;
private int zoom = NO_ZOOM; private double zoom = NO_ZOOM;
private String label; private String label;
private String query; private String query;
private boolean geoPoint; private boolean geoPoint;
@ -624,12 +625,12 @@ public class GeoPointParserUtil {
this.label = label.replaceAll("\\+", " "); this.label = label.replaceAll("\\+", " ");
} }
public GeoParsedPoint(double lat, double lon, int zoom) { public GeoParsedPoint(double lat, double lon, double zoom) {
this(lat, lon); this(lat, lon);
this.zoom = zoom; this.zoom = zoom;
} }
public GeoParsedPoint(double lat, double lon, int zoom, String label) { public GeoParsedPoint(double lat, double lon, double zoom, String label) {
this(lat, lon, label); this(lat, lon, label);
this.zoom = zoom; this.zoom = zoom;
} }
@ -684,7 +685,7 @@ public class GeoPointParserUtil {
return lon; return lon;
} }
public int getZoom() { public double getZoom() {
return zoom; return zoom;
} }
@ -754,9 +755,9 @@ public class GeoPointParserUtil {
@Override @Override
public String toString() { public String toString() {
return isGeoPoint() ? return isGeoPoint() ?
String.format("GeoParsedPoint [lat=%.5f, lon=%.5f, zoom=%d, label=%s]", lat, lon, zoom, label) : String.format("GeoParsedPoint [lat=%.5f, lon=%.5f, zoom=%.5f, label=%s]", lat, lon, zoom, label) :
String.format("GeoParsedPoint [query=%s]",query); String.format("GeoParsedPoint [query=%s]",query);
} }
} }
} }

10
OsmAnd-java/src/test/java/net/osmand/util/GeoPointParserUtilTest.java
View file

@ -39,7 +39,7 @@ public class GeoPointParserUtilTest {
final double dlat = 34.99393, dlon = -106.61568; final double dlat = 34.99393, dlon = -106.61568;
final double longLat = 34.993933029174805, longLon = -106.615680694580078; final double longLat = 34.993933029174805, longLon = -106.615680694580078;
final String name = "Treasure Island"; final String name = "Treasure Island";
int z = GeoParsedPoint.NO_ZOOM; double z = GeoParsedPoint.NO_ZOOM;
String url; String url;
String noQueryParameters[] = { String noQueryParameters[] = {
@ -63,7 +63,7 @@ public class GeoPointParserUtilTest {
"geo:0,0?m", "geo:0,0?m",
"geo:0,0?m=", "geo:0,0?m=",
"geo:0,0?m=foo", "geo:0,0?m=foo",
"geo:0,0?q=%D0%9D%D0", "geo:0,0?q=%F0%9D%F0",
"http://download.osmand.net/go?lat", "http://download.osmand.net/go?lat",
"http://download.osmand.net/go?lat=", "http://download.osmand.net/go?lat=",
"http://download.osmand.net/go?lat=34.99393", "http://download.osmand.net/go?lat=34.99393",
@ -705,7 +705,7 @@ public class GeoPointParserUtilTest {
actual = GeoPointParserUtil.parse(url); actual = GeoPointParserUtil.parse(url);
assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z)); assertGeoPoint(actual, new GeoParsedPoint(dlat, dlon, z));
/* URLs straight from various services, instead of generated here */ /* URLs straight from various services, instead of generated here */
String urls[] = { String urls[] = {
"https://openstreetmap.org/go/0LQ127-?m", "https://openstreetmap.org/go/0LQ127-?m",
@ -789,7 +789,7 @@ public class GeoPointParserUtilTest {
actual.getQuery() + "' != '" + expected.getQuery()); actual.getQuery() + "' != '" + expected.getQuery());
} else { } else {
double aLat = actual.getLatitude(), eLat = expected.getLatitude(), aLon = actual.getLongitude(), eLon = expected.getLongitude(); double aLat = actual.getLatitude(), eLat = expected.getLatitude(), aLon = actual.getLongitude(), eLon = expected.getLongitude();
int aZoom = actual.getZoom(), eZoom = expected.getZoom(); double aZoom = actual.getZoom(), eZoom = expected.getZoom();
String aLabel = actual.getLabel(), eLabel = expected.getLabel(); String aLabel = actual.getLabel(), eLabel = expected.getLabel();
if (eLabel != null) { if (eLabel != null) {
if (!aLabel.equals(eLabel)) { if (!aLabel.equals(eLabel)) {
@ -816,7 +816,7 @@ public class GeoPointParserUtilTest {
throw new RuntimeException("Query param not equal"); throw new RuntimeException("Query param not equal");
} else { } else {
double aLat = actual.getLatitude(), eLat = expected.getLatitude(), aLon = actual.getLongitude(), eLon = expected.getLongitude(); double aLat = actual.getLatitude(), eLat = expected.getLatitude(), aLon = actual.getLongitude(), eLon = expected.getLongitude();
int aZoom = actual.getZoom(), eZoom = expected.getZoom(); double aZoom = actual.getZoom(), eZoom = expected.getZoom();
String aLabel = actual.getLabel(), eLabel = expected.getLabel(); String aLabel = actual.getLabel(), eLabel = expected.getLabel();
if (eLabel != null) { if (eLabel != null) {
if (!aLabel.equals(eLabel)) { if (!aLabel.equals(eLabel)) {

4
OsmAnd/src/net/osmand/plus/search/QuickSearchDialogFragment.java
View file

@ -414,7 +414,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_ADDRESS, typeName, name); PointDescription pointDescription = new PointDescription(PointDescription.POINT_TYPE_ADDRESS, typeName, name);
app.getSettings().setMapLocationToShow( app.getSettings().setMapLocationToShow(
searchResult.location.getLatitude(), searchResult.location.getLongitude(), searchResult.location.getLatitude(), searchResult.location.getLongitude(),
searchResult.preferredZoom, pointDescription, true, searchResult.object); (int) searchResult.preferredZoom, pointDescription, true, searchResult.object);
hideToolbar(); hideToolbar();
MapActivity.launchMapActivityMoveToTop(getActivity()); MapActivity.launchMapActivityMoveToTop(getActivity());
@ -444,7 +444,7 @@ public class QuickSearchDialogFragment extends DialogFragment implements OsmAndC
hide(); hide();
} else if (group.getPoints().size() == 1) { } else if (group.getPoints().size() == 1) {
FavouritePoint p = group.getPoints().get(0); FavouritePoint p = group.getPoints().get(0);
app.getSettings().setMapLocationToShow(p.getLatitude(), p.getLongitude(), word.getResult().preferredZoom); app.getSettings().setMapLocationToShow(p.getLatitude(), p.getLongitude(), (int) word.getResult().preferredZoom);
hideToolbar(); hideToolbar();
MapActivity.launchMapActivityMoveToTop(getActivity()); MapActivity.launchMapActivityMoveToTop(getActivity());
hide(); hide();

4
OsmAnd/src/net/osmand/plus/search/QuickSearchListFragment.java
View file

@ -260,7 +260,7 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
showOnMap(getMapActivity(), dialogFragment, showOnMap(getMapActivity(), dialogFragment,
searchResult.location.getLatitude(), searchResult.location.getLongitude(), searchResult.location.getLatitude(), searchResult.location.getLongitude(),
searchResult.preferredZoom, pointDescription, object); (int) searchResult.preferredZoom, pointDescription, object);
} }
} }
@ -307,7 +307,7 @@ public abstract class QuickSearchListFragment extends OsmAndListFragment {
int position = getListView().getPositionForView(selected); int position = getListView().getPositionForView(selected);
if ((position != AdapterView.INVALID_POSITION) && (position >= getListView().getHeaderViewsCount())) { if ((position != AdapterView.INVALID_POSITION) && (position >= getListView().getHeaderViewsCount())) {
dialogFragment.getNavigationInfo().updateTargetDirection( dialogFragment.getNavigationInfo().updateTargetDirection(
listAdapter.getItem(position - getListView().getHeaderViewsCount()).getSearchResult().location, listAdapter.getItem(position - getListView().getHeaderViewsCount()).getSearchResult().location,
heading.floatValue()); heading.floatValue());
} }
} catch (Exception e) { } catch (Exception e) {