From 4f128579d6f79d73af48888c913e910e6feacc1c Mon Sep 17 00:00:00 2001
From: Al <albarrentine@gmail.com>
Date: Fri, 17 Feb 2017 14:07:00 -0500
Subject: [PATCH] [openaddresses] adding Commerce City, CO and creating an
 alias for the simple unit regex for reuse

---
 resources/parser/data_sets/openaddresses.yaml | 37 +++++++++----------
 1 file changed, 17 insertions(+), 20 deletions(-)

diff --git a/resources/parser/data_sets/openaddresses.yaml b/resources/parser/data_sets/openaddresses.yaml
index 4d5f16f5..d80212b7 100644
--- a/resources/parser/data_sets/openaddresses.yaml
+++ b/resources/parser/data_sets/openaddresses.yaml
@@ -52,6 +52,8 @@ global:
         UNIT:
             component: unit
 
+    simple_unit_regex: &simple_unit_regex
+        - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
 
     # Turned off by default to avoid performance penalty for reverse geocoding
     add_osm_boundaries: false
@@ -1767,8 +1769,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                       add_osm_boundaries: true
                       city_replacements:
                           city: Scotsdale
@@ -1948,6 +1949,11 @@ countries:
                     - filename: city_of_arvada.csv
                     - filename: city_of_aurora.csv
                     - filename: city_of_boulder.csv
+                    - filename: city_of_commerce_city.csv
+                      fields: *fields_with_unit
+                      non_numeric_units: true
+                      ignore_fields_containing:
+                          unit: *simple_unit_regex
                     - filename: city_of_erie.csv
                     - filename: city_of_fort_collins.csv
                       add_osm_boundaries: true
@@ -2756,8 +2762,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                       add_osm_boundaries: true
                       city_replacements:
                           state_district: Campbell County
@@ -3038,8 +3043,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                     - filename: st_charles.csv
                       city_replacements:
                           state_district: Saint Charles County
@@ -3443,8 +3447,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                     - filename: broome.csv
                     - filename: city_of_new_york.csv
                       add_osm_boundaries: true
@@ -3608,8 +3611,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                     - filename: city_of_salem.csv
                     - filename: crook.csv
                     - filename: deschutes.csv
@@ -3653,8 +3655,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                     - filename: allegheny.csv
                     - filename: armstrong.csv
                     - filename: bedford.csv
@@ -3677,8 +3678,7 @@ countries:
                       add_osm_boundaries: true
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                       city_replacements:
                           state_district: Chester County
                     - filename: clearfield.csv
@@ -3735,8 +3735,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                       add_osm_boundaries: true
                       city_replacements:
                           state_district: York County
@@ -4139,8 +4138,7 @@ countries:
                       fields: *fields_with_unit
                       non_numeric_units: true
                       ignore_fields_containing:
-                          unit:
-                              - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                          unit: *simple_unit_regex
                     - filename: walla_walla.csv
 
             wi:
@@ -4282,8 +4280,7 @@ countries:
                     add_osm_boundaries: true
                     fields: *fields_with_unit
                     ignore_fields_containing:
-                        unit:
-                            - "^(?:[A-Z]?[0-9]*|[0-9]*[A-Z]?)$"
+                        unit: *simple_unit_regex
                     city_replacements:
                         state_district: Teton County