Skip to content

Commit 1d2bebd

Browse files
skinkieskinkie
committed
Merge branch 'master' of github.com:NeTEx-CEN/NeTEx
2 parents f9f5f39 + 1bb53dd commit 1d2bebd

File tree

690 files changed

+1360528
-1363153
lines changed

Some content is hidden

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

690 files changed

+1360528
-1363153
lines changed

‎.github/scripts/validate-and-lint.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/bin/bash
2+
# Validate the XML file structure and lint XSD and XML files, e.g. indentation
3+
#
4+
# You need the binary `xmllint`
5+
# apt-get install libxml2-utils
6+
7+
# The -e flag causes the script to exit as soon as one command returns a non-zero exit code
8+
set -e
9+
10+
echo "Validating XML file structure and linting XSD and XML files ..."
11+
12+
PARSING_ERROR=0
13+
# Iterate all XML and XSD files
14+
while IFS= read -r -d $'\0' filename; do
15+
# Prettify the file using xmllint and save the result to ${filename}.pretty
16+
if XMLLINT_INDENT=$'\t' xmllint --encode UTF-8 --pretty 1 "${filename}" >"${filename}.pretty"; then
17+
# Remove lines containing the term "xmlspy" to get rid of advertising this and save the result as ${filename}
18+
grep -i -v "xmlspy" "${filename}.pretty" >"${filename}"
19+
else
20+
PARSING_ERROR=$?
21+
echo -e "\033[0;Validating XML structure of file '${filename}' failed\033[0m"
22+
fi
23+
# Remove temp file
24+
rm "${filename}.pretty"
25+
done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -print0)
26+
27+
if [ ${PARSING_ERROR} -ne 0 ]; then
28+
exit ${PARSING_ERROR}
29+
fi
30+
echo -e '\033[0;32mFinished validating XML file structure and linting XSD and XML files\033[0m'

‎.github/scripts/validate-examples.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/bash
2+
# Validate all OJP XML examples from the examples/ directory against the OJP XSD schema
3+
#
4+
# You need the binary `xmllint`
5+
# apt-get install libxml2-utils
6+
7+
# The -e flag causes the script to exit as soon as one command returns a non-zero exit code
8+
set -e
9+
10+
echo "Validating NeTEx XML examples ..."
11+
12+
if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml; then
13+
echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
14+
else
15+
echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'
16+
exit 1
17+
fi

‎.github/workflows/ci.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: CI
2+
3+
on: push
4+
5+
jobs:
6+
run:
7+
runs-on: ubuntu-latest
8+
9+
steps:
10+
- run: echo "Job was automatically triggered by a ${{ github.event_name }} event for branch ${{ github.ref }}"
11+
12+
- name: Check out repository code
13+
uses: actions/checkout@v3
14+
15+
- name: Install xmllint and xsltproc
16+
run: |
17+
sudo apt-get update
18+
sudo apt-get install libxml2-utils xsltproc
19+
20+
- name: Validate structure and lint XSD and XML files
21+
run: ./.github/scripts/validate-and-lint.sh
22+
23+
- name: Validate NeTEx XML examples
24+
run: ./.github/scripts/validate-examples.sh
25+
26+
- name: Commit changes
27+
uses: EndBug/add-and-commit@v9 # https://github.com/marketplace/actions/add-commit
28+
with:
29+
default_author: github_actions
30+
message: 'Lint and update documentation tables'

‎.travis.yml‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎examples/functions/calendar/NeTEx_Calendar_se_PA1.xml‎

