Lint and update documentation tables

NeTEx-CEN · Feb 22, 2023 · 034fe54 · 034fe54
1 parent abca654
commit 034fe54
Show file tree

Hide file tree

Showing 212 changed files with 7,885 additions and 8,105 deletions.
diff --git a/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml b/examples/functions/calendar/NeTEx_Calendar_se_PA1.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ====  Example of suggested NeTEx Calendar version====== -->
 <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">
 	<PublicationTimestamp>2001-12-17T09:30:47.0Z</PublicationTimestamp>

diff --git a/examples/functions/calendar/Netex_calendarCodeing_02.xml b/examples/functions/calendar/Netex_calendarCodeing_02.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== SImple Timetable  Example ====== 
 This example shows the encoding of a SERVICE CALENDAR F in NeTex XML  
 

diff --git a/examples/functions/calendar/Netex_calendarExample_01_BHN01.xml b/examples/functions/calendar/Netex_calendarExample_01_BHN01.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== SImple Timetable  Example ======
 This example shows the encoding of a simple
 Calendar

diff --git a/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml b/examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== FSYO First Passes==== -->
-<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">
+<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">
 	<PublicationTimestamp>2017-12-17T09:30:47.0Z</PublicationTimestamp>
 	<ParticipantRef>SYS001</ParticipantRef>
 	<!-- ======WHAT WAS REQUESTED ========== -->
@@ -321,7 +321,7 @@
 									<EndDate>2021-09-07T01:07:00</EndDate>
 									<fareContractEntries>
 										<SalesTransaction version="1" id="ENX:5781234501">
-											<Name>Kjøp Skoleskyss</Name>
+											<Name>Kjøp Skoleskyss</Name>
 											<Description>Initial purchase of carnet</Description>
 											<Date>2020-09-06T01:07:00</Date>
 											<Amount>10000</Amount>

diff --git a/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml b/examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
diff --git a/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml b/examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== Simple Point to Point Fare  Example ====== 
 This example shows the encoding of a simple point to point  fare set for a simple bus timetable for a   route in NeTex XML  
  
@@ -82,7 +82,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 		A separate  FARE FRAME is used to contain  the FARE   price  elements 
 		 A RESOURCE FRAME is used to contain  common code values 
 -->
-<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">
+<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">
 	<PublicationTimestamp>2010-12-17T09:30:47.0Z</PublicationTimestamp>
 	<ParticipantRef>SYS001</ParticipantRef>
 	<!--- ======WHAT WAS REQUESTED ========== -->
@@ -313,10 +313,9 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 					<FrameDefaults>
 						<DefaultCurrency>EUR</DefaultCurrency>
 					</FrameDefaults>
-
 					<prerequisites>
 						<FareFrameRef version="1.0" ref="myfares:DTA@Line_1@products"/>
-					</prerequisites>	
+					</prerequisites>
 					<priceGroups>
 						<PriceGroup version="1.0" id="myfares:Line_1">
 							<members>
@@ -366,7 +365,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 								<TypeOfTariff version="ntx:v1.0" id="ntx:zonal">
 									<Name>Zonal</Name>
 								</TypeOfTariff>
-										<TypeOfTariff version="ntx:v1.0" id="ntx:unit_distance">
+								<TypeOfTariff version="ntx:v1.0" id="ntx:unit_distance">
 									<Name>Unit distance (count of stops, sections, zones)</Name>
 								</TypeOfTariff>
 								<TypeOfTariff version="ntx:v1.0" id="ntx:section">

diff --git a/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml b/examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== Simple Point to Point Fare with  different media offers  Example ====== 
 This example shows the encoding of a point to point tariff for a simple bus timetable for a linear route in NeTex XML  
     
@@ -217,15 +217,15 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 				</ServiceFrame>
 				<!--- =============== FAREs =========== -->
 				<FareFrame version="1.0" id="myfares:DTA@Line24@products">
-						<prerequisites>
+					<prerequisites>
 						<ServiceFrameRef version="1.0" ref="mybus:DTA@Line24@network"/>
 					</prerequisites>
 					<!--- ====Fare Structure======= -->
 					<tariffs>
 						<Tariff version="1.0" id="myfares:PointToPoint_01">
 							<Name>Point to Point   Tariff</Name>
 							<OperatorRef version="any" ref="mybus:DTA"/>
-										<TypeOfTariffRef version="ntx:v1.0" ref="ntx:point_to_point"/>
+							<TypeOfTariffRef version="ntx:v1.0" ref="ntx:point_to_point"/>
 							<fareStructureElements>
 								<FareStructureElement version="1.0" id="myfares:PointToPoint_01@access">
 									<distanceMatrixElements>
