Skip to content

Commit e2e881d

Browse files
committed
Merge branch 'main' into development
# Conflicts: # content/api/our-apis/sl/journey-planner-2.md # themes/trafiklab-2024/assets/sass/shortcodes/_swagger_ui.scss
2 parents 8900558 + 88d6460 commit e2e881d

File tree

59 files changed

+1570
-116
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1570
-116
lines changed
11.6 KB
Loading

content/api/_index.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,21 @@ out [The right data type for your project](../docs/using-trafiklab-data/the-righ
2020
choose the right data source. [Using our data](../docs/using-trafiklab-data/) will help you to get started with our APIs
2121
and datasets.
2222

23-
| API | File format | Scheduled data | Real-time data | What is it |
24-
|:-----------------------------------------------------------------------------|:------------:|:--------------:|:------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------|
25-
| [GTFS Sverige 2](/api/gtfs-datasets/gtfs-sverige-2/) | GTFS ||| Dataset with all public transport, static and historical |
26-
| [GTFS Regional](/api/gtfs-datasets/gtfs-regional/) | GTFS(-RT) || Some, [see details](/api/gtfs-datasets/gtfs-regional/#operators-covered-by-this-dataset) | Public transport datasets |
27-
| [NeTEx/SIRI Regional](/api/netex-datasets/netex-regional/) | NeTEx & SIRI || Some, [see details](/api/netex-datasets/netex-regional/#operators-covered-by-this-dataset) | Highly detailed public transport datasets |
28-
| [GTFS Sweden 3](/api/gtfs-datasets/gtfs-sweden/) | GTFS || Some, [see details](/api/gtfs-datasets/gtfs-sweden/#operators-covered-by-this-dataset) | Public transport dataset of Sweden, as one static dataset and multiple realtime datasets |
29-
| [NeTEx Sweden](/api/netex-datasets/netex-sweden/) | NeTEx ||| Highly detailed public transport datasets of Sweden, as one static dataset and multiple realtime datasets |
30-
| [Stops data](/api/netex-datasets/stops-data/) | NeTEx ||| All stops of Sweden with mappings to regional IDs |
31-
| [KoDa](/api/trafiklab-apis/koda/) | GTFS(-RT) || Some, [see GTFS Regional details](/api/gtfs-datasets/gtfs-regional/#operators-covered-by-this-dataset) | High quality historical data |
32-
| [ResRobot Stolptidstabeller](/api/trafiklab-apis/resrobot-v21/timetables.md) | Json, XML || Some, [see details](/api/trafiklab-apis/resrobot-v21/timetables.md) | Departure & Arrival board API |
33-
| [ResRobot Reseplanerare](/api/trafiklab-apis/resrobot-v21/route-planner.md) | Json, XML ||| Travel planner API |
34-
| [SLs APIs ](/api/trafiklab-apis/sl/) | Json, XML ||| API collection |
35-
| [Oxyfi Vehicle Positions](/api/trafiklab-apis/oxyfi.md) | Websocket ||| Realtime train position API |
36-
| [Trafikverkets API](/api/trafiklab-apis/trafikverket.md) | Json, XML ||| Road and rail API |
23+
| API | File format | Scheduled data | Real-time data | What is it |
24+
|:---------------------------------------------------------------------------|:------------:|:--------------:|:------------------------------------------------------------------------------------------------------:|:----------------------------------------------------------------------------------------------------------|
25+
| [GTFS Sverige 2](/api/gtfs-datasets/gtfs-sverige-2/) | GTFS ||| Dataset with all public transport, static and historical |
26+
| [GTFS Regional](/api/gtfs-datasets/gtfs-regional/) | GTFS(-RT) || Some, [see details](/api/gtfs-datasets/gtfs-regional/#operators-covered-by-this-dataset) | Public transport datasets |
27+
| [NeTEx/SIRI Regional](/api/netex-datasets/netex-regional/) | NeTEx & SIRI || Some, [see details](/api/netex-datasets/netex-regional/#operators-covered-by-this-dataset) | Highly detailed public transport datasets |
28+
| [GTFS Sweden 3](/api/gtfs-datasets/gtfs-sweden/) | GTFS || Some, [see details](/api/gtfs-datasets/gtfs-sweden/#operators-covered-by-this-dataset) | Public transport dataset of Sweden, as one static dataset and multiple realtime datasets |
29+
| [NeTEx Sweden](/api/netex-datasets/netex-sweden/) | NeTEx ||| Highly detailed public transport datasets of Sweden, as one static dataset and multiple realtime datasets |
30+
| [Stops data](/api/netex-datasets/stops-data/) | NeTEx ||| All stops of Sweden with mappings to regional IDs |
31+
| [KoDa](/api/our-apis/koda/) | GTFS(-RT) || Some, [see GTFS Regional details](/api/gtfs-datasets/gtfs-regional/#operators-covered-by-this-dataset) | High quality historical data |
32+
| [ResRobot Stolptidstabeller](/api/our-apis/resrobot-v21/timetables.md) | Json, XML || Some, [see details](/api/our-apis/resrobot-v21/timetables.md) | Departure & Arrival board API |
33+
| [ResRobot Reseplanerare](/api/our-apis/resrobot-v21/route-planner.md) | Json, XML ||| Travel planner API |
34+
| [SLs APIs ](/api/our-apis/sl/) | Json, XML ||| API collection |
35+
| [Oxyfi Vehicle Positions](/api/our-apis/oxyfi.md) | Websocket ||| Realtime train position API |
36+
| [Trafikverkets API](/api/other-apis/trafikverket.md) | Json, XML ||| Road and rail API |
37+
| [Trafiklab Realtime APIs](/api/our-apis/trafiklab-realtime-apis/_index.md) | Json, XML ||| Stops, Departure & Arrival board API |
3738

3839
## Other APIs
3940

content/api/_index.sv.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ and datasets.
3636
| [GTFS Sweden 3](/api/gtfs-datasets/gtfs-sweden/) | GTFS || Some, [see details](/api/gtfs-datasets/gtfs-sweden/#operators-covered-by-this-dataset) | Public transport dataset of Sweden, as one static dataset and multiple realtime datasets |
3737
| [NeTEx Sweden](/api/netex-datasets/netex-sweden/) | NeTEx ||| Highly detailed public transport datasets of Sweden, as one static dataset and multiple realtime datasets |
3838
| [Stops data](/api/netex-datasets/stops-data/) | NeTEx ||| All stops of Sweden with mappings to regional IDs |
39-
| [KoDa](/api/trafiklab-apis/koda/) | GTFS(-RT) || Some, [see GTFS Regional details](/api/gtfs-datasets/gtfs-regional/#operators-covered-by-this-dataset) | High quality historical data |
40-
| [ResRobot Stolptidstabeller](/api/trafiklab-apis/resrobot-v21/timetables.md) | Json, XML || Some, [see details](/api/trafiklab-apis/resrobot-v21/timetables.md) | Departure & Arrival board API |
41-
| [ResRobot Reseplanerare](/api/trafiklab-apis/resrobot-v21/route-planner.md) | Json, XML ||| Travel planner API |
42-
| [SLs APIs ](/api/trafiklab-apis/sl/) | Json, XML ||| API collection |
43-
| [Oxyfi Vehicle Positions](/api/trafiklab-apis/oxyfi.md) | Websocket ||| Realtime train position API |
44-
| [Trafikverkets API](/api/trafiklab-apis/trafikverket.md) | Json, XML ||| Road and rail API |
39+
| [KoDa](/api/our-apis/koda/) | GTFS(-RT) || Some, [see GTFS Regional details](/api/gtfs-datasets/gtfs-regional/#operators-covered-by-this-dataset) | High quality historical data |
40+
| [ResRobot Stolptidstabeller](/api/our-apis/resrobot-v21/timetables.md) | Json, XML || Some, [see details](/api/our-apis/resrobot-v21/timetables.md) | Departure & Arrival board API |
41+
| [ResRobot Reseplanerare](/api/our-apis/resrobot-v21/route-planner.md) | Json, XML ||| Travel planner API |
42+
| [SLs APIs ](/api/our-apis/sl/) | Json, XML ||| API collection |
43+
| [Oxyfi Vehicle Positions](/api/our-apis/oxyfi.md) | Websocket ||| Realtime train position API |
44+
| [Trafikverkets API](/api/our-apis/trafikverket.md) | Json, XML ||| Road and rail API |
4545

4646

4747
## Other APIs

content/api/gtfs-datasets/gtfs-regional/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ per minute, see [realtime data](#realtime-data) for more information.
3838

3939
### Operators covered by this dataset
4040

41-
{{% stip-data-availability %}}
41+
{{% stip-data-availability abbreviation scheduled realtime vehiclepositions occupancy %}}
4242

4343
### Breaking changes
4444

@@ -182,7 +182,7 @@ You can read more about how to use real-time data in our GTFS format documentati
182182
## Historical data
183183
Historical GTFS data can be accessed through the KoDa API.
184184

185-
{{% page-ref page="/api/trafiklab-apis/koda" %}}
185+
{{% page-ref page="/api/our-apis/koda" %}}
186186
<br>
187187

188188
## Extra files

content/api/gtfs-datasets/gtfs-sverige-2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ agency_id,agency_name,agency_url,agency_timezone,agency_lang
123123
One or more operators have a local id for each national id. Not every local id corresponds to a national id.
124124

125125
{{% info %}} The local stop id for SL (id 275, Stockholms Lokaltrafik) is used by SL for _Stop-Area_. You
126-
can use SLs API [SL Transport](https://www.trafiklab.se/api/trafiklab-apis/sl/transport) to
126+
can use SLs API [SL Transport](https://www.trafiklab.se/api/our-apis/sl/transport) to
127127
translate it to a SiteID used in other SL APIs**.**
128128
{{% /info %}}
129129

content/api/gtfs-datasets/gtfs-sweden/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ per minute, see [realtime data](#realtime-data) for more information.
3131

3232
### Operators covered by this dataset
3333

34-
{{% stip-data-availability %}}
34+
{{% stip-data-availability abbreviation scheduled realtime vehiclepositions occupancy %}}
3535

3636
### Breaking changes
3737
These datasets have the **stable** status. This means that we will communicate when fields are

content/api/netex-datasets/netex-regional/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The static data in this dataset is updated on a daily basis, typically between 0
3333

3434
### Operators covered by this dataset
3535

36-
{{% stip-data-availability %}}
36+
{{% stip-data-availability abbreviation scheduled realtime vehiclepositions occupancy %}}
3737

3838
### Breaking changes
3939
This dataset has the **stable** status. This means that the fields can be added without prior warning, but when changes

content/api/netex-datasets/netex-sweden/_index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ The static data in this dataset is updated on a daily basis, typically between 1
3333

3434
### Operators covered by this dataset
3535

36-
{{% stip-data-availability-static %}}
36+
{{% stip-data-availability abbreviation scheduled %}}
3737

3838
### Breaking changes
3939

content/api/netex-datasets/netex-sweden/siri.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Replace `{operator}` with the abbreviation of the operator you want to download.
2929
OpenAPI specification, but are also listed on [the overview page for this API](_index.md). Replace `{apikey}` with your own API key.
3030
{{% /note %}}
3131

32-
{{% page-ref page="/docs/using-trafiklab/getting-api-keys" %}}
32+
{{% page-ref page="/docs/getting-started/using-trafiklab.md" %}}
3333

3434
## Available Siri data
3535

File renamed without changes.

0 commit comments

Comments
 (0)