Lines changed: 56 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,66 +1,64 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
32
<!-- ==== Example of suggested NeTEx Calendar version====== -->
4-
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
5-
xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
6-
<PublicationTimestamp>2001-12-17T09:30:47.0Z</PublicationTimestamp>
7-
<ParticipantRef>SYS001</ParticipantRef>
8-
<PublicationRequest version="1.0">
9-
<RequestTimestamp>2001-12-17T09:30:47.0Z</RequestTimestamp>
10-
<ParticipantRef>SYS002</ParticipantRef>
11-
<topics>
12-
<NetworkFrameTopic>
13-
<Current/>
14-
<ServiceCalendarFrameRef ref="noptis:9085002000100000"/>
15-
</NetworkFrameTopic>
16-
</topics>
17-
</PublicationRequest>
18-
<PublicationRefreshInterval>P7D</PublicationRefreshInterval>
19-
<Description>Noptis simple Simple service calendar example</Description>
20-
<dataObjects>
21-
<ServiceCalendarFrame version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
3+
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
4+
<PublicationTimestamp>2001-12-17T09:30:47.0Z</PublicationTimestamp>
5+
<ParticipantRef>SYS001</ParticipantRef>
6+
<PublicationRequest version="1.0">
7+
<RequestTimestamp>2001-12-17T09:30:47.0Z</RequestTimestamp>
8+
<ParticipantRef>SYS002</ParticipantRef>
9+
<topics>
10+
<NetworkFrameTopic>
11+
<Current/>
12+
<ServiceCalendarFrameRef ref="noptis:9085002000100000"/>
13+
</NetworkFrameTopic>
14+
</topics>
15+
</PublicationRequest>
16+
<PublicationRefreshInterval>P7D</PublicationRefreshInterval>
17+
<Description>Noptis simple Simple service calendar example</Description>
18+
<dataObjects>
19+
<ServiceCalendarFrame version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
2220
<!--- ======= CODESPACEs======== -->
23-
<codespaces>
24-
<Codespace id="noptis">
25-
<Xmlns>noptis</Xmlns>
26-
<XmlnsUrl>http://www.noptis.org./noptis</XmlnsUrl>
27-
<Description>A Noptis Customer </Description>
28-
</Codespace>
29-
</codespaces>
21+
<codespaces>
22+
<Codespace id="noptis">
23+
<Xmlns>noptis</Xmlns>
24+
<XmlnsUrl>http://www.noptis.org./noptis</XmlnsUrl>
25+
<Description>A Noptis Customer </Description>
26+
</Codespace>
27+
</codespaces>
3028
<!--- =======FRAME DEFAULTS======== -->
31-
<FrameDefaults>
32-
<DefaultCodespaceRef ref="noptis"/>
33-
</FrameDefaults>
29+
<FrameDefaults>
30+
<DefaultCodespaceRef ref="noptis"/>
31+
</FrameDefaults>
3432
<!-- =========================================== -->
35-
<ServiceCalendar version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
36-
<Name>Base</Name>
37-
<FromDate>2007-06-17</FromDate>
38-
<ToDate>2008-06-14</ToDate>
39-
<dayTypes>
40-
<DayType version="any" id="noptis:9086002000100001">
33+
<ServiceCalendar version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
34+
<Name>Base</Name>
35+
<FromDate>2007-06-17</FromDate>
36+
<ToDate>2008-06-14</ToDate>
37+
<dayTypes>
38+
<DayType version="any" id="noptis:9086002000100001">
4139
</DayType>
42-
<DayType version="any" id="noptis:9086002000100002">
40+
<DayType version="any" id="noptis:9086002000100002">
4341
</DayType>
44-
</dayTypes>
45-
<dayTypeAssignments>
46-
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-17">
47-
<Date>2007-06-17</Date>
48-
<DayTypeRef version="any" ref="noptis:9086002000100001"/>
49-
</DayTypeAssignment>
50-
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-24">
51-
<Date>2007-06-24</Date>
52-
<DayTypeRef version="any" ref="noptis:9086002000100001"/>
53-
</DayTypeAssignment>
54-
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-18">
55-
<Date>2007-06-18</Date>
56-
<DayTypeRef version="any" ref="noptis:9086002000100002"/>
57-
</DayTypeAssignment>
58-
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-25">
59-
<Date>2007-06-25</Date>
60-
<DayTypeRef version="any" ref="noptis:9086002000100002"/>
61-
</DayTypeAssignment>
62-
</dayTypeAssignments>
63-
</ServiceCalendar>
64-
</ServiceCalendarFrame>
65-
</dataObjects>
42+
</dayTypes>
43+
<dayTypeAssignments>
44+
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-17">
45+
<Date>2007-06-17</Date>
46+
<DayTypeRef version="any" ref="noptis:9086002000100001"/>
47+
</DayTypeAssignment>
48+
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-24">
49+
<Date>2007-06-24</Date>
50+
<DayTypeRef version="any" ref="noptis:9086002000100001"/>
51+
</DayTypeAssignment>
52+
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-18">
53+
<Date>2007-06-18</Date>
54+
<DayTypeRef version="any" ref="noptis:9086002000100002"/>
55+
</DayTypeAssignment>
56+
<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-25">
57+
<Date>2007-06-25</Date>
58+
<DayTypeRef version="any" ref="noptis:9086002000100002"/>
59+
</DayTypeAssignment>
60+
</dayTypeAssignments>
61+
</ServiceCalendar>
62+
</ServiceCalendarFrame>
63+
</dataObjects>
6664
</PublicationDelivery>

0 commit comments

Comments
 (0)