From 0f20613c138c8f6c990e69a47474323127e38a42 Mon Sep 17 00:00:00 2001 From: Al Date: Wed, 21 Feb 2018 22:16:04 -0500 Subject: [PATCH] [expand] using street name dictionaries as a possible root component instead of having to pollute the synonyms dictionary, which also affects the parser and might be a better place for general purpose synonyms affecting all components. --- src/expand.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/expand.c b/src/expand.c index 9f38e3db..45b506ab 100644 --- a/src/expand.c +++ b/src/expand.c @@ -559,6 +559,8 @@ static inline uint32_t gazetteer_valid_components(uint16_t dictionary_id) { return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET | LIBPOSTAL_ADDRESS_CATEGORY | LIBPOSTAL_ADDRESS_NEAR | LIBPOSTAL_ADDRESS_TOPONYM | LIBPOSTAL_ADDRESS_UNIT | LIBPOSTAL_ADDRESS_LEVEL | LIBPOSTAL_ADDRESS_STAIRCASE | LIBPOSTAL_ADDRESS_ENTRANCE; case DICTIONARY_STOPWORD: return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET | LIBPOSTAL_ADDRESS_CATEGORY | LIBPOSTAL_ADDRESS_NEAR | LIBPOSTAL_ADDRESS_TOPONYM; + case DICTIONARY_STREET_NAME: + return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET; case DICTIONARY_STREET_TYPE: return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET; case DICTIONARY_SYNONYM: @@ -614,6 +616,8 @@ static inline uint32_t gazetteer_possible_root_components(uint16_t dictionary_id return LIBPOSTAL_ADDRESS_STREET; case DICTIONARY_QUALIFIER: return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET; + case DICTIONARY_STREET_NAME: + return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET; case DICTIONARY_SYNONYM: return LIBPOSTAL_ADDRESS_NAME | LIBPOSTAL_ADDRESS_STREET; case DICTIONARY_TOPONYM: