Comment NL28#59
Merged
Merged
Conversation
Syncing from original
Presentation added to DesinationDisplay (and Variant) + Branding
skinkie
added a commit
that referenced
this pull request
Apr 14, 2020
* Correct MD page and add XMLSPY & Oxygen project files
* Change PriceRuleStepResultStructure's id attribute to be of type ObjectIdType instead of reffering to "id". Because jaxb generation of the model causes generated netex xml to have namespace prefix
* Add gml:Polygon and centroid to xsd group 'GroupOfStopPlacesGroup'. Will 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
* Add gml namespace for netex_ifopt_stopPlace
* Add gml namespace for netex_ifopt_stopPlace
* Add xsd import statements for xml
* Fix documentation
* remove unused file
* Added circleCI configuration
* Updated circleCI configuration
* Updated circleCI configuration
* Updated circleCI configuration
* Updated circleCI configuration
* Added build status badge in readme
* [skip ci] Trigger netex-java-model build after netex CEN xsd changes (in master)
* [skip ci] Do not check out. Not required as the script is in the toolbox image
* CCI:circleci-toolbox-image(c2d40e3)
* CCI:circleci-toolbox-image(c909494)
* Updated downstream trigger
* Fix typo AccountingTIme
* TransportMode as AllVehicleModesOfTransportEnumeration
* CCI:circleci-toolbox-image(4ea0dcf)
* Update examples
Trying to sort out mess
* Fixes to Layer
Correct data type on LayerRef and Substitution Group on Layer
* Reapply V1.09 changes
Reapply 1.09 changes and fixes to examples that had been ommited.
* Fix up norwegian examples for removal of version numbers
* CCI:circleci-toolbox-image(b4d9678)
* Further fix to correct 1.1 reference in norway example
change refernce to netex_
* move ServiceAlterationEnum from netex_servicPatternSupport to netex_serviceJourneySupport
Correction to modularisation and align with UML : move ServiceAlterationEnum from netex_servicPatternSupport to netex_serviceJourneySupport
* Documentation correction to email from sir to netex
Correct doc refs from schemer@siri.org.uk to netex.org.uk
* Add documentation for addition of CENTROID to GROUP OF STOP PLACES.
Documentation corrections only - no change to schema
* Update to documnetation in NeTex servcie pattern
* Update documentation on AccountingTime change
* Update README.md
* UK-07 All PriceRefs directy in table
* UK-34 TRAVEL DOCUMENT should not be in FARE FRAME - remove
Remove TravelDocument from Fare Frame
* UK-7 Add Allow list of MachineReadable enumerations,
UK-7 Add Allow list of MachineReadable enumerations, Also add open ended TYPE OF MACHINE READABILITY
* UK-05 Fix: Introduce a dummy TariffZone & TariffZOneRef
UK-05 Fix: Introduce a dummy Tariffzone and TariffZoneRef so that Fare zone can be a specialisation of TariffZone. Workaround to XMLSPY issue.
* Fix correct case on customerPurchasePackageRefs
### 2019.02.28 EURA-10 Improve __CustomePurchasePackage__
* Fix correct case on customerPurchasePackageRefs
* Allow inlining of CustomerPurchasePackages in a FareCOntract
* Allow backwards direction of reference. Revise constraints
EURA-(nk) Add __DistanceMatrixInverseRef__ for backwards direction of reference. Revise constraints
* UK-41 Add an additional functional operator to GenericParameterAssignment to clarify use of groups : oneOf / someOf/ allOf
UK-41 Add an additional functional operator to GenericParameterAssignment to clarify use of groups : oneOf / someOf/ allOf
Also correct documentation on relational operators
* UK-41 Revise Userprofile to allow multiple proof of documen
Allow list of enumerations
* UK-18 Add values for TypeOfInterval
* Fix make alternative name and dat visible on Direction
Corerct error: ALt names and validity attrubutes wre hidden
* Correction to comment in enum. No material change.
Wrong descriprions - no material change
* UK-18 Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy
Introduce a dummy TariffZone_ type to workaround substitutiongroup restrictions in XML spy
* Update Fare Examples
Corerctions and fixes to fare examples
* Further updates to fare examples
Make fare examples consistent and drop duplicates
* Update gtfs examples
Revise all GTFS examples to be consistent and use revised fare mapping
* <Modified>2019-02-25</Modified> CR047 NJSK Correct Typos on documentation </Date> <Date> <Modified>2019-03-02</Modified>
* UK-24 FRAMEWORK & FARES Add open __PaymentMethod__ as first class objec
* NJSK-Fix FRAMEWORK - Correct Type of __VersionFrameRef
Correct Type of __VersionFrameRef__ to be _VersionFrameRefStructure_ , correct substitution group on __ResoucreFrameRef__ to be __VersionFrameRef__
* Fix Fares Add missing PurchaseMoment to PurchaseWindow
Fix Fares Element was already define dbyt had got dropped from PurchaseWindow parameter - needed to support gtfs semantics
* Minor correctiosn to other fixes
* Update some examples to use new prerequite feature
Extensive Reviseon of examples
* Fix Make __InfrastructurePointRef__ and __InfrastructureLinkRef__ abstract
Fix Make __InfrastructurePointRef__ and __InfrastructureLinkRef__ abstract
* Corrections to examples
Revise examples
(a) to simplify ids, and improve consistency of notation
(b) add some prerequisites between frames
(c) corerct ids
(d) extend some cases
* UK-44 Improve sopport for defining large tariffs in modular fashion
UK-44 Improve Network etc for large tariff definitions
Add additional __groupsOfOperators__ to Network.
Also UseToExclude flag to GroupOfOperators
Also add flexible and urban to type of line enumeration
Add additional groupsOfOperators to Network.
Add UseToExclude flag to GroupOfLines
Add UseToExclude flag to GroupOfDistanceMatrixElements
* UK-18 Revisions to FareZone to mark stages, etc
UK-14 FARES Add extra __ScopingMethod__ attribute to __FareZone__ with enum values _explicitStops_, _IimplicitSpatialProjection_, _ImplicitSpatialProjection
UK-13 FARES Add extra ZoneTopologyEnumeration attribute enum values annular, sequence, overlappingSequence
UK-18 Specify fare stages on a pattern: Add extra attributes to __FarePointInPattern__ _IsFareStage_
EURA Allow stops to be excluded from a routing Add extra attributes to __FarePointInPattern__ _IsForbidden_
* Corrections FareZone change
Fix make new elemenst visible
* EURA 51 Add enumeration values to RoundTripType
EURA 51 Add enumeration values to RoundTripType returnOut returnBack so as to disstingusih legs . ALso add documentation annotations
* EURA-43 FARES Add extra relationships to __FareZone__ to indicate who who manages it: _
__AuthorityRef__ / __OperatorRef__, __GroupOfOperatorsRef__,
* EURA-54 FARES Add a SeatRef
EURA-54 FARES Add a SeatRef Add a __PassengerSeatRef__ to __ServiceValidtyParametersGroup__ of __accesssRighTparamaterAssignment__
* Add TravelDocumentRef and RetailDeviceRef parameter to SalesTeanaction
* Fix make RetailingOrgaisationRef an OrganisationOperatorRefStructure and not an OperatorRefStructure
* _Updates to xml schema_:
* EURA-78 FARES Allow more than one reference to a GroupsOfSalesOfferPackageRef from a SalesOfferPackage
EURA-78 FARES Allow more than one reference to a GroupsOfSalesOfferPackageRef from a SalesOfferPackage (ie make relationship many to many)
* Improvedand corrected Fare examples
Add Frame prerequisiyes and other features
Revsie soem of tap examples
* UK-8 F Add ___LayerRef___ to ___VersionFrame__ and to ___TypeOfFrame___
UK-8 F Add ___LayerRef___ to ___VersionFrame__ and to ___TypeOfFrame___.
* EURA-81 *FARES* Make relationshiop with TypeOfFareProduct many-to-many.
* UK-28 *FARES* Add a ___CustomerAccountRef___ to ___FareContract___.
* EURA-54 *FARES* Add a Seat reference
* Add a ___PassengerSeatRef___ to ___ServiceValidityParameterGroup___ of ___accessRightParamaterAssignment___.
* Also Add ___TravelDocumentRef___ and ___RetailDeviceRef___ parameter to ___SalesTransaction____.
* Also Fix: make ___RetailingOrgahisationRef___ an ___OrganisationOperatorRefStructure___ and not an ___OperatorRefStructure____.
* UK-38 Add MinimumAccess and MaximumAccess to FareStructureElementinSequence
* Add more values to EXXCHANGING types of exchaneg.
EURA-91 Add sameProductLongerJourney and sameProductShorterJourney to enumerated values for TypeOfExchange. attribute on Exchanging element
* Add courier to _FulfilmentMethodTypes.
Add _courier_ value to ___FulfilmentMethodType___ enumerations.
* EURA-53 CappingRule support fixed /variabel start
EURA-53 Add CappingRuleStartConstraintType attribute to CappingRule to state if fixed / flexible and DayType to specify startOnlyOn DayType
* Fiex to enhancement to add Layer to TYPE OF VERSION FRAME
* EURA-75 *FARES* Add new ___Add TravelBillingPolicy___ attribute to ___ChargingPolicy___
EURA-75 *FARES* Add new ___Add TravelBillingPolicy___ attribute to ___ChargingPolicy___ with enumerated values; _billAsYouGo_ , _billOnThreshold_, _billAtFareDayEnd_, _billAtPeriodEnd_
* Extra attributes on Usage Parameters
EURA-65 *FARES* EURA 65 - Add a new __SharedUsage___ attribute to ___Transferability.
UK-32 *FARES* Add new ___ResidenceType___ attribute to ___ResidenceQualification___ with enumerated values; _live_ , _work_, _study, _born_
* Also EURA -62: Add a ___CompanionRelationshipType___ attribute to ___CompanionProfile___
* EURA-42 *FARES* Add ___Currency___ to ___PricingRule___
* Correction to of caulculation parameters
* EURA 68 *FARES* Specify conditions fur changing group size
* __Exchanging___ usage parameter ___TypeOfExchange___ attribute: add new _changeGroupSize_ enumeration valuee.
* ___GroupTicket add new attribute ___GroupSizeChanges___ with enum values noChanges, free, charge, steppedCharge.
* Also ___Refunding___ element add _changeOfGroupSize_ value to ___RefundType___ enumeration.
* UK21 *FARES* Add ___SalesOfferEntitlementGiven___ and ___SalesOfferEntitlementRequired___ parameters
* Extend examples for Slaesoffer entitlement
* More groupsize changes
* EUR-71 *FARES* Add _superOffPeak_ and _specialEvent_ enumeration values to ___FareDemandType___.
* EURA-77 *FARES* Add ___tariffs/TariffRef___ attribute to ___FareProduct___.
* >UK-31 Change data type on ClassAttributeInFrame and ClassRelationshipnFrame
>UK-31 Change data type on ClassAttributeInFrame and ClassRelationshipnFrame / Name attributes from NCName
* Allow user classifications of FareStuctureFactor and FareStructureELement
UK-55 *FRAMEWORK* Add new ___TypeOfFareStructureElement___.
* Also UK-89 Add new ___TypeOfFareStructureFactor___.
* ALso Fix: Corrections to ___TypeOfFareProduct___.
* FarePrice improve annotations
UK-22 *FARES* Add new ___PrivateCode___ attribute to ___FarePrice___.
* Also UK-22 Add new ___Description___ attribute to ___FareProductPrice___.
* Also UK-22 Add new ___InfoLinks___ attribute to ___PriceableObject___.
* EURA-40 *FARES* Support Supcriptions
* Add new ___Subscribing___ usage parameter
* Add __SubscriptionRenewalPolicy___ attribute with enumeration values:
* _automatic_ - Renew automatcally at end of term.
* _manual_ - Renew on request.
* _automaticOnConfirmation_ - Confirm and enew automatically at end of subscription term.
* _none_ - No renewal allowed.
* Add __SubscriptionSuspensionPolicyEnumeration___ attribute with enumeration values:
* _none_ - Suspension not allowed.
* _forCertifiedIllness_ - Suspension allowed for illness.
* _forParentalLeave_ - Suspension allowed for parental leave.
* _forHoliday_ - Suspension allowed for Holiday.
* _forAnyReason_ -S uspension allowed for any reason
* Add __SubscriptionTermEnumeration___ attribute with enumeration values:
* _fixed_ - Subscription must be for a fixed term.
* _variable_ - Subscription can be for an arbitrary term
* _openEnded_ - Subscription term is open ended.
* ### 2019.03.11 CR-13 *FARES* Add _replacement_ value to ___LineType___
enumeration
* _Updates to xml schema_:
* netex_line_support.xsd
* EURA-72 *FARES* Improve Fare demand type for direction constraints
EURA-72 *FARES* Improve Fare demand type for direction constraints
* Make ___StartTimeAtStop___ ___StartTime__ optional
* Add new attribute StopUseConstraint___ to ___FareDemandType___ with values _arriving_. _departing_, _passingThrough_.
* Add partialEURA-87 *FARES* Support Partial Refunds of Passes
Also revise move implementation of new suspension from SUBSCRIBING to USAGE VALIDITY PERIOD
EURA-63 *FARES* Add DayOfMonth option to cover fares that are only available from 1st of the emonth
* NORWAY-98 *FARES* NORWAY-98 Add new value _activation_ to ___UsageTriggerEnumeration
NORWAY-98 *FARES* NORWAY-98 Add new value _activation_ to ___UsageTriggerEnumeration___ for ___UsageValidityPeriod___.
* Also add _Deregsistartiob_ value to ___UsageEnd___ values
* ALso and annototation comments.
* NORWAY-99 *FARES* Change cardinality of ___SupplementProduct__ / ___SupplementToFareProductRef___ from _0:1_ to _0:*_.
NORWAY-99 *FARES* Change cardinality of ___SupplementProduct__ / ___SupplementToFareProductRef___ from _0:1_ to _0:*_.
* Also add missing constraint for ___SupplementTofareProductRef___
* UK-45 *FARES* Add constraint mechanism to Entitlementsso that supplements and dependent products have same parameters to
UK-45 *FARES* Add constraint attributes to Entitlementsso that supplements and dependent products have same parameters to
* Add constraint elements to __EntitlementRequired___, __EntitlementGiven___,
* Add constraint elements to __SalesOfferEntitlementRequired___, __SalesOfferEntitlementGiven___,
* EURA-84 Add default PaymentMethod, TypesOfPaymentMethods
EURA-84 (Add default ___PaymentMethods___, ___TypesOfPaymentMethods___ and ___PurchaseMoments___ attribute to ___Network___, ___GroupOfLines___, and ___Line___.
* ALsofor Add default ___PaymentMethods___, ___TypesOfPaymentMethods___ and ___PurchaseMoments___ attribute to ___Network___, ___GroupOfLines___, and ___Line___.
* NORWAY-105 *FARES* Add ___MinimumDuration___ to ___TimeInterval___.
NORWAY-105 *FARES* Add ___MinimumDuration___ to ___TimeInterval___.
* Also fix ___TypeOffareStructureFactor___ on ___GeograohicalStructreFactor___.
* _Updates to xml schema_:
* netex_timeStructureFactor_version.xsd
* netex_geographicalStructureFactor_version.xsd
* NORWAY-102 *FARES* Add new enum values to ___Exchanging___ \ ExchangeableTo.
NORWAY-102 *FARES* Add new enum values to ___Exchanging___ \ ExchangeableTo.
* Values _upgradeToSpecifiedFare_, _downgradeToSpecifedFare_, _equivalentProduct_ (alsread have _ChangeGroupSize_)
* NORWAY-100 *FARES* Add ___ReservationType___ to RESERVING with values _autoAssigned_, _seatMap_ and _openSeating_.
NORWAY-100 *FARES* Add ___ReservationType___ to reserving with values _autoAssigned_, _seatMap_ and _openSeating_.
* Add constraints for new elements
integrity constraints for new elements Subscribing, TypeOfPaymentMethod , TypeOfFareStructureFactor, TypeOfFareStructureElement, TypeOfPricingRule.
* NORWAY-100 *FARES* Support VAT (and other tax) categories . Fix issues with RuleSteps
### 2019.03.12 NORWAY-100 *FARES* Support VAT (and other tax) categories Add ___TypeOfPricingRule__ element
* Also FIX add missing (!) relationship ___ruleStepResults \ RuleStep___ on ___SalesTrnasaction
* Also FIX Allow payments in Price units other than Money (!) ___ruleStepResults \ RuleStep___ to ___SalesTransaction___
* Also fix Type ___Transaction___ \___ AMount(!)___ to be _currencyType_ not _distance_.
* Also add a NARRATIVE text element on RuleStepResult
* Also add ___UnitDimension___ attribute to ___PriceUit___ with values _currency, distance, time,valueToken, other_.
* Also revise ___FarePrice___ element to add ___AmountWithResultsGroup___ and refactor ___FarePriceAmount___ groups to be clearer
* Also revise ___PriceRuleStepResult___: add new attributes ___AdjustmentAmount, ___AdjustmentUnits___, ___RoundingRef___,
* NB this revises current sense of ___PriceRuleStepResult___ \ ___Amount___
* Also allow nesting of Fare Table column headings and rows
___RoundingStepRef___, and ___Narrative___ text element.
* Typo fixed
* EURA-085 *FARES* Add new attribute to ___InterChanging __ RegisterBreak with values
EURA-085 *FARES* Add new attribute to ___InterChanging __ RegisterBreak with values _ none, markByStaff, markByValidator, markByMobileApp, other_
* Also EURA-085 Add new attribute ___ActivationMeans___ attribute to ___UsageValidityPerido___ with values _noneRequired, checkIn, useOfValidato useOfMobileDevice, automaticByTime, automaticByProximity, other_
* Fx some examples and and standard product categories
### 2019.03.13 UK *FARES* Simplify use of Fares:
* Add new Atrribute ___PreeassignedFareProductType___ to ___PreassignedFareProduct___ with values _singleTip, timeTimitedSingleTrip, dayReturnTrip, periodReturnTrip, multiStepTrip, dayPass, periodPass, other_.
* Add new attribute ___AmountOfPriceUnitType___ to ___AmountOfPriceUnitFareProduct___ with values _tripCarnet, passCarnet, unitCoupons, other_.
* NB these are separate from __TariffBasis___.
* Include new elements as fare validity parameters
EURA-40 *FARES* Typy up - Include new elements as fare validity parameters
* Add new ___FareStructureValidityParametersGroup___ to validity paarmaters with new attributes ___TypeOfTariffRef___, ___TypeOfFareStructureFactor___, ___TypeOfFarFresStructureFactorRef___,
* Extend ___FareProduct ValidityParametersGroup___ to validity paramaters with new attributes ___TypeOfPriceingRuleRef___, ___ChargingMethodRef___, ___TypeOfPaymentMethodRef___, TypeOfFareTableRef.
* Add new ___SeatingValidityParametersGroup___ with new attributes ___TrainElementRef___, ___TrainComponentLabelAssignmentRef___.
* Also UK-69 Scaleability. allow classifcation of FareTable with add new TypeOfOfFareTable element
* Also Rename ___ValidityParameterSetOperator___ ___ValidityParameterSelectionType___
* Also UK-41 Also add new ___LimitationSelectionType___ as additional functional operator to GenericParameterAssignment to clarify use of groups : oneOf / someOf/ allOf
* EURA-29 *FARES* Add new ___EligibilityChangePolicy___ usage parameter
EURA-29 *FARES* Add new ___EligibilityChangePolicy___ usage parameter with attributes ___OnBecomingPolicy___ and ___OnCeasingPolicy___.
* ___OnBecomingEnumeration___
* _automatic_ - If user becomes eligible, automatically apply additional user profile benefits to user, e.g. apply student or senior discounts.
* _invite_ - If user becomes eligible, invite user to take up eligible products. e.g. Invite to buy Senior railcard.
* _noAction_ - If user becomes eligible,, no automatic measures are taken.
* _other_
* OnCeasingEnumeration - Allowed values
* _immediateTermination_ - If user ceases to be eligible, automatically terminate validity of an elibility dependent product.
* _useUntilExpiry_ - If user ceases to be eligible, they may go on using the product until it expires..
* _terminateAfterGracePeriod_ - If user ceases to be eligible, termination take place after the end of a grace period
* _automaticallySubstituteProduct_ - If user ceases to be eligible, assign them an appropiate replacement product.
* _noAction_ - If user ceases to be eligible, take no action.
* _other_
### 2019.03.13 EURA-50 *FARES* Add new ___PurchaseAction___ attribute to ___PurchaseWindow__ with values: _purchase_, _reserve_, _orderWithoutPaying_, payForPreviousOrder, other_ _
, _seatMap_ and _openSeating_.
* Also reaname ______Reserving___ \ ReservationType___ to ___SeatAllocationMethod___ and move ___SeatAllocationMethodEnumeration___ to ___VehicleSeating___ package.
* Also add ___ReservationExpiryPeriod___ to ___Reserving___.
* _Updates to xml schema_:
* netex_vehicleSeating_support.xsd
* netex_usageParameterBooking_support.xsd
* netex_usageParameterBooking_version.xsd
* Simplifares - add standard product types
Add new Attribute PreeassignedFareProductType to PreassignedFareProduct with values singleTip, timeTimitedSingleTrip, dayReturnTrip, periodReturnTrip, multiStepTrip, dayPass, periodPass, other.
Add new Atrribute SupplementProductType to SupplementProduct with values seatReservation, dog, animal, bicycle, meal, wifi, other
Add new atrribute AmountOfPriceUnitType to AmountOfPriceUnitFareProduct with values tripCarnet, passCarnet, unitCoupons, other.,
* Fix ___FareContract___ and ___CustomerPurchasePackage___ issues and allow marking of use of ___CustomerPurchasePackage___,
Fix Fare COntract issues Allow marking of use of ___CustomerPurchasePackage___
* Also Fix several issues and align with TM
* UK-28 Add reference to ___CustomerAccount___ to ___FareContract___
* Add new attribute ___AccountStatusType___ to ___CustomerAccount___.
* Add new ___email___ attribute to ___Customer___
* Fix: Add missing relationship ___fareContracts / FareContract___ to ___CustomerAccount___.
* Remove ___fareContractEntries___ relationship from ___CustomerAccount___ : Use relationship on ___FareContract___. NB BREAKAGE!
* Fix: Add missing relationship customerPurchasePackageRefs / ___CustomerPurchasePackage___ to ___CustomerAccount___.
* Add missing attributes ___CustomerRef___, ___CustomerAccountRef___ and FareCOntractRef___ to ___CustomerPurchasePackage___.
* Add ___PassengerSeatRef___ and ___TrainElementRef___ to ___TravelDocument___.
* Add ___PrivateCode___ to ___TravelDocument___
* Also add missing ___CustomerPurchasePackageRef___ to ___TravelDocument___.
* Add new attribute ___PassengerSeatRef___ and ___TrainElementRef___ to ___TravelDocument___.
* Add new attribute ___AccessNumber___ to ___SpecificParameter Assignment___
* Add new attribute ___CustomerPurchasePackageStatus___ to to ___CustomerPurchasePackage___ with values _resrved_,_ordered_, _paidFor_, _unused_, _activated_ _partiallyUsed_, _used_, _archived_.
* Add _new attribute ___MarkedAs___ to ___CustomerPurchasePackageElement___.
* Add new child element ___CustomerPurchasePackageElementAccess___ to ___CustomerPurchasePackageElement___.
* Add missing relationship ___travelDocuments \ TravelDucment___ to ___CustomerPurchasePackage___.
* Add new view element ___TravelSpecificationSummaryView___ to ___TravelSpecification___.
* Add new view element ___TravelSpecificationSummaryView___ to ___CustomerPurchasePackage___.
* Add new ___CustomerPurchasePackageElementAccess__ element to ___CustomerPurchasePackageElement___.
* Also UK-32 *FARES*add ___StartDate___ and ___EndDate___ attributes to ___ResidentialEligibility___.
* HOUSEKEEPING Separate out netex_typeOfravelDocumentPackage.xsd_ from _netex_travelDocumentPackag.xsde_
* HOUSEKEEPING Move _netex_travelDocumentPackage.xsd_ from _\fares_ to to \ _sales_Transaction_ folder.
* Small Tidy ups to Earlier 1.11 CRs & fixs
Some new attributes and enum values renamed. Comments corrected
* add separate EndDayOffSer
Document Fix: Correction to typo on AccountingTime
NJSK Also add separate EndDayOffSer - DayOffSet should apply to start time relative to operatig day of Duty
* Fix #37 by Skinkie: Correct Typo: rename OppositeDIrectionRef to OppositeDirectionRef
Fix #37 by Skinkie: Correct Typo: rename OppositeDIrectionRef to OppositeDirectionRef NB this will break existing code
* Fix #38 by Skinkie from 2019.01.07 *Part1-IFOPT* . Fix typo on KeyScheme.
Fix #38 by Skinkie from 2019.01.07 *Part1-IFOPT* . Fix typo on KeyScheme.
* NB this will break existing XML that uses KeyScheme.
* Fix #39 typo on ServiceSiteRef.Structure.
Fix #39 by Skinkie from 2019.01.07 *Part1-IFOPT* . Fix typo on ServiceSiteRef.Structure.
* Fix #40 by Skinkie . Fix typo on DistanceMatrixElement.IsDirect.
Fix #40 by Skinkie from 2019.01.07 . Fix typo on DistanceMatrixElement.IsDirect.
* NB this will break existing XML that uses IsDirect.
* Fix #41 by Skinkie from 2019.01.07 Fix typo on MobilityList.
Fix #41 by Skinkie from 2019.01.07 *FRAMEWORK-CC*. Fix typo on MobilityList. Internal chaneg only.
* Fix #43 by Skinkie from 2019.01.07. Fix typo on _tactilePlatformEdges.
Fix #43 by Skinkie from 2019.01.07 *FRAMEWORK-CC*. Fix typo on _tactilePlatformEdges_.
* NB this will break existing XML that uses _tactilePlatformEdges_ value.
* Update Netex_10_StopPlace_uk_ComplexStation_Wimbledon_1.xml
* Fix #42 by Seime from 2019.01.07 * move _canalBarge_ value from air to water modes.
Fix #42 by Seime from 2019.01.07 *FRAMEWORK-CC*. Fix move _canalBarge_ value from air to water modes.
* NB this will break existing XML that uses _canalBarge_ value.
* Revise CR50 Snow and ICe modes
CR50 by CD from 2019-02-20 *FRAMEWORK-CC*. CD add snow and ice modes.
* NJSK Revise -
* Correct camel casing of _snowAndIce_ value foe ___TransportMode___,
* Correct camel casing of ___SnowAndIceSubmode___ values ; _unknown, undefined, snowMobile, snowCat, snowCoach, terraBus, windSled_,
* Add _snowAandIce_ to Submode choices
* Add _snowAndIce_ to ___AllModes___
* Update readme.md
* Integrate constraint fix #49 ny CD with other constraint changes:
Integrate constraint fix #49 ny CD with other constraint changes: Add ___EquipmentPlace___ to ___Place_AnyVersionedKey___.
* NJSK Review changes for CR51: Add new ___VehicleJourneyStopAssignment___ entity
CR51 *PART2-TI* CD Add new ___VehicleJourneyStopAssignment___ entity to set default stop assignment for ___VehicleJourney___.
* NJSK Review CR51: add doc comments
* NJSK make ___vehicleJourneyStopAssignmentsInFrame_RelStructure___ lower camel case consistent with NeTEx conventions.
* NJSK Allow inlining of ___vehicleJourneyStopAssignments___ within ___VehicleJourney___ as for other subcomponents
* NJSK Also correct camel case on ___trainComponentLabelAssignents___ and ___trainComponentLabelAssignents_RelStructure___.
* CD Change #52 Add new attribute ___StopPlaceWeight___ to ___StopPlace__. Review changes
CD Change #52 Add new attribute ___StopPlaceWeight___ to ___StopPlace__ with values _international, national, regional, local_.
* NJSK Review: Make values lowerCamelCase consistent with NeTEx conventions.
* FR-5 * CD #53 Add ___AccessFacilityList___ attribute to ___SiteFacilitySet___.
Add
* SBB21 CD #56. Add new ColourSystem attribute ;should be type xsd:normalizedString,
SBB21 CD #56. Add new ColourSystem attribute to Presentationa PrintPresentation.
NJSK Review ColourSystem and ColourName should be type xsd:normalizedString, not xsd:string.
* SBB23 CD #57. Add new BackgroundColour and BackgroundColourName attributes
SBB23 CD #57. Add new BackgroundColour and BackgroundColourName attributes to Presentation and PrintPresentation elements.
Add icon to TypeOfIIfolink enum values
</Date>
* NL28 CD #59 Add new ___Presentation___ attribute to ___Branding___. NJSK Review; Use a ___BrandingGroup___
NL28 CD #59 Add new ___Presentation___ attribute to ___Branding___.
NJSK Review; Use a ___BrandingGroup___ to be consistent with NeTEx coding patterns.
* NL31 CD #60 NJSK : Correct data types of new attributesAdd BoardingHeight, GapToPlatform;
NL31 CD #60 Add new attributes ___BoardingHeight___ and ___GapToPlatform___ o ___VehicleType___
* NJSK Review: Correct data types of new attributes to be of _LengthType_.
* NL32 CD #61 Add new values to ___AccessFacility___ enum; _wheelchairLift, automaticRamp. slidingStep_.
NL32 CD #61 Add new values to (Site) ___AccessFacility___ enum; _wheelchairLift, automaticRamp. slidingStep_.
* NJSK Review: Keep Site and Service aspects separate; add separate ___VehicleAccessFacility___ enum with values _unknown, wheelchairLift, manualRamp, automaticRamp, steps, slidingStep, narrowEntrance, validator_.
* NL48 CD #64 Add new attributes for stop advertising Print and Dynamic to StopPointInPattern.
NL48 CD #64 Add new attributes for stop advertising Print and Dynamic to StopPointInPattern.
* Move DynamicAdvertisementEnumeration to here rom netex_serviceJourney_support.xsd. Correct the annotations.
* NJSK Review: correct the annotations.
* FR49 CD #65 Accesibility changes - NK review changes
FR49 *Part1-IF* CD #65 Accesibility changes
* _netex_ifopt_equipmentTicketing_:
* CD Add new attributes to ___TicketingEquipment___; ___TactileInterfaceAvailable, AudioInterfaceAvailable, DisabledPriority, WheelchairSuitable___.
* NJSK Review: Place accessibility attributes in a separate group.
* CD: Add new attributes to ___TicketValidatorEquipment___; ___AudioValidationFeedback, VisualValidationFeedback, TactileValidationFeedback, ValidationGuidance___.
* _netex_ifopt_localService_:
* CD add LuggageMaximalWeihgt to LuggageService.
* NJSK Review: Correct Typo on ___LuggageMaximumWeight___. Make datatype _WeightType_. Also add to ___LeftLuggageService___.
* _netex_ifopt_equipmentAccess_:
* CD add ___NecessaryForce___ with values _noForce, lightForce, mediumForce, heavyForce, unknown_.
* CD add __LightingMethodEnumeration__ with values _movementDetector, stepDetector, switchOnTheWall,
atDoorOpening, onlyAtNight_.
* NJSK Review: Correct typo on stepDetector
* CD add ___TactileWarningStripEnumeration___ with values _tactileStripAtBeginning, tactileStripAtEnd, tactileStripAtBothEnds, noTactileStrip, unknown_,
* CD add ___FlooringTypeEnumeration___ with values _carpet, concrete, asphalt, cork, fibreglassGrating, glazedCeramicTiles, plasticMatting, ceramicTiles, rubber, steelPlate, vinyl, wood, stone, grass, dirt, gravel, uneven, unknown, other_
* CD add ___BorderTypeEnumeration___ with values _wall, grass, dirt, barrier, road, cyclingLane, step, rail, plants, trees, mud, solidEdge, water, gravel, noPhysicalBorder, otherPhysicalBorder, unknown, other,_
___NJSK Review: Move ___TactileWarningStripEnumeration, FlooringTypeEnumeration, BorderTypeEnumeration___ to _netex_ifopt_equipmentAccess_ from netex_path_support , use lower camel case for values.
* CD add new attribute NecessaryForceEnumeration with values noForce, lightForce, mediumForce, heavyForce, unknown
* CD add new attributeLightingMethod to PlaceLighting with values movementDetector, stepDetector, switchOnTheWall, atDoorOpening, onlyAtNight, other
___NJSK Review: correct typo on _stepDetector_.
* CD Add new attribute to __StairEquipment__; __WithoutRiser__.
* NJSK Review: change order of new elements to be with other step properties.
* CD Add new attribute to __EscalatorEquipment__ __EscalatorWithLanding__.
* CD Add new attributes to __TravellatorEquipment__; __Length__, __Slope__ and __IntegratesAnEscalatorPart__.
* NJSK Review: correct name of __IntegratesAnEscalatorPart__
* CD Add new attributs to __EscalatorEquipment__: __MagneticInductionLoop__, __GroundMarkAlignedWithButton__, __TactileGroundFloorButton__, __ExternalFloorSelection__.
* NJSK Review: correct name of __GroundMarkAlignedWithButton__.
* NJSK Review: drop __ButtonsHeigt__ as all ready covered by __CallButtonHeight__.
* NJSK Review: change order to group with like properties.
* CD Add new attributes to __EntranceEquipment__: __AudioOrVideoIntercom, Airlock, DoorstepMark AudioPassthroughIndicator, OpeningNecessaryForce__
* NJSK Review: change order of new elements to group with like properties
* NJSK Review: NB __AudioOrVideoIntercom__ overlaps with __EntranceAttention___
* CD Add new attributes to __QueuingEquipment__: __DisabledPriority, QueuingSeatedPossible.__
* _netex_ifopt_path_:
* CD add new attributes to __PathLink__; __Width, FlooringType, RightSideBorder, LeftSideBordert, TiltAngle, CodedTilt, TactileWarningStrip, TactileGuidingStrip__.
* NJSK Review: Reorder so as to place like elements together, add sub Groups to organize
* _netex_ifopt_equipmentPassenger_:
* CD add new attribute to ___PassengerSafetyEquipment___; ___AcousticAnnouncementsTrigger___ with values _onDemand, automatic_.
* CD add new attribute to ___PassengerSafetyEquipment___; ___AnnouncementsTriggeringMethod___ with values _presenceDetector, app, internetPage, specificDevice, pushButton_.
* NJSK Review: Correct typo on SupportBarHeigth, reorder new elements.
* _netex_ifopt_equipmentWaiting_:
* CD to Add new attribute to ___LuggageLockerEquipment___: ___LockingType___ with values _key, keyboard, mechanicalNumbering, contactless, phoneApp, other_.
* CD to Add new attributes to ___LuggageLockerEquipment___: ___BlindAccessible ,WheelchairAccepted___
* NJSK Review: CorrectTypo on ___WheelchairAccepted___, Change order of new attributes, move ___LockerTypeEnumeration___ and ___LuggageServiceEnumeration___ enums to support file.
* CD to Add new attributes to ___SeatingEquipment___: ___Armrest ,SeatingHeight___.,
* NJSK Review: Correct data type on ___SeatingHeight___.
* _netex_ifopt_equipmentSign_:
* CD add new attribute to __SignEquipment__; __AudioAnnouncementType__ with values _cyclicReading, whenSomebodyIsDetected, throughAnApp, throughASpecificDevice, other_
* CD add new attribute to __SignEquipment__; __FontSize__; with values; _verySmall, small, medium, large, veryLarge_
* NJSK Review: Correct Typos, camelCase values, move __SignContentEnumeration__ enums to support file , add _other_ value, zap _xxxx_value. change"big" to "large" in value names.
* FR49 CD #65 Accesibility changes
Two further changes fro previous commit
* __NL27__ CD #58 Add default ___TypeOfProductCategory___ and ___TypeOfService___ to ___Line___:
__NL27__ CD #58 Add default ___TypeOfProductCategory___ and ___TypeOfService___ to ___Line___:
* CD Move ___TypeOfProductCategory___ and ___TypeOfService___ to _netex_line_version.xsd_.
* NJSK Review: Move ___TypeOfProductCategory___ and ___TypeOfService__ from (Part2:) _netex_journey_version.xsd_ to (Framework reusable component) _netex_travelRights_version.xsd_)- rather than _line.xsd_, so they are visible to part 1.
* NJSK Review: clean up dependencies
* Drop include of _netex_travelRights_version.xsd_ from _netex_accessRightParameter_version.xsd_.
* Drop include of _netex_travelRights_version.xsd_ from _netex_usageParameterAfterSales_version.xsd_.
* Drop include of _netex_travelRights_version.xsd_ from _netex_fareTable_version.xsd_.
* Drop include of _netex_travelRights_version.xsd_ from _netex_parking_version.xsd_.
* NJSK Review: Rename _netex_travelRights_version to netex_servicRetrictions.xsd so as to align with TMc and UML.
* NJSK Review: correct the annotations. Also align xpr with spp and correct spp.
* ### 2019.03.26 __Fix__ *FRAMEWORK* NJSK Fix add missing TrainSize attribute to TrainElement * Align doc with schema * _Updates to xml schema_: * netex_trsin_version.xsd
### 2019.03.26 __Fix__ *FRAMEWORK* NJSK Fix add missing TrainSize attribute to TrainElement
* Align doc with schema
* _Updates to xml schema_:
* netex_trsin_version.xsd
* FR49 NJSK review revisions
Revisions to Accessi ility and equipment enhnacmenets arising from doc review
* Misc doc corrections
* Doc correction
* DOcumentation corrections and tidy ups to framework elements
* Documentation tidy ups to usage parameters
* Documentation tidy ups to Sales contract and CPP
* COrrectionss to GroupTicket and Eligibility ad do
Revis annotations and tidy up
* Doc tidy ups to fare product
* Doc tidy up to usage parameters
Drop some redunant new elements
* Fix add Operator to Journey designator
* Mis doc tidy ups
* correct doc
* Add missing ConnectionCertainty element that is in doc
* Revise ProductTypes
Revise prdocut types
* Revise entlement constraints and minor tidy ups to usage arameters
Revise entlement constraints
* Fix FacilitySet sunstitution group and add facility set to travel specifcation summary
* Remodularise Customer Purcjae Package and fix examples
* Fix: add missing attribute to SanitaryEquipment
* Fix erros in Parking
* Update comments and fix properties of paths
* Doc reveiw - correct Equipment comments
* Doc review tidy up base type comments add missing enums
* Update examples to use new classifcations etc
* Fies to parking
* Doc tidy and add new valeus for PurchaseWindow
* Corrections to fare table
* Fix typo on paymetMethods
* Add missing from and To point i pattern to JourneyMeeting
* Fix to Vehicle stopping and SItopPlace
* Fixes to facilities and Accommodation
* Fix Add missing TypeOfFrame elements
* Fix issue with TypeOfValue alternative names
* Add misisng TypeOfEntity to TypeOfFrame
* fixes to parking
* Fi - allow place to place journeys
* Fix - tidy up ServiceDEsignators
* Fix Revise Destination Secondary Name
The proposed Secondary name mechnaism did not work as it would allow only for a singel context. A simpler and better way is to add a cdisplay ontext to the existing DestinationDisplayVariant
* Fix add mising type of fare table
* Doc fixes
* Update README.md
* Fi - Dummy tariffone shoudl be abstract
* Fi x correct the constraint for ParkingEntrances
C
* Add epip profile metatdat example
* Fix journeyPart cosntraint. Fix leibel service
* Fix constraint on DefaultDatSoucreRef and DefaultResponsibilitySetRef
* Update README.md
* Fix DefaultCodeRef constraint and correct a lot of examples
* Fix remove empty enums
* Add Serbia and Montenegro to country codes
* FarePointInPattern Fix case i isFareStage
correction to new feature
* CCI:circleci-toolbox-image(468c0fa)
* CCI:circleci-toolbox-image(35f2baf)
* CCI:circleci-toolbox-image(8234e48)
* CCI:circleci-toolbox-image(e65201d)
* CCI:circleci-toolbox-image(67cb9d6)
* Added fixes per PullRequest #88 GitHub discussion, see commit thread for further comments
* Fixed example
* Fixed dateTime issues
* Fixed 24h datetime issues
Co-authored-by: nick-knowles <nick.knowles@gmail.com>
Co-authored-by: Cristoffer Solem <cristoffer.solem@gmail.com>
Co-authored-by: Kristian Syversen <kris@soprasteria.com>
Co-authored-by: Assad Riaz <assad.riaz@bouvet.no>
Co-authored-by: CricleCI Bot <email>
Co-authored-by: Stefan de Konink <stefan@konink.de>
skinkie
reviewed
May 5, 2021
| <xsd:annotation> | ||
| <xsd:documentation>Presentation values to use when rendering DESTINATION DISPLAY VARIANT, such as a colour.</xsd:documentation> | ||
| </xsd:annotation> | ||
| </xsd:element> |
Contributor
There was a problem hiding this comment.
This part of the pull request has not yet seen in master. @nick-knowles
Contributor
Author
There was a problem hiding this comment.
So it looks that it needs to be merged
Contributor
There was a problem hiding this comment.
I'll suggest here to approach it as new pull request. That prevents a mess.
Contributor
There was a problem hiding this comment.
This part is not in master yet. @Aurige : how to proceed.
skinkie
added
the
needs documentation update
Contributor
|
As pointed out above, one single change regarding presentation has not been added to master yet. But more troublesome, I am not able to find any definition of Branding in Part 1. |
Aurige
commented
May 6, 2021
Contributor
Author
Aurige
left a comment
Aurige
left a comment
There was a problem hiding this comment.
Branding was initially just a TypeOfValue, so was not requesting much documentation... but with the addition of Presentation in v1.1 it now definitely does :-( well spotted
| <xsd:annotation> | ||
| <xsd:documentation>Presentation values to use when rendering DESTINATION DISPLAY VARIANT, such as a colour.</xsd:documentation> | ||
| </xsd:annotation> | ||
| </xsd:element> |
Contributor
Author
There was a problem hiding this comment.
So it looks that it needs to be merged
ue71603
reviewed
Apr 13, 2022
ue71603
approved these changes
Apr 13, 2022
skinkie
reviewed
Apr 13, 2022
skinkie
approved these changes
Apr 13, 2022
erlendnils1
referenced
this pull request
in entur/NeTEx
Jun 29, 2023
* Comment-NL28 Presentation added to DesinationDisplay (and Variant) + Branding * Remove "new" Presentation * Update xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de>
erlendnils1
referenced
this pull request
in entur/NeTEx
Oct 31, 2023
* Comment-NL28 Presentation added to DesinationDisplay (and Variant) + Branding * Remove "new" Presentation * Update xsd/netex_framework/netex_responsibility/netex_dataSource_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de>
Aurige
added
document has been updated
Contributor
Author
|
Documentation updated, including extra alignment with XSD |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Presentation added to DesinationDisplay (and Variant) + Branding