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

Support OLC in SearchCore

Browse source
This commit is contained in:
theirix 2017-01-08 17:07:32 +03:00
parent 7db115f676
commit 30999d2351
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
OsmAnd-java/src/net/osmand/search/core/SearchCoreFactory.java
View file

@ -1,5 +1,6 @@
package net.osmand.search.core; package net.osmand.search.core;
import com.google.openlocationcode.OpenLocationCode;
import com.jwetherell.openmap.common.LatLonPoint; import com.jwetherell.openmap.common.LatLonPoint;
import com.jwetherell.openmap.common.UTMPoint; import com.jwetherell.openmap.common.UTMPoint;
@ -1031,6 +1032,15 @@ public class SearchCoreFactory {
LatLon parseLocation(String s) { LatLon parseLocation(String s) {
s = s.trim(); s = s.trim();
// detect OLC first
// avoid throwing exceptions by carefully checking exceptions
if (s.length() > 0 && OpenLocationCode.isValidCode(s)) {
OpenLocationCode olc = new OpenLocationCode(s);
if (olc.isFull()) {
OpenLocationCode.CodeArea codeArea = olc.decode();
return new LatLon(codeArea.getCenterLatitude(), codeArea.getCenterLongitude());
}
}
if(s.length() == 0 || !(s.charAt(0) == '-' || Character.isDigit(s.charAt(0)) if(s.length() == 0 || !(s.charAt(0) == '-' || Character.isDigit(s.charAt(0))
|| s.charAt(0) == 'S' || s.charAt(0) == 's' || s.charAt(0) == 'S' || s.charAt(0) == 's'
|| s.charAt(0) == 'N' || s.charAt(0) == 'n' || s.charAt(0) == 'N' || s.charAt(0) == 'n'