Skip to content

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

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.

Sign up for GitHub

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

Merged
skinkie merged 1 commit into from
Apr 29, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/functions/calendar/NeTEx_Calendar_se_PA1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +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">
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/calendar/Netex_calendarCodeing_02.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/calendar/Netex_calendarExample_01_BHN01.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/functions/fares/ENTUR-SchoolTwiceADayTripCarnet_2020120.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?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">
<PublicationTimestamp>2017-12-17T09:30:47.0Z</PublicationTimestamp>
Expand Down Expand Up @@ -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>
Expand Down
134 changes: 67 additions & 67 deletions examples/functions/fares/Netex_101.21_TfL_GeographicFares_UnitZone_MultipleProduct.xml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.1_Bus_SimpleFares_PointToPoint_SingleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.2_Bus_SimpleFares_PointToPoint_MultipleOffers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.3_Bus_SimpleFares_ZoneToZone_AdultChildProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_51.4_Bus_SimpleFares_ZoneToZone_OffPeakProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions examples/functions/fares/Netex_61.1_Bus_GeographicFares_UnitDistance_SingleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_61.2_Bus_GeographicFares_UnitZone_AdultChildProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
8 changes: 4 additions & 4 deletions examples/functions/fares/Netex_61.3_Bus_GeographicFares_UnitFareStage_SingleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 unit distance fare set for a simple bus timetable for a linear route in NeTex XML

Expand Down Expand Up @@ -43,9 +43,9 @@ Thus standard units woudl be calculated as

Price for Units

1 - �1,50
2 - �2.50
3. � 4.00
1 - £1,50
2 - £2.50
3. £ 4.00
==================================
2. DETAILS

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_61.4_Bus_GeographicFares_HierarchicalZone_MultipleOffers.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- ==== Simple Hierarchical Zonal Fare Example ======
This example shows the encoding of a zonal tariff for a simple bus timetable for a linear route in NeTex XML

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_71.1_Bus_TimeIntervalFares_Zonal_MultipleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- ==== Simple Time Interval Fare Example ======
This example shows the encoding of a time interval tariff for a simple bus timetable for a zone in NeTex XML

Expand Down
44 changes: 22 additions & 22 deletions examples/functions/fares/Netex_71.2_Bus_ZonalFares_MultipleSalesPackages.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 Zonal fare set for a bus timetable in NeTex XML

