From 83dda230a2d9a181857157df29a4864a4ee9035e Mon Sep 17 00:00:00 2001 From: goei <JsXLRu> Date: Wed, 29 Jul 2020 15:06:45 +0200 Subject: [PATCH] TMSS-272 Use station list from base schema --- .../task-observation-with-stations.json | 72 ++----------------- .../testdata/example_UC1_scheduling_unit.json | 7 +- 2 files changed, 5 insertions(+), 74 deletions(-) diff --git a/SAS/TMSS/src/tmss/tmssapp/schemas/task-observation-with-stations.json b/SAS/TMSS/src/tmss/tmssapp/schemas/task-observation-with-stations.json index e3ca16e53b8..70be1ec4c80 100644 --- a/SAS/TMSS/src/tmss/tmssapp/schemas/task-observation-with-stations.json +++ b/SAS/TMSS/src/tmss/tmssapp/schemas/task-observation-with-stations.json @@ -9,74 +9,10 @@ "default": ["CS001"], "oneOf": [ { - "type": "array", - "title": "Fixed list", - "additionalItems": false, - "additionalProperties": false, - "default": ["CS001"], - "items": { - "type": "string", - "enum": [ - "CS001", - "CS002", - "CS003", - "CS004", - "CS005", - "CS006", - "CS007", - "CS011", - "CS013", - "CS017", - "CS021", - "CS024", - "CS026", - "CS028", - "CS030", - "CS031", - "CS032", - "CS101", - "CS103", - "CS201", - "CS301", - "CS302", - "CS401", - "CS501", - "RS104", - "RS106", - "RS205", - "RS208", - "RS210", - "RS305", - "RS306", - "RS307", - "RS310", - "RS406", - "RS407", - "RS409", - "RS410", - "RS503", - "RS508", - "RS509", - "DE601", - "DE602", - "DE603", - "DE604", - "DE605", - "FR606", - "SE607", - "UK608", - "DE609", - "PL610", - "PL611", - "PL612", - "IE613", - "LV614" - ], - "title": "Station", - "description": "" - }, - "minItems": 1, - "uniqueItems": true + "fixed_stations": { + "$ref": "base.json#/definitions/def_stations", + "default": {} + } }, { "title": "Dynamic list", diff --git a/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json b/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json index 8468749d1a7..6d2191bba11 100644 --- a/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json +++ b/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json @@ -66,12 +66,7 @@ "antenna_set": "HBA_DUAL_INNER", "filter": "HBA_110_190" }, - "stations": [ - { - "group": "ALL", - "min_stations": 1 - } - ], + "stations": ["CS001","CS002","CS003"], "tile_beam": { "direction_type": "J2000", "angle1": 42, -- GitLab