TGIS: number_of_bands -> number_of_semantic_labels (#2011)

lib/temporal/SQL/strds_metadata_table.sql

@@ -18,7 +18,7 @@ CREATE TABLE  strds_metadata (
   ewres_min DOUBLE PRECISION,   -- The lowest east-west resolution of the registered raster maps
   ewres_max DOUBLE PRECISION,   -- The highest east-west resolution of the registered raster maps
   aggregation_type VARCHAR,     -- The aggregation type of the dataset (mean, min, max, ...) set by aggregation modules
-  number_of_bands INTEGER,       -- The number of registered bands
+  number_of_semantic_labels INTEGER,       -- The number of registered semantic labels
   title VARCHAR,                -- Title of the space-time raster dataset
   description VARCHAR,          -- Detailed description of the space-time raster dataset
   command VARCHAR,              -- The command that was used to create the space time raster dataset

lib/temporal/SQL/update_strds_metadata_template_v3.sql

@@ -7,8 +7,8 @@
 -- SPACETIME_REGISTER_TABLE is a placeholder for specific stds map register table name (SQL compliant)
 -- SPACETIME_ID is a placeholder for specific stds id: name@mapset
 
-UPDATE strds_metadata SET number_of_bands =
+-- Update the number of registered semantic labels
+UPDATE strds_metadata SET number_of_semantic_labels =
        (SELECT count(distinct semantic_label) FROM raster_metadata WHERE
        raster_metadata.id IN
                (SELECT id FROM SPACETIME_REGISTER_TABLE)

lib/temporal/SQL/upgrade_db_2_to_3.sql

@@ -10,7 +10,7 @@ ALTER TABLE raster_metadata
 
 -- strds_metadata_table.sql
 ALTER TABLE strds_metadata
- ADD COLUMN number_of_bands INTEGER;
+ ADD COLUMN number_of_semantic_labels INTEGER;
 
 -- tgis_metadata
 UPDATE tgis_metadata

python/grass/temporal/metadata.py

@@ -1343,7 +1343,8 @@ class STRDSMetadata(STDSRasterMetadataBase):
          | Maximum value min:.......... None
          | Maximum value max:.......... None
          | Aggregation type:........... None
-         | Number of registered bands:. None
+         | Number of semantic labels:.. None
+         | Semantic labels:............ None
          | Number of registered maps:.. None
          |
          | Title:
@@ -1362,7 +1363,8 @@ class STRDSMetadata(STDSRasterMetadataBase):
         max_min=None
         max_max=None
         aggregation_type=None
-        number_of_bands=None
+        number_of_semantic_labels=None
+        semantic_labels=None
         number_of_maps=None
 
     """
@@ -1374,7 +1376,7 @@ class STRDSMetadata(STDSRasterMetadataBase):
         )
 
         if get_tgis_db_version_from_metadata() > 2:
-            self.D["number_of_bands"] = None
+            self.D["number_of_semantic_labels"] = None
 
         self.set_raster_register(raster_register)
 
@@ -1390,18 +1392,18 @@ class STRDSMetadata(STDSRasterMetadataBase):
         else:
             return None
 
-    def get_number_of_bands(self):
-        """Get the number of registered bands
+    def get_number_of_semantic_labels(self):
+        """Get the number of registered semantic labels
         :return: None if not found
         """
-        if "number_of_bands" in self.D:
-            return self.D["number_of_bands"]
+        if "number_of_semantic_labels" in self.D:
+            return self.D["number_of_semantic_labels"]
         else:
             return None
 
-    def get_band_names(self):
-        """Get the distinct names of registered bands
-           The distinct band names are not stored in the metadata table
+    def get_semantic_labels(self):
+        """Get the distinct semantic lables of registered maps
+           The distinct semantic labels are not stored in the metadata table
            and fetched on-the-fly
         :return: None if not found
         """
@@ -1441,8 +1443,8 @@ class STRDSMetadata(STDSRasterMetadataBase):
             return None
 
     raster_register = property(fget=get_raster_register, fset=set_raster_register)
-    number_of_bands = property(fget=get_number_of_bands)
-    band_names = property(fget=get_band_names)
+    number_of_semantic_labels = property(fget=get_number_of_semantic_labels)
+    semantic_labels = property(fget=get_semantic_labels)
 
     def _print_info_body(self, shell=False):
         """Print information about this class (body part).
@@ -1455,11 +1457,16 @@ class STRDSMetadata(STDSRasterMetadataBase):
             print(" | Raster register table:...... " + str(self.get_raster_register()))
         super()._print_info_body(shell)
         if shell:
-            print("number_of_bands=" + str(self.get_number_of_bands()))
-            print("band_names=" + str(self.get_band_names()))
+            print(
+                "number_of_semantic_labels=" + str(self.get_number_of_semantic_labels())
+            )
+            print("semantic_labels=" + str(self.get_semantic_labels()))
         else:
-            print(" | Number of registered bands:. " + str(self.get_number_of_bands()))
-            print(" | Band names:................. " + str(self.get_band_names()))
+            print(
+                " | Number of semantic labels:.. "
+                + str(self.get_number_of_semantic_labels())
+            )
+            print(" | Semantic labels:............ " + str(self.get_semantic_labels()))
 
 
 ###############################################################################