goodmap 0.4.2__py3-none-any.whl → 0.4.4__py3-none-any.whl

goodmap/core.py

@@ -1,3 +1,5 @@
+from typing import Any, Dict, List
+
 # TODO move filtering to db site
 
 
@@ -10,10 +12,35 @@ def does_fulfill_requirement(entry, requirements):
     return all(matches)
 
 
+def sort_by_distance(data: List[Dict[str, Any]], query_params: Dict[str, List[str]]):
+    try:
+        if "lat" in query_params and "lon" in query_params:
+            lat = float(query_params["lat"][0])
+            lon = float(query_params["lon"][0])
+            data.sort(key=lambda x: (x["position"][0] - lat) ** 2 + (x["position"][1] - lon) ** 2)
+            return data
+        return data
+    except (ValueError, KeyError, IndexError):
+        return data
+
+
+def limit(data, query_params):
+    try:
+        if "limit" in query_params:
+            limit = int(query_params["limit"][0])
+            data = data[:limit]
+            return data
+        return data
+    except (ValueError, KeyError, IndexError):
+        return data
+
+
 def get_queried_data(all_data, categories, query_params):
     requirements = []
     for key in categories.keys():
         requirements.append((key, query_params.get(key)))
 
     filtered_data = [x for x in all_data if does_fulfill_requirement(x, requirements)]
-    return filtered_data
+    final_data = sort_by_distance(filtered_data, query_params)
+    final_data = limit(final_data, query_params)
+    return final_data

goodmap/core_api.py

@@ -72,8 +72,9 @@ def core_pages(
                 )
                 notifier_function(message)
             except Exception as e:
-                return make_response(jsonify({"message": f"Error sending notification : {e}"}), 400)
-            return make_response(jsonify({"message": "Location reported"}), 200)
+                error_message = gettext("Error sending notification")
+                return make_response(jsonify({"message": f"{error_message} : {e}"}), 400)
+            return make_response(jsonify({"message": gettext("Location reported")}), 200)
 
     @core_api.route("/data")
     class Data(Resource):

goodmap/templates/map.html

@@ -116,6 +116,7 @@ window.PRIMARY_COLOR = "{{ primary_color }}";
 window.SHOW_SUGGEST_NEW_POINT_BUTTON = {{ feature_flags.SHOW_SUGGEST_NEW_POINT_BUTTON | default(false) | tojson }};
 window.SHOW_SEARCH_BAR = {{ feature_flags.SHOW_SEARCH_BAR | default(false) | tojson }};
 window.USE_LAZY_LOADING = {{ feature_flags.USE_LAZY_LOADING | default(false) | tojson }};
+window.SHOW_ACCESSIBILITY_TABLE = {{ feature_flags.SHOW_ACCESSIBILITY_TABLE | default(false) | tojson }};
 </script>
 <script src="/static/map.js"></script>
 {% endblock %}

{goodmap-0.4.2.dist-info → goodmap-0.4.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: goodmap
-Version: 0.4.2
+Version: 0.4.4
 Summary: Map engine to serve all the people :)
 Author: Krzysztof Kolodzinski
 Author-email: krzysztof.kolodzinski@problematy.pl

{goodmap-0.4.2.dist-info → goodmap-0.4.4.dist-info}/RECORD

@@ -1,14 +1,14 @@
 goodmap/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-goodmap/core.py,sha256=hOTHrDRzbqkfSeKAoD01lzSoY4W8JwupXlJTwTzcvAU,586
-goodmap/core_api.py,sha256=R7c6NywWYyudIOzekbY_Xa2izszIFv-5YFEe5BrkJFw,6476
+goodmap/core.py,sha256=rzMhOIYnR1jxTX6uHQJKIPLYxdUm4_v2d6LrtHtJpHU,1465
+goodmap/core_api.py,sha256=wy861bym-OtJV_y65TNJNr_hxUW45bUK0j2Vt96HG1s,6544
 goodmap/data_models/location.py,sha256=ESR4Z_zINIjldJKhlXImMaQrdtUPJBQc6SatpPPJyNQ,1054
 goodmap/data_validator.py,sha256=e_PCc2CTgiEBK6inF_HDX5mb5R8poh3KkcbhyrLrFVA,4086
 goodmap/db.py,sha256=AJHUP3n29BRjgt6GoGnPtxLNg5TL-KSJhtSZtsZKmGM,3665
 goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
 goodmap/goodmap.py,sha256=cPTTyGqajuza3RDlfFuCl8idxy7TFo6LPuANP8hmg7U,1806
 goodmap/templates/admin.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-goodmap/templates/map.html,sha256=eU_h61l404g8e3_wszUokDrOC92bQ1nFl8yGMKRXFww,3820
-goodmap-0.4.2.dist-info/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
-goodmap-0.4.2.dist-info/METADATA,sha256=rSIeCJEqtI6SKaeD8TgBJ6HempDKjy8tJRafe3XystA,4525
-goodmap-0.4.2.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-goodmap-0.4.2.dist-info/RECORD,,
+goodmap/templates/map.html,sha256=llzzfWGHM0Xtr4Io05QJLCLajySHNBzKejR0Km5nGMw,3926
+goodmap-0.4.4.dist-info/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
+goodmap-0.4.4.dist-info/METADATA,sha256=9efllxXa6i44w0t6sXK5ok5mNsNDtmcxh_OolIBfdSg,4525
+goodmap-0.4.4.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+goodmap-0.4.4.dist-info/RECORD,,

{goodmap-0.4.2.dist-info → goodmap-0.4.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.1
+Generator: poetry-core 2.0.1
 Root-Is-Purelib: true
 Tag: py3-none-any