Skip to content

Commit 034fe54

Browse files
Lint and update documentation tables
1 parent abca654 commit 034fe54

File tree

212 files changed

+7885
-8105
lines changed

Some content is hidden

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

212 files changed

+7885
-8105
lines changed

examples/functions/calendar/NeTEx_Calendar_se_PA1.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="iso-8859-1"?>
2-
1+
<?xml version="1.0" encoding="UTF-8"?>
32
<!-- ==== Example of suggested NeTEx Calendar version====== -->
43
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
54
<PublicationTimestamp>2001-12-17T09:30:47.0Z</PublicationTimestamp>

examples/functions/calendar/Netex_calendarCodeing_02.xml

Lines changed: 1 addition & 1 deletion
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
<!-- ==== SImple Timetable Example ======
33
This example shows the encoding of a SERVICE CALENDAR F in NeTex XML
44

examples/functions/calendar/Netex_calendarExample_01_BHN01.xml

Lines changed: 1 addition & 1 deletion
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
<!-- ==== SImple Timetable Example ======
33
This example shows the encoding of a simple
44
Calendar

examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<?xml version="1.0" encoding="iso-8859-1"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
22
<!-- ==== FSYO First Passes==== -->
3-
<PublicationDelivery version="1.1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd" xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3+
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
44
<PublicationTimestamp>2017-12-17T09:30:47.0Z</PublicationTimestamp>
55
<ParticipantRef>SYS001</ParticipantRef>
66
<!-- ======WHAT WAS REQUESTED ========== -->
@@ -321,7 +321,7 @@
321321
<EndDate>2021-09-07T01:07:00</EndDate>
322322
<fareContractEntries>
323323
<SalesTransaction version="1" id="ENX:5781234501">
324-
<Name>Kjøp Skoleskyss</Name>
324+
<Name>Kjøp Skoleskyss</Name>
325325
<Description>Initial purchase of carnet</Description>
326326
<Date>2020-09-06T01:07:00</Date>
327327
<Amount>10000</Amount>

examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml

Lines changed: 79 additions & 81 deletions
Large diffs are not rendered by default.

examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml

Lines changed: 4 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
<!-- ==== Simple Point to Point Fare Example ======
33
This example shows the encoding of a simple point to point fare set for a simple bus timetable for a route in NeTex XML
44
@@ -82,7 +82,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
8282
A separate FARE FRAME is used to contain the FARE price elements
8383
A RESOURCE FRAME is used to contain common code values
8484
-->
85-
<PublicationDelivery version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd" xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
85+
<PublicationDelivery xmlns="http://www.netex.org.uk/netex" xmlns:siri="http://www.siri.org.uk/siri" xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" xsi:schemaLocation="http://www.netex.org.uk/netex ../../../xsd/NeTEx_publication.xsd">
8686
<PublicationTimestamp>2010-12-17T09:30:47.0Z</PublicationTimestamp>
8787
<ParticipantRef>SYS001</ParticipantRef>
8888
<!--- ======WHAT WAS REQUESTED ========== -->
@@ -313,10 +313,9 @@ A COMPOSITE FRAME is used to group the component FRAMEs
313313
<FrameDefaults>
314314
<DefaultCurrency>EUR</DefaultCurrency>
315315
</FrameDefaults>
316-
317316
<prerequisites>
318317
<FareFrameRef version="1.0" ref="myfares:DTA@Line_1@products"/>
319-
</prerequisites>
318+
</prerequisites>
320319
<priceGroups>
321320
<PriceGroup version="1.0" id="myfares:Line_1">
322321
<members>
@@ -366,7 +365,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
366365
<TypeOfTariff version="ntx:v1.0" id="ntx:zonal">
367366
<Name>Zonal</Name>
368367
</TypeOfTariff>
369-
<TypeOfTariff version="ntx:v1.0" id="ntx:unit_distance">
368+
<TypeOfTariff version="ntx:v1.0" id="ntx:unit_distance">
370369
<Name>Unit distance (count of stops, sections, zones)</Name>
371370
</TypeOfTariff>
372371
<TypeOfTariff version="ntx:v1.0" id="ntx:section">

examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml

