-
Notifications
You must be signed in to change notification settings - Fork 307
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
Fix #402 - Add bikeshare support - Layers and Trip Plan #776
Merged
Merged
Changes from 1 commit
Commits
Show all changes
140 commits
Select commit
Hold shift + click to select a range
dcf8367
Added bike stations to the map from OTP server. (Default marker is sh…
carvalhorr def334a
Added bounding box to request to OTP from the current map view.
carvalhorr bd38de3
Added item in HomeActitity drawer to switch bikes on/off.
carvalhorr 8b1d61d
Added support for multiple overlays respond to marker selection.
carvalhorr 0f7d5a5
Added personalized icons for bike station and info window when they a…
carvalhorr 19465fc
Updating the progress notes document.
carvalhorr 4140046
Updating the progress notes document.
carvalhorr 411f42e
Extracted strings in bike info window to strings resource file.
carvalhorr c3e3808
Updating the progress notes document.
carvalhorr b92b91b
Changed the way to activate the bikeshare on the map using layers
carvalhorr a76938f
Updated daily log for June 20
carvalhorr 1b74a70
Updated bikeshare info window UI to be more similar to other info win…
carvalhorr 56b2127
Added animation to move the new Layers FAB with sliding panel.
carvalhorr 5c915b5
Updated daily log for June 21
carvalhorr 4a13cc2
Updated daily log for June 22
carvalhorr b86a0a5
Fixed bug #307.
carvalhorr 2814eba
Revert "Fixed bug #307."
carvalhorr 85513c2
Removed LatLng from MapModeController
carvalhorr d87cf31
Complementing previous commit, LatLng can be used (and is prefered) i…
carvalhorr e2d1857
fixing bug on clearBikeStations()
carvalhorr e2e07fb
fixing bug on clearBikeStations()
carvalhorr a291e98
Adding markers for bikes stations
carvalhorr e80d312
Updated daily log and TODOs
carvalhorr 0737126
Changed the image for the bike small marker to use XML instead of PNG
carvalhorr 7a190e7
Added missing bike icons for different screen sizes.
carvalhorr ff2d38a
Included credits for using USF Maps App icon.
carvalhorr 1cea0b7
Removed use of Marker.getTag()/Marker.setTag() as Amazon map does not…
carvalhorr 374dc90
Adding bikeshare source images in SVG to the version control.
carvalhorr 7470e5d
Changed bike color to white in the bike station maps marker.
carvalhorr 0f8801f
Switched to FAB Speed Dial library (https://github.com/markormesher/a…
carvalhorr 18ff5f6
included missing documentation and license information.
carvalhorr 218864a
Added layers FAB cancel icon when opened and added images and control…
carvalhorr d84cb07
Udated bike station marker to be just the (P)arking signal for now.
carvalhorr 9e8ccb6
Including missing change in previous commit to reference correct imag…
carvalhorr eb56241
Removed unnecessary references to bikeshare from BaseMapFragment
carvalhorr f10d292
Gracefully handle non existing bikeshare info on OTP
carvalhorr 1be71b3
Gracefully handle non existing bikeshare info on OTP (store supportsO…
carvalhorr b0d08fa
Progress log update
carvalhorr 641940f
Refactored BikeStationOverlay to have a static final instance of Laye…
carvalhorr cc2c136
Added an option in the preferences window to let users select whether…
carvalhorr c293efe
Minor changes in the bikeshare preference.
carvalhorr 4106050
Minor changes in the bikeshare preference.
carvalhorr bb23044
Merge remote-tracking branch 'origin/gbfs' into gbfs
carvalhorr c145bbb
Changed bike markers depending on map zoom level
carvalhorr 7bf2fc8
Added analytics to bikeshare
carvalhorr 3cd4d3f
Changed preference window to not display bikeshare option if it is no…
carvalhorr e13aee6
Added different analytics labels for clicking on floating bike and bi…
carvalhorr 28b970b
Changed bike station marker (to add more padding inside the marker)
carvalhorr 784e2e5
Refactored bike request/response from OTP to make implementation simi…
carvalhorr abd33e7
Included mock data for testing bike share requests.
carvalhorr 98de3bd
Progress log update
carvalhorr dcc0d8e
Added test for bike station request.
carvalhorr 2c856b5
Added test for bike station request.
carvalhorr 8b09cd4
Merge remote-tracking branch 'origin/gbfs' into gbfs
carvalhorr c88f16b
Fixing code style issues.
carvalhorr 339352e
Added tests for all values of first bike station in the response.
carvalhorr b9e49b1
Adding missing license information
carvalhorr 3c38f1e
Refactoring: added setIsOtp and removed overloaded constructor that t…
carvalhorr 3d01076
Documentation and style
carvalhorr fb35584
Created separate info window for bike station and floating bike.
carvalhorr 2e5224f
Added margin on the bike station divider.
carvalhorr a6ca5a0
speed dial map layer on/off control layout changes (removed little gr…
carvalhorr beac4bc
Fixed method name misspelling
carvalhorr d4a3129
Extracted hardcoded string to resources file.
carvalhorr 0395f1f
Added shared preference keys to string resources and renamed other st…
carvalhorr e1f1804
Fixed bug: bikeshare layer was displayed after deactivating it at pre…
carvalhorr 12fc840
Fixing issue: made bike station markers to remain on screen on map zo…
carvalhorr 2be7329
Fixed small error on bike marker info window.
carvalhorr c35d2b6
Improving performance for bike overlay markers. Instead of removing a…
carvalhorr 7275435
Added background to the speed dial label.
carvalhorr 1b1739c
Fixed layers floating action button color on main activity.
carvalhorr 0975138
Cleaning unused styles.
carvalhorr d842d33
Made BaseMapFragment support multiple MapModeController (to make bike…
carvalhorr 6725f1f
updated the work log.
carvalhorr f32031d
Issue fixed: set the bike window adapter before displaying the info w…
carvalhorr 919ad56
Made bike layer work when map is on route mode.
carvalhorr 617c009
Added feedback through a toast message when layer is activated/deacti…
carvalhorr d622853
Make the bikeshare layer available in regions where it is not support…
carvalhorr c6f4b0d
removed toast message when bikeshare layer is activated/deactivated.
carvalhorr d7c2ed9
updated the work log.
carvalhorr ef67efa
Included bikeshare as one option in trip planning.
carvalhorr d9aa908
Fixed documentation and naming for LayerUtils class.
carvalhorr b13182d
Merge branch 'gbfs' into gbfs-tripplan
carvalhorr e3d79ec
Showing bike stations part of a trip plan in the map view.
carvalhorr db99636
Fixed bug that sometimes made the app crash when a bike station marke…
carvalhorr 102292f
Update Spanish Translation
themonki 34be55e
Included bikeshare title on directions result.
carvalhorr e40a529
updated the work log.
carvalhorr 82398ae
Merge pull request #1 from themonki/gbfs
carvalhorr 1f6fae8
Updated the regions URL to use the production regions server.
carvalhorr 215c2c7
Merge branch 'gbfs-tripplan' into gbfs
carvalhorr eadc8fe
Included check to avoid bike markers to be displayed if the bike laye…
carvalhorr 60148c2
Stopped map to zoom to region when trip planning and viewing route on…
carvalhorr 920def2
Removed bikeshare layer activation from the preferences window.
carvalhorr e081c26
Made "Additional Trip Preferences" on "Trip Planner" to persist after…
carvalhorr c348659
Added deep-linkning integration
carvalhorr ddef3f1
Removed hard coded code for TAMPA and refactored string resources lin…
carvalhorr b9cb8ab
Fixing code style issues.
carvalhorr 16724df
Making sure bikeshare is turned on by default.
carvalhorr 8ef67da
Adding "Rodrigo Carvalho" to contributors list.
carvalhorr e6e737d
Added analytics to bikeshare baloon click (deep-link)
carvalhorr e341f68
Fixed misspelling in the word balloon.
carvalhorr bc5561e
Fixed issue with navigation drawer selected item.
carvalhorr 0dcc8e0
Fixed issue with vehicle balloon when displayed with bike layer.
carvalhorr bc974d1
Merge branch 'master' into gbfs
carvalhorr b0a698f
Fixed issue bikeshare not showing correctly when multiple instances o…
carvalhorr 736fb11
Pointing regions_api to github to release a beta version of OBA Andro…
carvalhorr 4003c15
Fixed bike station/floating bike ID on deep linking integration
carvalhorr 97ffd54
Fixed bike station/floating bike ID on deep linking integration to re…
carvalhorr d8eeb7a
Fixed bike station/floating bike ID on deep linking integration to re…
carvalhorr 44a8e95
Fixed bike station/floating bike ID on deep linking integration to re…
carvalhorr 83e5027
Merge remote-tracking branch 'origin/gbfs' into gbfs
carvalhorr 874c6ca
BaseMapFragment was crashing after latest fixes regarding showing bik…
carvalhorr 80c9ba9
Included bikeshare by default when planning a trip in a region that b…
carvalhorr 8f38538
Renamed LayerUtils.isBikeshareLayerActive() to LayerUtils.isBikeshare…
carvalhorr f79dccd
Put the bike ID as the title in the bike station balloon.
carvalhorr 37aa659
Refactoring: moved method isBikeshareEnabled() from LayerUtils to App…
carvalhorr 359329b
Removed commented code
carvalhorr 342054d
Removed commented code
carvalhorr 93402db
Fixed problem of stop info sliding panel collapsing when click on bik…
carvalhorr ed41138
Tint the ">" in the bike marker balloons to be gray to match the bus …
carvalhorr a7d890f
Changes in floating bike/bike station balloons
carvalhorr 4319973
Issue fixed: layers FAB not hidden when switching to "Starred stops" …
carvalhorr 25267b7
Issue fixed: layers FAB in wrong position after opening other apps an…
carvalhorr effba63
Removed unused files
carvalhorr 91bdc0c
Issue fixed: layers FAB icon displayed wrong when alternating between…
carvalhorr 155e9cb
Changed bikeshare small icon size to 15dp instead of 22dp
carvalhorr 6796ae8
Issue fixed: layers FAB not hidden when switching to "Starred stops" …
carvalhorr adde643
Change text in additional trip plan options if bikeshare is supported…
carvalhorr 2a88d4d
Files cleanup
carvalhorr 92bc1be
Issue fixed: first time the app run, the layers FAB did not appear if…
carvalhorr 802680f
Issue fixed: wrong visibility of layers FAB. There were many states t…
carvalhorr adec834
Made layers FAB speed dial stay open after toggling bikeshare on/off
carvalhorr 7c5c7ea
Added proguard rules required by library uk.co.markormesher:android-f…
carvalhorr 42251b1
Made interaction with map work while layers FAB speed dial is open.
carvalhorr 4ec0960
Code cleanup
carvalhorr 551c71a
Fixed issue: bike stations need to be displayed when planing a trip r…
carvalhorr c0d50df
Fixed issue: trip plan additional preferences not saving transit mode
carvalhorr 300d3f4
Remove USF Maps icon credit
barbeau 8cf7217
Remove USF Maps app icon credit from Spanish translation
barbeau 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
Added test for bike station request.
- Loading branch information
commit 2c856b55cb77aa89d7609438809babb6a18a609d
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
...y-android/src/androidTest/java/org/onebusaway/android/io/test/BikeStationRequestTest.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,26 @@ | ||
package org.onebusaway.android.io.test; | ||
|
||
import org.onebusaway.android.app.Application; | ||
import org.onebusaway.android.io.request.bike.OtpBikeStationRequest; | ||
import org.onebusaway.android.io.request.bike.OtpBikeStationResponse; | ||
import org.onebusaway.android.mock.MockRegion; | ||
import org.opentripplanner.routing.bike_rental.BikeRentalStation; | ||
|
||
/** | ||
* Created by carvalhorr on 7/14/17. | ||
*/ | ||
public class BikeStationRequestTest extends ObaTestCase { | ||
|
||
public void testGetBikeStationsTampa() { | ||
Application.get().setCurrentRegion(MockRegion.getTampa(getContext()), false); | ||
OtpBikeStationRequest request = OtpBikeStationRequest.newRequest(getContext(), null, null); | ||
OtpBikeStationResponse response = request.call(); | ||
assertNotNull(response); | ||
assertNotNull(response.stations); | ||
assertEquals(133, response.stations.size()); | ||
for (BikeRentalStation station: response.stations) { | ||
assertNotNull(station.name); | ||
} | ||
} | ||
|
||
} |
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
File renamed without changes.
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
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.
I think this fine the way it is.