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

Fix NetworkProvider.hasCapabilities().

Browse source
This commit is contained in:
Andreas Schildbach 2014-08-29 09:43:33 +02:00
parent d066f17807
commit 4d46299fb1
73 changed files with 61 additions and 606 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -231,6 +231,12 @@ public abstract class AbstractEfaProvider extends AbstractNetworkProvider
this.fareCorrectionFactor = fareCorrectionFactor;
}
@Override
protected boolean hasCapability(final Capability capability)
{
return true;
}
private final void appendCommonRequestParams(final StringBuilder uri, final String outputFormat)
{
uri.append("?outputFormat=").append(outputFormat);

6
enabler/src/de/schildbach/pte/AbstractHafasProvider.java
View file

@ -219,6 +219,12 @@ public abstract class AbstractHafasProvider extends AbstractNetworkProvider
this.stationBoardCanDoEquivs = canDoEquivs;
}
@Override
protected boolean hasCapability(final Capability capability)
{
return true;
}
protected final String allProductsString()
{
final StringBuilder allProducts = new StringBuilder(numProductBits);

12
enabler/src/de/schildbach/pte/AbstractNetworkProvider.java
View file

@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import de.schildbach.pte.NetworkProvider.Capability;
import de.schildbach.pte.dto.Point;
import de.schildbach.pte.dto.Product;
import de.schildbach.pte.dto.Style;
@ -47,6 +48,17 @@ public abstract class AbstractNetworkProvider implements NetworkProvider
ALL_EXCEPT_HIGHSPEED.remove(Product.HIGH_SPEED_TRAIN);
}
public final boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (!hasCapability(capability))
return false;
return true;
}
protected abstract boolean hasCapability(Capability capability);
public Collection<Product> defaultProducts()
{
return ALL_EXCEPT_HIGHSPEED;

9
enabler/src/de/schildbach/pte/AbstractTsiProvider.java
View file

@ -187,6 +187,15 @@ public abstract class AbstractTsiProvider extends AbstractNetworkProvider
apiBase + (stopFinderEndpoint != null ? stopFinderEndpoint : DEFAULT_STOPFINDER_ENDPOINT));
}
@Override
protected boolean hasCapability(final Capability capability)
{
if (capability == Capability.DEPARTURES)
return false;
else
return true;
}
public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
{
final StringBuilder parameters = buildCommonRequestParams("SearchTripPoint", "json");

9
enabler/src/de/schildbach/pte/AtcProvider.java
View file

@ -34,13 +34,4 @@ public class AtcProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/AvvProvider.java
View file

@ -43,15 +43,6 @@ public class AvvProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static

10
enabler/src/de/schildbach/pte/BahnProvider.java
View file

@ -43,16 +43,6 @@ public final class BahnProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
|| capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/BayernProvider.java
View file

@ -56,15 +56,6 @@ public class BayernProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/BsvagProvider.java
View file

@ -43,15 +43,6 @@ public class BsvagProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static

9
enabler/src/de/schildbach/pte/BvbProvider.java
View file

@ -41,15 +41,6 @@ public class BvbProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
public SuggestLocationsResult suggestLocations(final CharSequence constraint) throws IOException
{

9
enabler/src/de/schildbach/pte/BvgProvider.java
View file

@ -73,15 +73,6 @@ public final class BvgProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.NEARBY_STATIONS)
return false;
return true;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/DingProvider.java
View file

@ -34,13 +34,4 @@ public class DingProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/DsbProvider.java
View file

@ -44,15 +44,6 @@ public class DsbProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/DubProvider.java
View file

@ -38,13 +38,4 @@ public class DubProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/EireannProvider.java
View file

@ -52,15 +52,6 @@ public class EireannProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected void setProductBits(final StringBuilder productBits, final Product product)
{

12
enabler/src/de/schildbach/pte/GvhProvider.java
View file

@ -43,13 +43,13 @@ public class GvhProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
@Override
protected boolean hasCapability(final Capability capability)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
return false;
else
return super.hasCapability(capability);
}
@Override

12
enabler/src/de/schildbach/pte/InvgProvider.java
View file

@ -70,13 +70,13 @@ public class InvgProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
@Override
protected boolean hasCapability(final Capability capability)
{
for (final Capability capability : capabilities)
if (capability == Capability.DEPARTURES)
return true;
return false;
if (capability == Capability.TRIPS)
return false;
else
return super.hasCapability(capability);
}
@Override

9
enabler/src/de/schildbach/pte/IvbProvider.java
View file

@ -36,13 +36,4 @@ public class IvbProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/JetProvider.java
View file

@ -47,15 +47,6 @@ public class JetProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/KvvProvider.java
View file

@ -50,15 +50,6 @@ public class KvvProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
private static final Pattern P_LINE = Pattern.compile("(.*?)\\s+\\([\\w/]+\\)", Pattern.CASE_INSENSITIVE);
@Override

9
enabler/src/de/schildbach/pte/LinzProvider.java
View file

@ -43,15 +43,6 @@ public class LinzProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static

9
enabler/src/de/schildbach/pte/LuProvider.java
View file

@ -37,15 +37,6 @@ public class LuProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/MetProvider.java
View file

@ -46,15 +46,6 @@ public class MetProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/MvgProvider.java
View file

@ -34,13 +34,4 @@ public class MvgProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/MvvProvider.java
View file

@ -49,15 +49,6 @@ public class MvvProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/NaldoProvider.java
View file

@ -41,15 +41,6 @@ public class NaldoProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/NasaProvider.java
View file

@ -45,15 +45,6 @@ public class NasaProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/NriProvider.java
View file

@ -47,15 +47,6 @@ public class NriProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/NsProvider.java
View file

@ -49,15 +49,6 @@ public class NsProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/NvbwProvider.java
View file

@ -38,15 +38,6 @@ public class NvbwProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/NvvProvider.java
View file

@ -43,15 +43,6 @@ public class NvvProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected void setProductBits(final StringBuilder productBits, final Product product)
{

10
enabler/src/de/schildbach/pte/OebbProvider.java
View file

@ -46,16 +46,6 @@ public class OebbProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
|| capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/PacaProvider.java
View file

@ -36,15 +36,6 @@ public class PacaProvider extends AbstractTsiProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String translateToLocalProduct(final Product p)
{

9
enabler/src/de/schildbach/pte/PlProvider.java
View file

@ -43,15 +43,6 @@ public class PlProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/RsagProvider.java
View file

@ -45,15 +45,6 @@ public class RsagProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/RtProvider.java
View file

@ -41,15 +41,6 @@ public class RtProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected void setProductBits(final StringBuilder productBits, final Product product)
{

9
enabler/src/de/schildbach/pte/SbbProvider.java
View file

@ -41,15 +41,6 @@ public class SbbProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

12
enabler/src/de/schildbach/pte/SeProvider.java
View file

@ -50,13 +50,13 @@ public class SeProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
@Override
protected boolean hasCapability(final Capability capability)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES)
return true;
return false;
if (capability == Capability.TRIPS)
return false;
else
return super.hasCapability(capability);
}
@Override

9
enabler/src/de/schildbach/pte/SeptaProvider.java
View file

@ -67,15 +67,6 @@ public class SeptaProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected void setProductBits(final StringBuilder productBits, final Product product)
{

9
enabler/src/de/schildbach/pte/SfProvider.java
View file

@ -45,15 +45,6 @@ public class SfProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String normalizeLocationName(final String name)
{

9
enabler/src/de/schildbach/pte/ShProvider.java
View file

@ -59,15 +59,6 @@ public class ShProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/SncbProvider.java
View file

@ -47,15 +47,6 @@ public class SncbProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/StockholmProvider.java
View file

@ -49,15 +49,6 @@ public class StockholmProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/StvProvider.java
View file

@ -37,15 +37,6 @@ public class StvProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/SvvProvider.java
View file

@ -34,13 +34,4 @@ public class SvvProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/SydneyProvider.java
View file

@ -38,15 +38,6 @@ public class SydneyProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String normalizeLocationName(final String name)
{

9
enabler/src/de/schildbach/pte/TfiProvider.java
View file

@ -41,15 +41,6 @@ public class TfiProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
public Collection<Product> defaultProducts()
{

9
enabler/src/de/schildbach/pte/TflProvider.java
View file

@ -44,15 +44,6 @@ public class TflProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/TlemProvider.java
View file

@ -44,15 +44,6 @@ public class TlemProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/TlswProvider.java
View file

@ -42,15 +42,6 @@ public class TlswProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
public Collection<Product> defaultProducts()
{

9
enabler/src/de/schildbach/pte/TlwmProvider.java
View file

@ -43,15 +43,6 @@ public class TlwmProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/VagfrProvider.java
View file

@ -44,15 +44,6 @@ public class VagfrProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static

9
enabler/src/de/schildbach/pte/VbbProvider.java
View file

@ -52,15 +52,6 @@ public class VbbProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/VblProvider.java
View file

@ -37,15 +37,6 @@ public class VblProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

10
enabler/src/de/schildbach/pte/VbnProvider.java
View file

@ -39,16 +39,6 @@ public class VbnProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.NEARBY_STATIONS || capability == Capability.DEPARTURES || capability == Capability.SUGGEST_LOCATIONS
|| capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected void setProductBits(final StringBuilder productBits, final Product product)
{

9
enabler/src/de/schildbach/pte/VgnProvider.java
View file

@ -43,15 +43,6 @@ public class VgnProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/VgsProvider.java
View file

@ -43,15 +43,6 @@ public class VgsProvider extends AbstractHafasProvider
return NetworkId.VGS;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected void setProductBits(final StringBuilder productBits, final Product product)
{

9
enabler/src/de/schildbach/pte/VmobilProvider.java
View file

@ -37,15 +37,6 @@ public class VmobilProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/VmsProvider.java
View file

@ -35,15 +35,6 @@ public class VmsProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/VmvProvider.java
View file

@ -44,15 +44,6 @@ public class VmvProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/VorProvider.java
View file

@ -48,15 +48,6 @@ public class VorProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static

9
enabler/src/de/schildbach/pte/VrnProvider.java
View file

@ -34,13 +34,4 @@ public class VrnProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/VrrProvider.java
View file

@ -46,15 +46,6 @@ public class VrrProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/VrtProvider.java
View file

@ -34,13 +34,4 @@ public class VrtProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/VsnProvider.java
View file

@ -42,15 +42,6 @@ public class VsnProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

9
enabler/src/de/schildbach/pte/VvmProvider.java
View file

@ -36,13 +36,4 @@ public class VvmProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/VvoProvider.java
View file

@ -44,15 +44,6 @@ public class VvoProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/VvsProvider.java
View file

@ -44,15 +44,6 @@ public class VvsProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
public Point[] getArea()
{

9
enabler/src/de/schildbach/pte/VvtProvider.java
View file

@ -36,13 +36,4 @@ public class VvtProvider extends AbstractEfaProvider
{
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
}

9
enabler/src/de/schildbach/pte/VvvProvider.java
View file

@ -37,15 +37,6 @@ public class VvvProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected String parseLine(final String mot, final String symbol, final String name, final String longName, final String trainType,
final String trainNum, final String trainName)

9
enabler/src/de/schildbach/pte/WienProvider.java
View file

@ -44,15 +44,6 @@ public class WienProvider extends AbstractEfaProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.SUGGEST_LOCATIONS || capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static

9
enabler/src/de/schildbach/pte/ZvvProvider.java
View file

@ -46,15 +46,6 @@ public class ZvvProvider extends AbstractHafasProvider
return NETWORK_ID;
}
public boolean hasCapabilities(final Capability... capabilities)
{
for (final Capability capability : capabilities)
if (capability == Capability.DEPARTURES || capability == Capability.TRIPS)
return true;
return false;
}
@Override
protected char intToProduct(final int value)
{

10
enabler/test/de/schildbach/pte/live/GvhProviderLiveTest.java
View file

@ -18,6 +18,7 @@
package de.schildbach.pte.live;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import java.util.Date;
@ -26,6 +27,7 @@ import org.junit.Test;
import de.schildbach.pte.GvhProvider;
import de.schildbach.pte.NetworkProvider.Accessibility;
import de.schildbach.pte.NetworkProvider.Capability;
import de.schildbach.pte.NetworkProvider.WalkSpeed;
import de.schildbach.pte.dto.Location;
import de.schildbach.pte.dto.LocationType;
@ -45,6 +47,14 @@ public class GvhProviderLiveTest extends AbstractProviderLiveTest
super(new GvhProvider(null));
}
@Test
public void capabilities() throws Exception
{
assertTrue(provider.hasCapabilities(Capability.NEARBY_STATIONS, Capability.DEPARTURES));
assertFalse(provider.hasCapabilities(Capability.SUGGEST_LOCATIONS, Capability.TRIPS));
assertFalse(provider.hasCapabilities(Capability.DEPARTURES, Capability.TRIPS));
}
@Test
public void nearbyStations() throws Exception
{