@@ -288,8 +288,8 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 												<MaximalFrequency>1</MaximalFrequency>
 											</FrequencyOfUse>
 											<Interchanging version="1.0" id="myfares:PointToPoint_01@conditions_of_travel@interchanging">
-													<FromMode>bus</FromMode>
-													<ToMode>bus</ToMode>
+												<FromMode>bus</FromMode>
+												<ToMode>bus</ToMode>
 												<MaximumNumberOfInterchanges>0</MaximumNumberOfInterchanges>
 											</Interchanging>
 										</limitations>
@@ -344,7 +344,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 					<fareProducts>
 						<PreassignedFareProduct version="1.0" id="myfares:Trip">
 							<Name>Standard Point To Point Trip  fare   </Name>
-									<TypeOfFareProductRef version="ntx:v1.0" ref="ntx:trip"/>
+							<TypeOfFareProductRef version="ntx:v1.0" ref="ntx:trip"/>
 							<OperatorRef version="any" ref="mybus:DTA"/>
 							<!--- ====VALIDABLE ELEMENTs====== -->
 							<validableElements>
@@ -419,11 +419,10 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 				</FareFrame>
 				<!--- =============== FAREs =========== -->
 				<FareFrame version="1.0" id="myfares:DTA@Line24@prices">
-									<Name>Prices for Line 24</Name>
+					<Name>Prices for Line 24</Name>
 					<prerequisites>
 						<FareFrameRef version="1.0" ref="myfares:DTA@Line24@products"/>
-					</prerequisites>	
-
+					</prerequisites>
 					<!--- ====Pricing Parmaters======= -->
 					<PricingParameterSet version="1.0" id="myfares:Line24">
 						<pricingRules>
@@ -579,16 +578,15 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 				</FareFrame>
 				<!--   ==== COMMON RESOURCES  ==   -->
 				<ResourceFrame version="1.0" id="mybus:DTA@Common_resources">
-						<codespaces>
+					<codespaces>
 						<Codespace id="ntx">
 							<Xmlns>ntx</Xmlns>
 							<XmlnsUrl>http://netex.org.uk/</XmlnsUrl>
 							<Description>Netex built in value</Description>
 						</Codespace>
 					</codespaces>
 					<typesOfValue>
-
-					<ValueSet version="ntx:v1.0" id="ntx:Types_of_Tariff" classOfValues="TypeOfTariff">
+						<ValueSet version="ntx:v1.0" id="ntx:Types_of_Tariff" classOfValues="TypeOfTariff">
 							<Name>Types of Tariff</Name>
 							<values>
 								<!--- ====Types OfTariff ========= -->
@@ -627,29 +625,26 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 								</TypeOfTariff>
 							</values>
 						</ValueSet>
-
-
 						<ValueSet version="ntx:v1.0" id="ntx:Types_of_FareProduct" classOfValues="TypeOfFareProduct">
 							<Name>Types of Fare Product</Name>
-							<values> 
+							<values>
 								<TypeOfFareProduct version="ntx:v1.0" id="ntx:trip">
 									<Name>Trip product</Name>
 								</TypeOfFareProduct>
-														<TypeOfFareProduct version="ntx:v1.0" id="ntx:multi_trip">
+								<TypeOfFareProduct version="ntx:v1.0" id="ntx:multi_trip">
 									<Name>Multitrip / carnet  product</Name>
 								</TypeOfFareProduct>
-									<TypeOfFareProduct version="ntx:v1.0" id="ntx:period_pass">
+								<TypeOfFareProduct version="ntx:v1.0" id="ntx:period_pass">
 									<Name>Peroid pass product</Name>
 								</TypeOfFareProduct>
-										<TypeOfFareProduct version="ntx:v1.0" id="ntx:day_pass">
+								<TypeOfFareProduct version="ntx:v1.0" id="ntx:day_pass">
 									<Name>Day pass product</Name>
 								</TypeOfFareProduct>
-																	<TypeOfFareProduct version="ntx:v1.0" id="ntx:discount_card">
+								<TypeOfFareProduct version="ntx:v1.0" id="ntx:discount_card">
 									<Name>Discount  product</Name>
 								</TypeOfFareProduct>
-
 							</values>
-						</ValueSet>		
+						</ValueSet>
 						<ValueSet version="any" id="myfares:Classes_of_Use" classOfValues="ClassOfUse">
 							<values>
 								<!--- ==== ClassOfUse========= -->

diff --git a/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml b/examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== Simple Zone to Zone Fare  Example ====== 
 This example shows the encoding of a Zone to zone tariff for a simple busn etwork in  NeTex XML  
 
@@ -308,9 +308,9 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 										<TypeOfAccessRightAssignmentRef version="ntx:v1.0" ref="ntx:can_access"/>
 										<ValidityParameterGroupingType>XOR</ValidityParameterGroupingType>
 										<validityParameters>
