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

Introduce dataSourceRef checking, so we can see seriously broken examples and implementations #454

Merged
merged 14 commits into from
Apr 17, 2024

Conversation

skinkie
Copy link
Contributor

@skinkie skinkie commented Jun 26, 2023

@Aurige my understanding is that @dataSourceRef + @Version should point to DataSource @id + @Version it becomes obviously once we enforce these constraints again a lot of examples just stop validating because they failed to implement the correct referening.

@ue71603 if we would agree to this principle, mentioned above having all EntitiesInVersion plus some 'rogue elements' pointing to the correct DataSource, we must update all the broken examples as well.

@skinkie skinkie added the bug Technical mistake, inconsistency with the documentation, etc. label Jun 26, 2023
@skinkie skinkie requested review from Aurige and ue71603 June 26, 2023 00:42
@Aurige
Copy link
Contributor

Aurige commented Sep 1, 2023

I'm note sure that I'm getting your point

Is it related to references like (from oe of the examples) :

<AccessibilityAssessment version="001" created="2010-05-17T09:30:47Z" modification="new" dataSourceRef="tbd:accessibility_data" id="tbd:9100WIMBLDN@A1-EE1+5n6-acc"> (from one of the examples)

in that case the version is the one of the AccessibilityAssessment not of the dataSource

Furthermore, in most case the DataSource will have one single version (NAPTAN is NAPTAN, SNCF is SNCF ...usually no sequence of version of them).

@skinkie
Copy link
Contributor Author

skinkie commented Sep 1, 2023

If a DataSource does not have the same version as the object it is on, that suggest that a single object can have concurrent version references. How would the version of the DataSource be resolved (or provided) if there would be multiple instances of a DataSource with the same identifier?

I am obviously happy to drop the version reference. But then the DataSource should not have a version in the first place.

@Aurige
Copy link
Contributor

Aurige commented Sep 11, 2023

