Vagrant and CI tests for Ubuntu 22.04

[nominatim.git] / nominatim / data / postcode_format.py

diff --git a/nominatim/data/postcode_format.py b/nominatim/data/postcode_format.py
index 0158111ada96790fdc89282e757ef8ceb462b536..366ea5057b322b7ddf77ee7d5937069e7f7b9846 100644 (file)
--- a/nominatim/data/postcode_format.py
+++ b/nominatim/data/postcode_format.py
@@ -11,7 +11,7 @@ format.
 import re
 
 from nominatim.errors import UsageError
 import re
 
 from nominatim.errors import UsageError

-from nominatim.tools import country_info
+from nominatim.data import country_info

 
 class CountryPostcodeMatcher:
     """ Matches and formats a postcode according to a format definition
 
 class CountryPostcodeMatcher:
     """ Matches and formats a postcode according to a format definition


@@ -78,6 +78,18 @@ class PostcodeFormatter:
         self.default_matcher = CountryPostcodeMatcher('', {'pattern': pattern})
 
 
         self.default_matcher = CountryPostcodeMatcher('', {'pattern': pattern})
 
 

+    def get_matcher(self, country_code):
+        """ Return the CountryPostcodeMatcher for the given country.
+            Returns None if the country doesn't have a postcode and the
+            default matcher if there is no specific matcher configured for
+            the country.
+        """
+        if country_code in self.country_without_postcode:
+            return None
+
+        return self.country_matcher.get(country_code, self.default_matcher)
+
+

     def match(self, country_code, postcode):
         """ Match the given postcode against the postcode pattern for this
             matcher. Returns a `re.Match` object if the country has a pattern
     def match(self, country_code, postcode):
         """ Match the given postcode against the postcode pattern for this
             matcher. Returns a `re.Match` object if the country has a pattern