goodmap 0.4.3__tar.gz → 0.5.0__tar.gz

{goodmap-0.4.3 → goodmap-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: goodmap
-Version: 0.4.3
+Version: 0.5.0
 Summary: Map engine to serve all the people :)
 Author: Krzysztof Kolodzinski
 Author-email: krzysztof.kolodzinski@problematy.pl
@@ -22,7 +22,7 @@ Requires-Dist: google-cloud-storage (>=2.7.0,<3.0.0)
 Requires-Dist: gql (>=3.4.0,<4.0.0)
 Requires-Dist: gunicorn (>=20.1.0,<21.0.0)
 Requires-Dist: humanize (>=4.6.0,<5.0.0)
-Requires-Dist: platzky (>=0.2.5,<0.3.0)
+Requires-Dist: platzky (>=0.3.1,<0.4.0)
 Requires-Dist: pydantic (>=2.7.1,<3.0.0)
 Description-Content-Type: text/markdown
 

goodmap-0.5.0/goodmap/core.py

@@ -0,0 +1,46 @@
+from typing import Any, Dict, List
+
+# TODO move filtering to db site
+
+
+def does_fulfill_requirement(entry, requirements):
+    matches = []
+    for category, values in requirements:
+        if not values:
+            continue
+        matches.append(all(entry_value in entry[category] for entry_value in values))
+    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)]
+    final_data = sort_by_distance(filtered_data, query_params)
+    final_data = limit(final_data, query_params)
+    return final_data

{goodmap-0.4.3 → goodmap-0.5.0}/goodmap/core_api.py

@@ -1,13 +1,11 @@
 import importlib.metadata
 import uuid
 
-import deprecation
 from flask import Blueprint, jsonify, make_response, request
 from flask_babel import gettext
 from flask_restx import Api, Resource, fields
 from platzky.config import LanguagesMapping
 
-from goodmap.core import get_queried_data
 from goodmap.formatter import prepare_pin
 
 
@@ -76,29 +74,6 @@ def core_pages(
                 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):
-        @deprecation.deprecated(
-            deprecated_in="0.4.1",
-            removed_in="0.5.0",
-            current_version=importlib.metadata.version("goodmap"),
-            details="Use /locations or /location/<point_id> instead",
-        )
-        def get(self):
-            """
-            Shows all data filtered by query parameters
-            e.g. /api/data?category=category1&category=category2
-            """
-            all_data = database.get_data()
-            query_params = request.args.to_dict(flat=False)
-            data = all_data["data"]
-            categories = all_data["categories"]
-            visible_data = all_data["visible_data"]
-            meta_data = all_data["meta_data"]
-            queried_data = get_queried_data(data, categories, query_params)
-            formatted_data = [prepare_pin(x, visible_data, meta_data) for x in queried_data]
-            return jsonify(formatted_data)
-
     @core_api.route("/locations")
     class GetLocations(Resource):
         def get(self):

{goodmap-0.4.3 → goodmap-0.5.0}/goodmap/data_validator.py

@@ -50,7 +50,7 @@ def get_invalid_value_in_category_violations(p, categories):
     for category in categories & p.keys():
         category_value_in_point = p[category]
         valid_values_set = categories[category]
-        if type(category_value_in_point) is list:
+        if isinstance(category_value_in_point, list):
             for attribute_value in category_value_in_point:
                 if attribute_value not in valid_values_set:
                     violations.append(

{goodmap-0.4.3 → goodmap-0.5.0}/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.3 → goodmap-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "goodmap"
-version = "0.4.3"
+version = "0.5.0"
 description = "Map engine to serve all the people :)"
 authors = ["Krzysztof Kolodzinski <krzysztof.kolodzinski@problematy.pl>"]
 readme = "README.md"
@@ -20,7 +20,7 @@ Flask-WTF = "^1.2.1"
 gql = "^3.4.0"
 aiohttp = "^3.8.4"
 pydantic = "^2.7.1"
-platzky = "^0.2.5"
+platzky = "^0.3.1"
 deprecation = "^2.1.0"
 
 [tool.poetry.group.dev.dependencies]
@@ -30,8 +30,9 @@ coveralls = "^3.3.1"
 pyright = "^1.1.291"
 freezegun = "^1.2.2"
 black = "^24.8.0"
-ruff = "^0.0.257"
+ruff = "^0.4.4"
 platzky = {path = "vendor/platzky", develop = true}
+platzky-redirections = "^0.1.0"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]
@@ -55,6 +56,10 @@ reportUntypedClassDecorator = false
 reportUnusedClass = false
 reportUntypedBaseClass = false
 
+exclude = [
+    "**/vendor/**",
+]
+
 [tool.black]
 line-length = 100
 target-version = ["py310"]
@@ -63,14 +68,13 @@ target-version = ["py310"]
 line-length = 100
 target-version = "py310"
 show-fixes = true
-select = [
+lint.select = [
     "I", # isort
     "F", # Pyflakes
     "E", # pycodestyle Error
     "W", # pycodestyle Warning
     "RUF", # Ruff-specific rules
 ]
-ignore = []
 
 [tool.pytest.ini_options]
 addopts = "--ignore=vendor"

goodmap-0.4.3/goodmap/core.py

@@ -1,19 +0,0 @@
-# TODO move filtering to db site
-
-
-def does_fulfill_requirement(entry, requirements):
-    matches = []
-    for category, values in requirements:
-        if not values:
-            continue
-        matches.append(all(entry_value in entry[category] for entry_value in values))
-    return all(matches)
-
-
-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