goodmap 0.5.1__py3-none-any.whl → 0.5.3__py3-none-any.whl

goodmap/core_api.py

@@ -13,6 +13,15 @@ def make_tuple_translation(keys_to_translate):
     return [(x, gettext(x)) for x in keys_to_translate]
 
 
+def get_or_none(data, *keys):
+    for key in keys:
+        if isinstance(data, dict):
+            data = data.get(key)
+        else:
+            return None
+    return data
+
+
 def paginate_results(items, raw_params, sort_by_default=None):
     """
     Apply pagination and sorting to a list of items.
@@ -82,7 +91,12 @@ def paginate_results(items, raw_params, sort_by_default=None):
 
 
 def core_pages(
-    database, languages: LanguagesMapping, notifier_function, csrf_generator, location_model
+    database,
+    languages: LanguagesMapping,
+    notifier_function,
+    csrf_generator,
+    location_model,
+    feature_flags={},
 ) -> Blueprint:
     core_api_blueprint = Blueprint("api", __name__, url_prefix="/api")
     core_api = Api(core_api_blueprint, doc="/doc", version="0.1")
@@ -195,7 +209,19 @@ def core_pages(
             """Shows all available categories"""
             all_data = database.get_data()
             categories = make_tuple_translation(all_data["categories"].keys())
-            return jsonify(categories)
+
+            if not feature_flags.get("CATEGORIES_HELP", False):
+                return jsonify(categories)
+            else:
+                categories_help = all_data["categories_help"]
+                proper_categories_help = []
+                if categories_help is not None:
+                    for option in categories_help:
+                        proper_categories_help.append(
+                            {option: gettext(f"categories_help_{option}")}
+                        )
+
+            return jsonify({"categories": categories, "categories_help": proper_categories_help})
 
     @core_api.route("/languages")
     class Languages(Resource):
@@ -209,7 +235,25 @@ def core_pages(
             """Shows all available types in category"""
             all_data = database.get_data()
             local_data = make_tuple_translation(all_data["categories"][category_type])
-            return jsonify(local_data)
+
+            categories_options_help = get_or_none(
+                all_data, "categories_options_help", category_type
+            )
+            proper_categories_options_help = []
+            if categories_options_help is not None:
+                for option in categories_options_help:
+                    proper_categories_options_help.append(
+                        {option: gettext(f"categories_options_help_{option}")}
+                    )
+            if not feature_flags.get("CATEGORIES_HELP", False):
+                return jsonify(local_data)
+            else:
+                return jsonify(
+                    {
+                        "categories_options": local_data,
+                        "categories_options_help": proper_categories_options_help,
+                    }
+                )
 
     @core_api.route("/generate-csrf-token")
     class CsrfToken(Resource):

goodmap/data_models/location.py

@@ -6,7 +6,7 @@ from pydantic import BaseModel, Field, create_model, field_validator
 class LocationBase(BaseModel, extra="allow"):
     position: tuple[float, float]
     uuid: str
-    remark: bool = False
+    remark: str = ""
 
     @field_validator("position")
     @classmethod

goodmap/goodmap.py

@@ -40,7 +40,12 @@ def create_app_from_config(config: Config) -> platzky.Engine:
     CSRFProtect(app)
 
     cp = core_pages(
-        app.db, languages_dict(config.languages), app.notify, generate_csrf, location_model
+        app.db,
+        languages_dict(config.languages),
+        app.notify,
+        generate_csrf,
+        location_model,
+        feature_flags=config.feature_flags,
     )
     app.register_blueprint(cp)
     goodmap = Blueprint("goodmap", __name__, url_prefix="/", template_folder="templates")

goodmap/templates/map.html

@@ -117,6 +117,7 @@ window.SHOW_SUGGEST_NEW_POINT_BUTTON = {{ feature_flags.SHOW_SUGGEST_NEW_POINT_B
 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 }};
+window.FEATURE_FLAGS = {{ feature_flags | tojson }};
 </script>
 <script src="/static/map.js"></script>
 {% endblock %}

{goodmap-0.5.1.dist-info → goodmap-0.5.3.dist-info}/METADATA

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

goodmap-0.5.3.dist-info/RECORD

@@ -0,0 +1,14 @@
+goodmap/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+goodmap/core.py,sha256=rzMhOIYnR1jxTX6uHQJKIPLYxdUm4_v2d6LrtHtJpHU,1465
+goodmap/core_api.py,sha256=8Mhs59c_MnORmHK7aFCNM7eBJBhNQ0MWcdYnmiW2GW4,15515
+goodmap/data_models/location.py,sha256=H3EKozc-WZvrYm6cwajl8_gaw4rQhxdlvxR1mk4mpkA,1104
+goodmap/data_validator.py,sha256=lBmVAPxvSmEOdUGeVYSjUvVVmKfPyq4CWoHfczTtEMM,4090
+goodmap/db.py,sha256=fB9B0nzNuTsMBak7iV4bGxAxGF5NSTGikht9keDOTGA,17518
+goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
+goodmap/goodmap.py,sha256=OOcuDEY7GZsHh8vjIJ9brd4SuGxNRq_lC_DMmNuome8,2731
+goodmap/templates/goodmap-admin.html,sha256=zGuau239BXyBerV21mDXcHy34ke8cLmZcMngcX1xhAs,35598
+goodmap/templates/map.html,sha256=-qbJ313t2EdSyIwULnQy3j81pH4MqI5yjtJ4Xoo7N7M,3979
+goodmap-0.5.3.dist-info/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
+goodmap-0.5.3.dist-info/METADATA,sha256=d5Wqic-brdjC_wocR63g1YINlERblKpmkZpTOZ-j5pg,5278
+goodmap-0.5.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+goodmap-0.5.3.dist-info/RECORD,,

goodmap-0.5.1.dist-info/RECORD

@@ -1,14 +0,0 @@
-goodmap/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-goodmap/core.py,sha256=rzMhOIYnR1jxTX6uHQJKIPLYxdUm4_v2d6LrtHtJpHU,1465
-goodmap/core_api.py,sha256=pxR14Hiaotu_7GCGB4bNmntyroFV7aBamYzNnwytCW8,13985
-goodmap/data_models/location.py,sha256=nvieHMobqLETSiC4GBAGVvHFOVMpf48sn6GntXi-6lY,1108
-goodmap/data_validator.py,sha256=lBmVAPxvSmEOdUGeVYSjUvVVmKfPyq4CWoHfczTtEMM,4090
-goodmap/db.py,sha256=fB9B0nzNuTsMBak7iV4bGxAxGF5NSTGikht9keDOTGA,17518
-goodmap/formatter.py,sha256=VlUHcK1HtM_IEU0VE3S5TOkZLVheMdakvUeW2tCKdq0,783
-goodmap/goodmap.py,sha256=Nx_s9JfEBbICNiPykiaMr7vepynZ6LcT0sb_pndL4D4,2654
-goodmap/templates/goodmap-admin.html,sha256=zGuau239BXyBerV21mDXcHy34ke8cLmZcMngcX1xhAs,35598
-goodmap/templates/map.html,sha256=llzzfWGHM0Xtr4Io05QJLCLajySHNBzKejR0Km5nGMw,3926
-goodmap-0.5.1.dist-info/LICENSE.md,sha256=nkCQOR7uheLRvHRfXmwx9LhBnMcPeBU9d4ebLojDiQU,1067
-goodmap-0.5.1.dist-info/METADATA,sha256=olBm-u5npCAhJAE4nu385pdnRc34HWQa_ZX0uIBSS9A,5278
-goodmap-0.5.1.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-goodmap-0.5.1.dist-info/RECORD,,