From d3fd51d33291e5bc5698b636462e238d0c39eccf Mon Sep 17 00:00:00 2001
From: Paul Fenwick <pjf@perltraining.com.au>
Date: Mon, 27 Mar 2017 22:47:21 +1100
Subject: [PATCH] [TAAS-18] countries.json += hrinfo_id, admin_level, geo;
 label tweak
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For our `countries.json` output:

- Added `hrinfo_id`
- Added `admin_level`
- Added `geolocation` (lat/lon)
- Tweaked `label.hrinfo` → `label.humanitarianresponse`

These were based upon the feedback in PR #14
---
 taas/config.yml | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/taas/config.yml b/taas/config.yml
index c7284c0..52f2df5 100644
--- a/taas/config.yml
+++ b/taas/config.yml
@@ -62,6 +62,15 @@ sources:
                     field: ISO 3166-2:2013 Alpha 2-Codes
                     optional: True
 
+                # The old HRinfo ID, in case people want to match.
+                hrinfo_id: 
+                    field: HRinfo ID
+                    optional: True
+
+                admin_level:
+                    field: Admin Level
+                    optional: True
+
                 # We have historical ISO-3166 data, but it does not appear in
                 # the original API, has only a single location in our
                 # spreadsheet which has a code. Since we're going for a minimum
@@ -79,7 +88,7 @@ sources:
                 # it very clear that these are all variations of the same name.
                 label.default: Preferred Term
 
-                label.hrinfo:
+                label.humanitarianresponse:
                     field:
                         - HRinfo Alt Term
                         - Preferred Term
@@ -101,6 +110,12 @@ sources:
                         - m49 Alt Term
                         - Preferred Term
 
-                # Our locations intentionally no longer include Lat/Long.
-                # Because this is allegedly a list of countries, we do not
-                # include admin level either.
+                # Lat/Long are a map, these keep backwards compatibility
+                # with our old API.
+                geolocation.lat:
+                    field: Latitude
+                    optional: True
+
+                geolocation.lon:
+                    field: Longitude
+                    optional: True