Merge branch 'master' of https://github.com/kartverket/where

kartverket · Dec 11, 2024 · 2ceb1cf · 2ceb1cf
2 parents 618d470 + 8ddd192
commit 2ceb1cf
Show file tree

Hide file tree

Showing 7 changed files with 112 additions and 52 deletions.
diff --git 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: [Tool]
+platforms: [OS_VM]
diff --git a/catalog-info.yaml b/catalog-info.yaml
@@ -0,0 +1,37 @@
+# nonk8s
+apiVersion: "backstage.io/v1alpha1"
+kind: "Component"
+metadata:
+  name: "where"
+  tags:
+  - "private"
+spec:
+  type: "service"
+  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"
diff --git 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
+
 
 ######################################################################
 #

diff --git 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

diff --git 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

diff --git 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",
@@ -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 = {
@@ -243,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
     ]
 
 
diff --git 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",