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

Migrate Stockholm to use SE.

Browse source
This commit is contained in:
Andreas Schildbach 2016-06-04 12:50:26 +02:00
parent 2b2bb3a7cc
commit 26621e5874
4 changed files with 39 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

2
enabler/src/de/schildbach/pte/NetworkId.java
View file

@ -47,7 +47,7 @@ public enum NetworkId
DSB, DSB,
// Sweden // Sweden
SE, STOCKHOLM, SE,
// Norway // Norway
NRI, NRI,

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

@ -1,155 +0,0 @@
/*
* Copyright 2010-2015 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.util.HashMap;
import java.util.Map;
import java.util.regex.Matcher;
import de.schildbach.pte.dto.Line;
import de.schildbach.pte.dto.Product;
import de.schildbach.pte.dto.Style;
import de.schildbach.pte.dto.Style.Shape;
/**
* @author Andreas Schildbach
*/
public class StockholmProvider extends AbstractHafasProvider
{
private static final String API_BASE = "http://reseplanerare.trafiken.nu/bin/";
private static final Product[] PRODUCTS_MAP = { Product.SUBURBAN_TRAIN, Product.SUBWAY, Product.REGIONAL_TRAIN, Product.BUS, Product.BUS,
Product.FERRY, Product.FERRY };
public StockholmProvider()
{
super(NetworkId.STOCKHOLM, API_BASE, "sn", PRODUCTS_MAP);
setStyles(STYLES);
setStationBoardHasStationTable(false);
setStationBoardCanDoEquivs(false);
}
@Override
protected String[] splitStationName(final String name)
{
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);
}
@Override
protected String[] splitAddress(final String address)
{
final Matcher m = P_SPLIT_NAME_LAST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitStationName(address);
}
@Override
protected void appendCommonQueryTripsBinaryParameters(final StringBuilder uri)
{
super.appendCommonQueryTripsBinaryParameters(uri);
uri.append("&REQ0HafasSearchIndividual=1&REQ0HafasSearchPublic=1"
+ "&existIntermodalDep_enable=yes&existIntermodalDest_enable=yes&existTotal_enable=yes"
+ "&REQ0JourneyDep_Foot_enable=1&REQ0JourneyDep_Foot_maxDist=5000&REQ0JourneyDep_Foot_minDist=0&REQ0JourneyDep_Foot_speed=100&REQ0JourneyDep_Bike_enable=0&REQ0JourneyDep_ParkRide_enable=0"
+ "&REQ0JourneyDest_Foot_enable=1&REQ0JourneyDest_Foot_maxDist=5000&REQ0JourneyDest_Foot_minDist=0&REQ0JourneyDest_Foot_speed=100&REQ0JourneyDest_Bike_enable=0&REQ0JourneyDest_ParkRide_enable=0");
}
@Override
protected Line parseLineAndType(final String lineAndType)
{
final Matcher m = P_NORMALIZE_LINE.matcher(lineAndType);
if (m.matches())
{
final String type = m.group(1);
final String number = m.group(2).replaceAll("\\s+", "");
if (type.length() > 0)
{
final Product product = normalizeType(type);
if (product != null)
return newLine(product, number, null);
}
throw new IllegalStateException("cannot normalize type " + type + " number " + number + " line#type " + lineAndType);
}
throw new IllegalStateException("cannot normalize line#type " + lineAndType);
}
@Override
protected Product normalizeType(final String type)
{
final String ucType = type.toUpperCase();
if ("TRAIN".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("NÄRTRAFIKEN".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("LOKALTÅG".equals(ucType))
return Product.REGIONAL_TRAIN;
if ("PENDELTÅG".equals(ucType))
return Product.SUBURBAN_TRAIN;
if ("METRO".equals(ucType))
return Product.SUBWAY;
if ("TUNNELBANA".equals(ucType))
return Product.SUBWAY;
if ("TRAM".equals(ucType))
return Product.TRAM;
if ("BUS".equals(ucType))
return Product.BUS;
if ("BUSS".equals(ucType))
return Product.BUS;
if ("FLYG".equals(ucType))
return Product.BUS;
if ("SHIP".equals(ucType))
return Product.FERRY;
if ("BÅT".equals(ucType))
return Product.FERRY;
if ("FÄRJA".equals(ucType))
return Product.FERRY;
// skip parsing of "common" lines
throw new IllegalStateException("cannot normalize type '" + type + "'");
}
private static final Map<String, Style> STYLES = new HashMap<String, Style>();
static
{
STYLES.put("UMETRO10", new Style(Shape.ROUNDED, Style.parseColor("#25368b"), Style.WHITE));
STYLES.put("UMETRO11", new Style(Shape.ROUNDED, Style.parseColor("#25368b"), Style.WHITE));
STYLES.put("UMETRO13", new Style(Shape.ROUNDED, Style.parseColor("#f1491c"), Style.WHITE));
STYLES.put("UMETRO14", new Style(Shape.ROUNDED, Style.parseColor("#f1491c"), Style.WHITE));
STYLES.put("UMETRO17", new Style(Shape.ROUNDED, Style.parseColor("#6ec72d"), Style.WHITE));
STYLES.put("UMETRO18", new Style(Shape.ROUNDED, Style.parseColor("#6ec72d"), Style.WHITE));
STYLES.put("UMETRO19", new Style(Shape.ROUNDED, Style.parseColor("#6ec72d"), Style.WHITE));
}
}

42
enabler/test/de/schildbach/pte/live/SeProviderLiveTest.java
View file

@ -17,7 +17,9 @@
package de.schildbach.pte.live; package de.schildbach.pte.live;
import static org.hamcrest.CoreMatchers.hasItem;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import java.util.Date; import java.util.Date;
@ -86,12 +88,40 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
print(result); print(result);
} }
@Test
public void suggestLocationsCoverage() throws Exception
{
final SuggestLocationsResult salzburgResult = suggestLocations("Stockholm");
print(salzburgResult);
assertThat(salzburgResult.getLocations(), hasItem(new Location(LocationType.STATION, "740098000")));
}
@Test @Test
public void shortTrip() throws Exception public void shortTrip() throws Exception
{ {
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "7414867", null, "Luleå Airport"), null, new Location( final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "740014867", null, "Luleå Airport"), null,
LocationType.STATION, "7498000", null, "STOCKHOLM"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, Accessibility.NEUTRAL); new Location(LocationType.STATION, "740098000", null, "STOCKHOLM"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
print(result); print(result);
if (!result.context.canQueryLater())
return;
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult);
}
@Test
public void shortStockholmTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "740098000", null, "STOCKHOLM"), null,
new Location(LocationType.STATION, "740020101", "Stockholm", "Slussen T-bana"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
print(result);
if (!result.context.canQueryLater())
return;
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult); print(laterResult);
} }
@ -99,10 +129,14 @@ public class SeProviderLiveTest extends AbstractProviderLiveTest
@Test @Test
public void longTrip() throws Exception public void longTrip() throws Exception
{ {
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "7498086", 67859847, 20212802, null, "KIRUNA"), null, final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "740098086", 67859847, 20212802, null, "KIRUNA"), null,
new Location(LocationType.STATION, "7498000", null, "STOCKHOLM"), new Date(), true, Product.ALL, WalkSpeed.NORMAL, new Location(LocationType.STATION, "740098000", null, "STOCKHOLM"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL); Accessibility.NEUTRAL);
print(result); print(result);
if (!result.context.canQueryLater())
return;
final QueryTripsResult laterResult = queryMoreTrips(result.context, true); final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult); print(laterResult);
} }

