Skip to content

Commit

Permalink
Merge branch 'next' into AccessRightParameterAssignment---TypeOfProof…
Browse files Browse the repository at this point in the history
…Ref-
  • Loading branch information
ue71603 authored May 30, 2024
2 parents e7e01f2 + 6e7ae5e commit 2c7d0fe
Show file tree
Hide file tree
Showing 306 changed files with 58,615 additions and 11,517 deletions.
4 changes: 2 additions & 2 deletions .github/scripts/validate-and-lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ while IFS= read -r -d $'\0' filename; do
fi
# Remove temp file
rm "${filename}.pretty"
done < <(/usr/bin/find . -type f \( -name "*.xsd" -or -name "*.xml" \) -print0)
done < <(/usr/bin/find examples xsd -type f \( -name "*.xsd" -or -name "*.xml" \) -print0)

if [ ${PARSING_ERROR} -ne 0 ]; then
exit ${PARSING_ERROR}
fi
echo -e '\033[0;32mFinished validating XML file structure and linting XSD and XML files\033[0m'
echo -e '\033[0;32mFinished linting XSD and XML files\033[0m'
2 changes: 1 addition & 1 deletion .github/scripts/validate-examples.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set -e

echo "Validating NeTEx XML examples ..."

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
if xmllint --noout --schema xsd/NeTEx_publication.xsd examples/standards/epiap/*xml examples/functions/deckPlans/*.xml examples/standards/epiap/*xml && 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
echo -e '\033[0;32mValidating NeTEx XML examples succeeded\033[0m'
else
echo -e '\033[0;31mValidating NeTEx XML examples failed\033[0m'
Expand Down
167 changes: 119 additions & 48 deletions NeTEx.spp

Large diffs are not rendered by default.

94 changes: 72 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,87 @@
# NeTEx (Network Timetable EXchange) XML schema
(C) 2009-2021 NeTEx, CEN, Crown Copyright
**(C) 2009-2024 NeTEx, CEN, Crown Copyright**

## Schemas for: Core, Part 1 (Network), Part 2 (Timetables), Part3 (Fares) and Part5 (NewModes).
See the NeTEx UML Physical and Conceptual models for an UML view of the packages. (This is available in electronic format).
## Schemas for:

The individual XML files are arranged hierarchically in folders, in a similar arrangement to that of the UML model and documentation. Thus there is a main folder for each part, and subfolders for each NeTEx functional area.
- Core
- Part 1 (Network)
- Part 2 (Timetables)
- Part 3 (Fares)
- Part 5 (New Modes)

----
## Getting Started
There are two main root schemas:
- **netex_publication** : Embeds NeTEx XML model elements in a bulk output file format for use in asynchronous publication. The intended content scope can be indicated by a filter object.
- **netex_siri.xsd** : Embeds NeTEx XML model elements in the SIRI protocol for dynamic exchange of elements between servers. Both Request/response or publish / subscribe is supported
### Overview

- NeTEx (Network Timetable EXchange) XML schema is a standardized format for exchanging network timetable data.

### Folder structure 📁

The individual XML files are organized hierarchically in folders, following the same structure as the UML model and documentation. The architecture is:

- **Main Folder for Each Part**: There is a main folder for each part of the schema (e.g., Core, Part 1, Part 2, etc.).
- **Subfolders for Functional Areas**: Within each main folder, there are subfolders for each NeTEx functional area, keeping the schema well-structured.

You can find more information about the directory's structure on the [wiki](https://github.com/ITxPT/NeTEx/wiki/Structure-And-Compatibility#netex-directory-structure)
### UML models

- You can refer to the NeTEx UML Physical and Conceptual models (note that NeTEx Conceptual model is Transmodel) for a detailed UML view of the schema packages.
- These models are available in electronic format.

## Getting started 🚀

### Main root schemas

1. **netex_publication**
- Embeds NeTEx XML model elements in a bulk output file format for use in asynchronous publication.
- The intended content scope can be indicated by a filter object.
- **netex_publication_noConstraint**: same as **netex_publication** but without all the XSD constraint that is convenient to speed up the work in development phases (but at the price of a much weaker validation).

In addition:
2. **netex_siri.xsd**
- Embeds NeTEx XML model elements in the SIRI protocol for dynamic exchange of elements between servers.
- Supports both request/response and publish/subscribe.

- **nx.xsd** : Embeds NeTeX XML model elements within a simple thematic organisation to facilitate browsing and inspection of NeTEx. The NX schema is not intended for actual use.
### Additional information

There are **XML examples** of the use of both protocols, see */examples* subdirectory.
- **nx.xsd**
- Embeds NeTeX XML model elements within a simple thematic organisation to facilitate browsing and inspection of NeTEx.
- The NX schema is not intended for actual use.

### XML examples

- Explore XML examples of the use of both protocols in the */examples* subdirectory.

Further information on the examples is available on the [wiki](https://github.com/ITxPT/NeTEx/wiki/Using-NeTEx#how-to-use-example-files)
### Support for XML editors
There is an _Altova XMLSpy_ project file in the root directory that provides an organised view of the schema and examples:
- NeTEx.spp

There is also an _Oxygen_ project file:
- NeTEx.xpr
- **Altova XMLSpy Project**: Find an organized view of the schema and examples in the root directory.
- Project file: NeTEx.spp

- **Oxygen Project File**:
- Project file: NeTEx.xpr

----

### Note on the schema
The schema is broken down systematically into small modular files; generally for each functional package in the design model (See UML Model) there are two xml schema files
- netex_xxxx_suppport.xsd - containing data type and ref structure definitions.
- netex_xxxx_version.xsd - containing the element definitions.

The schema is systematically divided into small modular files. Generally, for each functional package in the design model (See UML Model), there are two XML schema files:

- **netex_xxxx_suppport.xsd**: Contains data type and ref structure definitions.
- **netex_xxxx_version.xsd**: Contains the element definitions.

----
# Changelog
## Branches 🌿

See [CHANGELOG](CHANGELOG.md)
| Branch Name | Description | Link |
| ----------- | ------------------------------------------------------- | ----------------------------------------------- |
| `master` | Current head of the project | [GitHub](https://github.com/NeTEx-CEN/NeTEx) |
| `next` | Work for the next release | [GitHub](https://github.com/NeTEx-CEN/NeTEx/tree/next) |

# Change Log
## Releases
| Release Number | Release Date | Description | Link | Release Notes |
| -------------- | ------------- | ---------------------------------------------- | ------------- | ----------------------------------------------------------------------------------------------- |
| 1.2 | March 2022 | Latest productive version before new modes merge | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.2/README.md) |
| 1.2.2 | August 2023 | First version of new modes | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.2.2) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.2.2/README.md) |
| 1.3.1 | May 2024 | European Passenger Information Accessibility Profile (EPIAP) | [Code](https://github.com/NeTEx-CEN/NeTEx/releases/tag/v1.3.1) | [Release Notes](https://github.com/NeTEx-CEN/NeTEx/blob/v1.3.1/README.md) |
| 2.0 | 2024 | Upcoming release ⏳ | N/A | N/A |
## Full Version History 📚
The comprehensive versions history is available in [change_log.md](https://github.com/ITxPT/NeTEx/blob/NeTEx/change_log.md)
Loading

0 comments on commit 2c7d0fe

Please sign in to comment.