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

renamed method

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@682 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com 2011-06-08 20:27:51 +00:00
parent ee172bc0a5
commit caaf389634
9 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -112,7 +112,7 @@ public abstract class AbstractHafasProvider implements NetworkProvider
return 0;
}
protected String[] splitNameAndPlace(final String name)
protected String[] splitPlaceAndName(final String name)
{
return new String[] { null, name };
}
@ -135,8 +135,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
final int x = Integer.parseInt(pp.getAttributeValue(null, "x"));
final int y = Integer.parseInt(pp.getAttributeValue(null, "y"));
final String[] nameAndPlace = splitNameAndPlace(name);
return new Location(LocationType.STATION, id, y, x, nameAndPlace[0], nameAndPlace[1]);
final String[] placeAndName = splitPlaceAndName(name);
return new Location(LocationType.STATION, id, y, x, placeAndName[0], placeAndName[1]);
}
throw new IllegalStateException("cannot handle: " + type);
}
@ -286,8 +286,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
if (type == 1) // station
{
final String[] nameAndPlace = splitNameAndPlace(value);
results.add(new Location(LocationType.STATION, localId, lat, lon, nameAndPlace[0], nameAndPlace[1]));
final String[] placeAndName = splitPlaceAndName(value);
results.add(new Location(LocationType.STATION, localId, lat, lon, placeAndName[0], placeAndName[1]));
}
else if (type == 2) // address
{
@ -391,8 +391,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
final int lon = Integer.parseInt(iMatcherLonLat.group(1));
final int lat = Integer.parseInt(iMatcherLonLat.group(2));
final String[] nameAndPlace = splitNameAndPlace(name);
results.add(new Location(type, id, lat, lon, nameAndPlace[0], nameAndPlace[1]));
final String[] placeAndName = splitPlaceAndName(name);
results.add(new Location(type, id, lat, lon, placeAndName[0], placeAndName[1]));
XmlPullUtil.next(pp);
}
@ -1114,8 +1114,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
parsedLat = 0;
}
final String[] nameAndPlace = splitNameAndPlace(parsedName);
stations.add(new Location(LocationType.STATION, parsedId, parsedLat, parsedLon, nameAndPlace[0], nameAndPlace[1]));
final String[] placeAndName = splitPlaceAndName(parsedName);
stations.add(new Location(LocationType.STATION, parsedId, parsedLat, parsedLon, placeAndName[0], placeAndName[1]));
}
else
{
@ -1148,8 +1148,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
if (stopWeight != 0)
{
final String[] nameAndPlace = splitNameAndPlace(name);
stations.add(new Location(LocationType.STATION, id, lat, lon, nameAndPlace[0], nameAndPlace[1]));
final String[] placeAndName = splitPlaceAndName(name);
stations.add(new Location(LocationType.STATION, id, lat, lon, placeAndName[0], placeAndName[1]));
}
}
}
@ -1201,8 +1201,8 @@ public abstract class AbstractHafasProvider implements NetworkProvider
parsedLat = Integer.parseInt(mFineCoords.group(2));
}
final String[] nameAndPlace = splitNameAndPlace(parsedName);
stations.add(new Location(LocationType.STATION, parsedId, parsedLat, parsedLon, nameAndPlace[0], nameAndPlace[1]));
final String[] placeAndName = splitPlaceAndName(parsedName);
stations.add(new Location(LocationType.STATION, parsedId, parsedLat, parsedLon, placeAndName[0], placeAndName[1]));
}
else
{