-													<NetworkRef version="any" ref="mybus:DTA"/>
+											<NetworkRef version="any" ref="mybus:DTA"/>
 										</validityParameters>
-								</GenericParameterAssignment>
+									</GenericParameterAssignment>
 								</FareStructureElement>
 								<FareStructureElement version="1.0" id="myfares:Tz2z@eligibility">
 									<Name>Eligible user types</Name>
@@ -388,7 +388,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 								</DistanceMatrixElement>
 							</distanceMatrixElements>
 							<!--  == Prices === -->
-							<priceGroups> 
+							<priceGroups>
 								<PriceGroupRef version="1.0" ref="myfares:DTA@discounts"/>
 							</priceGroups>
 							<fareTables>
@@ -400,7 +400,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 					<fareProducts>
 						<PreassignedFareProduct version="1.0" id="myfares:SingleTrip">
 							<Name>Adult Zone to zone  Trip   </Name>
-								<OperatorRef version="any" ref="mybus:DTA"/>
+							<OperatorRef version="any" ref="mybus:DTA"/>
 							<!--- ====VALIDABLE ELEMENTs====== -->
 							<validableElements>
 								<ValidableElement version="1.0" id="myfares:SingleTrip@travel">

diff --git a/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml b/examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== Simple Zone to Zone with peak and Off peak  ratesFare Example ====== 
 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 
  
@@ -333,7 +333,7 @@ The Calendar is shown coded as
 				<FareFrame version="1.0" id="myfares:DTA@z2z_time_banded@products">
 					<prerequisites>
 						<ServiceFrameRef version="1.0" ref="mybus:DTA@z2z_time_banded@network"/>
-							<ServiceCalendarFrameRef version="1.0" ref="myfares:DTA@z2z_time_banded@calendar"/>
+						<ServiceCalendarFrameRef version="1.0" ref="myfares:DTA@z2z_time_banded@calendar"/>
 					</prerequisites>
 					<!--- ====Pricing Parmaters======= -->
 					<PricingParameterSet version="1.0" id="myfares:price_rules">
@@ -589,9 +589,9 @@ The Calendar is shown coded as
 					</salesOfferPackages>
 				</FareFrame>
 				<FareFrame version="1.0" id="myfares:DTA@z2z_time_banded@prices">
-							<prerequisites>
+					<prerequisites>
 						<FareFrameRef version="1.0" ref="myfares:DTA@z2z_time_banded@products"/>
-					</prerequisites>	
+					</prerequisites>
 					<!--- ====Fare Prices======= -->
 					<fareTables>
 						<FareTable version="1.0" id="myfares:DTA">

diff --git a/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml b/examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== Simple Unit Distance Fare Example ====== 
 This example shows the encoding of a unit distance fare set for a simple bus timetable for a linear route in NeTex XML 
  
@@ -39,7 +39,7 @@ Point to point Fare matrix
  B gi1	-
  A - 
  
-Price Per Unit £1,50
+Price Per Unit £1,50
 
 Thus standard fares woudl be calculated as 
 
@@ -172,7 +172,6 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 						<ResourceFrameRef version="1.0" ref="mybus:DTA@Common_Resources"/>
 					</prerequisites>
 					<Network version="any" id="mybus:DTA">
-
 						<members>
 							<LineRef version="any" ref="mybus:Line_24"/>
 						</members>
@@ -239,7 +238,7 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 				<!--- =============== FAREs =========== -->
 				<FareFrame version="1.0" id="myfares:DTA@Line24_Unit_Distance@products">
 					<prerequisites>
-						<ServiceFrameRef version="1.0" ref="mybus:DTA@Line24_Unit_Distance@network"/> 
+						<ServiceFrameRef version="1.0" ref="mybus:DTA@Line24_Unit_Distance@network"/>
 					</prerequisites>
 					<!--- ====Fare Structure======= -->
 					<geographicalUnits>

diff --git a/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml b/examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- ==== Simple Unt Zone Fare  Example ====== 
 This example shows the encoding of a unit distance tariff or a simple bus timetable for a linear route in NeTex XML  
 
@@ -261,7 +261,6 @@ A COMPOSITE FRAME is used to group the component FRAMEs
 					<tariffs>
 						<Tariff version="1.0" id="myfares:Unit_zone">
 							<Name>Unit fare zones</Name>
-
 							<OperatorRef version="1.0" ref="mybus:DTA"/>
 							<TypeOfTariffRef version="ntx:v1.0" ref="ntx:unit_distance"/>
 							<GeographicalUnitRef version="1.0" ref="myfares:1Zone"/>