Consolidated changes and fixes until May 17th 2019 by syversenkr · Pull Request #88 · TransmodelEcosystem/NeTEx

syversenkr · 2020-04-06T12:04:53Z

Consolidation of compatible changes and fixes up until May 17th 2019, used in Norway from August 2019.
For manual rebasing of CEN NeTEx master per NeTEx spec v1.1 document updates of late (August/November) 2019.

…ctIdType instead of reffering to "id". Because jaxb generation of the model causes generated netex xml to have namespace prefix

…and_type'

…ill not let GroupOfStopPlaces use xsd group 'ZoneGroup', because it contains fields only relevant to Zones (ParentZoneRef/typeOfZoneRefs_RelStructure). Will neither let GroupOfStopPlaces extend Zone_VersionStructure. Because it's not a zone, and it will cause a name collision with members

…nt by adding documentation (from NeTEx spec Part 1) to OrganistaionTypeEnums

…l Request #21)

…to date after additional pull requests merged.

…(in master)

…box image

correction to new feature

… build fail for example changes after that), incl resolve conflict in README.md

skinkie · 2020-04-06T12:10:57Z

-		<xsd:keyref name="Equipment_KeyRef" refer="netex:Equipment_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:EquipmentRef"/>
+		</xsd:unique>-->
+	   <!-- === (GENERAL) Equipment Key ========================== -->


Indent error

skinkie · 2020-04-06T12:12:29Z

@@ -3066,17 +3171,17 @@ Provides a general purpose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====Entrance============================== -->
+		<!-- =====Entrance==============================  


Why is this commented out?

looks like a bug ...

Will assume an error, as
xsd:element name="Entrance" type="SiteEntrance_VersionStructure" abstract="false" substitutionGroup="SiteComponent">
is defined in netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd:337

REMARK: Have kept the comment regardless, someone (@nick-knowles ?) should review and (maybe) revert to again include the
<xsd:keyref name="Entrance_AnyKeyRef" refer="netex:Entrance_AnyVersionedKey">

skinkie · 2020-04-06T12:12:54Z

@@ -3435,6 +3610,30 @@ Provides a general purpose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
+
+<!-- =====ParkingProperties============================== -->


Indent error

skinkie · 2020-04-06T12:15:21Z

@@ -3837,7 +4036,7 @@ Provides a general purpose wrapper for NeTEx data content.</xsd:documentation>
 		</xsd:unique>
 		<!-- =====RailwayJunction Key ========================== -->
 		<xsd:keyref name="RailwayJunction_KeyRef" refer="netex:RailwayJunction_AnyVersionedKey">
-			<xsd:selector xpath=".//netex:RailwayJunctionRef | .//netex:RailwayPointRef | .//netex:RailwayElement/netex:FromPointRef | .//netex:RailwayElement/netex:ToPointRef"/>
+			<xsd:selector xpath=" .//netex:RailwayPointRef | .//netex:RailwayElement/netex:FromPointRef | .//netex:RailwayElement/netex:ToPointRef"/>


Space after xpath="

skinkie · 2020-04-06T12:18:05Z

 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
-		<!-- =====PointInJourneyPatternLink============================== -->


Just wondering where did go to...

Moved to NeTEx_publication_timetable.xsd:5316
(diff v1.0 vs v1.1 are similar, but the concept is removed from xsd/NeTEx_publication_timetable.xsd in v1.1)

skinkie · 2020-04-06T12:19:14Z

 			<xsd:field xpath="@id"/>
 			<xsd:field xpath="@version"/>
 		</xsd:key>
 		<!-- =====FareProduct============================== -->
-		<!-- =====FareProduct Key ========================== -->


Where did this go to?

This should be looked into, as it seems the refactoring missed this concept in the NeTEx_publication_timetable.xsd
See output from
grep -irHn5 "FareProduct Key" *
for v1.09 and v1.1 (May 17th 2019).

(file attachement failed)

v1.0:

