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

Upstream merge 2024-02-05 #202

Merged
merged 69 commits into from
Feb 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
242b3fb
Return agencies and feed publisher in geocoding
leonardehrenfried Jan 19, 2024
d4d7c55
Serialize agencies in Lucene index
leonardehrenfried Jan 20, 2024
8726b2f
Add test for agencies
leonardehrenfried Jan 20, 2024
1db3ac1
Add test for feed publisher
leonardehrenfried Jan 20, 2024
1182afd
Add documentation
leonardehrenfried Jan 20, 2024
0e529c7
Add tests
leonardehrenfried Jan 21, 2024
a0e40e3
Inline code
leonardehrenfried Jan 21, 2024
a5fe85e
fix(deps): update dependency com.google.guava:guava to v33
renovate[bot] Jan 22, 2024
4e14a55
fix(deps): update geotools.version to v30.2
renovate[bot] Jan 24, 2024
47e2b94
fix(deps): update dependency org.apache.httpcomponents.client5:httpcl…
renovate[bot] Jan 24, 2024
4410fb1
Rename hopCost/Time -> mountDismountCost/Time in prefs
optionsome Jan 30, 2024
bfc479f
Merge remote-tracking branch 'upstream/dev-2.x' into geocoder-agency
leonardehrenfried Jan 30, 2024
9610132
Refactors GroupStopBuilder addLocation method.
eibakke Jan 31, 2024
195bb63
Refactors GroupStopBuilder addLocation method.
eibakke Jan 31, 2024
36ad8fc
Merge branch 'group-stop-builder-fix' of github.com:entur/OpenTripPla…
eibakke Feb 1, 2024
c0ebcbe
Adds unit test for GroupStop's geometry and encompassingAreaGeometry.
eibakke Feb 1, 2024
34bd9bb
Remove VehicleToStopHeuristics
leonardehrenfried Sep 28, 2023
fa30c9c
Set default cost for penalty
leonardehrenfried Oct 16, 2023
2a63edf
Finetune default values
leonardehrenfried Oct 16, 2023
f5e7cae
Improve tests and documentation
leonardehrenfried Oct 16, 2023
0ba3b90
Decorate direct itineraries with accessEgressPenalty
leonardehrenfried Oct 18, 2023
64cff4a
Use correct enum value in Transmodel schema
leonardehrenfried Oct 19, 2023
a4fed17
Remove penalty for direct itineraries
leonardehrenfried Oct 20, 2023
a2d84d7
Extract method for formatting default values
leonardehrenfried Oct 20, 2023
3f909f0
Set penalty to zero in test
leonardehrenfried Oct 20, 2023
3f2084f
Subtract generalized cost that was previously added
leonardehrenfried Nov 1, 2023
16f21df
Fix merge artifacts
leonardehrenfried Jan 30, 2024
d06a4db
Revert changes, done in other PR
leonardehrenfried Feb 1, 2024
488f345
Uses BERLIN coordinates and polygon instead of non-sense ones in Grou…
eibakke Feb 1, 2024
f35d8ca
Swap out stop code
leonardehrenfried Jan 31, 2024
7a7b35a
Add agency-specific stop code
leonardehrenfried Jan 31, 2024
866bc90
Implement logic for fetching primary stop
leonardehrenfried Jan 31, 2024
c9ef962
Adapt check for when names should be swapped
leonardehrenfried Jan 31, 2024
6e2cfff
Use more general version of agencySpecific methods
leonardehrenfried Feb 1, 2024
85d762a
Improve documentation
leonardehrenfried Feb 1, 2024
af42abe
Merge pull request #5640 from opentripplanner/renovate/geotools.version
leonardehrenfried Feb 5, 2024
634b339
Bump serialization version id for #5640
Feb 5, 2024
d2cc943
Merge pull request #5635 from opentripplanner/renovate/major-guava-mo…
leonardehrenfried Feb 5, 2024
eaa9160
Merge pull request #5644 from opentripplanner/renovate/org.apache.htt…
leonardehrenfried Feb 5, 2024
9f66f5d
Move method into sandbox
leonardehrenfried Feb 5, 2024
a83c2b1
Merge remote-tracking branch 'upstream/dev-2.x' into geocoder-agency
leonardehrenfried Feb 5, 2024
e34d655
Merge pull request #5651 from entur/group-stop-builder-fix
eibakke Feb 5, 2024
eaaf758
Add changelog entry for #5651 [ci skip]
Feb 5, 2024
190f745
Bump serialization version id for #5651
Feb 5, 2024
4f5c590
Fixes a few typos and improves documentation in the TransitService in…
eibakke Feb 5, 2024
8a7bbc0
Changes the GroupStop's getEncompassingAreaGeometry method to return …
eibakke Feb 5, 2024
0978b31
Merge pull request #5634 from ibi-group/geocoder-agency
leonardehrenfried Feb 5, 2024
55d87a5
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
leonardehrenfried Feb 5, 2024
0a42a1d
Use different source for monorail
leonardehrenfried Feb 5, 2024
645d324
Update junit5 monorepo to v5.10.2
renovate[bot] Feb 5, 2024
7705301
Update dependency org.slf4j:jul-to-slf4j to v2.0.12
renovate[bot] Feb 5, 2024
31cb93c
Update dependency org.mockito:mockito-core to v5.10.0
renovate[bot] Feb 6, 2024
f9c5569
Merge pull request #5650 from HSLdevcom/rename-hop
optionsome Feb 6, 2024
22dad32
Bump serialization version id for #5650
Feb 6, 2024
e840582
Merge pull request #5658 from entur/typo-cleanup
eibakke Feb 6, 2024
5184fa0
Update graphqlcodegenerator monorepo to v5.0.2
renovate[bot] Feb 7, 2024
5904d2e
Update micrometer.version to v1.12.2
renovate[bot] Feb 7, 2024
1d4f70f
Update dependency com.google.cloud:libraries-bom to v26.31.0
renovate[bot] Feb 7, 2024
948d7ad
Merge pull request #5669 from opentripplanner/renovate/micrometer.ver…
leonardehrenfried Feb 7, 2024
a38ce7b
Merge pull request #5670 from opentripplanner/renovate/com.google.clo…
leonardehrenfried Feb 7, 2024
d79bb93
Merge pull request #5381 from leonardehrenfried/remove-heuristics
leonardehrenfried Feb 7, 2024
46b00ab
Add changelog entry for #5381 [ci skip]
Feb 7, 2024
d697e93
Merge pull request #5668 from opentripplanner/renovate/graphqlcodegen…
leonardehrenfried Feb 7, 2024
7692ef1
Apply review feedback
leonardehrenfried Feb 7, 2024
1834124
Merge pull request #5659 from entur/group-stop-encompassing-area-cleanup
eibakke Feb 7, 2024
026e39e
Merge pull request #5653 from ibi-group/consolidated-stop-codes
leonardehrenfried Feb 8, 2024
2bd3fe3
Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…
leonardehrenfried Feb 8, 2024
4a78301
Update Atlanta smoke test
leonardehrenfried Feb 8, 2024
c2afe26
Add penalty for Cobb County flex
leonardehrenfried Feb 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
Prev Previous commit
Next Next commit
Bump serialization version id for opentripplanner#5650
  • Loading branch information
OTP Serialization Version Bot committed Feb 6, 2024
commit 22dad32bea0ad075fbdf17d02a083d19bf5b4090
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@


<properties>
<otp.serialization.version.id>143</otp.serialization.version.id>
<otp.serialization.version.id>144</otp.serialization.version.id>
<!-- Lib versions - keep list sorted on property name -->
<geotools.version>30.2</geotools.version>
<google.dagger.version>2.50</google.dagger.version>