Filter vector tiles stops by current service week #6003

leonardehrenfried · 2024-08-09T08:13:57Z

Summary

As requested by @fpurcell this PR allows the filtering of the vector tiles stop layer by the current service week.

It introduces a new concept into the vector tiles: a layer filter, which allows you remove results from the regular set of geometries.

Issue

Relates to #4879

Unit tests

✔️

Documentation

Autogenerated & Javadoc.

codecov · 2024-08-09T08:28:23Z

Codecov Report

Attention: Patch coverage is 67.24138% with 19 lines in your changes missing coverage. Please review.

Project coverage is 69.79%. Comparing base (dd2d0df) to head (253bb17).
Report is 63 commits behind head on dev-2.x.

Files with missing lines	Patch %	Lines
...ipplanner/ext/vectortiles/layers/LayerFilters.java	60.00%	8 Missing ⚠️
...xt/vectortiles/layers/stops/StopsLayerBuilder.java	0.00%	3 Missing ⚠️
...pplanner/apis/gtfs/datafetchers/QueryTypeImpl.java	0.00%	3 Missing ⚠️
...ntripplanner/apis/gtfs/generated/GraphQLTypes.java	62.50%	2 Missing and 1 partial ⚠️
...s/gtfs/support/filter/PatternByDateFilterUtil.java	80.00%	1 Missing ⚠️
...ntripplanner/inspector/vector/LayerParameters.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             dev-2.x    #6003   +/-   ##
==========================================
  Coverage      69.78%   69.79%           
- Complexity     17362    17367    +5     
==========================================
  Files           1964     1964           
  Lines          74388    74403   +15     
  Branches        7625     7626    +1     
==========================================
+ Hits           51911    51928   +17     
+ Misses         19833    19831    -2     
  Partials        2644     2644

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

leonardehrenfried · 2024-09-09T16:00:27Z

@fpurcell If you want to try this newest version out, you can use this config: https://github.com/opentripplanner/OpenTripPlanner/pull/6003/files#diff-2b0ae0e039e4bd0880eef97069c379ddb3b69fddbfe95e18b8e20dbdde457c36R66-R73

leonardehrenfried · 2024-09-10T14:43:25Z

@optionsome @t2gran I move the class PatternByServiceDatesFilter into the core model and separate the GraphQL-specific parts from it. This is now ready for review.

doc/user/examples/ibi/portland/router-config.json

src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/LayerFilters.java

optionsome · 2024-09-13T18:06:19Z

src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java

