Merge remote-tracking branch 'upstream/master'

[nominatim.git] / nominatim / api / result_formatting.py

diff --git a/nominatim/api/result_formatting.py b/nominatim/api/result_formatting.py
index 09cf7db802959d0a8ebb76b10fb614459fef737c..a6bfa91c64fb5befb8fdb4dcb4b8acd0cbbb7eb3 100644 (file)
--- a/nominatim/api/result_formatting.py
+++ b/nominatim/api/result_formatting.py
@@ -7,11 +7,11 @@
 """
 Helper classes and functions for formating results into API responses.
 """
 """
 Helper classes and functions for formating results into API responses.
 """

-from typing import Type, TypeVar, Dict, List, Callable, Any
+from typing import Type, TypeVar, Dict, List, Callable, Any, Mapping

 from collections import defaultdict
 
 T = TypeVar('T') # pylint: disable=invalid-name
 from collections import defaultdict
 
 T = TypeVar('T') # pylint: disable=invalid-name

-FormatFunc = Callable[[T], str]
+FormatFunc = Callable[[T, Mapping[str, Any]], str]

 
 
 class FormatDispatcher:
 
 
 class FormatDispatcher:


@@ -47,10 +47,10 @@ class FormatDispatcher:
         return fmt in self.format_functions[result_type]
 
 
         return fmt in self.format_functions[result_type]
 
 

-    def format_result(self, result: Any, fmt: str) -> str:
+    def format_result(self, result: Any, fmt: str, options: Mapping[str, Any]) -> str:

         """ Convert the given result into a string using the given format.
 
             The format is expected to be in the list returned by
             `list_formats()`.
         """
         """ Convert the given result into a string using the given format.
 
             The format is expected to be in the list returned by
             `list_formats()`.
         """

-        return self.format_functions[type(result)][fmt](result)
+        return self.format_functions[type(result)][fmt](result, options)