Update UN scripts for WHO places (#995)

* update UN scripts for WHO places

* fix

* fix

* fix

scripts/un/sdg/geography.py

@@ -208,27 +208,26 @@ def write_un_places(input_geos, output, sdg2type, un2sdg, un2dc_curated):
     '''
     un2dc_generated = {}
     new_subjects = []
-    with open(input_geos, encoding='utf-8') as f_in:
+    with open(input_geos, encoding='utf-8-sig') as f_in:
         with open(output, 'w', encoding='utf-8') as f_out:
             reader = csv.DictReader(f_in)
             for row in reader:
-                subject = row['subject_id']
+                subject = UN_PREFIX + ':' + row['undata_geo_id']
                 if subject in un2dc_curated:
                     dcid = un2dc_curated[subject].dcid
                     type = un2dc_curated[subject].type
                     name = un2dc_curated[subject].name
                 else:
-                    dcid = row['subject_id'].replace(':', '/')
-                    if row['subject_id'] in un2sdg and un2sdg[
-                            row['subject_id']] in sdg2type:
-                        sdg_type = sdg2type[un2sdg[row['subject_id']]]
+                    dcid = subject.replace(':', '/')
+                    if subject in un2sdg and un2sdg[subject] in sdg2type:
+                        sdg_type = sdg2type[un2sdg[subject]]
                         if sdg_type == SAMPLING_STATION or sdg_type == CITY:
                             type = sdg_type
                         else:
                             type = GEO_REGION
                     else:
                         type = GEO_REGION
-                    name = row['subject_label'].split('_')[-1]
+                    name = row['undata_geo_desc'].split('_')[-1]
                     un2dc_generated[subject] = Node(dcid, type, name)
 
                 # Add non-UN-specific places to new_subjects.
@@ -241,8 +240,8 @@ def write_un_places(input_geos, output, sdg2type, un2sdg, un2dc_curated):
                         'dcid': dcid,
                         'type': type,
                         'name': name,
-                        'code': row['subject_id'],
-                        'label': row['subject_label']
+                        'code': subject,
+                        'label': row['undata_geo_desc']
                     }))
     return un2dc_generated, new_subjects
 
@@ -355,7 +354,7 @@ def write_place_mappings(output, sdg2un, un2dc_curated, un2dc_generated):
     un2dc_curated = get_un2dc_curated(os.path.join(FOLDER, 'places.csv'))
 
     un2dc_generated, new_subjects = write_un_places(
-        os.path.join(FOLDER, 'geographies.csv'),
+        'sssom-mappings/data/enumerations/undata/geography.csv',
         os.path.join(FOLDER, 'un_places.mcf'), sdg2type, un2sdg, un2dc_curated)
     containment = process_containment(
         'sssom-mappings/data/enumerations/undata/geography_hierarchy.csv',

scripts/un/sdg/geography_test.py

@@ -102,7 +102,7 @@ def test_write_un_places(self):
         with tempfile.TemporaryDirectory() as tmp_dir:
             output = os.path.join(tmp_dir, 'un_places.mcf')
             un2dc_generated, new_subjects = geography.write_un_places(
-                os.path.join(FOLDER, 'test_geographies.csv'), output, SDG2TYPE,
+                os.path.join(FOLDER, 'test_geography.csv'), output, SDG2TYPE,
                 UN2SDG, UN2DC_CURATED)
             with open(output) as result:
                 with open(os.path.join(FOLDER,

scripts/un/sdg/testdata/test_geography/test_geography.csv

@@ -0,0 +1,3 @@
+undata_geo_id,undata_geo_desc
+G00000020,Afghanistan
+G00000030,Ajman