From f63a9cc579b184e31aeb0825bcfc26740444a5fc Mon Sep 17 00:00:00 2001 From: Al Date: Sun, 17 Dec 2017 22:12:12 -0500 Subject: [PATCH] [expand] adding number phrases as ignorable in PO boxes --- src/expand.c | 2 +- src/gazetteer_data.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/expand.c b/src/expand.c index 8bc6269d..5f8b9674 100644 --- a/src/expand.c +++ b/src/expand.c @@ -476,7 +476,7 @@ inline uint32_t gazetteer_ignorable_components(uint16_t dictionary_id) { case DICTIONARY_LEVEL_SUB_BASEMENT: return LIBPOSTAL_ADDRESS_ALL ^ (LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_ANY); case DICTIONARY_NUMBER: - return LIBPOSTAL_ADDRESS_HOUSE_NUMBER | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE | LIBPOSTAL_ADDRESS_STREET; + return LIBPOSTAL_ADDRESS_HOUSE_NUMBER | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_PO_BOX | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE | LIBPOSTAL_ADDRESS_STREET; case DICTIONARY_NO_NUMBER: return LIBPOSTAL_ADDRESS_ALL ^ (LIBPOSTAL_ADDRESS_HOUSE_NUMBER | LIBPOSTAL_ADDRESS_ANY); case DICTIONARY_PERSONAL_TITLE: diff --git a/src/gazetteer_data.c b/src/gazetteer_data.c index 0c23759a..444c225e 100644 --- a/src/gazetteer_data.c +++ b/src/gazetteer_data.c @@ -25,7 +25,7 @@ gazetteer_t gazetteer_config[] = { {DICTIONARY_NAMED_ORGANIZATION, LIBPOSTAL_ADDRESS_NAME}, {DICTIONARY_NAMED_PERSON, LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET}, {DICTIONARY_NO_NUMBER, LIBPOSTAL_ADDRESS_HOUSE_NUMBER}, - {DICTIONARY_NUMBER, LIBPOSTAL_ADDRESS_HOUSE_NUMBER | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE}, + {DICTIONARY_NUMBER, LIBPOSTAL_ADDRESS_HOUSE_NUMBER | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_PO_BOX | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE}, {DICTIONARY_PERSONAL_SUFFIX, LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET}, {DICTIONARY_PERSONAL_TITLE, LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET}, {DICTIONARY_PLACE_NAME, LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET},