feat(conform): pass building_name attribute through to output

Author: MiniCodeMonkey

openaddr/conform.py

@@ -46,7 +46,7 @@ def gdal_error_handler(err_class, err_num, err_msg):
 # We add columns to the extracted CSV with our own data with these names.
 GEOM_FIELDNAME = 'oa:geom'
 
-ADDRESSES_SCHEMA = [ 'hash', 'number', 'street', 'unit', 'city', 'district', 'region', 'postcode', 'id' ]
+ADDRESSES_SCHEMA = [ 'hash', 'number', 'street', 'unit', 'building_name', 'city', 'district', 'region', 'postcode', 'id' ]
 BUILDINGS_SCHEMA = [ 'hash']
 PARCELS_SCHEMA = [ 'hash', 'pid' ]
 RESERVED_SCHEMA = ADDRESSES_SCHEMA + BUILDINGS_SCHEMA + PARCELS_SCHEMA + [
@@ -1025,6 +1025,7 @@ def row_canonicalize_unit_and_number(sc, row):
     row["unit"] = (row.get("unit", '') or '').strip()
     row["number"] = (row.get("number", '') or '').strip()
     row["street"] = (row.get("street", '') or '').strip()
+    row["building_name"] = (row.get("building_name", '') or '').strip()
 
     if row.get("number", '').endswith('.0'):
         row["number"] = row["number"][:-2]

openaddr/tests/conform.py

@@ -57,6 +57,7 @@ def test_row_convert_to_out(self):
             "type": "Feature",
             "properties": {
                 "unit": "",
+                "building_name": "",
                 "number": "123",
                 "street": "MAPLE LN",
                 "city": "",
@@ -375,6 +376,7 @@ def test_transform_and_convert(self):
                 "region": "",
                 "district": "",
                 "postcode": "",
+                "building_name": "",
                 'hash': 'b3af08e447c7ed16',
                 "id": ""
             },
@@ -405,6 +407,7 @@ def test_transform_and_convert(self):
                 "region": "",
                 "district": "",
                 "postcode": "",
+                "building_name": "",
                 "id": "",
                 'hash': 'd4681f7e1d34e6ed'
             },
@@ -453,6 +456,7 @@ def test_transform_and_convert(self):
                 "district": "",
                 "postcode": "",
                 "id": "",
+                "building_name": "",
                 'hash': '591d7970b5753b0d'
             }
         }, r)
@@ -491,6 +495,7 @@ def test_transform_and_convert(self):
                 "district": "",
                 "postcode": "",
                 "id": "",
+                "building_name": "",
                 'hash': '7b1dc0b74cbc0162'
             }
         }, r)
@@ -510,6 +515,44 @@ def test_row_canonicalize_unit_and_number(self):
             r = row_canonicalize_unit_and_number({}, {"number": a, "street": "", "unit": ""})
             self.assertEqual(e, r["number"])
 
+    def test_row_canonicalize_building_name(self):
+        r = row_canonicalize_unit_and_number({}, {"number": "", "street": " OAK DR.", "unit": "", "building_name": " Rose Cottage "})
+        self.assertEqual("Rose Cottage", r["building_name"])
+
+        # Missing building_name canonicalizes to empty string
+        r = row_canonicalize_unit_and_number({}, {"number": "", "street": "OAK DR.", "unit": ""})
+        self.assertEqual("", r["building_name"])
+
+    def test_row_transform_and_convert_building_name(self):
+        "A BUILDING_NAME source column flows through to the output building_name attribute"
+        d = SourceConfig(dict({
+            "schema": 2,
+            "layers": {
+                "addresses": [{
+                    "name": "default",
+                    "conform": {
+                        "street": "STREET",
+                        "number": "NUMBER",
+                        "building_name": "BUILDING_NAME",
+                        "lon": "LON",
+                        "lat": "LAT"
+                    }
+                }]
+            }
+        }), "addresses", "default")
+
+        feat = row_transform_and_convert(d, {
+            "STREET": "HIGH STREET",
+            "NUMBER": "",
+            "BUILDING_NAME": "Rose Cottage",
+            "LON": "-1.25",
+            "LAT": "51.75"
+        })
+
+        self.assertEqual("Rose Cottage", feat["properties"]["building_name"])
+        self.assertEqual("", feat["properties"]["number"])
+        self.assertEqual("HIGH STREET", feat["properties"]["street"])
+
     def test_row_canonicalize_street_and_no_number(self):
         r = row_canonicalize_unit_and_number({}, {"number": None, "street": " OAK DR.", "unit": None})
         self.assertEqual("", r["number"])