Lines changed: 16 additions & 21 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
<!-- ==== Simple Point to Point Fare with different media offers Example ======
33
This example shows the encoding of a point to point tariff for a simple bus timetable for a linear route in NeTex XML
44
@@ -217,15 +217,15 @@ A COMPOSITE FRAME is used to group the component FRAMEs
217217
</ServiceFrame>
218218
<!--- =============== FAREs =========== -->
219219
<FareFrame version="1.0" id="myfares:DTA@Line24@products">
220-
<prerequisites>
220+
<prerequisites>
221221
<ServiceFrameRef version="1.0" ref="mybus:DTA@Line24@network"/>
222222
</prerequisites>
223223
<!--- ====Fare Structure======= -->
224224
<tariffs>
225225
<Tariff version="1.0" id="myfares:PointToPoint_01">
226226
<Name>Point to Point Tariff</Name>
227227
<OperatorRef version="any" ref="mybus:DTA"/>
228-
<TypeOfTariffRef version="ntx:v1.0" ref="ntx:point_to_point"/>
228+
<TypeOfTariffRef version="ntx:v1.0" ref="ntx:point_to_point"/>
229229
<fareStructureElements>
230230
<FareStructureElement version="1.0" id="myfares:PointToPoint_01@access">
231231
<distanceMatrixElements>
@@ -288,8 +288,8 @@ A COMPOSITE FRAME is used to group the component FRAMEs
288288
<MaximalFrequency>1</MaximalFrequency>
289289
</FrequencyOfUse>
290290
<Interchanging version="1.0" id="myfares:PointToPoint_01@conditions_of_travel@interchanging">
291-
<FromMode>bus</FromMode>
292-
<ToMode>bus</ToMode>
291+
<FromMode>bus</FromMode>
292+
<ToMode>bus</ToMode>
293293
<MaximumNumberOfInterchanges>0</MaximumNumberOfInterchanges>
294294
</Interchanging>
295295
</limitations>
@@ -344,7 +344,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
344344
<fareProducts>
345345
<PreassignedFareProduct version="1.0" id="myfares:Trip">
346346
<Name>Standard Point To Point Trip fare </Name>
347-
<TypeOfFareProductRef version="ntx:v1.0" ref="ntx:trip"/>
347+
<TypeOfFareProductRef version="ntx:v1.0" ref="ntx:trip"/>
348348
<OperatorRef version="any" ref="mybus:DTA"/>
349349
<!--- ====VALIDABLE ELEMENTs====== -->
350350
<validableElements>
@@ -419,11 +419,10 @@ A COMPOSITE FRAME is used to group the component FRAMEs
419419
</FareFrame>
420420
<!--- =============== FAREs =========== -->
421421
<FareFrame version="1.0" id="myfares:DTA@Line24@prices">
422-
<Name>Prices for Line 24</Name>
422+
<Name>Prices for Line 24</Name>
423423
<prerequisites>
424424
<FareFrameRef version="1.0" ref="myfares:DTA@Line24@products"/>
425-
</prerequisites>
426-
425+
</prerequisites>
427426
<!--- ====Pricing Parmaters======= -->
428427
<PricingParameterSet version="1.0" id="myfares:Line24">
429428
<pricingRules>
@@ -579,16 +578,15 @@ A COMPOSITE FRAME is used to group the component FRAMEs
579578
</FareFrame>
580579
<!-- ==== COMMON RESOURCES == -->
581580
<ResourceFrame version="1.0" id="mybus:DTA@Common_resources">
582-
<codespaces>
581+
<codespaces>
583582
<Codespace id="ntx">
584583
<Xmlns>ntx</Xmlns>
585584
<XmlnsUrl>http://netex.org.uk/</XmlnsUrl>
586585
<Description>Netex built in value</Description>
587586
</Codespace>
588587
</codespaces>
589588
<typesOfValue>
590-
591-
<ValueSet version="ntx:v1.0" id="ntx:Types_of_Tariff" classOfValues="TypeOfTariff">
589+
<ValueSet version="ntx:v1.0" id="ntx:Types_of_Tariff" classOfValues="TypeOfTariff">
592590
<Name>Types of Tariff</Name>
593591
<values>
594592
<!--- ====Types OfTariff ========= -->
@@ -627,29 +625,26 @@ A COMPOSITE FRAME is used to group the component FRAMEs
627625
</TypeOfTariff>
628626
</values>
629627
</ValueSet>
630-
631-
632628
<ValueSet version="ntx:v1.0" id="ntx:Types_of_FareProduct" classOfValues="TypeOfFareProduct">
633629
<Name>Types of Fare Product</Name>
634-
<values>
630+
<values>
635631
<TypeOfFareProduct version="ntx:v1.0" id="ntx:trip">
636632
<Name>Trip product</Name>
637633
</TypeOfFareProduct>
638-
<TypeOfFareProduct version="ntx:v1.0" id="ntx:multi_trip">
634+
<TypeOfFareProduct version="ntx:v1.0" id="ntx:multi_trip">
639635
<Name>Multitrip / carnet product</Name>
640636
</TypeOfFareProduct>
641-
<TypeOfFareProduct version="ntx:v1.0" id="ntx:period_pass">
637+
<TypeOfFareProduct version="ntx:v1.0" id="ntx:period_pass">
642638
<Name>Peroid pass product</Name>
643639
</TypeOfFareProduct>
644-
<TypeOfFareProduct version="ntx:v1.0" id="ntx:day_pass">
640+
<TypeOfFareProduct version="ntx:v1.0" id="ntx:day_pass">
645641
<Name>Day pass product</Name>
646642
</TypeOfFareProduct>
647-
<TypeOfFareProduct version="ntx:v1.0" id="ntx:discount_card">
643+
<TypeOfFareProduct version="ntx:v1.0" id="ntx:discount_card">
648644
<Name>Discount product</Name>
649645
</TypeOfFareProduct>
650-
651646
</values>
652-
</ValueSet>
647+
</ValueSet>
653648
<ValueSet version="any" id="myfares:Classes_of_Use" classOfValues="ClassOfUse">
654649
<values>
655650
<!--- ==== ClassOfUse========= -->

examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml

Lines changed: 5 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
<!-- ==== Simple Zone to Zone Fare Example ======
33
This example shows the encoding of a Zone to zone tariff for a simple busn etwork in NeTex XML
44
@@ -308,9 +308,9 @@ A COMPOSITE FRAME is used to group the component FRAMEs
308308
<TypeOfAccessRightAssignmentRef version="ntx:v1.0" ref="ntx:can_access"/>
309309
<ValidityParameterGroupingType>XOR</ValidityParameterGroupingType>
310310
<validityParameters>
311-
<NetworkRef version="any" ref="mybus:DTA"/>
311+
<NetworkRef version="any" ref="mybus:DTA"/>
312312
</validityParameters>
313-
</GenericParameterAssignment>
313+
</GenericParameterAssignment>
314314
</FareStructureElement>
315315
<FareStructureElement version="1.0" id="myfares:Tz2z@eligibility">
316316
<Name>Eligible user types</Name>
@@ -388,7 +388,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
388388
</DistanceMatrixElement>
389389
</distanceMatrixElements>
390390
<!-- == Prices === -->
391-
<priceGroups>
391+
<priceGroups>
392392
<PriceGroupRef version="1.0" ref="myfares:DTA@discounts"/>
393393
</priceGroups>
394394
<fareTables>
@@ -400,7 +400,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
400400
<fareProducts>
401401
<PreassignedFareProduct version="1.0" id="myfares:SingleTrip">
402402
<Name>Adult Zone to zone Trip </Name>
403-
<OperatorRef version="any" ref="mybus:DTA"/>
403+
<OperatorRef version="any" ref="mybus:DTA"/>
404404
<!--- ====VALIDABLE ELEMENTs====== -->
405405
<validableElements>
406406
<ValidableElement version="1.0" id="myfares:SingleTrip@travel">

examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml

Lines changed: 4 additions & 4 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
<!-- ==== Simple Zone to Zone with peak and Off peak ratesFare Example ======
33
This example shows the encoding of tariff for a simple bus network witha one to zone stucture and peak and off peak fares in NeTex XML
44
@@ -333,7 +333,7 @@ The Calendar is shown coded as
333333
<FareFrame version="1.0" id="myfares:DTA@z2z_time_banded@products">
334334
<prerequisites>
335335
<ServiceFrameRef version="1.0" ref="mybus:DTA@z2z_time_banded@network"/>
336-
<ServiceCalendarFrameRef version="1.0" ref="myfares:DTA@z2z_time_banded@calendar"/>
336+
<ServiceCalendarFrameRef version="1.0" ref="myfares:DTA@z2z_time_banded@calendar"/>
337337
</prerequisites>
338338
<!--- ====Pricing Parmaters======= -->
339339
<PricingParameterSet version="1.0" id="myfares:price_rules">
@@ -589,9 +589,9 @@ The Calendar is shown coded as
589589
</salesOfferPackages>
590590
</FareFrame>
591591
<FareFrame version="1.0" id="myfares:DTA@z2z_time_banded@prices">
592-
<prerequisites>
592+
<prerequisites>
593593
<FareFrameRef version="1.0" ref="myfares:DTA@z2z_time_banded@products"/>
594-
</prerequisites>
594+
</prerequisites>
595595
<!--- ====Fare Prices======= -->
596596
<fareTables>
597597
<FareTable version="1.0" id="myfares:DTA">

examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml

Lines changed: 3 additions & 4 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
<!-- ==== Simple Unit Distance Fare Example ======
33
This example shows the encoding of a unit distance fare set for a simple bus timetable for a linear route in NeTex XML
44
@@ -39,7 +39,7 @@ Point to point Fare matrix
3939
B gi1 -
4040
A -
4141
42-
Price Per Unit £1,50
42+
Price Per Unit £1,50
4343
4444
Thus standard fares woudl be calculated as
4545
@@ -172,7 +172,6 @@ A COMPOSITE FRAME is used to group the component FRAMEs
172172
<ResourceFrameRef version="1.0" ref="mybus:DTA@Common_Resources"/>
173173
</prerequisites>
174174
<Network version="any" id="mybus:DTA">
175-
176175
<members>
177176
<LineRef version="any" ref="mybus:Line_24"/>
178177
</members>
@@ -239,7 +238,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
239238
<!--- =============== FAREs =========== -->
240239
<FareFrame version="1.0" id="myfares:DTA@Line24_Unit_Distance@products">
241240
<prerequisites>
242-
<ServiceFrameRef version="1.0" ref="mybus:DTA@Line24_Unit_Distance@network"/>
241+
<ServiceFrameRef version="1.0" ref="mybus:DTA@Line24_Unit_Distance@network"/>
243242
</prerequisites>
244243
<!--- ====Fare Structure======= -->
245244
<geographicalUnits>

0 commit comments

Comments
 (0)