Fix normal conditions

scripts/build_shapes.py

@@ -98,9 +98,9 @@ def filter_gadm(
             f"Contended areas have been found for gadm layer {layer}. They will be dropped according to {contended_flag} option"
         )
 
+        # NOTE: in these options GID_0 is not changed because it is modified below
         if contended_flag == "drop":
             geodf.drop(geodf_non_std.index, inplace=True)
-            geodf["GID_0"] = cc
         else:
             # this is the "set_by_country" option that is also the fallback for unexpected values
             if contended_flag != "set_by_country":
@@ -109,8 +109,8 @@ def filter_gadm(
                     + "Fallback to 'set_by_country'"
                 )
 
-            # in case GID_0 have any exotic values, "COUNTRY" column may be used instead
-            geodf["GID_0"] = cc
+    # force GID_0 to be the country code for the relevant countries
+    geodf["GID_0"] = cc
 
     # country shape should have a single geomerty
     if (layer == 0) and (geodf.shape[0] > 1):