mirror of
https://gitlab.com/oeffi/public-transport-enabler.git
synced 2025-07-10 21:28:52 +00:00
PL: Ressurect provider for Poland under a new API base.
This commit is contained in:
parent
9b81c69251
commit
9e99ea59d2
3 changed files with 186 additions and 1 deletions
|
@ -67,7 +67,7 @@ public enum NetworkId {
|
||||||
TFI, EIREANN,
|
TFI, EIREANN,
|
||||||
|
|
||||||
// Poland
|
// Poland
|
||||||
PLNAVITIA,
|
PL, PLNAVITIA,
|
||||||
|
|
||||||
// Italy
|
// Italy
|
||||||
IT,
|
IT,
|
||||||
|
|
95
enabler/src/de/schildbach/pte/PlProvider.java
Normal file
95
enabler/src/de/schildbach/pte/PlProvider.java
Normal file
|
@ -0,0 +1,95 @@
|
||||||
|
/*
|
||||||
|
* 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
|
||||||
|
* 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 <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.schildbach.pte;
|
||||||
|
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
import com.google.common.base.Charsets;
|
||||||
|
|
||||||
|
import de.schildbach.pte.dto.Product;
|
||||||
|
import de.schildbach.pte.util.StringReplaceReader;
|
||||||
|
|
||||||
|
import okhttp3.HttpUrl;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Andreas Schildbach
|
||||||
|
*/
|
||||||
|
public class PlProvider extends AbstractHafasLegacyProvider {
|
||||||
|
private static final HttpUrl API_BASE = HttpUrl.parse("http://mobil.rozklad-pkp.pl/bin/");
|
||||||
|
private static final Product[] PRODUCTS_MAP = { Product.HIGH_SPEED_TRAIN, Product.HIGH_SPEED_TRAIN,
|
||||||
|
Product.REGIONAL_TRAIN, Product.SUBURBAN_TRAIN, Product.BUS, Product.BUS, Product.FERRY };
|
||||||
|
|
||||||
|
public PlProvider() {
|
||||||
|
super(NetworkId.PL, API_BASE, "pn", PRODUCTS_MAP);
|
||||||
|
setRequestUrlEncoding(Charsets.UTF_8);
|
||||||
|
setJsonNearbyLocationsEncoding(Charsets.UTF_8);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static final String[] PLACES = { "Warszawa", "Kraków" };
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected String[] splitStationName(final String name) {
|
||||||
|
for (final String place : PLACES) {
|
||||||
|
if (name.endsWith(", " + place))
|
||||||
|
return new String[] { place, name.substring(0, name.length() - place.length() - 2) };
|
||||||
|
if (name.startsWith(place + " ") || name.startsWith(place + "-"))
|
||||||
|
return new String[] { place, name.substring(place.length() + 1) };
|
||||||
|
}
|
||||||
|
|
||||||
|
return super.splitStationName(name);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void addCustomReplaces(final StringReplaceReader reader) {
|
||||||
|
reader.replace("dir=\"Sp ", " "); // Poland
|
||||||
|
reader.replace("dir=\"B ", " "); // Poland
|
||||||
|
reader.replace("dir=\"K ", " "); // Poland
|
||||||
|
reader.replace("dir=\"Eutingen i. G ", "dir=\"Eutingen\" "); // Poland
|
||||||
|
reader.replace("StargetLoc", "Süd\" targetLoc"); // Poland
|
||||||
|
reader.replace("platform=\"K ", " "); // Poland
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Set<Product> defaultProducts() {
|
||||||
|
return Product.ALL;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected Product normalizeType(final String type) {
|
||||||
|
final String ucType = type.toUpperCase();
|
||||||
|
|
||||||
|
if ("AR".equals(ucType)) // Arriva Polaczen
|
||||||
|
return Product.REGIONAL_TRAIN;
|
||||||
|
if ("N".equals(ucType))
|
||||||
|
return Product.REGIONAL_TRAIN;
|
||||||
|
if ("REG".equals(ucType))
|
||||||
|
return Product.REGIONAL_TRAIN;
|
||||||
|
if ("L".equals(ucType) || "LS".equals(ucType)) // Łódzka Kolej Aglomeracyjna
|
||||||
|
return Product.REGIONAL_TRAIN;
|
||||||
|
|
||||||
|
if ("IRB".equals(ucType)) // interREGIO Bus
|
||||||
|
return Product.BUS;
|
||||||
|
if ("ZKA".equals(ucType)) // Zastępcza Komunikacja Autobusowa (Schienenersatzverkehr)
|
||||||
|
return Product.BUS;
|
||||||
|
|
||||||
|
if ("FRE".equals(ucType))
|
||||||
|
return Product.FERRY;
|
||||||
|
|
||||||
|
return super.normalizeType(type);
|
||||||
|
}
|
||||||
|
}
|
90
enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
Normal file
90
enabler/test/de/schildbach/pte/live/PlProviderLiveTest.java
Normal file
|
@ -0,0 +1,90 @@
|
||||||
|
/*
|
||||||
|
* 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
|
||||||
|
* 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 <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package de.schildbach.pte.live;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import de.schildbach.pte.NetworkProvider.Accessibility;
|
||||||
|
import de.schildbach.pte.NetworkProvider.WalkSpeed;
|
||||||
|
import de.schildbach.pte.PlProvider;
|
||||||
|
import de.schildbach.pte.dto.Location;
|
||||||
|
import de.schildbach.pte.dto.LocationType;
|
||||||
|
import de.schildbach.pte.dto.NearbyLocationsResult;
|
||||||
|
import de.schildbach.pte.dto.Product;
|
||||||
|
import de.schildbach.pte.dto.QueryDeparturesResult;
|
||||||
|
import de.schildbach.pte.dto.QueryTripsResult;
|
||||||
|
import de.schildbach.pte.dto.SuggestLocationsResult;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @author Andreas Schildbach
|
||||||
|
*/
|
||||||
|
public class PlProviderLiveTest extends AbstractProviderLiveTest {
|
||||||
|
public PlProviderLiveTest() {
|
||||||
|
super(new PlProvider());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void nearbyStations() throws Exception {
|
||||||
|
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "5100065"));
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void nearbyStationsByCoordinate() throws Exception {
|
||||||
|
final NearbyLocationsResult result = queryNearbyStations(Location.coord(52227027, 20989795));
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void queryDepartures() throws Exception {
|
||||||
|
final QueryDeparturesResult result = queryDepartures("5100065", false);
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void queryDeparturesInvalidStation() throws Exception {
|
||||||
|
final QueryDeparturesResult result = queryDepartures("999999", false);
|
||||||
|
assertEquals(QueryDeparturesResult.Status.INVALID_STATION, result.status);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void suggestLocations() throws Exception {
|
||||||
|
final SuggestLocationsResult result = suggestLocations("Warszawa");
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void suggestLocationsUmlaut() throws Exception {
|
||||||
|
final SuggestLocationsResult result = suggestLocations("Służewiec");
|
||||||
|
print(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void shortTrip() throws Exception {
|
||||||
|
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "5196001", null, "KRAKÓW"), null,
|
||||||
|
new Location(LocationType.STATION, "5196003", null, "WARSZAWA"), new Date(), true, Product.ALL,
|
||||||
|
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
|
||||||
|
print(result);
|
||||||
|
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
|
||||||
|
print(laterResult);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue