Skip to content

Commit 84c52d1

Browse files
skinkieseimesyversenkrhennoitue71603
authored
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 <matthias.guenter@sbb.ch> * 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 <matthias.guenter@sbb.ch> * 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 <stefan@konink.de> Co-authored-by: Stefan de Konink <stefan@konink.de> * 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 <stefan@konink.de> * 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 <stefan@konink.de> * 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 <stefan@konink.de> * Need to specify more than one ActivationMeans (#319) Co-authored-by: Kristian Syversen <kristian.syversen@entur.org> * 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 <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Apply suggestions from code review Co-authored-by: Stefan de Konink <stefan@konink.de> * 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 <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * 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 <stefan@konink.de> * 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 <144349651+DWillDB@users.noreply.github.com> --------- Co-authored-by: DWillDB <144349651+DWillDB@users.noreply.github.com> * 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 <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --------- Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * 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 <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Enhance door control element height (Fix #541) (#542) * Fix #541 * adds example for door control element height Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> * Fix #541 updates documentation for door control element height * Fix #541 adds example for door control element height --------- Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> * 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 <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * improved comments * removing depreciated values --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * LiftCallEquipment (#634) * LiftCallEquipment added * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> --------- Co-authored-by: Stefan de Konink <stefan@konink.de> * 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 <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * 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 <stefan@konink.de> * 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 <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * 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 <stefan@konink.de> * 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 <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * 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 <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentWaiting_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> * 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 <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_version.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * fixing names according to Tim * Update xsd/netex_framework/netex_reusableComponents/netex_submode_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * fix validation problem --------- Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> * 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 <stefan@konink.de> * Update xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_genericFramework/netex_accessibility/netex_acsb_limitations.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/NeTEx_publication_timetable.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Lint and update documentation tables * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_stopPlace_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_mode_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/NeTEx_publication_timetable.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentAccess_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * 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 <arne.seime@gmail.com> Co-authored-by: syversenkr <kristian.syversen@entur.org> Co-authored-by: Henno Willering <hennoit@users.noreply.github.com> Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> Co-authored-by: Arne Seime <seime@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: DWillDB <144349651+DWillDB@users.noreply.github.com> Co-authored-by: trurlurl <82838870+trurlurl@users.noreply.github.com> Co-authored-by: Julius Tens <144336919+juliustens-db@users.noreply.github.com>
1 parent af04aa1 commit 84c52d1

File tree

42 files changed

+14467
-49
lines changed

Some content is hidden

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

42 files changed

+14467
-49
lines changed

NeTEx.spp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,11 @@
947947
<Folder FolderName="gbfs">
948948
<File FilePath="examples\standards\gbfs\Netex_gbfs_exm1.xml" HomeFolder="Yes"/>
949949
</Folder>
950+
<Folder FolderName="epiap">
951+
<File FilePath="examples\standards\epiap\Chur_Equipment_Pathlink_V1.0.xml" HomeFolder="Yes"/>
952+
<File FilePath="examples\standards\epiap\eiap_test1_ramp.xml" HomeFolder="Yes"/>
953+
<File FilePath="examples\standards\epiap\EPIAP_Accessibility_Chur_V08_vehicletypes.xml" HomeFolder="Yes"/>
954+
</Folder>
950955
</Folder>
951956
</Folder>
952957
<Folder FolderName="netex_siri_requests">

examples/functions/grouping/Netex_GroupingExample_General_01.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ This is shows use ofGrouping oif entities in the same file
2323
Version History
2424
Group changes to show all versions of each basic entity (Stop, Link, Srevice pattern, DAY TYPE)
2525
26+
2021-01-25 - Added example use of GroupOfTariffZones
2627
2728
(C) 2010-2019 Crown Copyright CEN
2829
-->
@@ -75,5 +76,21 @@ Version History
7576
</GeneralGroupOfEntities>
7677
</groupsOfEntities>
7778
</ResourceFrame>
79+
<SiteFrame version="any" id="mybus:ExampleGroupOfTariffZones">
80+
<groupsOfTariffZones>
81+
<GroupOfTariffZones version="any" id="mybus:InnerOslo">
82+
<members>
83+
<TariffZoneRef versionRef="EXTERNAL" ref="mybus:ZoneA"/>
84+
<TariffZoneRef versionRef="EXTERNAL" ref="mybus:ZoneB"/>
85+
</members>
86+
</GroupOfTariffZones>
87+
<GroupOfTariffZones version="any" id="mybus:GreaterOslo">
88+
<members>
89+
<TariffZoneRef versionRef="EXTERNAL" ref="mybus:ZoneC"/>
90+
<TariffZoneRef versionRef="EXTERNAL" ref="mybus:ZoneD"/>
91+
</members>
92+
</GroupOfTariffZones>
93+
</groupsOfTariffZones>
94+
</SiteFrame>
7895
</dataObjects>
7996
</PublicationDelivery>

examples/functions/stopPlace/FX-PI-01_UK_TBD_STOP-OFFER_910GWIMBLDN-accessibility_20140601.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -758,14 +758,17 @@ Changes
758758
<Level version="001" created="2010-04-17T09:30:47Z" id="tbd:9100WIMBLDN@Lvl_G0">
759759
<Name>Ground </Name>
760760
<PublicCode>G</PublicCode>
761+
<RelativeLevelOrder>0</RelativeLevelOrder>
761762
</Level>
762763
<Level version="001" created="2010-04-17T09:30:47Z" id="tbd:9100WIMBLDN@Lvl_PL">
763764
<Name>Platform Level</Name>
764765
<PublicCode>PL</PublicCode>
766+
<RelativeLevelOrder>-1</RelativeLevelOrder>
765767
</Level>
766768
<Level version="001" created="2010-04-17T09:30:47Z" id="tbd:9100WIMBLDN@Lvl_ST">
767769
<Name>Street Level</Name>
768770
<PublicCode>ST</PublicCode>
771+
<RelativeLevelOrder>+1</RelativeLevelOrder>
769772
</Level>
770773
</levels>
771774
<!-- ============ENTRANCES ===================- -->

examples/functions/stopPlace/Netex_10_StopPlace_withParking_1.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,6 +1017,7 @@ Changes
10171017
<EntranceEquipment version="any" id="nptg:9100WIMBLDN_A2b-EI5_e1">
10181018
<Door>true</Door>
10191019
<KeptOpen>true</KeptOpen>
1020+
<DoorControlElementHeight>0.8</DoorControlElementHeight>
10201021
<WheelchairPassable>true</WheelchairPassable>
10211022
</EntranceEquipment>
10221023
</placeEquipments>
@@ -1035,6 +1036,7 @@ Changes
10351036
<EntranceEquipment version="any" id="nptg:9100WIMBLDN_A2b-EI6">
10361037
<Door>true</Door>
10371038
<KeptOpen>true</KeptOpen>
1039+
<DoorControlElementHeight>0.8</DoorControlElementHeight>
10381040
<WheelchairPassable>true</WheelchairPassable>
10391041
</EntranceEquipment>
10401042
</placeEquipments>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
File Chur_Equipment_Pathlink_V1.0.gpx shows access equipments and site pathlinks of Chur station (UIC stop 8509000)
2+
The file has been generated from the DIVA scheduling system. Timetable Frame and Calendar Frame have been removed to keep the file smaller.
3+
The pathlink coordinates have been determined by automatic routing on OSM GIS data; some of them are not perfect yet.
4+
The additional file Chur_Equipment_Pathlink_V1.0.gpx contains the pathlinks as gpx so they can be viewed with appropriate tools, e.g. https://www.gpsvisualizer.com/

examples/standards/epiap/Chur_Equipment_Pathlink_V1.0.gpx

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)