diff --git a/README.md b/README.md index db073d1..367c64a 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,9 @@ OpenAPI 3.0 documentation is available at [Swaggerhub](https://app.swaggerhub.co The Blueprint for an Transport Operator to Mobility-as-a-service Provider API is available at the [documentation page](https://github.com/TOMP-WG/TOMP-API/tree/master/documents). How can I join the TOMP working group? -Join our [Slack space](https://join.slack.com/t/tomp-wg/shared_invite/zt-e3fftun7-qCs8FyXZPPy9pt_opyFw0QPlease) or contact Ayse (aysehilal.ocal@ndw.nu) to be added to our mailing list and to receive invites for the working group meetings. +--- + +Join our [Slack space](https://join.slack.com/t/tomp-wg/shared_invite/zt-e3fftun7-qCs8FyXZPPy9pt_opyFw0QPlease) or contact Jed (tomp-secretary@maas-alliance.eu) to be added to our mailing list and to receive invites for the working group meetings. The working group meetings take place every month with the goal to develop and specify a generic TOMP-API for use by Transport Operators and Mobility-as-a-service Providers. All reports can be found at the [documentation page](https://github.com/TOMP-WG/TOMP-API/tree/master/documents/working%20group%20reports). @@ -28,5 +30,4 @@ Code of conduct [Our code of conduct](https://github.com/TOMP-WG/TOMP-API/blob/master/code_of_conduct.md) [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg)](code_of_conduct.md) - diff --git a/TOMP-API.yaml b/TOMP-API.yaml index c02832e..085b6b1 100644 --- a/TOMP-API.yaml +++ b/TOMP-API.yaml @@ -3017,16 +3017,22 @@ components: meta: type: object additionalProperties: true - + geojsonLine: - description: An array of WGS84 coordinate pairs - type: array - example: [[6.169639, 52.253279], [6.05623, 52.63473]] - items: - $ref: "#/components/schemas/geojsonPoint" + type: object + description: An array of WGS84 coordinate pairs + allOf: + - $ref: "#/components/schemas/geojsonGeometry" + - type: object + properties: + coordinates: + description: Geojson Coordinate + type: array + example: [ [ 6.169639, 52.253279 ], [ 6.05623, 52.63473 ] ] + items: + $ref: "#/components/schemas/basePoint" - geojsonPoint: - description: Geojson Coordinate + basePoint: type: array minItems: 2 maxItems: 2 @@ -3034,43 +3040,70 @@ components: type: number format: float minimum: 0.0 - example: [4.53432, 55.324523] + example: [ 4.53432, 55.324523 ] + + geojsonPoint: + type: object + description: Geojson Coordinate + allOf: + - $ref: "#/components/schemas/geojsonGeometry" + - type: object + properties: + coordinates: + $ref: "#/components/schemas/basePoint" geojsonPolygon: + type: object description: geojson representation of a polygon. First and last point must be equal. See also https://geojson.org/geojson-spec.html#polygon and example https://geojson.org/geojson-spec.html#id4. The order should be lon, lat [[[lon1, lat1], [lon2,lat2], [lon3,lat3], [lon1,lat1]]], the first point should match the last point. - type: array - items: - $ref: "#/components/schemas/geojsonLine" - example: [[[1.0, 1.0], [0.0, 1.0], [0.0, 0.0], [1.0,0.0], [1.0, 1.0]]] + allOf: + - $ref: "#/components/schemas/geojsonGeometry" + - type: object + properties: + coordinates: + type: array + example: [[[1.0, 1.0], [0.0, 1.0], [0.0, 0.0], [1.0,0.0], [1.0, 1.0]]] + items: + type: array + items: + $ref: "#/components/schemas/basePoint" geojsonMultiPolygon: + type: object description: geojson representation of a multi polygon. See also https://geojson.org/geojson-spec.html#multipolygon - type: array - items: - $ref: "#/components/schemas/geojsonPolygon" - example: [[[[1.0, 1.0], [0.0, 1.0], [0.0, 0.0], [1.0,0.0], [1.0, 1.0]]]] + allOf: + - $ref: "#/components/schemas/geojsonGeometry" + - type: object + properties: + coordinates: + type: array + example: [[[[1.0, 1.0], [0.0, 1.0], [0.0, 0.0], [1.0,0.0], [1.0, 1.0]]]] + items: + type: array + items: + type: array + items: + $ref: "#/components/schemas/basePoint" geojsonGeometry: + type: object + description: geoJSON geometry required: - - type - description: - geoJSON geometry + - type properties: type: type: string - enum: - - Point - - LineString - - Polygon - - MultiPolygon - coordinates: - oneOf: - - $ref: "#/components/schemas/geojsonPoint" - - $ref: "#/components/schemas/geojsonLine" - - $ref: "#/components/schemas/geojsonPolygon" - - $ref: "#/components/schemas/geojsonMultiPolygon" + enum: + - Point + - LineString + - Polygon + - MultiPolygon discriminator: propertyName: type + mapping: + Point: "#/components/schemas/geojsonPoint" + LineString: "#/components/schemas/geojsonLine" + Polygon: "#/components/schemas/geojsonPolygon" + MultiPolygon: "#/components/schemas/geojsonMultiPolygon" information: description: Information provided to end users diff --git a/documents/presentations/2024 06 26 Building the future of TOMP-API.pdf b/documents/presentations/2024 06 26 Building the future of TOMP-API.pdf new file mode 100644 index 0000000..0e7aaa4 Binary files /dev/null and b/documents/presentations/2024 06 26 Building the future of TOMP-API.pdf differ diff --git a/documents/presentations/20241107 - Feedback session III - OGC.pptx b/documents/presentations/20241107 - Feedback session III - OGC.pptx new file mode 100644 index 0000000..389715f Binary files /dev/null and b/documents/presentations/20241107 - Feedback session III - OGC.pptx differ diff --git a/documents/presentations/231025_TOMP_ Presentation_Data_Standardisation.pptx.pdf b/documents/presentations/231025_TOMP_ Presentation_Data_Standardisation.pptx.pdf new file mode 100644 index 0000000..aad7139 Binary files /dev/null and b/documents/presentations/231025_TOMP_ Presentation_Data_Standardisation.pptx.pdf differ diff --git a/documents/presentations/Presentation Marktconsultation TOMP-API en.pptx b/documents/presentations/Presentation Marktconsultation TOMP-API en.pptx new file mode 100644 index 0000000..d044239 Binary files /dev/null and b/documents/presentations/Presentation Marktconsultation TOMP-API en.pptx differ diff --git a/documents/presentations/Standardisation at work within CEN.pdf b/documents/presentations/Standardisation at work within CEN.pdf new file mode 100644 index 0000000..ac6ab76 Binary files /dev/null and b/documents/presentations/Standardisation at work within CEN.pdf differ diff --git a/documents/presentations/TOMP-API - GBFS - availability.pptx b/documents/presentations/TOMP-API - GBFS - availability.pptx new file mode 100644 index 0000000..57cc7a5 Binary files /dev/null and b/documents/presentations/TOMP-API - GBFS - availability.pptx differ diff --git a/documents/working group reports/Report TOMP-API Working group 88.pdf b/documents/working group reports/Report TOMP-API Working group 88.pdf new file mode 100644 index 0000000..01f0266 Binary files /dev/null and b/documents/working group reports/Report TOMP-API Working group 88.pdf differ diff --git a/documents/working group reports/Report TOMP-API working group 82.pdf b/documents/working group reports/Report TOMP-API working group 82.pdf new file mode 100644 index 0000000..49f87d8 Binary files /dev/null and b/documents/working group reports/Report TOMP-API working group 82.pdf differ diff --git a/documents/working group reports/Report TOMP-API working group 83.pdf b/documents/working group reports/Report TOMP-API working group 83.pdf new file mode 100644 index 0000000..d931d7a Binary files /dev/null and b/documents/working group reports/Report TOMP-API working group 83.pdf differ diff --git a/documents/working group reports/Report TOMP-API working group 84.pdf b/documents/working group reports/Report TOMP-API working group 84.pdf new file mode 100644 index 0000000..e985514 Binary files /dev/null and b/documents/working group reports/Report TOMP-API working group 84.pdf differ diff --git a/documents/working group reports/Report TOMP-API working group 85.pdf b/documents/working group reports/Report TOMP-API working group 85.pdf new file mode 100644 index 0000000..d703f07 Binary files /dev/null and b/documents/working group reports/Report TOMP-API working group 85.pdf differ diff --git a/documents/working group reports/Report TOMP-API working group 86.pdf b/documents/working group reports/Report TOMP-API working group 86.pdf new file mode 100644 index 0000000..add5cc3 Binary files /dev/null and b/documents/working group reports/Report TOMP-API working group 86.pdf differ diff --git a/documents/working group reports/Report TOMP-API working group 87.pdf b/documents/working group reports/Report TOMP-API working group 87.pdf new file mode 100644 index 0000000..64c848c Binary files /dev/null and b/documents/working group reports/Report TOMP-API working group 87.pdf differ diff --git a/documents/working group reports/Report of TOMP-API Working group 89.pdf b/documents/working group reports/Report of TOMP-API Working group 89.pdf new file mode 100644 index 0000000..130d919 Binary files /dev/null and b/documents/working group reports/Report of TOMP-API Working group 89.pdf differ diff --git a/documents/working group reports/Report of TOMP-API working group 90 .pdf b/documents/working group reports/Report of TOMP-API working group 90 .pdf new file mode 100644 index 0000000..633c291 Binary files /dev/null and b/documents/working group reports/Report of TOMP-API working group 90 .pdf differ diff --git a/documents/working group reports/Report of TOMP-API working group 91 .pdf b/documents/working group reports/Report of TOMP-API working group 91 .pdf new file mode 100644 index 0000000..41944b9 Binary files /dev/null and b/documents/working group reports/Report of TOMP-API working group 91 .pdf differ