xsd/NeTEx_publication.xsd-6368- <xsd:selector xpath=".//netex:BorderPoint "/> xsd/NeTEx_publication.xsd-6369- <xsd:field xpath="@id"/> xsd/NeTEx_publication.xsd-6370- <xsd:field xpath="@version"/> xsd/NeTEx_publication.xsd-6371- </xsd:key> xsd/NeTEx_publication.xsd-6372-  xsd/NeTEx_publication.xsd:6373:  xsd/NeTEx_publication.xsd-6374-  xsd/NeTEx_publication.xsd-6480- <xsd:keyref name="PreassignedFareProduct_KeyRef" refer="netex:PreassignedFareProduct_AnyVersionedKey"> xsd/NeTEx_publication.xsd-6481- <xsd:selector xpath=".//netex:PreassignedFareProductRef"/> xsd/NeTEx_publication.xsd-6482- <xsd:field xpath="@ref"/> xsd/NeTEx_publication.xsd-6483- <xsd:field xpath="@version"/> xsd/NeTEx_publication.xsd-6484- </xsd:keyref> -- -- xsd/NeTEx_publication_timetable.xsd-6382- <xsd:selector xpath=".//netex:BorderPoint "/> xsd/NeTEx_publication_timetable.xsd-6383- <xsd:field xpath="@id"/> xsd/NeTEx_publication_timetable.xsd-6384- <xsd:field xpath="@version"/> xsd/NeTEx_publication_timetable.xsd-6385- </xsd:key> xsd/NeTEx_publication_timetable.xsd-6386-  xsd/NeTEx_publication_timetable.xsd:6387:  xsd/NeTEx_publication_timetable.xsd-6388-  xsd/NeTEx_publication_timetable.xsd-6494- <xsd:keyref name="PreassignedFareProduct_KeyRef" refer="netex:PreassignedFareProduct_AnyVersionedKey"> xsd/NeTEx_publication_timetable.xsd-6495- <xsd:selector xpath=".//netex:PreassignedFareProductRef"/> xsd/NeTEx_publication_timetable.xsd-6496- <xsd:field xpath="@ref"/> xsd/NeTEx_publication_timetable.xsd-6497- <xsd:field xpath="@version"/> xsd/NeTEx_publication_timetable.xsd-6498- </xsd:keyref>

v1.1 (per 17th may 2019)

NeTEx_publication.xsd-6622- </xsd:annotation> NeTEx_publication.xsd-6623- <xsd:selector xpath=".//netex:PreassignedFareProduct"/> NeTEx_publication.xsd-6624- <xsd:field xpath="@id"/> NeTEx_publication.xsd-6625- <xsd:field xpath="@version"/> NeTEx_publication.xsd-6626- </xsd:unique> NeTEx_publication.xsd:6627:  NeTEx_publication.xsd-6628- <xsd:keyref name="PreassignedFareProduct_KeyRef" refer="netex:PreassignedFareProduct_AnyVersionedKey"> NeTEx_publication.xsd-6629- <xsd:selector xpath=".//netex:PreassignedFareProductRef | .//netex:SupplementToFareProductRef"/> NeTEx_publication.xsd-6630- <xsd:field xpath="@ref"/> NeTEx_publication.xsd-6631- <xsd:field xpath="@version"/> NeTEx_publication.xsd-6632- </xsd:keyref>

skinkie · 2020-04-06T12:21:13Z

@@ -7241,7 +7431,7 @@ Provides a general purpose wrapper for NeTEx data content.</xsd:documentation>
 			<xsd:annotation>
 				<xsd:documentation>Every [FareTable Id + Version] must be unique within document.</xsd:documentation>
 			</xsd:annotation>
-			<xsd:selector xpath=".//netex:FareTable"/>
+			<xsd:selector xpath=".//netex:FareTable   | .//netex:StandardFareTable"/>


Many of the Fare selectors are using multiple spaces around |

Have also corrected these where spottet, but probably heaps more in the code. Though cosmetic, does not affect the functionality, these and similar issues should be cleaned up iterative when spotted.

skinkie · 2020-04-06T12:21:51Z

+			<xsd:field xpath="@version"/>
+		</xsd:unique>
+		<xsd:keyref name="EligibilityChangePolicy_KeyRef" refer="netex:EligibilityChangePolicy_AnyVersionedKey">
+			<xsd:selector xpath=" .//netex:EligibilityChangePolicyRef"/>


space after xpath="

skinkie · 2020-04-06T12:26:31Z

@@ -118,18 +132,6 @@ Rail transport, Roads and Road transport
 		</xsd:sequence>
 	</xsd:group>
 	<!-- =====GROUPING=============================================== -->
-	<xsd:complexType name="groupOfEntitiesInFrame_RelStructure">


So where did this go?

Moved to netex_framework/netex_genericFramework/netex_grouping_version.xsd:67
(except that, contents of v1.0 and v.1.1 seems to be the same)

Aurige · 2020-04-06T13:21:21Z

I did a quick walk throug but didn't spot other points than Stefan ! So most important seems to ba a cleaning of some trailing spaces in NeTEx_publication.xsd

syversenkr · 2020-04-06T13:38:25Z

I can fix the spottet errors in NeTEx_publication.xsd and add the update to the pull in a little while

… see commit thread for further comments

Aurige · 2020-04-07T09:39:12Z

Ok, so shall we merge this version ?

syversenkr · 2020-04-07T09:58:14Z

Yes indeed, I believe we should.

