Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename ExchangePointsResult element #295

Merged
merged 17 commits into from
Jan 20, 2023

Conversation

trurlurl
Copy link
Contributor

@trurlurl trurlurl commented Jan 15, 2023

This change renames the result elements in the ExchangePointsResponseGroup from Place to ExchangePointsResult. The former name Place was probably a copy-paste-error which already existed in OJP 1.0 and was not found until now.

It also improves the naming consistency by renaming the structures

  • ExchangePointResponseContext to ExchangePointsResponseContext
  • ExchangePointProblemStructure to ExchangePointsProblemStructure

@trurlurl trurlurl added bug Something isn't working documentation labels Jan 15, 2023
@trurlurl trurlurl added this to the v2.0 milestone Jan 15, 2023
ue71603
ue71603 previously approved these changes Jan 15, 2023
* LineInformation Request and Response

Specially for the shape of the line.

* Travis CI update [skip ci]

* switched shape to gml:LineString

* remove Probability

* Travis CI update [skip ci]

* typo corrected

* remedy for Stefans itches ;-)

* update xsd

* Travis CI update [skip ci]

* simplyfy siri import

* gml removed, error fixed, example added

* Update schema-collection.xml

* Lint and update documentation tables

* Lint and update documentation tables

* Better name for the elemente RouteGeometry

for simplicities sake, I would like to still kee it a LinkProjectionStructure

* update example

* Lint and update documentation tables

* LinkProjectionStructure -> LinearShapeStructure

* fixed error during rebasing

* Lint and update documentation tables

* don't mix changes

...and I think I won't change it afterwards at all.

* Lint and update documentation tables

* Update OJP/OJP_Requests.xsd

* Update OJP/OJP_Common.xsd

* Lint and update documentation tables

* Update OJP/OJP_Lines.xsd

* Lint and update documentation tables

Co-authored-by: Travis CI User <travis@example.org>
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Stefan de Konink <stefan@konink.de>
skinkie
skinkie previously approved these changes Jan 19, 2023
commit 7b577f1
Author: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun Jan 15 16:19:55 2023 +0000

    Lint and update documentation tables

commit e0d210f
Author: trurlurl <82838870+trurlurl@users.noreply.github.com>
Date:   Sun Jan 15 17:11:24 2023 +0100

    Improved naming consistency
@skinkie
Copy link
Contributor

skinkie commented Jan 19, 2023

Manually merged; fc1981c

@skinkie skinkie closed this Jan 19, 2023
@skinkie skinkie deleted the small_corrections_exchangepoints branch January 19, 2023 11:39
@sgrossberndt sgrossberndt restored the small_corrections_exchangepoints branch January 19, 2023 11:57
@skinkie skinkie reopened this Jan 19, 2023
@skinkie skinkie dismissed stale reviews from ue71603 and themself via 318dc0d January 19, 2023 12:15
@sgrossberndt sgrossberndt reopened this Jan 19, 2023
@sgrossberndt sgrossberndt dismissed stale reviews from skinkie and ue71603 via 318dc0d January 19, 2023 12:15
skinkie
skinkie previously approved these changes Jan 19, 2023
skinkie
skinkie previously approved these changes Jan 19, 2023
@sgrossberndt sgrossberndt changed the title Small corrections in ExchangePointsResponse and -Result Rename ExchangePointsResult element Jan 19, 2023
@skinkie
Copy link
Contributor

skinkie commented Jan 19, 2023

@sgrossberndt need help; this went very wrong.

@sgrossberndt
Copy link
Contributor

I'll reset this branch and pull request to the former state

@skinkie skinkie force-pushed the small_corrections_exchangepoints branch from f8f6c6a to a8f6598 Compare January 19, 2023 16:38
@sgrossberndt
Copy link
Contributor

or.. you do this :-D

@skinkie
Copy link
Contributor

skinkie commented Jan 19, 2023

or.. you do this :-D

Needed to find exactly how.

@ue71603
Copy link
Contributor

ue71603 commented Jan 20, 2023

Stefan: Needs to be reviewed very carefully.

# Conflicts:
#	OJP/OJP_Trips.xsd
#	docs/generated/index.html
@skinkie
Copy link
Contributor

skinkie commented Jan 20, 2023

Please make sure that the merge is correct before accepting.

OJP/OJP_Trips.xsd Outdated Show resolved Hide resolved
@@ -824,6 +824,7 @@
<xs:documentation>A list of references to SITUATIONs.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SituationFullRef" type="SituationFullRefStructure" minOccurs="0" maxOccurs="unbounded"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sgrossberndt This comes from somewhere... but is likely correct.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it is not correct. SituationFullRefs replaced SituationFullRef

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@@ -824,6 +824,7 @@
<xs:documentation>A list of references to SITUATIONs.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SituationFullRef" type="SituationFullRefStructure" minOccurs="0" maxOccurs="unbounded"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, it is not correct. SituationFullRefs replaced SituationFullRef

OJP/OJP_Trips.xsd Outdated Show resolved Hide resolved
skinkie
skinkie previously approved these changes Jan 20, 2023
@skinkie skinkie merged commit 78687cd into changes_for_v1.1 Jan 20, 2023
@skinkie skinkie deleted the small_corrections_exchangepoints branch January 20, 2023 14:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants