fix parsing of operator in special phrases

Because of unstripped input, the operators wouldn't match.

diff --git a/nominatim/tools/special_phrases/special_phrase.py b/nominatim/tools/special_phrases/special_phrase.py
index da7968cac9c0845917f4593da1c41c3b1b9ac18d..eb95d919aae63f39ec9f848f27ae593e3ee95308 100644 (file)
--- a/nominatim/tools/special_phrases/special_phrase.py
+++ b/nominatim/tools/special_phrases/special_phrase.py
@@ -16,4 +16,5 @@ class SpecialPhrase():
         # Hack around a bug where building=yes was imported with quotes into the wiki
         self.p_type = re.sub(r'\"|"', '', p_type.strip())
         # Needed if some operator in the wiki are not written in english
         # Hack around a bug where building=yes was imported with quotes into the wiki
         self.p_type = re.sub(r'\"|"', '', p_type.strip())
         # Needed if some operator in the wiki are not written in english

+        p_operator = p_operator.strip()

         self.p_operator = '-' if p_operator not in ('near', 'in') else p_operator
         self.p_operator = '-' if p_operator not in ('near', 'in') else p_operator

diff --git a/test/python/test_tools_sp_wiki_loader.py b/test/python/test_tools_sp_wiki_loader.py
index 35b413d3bedf899ea466f481ae4a0aaa5f0fabef..f29528a51ec1d3ce8e4624a5b35c5c94d91b57dc 100644 (file)
--- a/test/python/test_tools_sp_wiki_loader.py
+++ b/test/python/test_tools_sp_wiki_loader.py
@@ -30,7 +30,7 @@ def test_parse_xml(sp_wiki_loader, xml_wiki_content):
         Should return the right SpecialPhrase objects.
     """
     phrases = sp_wiki_loader.parse_xml(xml_wiki_content)
         Should return the right SpecialPhrase objects.
     """
     phrases = sp_wiki_loader.parse_xml(xml_wiki_content)

-    assert check_phrases_content(phrases)
+    check_phrases_content(phrases)

 
 
 def test_next(sp_wiki_loader):
 
 
 def test_next(sp_wiki_loader):


@@ -40,15 +40,29 @@ def test_next(sp_wiki_loader):
         the 'en' special phrases.
     """
     phrases = next(sp_wiki_loader)
         the 'en' special phrases.
     """
     phrases = next(sp_wiki_loader)

-    assert check_phrases_content(phrases)
+    check_phrases_content(phrases)

 
 def check_phrases_content(phrases):
     """
         Asserts that the given phrases list contains
         the right phrases of the 'en' special phrases.
     """
 
 def check_phrases_content(phrases):
     """
         Asserts that the given phrases list contains
         the right phrases of the 'en' special phrases.
     """

-    return  len(phrases) > 1 \
-            and any(p.p_label == 'Embassies' and p.p_class == 'amenity' and p.p_type == 'embassy'
-                    and p.p_operator == '-' for p in phrases) \
-            and any(p.p_label == 'Zip Line' and p.p_class == 'aerialway' and p.p_type == 'zip_line'
-                    and p.p_operator == '-' for p in phrases)
+    assert set((p.p_label, p.p_class, p.p_type, p.p_operator) for p in phrases) ==\
+              {('Zip Line', 'aerialway', 'zip_line', '-'),
+               ('Zip Lines', 'aerialway', 'zip_line', '-'),
+               ('Zip Line in', 'aerialway', 'zip_line', 'in'),
+               ('Zip Lines in', 'aerialway', 'zip_line', 'in'),
+               ('Zip Line near', 'aerialway', 'zip_line', 'near'),
+               ('Animal shelter', 'amenity', 'animal_shelter', '-'),
+               ('Animal shelters', 'amenity', 'animal_shelter', '-'),
+               ('Animal shelter in', 'amenity', 'animal_shelter', 'in'),
+               ('Animal shelters in', 'amenity', 'animal_shelter', 'in'),
+               ('Animal shelter near', 'amenity', 'animal_shelter', 'near'),
+               ('Animal shelters near', 'amenity', 'animal_shelter', 'near'),
+               ('Drinking Water near', 'amenity', 'drinking_water', 'near'),
+               ('Water', 'amenity', 'drinking_water', '-'),
+               ('Water in', 'amenity', 'drinking_water', 'in'),
+               ('Water near', 'amenity', 'drinking_water', 'near'),
+               ('Embassy', 'amenity', 'embassy', '-'),
+               ('Embassys', 'amenity', 'embassy', '-'),
+               ('Embassies', 'amenity', 'embassy', '-')}