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

Add variable fares by time or day #357

Merged
Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
94d15cb
Added timeframes
omar-kabbani Aug 4, 2022
bfc2b12
Add date-based fares
omar-kabbani Aug 5, 2022
713e91c
Update timeframes.txt description
isabelle-dr Nov 14, 2022
5a8ca38
Change end time from required to optional
isabelle-dr Nov 14, 2022
0b7c9e2
Records with the same timeframe id must cover a 24h period
isabelle-dr Nov 14, 2022
fd2eb13
no overlap
isabelle-dr Nov 14, 2022
991ccba
remove requirement on 24h coverage and overlapping
isabelle-dr Nov 15, 2022
d2e89a6
fix typo
isabelle-dr Nov 21, 2022
710be10
Revert changes in timeframes.end_time
isabelle-dr Nov 23, 2022
f9a4a1d
move service_id to timeframes.txt
isabelle-dr Mar 10, 2023
84da99f
Move timeframes to the fares v2 section
isabelle-dr Mar 10, 2023
b8aad98
rename timeframe_id to timeframe_group_id
isabelle-dr Mar 10, 2023
438dbf2
Merge branch 'master' into GTFS-Fares-v2-time-variable-fares
isabelle-dr Mar 15, 2023
d68c3fd
place timeframes.txt with other Fares v2 files
isabelle-dr Mar 15, 2023
50e60c8
Rename from/to fields + change empty semantics
isabelle-dr Mar 21, 2023
d42bfdf
add line break
isabelle-dr Mar 21, 2023
50a080d
Add timeframes description
isabelle-dr Mar 23, 2023
19dae72
Make timeframe fields required
isabelle-dr Mar 23, 2023
0222fff
service_id references calendar or calendar_dates
isabelle-dr Mar 23, 2023
27f5c06
Add requirements
isabelle-dr Mar 23, 2023
9bd26d0
typo
isabelle-dr Mar 23, 2023
acd9d0d
Update timeframe fields description
isabelle-dr Apr 4, 2023
a182e6c
end time is not included in the interval
isabelle-dr Apr 4, 2023
e8463ce
Add timeframe_type field
isabelle-dr Apr 4, 2023
477ab30
Overlapping time frames must not be defined
isabelle-dr Apr 5, 2023
c34bfed
introduce override
isabelle-dr Apr 5, 2023
d4afc6e
improve override description
isabelle-dr Apr 7, 2023
55679c9
Revert "improve override description"
isabelle-dr Apr 7, 2023
189822f
improve override description
isabelle-dr Apr 7, 2023
f0e18a8
update timeframe fields description
isabelle-dr Apr 7, 2023
0aedadc
remove timeframe fields for no exact matched found
isabelle-dr Apr 11, 2023
91bda27
Update descriptions for empty values:
isabelle-dr Apr 11, 2023
af4b67b
Both values need to be empty or neither should be empty
isabelle-dr May 24, 2023
fe45e7e
Change to local time semantics
isabelle-dr May 24, 2023
045258f
Changed name start/end_timeframe_group_id
tzujenchanmbd May 24, 2023
ad54f36
Remove timeframe_type & priority fields
tzujenchanmbd May 24, 2023
518578b
revise "start" to "end"
tzujenchanmbd May 25, 2023
f33a935
Remove "initial" after Gavriel's comment
isabelle-dr Jun 25, 2023
4bf749f
Remove unnecessary empty description
tzujenchanmbd Jul 19, 2023
0007c89
Changes based on Jeremy's feedback
tzujenchanmbd Jul 20, 2023
1a65d75
Modify empty wording
tzujenchanmbd Jul 20, 2023
12c3bb7
Move overlapping requirement out of service_id description
isabelle-dr Jul 27, 2023
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
Revert "improve override description"
This reverts commit d4afc6e.
  • Loading branch information
isabelle-dr committed Apr 7, 2023
commit 55679c95ddd2b1989aba55b022cd7f27dc43e715
5 changes: 1 addition & 4 deletions gtfs/spec/en/reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -436,10 +436,7 @@ To process the cost of a leg:
| `end_timeframe_group_id` | Foreign ID referencing `timeframes.timeframe_group_id` | Optional | Defines the timeframe for the arrival of the fare leg.<br><br>For a fare leg rule that specifies a `end_timeframe_group_id`, that rule will match a particular leg if there exists at least a row in `timeframes.txt` where all of the following conditions are true:<br>- The row’s `timeframe_group_id` is equal to the `end_timeframe_group_id` value.<br>- The set of service days identified by the row’s `service_id` contains the service day of the leg’s departure trip.<br>- The arrival time of the leg, relative to the service day per [GTFS Time field type](#field-types) conventions, is greater than or equal to the rows `start_time` value and less than the `end_time` value.<br><br>If there are no matching `fare_leg_rules.end_timeframe_group_id` values to the `timeframe_group_id` being filtered, empty `fare_leg_rules.end_timeframe_group_id` will be matched by default. <br><br>An empty `fare_leg_rules.end_timeframe_group_id` indicates that the end time of the leg does not affect the fare. |
| `timeframe_type` | Enum | **Conditionally Required** | Defines the type of fare validation to be associated with `timeframes.start_time` and `timeframes.end_time`.<br><br>Valid options are:<br>`0` - In vehicle.<br>`1` - At fare gate or on platform.<br><br>Conditionally Required:<br>- **Required** if either `start_timeframe_group_id` or `end_timeframe_group_id` is defined.<br>- **Forbidden** otherwise.|
| `fare_product_id` | Foreign ID referencing `fare_products.fare_product_id` | **Required** | The fare product required to travel the leg. |
| `override` | Non-negative integer | Optional | Allows certain rules to take precedence over others. When multiple entries in `fare_leg_rules.txt` match, the rule or set of rules with the highest value for `override` will be selected.<br><br>An empty value for `override` is treated as zero.|

e third rule to take precedence
The same order value can be applied for multiple fare leg rules
| `override` | Non-negative integer | Optional | When multiple entries in `fare_leg_rules.txt` match, the one with the highest `override` value will be selected.<br><br>An empty value for `override` is treated as zero.|
isabelle-dr marked this conversation as resolved.
Show resolved Hide resolved

### fare_transfer_rules.txt

Expand Down