fixing Operator/Authority choice in line

.travis.yml

@@ -1,7 +1,20 @@
-language: c
+language: java
+
+# use Java 11
+jdk:
+- openjdk11
+
+# see https://blog.travis-ci.com/2014-12-17-faster-builds-with-container-based-infrastructure
+sudo: false
+
+# cache the build tool's caches
+cache:
+  directories:
+  - $HOME/.m2
 
 before_script:
   - sudo apt-get install -qq libxml2-utils
-
+  - echo "MAVEN_OPTS='-Xmx4g'" > ~/.mavenrc
 script:
   - "xmllint --noout --schema xsd/NeTEx_publication.xsd examples/functions/calendar/*xml examples/functions/fares/*xml examples/functions/grouping/*xml examples/functions/newModes/*xml examples/functions/patterns/*xml examples/functions/pointOfInterest/*xml examples/functions/simpleNetwork/*xml examples/functions/site/*xml examples/functions/stopPlace/*xml examples/functions/timetable/*xml examples/functions/validityCondition/*xml examples/functions/variant/*xml examples/functions/vehicleSchedule/*xml examples/functions/versioning/*xml examples/standards/epip/*xml examples/standards/era_uic/*xml examples/standards/fxc/*xml examples/standards/gbfs/*xml examples/standards/gtfs/*xml examples/standards/neptune/*xml  examples/standards/noptis/*xml examples/standards/tap_tsi/*xml examples/standards/txc/*xml examples/standards/vdv452/*/*xml examples/standards/vdv452/*/*/*xml"
+# disabled for now  - "travis_wait 360 mvn clean install -P codestyle -DratchetFrom=HEAD -X"

README.md

@@ -1,5 +1,5 @@
 # NeTEx (Network Timetable EXchange) XML schema
-(C) 2009-2021  NeTEx, CEN, Crown Copyright
+(C) 2009-2022  NeTEx, CEN, Crown Copyright
 
 ## Schemas for: Core, Part 1 (Network),  Part 2 (Timetables), Part3 (Fares) and Part5 (NewModes).
 
@@ -31,7 +31,41 @@ The schema is broken down systematically into small modular files; generally for
  - netex_xxxx_suppport.xsd - containing data type  and ref structure definitions.
  - netex_xxxx_version.xsd - containing the element definitions.
 ----
+## Contributing
+
+### Codestyle
+Any changes to the content must be formatted according to a set of rules. The formatting rules are described using [Eclipse WTP configuration files](eclipsecodestyle/xml.prefs). 
+These may be imported into an Eclipse based editor or configured manually in your preferred editor. The configuration file is *somewhat* self-explanatory, but the important rules are:
+* Character encoding must be `UTF-8`
+* Line width is max 200 characters
+* Indentation is done using `space` (opposed to `tabs`)
+* Indentation level is 2 spaces
+
+
+#### Verifying and performing formatting on the command line
+
+* Prerequisite: A working [Maven installation](https://maven.apache.org/)
+
+Note: Format checks take quite a bit of time for the examples folder (1 hour+), and you may limit the reformatting/checks to a set of files by specifying 
+`-DspotlessFiles=xsd/path/to/changed/file.xsd,examples/path/to/changed/file.xml`
+
+Note2: You may also specify that only files changed since latest commit on your base branch be formatted by specifying
+`-DratchetFrom=<your origin>/<branch_you_are_based_on>`, ie if you are creating a PR branch based on the current master: `-DratchetFrom=origin/master`
+
+To verify that the code is according to standard, run from the project root folder
+```
+mvn spotless:check <see notes above>
+```
+
+To actually format any discrepancies, run
+```
+mvn spotless:apply <see notes above>
+```
+
+Reference https://github.com/diffplug/spotless/blob/main/plugin-maven/README.md#eclipse-web-tools-platform
+
 # Changelog
+=======
 
 See [CHANGELOG](CHANGELOG.md)
 

eclipsecodestyle/xml.prefs

@@ -0,0 +1,26 @@
+attributeHasNoValue=2
+eclipse.preferences.version=1
+endTagWithAttributes=2
+formatCommentJoinLines=false
+formatCommentText=false
+honourAllSchemaLocations=true
+indentationChar=space
+indentationSize=2
+indicateNoGrammar=-1
+indicateReferencedFileContainsErrors=2
+indiciateNoDocumentElement=-1
+lineWidth=200
+markupValidation=true
+missingClosingBracket=2
+missingClosingQuote=2
+missingEndTag=2
+missingQuotes=2
+missingStartTag=2
+missingTagName=2
+namespaceInPITarget=2
+preserveCDATAContent=true
+resolveExternalEntities=false
+spaceBeforeEmptyCloseTag=false
+whitespaceAtStart=2
+whitespaceBeforeTagName=2
+xinclude=false

examples/functions/calendar/NeTEx_Calendar_se_PA1.xml

@@ -1,65 +1,66 @@
 <?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>
-	<ParticipantRef>SYS001</ParticipantRef>
-	<PublicationRequest version="1.0">
-		<RequestTimestamp>2001-12-17T09:30:47.0Z</RequestTimestamp>
-		<ParticipantRef>SYS002</ParticipantRef>
-		<topics>
-			<NetworkFrameTopic>
-				<Current/>
-				<ServiceCalendarFrameRef ref="noptis:9085002000100000"/>
-			</NetworkFrameTopic>
-		</topics>
-	</PublicationRequest>
-	<PublicationRefreshInterval>P7D</PublicationRefreshInterval>
-	<Description>Noptis simple Simple service calendar  example</Description>
-	<dataObjects>
-		<ServiceCalendarFrame version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
+<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>
+  <ParticipantRef>SYS001</ParticipantRef>
+  <PublicationRequest version="1.0">
+    <RequestTimestamp>2001-12-17T09:30:47.0Z</RequestTimestamp>
+    <ParticipantRef>SYS002</ParticipantRef>
+    <topics>
+      <NetworkFrameTopic>
+        <Current/>
+        <ServiceCalendarFrameRef ref="noptis:9085002000100000"/>
+      </NetworkFrameTopic>
+    </topics>
+  </PublicationRequest>
+  <PublicationRefreshInterval>P7D</PublicationRefreshInterval>
+  <Description>Noptis simple Simple service calendar example</Description>
+  <dataObjects>
+    <ServiceCalendarFrame version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
 			<!--- ======= CODESPACEs======== -->
-			<codespaces>
-				<Codespace id="noptis">
-					<Xmlns>noptis</Xmlns>
-					<XmlnsUrl>http://www.noptis.org./noptis</XmlnsUrl>
-					<Description>A Noptis Customer </Description>
-				</Codespace>
-			</codespaces>
+      <codespaces>
+        <Codespace id="noptis">
+          <Xmlns>noptis</Xmlns>
+          <XmlnsUrl>http://www.noptis.org./noptis</XmlnsUrl>
+          <Description>A Noptis Customer </Description>
+        </Codespace>
+      </codespaces>
 			<!--- =======FRAME DEFAULTS======== -->
-			<FrameDefaults>
-				<DefaultCodespaceRef ref="noptis"/>
-			</FrameDefaults>
+      <FrameDefaults>
+        <DefaultCodespaceRef ref="noptis"/>
+      </FrameDefaults>
 			<!-- =========================================== -->
-			<ServiceCalendar version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
-				<Name>Base</Name>
-				<FromDate>2007-06-17</FromDate>
-				<ToDate>2008-06-14</ToDate>
-				<dayTypes>
-					<DayType version="any" id="noptis:9086002000100001">
-				</DayType>
-					<DayType version="any" id="noptis:9086002000100002">
-				</DayType>
-				</dayTypes>
-				<dayTypeAssignments>
-					<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-17">
-						<Date>2007-06-17</Date>
-						<DayTypeRef version="any" ref="noptis:9086002000100001"/>
-					</DayTypeAssignment>
-					<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-24">
-						<Date>2007-06-24</Date>
-						<DayTypeRef version="any" ref="noptis:9086002000100001"/>
-					</DayTypeAssignment>
-					<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-18">
-						<Date>2007-06-18</Date>
-						<DayTypeRef version="any" ref="noptis:9086002000100002"/>
-					</DayTypeAssignment>
-					<DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-25">
-						<Date>2007-06-25</Date>
-						<DayTypeRef version="any" ref="noptis:9086002000100002"/>
-					</DayTypeAssignment>
-				</dayTypeAssignments>
-			</ServiceCalendar>
-		</ServiceCalendarFrame>
-	</dataObjects>
+      <ServiceCalendar version="any" responsibilitySetRef="noptis:9010001000000000" id="noptis:9085002000100000">
+        <Name>Base</Name>
+        <FromDate>2007-06-17</FromDate>
+        <ToDate>2008-06-14</ToDate>
+        <dayTypes>
+          <DayType version="any" id="noptis:9086002000100001">
+          </DayType>
+          <DayType version="any" id="noptis:9086002000100002">
+          </DayType>
+        </dayTypes>
+        <dayTypeAssignments>
+          <DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-17">
+            <Date>2007-06-17</Date>
+            <DayTypeRef version="any" ref="noptis:9086002000100001"/>
+          </DayTypeAssignment>
+          <DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-24">
+            <Date>2007-06-24</Date>
+            <DayTypeRef version="any" ref="noptis:9086002000100001"/>
+          </DayTypeAssignment>
+          <DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-18">
+            <Date>2007-06-18</Date>
+            <DayTypeRef version="any" ref="noptis:9086002000100002"/>
+          </DayTypeAssignment>
+          <DayTypeAssignment version="any" order="1" id="noptis:DayTypeAssignment:2007-06-25">
+            <Date>2007-06-25</Date>
+            <DayTypeRef version="any" ref="noptis:9086002000100002"/>
+          </DayTypeAssignment>
+        </dayTypeAssignments>
+      </ServiceCalendar>
+    </ServiceCalendarFrame>
+  </dataObjects>
 </PublicationDelivery>