Fix bad git mess

Author: davidhassell

cf/aggregate.py

@@ -210,7 +210,6 @@ class _Meta:
         (
             "Type",
             "Identity",
-            "featureType",
             "Units",
             "Cell_methods",
             "Data",
@@ -390,8 +389,6 @@ def __init__(
         if field_identity:
             self.identity = f.get_property(field_identity, None)
 
-        self.featureType = f.get_property('featureType', None)
-            
         construct_axes = f.constructs.data_axes()
 
         # ------------------------------------------------------------
@@ -505,7 +502,6 @@ def __init__(
                         "identity": dim_identity,
                         "key": dim_coord_key,
                         "units": units,
-                        "cf_role": None,
                         "hasdata": dim_coord.has_data(),
                         "hasbounds": hasbounds,
                         "coordrefs": self.find_coordrefs(axis),
@@ -543,14 +539,11 @@ def __init__(
                     aux_coord, aux_identity, relaxed_units=relaxed_units
                 )
 
-                cf_role = self.featureType and aux_coord.get_property("cf_role", None)
-
                 info_aux.append(
                     {
                         "identity": aux_identity,
                         "key": key,
                         "units": units,
-                        "cf_role": cf_role,
                         "hasdata": aux_coord.has_data(),
                         "hasbounds": aux_coord.has_bounds(),
                         "coordrefs": self.find_coordrefs(key),
@@ -599,7 +592,6 @@ def __init__(
                 "ids": "identity",
                 "keys": "key",
                 "units": "units",
-                "cf_role": "cf_role",
                 "hasdata": "hasdata",
                 "hasbounds": "hasbounds",
                 "coordrefs": "coordrefs",
@@ -1568,9 +1560,6 @@ def coord_has_identity_and_data(self, coord, axes=None):
             default=None,
         )
 
-        if self.featureType and coord.get_property('cf_role', None):
-            print(11111, repr(coord))
-
         if identity is not None:
             all_coord_identities = self.all_coord_identities.setdefault(
                 axes, set()
@@ -1784,9 +1773,6 @@ def structural_signature(self):
         Cell_methods = self.cell_methods
         Data = self.has_field_data
 
-        # FeatureType
-        featureType = self.featureType
-        
         # Properties
         Properties = self.properties
 
@@ -1826,7 +1812,6 @@ def structural_signature(self):
                         ]
                     ),
                 ),
-                ("cf_role", axis[identity]["cf_role"]),
                 ("hasdata", axis[identity]["hasdata"]),
                 ("hasbounds", axis[identity]["hasbounds"]),
                 ("coordrefs", axis[identity]["coordrefs"]),
@@ -1933,7 +1918,6 @@ def structural_signature(self):
         self.signature = self._structural_signature(
             Type=Type,
             Identity=Identity,
-            featureType=featureType,
             Units=Units,
             Cell_methods=Cell_methods,
             Data=Data,
@@ -4148,9 +4132,6 @@ def _hash_values(m):
 
         hash0 = hash1
 
-        if m0.featureType and not count:
-            print(9999999999999)
-        
         if count == 1:
             # --------------------------------------------------------
             # Exactly one axis has different 1-d coordinate values
@@ -4252,24 +4233,10 @@ def _hash_values(m):
             # aggregate anything in this entire group.
             # --------------------------------------------------------
             if info:
-                coord_ids = []
-                for k, v in m0.axis.items():
-                    coord_ids.extend([repr(i) for i in v['ids']])
-                
-                if len(coord_ids) > 1:
-                    coord_ids =  (
-                        f"{', '.join(coord_ids[:-1])} and {coord_ids[-1]}"
-                    )
-                elif coord_ids:
-                    coord_ids =  coord_ids[0]
-                else:
-                    coord_ids = ""
-                                            
                 meta[
                     0
                 ].message = (
-                    f"Some fields have identical sets of 1-d {coord_ids} "
-                    "coordinates."
+                    "Some fields have identical sets of 1-d coordinates."
                 )
 
             return ()