Conversation
* Manual lint * remove netex_all_filters * Redo #339 * ConditionSummaryChargingGroup * Fix errors and align with specificaions in NeTEx pt 3 * Update * Update * Move from Travis to github actions * Lint merge
* Update netex_ifopt_site_version.xsd * new name after discussion with Stefan * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd
# Conflicts: # .travis.yml # examples/functions/calendar/NeTEx_Calendar_se_PA1.xml # examples/functions/newModes/NewModes-CarClubExample.xml # examples/functions/newModes/NewModes-CycleSharingExample.xml # examples/functions/validityCondition/NeTEx_trigger-01.xml # examples/standards/epiap/eiap_test1_ramp.xml # examples/standards/noptis/Netex_StopPlace_se_NOPTIS_Example_TEH_PA1.xml # examples/standards/noptis/Netex_StopPlace_se_NOPTIS_TEH_Style1_PB1.xml # examples/standards/nta/NeTEx-Export Example.xml # examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-TCVP.xml # examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080-full.xml # examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1-1080.xml # examples/standards/tap_tsi/B1_NRT/Netex_tap_tsi_B1.xml # examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1180.xml # examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-1181.xml # examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71-optimised.xml # examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2-71.xml # examples/standards/tap_tsi/B2_IRT/Netex_tap_tsi_B2.xml # examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3+more.xml # examples/standards/tap_tsi/B3_Special/Netex_tap_tsi_B3.xml # examples/standards/tap_tsi/Other/Netex_tap_trainhotel_1.xml # examples/standards/tap_tsi/Other/Netex_tap_trainhotel_SalesPackage_2.xml # xsd/netex_framework/netex_reusableComponents/netex_otherOrganisation_version.xsd # xsd/netex_framework/netex_reusableComponents/netex_topographicPlace_version.xsd # xsd/netex_framework/netex_reusableComponents/netex_transportOrganisation_version.xsd # xsd/netex_framework/netex_utility/netex_location_types.xsd # xsd/netex_framework/netex_utility/netex_utility_types.xsd # xsd/netex_part_1/part1_networkDescription/netex_lineNetwork_version.xsd # xsd/netex_part_1/part1_networkDescription/netex_routeInstruction_version.xsd # xsd/netex_part_1/part1_tacticalPlanning/netex_fareZone_version.xsd # xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd # xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd # xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd # xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd # xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd # xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd # xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
# Conflicts: # xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd # xsd/netex_part_1/part1_tacticalPlanning/netex_passengerInformationEquipment_version.xsd # xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_version.xsd # xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd # xsd/netex_part_3/part3_fares/netex_distanceMatrixElement_version.xsd # xsd/netex_part_3/part3_fares/netex_usageParameterTravel_support.xsd # xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd
Notice that the examples still miss RelativeLevelOrder.
…ional and a small validity problem (#430) Examples adapted to new RelativeLevelOrder and RelativeLevelOrder optional. We otherwise have examples that break. And it might be that people don't wish to use them.
* XSD Validation issue A few XSD files were not valid when used individually (netex_ifopt_equipmentAccess_support.xsd and netex_ifopt_equipmentSigns_support.xsd for example) This was solved by simply move PlaceEquipmentRef, PlaceEquipmentRefStructure and PlaceEquipmentIdType from netex_equipment_version.xsd to netex_equipment_support.xsd (which is quite logical) Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com>
* adding RelativeLevelOrder to Levels * Update Netex_01_Stops_SingleStopOnStreet_1.xml
Update next with master
Update EPIAP with master
Harmonisation of DatedVehicleJourney and DatedServiceJourney Initially poposed by ENTU in PR487
…version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de>
Propagate fixes
Propagate fixes to EPIAP
…ace-PR368 Extended-DatedVehicleJourney+Replace-PR368
…leJourney+Replace-PR368 Revert "Extended-DatedVehicleJourney+Replace-PR368"
* Add qrcode to MachineReadableEnumeration * Change qrcode to qrCode --------- Co-authored-by: Kristian Syversen <kristian.syversen@entur.org>
* First part of Beacon Equipment * second part of BeaconEquipment * BeaconEquipment -> PassengerBeaconEquipment There are also technical Beacons with BeaconPoint. As they are different currently no ref is added in either element. * XML Spy removed * fixed example and added examples to project * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Apply suggestions from code review * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_equipmentPassenger_support.xsd * Apply suggestions from code review --------- Co-authored-by: Stefan de Konink <stefan@konink.de>
Update of the Pr411 (that was merged and rolled back due to issues with examples uising UIC periods) and PR518 (broken for whatever github reason) This version integrates the decisions from the Meeting #13 and #14: Update of examples to use OperatingDayRef in dated jouneys (keep the old UIC periods commented with an explicit mention of the deprecation). UicOperatingPeriod deletion is now replaced by a simple deprecation (clearly stated in comments) for backward compatibility reasons.
…pamle-updates Rail dated journey fix without example updates
* Addition of TypeOfProductCategory to JourneyPart Addition of TypeOfProductCategory to JourneyPart Following #435 and the NeTEx group dicussion and decision * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Addition of reviews to vehicle pooling drivers and passengers Addition of reviews to vehicle pooling drivers and passengers Also adds a missing Transmodel relation from SINGLE JOURNEY to VEHICLE POOLING DRIVER Answers to #318 * Fix XML Spy issue * Lint and update documentation tables * Update following Github review Updates following Github review and typo fixing * Lint and update documentation tables * Decision from meeting # 15 Global rating are decimal 5 stars model Ok: annotation mentions that 5 is better the 1 --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Update netex_seatingPlan_support.xsd * Update netex_seatingPlan_version.xsd * Update DeckPlans-Example.xml * Update DeckPlans-Example_bus.xml * Update DeckPlans-Example_train.xml * Update DeckPlans-Example_train_simple.xml * Fix bug * Since deckplan was introduced in the next branch, it does not make sence to keep deprecated structures before there was even a release. * Apply suggestions from code review * Apply suggestions from code review * Fix HasAisleinFront in the examples too * Change IsInMiddle netex_seatingPlan_version.xsd Change of IsInMiddle to BetweenSeats for better clarity * Update DeckPlans-Example.xml Change of IsInMiddle to BetweenSeats for clarity * Update DeckPlans-Example_bus.xml Change IsInMiddle to BetweenSeats for clarity * Update DeckPlans-Example_train.xml Change IsInMiddle for BetweenSeats for clarity * Make booleans clearer Changes are: ByAisle -> IsByAisle, ByWindows -> IsByWindows, BetweenSeats -> IsBetweenSeats * Adjust names for booleans in XSD & update examples * Apply suggestions from code review * Fix examples * Setting default to false --------- Co-authored-by: Stefan de Konink <stefan@konink.de>
* Introduce xmllint compiled from 2b6b3945f2df548b56f2c73c490dda9781f92eb2 to overcome the issues with Ubuntu * Disable the installation of the stock xmllint * Update the scripts to execute the static xmllint-master
* Finally validate all examples, in all subfolders * Fix all remaining broken examples.
* Fix most of the errors, except for IsAllowed * Remove IsAllowed, since it already has been defined in the parent
* fixing From/To JourneyRefStructure * Update xsd/netex_part_2/part2_journeyTimes/netex_interchange_version.xsd * Deprecate structures, introduce actually matching structures * Do the same for ConnectingJourneyRef * Revert changes * Revert "Revert changes" This reverts commit 0c65fbd. --------- Co-authored-by: Stefan de Konink <stefan@konink.de>
* Recharging revisions - Add rechargiungStation and Recharging Bay Add RechargiungStation and Recharging Bay entities * Add missing height to WaitingEquipment Was missing a height - needed for shelters seats etc * Recharging point revisions for VVS Allow VEHICLE JOURNEY to ref a RECHARHING PROFILE. ALLOW RECHARGING PROFIEL to say which VEHCILE CHARGING EQUIPMENT it is compatibel with. * Lint and update documentation tables * Update NeTEx VDV Example.xml Reworked VDV 452 E-Bus-Charging Example * Lint and update documentation tables * ScheduledStopPointRefs_RelStructure needs to allow more than one reference to ScheduledStopPoint * RechargingPointAssignment allows for list of served ScheduledStopPoints * SiteFrame allows for list of RechargingStations We do not want to use parkings for the bus recharging stations and elements, therefore we need an own collection * Reworked VDV 452 example to use RechargingPointAssignment/servedScheduledStopPoints * Update xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_framework/netex_reusableComponents/netex_nm_equipmentEnergy_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_ifopt/netex_rechargingPointAssignment_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_1/part1_tacticalPlanning/netex_servicePattern_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Fix XML example merge issues * Update xsd/netex_part_2/part2_journeyTimes/netex_vehicleJourney_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Solving issues after remerging "next" to the branch Solving issues after remerging "next" to the branch * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Fixed minor validation error, removed use of SiteFrame/rechargingStations. Removed unused parking/charging example. * Revert "SiteFrame allows for list of RechargingStations" This reverts commit ce849b3. Following the decision of the workgroup, recharging stations will be found under SiteFrame/parkings * Added reference to recharging equipment and recharging profile used to RechargingStep. Needed for VDV 452 compatibility * Added reference to recharging equipment used and recharging profile used to RechargingSteps --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: duexw <duex@mentz.net> Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
* Don't use windows paths * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Refer to #921 for details
* Entrance deprecated as instance The ENTRANCE is an abstract Transmodel object and therfore should not ne used as an instance (use specialisations like StopPalceEntrance, PointOfInterestEntrance, etc.). It still has "abstract="false" for backward compatibility, but using it as an instance is DEPRECATED from v2.0 and it will be formally changed to abstract in v3.0 * Update xsd/netex_part_1/part1_ifopt/netex_ifopt_site_version.xsd Co-authored-by: Stefan de Konink <stefan@konink.de>
* MandatoryEnumeration comment correction MandatoryEnumeration comment correction * Update xsd/netex_framework/netex_responsibility/netex_entity_support.xsd --------- Co-authored-by: Christophe Duquesne <christophe.duquesne@aurigetech.com> Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch>
* changes copied * undo deckplan - too many changes * fixing bugs * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
…="false" is the default.
As proposed here #918 (comment)
Next documentationtags
Hygiene on abstract work.
* DayOffset are not integer but DayOffsetType DayOffset are not integer but of DayOffsetType * Additional DayOffsetType corrections * Update xsd/netex_part_2/part2_vehicleService/netex_vehicleService_version.xsd --------- Co-authored-by: Stefan de Konink <stefan@konink.de>
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
11 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.
This pull request is in essence "trivial" because it only replaces _ with _Dummy.
But I think it does show that there are still things that look and feel wrong. For example, NeTEx defines the abstract "Organisation" it, is abstract so it cannot be used. The abstract object is not used to derive objects from. I wonder why we won't rename Organisation_Dummy to Organisation. In the overview below all elements that are in fact abstract, but still have a matching Dummy.
@Aurige @nick-knowles please review, and let me know if the Dummy element can be just renamed to the "Transmodel-abstract".