Commit 2628bd30 authored by sunse's avatar sunse
Browse files

manual fix the merge confliction for CR0019

parents 38cc46cc 1548913c

OpenAPI/TS28104_MdaNrm.yaml

+1 −26
Original line number Diff line number Diff line
@@ -68,31 +68,7 @@ components: 
        - type: object

          properties:

            areaScope:

              $ref: '#/components/schemas/GeoAreaList'



    GeoAreaList:

      type: array

      items:

        $ref: '#/components/schemas/GeoArea'



    GeoArea:

      type: object

      properties:

        coordinates:

          type: array

          items:

            $ref: '#/components/schemas/Coordinate'

        altitude:

          type: number

          format: float



    Coordinate:

      type: object

      properties:

        latitude:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Latitude'

        longitude:

          $ref: 'TS28623_ComDefs.yaml#/components/schemas/Longitude'

              $ref: 'TS28623_ComDefs.yaml#/components/schemas/GeoArea'



    AnalyticsSchedule:

      oneOf:
@@ -107,7 +83,6 @@ components: 
            granularityPeriod:

              type: integer





#-------- Definition of abstract IOCs --------------------------------------------

OpenAPI/TS28623_ComDefs.yaml

+7 −1
Original line number Diff line number Diff line
@@ -82,11 +82,17 @@ components: 
      type: array

      items:

        $ref: '#/components/schemas/GeoCoordinate'

    GeoAreaToCellMapping:

      minItems: 3

    GeoArea:

      type: object

      properties:

        convexGeoPolygon:

          $ref: '#/components/schemas/ConvexGeoPolygon'

    GeoAreaToCellMapping:

      type: object

      properties:

        convexGeoPolygon:

          $ref: '#/components/schemas/GeoArea'

        associationThreshold:

          type: integer

    AreaOfInterest: