From 08c7af14b859e087ca1c851d3fd71ee17cf9876b Mon Sep 17 00:00:00 2001 From: Pavel Zavora Date: Thu, 8 Sep 2022 15:54:24 +0200 Subject: [PATCH 1/2] fix: repair GeoTrackMapViewLayer type --- contracts/cloud-diff.yml | 30 +++++++------- contracts/cloud.json | 44 ++++++++++----------- contracts/cloud.yml | 30 +++++++------- contracts/common.yml | 30 +++++++------- contracts/oss-diff.yml | 30 +++++++------- contracts/oss.json | 44 ++++++++++----------- contracts/oss.yml | 30 +++++++------- contracts/ref/cloud.yml | 32 +++++++-------- contracts/ref/oss.yml | 32 +++++++-------- src/common/schemas/GeoTrackMapViewLayer.yml | 30 +++++++------- 10 files changed, 166 insertions(+), 166 deletions(-) diff --git a/contracts/cloud-diff.yml b/contracts/cloud-diff.yml index 3c88ba54..05fda120 100644 --- a/contracts/cloud-diff.yml +++ b/contracts/cloud-diff.yml @@ -2675,21 +2675,21 @@ paths: - speed - randomColors - trackPointVisualization - properties: - trackWidth: - description: Width of the track - type: integer - speed: - description: Speed of the track animation - type: integer - randomColors: - description: Assign different colors to different tracks - type: boolean - colors: - description: Colors define color encoding of data into a visualization - type: array - items: - $ref: '#/paths/~1dashboards/post/responses/201/content/application~1json/schema/oneOf/1/allOf/1/properties/cells/items/allOf/1/properties/properties/oneOf/0/properties/colors/items' + properties: + trackWidth: + description: Width of the track + type: integer + speed: + description: Speed of the track animation + type: integer + randomColors: + description: Assign different colors to different tracks + type: boolean + colors: + description: Colors define color encoding of data into a visualization + type: array + items: + $ref: '#/paths/~1dashboards/post/responses/201/content/application~1json/schema/oneOf/1/allOf/1/properties/cells/items/allOf/1/properties/properties/oneOf/0/properties/colors/items' labels: $ref: '#/components/schemas/Task/properties/labels' default: diff --git a/contracts/cloud.json b/contracts/cloud.json index 22463e09..4817c297 100644 --- a/contracts/cloud.json +++ b/contracts/cloud.json @@ -17785,30 +17785,30 @@ "speed", "randomColors", "trackPointVisualization" - ] - } - ], - "properties": { - "trackWidth": { - "description": "Width of the track", - "type": "integer" - }, - "speed": { - "description": "Speed of the track animation", - "type": "integer" - }, - "randomColors": { - "description": "Assign different colors to different tracks", - "type": "boolean" - }, - "colors": { - "description": "Colors define color encoding of data into a visualization", - "type": "array", - "items": { - "$ref": "#/components/schemas/DashboardColor" + ], + "properties": { + "trackWidth": { + "description": "Width of the track", + "type": "integer" + }, + "speed": { + "description": "Speed of the track animation", + "type": "integer" + }, + "randomColors": { + "description": "Assign different colors to different tracks", + "type": "boolean" + }, + "colors": { + "description": "Colors define color encoding of data into a visualization", + "type": "array", + "items": { + "$ref": "#/components/schemas/DashboardColor" + } + } } } - } + ] }, "GeoHeatMapViewLayer": { "allOf": [ diff --git a/contracts/cloud.yml b/contracts/cloud.yml index ebd45598..198a2864 100644 --- a/contracts/cloud.yml +++ b/contracts/cloud.yml @@ -13583,21 +13583,21 @@ components: - speed - randomColors - trackPointVisualization - properties: - trackWidth: - description: Width of the track - type: integer - speed: - description: Speed of the track animation - type: integer - randomColors: - description: Assign different colors to different tracks - type: boolean - colors: - description: Colors define color encoding of data into a visualization - type: array - items: - $ref: '#/components/schemas/DashboardColor' + properties: + trackWidth: + description: Width of the track + type: integer + speed: + description: Speed of the track animation + type: integer + randomColors: + description: Assign different colors to different tracks + type: boolean + colors: + description: Colors define color encoding of data into a visualization + type: array + items: + $ref: '#/components/schemas/DashboardColor' GeoHeatMapViewLayer: allOf: - $ref: '#/components/schemas/GeoViewLayerProperties' diff --git a/contracts/common.yml b/contracts/common.yml index 218faecb..6a966a0f 100644 --- a/contracts/common.yml +++ b/contracts/common.yml @@ -11895,21 +11895,21 @@ components: - speed - randomColors - trackPointVisualization - properties: - trackWidth: - description: Width of the track - type: integer - speed: - description: Speed of the track animation - type: integer - randomColors: - description: Assign different colors to different tracks - type: boolean - colors: - description: Colors define color encoding of data into a visualization - type: array - items: - $ref: '#/components/schemas/DashboardColor' + properties: + trackWidth: + description: Width of the track + type: integer + speed: + description: Speed of the track animation + type: integer + randomColors: + description: Assign different colors to different tracks + type: boolean + colors: + description: Colors define color encoding of data into a visualization + type: array + items: + $ref: '#/components/schemas/DashboardColor' GeoHeatMapViewLayer: allOf: - $ref: '#/components/schemas/GeoViewLayerProperties' diff --git a/contracts/oss-diff.yml b/contracts/oss-diff.yml index 70e07358..0199381c 100644 --- a/contracts/oss-diff.yml +++ b/contracts/oss-diff.yml @@ -4723,21 +4723,21 @@ paths: - speed - randomColors - trackPointVisualization - properties: - trackWidth: - description: Width of the track - type: integer - speed: - description: Speed of the track animation - type: integer - randomColors: - description: Assign different colors to different tracks - type: boolean - colors: - description: Colors define color encoding of data into a visualization - type: array - items: - $ref: '#/paths/~1dashboards/post/responses/201/content/application~1json/schema/oneOf/1/allOf/1/properties/cells/items/allOf/1/properties/properties/oneOf/0/properties/colors/items' + properties: + trackWidth: + description: Width of the track + type: integer + speed: + description: Speed of the track animation + type: integer + randomColors: + description: Assign different colors to different tracks + type: boolean + colors: + description: Colors define color encoding of data into a visualization + type: array + items: + $ref: '#/paths/~1dashboards/post/responses/201/content/application~1json/schema/oneOf/1/allOf/1/properties/cells/items/allOf/1/properties/properties/oneOf/0/properties/colors/items' labels: $ref: '#/components/schemas/Task/properties/labels' default: diff --git a/contracts/oss.json b/contracts/oss.json index a7897fa6..01d6eb3f 100644 --- a/contracts/oss.json +++ b/contracts/oss.json @@ -20335,30 +20335,30 @@ "speed", "randomColors", "trackPointVisualization" - ] - } - ], - "properties": { - "trackWidth": { - "description": "Width of the track", - "type": "integer" - }, - "speed": { - "description": "Speed of the track animation", - "type": "integer" - }, - "randomColors": { - "description": "Assign different colors to different tracks", - "type": "boolean" - }, - "colors": { - "description": "Colors define color encoding of data into a visualization", - "type": "array", - "items": { - "$ref": "#/components/schemas/DashboardColor" + ], + "properties": { + "trackWidth": { + "description": "Width of the track", + "type": "integer" + }, + "speed": { + "description": "Speed of the track animation", + "type": "integer" + }, + "randomColors": { + "description": "Assign different colors to different tracks", + "type": "boolean" + }, + "colors": { + "description": "Colors define color encoding of data into a visualization", + "type": "array", + "items": { + "$ref": "#/components/schemas/DashboardColor" + } + } } } - } + ] }, "GeoHeatMapViewLayer": { "allOf": [ diff --git a/contracts/oss.yml b/contracts/oss.yml index 739cd95b..c568a013 100644 --- a/contracts/oss.yml +++ b/contracts/oss.yml @@ -15367,21 +15367,21 @@ components: - speed - randomColors - trackPointVisualization - properties: - trackWidth: - description: Width of the track - type: integer - speed: - description: Speed of the track animation - type: integer - randomColors: - description: Assign different colors to different tracks - type: boolean - colors: - description: Colors define color encoding of data into a visualization - type: array - items: - $ref: '#/components/schemas/DashboardColor' + properties: + trackWidth: + description: Width of the track + type: integer + speed: + description: Speed of the track animation + type: integer + randomColors: + description: Assign different colors to different tracks + type: boolean + colors: + description: Colors define color encoding of data into a visualization + type: array + items: + $ref: '#/components/schemas/DashboardColor' GeoHeatMapViewLayer: allOf: - $ref: '#/components/schemas/GeoViewLayerProperties' diff --git a/contracts/ref/cloud.yml b/contracts/ref/cloud.yml index 083a39a5..61007061 100644 --- a/contracts/ref/cloud.yml +++ b/contracts/ref/cloud.yml @@ -1662,27 +1662,27 @@ components: GeoTrackMapViewLayer: allOf: - $ref: '#/components/schemas/GeoViewLayerProperties' - - required: + - properties: + colors: + description: Colors define color encoding of data into a visualization + items: + $ref: '#/components/schemas/DashboardColor' + type: array + randomColors: + description: Assign different colors to different tracks + type: boolean + speed: + description: Speed of the track animation + type: integer + trackWidth: + description: Width of the track + type: integer + required: - trackWidth - speed - randomColors - trackPointVisualization type: object - properties: - colors: - description: Colors define color encoding of data into a visualization - items: - $ref: '#/components/schemas/DashboardColor' - type: array - randomColors: - description: Assign different colors to different tracks - type: boolean - speed: - description: Speed of the track animation - type: integer - trackWidth: - description: Width of the track - type: integer GeoViewLayer: oneOf: - $ref: '#/components/schemas/GeoCircleViewLayer' diff --git a/contracts/ref/oss.yml b/contracts/ref/oss.yml index 2b545670..7e52c06d 100644 --- a/contracts/ref/oss.yml +++ b/contracts/ref/oss.yml @@ -1720,27 +1720,27 @@ components: GeoTrackMapViewLayer: allOf: - $ref: '#/components/schemas/GeoViewLayerProperties' - - required: + - properties: + colors: + description: Colors define color encoding of data into a visualization + items: + $ref: '#/components/schemas/DashboardColor' + type: array + randomColors: + description: Assign different colors to different tracks + type: boolean + speed: + description: Speed of the track animation + type: integer + trackWidth: + description: Width of the track + type: integer + required: - trackWidth - speed - randomColors - trackPointVisualization type: object - properties: - colors: - description: Colors define color encoding of data into a visualization - items: - $ref: '#/components/schemas/DashboardColor' - type: array - randomColors: - description: Assign different colors to different tracks - type: boolean - speed: - description: Speed of the track animation - type: integer - trackWidth: - description: Width of the track - type: integer GeoViewLayer: oneOf: - $ref: '#/components/schemas/GeoCircleViewLayer' diff --git a/src/common/schemas/GeoTrackMapViewLayer.yml b/src/common/schemas/GeoTrackMapViewLayer.yml index f7d53104..4ccab0aa 100644 --- a/src/common/schemas/GeoTrackMapViewLayer.yml +++ b/src/common/schemas/GeoTrackMapViewLayer.yml @@ -2,18 +2,18 @@ - $ref: "./GeoViewLayerProperties.yml" - type: object required: [trackWidth, speed, randomColors, trackPointVisualization] - properties: - trackWidth: - description: Width of the track - type: integer - speed: - description: Speed of the track animation - type: integer - randomColors: - description: Assign different colors to different tracks - type: boolean - colors: - description: Colors define color encoding of data into a visualization - type: array - items: - $ref: "./DashboardColor.yml" + properties: + trackWidth: + description: Width of the track + type: integer + speed: + description: Speed of the track animation + type: integer + randomColors: + description: Assign different colors to different tracks + type: boolean + colors: + description: Colors define color encoding of data into a visualization + type: array + items: + $ref: "./DashboardColor.yml" From 74d1780552252e3ffab94c963503fd42751c2fde Mon Sep 17 00:00:00 2001 From: Pavel Zavora Date: Thu, 8 Sep 2022 20:19:24 +0200 Subject: [PATCH 2/2] fix: remove missing required trackPointVisualization property --- contracts/cloud-diff.yml | 1 - contracts/cloud.json | 3 +-- contracts/cloud.yml | 1 - contracts/common.yml | 1 - contracts/oss-diff.yml | 1 - contracts/oss.json | 3 +-- contracts/oss.yml | 1 - contracts/ref/cloud.yml | 1 - contracts/ref/oss.yml | 1 - src/common/schemas/GeoTrackMapViewLayer.yml | 2 +- 10 files changed, 3 insertions(+), 12 deletions(-) diff --git a/contracts/cloud-diff.yml b/contracts/cloud-diff.yml index 05fda120..9c18471f 100644 --- a/contracts/cloud-diff.yml +++ b/contracts/cloud-diff.yml @@ -2674,7 +2674,6 @@ paths: - trackWidth - speed - randomColors - - trackPointVisualization properties: trackWidth: description: Width of the track diff --git a/contracts/cloud.json b/contracts/cloud.json index 4817c297..b1e6003a 100644 --- a/contracts/cloud.json +++ b/contracts/cloud.json @@ -17783,8 +17783,7 @@ "required": [ "trackWidth", "speed", - "randomColors", - "trackPointVisualization" + "randomColors" ], "properties": { "trackWidth": { diff --git a/contracts/cloud.yml b/contracts/cloud.yml index 198a2864..1763b112 100644 --- a/contracts/cloud.yml +++ b/contracts/cloud.yml @@ -13582,7 +13582,6 @@ components: - trackWidth - speed - randomColors - - trackPointVisualization properties: trackWidth: description: Width of the track diff --git a/contracts/common.yml b/contracts/common.yml index 6a966a0f..c5cc546c 100644 --- a/contracts/common.yml +++ b/contracts/common.yml @@ -11894,7 +11894,6 @@ components: - trackWidth - speed - randomColors - - trackPointVisualization properties: trackWidth: description: Width of the track diff --git a/contracts/oss-diff.yml b/contracts/oss-diff.yml index 0199381c..e03ff3a6 100644 --- a/contracts/oss-diff.yml +++ b/contracts/oss-diff.yml @@ -4722,7 +4722,6 @@ paths: - trackWidth - speed - randomColors - - trackPointVisualization properties: trackWidth: description: Width of the track diff --git a/contracts/oss.json b/contracts/oss.json index 01d6eb3f..339a7cdb 100644 --- a/contracts/oss.json +++ b/contracts/oss.json @@ -20333,8 +20333,7 @@ "required": [ "trackWidth", "speed", - "randomColors", - "trackPointVisualization" + "randomColors" ], "properties": { "trackWidth": { diff --git a/contracts/oss.yml b/contracts/oss.yml index c568a013..f5943e25 100644 --- a/contracts/oss.yml +++ b/contracts/oss.yml @@ -15366,7 +15366,6 @@ components: - trackWidth - speed - randomColors - - trackPointVisualization properties: trackWidth: description: Width of the track diff --git a/contracts/ref/cloud.yml b/contracts/ref/cloud.yml index 61007061..bfeab170 100644 --- a/contracts/ref/cloud.yml +++ b/contracts/ref/cloud.yml @@ -1681,7 +1681,6 @@ components: - trackWidth - speed - randomColors - - trackPointVisualization type: object GeoViewLayer: oneOf: diff --git a/contracts/ref/oss.yml b/contracts/ref/oss.yml index 7e52c06d..69c93039 100644 --- a/contracts/ref/oss.yml +++ b/contracts/ref/oss.yml @@ -1739,7 +1739,6 @@ components: - trackWidth - speed - randomColors - - trackPointVisualization type: object GeoViewLayer: oneOf: diff --git a/src/common/schemas/GeoTrackMapViewLayer.yml b/src/common/schemas/GeoTrackMapViewLayer.yml index 4ccab0aa..24e4139a 100644 --- a/src/common/schemas/GeoTrackMapViewLayer.yml +++ b/src/common/schemas/GeoTrackMapViewLayer.yml @@ -1,7 +1,7 @@ allOf: - $ref: "./GeoViewLayerProperties.yml" - type: object - required: [trackWidth, speed, randomColors, trackPointVisualization] + required: [trackWidth, speed, randomColors] properties: trackWidth: description: Width of the track