Merge pull request #93 from iredpath/RLPNC-5319-support-unfielded-addresses

RLPNC-5319: update example, support unfielded addresses

Author: jkho

examples/address_similarity.py

@@ -18,7 +18,7 @@ def run(key, alt_url='https://api.rosette.com/rest/v1/'):
 
     params = AddressSimilarityParameters()
     params["address1"] = {"houseNumber": "1600", "road": "Pennsylvania Ave NW", "city": "Washington", "state": "DC", "postCode": "20500"}
-    params["address2"] = {"houseNumber": "160", "road": "Pennsilvana Avenue", "city": "Washington", "state": "D.C.", "postCode": "20500"}
+    params["address2"] = "160 Pennsilvana Avenue, Washington, D.C., 20500"
 
     try:
         return api.address_similarity(params)

rosette/api.py

@@ -250,9 +250,9 @@ class AddressSimilarityParameters(_DocumentParamSetBase):
     """Parameter object for C{address-similarity} endpoint.
     All are required.
 
-    C{address1} The address to be matched, a C{address} object.
+    C{address1} The address to be matched, a C{address} object or address string.
 
-    C{address2} The address to be matched, a C{address} object.
+    C{address2} The address to be matched, a C{address} object or address string.
 
     The C{address} object contains these optional fields:
       city, island, district, stateDistrict, state, countryRegion, country, worldRegion, postCode, poBox
@@ -455,7 +455,8 @@ def call(self, parameters):
         if not isinstance(parameters, _DocumentParamSetBase):
             if self.suburl != self.api.endpoints['NAME_SIMILARITY'] \
                and self.suburl != self.api.self.api.endpoints['NAME_TRANSLATION'] \
-               and self.suburl != self.api.self.api.endpoints['NAME_DEDUPLICATION']:
+               and self.suburl != self.api.self.api.endpoints['NAME_DEDUPLICATION'] \
+               and self.suburl != self.api.self.api.endpoints['ADDRESS_SIMILARITY']:
                 text = parameters
                 parameters = DocumentParameters()
                 parameters['content'] = text