Merge pull request #770 from nsidc/reorg-internet-required

Re-organize internet-required layers

qgreenland/config/cfg-lock.json

@@ -13020,6 +13020,39 @@
       },
       {
         "children": [
+          {
+            "children": [
+              {
+                "layer_cfg": {
+                  "description": "Map showing geological features of Greenland.\n\nPlease download the legend for information on interpretation\nof this layer:\nhttps://maps.greenmin.gl/geusmapmore/greenlandportal/G500_2023_LEGEND.pdf .",
+                  "id": "geus_geological_map",
+                  "in_package": true,
+                  "input": {
+                    "asset": {
+                      "id": "only"
+                    },
+                    "dataset": {
+                      "id": "geus_geological_map"
+                    }
+                  },
+                  "show": false,
+                  "steps": null,
+                  "style": null,
+                  "tags": [
+                    "online"
+                  ],
+                  "title": "Geological Map (1:500 000)"
+                },
+                "name": "geus_geological_map"
+              }
+            ],
+            "name": "Internet required",
+            "settings": {
+              "expand": false,
+              "order": null,
+              "show": false
+            }
+          },
           {
             "layer_cfg": {
               "description": "Location and magnitude of earthquakes.",
@@ -13415,6 +13448,7 @@
         "settings": {
           "expand": false,
           "order": [
+            "Internet required",
             ":earthquakes",
             ":tectonic_plate_boundaries",
             ":tectonic_plate_polygons",
@@ -27324,93 +27358,80 @@
               "title": "Satellite orthophoto mosaic (10-0.2m)"
             },
             "name": "sdfi_satellite_orthophotos"
-          },
-          {
-            "layer_cfg": {
-              "description": "The Greenland vector data is based on commercial satellite images\nwith a resolution of 0.5 m. The images are primarily from the summer\nmonths in the period from 2017 to 2021. Data is produced and quality\nassured according to ISO standards.\n\nVector data from East Greenland are not\nfinally approved, and you will therefore be able to see, for example, sharp\ndemarcations between different terrain forms. The data will be updated\ncontinuously, first half of 2023.\n\nGreenlandic place names:\nThe Language Secretariat (Oqaasileriffik) in Nuuk is the responsible authority\nfor place names. It is also the Language Secretariat that has been responsible\nfor the correct placement of the approx. 33,000 place names.  The\nSelf-Government at Landsplan is the responsible authority for place names for\ncities and residences.",
-              "id": "sdfi_topo_map",
-              "in_package": true,
-              "input": {
-                "asset": {
-                  "id": "only"
-                },
-                "dataset": {
-                  "id": "sdfi_topo_map"
-                }
-              },
-              "show": false,
-              "steps": null,
-              "style": null,
-              "tags": [
-                "online"
-              ],
-              "title": "Topographic map of Greenland"
-            },
-            "name": "sdfi_topo_map"
-          },
-          {
-            "layer_cfg": {
-              "description": "Map showing geological features of Greenland.\n\nPlease download the legend for information on interpretation\nof this layer:\nhttps://maps.greenmin.gl/geusmapmore/greenlandportal/G500_2023_LEGEND.pdf .",
-              "id": "geus_geological_map",
-              "in_package": true,
-              "input": {
-                "asset": {
-                  "id": "only"
-                },
-                "dataset": {
-                  "id": "geus_geological_map"
-                }
-              },
-              "show": false,
-              "steps": null,
-              "style": null,
-              "tags": [
-                "online"
-              ],
-              "title": "Geological Map (1:500 000)"
-            },
-            "name": "geus_geological_map"
-          },
-          {
-            "layer_cfg": {
-              "description": "Blue Marble (August 2004, Shaded Relief and Bathymetry).\n\nThe MODIS Blue Marble, Next Generation layer with Shaded Relief and\nBathymetry is a cloud free, true color composite of MODIS imagery from\nAugust 2004 including shaded relief and bathymetry in the water bodies.\n\nThe MODIS Blue Marble, Next Generation is a static product created with data\nfrom 2004 from the MODIS instrument on board the Terra satellite. The image\nresolution is 500 m. It can be viewed in Worldview/Global Imagery Browse\nServices (GIBS). Images for January \u2013 December 2004 can be downloaded from\nNASA\u2019s Visible Earth.\n\nReferences: NASA Earth Observatory - Blue Marble\n[https://earthobservatory.nasa.gov/features/BlueMarble]; NASA Earth\nObservations - Blue Marble\n[https://neo.gsfc.nasa.gov/view.php?datasetId=BlueMarbleNG-TB]; NASA\nEarth Observations - Blue Marble: Next Generation+Topography and\nBathymetry\n[https://neo.gsfc.nasa.gov/view.php?datasetId=BlueMarbleNG-TB].",
-              "id": "blue_marble_shaded_relief_bathymetry",
-              "in_package": true,
-              "input": {
-                "asset": {
-                  "id": "only"
-                },
-                "dataset": {
-                  "id": "gibs"
-                }
-              },
-              "show": false,
-              "steps": null,
-              "style": null,
-              "tags": [
-                "online"
-              ],
-              "title": "Blue Marble shaded relief and Bathymetry (500m)"
-            },
-            "name": "blue_marble_shaded_relief_bathymetry"
           }
         ],
-        "name": "Internet-required data",
+        "name": "Satellite imagery (Internet required)",
         "settings": {
           "expand": false,
           "order": [
             ":image_mosaic_2019",
             ":image_mosaic_2015",
-            ":sdfi_satellite_orthophotos",
-            ":sdfi_topo_map",
-            ":geus_geological_map",
-            ":blue_marble_shaded_relief_bathymetry"
+            ":sdfi_satellite_orthophotos"
           ],
           "show": false
         }
       },
       {
         "children": [
+          {
+            "children": [
+              {
+                "layer_cfg": {
+                  "description": "The Greenland vector data is based on commercial satellite images\nwith a resolution of 0.5 m. The images are primarily from the summer\nmonths in the period from 2017 to 2021. Data is produced and quality\nassured according to ISO standards.\n\nVector data from East Greenland are not\nfinally approved, and you will therefore be able to see, for example, sharp\ndemarcations between different terrain forms. The data will be updated\ncontinuously, first half of 2023.\n\nGreenlandic place names:\nThe Language Secretariat (Oqaasileriffik) in Nuuk is the responsible authority\nfor place names. It is also the Language Secretariat that has been responsible\nfor the correct placement of the approx. 33,000 place names.  The\nSelf-Government at Landsplan is the responsible authority for place names for\ncities and residences.",
+                  "id": "sdfi_topo_map",
+                  "in_package": true,
+                  "input": {
+                    "asset": {
+                      "id": "only"
+                    },
+                    "dataset": {
+                      "id": "sdfi_topo_map"
+                    }
+                  },
+                  "show": false,
+                  "steps": null,
+                  "style": null,
+                  "tags": [
+                    "online"
+                  ],
+                  "title": "Topographic map of Greenland"
+                },
+                "name": "sdfi_topo_map"
+              },
+              {
+                "layer_cfg": {
+                  "description": "Blue Marble (August 2004, Shaded Relief and Bathymetry).\n\nThe MODIS Blue Marble, Next Generation layer with Shaded Relief and\nBathymetry is a cloud free, true color composite of MODIS imagery from\nAugust 2004 including shaded relief and bathymetry in the water bodies.\n\nThe MODIS Blue Marble, Next Generation is a static product created with data\nfrom 2004 from the MODIS instrument on board the Terra satellite. The image\nresolution is 500 m. It can be viewed in Worldview/Global Imagery Browse\nServices (GIBS). Images for January \u2013 December 2004 can be downloaded from\nNASA\u2019s Visible Earth.\n\nReferences: NASA Earth Observatory - Blue Marble\n[https://earthobservatory.nasa.gov/features/BlueMarble]; NASA Earth\nObservations - Blue Marble\n[https://neo.gsfc.nasa.gov/view.php?datasetId=BlueMarbleNG-TB]; NASA\nEarth Observations - Blue Marble: Next Generation+Topography and\nBathymetry\n[https://neo.gsfc.nasa.gov/view.php?datasetId=BlueMarbleNG-TB].",
+                  "id": "blue_marble_shaded_relief_bathymetry",
+                  "in_package": true,
+                  "input": {
+                    "asset": {
+                      "id": "only"
+                    },
+                    "dataset": {
+                      "id": "gibs"
+                    }
+                  },
+                  "show": false,
+                  "steps": null,
+                  "style": null,
+                  "tags": [
+                    "online"
+                  ],
+                  "title": "Blue Marble shaded relief and bathymetry (500m)"
+                },
+                "name": "blue_marble_shaded_relief_bathymetry"
+              }
+            ],
+            "name": "Internet required",
+            "settings": {
+              "expand": false,
+              "order": [
+                ":sdfi_topo_map",
+                ":blue_marble_shaded_relief_bathymetry"
+              ],
+              "show": false
+            }
+          },
           {
             "layer_cfg": {
               "description": "Polygons representing the land.",
@@ -27681,6 +27702,7 @@
         "settings": {
           "expand": true,
           "order": [
+            "Internet required",
             ":land",
             ":ocean",
             ":background"
@@ -27707,7 +27729,7 @@
         "Oceanography",
         "Future projections",
         "Terrain models",
-        "Internet-required data",
+        "Satellite imagery (Internet required)",
         "Basemaps"
       ]
     }

qgreenland/config/layers/Basemaps/Internet required/__settings__.py

@@ -0,0 +1,8 @@
+from qgreenland.models.config.layer_group import LayerGroupSettings, LayerIdentifier
+
+settings = LayerGroupSettings(
+    order=[
+        LayerIdentifier("sdfi_topo_map"),
+        LayerIdentifier("blue_marble_shaded_relief_bathymetry"),
+    ],
+)

qgreenland/config/layers/Basemaps/Internet required/online.py

@@ -0,0 +1,64 @@
+from qgreenland.config.datasets.online import (
+    gibs,
+    sdfi_topo_map,
+)
+from qgreenland.models.config.layer import Layer, LayerInput
+
+sdfi_topo_map_layer = Layer(
+    id="sdfi_topo_map",
+    title="Topographic map of Greenland",
+    description=(
+        """The Greenland vector data is based on commercial satellite images
+            with a resolution of 0.5 m. The images are primarily from the summer
+            months in the period from 2017 to 2021. Data is produced and quality
+            assured according to ISO standards.
+
+            Vector data from East Greenland are not
+            finally approved, and you will therefore be able to see, for example, sharp
+            demarcations between different terrain forms. The data will be updated
+            continuously, first half of 2023.
+
+            Greenlandic place names:
+            The Language Secretariat (Oqaasileriffik) in Nuuk is the responsible authority
+            for place names. It is also the Language Secretariat that has been responsible
+            for the correct placement of the approx. 33,000 place names.  The
+            Self-Government at Landsplan is the responsible authority for place names for
+            cities and residences."""
+    ),
+    tags=["online"],
+    input=LayerInput(
+        dataset=sdfi_topo_map,
+        asset=sdfi_topo_map.assets["only"],
+    ),
+)
+
+blue_marble_layer = Layer(
+    id="blue_marble_shaded_relief_bathymetry",
+    title="Blue Marble shaded relief and bathymetry (500m)",
+    description=(
+        """Blue Marble (August 2004, Shaded Relief and Bathymetry).
+
+        The MODIS Blue Marble, Next Generation layer with Shaded Relief and
+        Bathymetry is a cloud free, true color composite of MODIS imagery from
+        August 2004 including shaded relief and bathymetry in the water bodies.
+
+        The MODIS Blue Marble, Next Generation is a static product created with data
+        from 2004 from the MODIS instrument on board the Terra satellite. The image
+        resolution is 500 m. It can be viewed in Worldview/Global Imagery Browse
+        Services (GIBS). Images for January – December 2004 can be downloaded from
+        NASA’s Visible Earth.
+
+        References: NASA Earth Observatory - Blue Marble
+        [https://earthobservatory.nasa.gov/features/BlueMarble]; NASA Earth
+        Observations - Blue Marble
+        [https://neo.gsfc.nasa.gov/view.php?datasetId=BlueMarbleNG-TB]; NASA
+        Earth Observations - Blue Marble: Next Generation+Topography and
+        Bathymetry
+        [https://neo.gsfc.nasa.gov/view.php?datasetId=BlueMarbleNG-TB]."""
+    ),
+    tags=["online"],
+    input=LayerInput(
+        dataset=gibs,
+        asset=gibs.assets["only"],
+    ),
+)

qgreenland/config/layers/Basemaps/__settings__.py

@@ -1,7 +1,12 @@
-from qgreenland.models.config.layer_group import LayerGroupSettings, LayerIdentifier
+from qgreenland.models.config.layer_group import (
+    LayerGroupIdentifier,
+    LayerGroupSettings,
+    LayerIdentifier,
+)
 
 settings = LayerGroupSettings(
     order=[
+        LayerGroupIdentifier("Internet required"),
         LayerIdentifier("land"),
         LayerIdentifier("ocean"),
         LayerIdentifier("background"),

qgreenland/config/layers/Geology/Internet required/online.py

@@ -0,0 +1,20 @@
+from qgreenland.config.datasets.online import geus_geological_map
+from qgreenland.models.config.layer import Layer, LayerInput
+
+geus_geological_map_layer = Layer(
+    id="geus_geological_map",
+    title="Geological Map (1:500 000)",
+    description=(
+        """Map showing geological features of Greenland.
+
+        Please download the legend for information on interpretation
+        of this layer:
+        https://maps.greenmin.gl/geusmapmore/greenlandportal/G500_2023_LEGEND.pdf .
+        """
+    ),
+    tags=["online"],
+    input=LayerInput(
+        dataset=geus_geological_map,
+        asset=geus_geological_map.assets["only"],
+    ),
+)

qgreenland/config/layers/Geology/__settings__.py

@@ -6,6 +6,7 @@
 
 settings = LayerGroupSettings(
     order=[
+        LayerGroupIdentifier("Internet required"),
         LayerIdentifier("earthquakes"),
         LayerIdentifier("tectonic_plate_boundaries"),
         LayerIdentifier("tectonic_plate_polygons"),