TransmodelEcosystem@17c3b06

nick-knowles and others added 30 commits January 19, 2018 19:15

Correct MD page and add XMLSPY & Oxygen project files

bd3481d

Change PriceRuleStepResultStructure's id attribute to be of type Obje…

93299c4

…ctIdType instead of reffering to "id". Because jaxb generation of the model causes generated netex xml to have namespace prefix

Merge branch 'fix_price_rule_step_result_structure_id_attribute_name_…

84e8496

…and_type'

Merge branch 'fix_max_occurs_on_groups_of_stop_places_in_frame'

2aa4034

Merge branch 'add_centroid_and_polygon_to_group_of_stop_places'

80bbf5d

Add gml namespace for netex_ifopt_stopPlace

86f5de8

Add gml namespace for netex_ifopt_stopPlace

2a38bd1

Add xsd import statements for xml

2d0ffd4

Merge branch 'add_centroid_and_polygon_to_group_of_stop_places'

4b903f2

Fix documentation

4e2fcb8

Merge branch 'add_centroid_and_polygon_to_group_of_stop_places'

462966c

Merge branch 'add_centroid_and_polygon_to_group_of_stop_places'

ec4f652

Merge branch 'master' of https://github.com/NeTEx-CEN/NeTEx

e11e89c

remove unused file

1da8c26

Merge branch 'remove_version_suffixes_in_file_names'

ebaa370

Merge branch 'extend_ServiceAlterationEnum'

2ff7ba8

Merge branch 'add_documentation_to_organisationtype': Minor improveme…

053f642

…nt by adding documentation (from NeTEx spec Part 1) to OrganistaionTypeEnums

Merge branch 'fix_JourneyFrequencyGroup_id_constraint_check' (see Pul…

3e08262

…l Request #21)

Merge remote-tracking branch 'NeTEx-CEN/master'

dfd9681

Merge remote-tracking branch 'NeTEx-CEN/master'

4e8116a

Merge remote-tracking branch 'NeTEx-CEN/master'. Keeping our fork up …

396f497

…to date after additional pull requests merged.

Added circleCI configuration

95df246

Updated circleCI configuration

32a8ddc

Updated circleCI configuration

281ddb6

Updated circleCI configuration

45b0f83

Updated circleCI configuration

609f6b9

Added build status badge in readme

f7b429a

[skip ci] Trigger netex-java-model build after netex CEN xsd changes …

c27369e

…(in master)

[skip ci] Do not check out. Not required as the script is in the tool…

f4472e7

…box image

nick-knowles and others added 9 commits May 10, 2019 18:38

Fix remove empty enums

9a7af5d

Add Serbia and Montenegro to country codes

fdba840

FarePointInPattern Fix case i isFareStage

a66ae6c

correction to new feature

CCI:circleci-toolbox-image(468c0fa)

58a5925

CCI:circleci-toolbox-image(35f2baf)

0e25d23

CCI:circleci-toolbox-image(8234e48)

ab58d25

CCI:circleci-toolbox-image(e65201d)

c0b3516

CCI:circleci-toolbox-image(67cb9d6)

4907b2c

Merged with pull request 'Njsk 0.09 rollup' up until May 17th (due to…

12243e0

… build fail for example changes after that), incl resolve conflict in README.md

skinkie reviewed Apr 6, 2020

View reviewed changes

syversenkr added 4 commits April 6, 2020 16:21

Added fixes per PullRequest TransmodelEcosystem#88 GitHub discussion,…

0cc4f29

… see commit thread for further comments

Fixed example

efae1eb

Fixed dateTime issues

7a41720

Fixed 24h datetime issues

d7dc5dd

skinkie merged commit 17c3b06 into TransmodelEcosystem:master Apr 14, 2020

syversenkr changed the title ~~Changes and fixes up until May 17th 2019~~ Consolidated changes and fixes up until May 17th 2019 Apr 14, 2020

syversenkr changed the title ~~Consolidated changes and fixes up until May 17th 2019~~ Consolidated changes and fixes until May 17th 2019 Apr 14, 2020

Aurige added a commit to Aurige/NeTEx that referenced this pull request Apr 22, 2020

Changes and fixes up until May 17th 2019 (TransmodelEcosystem#88)

b9a6e60

TransmodelEcosystem@17c3b06

Conversation

syversenkr commented Apr 6, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

syversenkr Apr 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

syversenkr Apr 6, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Aurige commented Apr 6, 2020

Uh oh!

syversenkr commented Apr 6, 2020

Uh oh!

Aurige commented Apr 7, 2020

Uh oh!

syversenkr commented Apr 7, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

syversenkr Apr 6, 2020 •

edited

Loading

syversenkr Apr 6, 2020 •

edited

Loading