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

throw if mapName cannot be parsed

Browse source
This commit is contained in:
Andreas Schildbach 2013-03-25 13:22:39 +01:00
parent a4c148709c
commit 5ac76d4410
1 changed files with 56 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

68
enabler/src/de/schildbach/pte/AbstractEfaProvider.java
View file

@ -532,12 +532,24 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
final String streetIdStr = pp.getAttributeValue(null, "streetID"); final String streetIdStr = pp.getAttributeValue(null, "streetID");
final String place = !"loc".equals(anyType) ? normalizeLocationName(pp.getAttributeValue(null, "locality")) : null; final String place = !"loc".equals(anyType) ? normalizeLocationName(pp.getAttributeValue(null, "locality")) : null;
final String name = normalizeLocationName(pp.getAttributeValue(null, "objectName")); final String name = normalizeLocationName(pp.getAttributeValue(null, "objectName"));
int lat = 0, lon = 0;
if ("WGS84".equals(pp.getAttributeValue(null, "mapName"))) final String mapName = pp.getAttributeValue(null, "mapName");
final int lat;
final int lon;
if (mapName == null || mapName.length() == 0)
{
lat = 0;
lon = 0;
}
else if ("WGS84".equals(mapName))
{ {
lat = Math.round(XmlPullUtil.floatAttr(pp, "y")); lat = Math.round(XmlPullUtil.floatAttr(pp, "y"));
lon = Math.round(XmlPullUtil.floatAttr(pp, "x")); lon = Math.round(XmlPullUtil.floatAttr(pp, "x"));
} }
else
{
throw new IllegalStateException("unknown mapName: " + mapName);
}
LocationType type; LocationType type;
int id; int id;
@ -597,12 +609,25 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
private Location processItdOdvAssignedStop(final XmlPullParser pp) throws XmlPullParserException, IOException private Location processItdOdvAssignedStop(final XmlPullParser pp) throws XmlPullParserException, IOException
{ {
final int id = Integer.parseInt(pp.getAttributeValue(null, "stopID")); final int id = Integer.parseInt(pp.getAttributeValue(null, "stopID"));
int lat = 0, lon = 0;
if ("WGS84".equals(pp.getAttributeValue(null, "mapName"))) final String mapName = pp.getAttributeValue(null, "mapName");
final int lat;
final int lon;
if (mapName == null || mapName.length() == 0)
{
lat = 0;
lon = 0;
}
else if ("WGS84".equals(mapName))
{ {
lat = Math.round(XmlPullUtil.floatAttr(pp, "y")); lat = Math.round(XmlPullUtil.floatAttr(pp, "y"));
lon = Math.round(XmlPullUtil.floatAttr(pp, "x")); lon = Math.round(XmlPullUtil.floatAttr(pp, "x"));
} }
else
{
throw new IllegalStateException("unknown mapName: " + mapName);
}
final String place = normalizeLocationName(XmlPullUtil.attr(pp, "place")); final String place = normalizeLocationName(XmlPullUtil.attr(pp, "place"));
XmlPullUtil.enter(pp, "itdOdvAssignedStop"); XmlPullUtil.enter(pp, "itdOdvAssignedStop");
@ -676,7 +701,7 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
while (XmlPullUtil.test(pp, "itdOdvAssignedStop")) while (XmlPullUtil.test(pp, "itdOdvAssignedStop"))
{ {
final String parsedMapName = pp.getAttributeValue(null, "mapName"); final String parsedMapName = pp.getAttributeValue(null, "mapName");
if (parsedMapName != null) if (parsedMapName != null && parsedMapName.length() != 0)
{ {
final int parsedLocationId = XmlPullUtil.intAttr(pp, "stopID"); final int parsedLocationId = XmlPullUtil.intAttr(pp, "stopID");
// final String parsedLongName = normalizeLocationName(XmlPullUtil.attr(pp, // final String parsedLongName = normalizeLocationName(XmlPullUtil.attr(pp,
@ -1558,10 +1583,23 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
if (assignedStationDepartures == null) if (assignedStationDepartures == null)
{ {
final String mapName = pp.getAttributeValue(null, "mapName"); final String mapName = pp.getAttributeValue(null, "mapName");
if (mapName == null || !"WGS84".equals(mapName)) final int lat;
final int lon;
if (mapName == null || mapName.length() == 0)
{
lat = 0;
lon = 0;
}
else if ("WGS84".equals(mapName))
{
lat = Math.round(XmlPullUtil.floatAttr(pp, "y"));
lon = Math.round(XmlPullUtil.floatAttr(pp, "x"));
}
else
{
throw new IllegalStateException("unknown mapName: " + mapName); throw new IllegalStateException("unknown mapName: " + mapName);
final int lon = Math.round(XmlPullUtil.floatAttr(pp, "x")); }
final int lat = Math.round(XmlPullUtil.floatAttr(pp, "y"));
// final String name = normalizeLocationName(XmlPullUtil.attr(pp, "nameWO")); // final String name = normalizeLocationName(XmlPullUtil.attr(pp, "nameWO"));
assignedStationDepartures = new StationDepartures(new Location(LocationType.STATION, assignedStopId, lat, lon), assignedStationDepartures = new StationDepartures(new Location(LocationType.STATION, assignedStopId, lat, lon),
@ -1654,16 +1692,22 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
if (name == null) if (name == null)
name = normalizeLocationName(pp.getAttributeValue(null, "name")); name = normalizeLocationName(pp.getAttributeValue(null, "name"));
final int lat, lon; final String mapName = pp.getAttributeValue(null, "mapName");
if ("WGS84".equals(pp.getAttributeValue(null, "mapName"))) final int lat;
final int lon;
if (mapName == null || mapName.length() == 0)
{
lat = 0;
lon = 0;
}
else if ("WGS84".equals(mapName))
{ {
lat = Math.round(XmlPullUtil.floatAttr(pp, "y")); lat = Math.round(XmlPullUtil.floatAttr(pp, "y"));
lon = Math.round(XmlPullUtil.floatAttr(pp, "x")); lon = Math.round(XmlPullUtil.floatAttr(pp, "x"));
} }
else else
{ {
lat = 0; throw new IllegalStateException("unknown mapName: " + mapName);
lon = 0;
} }
return new Location(LocationType.STATION, id, lat, lon, place, name); return new Location(LocationType.STATION, id, lat, lon, place, name);