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

fixed 'current location' for networks other than MVV

Browse source 
git-svn-id: https://public-transport-enabler.googlecode.com/svn/trunk@84 0924bc21-9374-b0fa-ee44-9ff1593b38f0
This commit is contained in:
andreas.schildbach 2010-08-15 19:43:53 +00:00
parent 6648d8fa30
commit 5b62b02476
6 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/de/schildbach/pte/BahnProvider.java
View file

@ -41,8 +41,12 @@ public final class BahnProvider implements NetworkProvider
private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000;
public boolean hasCapabilities(Capability... capabilities) public boolean hasCapabilities(final Capability... capabilities)
{ {
for (final Capability capability : capabilities)
if (capability == Capability.LOCATION_WGS84)
return false;
return true; return true;
} }

8
src/de/schildbach/pte/MvvProvider.java
View file

@ -42,7 +42,7 @@ public class MvvProvider implements NetworkProvider
private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000; private static final long PARSER_DAY_ROLLOVER_THRESHOLD_MS = 12 * 60 * 60 * 1000;
private static final String ENCODING = "ISO-8859-1"; private static final String ENCODING = "ISO-8859-1";
public boolean hasCapabilities(Capability... capabilities) public boolean hasCapabilities(final Capability... capabilities)
{ {
for (final Capability capability : capabilities) for (final Capability capability : capabilities)
if (capability == Capability.NEARBY_STATIONS) if (capability == Capability.NEARBY_STATIONS)
@ -122,7 +122,7 @@ public class MvvProvider implements NetworkProvider
if (fromType == LocationType.WGS84) if (fromType == LocationType.WGS84)
{ {
final String[] parts = from.split(","); final String[] parts = from.split(",\\s*", 2);
final double lat = Double.parseDouble(parts[0]); final double lat = Double.parseDouble(parts[0]);
final double lon = Double.parseDouble(parts[1]); final double lon = Double.parseDouble(parts[1]);
uri.append("&nameInfo_origin=").append(String.format("%2.5f:%2.5f", lon, lat)).append(":WGS84[DD.ddddd]"); uri.append("&nameInfo_origin=").append(String.format("%2.5f:%2.5f", lon, lat)).append(":WGS84[DD.ddddd]");
@ -146,7 +146,7 @@ public class MvvProvider implements NetworkProvider
if (toType == LocationType.WGS84) if (toType == LocationType.WGS84)
{ {
final String[] parts = to.split(","); final String[] parts = to.split(",\\s*", 2);
final double lat = Double.parseDouble(parts[0]); final double lat = Double.parseDouble(parts[0]);
final double lon = Double.parseDouble(parts[1]); final double lon = Double.parseDouble(parts[1]);
uri.append("&nameInfo_destination=").append(String.format("%2.5f:%2.5f", lon, lat)).append(":WGS84[DD.ddddd]"); uri.append("&nameInfo_destination=").append(String.format("%2.5f:%2.5f", lon, lat)).append(":WGS84[DD.ddddd]");
@ -172,7 +172,7 @@ public class MvvProvider implements NetworkProvider
{ {
if (viaType == LocationType.WGS84) if (viaType == LocationType.WGS84)
{ {
final String[] parts = via.split(","); final String[] parts = via.split(",\\s*", 2);
final double lat = Double.parseDouble(parts[0]); final double lat = Double.parseDouble(parts[0]);
final double lon = Double.parseDouble(parts[1]); final double lon = Double.parseDouble(parts[1]);
uri.append("&nameInfo_via=").append(String.format("%2.5f:%2.5f", lon, lat)).append(":WGS84[DD.ddddd]"); uri.append("&nameInfo_via=").append(String.format("%2.5f:%2.5f", lon, lat)).append(":WGS84[DD.ddddd]");

2
src/de/schildbach/pte/NetworkProvider.java
View file

@ -30,7 +30,7 @@ public interface NetworkProvider
{ {
public enum Capability public enum Capability
{ {
NEARBY_STATIONS, DEPARTURES, CONNECTIONS NEARBY_STATIONS, DEPARTURES, CONNECTIONS, LOCATION_WGS84
} }
public enum LocationType public enum LocationType

4
src/de/schildbach/pte/RmvProvider.java
View file

@ -44,6 +44,10 @@ public class RmvProvider implements NetworkProvider
public boolean hasCapabilities(final Capability... capabilities) public boolean hasCapabilities(final Capability... capabilities)
{ {
for (final Capability capability : capabilities)
if (capability == Capability.LOCATION_WGS84)
return false;
return true; return true;
} }

2
src/de/schildbach/pte/SbbProvider.java
View file

@ -44,7 +44,7 @@ public class SbbProvider implements NetworkProvider
public boolean hasCapabilities(final Capability... capabilities) public boolean hasCapabilities(final Capability... capabilities)
{ {
for (final Capability capability : capabilities) for (final Capability capability : capabilities)
if (capability == Capability.NEARBY_STATIONS) if (capability == Capability.NEARBY_STATIONS || capability == Capability.LOCATION_WGS84)
return false; return false;
return true; return true;

4
src/de/schildbach/pte/VbbProvider.java
View file

@ -45,10 +45,10 @@ public final class VbbProvider implements NetworkProvider
private static final String BVG_BASE_URL = "http://mobil.bvg.de"; private static final String BVG_BASE_URL = "http://mobil.bvg.de";
public boolean hasCapabilities(Capability... capabilities) public boolean hasCapabilities(final Capability... capabilities)
{ {
for (final Capability capability : capabilities) for (final Capability capability : capabilities)
if (capability == Capability.NEARBY_STATIONS) if (capability == Capability.NEARBY_STATIONS || capability == Capability.LOCATION_WGS84)
return false; return false;
return true; return true;