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

OOEVV, SVV, VAO, VMOBIL, VOR, VVT: Increase API version to 1.15 to fix spurious PARSE errors when querying for trips.

Browse source 
Bring related LiveTests up to speed too.
This commit is contained in:
Andreas Schildbach 2018-11-17 22:24:50 +01:00
parent 874198b621
commit 05d1a5826b
12 changed files with 110 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

7
enabler/src/de/schildbach/pte/OoevvProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright 2015 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
@ -36,7 +36,7 @@ public class OoevvProvider extends AbstractHafasClientInterfaceProvider {
public OoevvProvider(final String apiAuthorization) {
super(NetworkId.OOEVV, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14");
setApiVersion("1.15");
setApiClient("{\"id\":\"VAO\",\"l\":\"vs_ooevv\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization);
httpClient.setSslAcceptAllHostnames(true);
@ -54,7 +54,6 @@ public class OoevvProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(name);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitStationName(name);
}
@ -63,7 +62,6 @@ public class OoevvProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(poi);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitPOI(poi);
}
@ -72,7 +70,6 @@ public class OoevvProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
return super.splitAddress(address);
}
}

7
enabler/src/de/schildbach/pte/SvvProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 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
@ -39,7 +39,7 @@ public class SvvProvider extends AbstractHafasClientInterfaceProvider {
public SvvProvider(final String apiAuthorization) {
super(NetworkId.SVV, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14");
setApiVersion("1.15");
setApiClient("{\"id\":\"VAO\",\"l\":\"vs_svv\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
@ -58,7 +58,6 @@ public class SvvProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(name);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitStationName(name);
}
@ -67,7 +66,6 @@ public class SvvProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(poi);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitPOI(poi);
}
@ -76,7 +74,6 @@ public class SvvProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
return super.splitAddress(address);
}

4
enabler/src/de/schildbach/pte/VaoProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright 2015 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
@ -39,7 +39,7 @@ public class VaoProvider extends AbstractHafasClientInterfaceProvider {
public VaoProvider(final String apiAuthorization) {
super(NetworkId.VAO, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14");
setApiVersion("1.15");
setApiClient("{\"id\":\"VAO\",\"l\":\"vs_vvv\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization);
setStyles(STYLES);

7
enabler/src/de/schildbach/pte/VmobilProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright 2015 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
@ -36,7 +36,7 @@ public class VmobilProvider extends AbstractHafasClientInterfaceProvider {
public VmobilProvider(final String apiAuthorization) {
super(NetworkId.VMOBIL, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14");
setApiVersion("1.15");
setApiClient("{\"id\":\"VAO\",\"l\":\"vs_vvv\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization);
}
@ -53,7 +53,6 @@ public class VmobilProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(name);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitStationName(name);
}
@ -62,7 +61,6 @@ public class VmobilProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(poi);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitPOI(poi);
}
@ -71,7 +69,6 @@ public class VmobilProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
return super.splitAddress(address);
}
}

7
enabler/src/de/schildbach/pte/VorProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 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
@ -39,7 +39,7 @@ public class VorProvider extends AbstractHafasClientInterfaceProvider {
public VorProvider(final String apiAuthorization) {
super(NetworkId.VOR, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14");
setApiVersion("1.15");
setApiClient("{\"id\":\"VAO\",\"l\":\"vs_anachb\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization);
setStyles(STYLES);
@ -57,7 +57,6 @@ public class VorProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(name);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitStationName(name);
}
@ -66,7 +65,6 @@ public class VorProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(poi);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitPOI(poi);
}
@ -75,7 +73,6 @@ public class VorProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
return super.splitAddress(address);
}

7
enabler/src/de/schildbach/pte/VvtProvider.java
View file

@ -1,5 +1,5 @@
/*
* Copyright 2010-2015 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
@ -36,7 +36,7 @@ public class VvtProvider extends AbstractHafasClientInterfaceProvider {
public VvtProvider(final String apiAuthorization) {
super(NetworkId.VVT, API_BASE, PRODUCTS_MAP);
setApiVersion("1.14");
setApiVersion("1.15");
setApiClient("{\"id\":\"VAO\",\"l\":\"vs_vvt\",\"type\":\"AND\"}");
setApiAuthorization(apiAuthorization);
}
@ -53,7 +53,6 @@ public class VvtProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(name);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitStationName(name);
}
@ -62,7 +61,6 @@ public class VvtProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_ONE_COMMA.matcher(poi);
if (m.matches())
return new String[] { m.group(2), m.group(1) };
return super.splitPOI(poi);
}
@ -71,7 +69,6 @@ public class VvtProvider extends AbstractHafasClientInterfaceProvider {
final Matcher m = P_SPLIT_NAME_FIRST_COMMA.matcher(address);
if (m.matches())
return new String[] { m.group(1), m.group(2) };
return super.splitAddress(address);
}
}