Follow housenumber refactoring in addok

cf addok/addok#319

Author: yohanboniface

Diff for: README.md

@@ -25,10 +25,9 @@
         …,
     ]
 
-- Replace default `match_housenumber` and `make_labels` by France dedicated ones:
+- Replace default `make_labels` by France dedicated one:
 
     SEARCH_RESULT_PROCESSORS_PYPATHS = [
-        'addok_france.match_housenumber',
         'addok_france.make_labels',
         …,
     ]

Diff for: addok_france/__init__.py

@@ -17,4 +17,3 @@
 flag_housenumber = utils.flag_housenumber
 make_labels = utils.make_labels
 remove_leading_zeros = yielder(utils.remove_leading_zeros)
-match_housenumber = utils.match_housenumber

Diff for: addok_france/utils.py

@@ -104,10 +104,13 @@ def glue_ordinal(tokens):
 
 
 def flag_housenumber(tokens):
+    # Only keep first match (avoid noise in the middle of the search query).
+    found = False
     for previous, token, next_ in neighborhood(tokens):
         if ((token.is_first or (next_ and TYPES_PATTERN.match(next_)))
-                and NUMBER_PATTERN.match(token)):
+                and NUMBER_PATTERN.match(token) and not found):
             token.kind = 'housenumber'
+            found = True
         yield token
 
 
@@ -160,23 +163,3 @@ def add(labels, label):
                 label = '{} {}'.format(label, city)
                 add(labels, label)
         result.labels.extend(labels)
-
-
-def match_housenumber(helper, result):
-    if not helper.check_housenumber:
-        return
-    tokens = []
-    for token in sorted(helper.tokens, key=lambda t: t.position):
-        if token.kind == 'housenumber':
-            tokens.append(token)
-        elif tokens:
-            # Housenumber may have multiple tokens (eg. "dix huit"), we join
-            # those to match the way they have been processed by
-            # addok.helpers.index.prepare_housenumbers.
-            raw = ''.join(tokens)
-            if raw in result.housenumbers:
-                data = result.housenumbers[raw]
-                result.housenumber = data.pop('raw')
-                result.type = 'housenumber'
-                result.update(data)
-                break

Diff for: tests/conftest.py

@@ -6,7 +6,7 @@ def pytest_configure():
         "addok_france.remove_leading_zeros",
     ]
     config.SEARCH_RESULT_PROCESSORS_PYPATHS = [
-        'addok_france.match_housenumber',
+        'addok.helpers.results.match_housenumber',
         'addok_france.make_labels',
         'addok.helpers.results.score_by_importance',
         'addok.helpers.results.score_by_autocomplete_distance',

Diff for: tests/test_utils.py

@@ -271,7 +271,6 @@ def test_match_housenumber_with_multiple_tokens(config):
     assert result.lat == '48.18'
 
 
-
 def test_make_labels(config):
     doc = {
         'id': 'xxxx',