mirrors/public-transport-enabler
1
0
Fork 0
mirror of https://gitlab.com/oeffi/public-transport-enabler.git synced 2025-07-18 16:29:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make 0/0 coordinates valid even if using non-WGS84 ellipsoid

Browse source
This commit is contained in:
Andreas Schildbach 2013-06-14 17:37:19 +02:00
parent 871b08f13a
commit aaa2a6c810
2 changed files with 68 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
enabler/src/de/schildbach/pte/util/XmlPullUtil.java
View file

@ -102,6 +102,21 @@ public final class XmlPullUtil
return pp.getAttributeValue(null, attrName).trim();
}
public static String optAttr(final XmlPullParser pp, final String attrName, final String defaultValue)
{
final String attr = pp.getAttributeValue(null, attrName);
if (attr != null)
{
final String trimmedAttr = attr.trim();
if (trimmedAttr.length() > 0)
return trimmedAttr;
}
return defaultValue;
}
public static int intAttr(final XmlPullParser pp, final String attrName)
{
return Integer.parseInt(pp.getAttributeValue(null, attrName).trim());
@ -109,9 +124,9 @@ public final class XmlPullUtil
public static int optIntAttr(final XmlPullParser pp, final String attrName, final int defaultValue)
{
final String attr = pp.getAttributeValue(null, attrName);
final String attr = optAttr(pp, attrName, null);
if (attr != null)
return Integer.parseInt(attr.trim());
return Integer.parseInt(attr);
else
return defaultValue;
}
@ -121,6 +136,15 @@ public final class XmlPullUtil
return Float.parseFloat(pp.getAttributeValue(null, attrName).trim());
}
public static float optFloatAttr(final XmlPullParser pp, final String attrName, final float defaultValue)
{
final String attr = optAttr(pp, attrName, null);
if (attr != null)
return Float.parseFloat(attr);
else
return defaultValue;
}
public static void requireAttr(final XmlPullParser pp, final String attrName, final String requiredValue)
{
if (!requiredValue.equals(attr(pp, attrName)))