Expand Down Expand Up @@ -1015,7 +1015,7 @@ For the student product
<TopologicalPlace>North East</TopologicalPlace>
<Zone>Co. Durham</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�80 Funded</validityParameters>
<validityParameters>15 Week-£80 Funded</validityParameters>
<CellPrice>140</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -1026,7 +1026,7 @@ For the student product
<TopologicalPlace>North East</TopologicalPlace>
<Zone>Co. Durham</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�115 Funded</validityParameters>
<validityParameters>15 Week-£115 Funded</validityParameters>
<CellPrice>105</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -1037,7 +1037,7 @@ For the student product
<TopologicalPlace>North East</TopologicalPlace>
<Zone>Co. Durham</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�135 Funded</validityParameters>
<validityParameters>15 Week-£135 Funded</validityParameters>
<CellPrice>85</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand Down Expand Up @@ -1096,16 +1096,16 @@ For the student product
<!--- ====Pricing Parmaters======= -->
<PricingParameterSet version="1.0" id="cdla:Multiple_packages:pp">
<pricingRules>
<DiscountingRule version="any" id="cdla:�0-Off">
<DiscountingRule version="any" id="cdla:£0-Off">
<DiscountAsValue>0</DiscountAsValue>
</DiscountingRule>
<DiscountingRule version="any" id="cdla:�80-Off">
<DiscountingRule version="any" id="cdla:£80-Off">
<DiscountAsValue>80</DiscountAsValue>
</DiscountingRule>
<DiscountingRule version="any" id="cdla:�115-Off">
<DiscountingRule version="any" id="cdla:£115-Off">
<DiscountAsValue>115</DiscountAsValue>
</DiscountingRule>
<DiscountingRule version="any" id="cdla:�135-Off">
<DiscountingRule version="any" id="cdla:£135-Off">
<DiscountAsValue>135</DiscountAsValue>
</DiscountingRule>
</pricingRules>
Expand Down Expand Up @@ -1919,7 +1919,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>North East student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>250</Amount>
<DiscountingRuleRef version="any" ref="cdla:�0-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£0-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand All @@ -1933,7 +1933,7 @@ TopologicalPlace>North East</TopologicalPlace>
<TopologicalPlace>North East</TopologicalPlace>
<Zone>North East</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�80 Funded</validityParameters>
<validityParameters>15 Week-£80 Funded</validityParameters>
<CellPrice>170</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -1945,7 +1945,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>North East student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>170</Amount>
<DiscountingRuleRef version="any" ref="cdla:�80-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£80-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand All @@ -1958,7 +1958,7 @@ TopologicalPlace>North East</TopologicalPlace>
<TopologicalPlace>North East</TopologicalPlace>
<Zone>North East</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�115 Funded</validityParameters>
<validityParameters>15 Week-£115 Funded</validityParameters>
<CellPrice>135</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -1970,7 +1970,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>North East student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>135</Amount>
<DiscountingRuleRef version="any" ref="cdla:�115-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£115-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand All @@ -1983,7 +1983,7 @@ TopologicalPlace>North East</TopologicalPlace>
<TopologicalPlace>North East</TopologicalPlace>
<Zone>North East</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�135 Funded</validityParameters>
<validityParameters>15 Week-£135 Funded</validityParameters>
<CellPrice>115</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -1995,7 +1995,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>North East student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>115</Amount>
<DiscountingRuleRef version="any" ref="cdla:�115-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£115-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand Down Expand Up @@ -2270,7 +2270,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>County Durham student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>220</Amount>
<DiscountingRuleRef version="any" ref="cdla:�0-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£0-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand All @@ -2283,7 +2283,7 @@ TopologicalPlace>North East</TopologicalPlace>
<TopologicalPlace>North East</TopologicalPlace>
<Zone>Co. Durham</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�80 Funded</validityParameters>
<validityParameters>15 Week-£80 Funded</validityParameters>
<CellPrice>140</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -2295,7 +2295,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>County Durham student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>140</Amount>
<DiscountingRuleRef version="any" ref="cdla:�80-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£80-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand All @@ -2308,7 +2308,7 @@ TopologicalPlace>North East</TopologicalPlace>
<TopologicalPlace>North East</TopologicalPlace>
<Zone>Co. Durham</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�115 Funded</validityParameters>
<validityParameters>15 Week-£115 Funded</validityParameters>
<CellPrice>105</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -2320,7 +2320,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>County Durham student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>105</Amount>
<DiscountingRuleRef version="any" ref="cdla:�115-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£115-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand All @@ -2333,7 +2333,7 @@ TopologicalPlace>North East</TopologicalPlace>
<TopologicalPlace>North East</TopologicalPlace>
<Zone>Co. Durham</Zone>
<Type>Student</Type>
<validityParameters>15 Week-�135 Funded</validityParameters>
<validityParameters>15 Week-£135 Funded</validityParameters>
<CellPrice>85</CellPrice>
<PriceActivationFrom>20110808</PriceActivationFrom>,Variable,
<period>104</period>
Expand All @@ -2345,7 +2345,7 @@ TopologicalPlace>North East</TopologicalPlace>
<Name>County Durham student fare 15Week unfunded</Name>
<StartDate>2011-08-08</StartDate>
<Amount>85</Amount>
<DiscountingRuleRef version="any" ref="cdla:�135-Off"/>
<DiscountingRuleRef version="any" ref="cdla:£135-Off"/>
</CellPrice>
<FareProductRef version="1.0" ref="cdla:Period_pass@student"/>
<TimeIntervalRef version="1.0" ref="cdla:15week"/>
Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_81.1_Metro_FlatFare_GroupProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 flat fare set for w ith a group ticket in NeTex XML

Expand Down
2 changes: 1 addition & 1 deletion examples/functions/fares/Netex_91.1_Rail_RailCard_MultipleProduct.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<?xml version="1.0" encoding="UTF-8"?>
<!-- ==== Simple Railcard tarriff Example ======
This example shows the encoding of a rail card with discount rights on purchase of rail tickets in NeTex XML

Expand Down
Loading