112
enabler/test/de/schildbach/pte/live/StockholmProviderLiveTest.java
View file

@ -1,112 +0,0 @@
/*
* Copyright 2010-2015 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 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.StockholmProvider;
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 StockholmProviderLiveTest extends AbstractProviderLiveTest
{
public StockholmProviderLiveTest()
{
super(new StockholmProvider());
}
@Test
public void nearbyStations() throws Exception
{
final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "301109600"));
print(result);
}
@Test
public void nearbyStationsByCoordinate() throws Exception
{
final NearbyLocationsResult result = queryNearbyStations(Location.coord(59329897, 18072281));
print(result);
}
@Test
public void queryDepartures() throws Exception
{
final QueryDeparturesResult result = queryDepartures("301109600", 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("Luleå Airport");
print(result);
}
@Test
public void suggestLocationsUmlaut() throws Exception
{
final SuggestLocationsResult result = suggestLocations("östra");
print(result);
}
@Test
public void shortTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "200101051", "Stockholm", "T-Centralen"), null, new Location(
LocationType.STATION, "200101221", "Stockholm", "Abrahamsberg"), new Date(), true, Product.ALL, WalkSpeed.NORMAL,
Accessibility.NEUTRAL);
print(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult);
}
@Test
public void addressToStationTrip() throws Exception
{
final QueryTripsResult result = queryTrips(new Location(LocationType.ADDRESS, null, 59360519, 17989266, null, "Sommarvägen 1, Solna"), null,
new Location(LocationType.STATION, "300109205", 59340518, 18081532, "Stockholm", "Stadion"), new Date(), true, Product.ALL,
WalkSpeed.NORMAL, Accessibility.NEUTRAL);
print(result);
final QueryTripsResult laterResult = queryMoreTrips(result.context, true);
print(laterResult);
}
}