-
Notifications
You must be signed in to change notification settings - Fork 131
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Navitia: Add Brazil providers #179
Open
grote
wants to merge
1
commit into
schildbach:master
Choose a base branch
from
grote:brazil-provider
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright 2014-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 javax.annotation.Nullable; | ||
|
||
import okhttp3.HttpUrl; | ||
|
||
/** | ||
* @author Torsten Grote | ||
*/ | ||
public class BrFloripaProvider extends AbstractNavitiaProvider | ||
{ | ||
private static final String API_REGION = "br-floripa"; | ||
|
||
public BrFloripaProvider(final HttpUrl api, @Nullable final String authorization) | ||
{ | ||
super(NetworkId.BRFLORIPA, api, authorization); | ||
|
||
setTimeZone("America/Sao_Paulo"); | ||
} | ||
|
||
@Override | ||
public String region() | ||
{ | ||
return API_REGION; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
* Copyright 2014-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 de.schildbach.pte.dto.Product; | ||
import de.schildbach.pte.dto.Style; | ||
import de.schildbach.pte.dto.Style.Shape; | ||
|
||
/** | ||
* @author Torsten Grote | ||
*/ | ||
public class BrProvider extends AbstractNavitiaProvider | ||
{ | ||
private static final String API_REGION = "br"; | ||
|
||
public BrProvider(final String authorization) | ||
{ | ||
super(NetworkId.BR, authorization); | ||
|
||
setTimeZone("America/Sao_Paulo"); | ||
} | ||
|
||
@Override | ||
public String region() | ||
{ | ||
return API_REGION; | ||
} | ||
|
||
@Override | ||
protected Style getLineStyle(final String network, final Product product, final String code, final String color) | ||
{ | ||
final Style defaultStyle = Standard.STYLES.get(product); | ||
int bc = defaultStyle.backgroundColor; | ||
int fc = defaultStyle.foregroundColor; | ||
if(color != null) { | ||
bc = Style.parseColor(color); | ||
fc = computeForegroundColor(color); | ||
} | ||
|
||
switch (product) | ||
{ | ||
case SUBURBAN_TRAIN: | ||
{ | ||
return new Style(Shape.CIRCLE, bc, fc); | ||
} | ||
case SUBWAY: | ||
{ | ||
return new Style(Shape.CIRCLE, bc, fc); | ||
} | ||
case TRAM: | ||
{ | ||
return new Style(Shape.RECT, bc, fc); | ||
} | ||
case BUS: | ||
{ | ||
return new Style(Shape.RECT, bc, fc); | ||
} | ||
default: | ||
return new Style(bc, fc); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -83,4 +83,8 @@ public enum NetworkId { | |
|
||
// Africa | ||
GHANA, | ||
|
||
// Brazil | ||
BR, BRFLORIPA, | ||
|
||
} |
84 changes: 84 additions & 0 deletions
84
enabler/test/de/schildbach/pte/live/BrFloripaProviderLiveTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/* | ||
* Copyright 2014-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 org.junit.Test; | ||
|
||
import de.schildbach.pte.BrFloripaProvider; | ||
import de.schildbach.pte.BrProvider; | ||
import de.schildbach.pte.dto.Point; | ||
import okhttp3.HttpUrl; | ||
|
||
import static org.junit.Assert.assertTrue; | ||
|
||
/** | ||
* @author Torsten Grote | ||
*/ | ||
public class BrFloripaProviderLiveTest extends AbstractNavitiaProviderLiveTest { | ||
|
||
public BrFloripaProviderLiveTest() { | ||
super(new BrFloripaProvider(HttpUrl.parse("https://transportr.grobox.de/api/v1/"), null)); | ||
} | ||
|
||
@Test | ||
public void nearbyStationsAddress() throws Exception { | ||
nearbyStationsAddress(-27597000, -48553000); | ||
} | ||
|
||
@Test | ||
public void nearbyStationsStation() throws Exception { | ||
nearbyStationsStation("stop_point:43719878"); | ||
} | ||
|
||
@Test | ||
public void nearbyStationsInvalidStation() throws Exception { | ||
nearbyStationsInvalidStation("stop_point:3719878"); | ||
} | ||
|
||
@Test | ||
public void queryDeparturesEquivsFalse() throws Exception { | ||
queryDeparturesEquivsFalse("stop_point:43719878"); | ||
} | ||
|
||
@Test | ||
public void queryDeparturesInvalidStation() throws Exception { | ||
queryDeparturesInvalidStation("stop_point:OWX:SP:6911"); | ||
} | ||
|
||
@Test | ||
public void suggestLocations() throws Exception { | ||
suggestLocationsFromName("Lagoa"); | ||
} | ||
|
||
@Test | ||
public void queryTripStations() throws Exception { | ||
queryTrip("Rua da Capela", "Bola de Neve Church"); | ||
} | ||
|
||
@Test | ||
public void queryMoreTrips() throws Exception { | ||
queryMoreTrips("CELESC", "SC-406"); | ||
} | ||
|
||
@Test | ||
public void getArea() throws Exception { | ||
final Point[] polygon = provider.getArea(); | ||
assertTrue(polygon.length > 0); | ||
} | ||
|
||
} |
89 changes: 89 additions & 0 deletions
89
enabler/test/de/schildbach/pte/live/BrProviderLiveTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
/* | ||
* Copyright 2014-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 org.junit.Test; | ||
|
||
import de.schildbach.pte.BrProvider; | ||
import de.schildbach.pte.dto.Point; | ||
|
||
import static org.junit.Assert.assertTrue; | ||
|
||
/** | ||
* @author Torsten Grote | ||
*/ | ||
public class BrProviderLiveTest extends AbstractNavitiaProviderLiveTest { | ||
|
||
public BrProviderLiveTest() { | ||
super(new BrProvider(secretProperty("navitia.authorization"))); | ||
} | ||
|
||
@Test | ||
public void nearbyStationsAddress() throws Exception { | ||
// Sao Paulo | ||
nearbyStationsAddress(-23547900, -46635200); | ||
} | ||
|
||
@Test | ||
public void nearbyStationsAddress2() throws Exception { | ||
// Rio de Janeiro | ||
nearbyStationsAddress(-22905300, -43179500); | ||
} | ||
|
||
@Test | ||
public void nearbyStationsStation() throws Exception { | ||
nearbyStationsStation("stop_point:OIO:SP:18255914"); | ||
} | ||
|
||
@Test | ||
public void nearbyStationsInvalidStation() throws Exception { | ||
nearbyStationsInvalidStation("stop_point:OIO:SPX:18255914"); | ||
} | ||
|
||
@Test | ||
public void queryDeparturesEquivsFalse() throws Exception { | ||
queryDeparturesEquivsFalse("stop_point:OSA:SP:800016608"); | ||
} | ||
|
||
@Test | ||
public void queryDeparturesInvalidStation() throws Exception { | ||
queryDeparturesInvalidStation("stop_point:OWX:SP:6911"); | ||
} | ||
|
||
@Test | ||
public void suggestLocations() throws Exception { | ||
suggestLocationsFromName("Republica"); | ||
} | ||
|
||
@Test | ||
public void queryTripStations() throws Exception { | ||
queryTrip("Benjamim Constant", "Avenida Paulista"); | ||
} | ||
|
||
@Test | ||
public void queryMoreTrips() throws Exception { | ||
queryMoreTrips("Republica", "Avenida Paulista"); | ||
} | ||
|
||
@Test | ||
public void getArea() throws Exception { | ||
final Point[] polygon = provider.getArea(); | ||
assertTrue(polygon.length > 0); | ||
} | ||
|
||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One of the live tests with an invalid station arrived here and
head
had nopagination
, but anerror
.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe this change should go into a different PR that implements error handling for all Navitia calls?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You seem to be merging PRs manually somehow. Couldn't you just split these 3 lines out into a separate commit when you do? I am happy to waive ownership on them.