Backport of integration into 2.3#191
Conversation
This is needed to work around JAXB/XERCES/xmllint limitations
fixing imports
This reverts commit cc77053.
* adding taxi * Lint and update documentation tables * Update xsd/siri_model/siri_reference.xsd Co-authored-by: Lasse Tyrihjell <lassetyr@gmail.com> * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Lasse Tyrihjell <lassetyr@gmail.com>
Travis to github actions
Ignore local .git folder
Merge from master
* Occupancy examples * Remove trailing spaces * Delete ext_productionTimetable_response.xml * Lint and update documentation tables * Update examples/occupancy/ext_estimatedTimetable_response.xml * Update examples/occupancy/exv_vehicleMonitoring_response.xml --------- Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
…#101) * CR091: Identification of Initiallload with AllData in ServiceDelivery * Lint and update documentation tables * CR091: specify element name and description more precisely --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
…104) * deprecating not used affected structures * deprecating not used affected structures * deprecating not used affected structures * fixed error * Lint and update documentation tables --------- Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* add coordinates to FacilityLocation * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Initial attempt to get xcore working with SIRI * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* CR090: Harmonization of ActionStatus and Progress in SX * Lint and update documentation tables * CR090a: change back ActionStatusEnum and add seperate element ActionIsClosing * revert ActionStatus back to default value open * update description and remove reference to Progress element --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* validate and lint update * Temporary add it * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Second try on Control Actions * Lint and update documentation tables * Suggestions * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Typo corrections on siri_request_errorConditions.xsd (#158) * Typo corrections on siri_request_errorConditions.xsd Addresses issue #125 * Apply suggestions from code review --------- Co-authored-by: Stefan de Konink <stefan@konink.de> * Add example for DataSource in ET (#160) * aligning SIRI with what was intended for OPERATING DAY (#134) * aligning SIRI with what was intended * Update xsd/siri_model/siri_journey_support.xsd Co-authored-by: Stefan de Konink <stefan@konink.de> * Lint and update documentation tables --------- Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: haeckerbaer <54021300+haeckerbaer@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * Fix typos in documentation siri_situation.xsd (#147) * Fix typos in documentation siri_situation.xsd Fix typos & addition of one annotation missing * add missing tags to new annotation it seems that author added a new annotation in previous commit but forgot proper tags. * correct typo --------- Co-authored-by: haeckerbaer <54021300+haeckerbaer@users.noreply.github.com> Co-authored-by: Tim Rivett <56296031+tim-rivett@users.noreply.github.com> * remove blank in FareClassEnumerationList (#174) --------- Co-authored-by: Tu-Tho Thai <info@tutho.com> Co-authored-by: Stefan de Konink <stefan@konink.de> Co-authored-by: Leonard Ehrenfried <mail@leonard.io> Co-authored-by: Matthias Günter <matthias.guenter@sbb.ch> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Tim Rivett <56296031+tim-rivett@users.noreply.github.com>
…nation elements (#176) * replace NaturalLanguagePlaceNameStructure in journey schema NaturalLanguagePlaceNameStructure is replaced with NaturalLanguageStringStructure to support commas that are very common in stop names * replace NaturalLanguagePlaceNameStructure in datedVehicleJourney schema * replace NaturalLanguagePlaceNameStructure in situationAffects schema * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
* Revise README with SIRI schema and contribution info Updated README to include SIRI XML schema details and contribution guidelines. * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
|
2.3 should be identical to integration so i'm a bit confused by the statement "I do not think we need all of these commits from integration branch". And did we actually decide to remove integration? I thought we'll use it as "next" similar to NeTEx? |
|
@haeckerbaer I think @TuThoThai wanted to branch of 2.3 from 2.2 (I think that is the reason...) What would be your proposal to create a branch to facilitate fixes, etc.? |
|
@haeckerbaer, indeed @skinkie is right. What I wanted:
And, yes, we said we would remove "master", "next", "integration" to facilitate new contributions and ease readibility. So, my main question yesterday: is there anything that we left on "integration" when we created v2.2 release (because it did not match the CEN documentation)? If yes, which are they? |
|
we can just create 2.3 branch (from integration) when we are ready to release it. would be a bit simpler. Yes, we left a lot on integration that was not included in v2.2! So we really have to make sure that we get everything and the simplest /safest way is to just wait with the clean up until we are ready to release 2.3, in my opinion. edit: another very simple solution would be to just rename integration to 2.3 |
|
@haeckerbaer, we have 1 major issue with |
|
integration was the base for v2.2 and therefore ControlActions! So it most certainly has them. Again, integration was the basis for v2.2 but without the SX changes and whatnot other functional changes (except for ControlActions). v2.3 must be exactly idenctical to integration. |
* Fixing typos and definition. No longer allowing other types. If somebody invents warp-drive we should reconsider. * Lint and update documentation tables --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
6 participants
As agreed, the
integrationbranch is supposed to be deleted. All new work should point to the branchv2.3@skinkie and @haeckerbaer, I do not think we need all of these commits from integration branch but I struggle cherry picking the ones that are absolutely needed. Help from the 2 of you would be greatly appreciated. 🙏