+import org.opentripplanner.transit.service.TransitService;
+
+/**
+ * Utility methods for instantiating a {@link PatternByServiceDatesFilter}/


Suggested change

* Utility methods for instantiating a {@link PatternByServiceDatesFilter}/

* Utility methods for instantiating a {@link PatternByServiceDatesFilter}.

I think the / was a mistake. but if not, feel free to ignore this suggestion.

It was. Applied.

Why am I still seeing the / here? What caused this 🤔 ?

src/test/java/org/opentripplanner/apis/gtfs/PatternTestModel.java

src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java

leonardehrenfried · 2024-09-17T07:45:15Z

Since I was struggling to attract reviewers, I added one more parameter to Stop#routes in order to not split up the work into too many PRs.

optionsome · 2024-09-17T14:15:48Z

src/main/java/org/opentripplanner/apis/gtfs/support/filter/PatternByDateFilterUtil.java

+import org.opentripplanner.transit.service.TransitService;
+
+/**
+ * Utility methods for instantiating a {@link PatternByServiceDatesFilter}/


Why am I still seeing the / here? What caused this 🤔 ?

src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls

leonardehrenfried · 2024-09-17T14:45:33Z

@optionsome I think I might have made a mistake when merging/rebasing. It's fixed now.

src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls

Co-authored-by: Joel Lappalainen <[email protected]>

leonardehrenfried requested a review from a team as a code owner August 9, 2024 08:13

leonardehrenfried marked this pull request as draft August 9, 2024 08:14

This was referenced Aug 9, 2024

Possible: support date-range-based OTP Index queries (e.g. getting ‘active’ stops/routes for specific date(s)) #4879

Closed

[DO NOT MERGE] PRs to test during Leonard's absence ibi-group/OpenTripPlanner#220

Closed

leonardehrenfried force-pushed the trimet-vector-layer branch from b93818c to b15ea3f Compare September 4, 2024 13:13

leonardehrenfried added 6 commits September 5, 2024 16:55

Filter stops by current service week

aba7f80

Update example file

526e3f2

Introduce vector tile filters

6f1db53

Lowercase the enum name

924fce0

Add documentation

0f5aaf6

Add test

9303ee5

leonardehrenfried force-pushed the trimet-vector-layer branch from 913239d to 9303ee5 Compare September 5, 2024 14:56

leonardehrenfried marked this pull request as ready for review September 5, 2024 19:36

optionsome self-requested a review September 10, 2024 09:28

Move filter class into transit.service

966a7c9

leonardehrenfried added the IBI Developed by or important for IBI Group label Sep 12, 2024

habrahamsson-skanetrafiken requested a review from vpaturet September 12, 2024 14:21

Merge remote-tracking branch 'upstream/dev-2.x' into trimet-vector-layer

dd2d0df

optionsome requested changes Sep 13, 2024

View reviewed changes

leonardehrenfried added 3 commits September 16, 2024 10:17

Move LayerFilters up one level

a618219

Rename variable

5c76b0b

Move test generation model

cc51cb1

leonardehrenfried requested a review from optionsome September 16, 2024 08:38

leonardehrenfried added 4 commits September 16, 2024 10:41

Merge remote-tracking branch 'upstream/dev-2.x' into trimet-vector-layer

203943c

Rename enum to SUNDAY_TO_SUNDAY_SERVICE_WEEK

8b885dc

Extend schema for filtering routes by service dates

cd73bd7

Improve implementation

7d9033d

leonardehrenfried added 2 commits September 16, 2024 15:22

Convert from Stream to Collection

8f03dbb

Add GraphQL assertion

1a2fc41

optionsome reviewed Sep 17, 2024

View reviewed changes

src/ext/java/org/opentripplanner/ext/vectortiles/layers/LayerFilters.java Outdated Show resolved Hide resolved

leonardehrenfried added 2 commits September 17, 2024 09:40

Format schema

1d18923

Update Javadoc

87991ac

optionsome reviewed Sep 17, 2024

View reviewed changes

Apply review feedback

86b48db

leonardehrenfried requested a review from optionsome September 17, 2024 14:46

optionsome reviewed Sep 17, 2024

View reviewed changes

src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls Outdated Show resolved Hide resolved

Fix spelling

253bb17

Co-authored-by: Joel Lappalainen <[email protected]>

leonardehrenfried requested a review from optionsome September 18, 2024 05:17

t2gran added this to the 2.7 (next release) milestone Sep 18, 2024

optionsome approved these changes Sep 18, 2024

View reviewed changes

leonardehrenfried enabled auto-merge September 19, 2024 04:48

vpaturet approved these changes Sep 20, 2024

View reviewed changes

leonardehrenfried merged commit dc56145 into opentripplanner:dev-2.x Sep 20, 2024
5 checks passed

t2gran pushed a commit that referenced this pull request Sep 20, 2024

Add changelog entry for #6003 [ci skip]

885e4ae

leonardehrenfried deleted the trimet-vector-layer branch September 20, 2024 11:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Filter vector tiles stops by current service week #6003

Filter vector tiles stops by current service week #6003

leonardehrenfried commented Aug 9, 2024 •

edited

Loading

codecov bot commented Aug 9, 2024 •

edited

Loading

leonardehrenfried commented Sep 9, 2024

leonardehrenfried commented Sep 10, 2024

optionsome Sep 13, 2024

optionsome Sep 13, 2024

leonardehrenfried Sep 16, 2024

optionsome Sep 17, 2024

leonardehrenfried commented Sep 17, 2024

optionsome Sep 17, 2024

leonardehrenfried commented Sep 17, 2024 •

edited

Loading

	* Utility methods for instantiating a {@link PatternByServiceDatesFilter}/
	* Utility methods for instantiating a {@link PatternByServiceDatesFilter}.

Filter vector tiles stops by current service week #6003

Filter vector tiles stops by current service week #6003

Conversation

leonardehrenfried commented Aug 9, 2024 • edited Loading

Summary

Issue

Unit tests

Documentation

codecov bot commented Aug 9, 2024 • edited Loading

Codecov Report

leonardehrenfried commented Sep 9, 2024

leonardehrenfried commented Sep 10, 2024

optionsome Sep 13, 2024

Choose a reason for hiding this comment

optionsome Sep 13, 2024

Choose a reason for hiding this comment

leonardehrenfried Sep 16, 2024

Choose a reason for hiding this comment

optionsome Sep 17, 2024

Choose a reason for hiding this comment

leonardehrenfried commented Sep 17, 2024

optionsome Sep 17, 2024

Choose a reason for hiding this comment

leonardehrenfried commented Sep 17, 2024 • edited Loading

leonardehrenfried commented Aug 9, 2024 •

edited

Loading

codecov bot commented Aug 9, 2024 •

edited

Loading

leonardehrenfried commented Sep 17, 2024 •

edited

Loading