Skip to content

Commit 3d1d9e7

Browse files
skinkieerlend
skinkie
authored and
erlend
committed
Manual lint
# Conflicts: # xsd/netex_framework/netex_reusableComponents/netex_facility_support.xsd # xsd/netex_part_2/part2_journeyTimes/netex_datedVehicleJourney_version.xsd # xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd # xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd # xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd # xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd # xsd/netex_part_3/part3_salesTransactions/netex_salesContract_version.xsd
1 parent cf24d5e commit 3d1d9e7

File tree

337 files changed

+826
-2000
lines changed

Some content is hidden

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

337 files changed

+826
-2000
lines changed

‎xsd/NeTEx_publication-NoConstraint.xsd‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="iso-8859-1"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_publication">
33
<!-- ===SIRI system IDs for request =========================================================== -->
44
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_base-v2.0.xsd"/>
@@ -25,11 +25,9 @@
2525
<!-- Created from Siri.xsd -->
2626
</Date>
2727
<Description><p>netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.</p>.
28-
<p> The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets. </p>
29-
<p>This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI).
28+
<p> The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets. </p><p>This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI).
3029
<ul><li>For each data object type it describes an XML representation which can be used to exchange netex data.</li><li>It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.</li><li>A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means. </li></ul>
31-
</p>
32-
</Description>
30+
</p></Description>
3331
<Format>
3432
<MediaType>text/xml</MediaType>
3533
<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>

‎xsd/NeTEx_publication.xsd‎

Lines changed: 41 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="iso-8859-1"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<xsd:schema xmlns="http://www.netex.org.uk/netex" xmlns:netex="http://www.netex.org.uk/netex" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:siri="http://www.siri.org.uk/siri" targetNamespace="http://www.netex.org.uk/netex" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1" id="netex_publication">
33
<!-- ===SIRI system IDs for request =========================================================== -->
44
<xsd:import namespace="http://www.siri.org.uk/siri" schemaLocation="siri/siri_base-v2.0.xsd"/>
@@ -16,36 +16,26 @@
1616
<Contributor>CEN TC278 WG3 SG9 Team.</Contributor>
1717
<Coverage>Europe</Coverage>
1818
<Creator>First Drafted for NeTEx version 1.0 CEN TC278 WG3 SG9 Editor Nicholas Knowles. mailto:schemer@netex.org.uk</Creator>
19-
<Date>
20-
<Modified>2021-09-02</Modified>NewModes: Add BatteyEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug
19+
<Date><Modified>2021-09-02</Modified>NewModes: Add BatteyEquipment and TypeOfBatteryCHemistry. Add ChargingEquipmentProfile, TypeOfPlug
2120
</Date>
22-
<Date>
23-
<Modified>2021-09-01</Modified>NewModes: AddPOOL OF VEHICLEs
21+
<Date><Modified>2021-09-01</Modified>NewModes: AddPOOL OF VEHICLEs
2422
</Date>
25-
<Date>
26-
<Modified>2021-08-03</Modified>Add PARKING BAY CONDITION and RENTAL AVAILABILITY
23+
<Date><Modified>2021-08-03</Modified>Add PARKING BAY CONDITION and RENTAL AVAILABILITY
2724
</Date>
28-
<Date>
29-
<Modified>2021-09-01</Modified>NewModes: Add PoolOfVehicles
25+
<Date><Modified>2021-09-01</Modified>NewModes: Add PoolOfVehicles
3026
</Date>
31-
<Date>
32-
<Modified>2021-08-03</Modified>Add PARKING BAY CONDITION and RENTAL AVAILABILITY
27+
<Date><Modified>2021-08-03</Modified>Add PARKING BAY CONDITION and RENTAL AVAILABILITY
3328
</Date>
34-
<Date>
35-
<Modified>2021-07-09</Modified>Revise name sto allign with TM
36-
VehicleRentalOperation --> VehicleRental, VehicleSharingOperation --> VehicleSharing, VehiclePoolingOperation --> VehiclePooling
29+
<Date><Modified>2021-07-09</Modified>Revise name sto allign with TM
30+
VehicleRentalOperation --&gt; VehicleRental, VehicleSharingOperation --&gt; VehicleSharing, VehiclePoolingOperation --&gt; VehiclePooling
3731
</Date>
38-
<Date>
39-
<Modified>2021-01-08</Modified>NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment
32+
<Date><Modified>2021-01-08</Modified>NewModes: drop MobilityServiceElement, MobilityServiceElementPrice, add constraint fro ModerRestriction assessment
4033
</Date>
41-
<Date>
42-
<Modified>2020-11-16</Modified>NewModes: Drop AlternativeTransportOperator
34+
<Date><Modified>2020-11-16</Modified>NewModes: Drop AlternativeTransportOperator
4335
</Date>
44-
<Date>
45-
<Modified>2020-11-06</Modified>NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints.
36+
<Date><Modified>2020-11-06</Modified>NewMOdes (Norway) Add RelatedOrganisation and reusable Contacts constraints.
4637
</Date>
47-
<Date>
48-
<Modified>2020-10-14</Modified>NewModes Add Constraints (NM)
38+
<Date><Modified>2020-10-14</Modified>NewModes Add Constraints (NM)
4939
Add MobilityServiceFrame, MobilityJourneyFrame.
5040
TypeOfProof, TaxiRank, TaxiStand. TypeOfParking
5141
ScheduledOperation, FlexibleOperation, VehicleRental, VehicleSharing, VehiclePooling.
@@ -69,66 +59,50 @@
6959
FIX: Add OpenTransportMode, Submode, VehicleChargingEquipment, CycleStorageEquipment, HailAndRideArea
7060
FIX: Remove PlaceRef and EquipmentRef and bogus restrictions on uniqueness across places and equipment.
7161
</Date>
72-
<Date>
73-
<Modified>2020-08-20</Modified>Corrections
62+
<Date><Modified>2020-08-20</Modified>Corrections
7463
Add UicOperatingPeriod key and ref constraints
7564
</Date>
76-
<Date>
77-
<Modified>2020.07.28</Modified>### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent
65+
<Date><Modified>2020.07.28</Modified>### 2020.07.28 FIX Issue #101*Publication*:Add missing constraints for __FareTableRow__, __FareTableColumn__, __TypeOfLine__ and for __FareZone__ Parent
7866

