From 11392995d103fe56439510a60cd2084f44492f2d Mon Sep 17 00:00:00 2001 From: Sarmilan Gunabala Date: Mon, 27 May 2024 13:59:00 +0200 Subject: [PATCH 1/9] Oppdaterer beskrivelse.yaml fra versjon 1.0 til 3.0 og oppretter en catalog-info.yaml --- .sikkerhet/beskrivelse.yaml | 7 +++++-- catalog-info.yaml | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 catalog-info.yaml diff --git a/.sikkerhet/beskrivelse.yaml b/.sikkerhet/beskrivelse.yaml index f2a2cd0..6bf7457 100644 --- a/.sikkerhet/beskrivelse.yaml +++ b/.sikkerhet/beskrivelse.yaml @@ -1,2 +1,5 @@ -version: 1.0 -organisasjon: Geodesi +version: 3.0 +organization: Geodesi +product: +repo_types: [InternalClient] +platforms: [OS_VM] diff --git a/catalog-info.yaml b/catalog-info.yaml new file mode 100644 index 0000000..456dbca --- /dev/null +++ b/catalog-info.yaml @@ -0,0 +1,37 @@ +# nonk8s +apiVersion: "backstage.io/v1alpha1" +kind: "Component" +metadata: + name: "where" + tags: + - "internal" +spec: + type: "website" + lifecycle: "production" + owner: "global_geodesi" +--- +apiVersion: "backstage.io/v1alpha1" +kind: "Group" +metadata: + name: "security_champion_where" + title: "Security Champion where" +spec: + type: "security_champion" + parent: "geodesi_security_champions" + members: + - "annsilje" + children: + - "resource:where" +--- +apiVersion: "backstage.io/v1alpha1" +kind: "Resource" +metadata: + name: "where" + links: + - url: "https://github.com/kartverket/where" + title: "where på GitHub" +spec: + type: "repo" + owner: "security_champion_where" + dependencyOf: + - "component:where" From 72c9999fc6fe1c1ba00fb8a06382dbd234ddc614 Mon Sep 17 00:00:00 2001 From: Sarmilan Gunabala Date: Tue, 8 Oct 2024 11:50:46 +0200 Subject: [PATCH 2/9] Update beskrivelse.yaml --- .sikkerhet/beskrivelse.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sikkerhet/beskrivelse.yaml b/.sikkerhet/beskrivelse.yaml index 6bf7457..808ffe6 100644 --- a/.sikkerhet/beskrivelse.yaml +++ b/.sikkerhet/beskrivelse.yaml @@ -1,5 +1,5 @@ version: 3.0 organization: Geodesi product: -repo_types: [InternalClient] +repo_types: [Tool] platforms: [OS_VM] From b2bb0ac5e6fe098bb836b81d249f753c16c07ca0 Mon Sep 17 00:00:00 2001 From: Sarmilan Gunabala Date: Tue, 8 Oct 2024 11:51:37 +0200 Subject: [PATCH 3/9] Update catalog-info.yaml --- catalog-info.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalog-info.yaml b/catalog-info.yaml index 456dbca..9cb76fa 100644 --- a/catalog-info.yaml +++ b/catalog-info.yaml @@ -4,9 +4,9 @@ kind: "Component" metadata: name: "where" tags: - - "internal" + - "private" spec: - type: "website" + type: "service" lifecycle: "production" owner: "global_geodesi" --- From dcad801bb94e7a1c503d8f550b96e0cc1d4070ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=A4hnn?= Date: Mon, 28 Oct 2024 17:15:37 +0100 Subject: [PATCH 4/9] added information of new Galileo satellites --- where/writers/_gnss.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/where/writers/_gnss.py b/where/writers/_gnss.py index 96def37..5ca815a 100644 --- a/where/writers/_gnss.py +++ b/where/writers/_gnss.py @@ -173,6 +173,10 @@ def get_grc_csv_row( "GSAT0222": "B07", "GSAT0223": "B03", "GSAT0224": "B15", + "GSAT0225": "C05", + "GSAT0226": "A02", + "GSAT0227": "C12", + "GSAT0232": "A17", } station_def = { From ba4da6be655e4cab0b1e9b4924e1f1bc5f7e3ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=A4hnn?= Date: Mon, 28 Oct 2024 17:16:50 +0100 Subject: [PATCH 5/9] new Galileo satellites added --- config/where_pipeline_sisre.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/where_pipeline_sisre.conf b/config/where_pipeline_sisre.conf index 9b15109..4322889 100755 --- a/config/where_pipeline_sisre.conf +++ b/config/where_pipeline_sisre.conf @@ -79,8 +79,8 @@ removers:help = Define removers used in the analysis. Followin satellites = G01 G02 G03 G04 G05 G06 G07 G08 G09 G10 G11 G12 G13 G14 G15 G16 G17 G18 G19 G20 G21 G22 G23 G24 G25 G26 G27 G28 G29 G30 G31 G32 - E01 E02 E03 E04 E05 E07 E08 E09 E10 E11 E13 E12 E14 E15 E18 E19 E20 E21 E22 E24 E25 - E26 E27 E30 E31 E33 E34 E36 + E01 E02 E03 E04 E05 E06 E07 E08 E09 E10 E11 E13 E12 E14 E15 E18 E19 E20 E21 E22 E24 + E25 E26 E27 E29 E30 E31 E33 E34 E36 #R01 R02 R03 R04 R05 R06 R07 R08 R09 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 #R22 R23 R24 #C01 C02 C03 C04 C05 C06 C07 C08 C09 C10 C11 C12 C13 C14 C15 C30 C31 C32 C33 C34 C35 From 7089ca64c61f4442e5aef09cebfc3b5b33a0b4f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=A4hnn?= Date: Mon, 28 Oct 2024 17:17:13 +0100 Subject: [PATCH 6/9] new Galileo satellites added --- config/where_pipeline_gnss_has_sp3.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/where_pipeline_gnss_has_sp3.conf b/config/where_pipeline_gnss_has_sp3.conf index 6578f32..0d9fbbc 100644 --- a/config/where_pipeline_gnss_has_sp3.conf +++ b/config/where_pipeline_gnss_has_sp3.conf @@ -73,8 +73,8 @@ satellite_origin:help = Choose satellite origin of SP3 files. This can eithe satellites = G01 G02 G03 G04 G05 G06 G07 G08 G09 G10 G11 G12 G13 G14 G15 G16 G17 G18 G19 G20 G21 G22 G23 G24 G25 G26 G27 G28 G29 G30 G31 G32 - E01 E02 E03 E04 E05 E07 E08 E09 E10 E11 E13 E12 E14 E15 E18 E19 E20 E21 E22 E24 E25 E26 - E27 E30 E31 E33 E34 E36 + E01 E02 E03 E04 E05 E06 E07 E08 E09 E10 E11 E13 E12 E14 E15 E18 E19 E20 E21 E22 E24 E25 + E26 E27 E29 E30 E31 E33 E34 E36 #R01 R02 R03 R04 R05 R06 R07 R08 R09 R10 R11 R12 R13 R14 R15 R16 R17 R18 R19 R20 R21 R22 #R23 R24 #C01 C02 C03 C04 C05 C06 C07 C08 C09 C10 C11 C12 C13 C14 C15 C30 C31 C32 C33 C34 C35 From 93b141aa821090140526f8a57adece0e7eded7f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=A4hnn?= Date: Mon, 28 Oct 2024 17:17:44 +0100 Subject: [PATCH 7/9] gnss_has profile added --- config/there.conf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/config/there.conf b/config/there.conf index 83054bd..b2f80ec 100644 --- a/config/there.conf +++ b/config/there.conf @@ -221,6 +221,22 @@ x_axis = time y_axis = residual +###################################################################### +# +# --profile=gnss_has +# +[analysis__gnss_has] +dataset_dropdowns = id, date, stage, label +filters = system, satellite +stages = read, edit, write +tooltip_fields = time, rundate, satellite, system, iod, gnssiod + +[analysis_initial__gnss_has] +color = satellite +stage = write +x_axis = time +y_axis = gnss_has + ###################################################################### # From 6853b91baa31c81ebf439a72d6b6686c9290cfd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=A4hnn?= Date: Wed, 27 Nov 2024 15:56:10 +0100 Subject: [PATCH 8/9] change of markersize of availability plots --- where/writers/gnss_has_report.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/where/writers/gnss_has_report.py b/where/writers/gnss_has_report.py index e576b94..40a8ba7 100644 --- a/where/writers/gnss_has_report.py +++ b/where/writers/gnss_has_report.py @@ -393,7 +393,7 @@ def _plot_has_clock_availability( options={ "figsize": (7, 8), "marker": "s", - "marksersize": 10, + "markersize": 1, "legend_ncol": 4, "legend_location": "bottom", "plot_to": "file", @@ -467,7 +467,7 @@ def _plot_has_orbit_availability( options={ "figsize": (7, 8), "marker": "s", - "marksersize": 10, + "markersize": 1, "legend_ncol": 4, "legend_location": "bottom", "plot_to": "file", From 8ddd1924c30f81bd0f8cd4d9dacfa03e49124e1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20D=C3=A4hnn?= Date: Wed, 27 Nov 2024 15:56:45 +0100 Subject: [PATCH 9/9] changed KPI CSV format --- where/writers/_gnss.py | 88 +++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/where/writers/_gnss.py b/where/writers/_gnss.py index 5ca815a..49f6716 100644 --- a/where/writers/_gnss.py +++ b/where/writers/_gnss.py @@ -79,18 +79,18 @@ def get_grc_csv_row( business_def = { "Galileo": { - "hpe": "FOM-OS-07 Horizontal Positioning Service Accuracy per Station over Month", - "site_vel_3d": "FOM-OS-11 3D Velocity Service Accuracy per Station over Month", - "sisre": "SDD-OS-09 SIS Ranging Accuracy at GA over All Satellites over Month", - "sisre_sat": "SDD-OS-10 SIS Ranging Accuracy at GA per Satellite over Month", - "vpe": "FOM-OS-08 Vertical Positioning Service Accuracy per Station over Month", + "hpe": "FOM-OS-07: Horizontal Positioning Service Accuracy per Station over Month", + "site_vel_3d": "FOM-OS-11: 3D Velocity Service Accuracy per Station over Month", + "sisre": "SDD-OS-09: SIS Ranging Accuracy at GA over All Satellites over Month", + "sisre_sat": "SDD-OS-10: SIS Ranging Accuracy at GA per Satellite over Month", + "vpe": "FOM-OS-08: Vertical Positioning Service Accuracy per Station over Month", }, "GPS": { - "hpe": "FOM-OS-07 Horizontal Positioning Service Accuracy per Station over Month", - "site_vel_3d": "FOM-OS-11 3D Velocity Service Accuracy per Station over Month", - "sisre": "SPS-OS-02 SIS Ranging Accuracy over All Satellites over Month", - "sisre_sat": "SPS-OS-03 SIS Ranging Accuracy per Satellite over Month", - "vpe": "FOM-OS-08 Vertical Positioning Service Accuracy per Station over Month", + "hpe": "FOM-OS-07; Horizontal Positioning Service Accuracy per Station over Month", + "site_vel_3d": "FOM-OS-11: 3D Velocity Service Accuracy per Station over Month", + "sisre": "SPS-OS-02: SIS Ranging Accuracy over All Satellites over Month", + "sisre_sat": "SPS-OS-03: SIS Ranging Accuracy per Satellite over Month", + "vpe": "FOM-OS-08: Vertical Positioning Service Accuracy per Station over Month", }, } @@ -112,39 +112,39 @@ def get_grc_csv_row( } slot_def = { - "SVN41": "B3", - "SVN43": "F6", - "SVN44": "B3", - "SVN45": "D3", - "SVN48": "A4", - "SVN50": "E3", - "SVN51": "E4", - "SVN52": "A2", - "SVN53": "C4", - "SVN55": "F2", - "SVN56": "B1", - "SVN57": "C1", - "SVN58": "B4", - "SVN59": "C5", - "SVN61": "D1", - "SVN62": "B2", - "SVN63": "D2", - "SVN64": "A3", - "SVN65": "A1", - "SVN66": "C2", - "SVN67": "D4", - "SVN68": "F3", - "SVN69": "E1", - "SVN70": "F1", - "SVN71": "B5", - "SVN72": "C3", - "SVN73": "E2", - "SVN74": "F4", - "SVN75": "D6", - "SVN76": "E5", - "SVN77": "B6", - "SVN78": "D5", - "SVN79": "A6", + "SVN41": "B03", + "SVN43": "F06", + "SVN44": "B03", + "SVN45": "D03", + "SVN48": "A04", + "SVN50": "E03", + "SVN51": "E04", + "SVN52": "A02", + "SVN53": "C04", + "SVN55": "F02", + "SVN56": "B01", + "SVN57": "C01", + "SVN58": "B04", + "SVN59": "C05", + "SVN61": "D01", + "SVN62": "B02", + "SVN63": "D02", + "SVN64": "A03", + "SVN65": "A01", + "SVN66": "C02", + "SVN67": "D04", + "SVN68": "F03", + "SVN69": "E01", + "SVN70": "F01", + "SVN71": "B05", + "SVN72": "C03", + "SVN73": "E02", + "SVN74": "F04", + "SVN75": "D06", + "SVN76": "E05", + "SVN77": "B06", + "SVN78": "D05", + "SVN79": "A06", "GSAT0101": "B05", "GSAT0102": "B06", "GSAT0103": "C04", @@ -247,7 +247,7 @@ def get_grc_csv_row( target_def[kpi], # Target unit_def[kpi], # Unit date, # Month/Year - f"{result:.5f}", # Result + f"{result:.3f}", # Result ]