diff --git a/enabler/src/de/schildbach/pte/JetProvider.java b/enabler/src/de/schildbach/pte/JetProvider.java deleted file mode 100644 index 09de5f9d..00000000 --- a/enabler/src/de/schildbach/pte/JetProvider.java +++ /dev/null @@ -1,91 +0,0 @@ -/* - * Copyright 2013-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 . - */ - -package de.schildbach.pte; - -import java.io.IOException; -import java.util.EnumSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import com.google.common.base.Charsets; - -import de.schildbach.pte.dto.Line; -import de.schildbach.pte.dto.Location; -import de.schildbach.pte.dto.LocationType; -import de.schildbach.pte.dto.NearbyLocationsResult; -import de.schildbach.pte.dto.Product; - -/** - * Jesuralem? JET = Jerusalem Eternal Tours? - * - * @author Andreas Schildbach - */ -public class JetProvider extends AbstractHafasProvider { - private static final String API_BASE = "http://planner.jet.org.il/bin/"; - private static final Product[] PRODUCTS_MAP = { null, null, Product.TRAM, Product.BUS }; - - public JetProvider() { - super(NetworkId.JET, API_BASE, "yn", PRODUCTS_MAP); - - setJsonGetStopsEncoding(Charsets.UTF_8); - setJsonNearbyLocationsEncoding(Charsets.UTF_8); - } - - @Override - public NearbyLocationsResult queryNearbyLocations(final EnumSet types, final Location location, - final int maxDistance, final int maxLocations) throws IOException { - if (location.hasLocation()) { - return nearbyLocationsByCoordinate(types, location.lat, location.lon, maxDistance, maxLocations); - } else if (location.type == LocationType.STATION && location.hasId()) { - final StringBuilder uri = new StringBuilder(stationBoardEndpoint); - uri.append("?near=Anzeigen"); - uri.append("&distance=").append(maxDistance != 0 ? maxDistance / 1000 : 50); - uri.append("&input=").append(normalizeStationId(location.id)); - - return htmlNearbyStations(uri.toString()); - } else { - throw new IllegalArgumentException("cannot handle: " + location); - } - } - - @Override - protected String[] splitAddress(final String address) { - final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address); - if (m.matches()) - return new String[] { m.group(1), m.group(2) }; - - return super.splitStationName(address); - } - - private static final Pattern P_NORMALIZE_BUS = Pattern.compile("([א]?\\d{1,3})#"); - - @Override - protected Line parseLineAndType(final String lineAndType) { - if ("רק1#".equals(lineAndType)) - return newLine(Product.TRAM, "רק1", null); - - if ("א 11#".equals(lineAndType) || "11א#".equals(lineAndType)) - return newLine(Product.BUS, "א11", null); - - final Matcher mBus = P_NORMALIZE_BUS.matcher(lineAndType); - if (mBus.matches()) - return newLine(Product.BUS, mBus.group(1), null); - - throw new IllegalStateException("cannot normalize line#type '" + lineAndType + "'"); - } -} diff --git a/enabler/src/de/schildbach/pte/NetworkId.java b/enabler/src/de/schildbach/pte/NetworkId.java index 99477d45..558b11b1 100644 --- a/enabler/src/de/schildbach/pte/NetworkId.java +++ b/enabler/src/de/schildbach/pte/NetworkId.java @@ -72,9 +72,6 @@ public enum NetworkId { // United Arab Emirates DUB, - // Israel - JET, - // United States SEPTA, RTACHICAGO, diff --git a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java b/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java deleted file mode 100644 index 8b0e13e0..00000000 --- a/enabler/test/de/schildbach/pte/live/JetProviderLiveTest.java +++ /dev/null @@ -1,90 +0,0 @@ -/* - * Copyright 2013-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 . - */ - -package de.schildbach.pte.live; - -import static org.junit.Assert.assertEquals; - -import java.util.Date; - -import org.junit.Test; - -import de.schildbach.pte.JetProvider; -import de.schildbach.pte.NetworkProvider.Accessibility; -import de.schildbach.pte.NetworkProvider.WalkSpeed; -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 JetProviderLiveTest extends AbstractProviderLiveTest { - public JetProviderLiveTest() { - super(new JetProvider()); - } - - @Test - public void nearbyStations() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(new Location(LocationType.STATION, "1055")); - print(result); - } - - @Test - public void nearbyStationsByCoordinate() throws Exception { - final NearbyLocationsResult result = queryNearbyStations(Location.coord(31769757, 35213506)); - print(result); - } - - @Test - public void queryDepartures() throws Exception { - final QueryDeparturesResult result1 = queryDepartures("568", false); - print(result1); - - final QueryDeparturesResult result2 = queryDepartures("1055", false); - print(result2); - - final QueryDeparturesResult result3 = queryDepartures("90010", false); - print(result3); - } - - @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("הנשיא - מוזיאון האיסלם, ירושלים"); - print(result); - } - - @Test - public void shortConnection() throws Exception { - final QueryTripsResult result = queryTrips(new Location(LocationType.STATION, "1055", null, null), null, - new Location(LocationType.STATION, "90010", null, null), new Date(), true, Product.ALL, - WalkSpeed.NORMAL, Accessibility.NEUTRAL); - print(result); - final QueryTripsResult laterResult = queryMoreTrips(result.context, true); - print(laterResult); - } -}