reorganize code around result formatting

[nominatim.git] / nominatim / api / v1 / format.py

diff --git a/nominatim/result_formatter/v1.py b/nominatim/api/v1/format.py
similarity index 84%
rename from nominatim/result_formatter/v1.py
rename to nominatim/api/v1/format.py
index 9114d45feed4541cc4a6b25b4d6c6ed51f9c66c2..cb2b15a71725b33e5b3c5aac89f0232b89961281 100644 (file)
--- a/nominatim/result_formatter/v1.py
+++ b/nominatim/api/v1/format.py
@@ -11,12 +11,12 @@ from typing import Dict, Any
 from collections import OrderedDict
 import json
 
-from nominatim.result_formatter.base import FormatDispatcher
+from nominatim.api.result_formatting import FormatDispatcher
 from nominatim.api import StatusResult
 
-create = FormatDispatcher()
+dispatch = FormatDispatcher()
 
-@create.format_func(StatusResult, 'text')
+@dispatch.format_func(StatusResult, 'text')
 def _format_status_text(result: StatusResult) -> str:
     if result.status:
         return f"ERROR: {result.message}"
@@ -24,7 +24,7 @@ def _format_status_text(result: StatusResult) -> str:
     return 'OK'
 
 
-@create.format_func(StatusResult, 'json')
+@dispatch.format_func(StatusResult, 'json')
 def _format_status_json(result: StatusResult) -> str:
     out: Dict[str, Any] = OrderedDict()
     out['status'] = result.status