From 9cccaec4edc32d3b2404cf10101ce72db3ddb167 Mon Sep 17 00:00:00 2001
From: Shahram Najm <masn@ecmwf.int>
Date: Tue, 13 Jun 2023 20:52:59 +0100
Subject: [PATCH] ECC-1611: C API: Add function to determine if a BUFR key is a
 coordinate descriptor

---
 src/grib_accessor_class_bufr_data_array.cc | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/grib_accessor_class_bufr_data_array.cc b/src/grib_accessor_class_bufr_data_array.cc
index ef70c92a2..6e4189168 100644
--- a/src/grib_accessor_class_bufr_data_array.cc
+++ b/src/grib_accessor_class_bufr_data_array.cc
@@ -1961,7 +1961,8 @@ static int adding_extra_key_attributes(grib_handle* h)
 }
 
 static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, grib_accessor* attribute, grib_section* section,
-                                                      long ide, long subset, int add_dump_flag, int count, int add_extra_attributes)
+                                                      long ide, long subset, int add_dump_flag, int add_coord_flag,
+                                                      int count, int add_extra_attributes)
 {
     grib_accessor_bufr_data_array* self = (grib_accessor_bufr_data_array*)a;
     char code[10]               = {0,};
@@ -1989,6 +1990,10 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
         creator.flags = GRIB_ACCESSOR_FLAG_DUMP;
         operatorCreator.flags |= GRIB_ACCESSOR_FLAG_DUMP;
     }
+    if (add_coord_flag) {
+        creator.flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD;
+        operatorCreator.flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD;
+    }
 
     idx = self->compressedData ? self->elementsDescriptorsIndex->v[0]->v[ide] : self->elementsDescriptorsIndex->v[subset]->v[ide];
 
@@ -1996,6 +2001,7 @@ static grib_accessor* create_accessor_from_descriptor(const grib_accessor* a, gr
         case 0:
         case 1:
             creator.name = grib_context_strdup(a->context, self->expanded->v[idx]->shortName);
+
             /* ECC-325: store alloc'd string (due to strdup) for clean up later */
             grib_sarray_push(a->context, self->tempStrings, creator.name);
             elementAccessor = grib_accessor_factory(section, &creator, 0, NULL);
@@ -2466,7 +2472,7 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
     grib_accessor* elementFromBitmap        = NULL;
     grib_handle* hand = grib_handle_of_accessor(a);
     /*int reuseBitmap=0;*/
-    int add_dump_flag = 1, count = 0;
+    int add_dump_flag = 1, add_coord_flag = 0, count = 0;
     /*int forceGroupClosure=0;*/
 
     creatorGroup.op         = (char*)"bufr_group";
@@ -2533,11 +2539,13 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                 continue; /* Descriptor does not have an associated key e.g. inside op 203YYY */
             }
             elementFromBitmap = NULL;
+            add_coord_flag = 0;
             if (descriptor->F == 0 && IS_COORDINATE_DESCRIPTOR(descriptor->X) &&
                 self->unpackMode == CODES_BUFR_UNPACK_STRUCTURE) {
                 const int sidx = descriptor->Y + significanceQualifierIndexArray[descriptor->X] * NUMBER_OF_QUALIFIERS_PER_CATEGORY;
                 DebugAssert(sidx > 0);
                 groupNumber++;
+                add_coord_flag = 1;
 
                 if (significanceQualifierGroup[sidx]) {
                     groupSection = significanceQualifierGroup[sidx]->parent;
@@ -2563,7 +2571,6 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                 gaGroup->sub_section       = grib_section_create(hand, gaGroup);
                 gaGroup->bufr_group_number = groupNumber;
 
-                //gaGroup->flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD; //??
                 accessor_constant_set_type(gaGroup, GRIB_TYPE_LONG);
                 accessor_constant_set_dval(gaGroup, groupNumber);
                 grib_push_accessor(gaGroup, groupSection->block);
@@ -2677,7 +2684,8 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                 grib_accessors_list_push(self->dataAccessors, asn, rank);
             }
             count++;
-            elementAccessor = create_accessor_from_descriptor(a, associatedFieldAccessor, section, ide, iss, add_dump_flag, count, add_extra_attributes);
+            elementAccessor = create_accessor_from_descriptor(a, associatedFieldAccessor, section, ide, iss,
+                                                              add_dump_flag, add_coord_flag, count, add_extra_attributes);
             if (!elementAccessor) {
                 err = GRIB_DECODING_ERROR;
                 return err;
@@ -2736,9 +2744,6 @@ static int create_keys(const grib_accessor* a, long onlySubset, long startSubset
                             }
                         }
                         if (add_key) {
-                            if (descriptor->F == 0 && IS_COORDINATE_DESCRIPTOR(descriptor->X)) { //??
-                                elementAccessor->flags |= GRIB_ACCESSOR_FLAG_BUFR_COORD;
-                            }
                             grib_push_accessor(elementAccessor, section->block);
                             rank = grib_data_accessors_trie_push(self->dataAccessorsTrie, elementAccessor);
                             grib_accessors_list_push(self->dataAccessors, elementAccessor, rank);