7967
</Date>
80-
<Date>
81-
<Modified>2020-04-17</Modified>Corrections
68+
<Date><Modified>2020-04-17</Modified>Corrections
8269
Add ParentFareZoneRef constraint
8370
</Date>
84-
<Date>
85-
<Modified>2020-04-02</Modified>Corrections
71+
<Date><Modified>2020-04-02</Modified>Corrections
8672
Add constraint for RowRef and ColumnRef
8773
</Date>
88-
<Date>
89-
<Modified>2019-05-15</Modified>Corrections
74+
<Date><Modified>2019-05-15</Modified>Corrections
9075
Add TypeOfLine constraint
9176
</Date>
92-
<Date>
93-
<Modified>2019-05-02</Modified>
77+
<Date><Modified>2019-05-02</Modified>
9478
Corrections
9579
Add missing constraint selectors for DefaultResponsibilitySetRef and DefaultDataSourceRef
9680
Add missing constraints ref DefaultCodespaceRef
9781
</Date>
98-
<Date>
99-
<Modified>2019-04-24</Modified>Corrections
82+
<Date><Modified>2019-04-24</Modified>Corrections
10083
Add missing constraints ref for JourneyPart/MainPartRef to JourneyPartCouple
10184
</Date>
102-
<Date>
103-
<Modified>2019-04-24</Modified>Corrections
85+
<Date><Modified>2019-04-24</Modified>Corrections
10486
(1)Add constraints ref for ParkingEntranceForVehicles and ParkingPasengerEntrance
10587
(2) Drop general EntranceRef constraint
10688
</Date>
107-
<Date>
108-
<Modified>2019-04-14</Modified>Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment
89+
<Date><Modified>2019-04-14</Modified>Fix add constraints for VehicleStopingPosition and VehicleQuayAlignment and VehiclePositionAlignment
10990
</Date>
110-
<Date>
111-
<Modified>2019-04-10</Modified>Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef
91+
<Date><Modified>2019-04-10</Modified>Fix add constraints for ParkingProperties and CompanionUserProfile/ParentRef
11292
</Date>
113-
<Date>
114-
<Modified>2019-03-25</Modified>Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey.
93+
<Date><Modified>2019-03-25</Modified>Fix: Integrate fix by CD with other constraint changes: Add EquipmentPlace to Place_AnyVersionedKey.
11594
</Date>
116-
<Date>
117-
<Modified>2019-03-12</Modified>Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability,
95+
<Date><Modified>2019-03-12</Modified>Fix: Add integrity constraints for new elements EligibilityChangePolicy, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule, TypeOfFareTable, TypeOfMachineReadability,
11896
Also drop some spurious selectors.
11997
</Date>
120-
<Date>
121-
<Modified>2019-03-10</Modified>Fix: Add constraint for SupplementToFareProductRef .
98+
<Date><Modified>2019-03-10</Modified>Fix: Add constraint for SupplementToFareProductRef .
12299
</Date>
123-
<Date>
124-
<Modified>2019-03-01</Modified>EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element
100+
<Date><Modified>2019-03-01</Modified>EURA-(nk) Add constraint for DistanceMatrixInverseRef for backwards direction of reference to a DIstance Matrix Element
125101
</Date>
126-
<Date>
127-
<Modified>2019-02-18</Modified>
102+
<Date><Modified>2019-02-18</Modified>
128103
(a) Relax uniqueness constraint on FareTable and PriceGroup now unique within type,
129104
</Date>
130-
<Date>
131-
<Modified>2019-01-15</Modified>
105+
<Date><Modified>2019-01-15</Modified>
132106
(a) Fix keyref constraint on TimingLinkInJourneyPattern_AnyVersionedKey, (Drop DropFarePointInPattern. TimingTimingLinkInJournePattern, STopTimingLinkInJourneyPattern)
133107
(b) Fix keyref constraint on ServiceLinkInJourneyPattern_AnyVersionedKey (Drop points)
134108
(c) Fix keyref constraint on FarePointInPattern_AnyVersionedKey - Add Points
@@ -145,61 +119,45 @@
145119
(n) Fix Add Constraints on SectionInSequence
146120
(o) Revise key names to emphasise when key is ordered
147121
</Date>
148-
<Date>
149-
<Modified>2018-06-01</Modified> Rename Sales Package to SALES OFFER PACKAGE
122+
<Date><Modified>2018-06-01</Modified> Rename Sales Package to SALES OFFER PACKAGE
150123
</Date>
151-
<Date>
152-
<Modified>2018-01-07</Modified> Remove trailing blanks on names</Date>
153-
<Date>
154-
<Modified>2017-08-10</Modified>Align with TM6
124+
<Date><Modified>2018-01-07</Modified> Remove trailing blanks on names</Date>
125+
<Date><Modified>2017-08-10</Modified>Align with TM6
155126
Rename Passenger Contract to FareContract.
156127
Rename Passenger Contract Event to FareContractEntry.
157128
Rename Type of Passenger Contract to TypeOfFareContract.
158129
Adjust References in Dependent packages.
159130
</Date>
160-
<Date>
161-
<Modified>2017-08-10</Modified>
131+
<Date><Modified>2017-08-10</Modified>
162132
Rename FareContractEvent to FareContractEntry
163133
Add constraints for CustomerPurchasePackage, CustomerPurchasePackageElement, CustomerPurchaseParameterAssignment
164134
Add constraints for CustomerAccount, CustomerAccountStatus, TypeOf CustomerAccount,
165135
Add constraints for CustomerEligibility, UserProfileEligibility, CommercialProfileEligibility, ResidentialQualifactionEligibility
166136
</Date>
167-
<Date>
168-
<Modified>2017-06-29</Modified>
137+
<Date><Modified>2017-06-29</Modified>
169138
CR048 add constraints WHITE LIST
170139
Fix: Add Constraint on CUSTOMER
171140
CR00310 add constraints on JOURNEY PART POSITION
172141
</Date>
173-
<Date>
174-
<Modified>2017-05-09</Modified>
142+
<Date><Modified>2017-05-09</Modified>
175143
Correct COnstraints for PointOnRoute
176144
Add Missing Constraints For CommonSectionMember / PointOnSection and LinkOnSection er
177145
Add Missing Constraints For GroupOfServicesMember , JourneyAccounting DelegatedResponsibilitySet
178146
Reinstate Constraints for CAll
179147
Fix constraints that were missing namespace on subpart
180148
</Date>
181-
<Date>
182-
<Modified>2017-03-27</Modified>
149+
<Date><Modified>2017-03-27</Modified>
183150
Various 1.1 changes see CRS.
184151
CR0038 revise constraints on ResponsibilityRole
185152
</Date>
186-
<Date>
187-
<Modified>2011-01-17</Modified>V0.94 Revised
153+
<Date><Modified>2011-01-17</Modified>V0.94 Revised
188154
</Date>
189-
<Date>
190-
<Created>2010-09-04</Created>Created from Siri.xsd
155+
<Date><Created>2010-09-04</Created>Created from Siri.xsd
191156
</Date>
192-
<Description>
193-
<p>netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.</p>.
194-
<p> The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets. </p>
195-
<p>This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI).
196-
<ul>
197-
<li>For each data object type it describes an XML representation which can be used to exchange netex data.</li>
198-
<li>It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.</li>
199-
<li>A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means. </li>
200-
</ul>
201-
</p>
202-
</Description>
157+
<Description><p>netex Xml is an XML representation of the Transmodel model that can be used to exchange data objects between netex databases and other services.</p>.
158+
<p> The same netex Xml of netex data objects can be used both in fine grained protocols that exchange one or more objects at a time, such as the SIRI based netex Xml web service, and in bulk publication exchange formats used to exchange whole data sets. </p><p>This netex Publication exchange XML schema defines a bulk delivery format to exchange netex objects as an XML document. (It has no dependency on SIRI).
159+
<ul><li>For each data object type it describes an XML representation which can be used to exchange netex data.</li><li>It also describes filters to describe requests for publishing data. These can be used both to configure the publication, and to describe the contents of the published document, for example all Network Objects, or all current traffic events.</li><li>A particular use of the netex Publication Exchange format is to publish data from a NeTEx system: at regular intervals as an Xml document which can be transmitted to other systems by FTP or other communication transport means. </li></ul>
160+
</p></Description>
203161
<Format>
204162
<MediaType>text/xml</MediaType>
205163
<Syntax>http://www.w3.org/2001/XMLSchema</Syntax>
@@ -4579,14 +4537,12 @@ Correct COnstraints for PointOnRoute
45794537
<xsd:field xpath="@version"/>
45804538
<xsd:field xpath="@order"/>
45814539
</xsd:keyref>
4582-
45834540
<xsd:key name="ParkingAreaCapacityAssignment_AnyVersionedKey">
45844541
<xsd:selector xpath=".//netex:ParkingAreaCapacityAssignment"/>
45854542
<xsd:field xpath="@id"/>
45864543
<xsd:field xpath="@version"/>
45874544
<xsd:field xpath="@order"/>
45884545
</xsd:key>
4589-
45904546
<!-- =====RentalAvailability============================== -->
45914547
<!-- =====RentalAvailability unique========================== -->
45924548
<xsd:unique name="RentalAvailability_UniqueBy_Id_Version">

0 commit comments

Comments
 (0)