Merge pull request #84 from openaddresses/handle-integer-fields-in-esri

Handle accuracy as an integer when building fields to download in Esri

Author: iandees

openaddr/cache.py

@@ -360,8 +360,13 @@ def field_names_to_request(cls, source_config):
                 elif isinstance(v, list):
                     # It's a list of field names
                     fields |= set(v)
-                else:
+                elif isinstance(v, str):
+                    # It's a direct field name mapping
                     fields.add(v)
+                # Note: We intentionally skip non-string scalar values (e.g., integers) because
+                # Esri only supports string field names. Also, the 'accuracy' field can be
+                # set to an integer constant (like 1) to indicate a fixed accuracy level,
+                # rather than a field name to fetch from the source.
 
         if fields:
             # Remove any blank or None values

openaddr/tests/cache.py

@@ -347,6 +347,24 @@ def test_field_names_to_request(self):
         fields11 = EsriRestDownloadTask.field_names_to_request(conform11)
         self.assertEqual(fields11, ['Number', 'StateColumn', 'Street'])
 
+        # Test that integer accuracy values are skipped (not treated as field names)
+        # The 'accuracy' field can be an integer constant indicating a fixed accuracy level
+        conform12 = SourceConfig(dict({
+            "schema": 2,
+            "layers": {
+                "addresses": [{
+                    "name": "default",
+                    "conform": {
+                        "street": "StreetName",
+                        "number": "HouseNumber",
+                        "accuracy": 1,
+                    }
+                }]
+            }
+        }), "addresses", "default")
+        fields12 = EsriRestDownloadTask.field_names_to_request(conform12)
+        self.assertEqual(fields12, ['HouseNumber', 'StreetName'])
+
     def test_handle_feature_server_with_lat_lon_in_conform(self):
         '''
         '''