goodmap 1.1.8__py3-none-any.whl → 1.1.9__py3-none-any.whl

goodmap/config.py

@@ -10,7 +10,7 @@ class GoodmapConfig(PlatzkyConfig):
     """Extended configuration for Goodmap with additional frontend library URL."""
 
     goodmap_frontend_lib_url: str = Field(
-        default="https://cdn.jsdelivr.net/npm/@problematy/goodmap@0.4.2",
+        default="https://cdn.jsdelivr.net/npm/@problematy/goodmap@1.0.4",
         alias="GOODMAP_FRONTEND_LIB_URL",
     )
 

goodmap/core_api.py

@@ -2,6 +2,7 @@ import importlib.metadata
 import logging
 import uuid
 
+import deprecation
 import numpy
 import pysupercluster
 from flask import Blueprint, jsonify, make_response, request
@@ -105,7 +106,28 @@ def core_pages(
         def post(self):
             """Suggest new location"""
             try:
-                suggested_location = request.get_json()
+                # Handle both multipart/form-data (with file uploads) and JSON
+                if request.content_type and request.content_type.startswith("multipart/form-data"):
+                    # Parse form data dynamically
+                    import json as json_lib
+
+                    suggested_location = {}
+
+                    for key in request.form:
+                        value = request.form[key]
+                        # Try to parse as JSON for complex types (arrays, objects, position)
+                        try:
+                            suggested_location[key] = json_lib.loads(value)
+                        except ValueError:  # JSONDecodeError inherits from ValueError
+                            # If not JSON, use as-is (simple string values)
+                            suggested_location[key] = value
+
+                    # TODO: Handle photo file upload from request.files['photo']
+                    # For now, we just ignore it as the backend doesn't store photos yet
+                else:
+                    # Parse JSON data
+                    suggested_location = request.get_json()
+
                 suggested_location.update({"uuid": str(uuid.uuid4())})
                 location = location_model.model_validate(suggested_location)
                 database.add_suggestion(location.model_dump())
@@ -115,7 +137,7 @@ def core_pages(
                 )
                 notifier_function(message)
             except BadRequest:
-                logger.warning("Invalid JSON in suggest endpoint")
+                logger.warning("Invalid request data in suggest endpoint")
                 return make_response(jsonify({"message": ERROR_INVALID_REQUEST_DATA}), 400)
             except LocationValidationError as e:
                 logger.warning(
@@ -244,6 +266,23 @@ def core_pages(
             version_info = {"backend": importlib.metadata.version("goodmap")}
             return jsonify(version_info)
 
+    @core_api.route("/generate-csrf-token")
+    class CsrfToken(Resource):
+        @deprecation.deprecated(
+            deprecated_in="1.1.8",
+            details="This endpoint for explicit CSRF token generation is deprecated. "
+            "CSRF protection remains active in the application.",
+        )
+        def get(self):
+            """
+            Generate CSRF token (DEPRECATED)
+
+            This endpoint is deprecated and maintained only for backward compatibility.
+            CSRF protection remains active in the application.
+            """
+            csrf_token = csrf_generator()
+            return {"csrf_token": csrf_token}
+
     @core_api.route("/categories")
     class Categories(Resource):
         def get(self):
@@ -297,12 +336,6 @@ def core_pages(
                     }
                 )
 
-    @core_api.route("/generate-csrf-token")
-    class CsrfToken(Resource):
-        def get(self):
-            csrf_token = csrf_generator()
-            return {"csrf_token": csrf_token}
-
     @core_api.route("/admin/locations")
     class AdminManageLocations(Resource):
         def get(self):

goodmap/goodmap.py

@@ -53,10 +53,21 @@ def create_app_from_config(config: GoodmapConfig) -> platzky.Engine:
 
     @goodmap.route("/")
     def index():
+        # Prepare location schema for frontend dynamic forms
+        # Convert categories dict_keys to a proper dict for JSON serialization
+        category_data = app.db.get_category_data()
+        categories = category_data.get("categories", {})
+
+        location_schema = {
+            "obligatory_fields": location_obligatory_fields,
+            "categories": categories,
+        }
+
         return render_template(
             "map.html",
             feature_flags=config.feature_flags,
             goodmap_frontend_lib_url=config.goodmap_frontend_lib_url,
+            location_schema=location_schema,
         )
 
     @goodmap.route("/goodmap-admin")

goodmap/templates/goodmap-admin.html

@@ -1,6 +1,8 @@
 {% extends "admin.html" %}
 
 {% block head_meta %}
+<meta name="csrf-token" content="{{ csrf_token() }}">
+
 <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
       integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
       crossorigin=""/>

goodmap/templates/map.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 
 {% block head_meta %}
+<meta name="csrf-token" content="{{ csrf_token() }}">
 
 <link rel="stylesheet" href="https://unpkg.com/leaflet@1.7.1/dist/leaflet.css"
       integrity="sha512-xodZBNTC5n17Xt2atTPuE1HxjVMSvLVW9ocqUKLsCC5CXdbqCmblAshOMAS6/keqq/sMZMZ19scR4PsZChSR7A=="
@@ -119,6 +120,10 @@ window.USE_LAZY_LOADING = {{ feature_flags.USE_LAZY_LOADING | default(false) | t
 window.USE_SERVER_SIDE_CLUSTERING = {{ feature_flags.USE_SERVER_SIDE_CLUSTERING | default(false) | tojson }};
 window.SHOW_ACCESSIBILITY_TABLE = {{ feature_flags.SHOW_ACCESSIBILITY_TABLE | default(false) | tojson }};
 window.FEATURE_FLAGS = {{ feature_flags | tojson }};
+
+// Location schema for dynamic form building
+// Contains required fields and available categories for new location suggestions
+globalThis.LOCATION_SCHEMA = {{ location_schema | tojson }};
 </script>
 <script src="{{ goodmap_frontend_lib_url }}"></script>
 {% endblock %}

{goodmap-1.1.8.dist-info → goodmap-1.1.9.dist-info}/METADATA

@@ -1,8 +1,7 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.3
 Name: goodmap
-Version: 1.1.8
+Version: 1.1.9
 Summary: Map engine to serve all the people :)
-License-File: LICENSE.md
 Author: Krzysztof Kolodzinski
 Author-email: krzysztof.kolodzinski@problematy.pl
 Requires-Python: >=3.10,<4.0
@@ -11,7 +10,6 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Classifier: Programming Language :: Python :: 3.14
 Provides-Extra: docs
 Requires-Dist: Babel (>=2.10.3,<3.0.0)
 Requires-Dist: Flask (==3.0.3)

goodmap-1.1.9.dist-info/RECORD

@@ -0,0 +1,17 @@
+goodmap/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+goodmap/clustering.py,sha256=ULB-fPNOUDblgpBK4vzuo0o2yqIcvG84F3R6Za2X_l4,2905
+goodmap/config.py,sha256=CsmC1zuvVab90VW50dtARHbFJpy2vfsIfbque8Zgc-U,1313
+goodmap/core.py,sha256=rzMhOIYnR1jxTX6uHQJKIPLYxdUm4_v2d6LrtHtJpHU,1465
+goodmap/core_api.py,sha256=Xzr9x89-K0gURcFvAypjKaboExdTKq1KfLfnGTvNG-Q,21144
+goodmap/data_models/location.py,sha256=brDdaICyYPs8QrWEkRXkUybQS3IJaZGbkDWa6hqhFAg,2008
+goodmap/data_validator.py,sha256=lBmVAPxvSmEOdUGeVYSjUvVVmKfPyq4CWoHfczTtEMM,4090
+goodmap/db.py,sha256=TcqYGbK5yk6S735Si1AzjNqcbB1nsd9pFGOy5qN9Vec,46589
+goodmap/exceptions.py,sha256=jkFAUoc5LHk8iPjxHxbcRp8W6qFCSEA25A8XaSwxwyo,2906
+goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
+goodmap/goodmap.py,sha256=LbmzYn4FHaP-Y5ZtQhMncGO2h18k2WYAsP5Hzw4oGUw,3392
+goodmap/templates/goodmap-admin.html,sha256=LSiOZ9-n29CnlfVNwdgmXwT7Xe7t5gvGh1xSrFGqOIY,35669
+goodmap/templates/map.html,sha256=Uk7FFrZwvHZvG0DDaQrGW5ZrIMD21XrJzMub76uIlAg,4348
+goodmap-1.1.9.dist-info/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
+goodmap-1.1.9.dist-info/METADATA,sha256=mgkDiknn13-EscrXxZFB7UULT7DgRFRTLtBArTF-0Jg,5792
+goodmap-1.1.9.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+goodmap-1.1.9.dist-info/RECORD,,

{goodmap-1.1.8.dist-info → goodmap-1.1.9.dist-info}/WHEEL

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

goodmap-1.1.8.dist-info/RECORD

@@ -1,17 +0,0 @@
-goodmap/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-goodmap/clustering.py,sha256=ULB-fPNOUDblgpBK4vzuo0o2yqIcvG84F3R6Za2X_l4,2905
-goodmap/config.py,sha256=sseE4sceFB8OBuFsrRpQJvjv0Vg5KFdkzihBX_hbE2c,1313
-goodmap/core.py,sha256=rzMhOIYnR1jxTX6uHQJKIPLYxdUm4_v2d6LrtHtJpHU,1465
-goodmap/core_api.py,sha256=gzFYeek65_4kLET0NPMlSqTz1UGlQl7Dam6lxDtrTIk,19586
-goodmap/data_models/location.py,sha256=brDdaICyYPs8QrWEkRXkUybQS3IJaZGbkDWa6hqhFAg,2008
-goodmap/data_validator.py,sha256=lBmVAPxvSmEOdUGeVYSjUvVVmKfPyq4CWoHfczTtEMM,4090
-goodmap/db.py,sha256=TcqYGbK5yk6S735Si1AzjNqcbB1nsd9pFGOy5qN9Vec,46589
-goodmap/exceptions.py,sha256=jkFAUoc5LHk8iPjxHxbcRp8W6qFCSEA25A8XaSwxwyo,2906
-goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
-goodmap/goodmap.py,sha256=q6okPopWBH6jDkKJcGDegebaapHLFUVilJ3p3aKi97k,2960
-goodmap/templates/goodmap-admin.html,sha256=39PJ1drk_xdkyzXgPZZNXYq9gA9oTVeR8hsgeae6E0g,35614
-goodmap/templates/map.html,sha256=aEIL6M7AlBZ34asV5R1syKq9IA1tBZNhiBMA9ovco7I,4105
-goodmap-1.1.8.dist-info/METADATA,sha256=yi1Z2yvFOSKXRRLWUo10UWJHinLEW3IHgP4PZs7M_uo,5868
-goodmap-1.1.8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-goodmap-1.1.8.dist-info/licenses/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
-goodmap-1.1.8.dist-info/RECORD,,