mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-07 05:28:46 +00:00
San Francisco
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@408 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach@gmail.com
parent
fde8097dd4
commit
37b08cf734
5 changed files with 210 additions and 6 deletions
|
|
@ -161,8 +161,8 @@ public abstract class AbstractEfaProvider implements NetworkProvider
|
|||
type = LocationType.ANY;
|
||||
id = 0;
|
||||
}
|
||||
else if ("postcode".equals(anyType) || "street".equals(anyType) || "address".equals(anyType) || "singlehouse".equals(anyType)
|
||||
|| "buildingname".equals(anyType))
|
||||
else if ("postcode".equals(anyType) || "street".equals(anyType) || "crossing".equals(anyType) || "address".equals(anyType)
|
||||
|| "singlehouse".equals(anyType) || "buildingname".equals(anyType))
|
||||
{
|
||||
type = LocationType.ADDRESS;
|
||||
id = 0;
|
||||
|
|
@ -680,6 +680,12 @@ public abstract class AbstractEfaProvider implements NetworkProvider
|
|||
return 'T' + str;
|
||||
if (type.equals("STR")) // Nordhausen
|
||||
return 'T' + str;
|
||||
if ("California Cable Car".equals(name)) // San Francisco
|
||||
return 'T' + name;
|
||||
if ("Muni Rail".equals(noTrainName)) // San Francisco
|
||||
return 'T' + name;
|
||||
if ("Cable Car".equals(noTrainName)) // San Francisco
|
||||
return 'T' + name;
|
||||
|
||||
if (type.equals("BUS"))
|
||||
return 'B' + str;
|
||||
|
|
@ -1293,9 +1299,17 @@ public abstract class AbstractEfaProvider implements NetworkProvider
|
|||
}
|
||||
|
||||
if (key.equals("FOR_RIDER"))
|
||||
type = Type.valueOf(value.split(" ")[0].toUpperCase());
|
||||
{
|
||||
final String typeStr = value.split(" ")[0].toUpperCase();
|
||||
if (typeStr.equals("REGULAR"))
|
||||
type = Type.ADULT;
|
||||
else
|
||||
type = Type.valueOf(typeStr);
|
||||
}
|
||||
else if (key.equals("PRICE"))
|
||||
fare = Float.parseFloat(value);
|
||||
{
|
||||
fare = Float.parseFloat(value) * (currency.getCurrencyCode().equals("US$") ? 0.01f : 1);
|
||||
}
|
||||
|
||||
XmlPullUtil.exit(pp, "itdGenericTicket");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,5 +44,8 @@ public enum NetworkId
|
|||
MARIBOR,
|
||||
|
||||
// United Arab Emirates
|
||||
DUB
|
||||
DUB,
|
||||
|
||||
// United States
|
||||
SF
|
||||
}
|
||||
|
|
|
|||
139
src/de/schildbach/pte/SfProvider.java
Normal file
139
src/de/schildbach/pte/SfProvider.java
Normal file
|
|
@ -0,0 +1,139 @@
|
|||
/*
|
||||
* Copyright 2010 the original author or authors.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.schildbach.pte;
|
||||
|
||||
import java.text.DateFormat;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
import java.util.TimeZone;
|
||||
|
||||
import de.schildbach.pte.dto.Location;
|
||||
import de.schildbach.pte.util.ParserUtils;
|
||||
|
||||
/**
|
||||
* @author Andreas Schildbach
|
||||
*/
|
||||
public class SfProvider extends AbstractEfaProvider
|
||||
{
|
||||
public static final NetworkId NETWORK_ID = NetworkId.SF;
|
||||
private final static String API_BASE = "http://tripplanner.transit.511.org/mtc/";
|
||||
|
||||
public NetworkId id()
|
||||
{
|
||||
return NETWORK_ID;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected TimeZone timeZone()
|
||||
{
|
||||
return TimeZone.getTimeZone("PST");
|
||||
}
|
||||
|
||||
public boolean hasCapabilities(Capability... capabilities)
|
||||
{
|
||||
for (final Capability capability : capabilities)
|
||||
if (capability == Capability.DEPARTURES || capability == Capability.CONNECTIONS)
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
private static final String AUTOCOMPLETE_URI = API_BASE
|
||||
+ "XSLT_TRIP_REQUEST2?outputFormat=XML&coordOutputFormat=WGS84&locationServerActive=1&type_origin=any&name_origin=%s";
|
||||
|
||||
@Override
|
||||
protected String autocompleteUri(final CharSequence constraint)
|
||||
{
|
||||
return String.format(AUTOCOMPLETE_URI, ParserUtils.urlEncode(constraint.toString(), "ISO-8859-1"));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String nearbyLatLonUri(final int lat, final int lon)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
|
||||
private static final String NEARBY_STATION_URI = API_BASE
|
||||
+ "XSLT_DM_REQUEST"
|
||||
+ "?outputFormat=XML&coordOutputFormat=WGS84&name_dm=%s&type_dm=stop&itOptionsActive=1&ptOptionsActive=1&useProxFootSearch=1&mergeDep=1&useAllStops=1&mode=direct";
|
||||
|
||||
@Override
|
||||
protected String nearbyStationUri(final String stationId)
|
||||
{
|
||||
return String.format(NEARBY_STATION_URI, ParserUtils.urlEncode(stationId));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String departuresQueryUri(final String stationId, final int maxDepartures)
|
||||
{
|
||||
final StringBuilder uri = new StringBuilder();
|
||||
uri.append(API_BASE).append("XSLT_DM_REQUEST");
|
||||
uri.append("?outputFormat=XML");
|
||||
uri.append("&coordOutputFormat=WGS84");
|
||||
uri.append("&type_dm=stop");
|
||||
uri.append("&name_dm=").append(stationId);
|
||||
uri.append("&mode=direct");
|
||||
uri.append("&useRealtime=1");
|
||||
return uri.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String connectionsQueryUri(final Location from, final Location via, final Location to, final Date date, final boolean dep,
|
||||
final String products, final WalkSpeed walkSpeed)
|
||||
{
|
||||
final DateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMdd");
|
||||
final DateFormat TIME_FORMAT = new SimpleDateFormat("HHmm");
|
||||
|
||||
final StringBuilder uri = new StringBuilder();
|
||||
uri.append(API_BASE);
|
||||
uri.append("XSLT_TRIP_REQUEST2");
|
||||
|
||||
uri.append("?language=de");
|
||||
appendCommonConnectionParams(uri);
|
||||
|
||||
appendLocation(uri, from, "origin");
|
||||
appendLocation(uri, to, "destination");
|
||||
if (via != null)
|
||||
appendLocation(uri, via, "via");
|
||||
|
||||
uri.append("&itdDate=").append(ParserUtils.urlEncode(DATE_FORMAT.format(date)));
|
||||
uri.append("&itdTime=").append(ParserUtils.urlEncode(TIME_FORMAT.format(date)));
|
||||
uri.append("&itdTripDateTimeDepArr=").append(dep ? "dep" : "arr");
|
||||
|
||||
uri.append("&ptOptionsActive=1");
|
||||
uri.append("&changeSpeed=").append(WALKSPEED_MAP.get(walkSpeed));
|
||||
uri.append(productParams(products));
|
||||
|
||||
uri.append("&locationServerActive=1");
|
||||
uri.append("&useRealtime=1");
|
||||
|
||||
return uri.toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String commandLink(final String sessionId, final String command)
|
||||
{
|
||||
final StringBuilder uri = new StringBuilder();
|
||||
uri.append(API_BASE);
|
||||
uri.append("XSLT_TRIP_REQUEST2");
|
||||
uri.append("?sessionID=").append(sessionId);
|
||||
appendCommonConnectionParams(uri);
|
||||
uri.append("&command=").append(command);
|
||||
return uri.toString();
|
||||
}
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ public final class Fare implements Serializable
|
|||
{
|
||||
public enum Type
|
||||
{
|
||||
ADULT, CHILD, STUDENT, SENIOR
|
||||
ADULT, CHILD, YOUTH, STUDENT, MILITARY, SENIOR, DISABLED
|
||||
}
|
||||
|
||||
public final String network;
|
||||
|
|
|
|||
48
test/de/schildbach/pte/live/SfProviderLiveTest.java
Normal file
48
test/de/schildbach/pte/live/SfProviderLiveTest.java
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
/*
|
||||
* Copyright 2010 the original author or authors.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package de.schildbach.pte.live;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import de.schildbach.pte.SfProvider;
|
||||
import de.schildbach.pte.dto.NearbyStationsResult;
|
||||
import de.schildbach.pte.dto.QueryDeparturesResult;
|
||||
|
||||
/**
|
||||
* @author Andreas Schildbach
|
||||
*/
|
||||
public class SfProviderLiveTest
|
||||
{
|
||||
private final SfProvider provider = new SfProvider();
|
||||
|
||||
@Test
|
||||
public void nearbyStation() throws Exception
|
||||
{
|
||||
final NearbyStationsResult result = provider.nearbyStations("San Franzisco", 0, 0, 0, 0);
|
||||
|
||||
System.out.println(result.stations.size() + " " + result.stations);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void queryDepartures() throws Exception
|
||||
{
|
||||
final QueryDeparturesResult result = provider.queryDepartures("10010813", 0);
|
||||
|
||||
System.out.println(result.departures.size() + " " + result.departures);
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue