mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-01-29 12:01:20 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Normalize GEO: to geo:

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@873 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2009-03-06 15:25:26 +00:00
parent 415c9257d6
commit 6fe022eb10
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/src/com/google/zxing/client/result/GeoResultParser.java
View file

@ -38,12 +38,7 @@ final class GeoResultParser extends ResultParser {
} }
// Drop geo, query portion // Drop geo, query portion
int queryStart = rawText.indexOf('?', 4); int queryStart = rawText.indexOf('?', 4);
String geoURIWithoutQuery; String geoURIWithoutQuery = queryStart < 0 ? rawText.substring(4) : rawText.substring(4, queryStart);
if (queryStart < 0) {
geoURIWithoutQuery = rawText.substring(4);
} else {
geoURIWithoutQuery = rawText.substring(4, queryStart);
}
int latitudeEnd = geoURIWithoutQuery.indexOf(','); int latitudeEnd = geoURIWithoutQuery.indexOf(',');
if (latitudeEnd < 0) { if (latitudeEnd < 0) {
return null; return null;
@ -62,7 +57,8 @@ final class GeoResultParser extends ResultParser {
} catch (NumberFormatException nfe) { } catch (NumberFormatException nfe) {
return null; return null;
} }
return new GeoParsedResult(rawText, latitude, longitude, altitude); return new GeoParsedResult(rawText.startsWith("GEO:") ? "geo:" + rawText.substring(4) : rawText,
latitude, longitude, altitude);
} }
} }