Still lost : the data source is the data provider (DATA SOURCE identifies the system which has produced the data) ... the data provider is a stable entity. When UK is referencing the data source as being Naptan (as a system), are when it is Ile de France Mobilité (Paris' Authority, as their open data publication system) the data source version is not really meaningful. But the data source is possibly managing object's versions of course.
Do we put different concepts behind data source ?

@skinkie
Copy link
Contributor Author

skinkie commented Sep 11, 2023

If the DataSource is a stable entity it should not be versioned within NeTEx at the DataSource element level. There are multiple elements which do not have a version attribute and are truely unversioned.

@ue71603 ue71603 added this to the netex_1.2 milestone Dec 1, 2023
@ue71603
Copy link
Contributor

ue71603 commented Jan 24, 2024

Fixing examples for me.

@ue71603 ue71603 force-pushed the fix_datasourceref3 branch from 75cb375 to d91ddab Compare January 24, 2024 22:41
@ue71603
Copy link
Contributor

ue71603 commented Jan 25, 2024

I fixed it now so that it works for version, too. But will remove version now

@ue71603 ue71603 removed their assignment Jan 25, 2024
xsd/NeTEx_publication.xsd Outdated Show resolved Hide resolved
@@ -285,12 +285,15 @@ Correct COnstraints for PointOnRoute
<xsd:keyref name="DataSource_AnyKeyRef" refer="netex:DataSource_AnyVersionedKey">
<xsd:selector xpath=".//netex:DataSourceRef | .//netex:DefaultDataSourceRef"/>
<xsd:field xpath="@ref"/>
<xsd:field xpath="@version"/>
<!-- <xsd:field xpath="@version"/> +v2.0-->
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am sorry I was stupid. But I think we are not there yet. I think for DataSourceRef we must have a version, but I should point to a DataSource key with id + version. Difficult.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed. better?

@ue71603
Copy link
Contributor

ue71603 commented Apr 10, 2024

@skinkie @Aurige pls check

@skinkie skinkie merged commit 56046b2 into master Apr 17, 2024
1 check passed
@skinkie skinkie deleted the fix_datasourceref3 branch April 17, 2024 15:33
skinkie added a commit that referenced this pull request May 3, 2024
* Fix typo psychosensory (#690)

* Change organisation ref abstract (#686)

* Make OrganisationRef abstract

* Organisation is abstract

* Something hidden

* Bring backwards compatibility

* Split because of older xmllint

* redid 409 (which also contains 408): Enhancement tMCR Vehicle Equipment profile Member, accepted driver permits (#612)

* redid 409 (which also contains 408)

last two commits d57ef6a 7f18bb2 .Did overwrite the existing files.

* Lint and update documentation tables

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update examples/functions/newModes/NewModes-CycleSharingExample.xml

Co-authored-by: Stefan de Konink <[email protected]>

* Update examples/functions/newModes/NewModes-CycleSharingExample.xml

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

* typo

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update examples/functions/newModes/NewModes-CycleSharingExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_vehicleType_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Apply suggestions from code review

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Stefan de Konink <[email protected]>
Co-authored-by: trurlurl <[email protected]>

* Adding unique constraints for the elements that actually exists in our examples (#464)

* Add DatedServiceJourney_UniqueBy_Id_Version

* Lint and update documentation tables

* Add AccessibilityAssessment and AccessibilityLimitation unique constraints

* Lint and update documentation tables

* Add AvailabilityCondition Unique constraint as part of the ValidityCondition constraint

* Put AvailabilityCondition in a new unique constraint because of AvailabilityConditionIdType

* Lint and update documentation tables

* Add DatedVehicleJourney and NormalDatedVehicleJourney constraints

* Add FlexibleRoute, FlexibleQuay, FlexibleLine, FlexibleStopAssignment

* Fix typo

* Fix FlexibleStopAssignment in examples for missing order attribute

* Lint and update documentation tables

* Introduce SitePathLink unique as path of PathLinkIdType

* Introduce unique constraint for ValidityPeriod which uses ValidityConditionIdType

* Introduce unique constraint for ValidDuring which uses AvailabilityConditionIdType

* Introduce unique constraint for ValidyPeriod which uses UsageValidityPeriodIdType, fix ValidBetween

* Fix broken example, due to the assignment within a single unique constraint

* Reintroduce OperatingDay unique constraints

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthias Günter <[email protected]>

* Introduce dataSourceRef checking, so we can see seriously broken examples and implementations (#454)

* Introduce dataSourceRef checking, so we can see seriously broken examples and implementations.

* to force a rerun

* updated examples

* more example corrections

* Lint and update documentation tables

* remove checking for version in DataSource and DataSourceRef

* Aurige example with id without version for DataSource

* removed comments

* change to the way validation is done.

* fix validation

* Update Le Corbusier - SQYBUS-NeTEx-Profil Arret.xml

* Lint and update documentation tables

---------

Co-authored-by: Matthias Günter <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* Create FX-PI-01_ParisExample.xml (#640)

* Create FX-PI-01_ParisExample.xml

* spaces and tabs  fixed

* part 2

@nick-knowles  never mix tabs and spaces that way again, pls.

* part 3

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

* Update examples/standards/fxc/FX-PI-01_ParisExample.xml

Co-authored-by: trurlurl <[email protected]>

---------

Co-authored-by: trurlurl <[email protected]>

* Remove all abstract elements from constraint validation (#462)

* Remove all abstract elements from constraint validation

* Make ResposibilityRole not abstract, and revert constraint check removal

* Update NeTEx_publication.xsd

* Update NeTEx_publication_timetable.xsd

---------

Co-authored-by: Matthias Günter <[email protected]>

* EPIAP to Master (#705)

* Add usage validity start/end time for element access

* Initial commit for GroupOfTariffZones

* Fixed copy/paste error on documentation tags

* Add optional TimebandRef and ServiceCalendarRef to TemporalValidityParametersGroup

* Add dynamicdistancematrixelement for on-the-fly generation when pre-computing all possible combinations is not feasible

* Added proper element definition

* Add enumerations for pushchair (#187)

* Add enumerations for pushchair

* Typo in VehicleType (#253) (#256)

* Typo in VehicleType

Reported by @hennoit

* Add Presentation to TypeOfProductCategory (#254)

* Add VehicleMode to VehicleType (and some typos) (#252)

* Level with order (#263)

Level order as proposed for EPIAP.

* Fix typo's

* Remove emf leftover

* Remove network_filter_network.xsd

* Remove netex_country_version.xsd

* EPIAP quay boarding positions enhancement (#298)

* Update netex_ifopt_stopPlace_version.xsd

EPIAP Quay and Boarding Position Enhancement

* Change from Stefan Jugelt on documentation for EdgeToTrackCenterDistance


I would suggest to refer to the parameter 4.2.9.3. Platform offset of the Infrastrcuture TSI: 

                                             <xsd:element name="EdgeToTrackCenterDistance" type="LengthType" minOccurs="0">
                                                            <xsd:annotation>
                                                                           <xsd:documentation>Distance between the track centre and the platform edge parallel to the running plane (bq), as defined in chapter 13 of EN 15273-3:2013.</xsd:documentation>
                                                            </xsd:annotation>
                                             </xsd:element>

Co-authored-by: Matthias Günter <[email protected]>

* EPIAP quay boarding positions enhancement (#298)

* Update netex_ifopt_stopPlace_version.xsd

EPIAP Quay and Boarding Position Enhancement

* Change from Stefan Jugelt on documentation for EdgeToTrackCenterDistance


I would suggest to refer to the parameter 4.2.9.3. Platform offset of the Infrastrcuture TSI: 

                                             <xsd:element name="EdgeToTrackCenterDistance" type="LengthType" minOccurs="0">
                                                            <xsd:annotation>
                                                                           <xsd:documentation>Distance between the track centre and the platform edge parallel to the running plane (bq), as defined in chapter 13 of EN 15273-3:2013.</xsd:documentation>
                                                            </xsd:annotation>
                                             </xsd:element>

Co-authored-by: Matthias Günter <[email protected]>

* Adding handrail to BorderTypeEnumeration (#303)

This allows for this accessibility feature to be used in SitePathLink

* EPIAP: Add raised kerb mobility facility enumeration (#301)

* raisedCurb in MobilityFacilityEnumeration

* Curb to Kerb

Kerb is used in the rest of NeTEx

* EPIAP: Add raised kerb mobility facility enumeration (#301)

* raisedCurb in MobilityFacilityEnumeration

* Curb to Kerb

Kerb is used in the rest of NeTEx

* Add Length and Width on StopPlaceSpaceGroup (#315)

Replaces #302

* Improve passenger information equipment (#314)

* Adding handrail to BorderTypeEnumeration

This allows for this accessibility feature to be used in SitePathLink

* Update netex_passengerInformationEquipment_version.xsd

* comments gone

* Handrail is in a different PR

REmoved here

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentTicketing_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

Co-authored-by: Stefan de Konink <[email protected]>

* Update netex_ifopt_stopPlace_support.xsd (#276)

* Update netex_ifopt_stopPlace_support.xsd

Extension of QuayTypeEnumeration for the hierarchy needed in rail

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

* completed with discussion from the PullRequest

Co-authored-by: Stefan de Konink <[email protected]>

* Allow multiple gml:Polygons associated to a Zone (#255)

* Allow multiple Polygons to describe a Zone

* use MultiSurface instead of multiple Polygons

* Update netex_servicePattern_support.xsd (#214)

* Update copyright to 2021 (#206)

* Update copyright to 2021

* Declutter whitespace

* Fix

* Update netex_servicePattern_support.xsd

Adding a possibility that the driver should be informed

* more neutral formulation of  informStaffOnboard

* typo correction

Co-authored-by: Stefan de Konink <[email protected]>

* Extension of AccessibilityLimitation for EPIAP (#265)

* Extension of AccessibilityLimitation for EPIAP

* Other problems from Adrian's CR on AccessibibilityLimitation

* Update netex_facility_support.xsd (#278)

* Updating additional relevant user categories (#280)

women and families are possibly also relevant additional ParkingUserTypes

Co-authored-by: Stefan de Konink <[email protected]>

* Need to specify more than one ActivationMeans (#319)

Co-authored-by: Kristian Syversen <[email protected]>

* Add support for NAND, NOR, XNOR as a LogicalOperation. Also renamed BooleanOperatorEnumeration to LogicalOperationEnumeration to better reflect actual use (#126)

* TransportMode (Duty) as AllModesEnumeration

Fix #44

* Resolve comments.

Fix #151

* Added Chur example from Wilfried (#329)

* Added Chur example from Wilfried

* Adding EPIAP examples to travis

* Changed charset encoding from latin1, latin2 to UTF-8 (#352)

* changes according to basecamp discussion (#344)

* changes according to basecamp discussion

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Apply suggestions from code review

Co-authored-by: Stefan de Konink <[email protected]>

* Update netex_acsb_limitations.xsd

* Stairfree Access as Limitation to be more compatible with OJP (#362)

* Stairfree Access as Limitation to be more compatible with OJP and for EP

* Update netex_ifopt_site_version.xsd (#410)

* Update netex_ifopt_site_version.xsd

* new name after discussion with Stefan

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd

* Fix branch

Notice that the examples still miss RelativeLevelOrder.

* examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional and a small validity problem (#430)

Examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional. We otherwise have examples that break. And it might be that people don't wish to use them.

* BeaconEquipment added and example VehicleType modeling for EPIAP (#365)

* First part of Beacon Equipment

* second part of BeaconEquipment

* BeaconEquipment -> PassengerBeaconEquipment

There are also technical Beacons with BeaconPoint. As they are different currently no ref is added in either element.

* XML Spy removed

* fixed example and added examples to project

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

* Apply suggestions from code review

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

* Apply suggestions from code review

---------

Co-authored-by: Stefan de Konink <[email protected]>

* Lint and update documentation tables

* Fix railIslandPlatform (#524)

Fix #523

* Fix #533 (#534)

* Fix #533

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: DWillDB <[email protected]>

---------

Co-authored-by: DWillDB <[email protected]>

* Fix epiap example validation (#547)

* Make sure the EPIAP examples actually get validated

Split up until new release of libxml2 is available.

* Fix #539 (#540)

* Ramp equipment with maximal load and an explanation for Length for mobile ramps. (#366)

* Update netex_ifopt_equipmentAccess_version.xsd

* Update netex_ifopt_equipmentAccess_version.xsd

* fix ident1

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

---------

Co-authored-by: trurlurl <[email protected]>

* Lint and update documentation tables

* Delfiplus extensions (#388)

* Changes needed from the mapping table on DELFI+

* changes to ramp/hoist
* more information in stationMap
removal of an element that we could not find out, what it does (replaced with a length and width)

* Update netex_ifopt_stopPlace_support.xsd

* Lint and update documentation tables

* Update xsd/netex_framework/netex_reusableComponents/netex_equipment_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

Co-authored-by: trurlurl <[email protected]>

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: trurlurl <[email protected]>

* Enhance door control element height (Fix #541) (#542)

* Fix #541

* adds example for door control element height

Co-authored-by: Christophe Duquesne <[email protected]>

* Fix #541 updates documentation for door control element height

* Fix #541 adds example for door control element height

---------

Co-authored-by: Christophe Duquesne <[email protected]>

* Create epiap_test_Crossing_Equipment.xml (#611)

* Create epiap_test_Crossing_Equipment.xml

* Lint and update documentation tables

* version to 1 and filled description

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

* changing QuayType for "on street" bus/tram (#629)

* changing QuayTaype for "on street"

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

Co-authored-by: trurlurl <[email protected]>

* improved comments

* removing depreciated values

---------

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: trurlurl <[email protected]>

* LiftCallEquipment (#634)

* LiftCallEquipment added

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

---------

Co-authored-by: Stefan de Konink <[email protected]>

* EPIAP Equipments Enhancement (#555)

* Enhancement of Crossing Equipments

Enhancements of the Crossing Equipmentsproposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#18 (French Accessibility Profile)

More similar commits (on other accessibility equipments) will follow on this same PR (several proposal on several object on the same XSD  file)

* Enhancement of Sanitary Equipments

Enhancements of the Sanitary Equipments proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#19 (French Accessibility Profile)

* Enhancement of Sanitary Equipments

complement

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Addition of default values

Addition of default values whenever relevant

* Addition of default value

Addition of default values whenever relevant

* Enhancement of the SeatingEquipments

Enhancements of the SeatingEquipments proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#20 (French Accessibility Profile)

* Lint and update documentation tables

* to conform PR540 decision

* Enhancement of the EntranceEquipment

Enhancement of the EntranceEquipment

Enhancements of the EntranceEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#21 (French Accessibility Profile)

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Enhancement of the RampEquipment

Enhancements of the RampEquipmentproposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#22 (French Accessibility Profile)

* Enhancement of the RoughSurface

Enhancements of the RoughSurfaceproposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#23 (French Accessibility Profile)

* Enhancements of the StaircaseEquipment

Enhancements of the StaircaseEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#24 (French Accessibility Profile)

* Enhancements of the EscalatorEquipment

Enhancements of the EscalatorEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#25 (French Accessibility Profile)

* Enhancements of the LiftEquipment

Enhancements of the LiftEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#27 (French Accessibility Profile)

* Enhancement of Crossing Equipments

Enhancements of the Crossing Equipmentsproposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#18 (French Accessibility Profile)

More similar commits (on other accessibility equipments) will follow on this same PR (several proposal on several object on the same XSD  file)

* Enhancement of Sanitary Equipments

Enhancements of the Sanitary Equipments proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#19 (French Accessibility Profile)

* Enhancement of Sanitary Equipments

complement

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Addition of default values

Addition of default values whenever relevant

* Addition of default value

Addition of default values whenever relevant

* Enhancement of the SeatingEquipments

Enhancements of the SeatingEquipments proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#20 (French Accessibility Profile)

* Lint and update documentation tables

* Enhancement of the EntranceEquipment

Enhancement of the EntranceEquipment

Enhancements of the EntranceEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#21 (French Accessibility Profile)

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Enhancement of the RampEquipment

Enhancements of the RampEquipmentproposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#22 (French Accessibility Profile)

* Enhancement of the RoughSurface

Enhancements of the RoughSurfaceproposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#23 (French Accessibility Profile)

* Enhancements of the StaircaseEquipment

Enhancements of the StaircaseEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#24 (French Accessibility Profile)

* Enhancements of the EscalatorEquipment

Enhancements of the EscalatorEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#25 (French Accessibility Profile)

* Enhancements of the LiftEquipment

Enhancements of the LiftEquipment proposed by the French team working on an accessibility capture tool

These enhancements are mainly coming from comparison and mapping with OSM
The original request is here etalab/transport-profil-netex-fr#27 (French Accessibility Profile)

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* cleaning

Cleanin g of unnecessary "discomfortable" values

* Clarifications

Clarifications (from github diuscussions)

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Christophe Duquesne <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: Christophe Duquesne <[email protected]>

* fixed comments from Nick

* fixing error

* Lint and update documentation tables

* typo plus unknown value for StairRampEnumeration

* Lint and update documentation tables

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: trurlurl <[email protected]>

* fixing names according to Tim

* Update xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* fix validation problem

---------

Co-authored-by: Stefan de Konink <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Matthias Günter <[email protected]>
Co-authored-by: trurlurl <[email protected]>

* Clone 'TactileWriting' attribute from StairGroup for other equipments with handrail (#664)

* Lint and update documentation tables

* Update xsd/NeTEx_publication_timetable.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/NeTEx_publication_timetable.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Lint and update documentation tables

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/NeTEx_publication_timetable.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd

Co-authored-by: Stefan de Konink <[email protected]>

* Apply suggestions from code review

* Apply suggestions from code review

* To solve issue #665

This change would solve #665, but I'm not sure it is allowed to let it slip in here. If it interfered with this PR, I would do it later in a separate PR, after this one will be merged.

---------

Co-authored-by: Arne Seime <[email protected]>
Co-authored-by: syversenkr <[email protected]>
Co-authored-by: Henno Willering <[email protected]>
Co-authored-by: Matthias Günter <[email protected]>
Co-authored-by: Christophe Duquesne <[email protected]>
Co-authored-by: Arne Seime <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DWillDB <[email protected]>
Co-authored-by: trurlurl <[email protected]>
Co-authored-by: Julius Tens <[email protected]>

* Add properties to describe the height of a Lift (including its doors) (#696)

* Fix schema and examples

* changes to clean up merge

* Second try

* Apply suggestions from code review

Thanks @trurlurl

---------

Co-authored-by: Matthias Günter <[email protected]>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: trurlurl <[email protected]>
Co-authored-by: Arne Seime <[email protected]>
Co-authored-by: syversenkr <[email protected]>
Co-authored-by: Henno Willering <[email protected]>
Co-authored-by: Christophe Duquesne <[email protected]>
Co-authored-by: Arne Seime <[email protected]>
Co-authored-by: DWillDB <[email protected]>
Co-authored-by: Julius Tens <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Technical mistake, inconsistency with the documentation, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants