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

DSB: Migrate to Hafas client interface.

Browse source
This commit is contained in:
Andreas Schildbach 2018-11-16 21:44:56 +01:00
parent db7b4c8a0d
commit ec05c0a519
3 changed files with 26 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/*
* Copyright 2010-2017 the original author or authors.
* Copyright 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
@ -19,7 +19,6 @@ package de.schildbach.pte;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import de.schildbach.pte.dto.Product;
@ -28,18 +27,18 @@ import okhttp3.HttpUrl;
/**
* @author Andreas Schildbach
*/
public class DsbProvider extends AbstractHafasLegacyProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("https://www.rejseplanen.dk/bin/");
// http://dk.hafas.de/bin/fat/
// http://www.dsb.dk/Rejseplan/bin/
public class DsbProvider extends AbstractHafasClientInterfaceProvider {
private static final HttpUrl API_BASE = HttpUrl.parse("http://mobilapps.rejseplanen.dk/bin/");
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN,
Product.REGIONAL_TRAIN, Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.BUS,
Product.BUS, Product.BUS, Product.FERRY, Product.SUBWAY };
Product.BUS, Product.BUS, Product.FERRY, Product.SUBWAY, Product.SUBURBAN_TRAIN /* Light Rail */ };
public DsbProvider() {
super(NetworkId.DSB, API_BASE, "mn", PRODUCTS_MAP);
setStationBoardHasStationTable(false);
public DsbProvider(final String apiAuthorization) {
super(NetworkId.DSB, API_BASE, PRODUCTS_MAP);
setApiEndpoint("iphone.exe");
setApiVersion("1.14");
setApiClient("{\"id\":\"DK\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization);
}
@Override
@ -47,7 +46,6 @@ public class DsbProvider extends AbstractHafasLegacyProvider {
final Matcher m = P_SPLIT_NAME_PAREN.matcher(name);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitStationName(name);
}
@ -55,70 +53,4 @@ public class DsbProvider extends AbstractHafasLegacyProvider {
public Set<Product> defaultProducts() {
return Product.ALL;
}
@Override
protected Product normalizeType(final String type) {
final String ucType = type.toUpperCase();
if ("ICL".equals(ucType))
return Product.HIGH_SPEED_TRAIN;
if ("IB".equals(ucType))
return Product.HIGH_SPEED_TRAIN;
if ("SJ".equals(ucType))
return Product.HIGH_SPEED_TRAIN;
if ("ØR".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("RA".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("RX".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("PP".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("L".equals(ucType)) // Lokalbane
return Product.REGIONAL_TRAIN;
if ("PÅGATOG".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("S-TOG".equals(ucType))
return Product.SUBURBAN_TRAIN;
if ("BYBUS".equals(ucType))
return Product.BUS;
if ("X-BUS".equals(ucType) || "X BUS".equals(ucType))
return Product.BUS;
if ("HV-BUS".equals(ucType)) // Havnebus
return Product.BUS;
if ("T-BUS".equals(ucType)) // Togbus
return Product.BUS;
if ("TOGBUS".equals(ucType))
return Product.BUS;
if ("FLEXBUS".equals(ucType))
return Product.BUS;
if ("FJERNBUS".equals(ucType))
return Product.BUS;
if ("TELEBUS".equals(ucType))
return Product.ON_DEMAND;
if ("TELETAXI".equals(ucType))
return Product.ON_DEMAND;
if ("FÆRGE".equals(ucType))
return Product.FERRY;
return super.normalizeType(type);
}
// Busses line name is formatted as "42#Bus 42" but we just want "42"
private static final Pattern P_NORMALIZE_LINE_NAME_BUS_DSB = Pattern.compile(".*?#Bus (.*)",
Pattern.CASE_INSENSITIVE);
@Override
protected String normalizeLineName(final String lineName) {
final Matcher mBus = P_NORMALIZE_LINE_NAME_BUS_DSB.matcher(lineName);
if (mBus.matches())
return mBus.group(1);
return super.normalizeLineName(lineName);
}
}