Skip to content
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

DO NO MERGE: Flex duration factors #208

Closed
wants to merge 151 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
1faa689
Optionally abort the startup if configuration is invalid
leonardehrenfried Feb 7, 2024
a6d7518
Add documentation
leonardehrenfried Feb 8, 2024
57243b0
Remove 'public' modifier
leonardehrenfried Feb 8, 2024
43a6826
Add test
leonardehrenfried Feb 8, 2024
c3da460
Add documentation
leonardehrenfried Feb 8, 2024
f499a45
Fix typo
leonardehrenfried Feb 9, 2024
cc0c13d
Fix issue with cancellations on trip patterns that run after midnight
optionsome Mar 1, 2024
bd702cd
Apply review feedback
leonardehrenfried Mar 11, 2024
e6ba88e
Update documentation
leonardehrenfried Mar 11, 2024
3b80bf2
Merge remote-tracking branch 'upstream/dev-2.x' into config-check
leonardehrenfried Mar 11, 2024
ba8e563
Apply review feedback
leonardehrenfried Mar 12, 2024
5aeeffa
'property' -> 'parameter'
leonardehrenfried Mar 13, 2024
be68840
Add tests for TransitLayer
optionsome Mar 20, 2024
a3d0e67
Rename methods/fields and add docs
optionsome Mar 20, 2024
32eefbc
Apply suggestions from code review
leonardehrenfried Mar 25, 2024
cc4b0d9
Rename tests
leonardehrenfried Mar 25, 2024
86f1a83
Don't check warnings
leonardehrenfried Mar 25, 2024
7cf928e
Rename from properties to parameters
leonardehrenfried Mar 25, 2024
fae03b1
Move exception throwing code into ConfigModel.java
leonardehrenfried Mar 25, 2024
70026b9
Improve documentation
leonardehrenfried Mar 25, 2024
1023451
Add NOI OpenDataHub parking updater
leonardehrenfried Mar 25, 2024
999f28b
Update docs
leonardehrenfried Mar 25, 2024
95c4f6c
Add nicer toString
leonardehrenfried Mar 26, 2024
aebead9
Correct x/y lat/lon confusion
leonardehrenfried Mar 27, 2024
e58a5a4
Move polygons into separate class
leonardehrenfried Mar 27, 2024
4c9d5fc
Correct polygon for Frogner Park
leonardehrenfried Mar 28, 2024
256226d
Update lucene.version to v9.10.0
renovate[bot] Mar 31, 2024
ae3562a
Update Debug UI dependencies (non-major)
renovate[bot] Apr 2, 2024
c56924d
Merge pull request #5775 from opentripplanner/renovate/debug-ui-depen…
leonardehrenfried Apr 2, 2024
8d15a0d
Upgrade debug client to version 2024/04/2024-04-02T07:25
Apr 2, 2024
258398d
Remove import
leonardehrenfried Apr 2, 2024
827d5c0
Merge pull request #5773 from ibi-group/swap-lat-lon
leonardehrenfried Apr 2, 2024
8a45b2e
Update dependency com.google.cloud.tools:jib-maven-plugin to v3.4.2
renovate[bot] Apr 3, 2024
c1a9196
Update dependency org.jacoco:jacoco-maven-plugin to v0.8.12
renovate[bot] Apr 3, 2024
f0178e0
island pruning for stops without modes
bas-hbt Apr 3, 2024
5b6cfda
Fix bug in heuristics cost calculation for egress legs
habrahamsson-skanetrafiken Apr 3, 2024
3b44701
Add commit activity badge
leonardehrenfried Apr 3, 2024
978424c
Merge pull request #5719 from HSLdevcom/fix-late-cancellations
optionsome Apr 3, 2024
b0d28ff
Add changelog entry for #5719 [ci skip]
Apr 3, 2024
4a1b0d0
Improve handling of invalid leg reference
vpaturet Mar 21, 2024
b41f286
Remove dependency on org.json-simple
leonardehrenfried Apr 4, 2024
3c1bb2d
Move expensive WGS84_XY constant setup into ElevationModule
leonardehrenfried Apr 4, 2024
64ded27
Make field private
leonardehrenfried Apr 4, 2024
0d04646
Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1
renovate[bot] Apr 4, 2024
300a52e
Update google.dagger.version to v2.51.1
renovate[bot] Apr 5, 2024
30dee5f
Merge pull request #5777 from opentripplanner/renovate/lucene.version
leonardehrenfried Apr 5, 2024
db554c2
Fix handling of null transport mode filter
vpaturet Apr 5, 2024
0bed0f2
Merge pull request #5785 from leonardehrenfried/remove-json-simple
leonardehrenfried Apr 5, 2024
24076e9
Discourage walking when sidepaths are available
optionsome Apr 5, 2024
1a05817
Update jersey monorepo to v3.1.6
renovate[bot] Apr 5, 2024
5871882
Fix trip duplication in DSJ mapping
vpaturet Apr 8, 2024
942e3b5
Merge pull request #5788 from opentripplanner/renovate/google.dagger.…
leonardehrenfried Apr 9, 2024
c4dff62
Merge pull request #5789 from entur/fix_null_transport_mode_filter
vpaturet Apr 9, 2024
da32716
Add changelog entry for #5789 [ci skip]
Apr 9, 2024
d15e616
Merge pull request #5791 from opentripplanner/renovate/jersey-monorepo
leonardehrenfried Apr 9, 2024
f5c51bc
Add comment about moving constant
leonardehrenfried Apr 9, 2024
9e1bd4d
Fix typo
vpaturet Apr 9, 2024
3a7a418
Update src/main/java/org/opentripplanner/graph_builder/module/ned/Ele…
leonardehrenfried Apr 9, 2024
70bb4ee
Fix formatting
leonardehrenfried Apr 9, 2024
9d764b1
Upgrade Codecov action and use token
leonardehrenfried Apr 9, 2024
d25e97b
Merge pull request #5797 from leonardehrenfried/codecov-upgrade
leonardehrenfried Apr 9, 2024
bf11e9f
Don't back cycling on use_sidepath and apply safety values in default…
optionsome Apr 9, 2024
1896c99
Added unit test
vpaturet Apr 9, 2024
0564038
extract ferry-check
bas-hbt Apr 9, 2024
ffbacb9
Finetune renovate automerge config [ci skip]
leonardehrenfried Apr 10, 2024
8754908
Increase log severity for incompatible serialized leg reference
vpaturet Apr 10, 2024
146db25
Add matrix badge [ci skip]
leonardehrenfried Apr 10, 2024
39fe08e
Merge pull request #5769 from leonardehrenfried/noi-parking
leonardehrenfried Apr 10, 2024
9309737
refactoring
bas-hbt Apr 11, 2024
ad49e64
Merge pull request #5790 from HSLdevcom/use-sidepath
optionsome Apr 11, 2024
69dca4e
Add changelog entry for #5790 [ci skip]
Apr 11, 2024
8230308
use pattern variable
bas-hbt Apr 11, 2024
bbbe74c
Implement hashCode for Money
leonardehrenfried Apr 11, 2024
2bd35cc
Update GPG plugin less often [ci skip]
leonardehrenfried Apr 11, 2024
150170f
Update dependency com.tngtech.archunit:archunit to v1.3.0
renovate[bot] Apr 11, 2024
20f0191
Merge pull request #5782 from HBTGmbH/island-pruning-for-stops-withou…
leonardehrenfried Apr 12, 2024
b1e26a8
Add changelog entry for #5782 [ci skip]
Apr 12, 2024
75e515b
Overwrites directMode when it is not set in the request. (#5779)
eibakke Apr 12, 2024
f3b8c93
Add changelog entry for #5779 [ci skip]
Apr 12, 2024
1e1659a
Update dependency @testing-library/react to v15
renovate[bot] Apr 13, 2024
bd8ff4b
Merge pull request #5799 from opentripplanner/renovate/testing-librar…
leonardehrenfried Apr 15, 2024
86af4f8
Upgrade debug client to version 2024/04/2024-04-15T05:43
Apr 15, 2024
dc95c7b
Update dependency org.entur.gbfs:gbfs-java-model to v3.1.1
renovate[bot] Apr 15, 2024
31341fa
Automerge maven-jar-plugin [ci skip]
leonardehrenfried Apr 15, 2024
af101e0
Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.0
renovate[bot] Apr 13, 2024
587162b
Merge pull request #5784 from entur/improve_invalid_leg_reference_han…
vpaturet Apr 15, 2024
b1ed4ff
Add flex duration factors and offsets
leonardehrenfried Feb 12, 2024
95527bb
Add initial implementation of flex duration factors
leonardehrenfried Feb 14, 2024
ea0960a
Remove stop-time-based factors
leonardehrenfried Mar 15, 2024
a0eb066
Move factors into calcultor
leonardehrenfried Mar 15, 2024
cc76012
Encapsulate factors, add parsing
leonardehrenfried Mar 15, 2024
dca331b
Make factors serializable
leonardehrenfried Mar 15, 2024
721845e
Use safe instead of mean values
leonardehrenfried Apr 5, 2024
abcfa93
Use correct booking info instances
leonardehrenfried Apr 5, 2024
5066052
Implement duration modifier for ScheduledDeviated trip
leonardehrenfried Apr 5, 2024
90b15cd
Rename and test
leonardehrenfried Apr 6, 2024
41b2e50
Extract class for building flex stop times
leonardehrenfried Apr 7, 2024
dec30cd
Remove durationModifier to ScheduledDeviatedTrip
leonardehrenfried Apr 9, 2024
354c968
Add test and docs for DurationModifier
leonardehrenfried Apr 9, 2024
991406e
Cleanup, tests and documentation
leonardehrenfried Apr 9, 2024
b176aee
Merge pull request #5786 from leonardehrenfried/move-crs
leonardehrenfried Apr 15, 2024
591296b
Update Debug UI dependencies (non-major)
renovate[bot] Apr 16, 2024
f77cede
Update slf4j monorepo to v2.0.13
renovate[bot] Apr 15, 2024
97315c0
Merge pull request #5803 from opentripplanner/renovate/debug-ui-depen…
leonardehrenfried Apr 16, 2024
89c2027
Upgrade debug client to version 2024/04/2024-04-16T05:11
Apr 16, 2024
7fc187a
Merge pull request #5804 from opentripplanner/renovate/org.entur.gbfs…
leonardehrenfried Apr 16, 2024
28e3fc6
Merge pull request #5794 from entur/fix_trip_duplication_in_DSJ_mapping
vpaturet Apr 16, 2024
ed40a51
Add changelog entry for #5794 [ci skip]
Apr 16, 2024
257ca44
Merge pull request #5801 from leonardehrenfried/fix-hashcode
leonardehrenfried Apr 16, 2024
bad0b72
Fix DebugUi doc
habrahamsson-skanetrafiken Apr 17, 2024
d0788f2
Merge pull request #5808 from Skanetrafiken/fix-doc
leonardehrenfried Apr 17, 2024
a1f51da
Add Bikeep parking updater
leonardehrenfried Apr 10, 2024
f2a76c2
Add tag handling
leonardehrenfried Apr 10, 2024
68f667e
Apply suggestions from code review
leonardehrenfried Apr 18, 2024
085f049
Merge pull request #5676 from ibi-group/config-check
leonardehrenfried Apr 18, 2024
4b5b7d6
Add changelog entry for #5676 [ci skip]
Apr 18, 2024
6c7d953
Replace DurationModifier with TimePenalty
leonardehrenfried Apr 18, 2024
091e4ed
Update documentation
leonardehrenfried Apr 18, 2024
165e8cf
Merge remote-tracking branch 'upstream/dev-2.x' into flex-duration-fa…
leonardehrenfried Apr 18, 2024
355b287
Update documentation
leonardehrenfried Apr 18, 2024
cd166d8
Update dependency ch.qos.logback:logback-classic to v1.5.6
renovate[bot] Apr 19, 2024
7440b8a
Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3
renovate[bot] Apr 19, 2024
c5d87a1
Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.4
renovate[bot] Apr 19, 2024
aa92132
Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.1
renovate[bot] Apr 21, 2024
e2cc0e5
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.3
renovate[bot] Apr 24, 2024
3572d3b
de-emphasize mailing list in landing page
abyrd Apr 25, 2024
965fe27
Update Debug UI dependencies (non-major)
renovate[bot] Apr 25, 2024
a5d91fb
Resolve review comments
habrahamsson-skanetrafiken Apr 25, 2024
7074fc4
Merge pull request #5814 from opentripplanner/renovate/debug-ui-depen…
testower Apr 25, 2024
329266c
Upgrade debug client to version 2024/04/2024-04-25T13:07
Apr 25, 2024
3da04c0
Merge pull request #5783 from Skanetrafiken/fix-egress-transfer-cost-bug
habrahamsson-skanetrafiken Apr 25, 2024
23cd12e
Add changelog entry for #5783 [ci skip]
Apr 25, 2024
7d30e9d
Merge pull request #5820 from opentripplanner/mailing-list-docs-update
abyrd Apr 25, 2024
a6d8e41
Add changelog entry for #5820 [ci skip]
Apr 25, 2024
0859b64
Merge pull request #5798 from leonardehrenfried/bikeep
leonardehrenfried Apr 26, 2024
0a1abb2
Update Debug UI dependencies (non-major)
renovate[bot] May 2, 2024
45e0ffa
Merge pull request #5823 from opentripplanner/renovate/debug-ui-depen…
testower May 2, 2024
5b3be61
Upgrade debug client to version 2024/05/2024-05-02T14:37
May 2, 2024
ac85a45
test: modify tests for Kitsap transit cash trasnfers
daniel-heppner-ibigroup May 2, 2024
b6a2982
implement new transfer logic for Kitsap transit
daniel-heppner-ibigroup May 2, 2024
b5f6a70
orca fares: general cleanup and fix for xfer value
daniel-heppner-ibigroup May 3, 2024
e33d710
fix(orca-fares): use getter for transfer discount
daniel-heppner-ibigroup May 3, 2024
f4f1e39
Merge pull request #5826 from ibi-group/kitsap-free-transfers
leonardehrenfried May 6, 2024
b47dfe8
Add changelog entry for #5826 [ci skip]
May 6, 2024
51f466f
Clean up changelog [ci skip]
leonardehrenfried May 6, 2024
b1d36f9
Update accessibility score docs [ci skip]
leonardehrenfried May 6, 2024
90148e0
Update docs about experimental fields
leonardehrenfried May 6, 2024
a4dc25b
Revert renaming
leonardehrenfried May 6, 2024
42b36bf
Merge remote-tracking branch 'upstream/dev-2.x' into flex-duration-fa…
leonardehrenfried May 6, 2024
ea67975
Remove extra collection conversion
leonardehrenfried May 8, 2024
695161a
Rename modifiers/factors to time penalty
leonardehrenfried May 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/workflows/cibuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ jobs:

- name: Send coverage data to codecov.io
if: github.repository_owner == 'opentripplanner'
uses: codecov/codecov-action@v3.1.1
uses: codecov/codecov-action@v4
with:
files: target/site/jacoco/jacoco.xml
token: ${{ secrets.CODECOV_TOKEN }}
verbose: true

- name: Deploy to Github Package Registry
if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x')
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/performance-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:

- name: Set up Maven
if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
uses: stCarolas/setup-maven@v.4.5
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.8.2

Expand All @@ -102,7 +102,7 @@ jobs:
- name: Archive travel results file
if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: ${{ matrix.location }}-travelSearch-results.csv
path: test/performance/${{ matrix.location }}/travelSearch-results.csv
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
## Overview

[![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner)
[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat&?cacheSeconds=172800)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im)
[![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner)
[![Commit activity](https://img.shields.io/github/commit-activity/y/opentripplanner/OpenTripPlanner)](https://github.com/opentripplanner/OpenTripPlanner/graphs/contributors)
[![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner)

OpenTripPlanner (OTP) is an open source multi-modal trip planner, focusing on travel by scheduled
Expand Down
Loading
Loading