fix wiring

Author: raven-wing

frontend/src/components/Map/map.config.js

@@ -1,7 +1,8 @@
-// The view the frontend opened on before it became configurable: the centre of Poland,
-// zoomed out far enough to hold the country. A deliberate second copy of
-// goodmap/initial_view.py's defaults - this module cannot reach Python, and editing both is
-// the price of that.
+// Where the map opens when the page set no window.INITIAL_VIEW: the centre of Poland,
+// zoomed out far enough to hold the country. goodmap/initial_view.py resolves these same
+// defaults server-side and normally sends a complete view, so these values are reached only
+// by a bundle running outside map.html. Nothing checks that the two agree - keep them in
+// step by hand.
 const DEFAULT_VIEW = {
     center: [51.917, 19.013],
     zoom: 7,

goodmap/db.py

@@ -626,6 +626,70 @@ def get_marker_styles(db):
     return globals()[f"{db.module_name}_get_marker_styles"]
 
 
+# ------------------------------------------------
+# get_initial_view
+
+
+def google_json_db_get_initial_view(self) -> dict[str, Any]:
+    """
+    Retrieve the map's opening view from Google Cloud Storage JSON blob.
+
+    Returns:
+        dict: Raw ``initial_view`` config (center, zoom, max_zoom). Returns empty dict if
+              not found - declaring a view is optional.
+    """
+    return self.data.get("map", {}).get("initial_view", {})
+
+
+def json_file_db_get_initial_view(self) -> dict[str, Any]:
+    """
+    Retrieve the map's opening view from JSON file database.
+
+    Returns:
+        dict: Raw ``initial_view`` config (center, zoom, max_zoom). Returns empty dict if
+              not found - declaring a view is optional.
+    """
+    return self.data.get("map", {}).get("initial_view", {})
+
+
+def json_db_get_initial_view(self) -> dict[str, Any]:
+    """
+    Retrieve the map's opening view from in-memory JSON database.
+
+    Returns:
+        dict: Raw ``initial_view`` config (center, zoom, max_zoom). Returns empty dict if
+              not found - declaring a view is optional.
+    """
+    return self.data.get("initial_view", {})
+
+
+def mongodb_db_get_initial_view(self) -> dict[str, Any]:
+    """
+    Retrieve the map's opening view from MongoDB.
+
+    Returns:
+        dict: Raw ``initial_view`` config (center, zoom, max_zoom). Returns empty dict if
+              the config document is missing or does not declare one.
+    """
+    config_doc = self.db.config.find_one({"_id": "map_config"})
+    if config_doc:
+        return config_doc.get("initial_view", {})
+    return {}
+
+
+def get_initial_view(db):
+    """
+    Get the appropriate get_initial_view function for the given database backend.
+
+    Args:
+        db: Database instance (must have module_name attribute).
+
+    Returns:
+        callable: Backend-specific get_initial_view function.
+    """
+    return globals()[f"{db.module_name}_get_initial_view"]
+
+
 # ------------------------------------------------
 # get_categories
 
@@ -1842,6 +1906,7 @@ def extend_db_with_goodmap_queries(db, location_model):
     db.extend("get_visible_data", get_visible_data(db))
     db.extend("get_meta_data", get_meta_data(db))
     db.extend("get_marker_styles", get_marker_styles(db))
+    db.extend("get_initial_view", get_initial_view(db))
     db.extend("get_locations", get_locations(db, location_model))
     db.extend("get_locations_paginated", get_locations_paginated(db, location_model))
     db.extend("get_location", get_location(db, location_model))

goodmap/goodmap.py

@@ -22,10 +22,12 @@
 from goodmap.db import (
     extend_db_with_goodmap_queries,
     get_category_data,
+    get_initial_view,
     get_location_obligatory_fields,
     get_marker_styles,
 )
 from goodmap.feature_flags import EnableAdminPanel
+from goodmap.initial_view import resolve_initial_view
 from goodmap.marker_styles import resolve_marker_styles
 from goodmap.plugin import CAPABILITY_BASES, GoodmapPluginBase
 
@@ -193,6 +195,11 @@ def create_app_from_config(config: GoodmapConfig) -> platzky.Engine:
     raw_marker_styles = get_marker_styles(app.db)(app.db)
     marker_styles = resolve_marker_styles(raw_marker_styles)
 
+    # Resolved once at startup rather than per request: the view cannot change without a
+    # restart, and resolving here is what makes a bad one fail the boot instead of every
+    # page load (see goodmap.initial_view).
+    initial_view = resolve_initial_view(get_initial_view(app.db)(app.db))
+
     location_model = create_location_model(location_obligatory_fields, categories)
     app.db = extend_db_with_goodmap_queries(app.db, location_model)
 
@@ -292,6 +299,7 @@ def index():
             goodmap_frontend_lib_url=config.goodmap_frontend_lib_url,
             plugin_manifest=plugin_manifest,
             marker_styles=marker_styles,
+            initial_view=initial_view,
         )
 
     @goodmap.route("/goodmap-admin")

goodmap/templates/map.html

@@ -121,6 +121,7 @@
 window.FEATURE_FLAGS = {{ feature_flags | tojson }};
 window.PLUGIN_MANIFEST = {{ plugin_manifest | tojson }};
 window.MARKER_STYLES = {{ marker_styles | tojson }};
+window.INITIAL_VIEW = {{ initial_view | tojson }};
 </script>
 <script src="{{ goodmap_frontend_lib_url }}" crossorigin="anonymous"></script>
 {% endblock %}

tests/unit_tests/test_db.py

@@ -24,6 +24,7 @@
     google_json_db_get_categories,
     google_json_db_get_category_data,
     google_json_db_get_data,
+    google_json_db_get_initial_view,
     google_json_db_get_location_obligatory_fields,
     google_json_db_get_locations_paginated,
     google_json_db_get_marker_styles,
@@ -38,6 +39,7 @@
     json_db_get_categories,
     json_db_get_category_data,
     json_db_get_data,
+    json_db_get_initial_view,
     json_db_get_location_obligatory_fields,
     json_db_get_locations,
     json_db_get_report,
@@ -57,6 +59,7 @@
     json_file_db_get_categories,
     json_file_db_get_category_data,
     json_file_db_get_data,
+    json_file_db_get_initial_view,
     json_file_db_get_location_obligatory_fields,
     json_file_db_get_locations,
     json_file_db_get_locations_paginated,
@@ -81,6 +84,7 @@
     mongodb_db_get_categories,
     mongodb_db_get_category_data,
     mongodb_db_get_data,
+    mongodb_db_get_initial_view,
     mongodb_db_get_location,
     mongodb_db_get_location_obligatory_fields,
     mongodb_db_get_locations,
@@ -340,6 +344,91 @@ def test_json_file_db_get_marker_styles_empty():
     assert result == {}
 
 
+# ------------------------------------------------
+# get_initial_view
+#
+# Every backend returns the raw config untouched; resolve_initial_view fills the blanks in,
+# so "declared nothing" has to reach it as {} rather than as a backend's own guess at a view.
+
+
+@mock.patch(
+    "builtins.open",
+    mock.mock_open(
+        read_data=json.dumps({"map": {"initial_view": {"center": [53.37, 22.89], "zoom": 8}}})
+    ),
+)
+def test_json_file_db_get_initial_view():
+    db = JsonFile("/fake/path/data.json")
+    assert json_file_db_get_initial_view(db) == {"center": [53.37, 22.89], "zoom": 8}
+
+
+@mock.patch("builtins.open", mock.mock_open(read_data=json.dumps({"map": {}})))
+def test_json_file_db_get_initial_view_empty():
+    db = JsonFile("/fake/path/data.json")
+    assert json_file_db_get_initial_view(db) == {}
+
+
+def test_json_db_get_initial_view():
+    db = in_memory_json_db({"initial_view": {"center": [10.0, 20.0], "zoom": 3, "max_zoom": 12}})
+    assert json_db_get_initial_view(db) == {"center": [10.0, 20.0], "zoom": 3, "max_zoom": 12}
+
+
+def test_json_db_get_initial_view_empty():
+    assert json_db_get_initial_view(in_memory_json_db({})) == {}
+
+
+@mock.patch("platzky.db.google_json_db.Client")
+def test_google_json_db_get_initial_view(mock_cli):
+    blob = mock_cli.return_value.bucket.return_value.blob.return_value
+    blob.download_as_text.return_value = json.dumps(
+        {"map": {"initial_view": {"center": [53.37, 22.89], "max_zoom": 17}}}
+    )
+    db = GoogleJsonDb("bucket", "blob")
+    assert google_json_db_get_initial_view(db) == {"center": [53.37, 22.89], "max_zoom": 17}
+
+
+@mock.patch("platzky.db.google_json_db.Client")
+def test_google_json_db_get_initial_view_empty(mock_cli):
+    mock_cli.return_value.bucket.return_value.blob.return_value.download_as_text.return_value = (
+        json.dumps({"map": {}})
+    )
+    db = GoogleJsonDb("bucket", "blob")
+    assert google_json_db_get_initial_view(db) == {}
+
+
+@mock.patch("platzky.db.mongodb_db.MongoClient")
+def test_mongodb_db_get_initial_view(mock_client):
+    mock_db = mock.Mock()
+    mock_client.return_value.__getitem__.return_value = mock_db
+    mock_db.config.find_one.return_value = {
+        "_id": "map_config",
+        "initial_view": {"center": [53.37, 22.89], "zoom": 8},
+    }
+
+    db = MongoDB("mongodb://localhost:27017", "test_db")
+    assert mongodb_db_get_initial_view(db) == {"center": [53.37, 22.89], "zoom": 8}
+
+
+@mock.patch("platzky.db.mongodb_db.MongoClient")
+def test_mongodb_db_get_initial_view_empty(mock_client):
+    mock_db = mock.Mock()
+    mock_client.return_value.__getitem__.return_value = mock_db
+    mock_db.config.find_one.return_value = {"_id": "map_config"}
+
+    db = MongoDB("mongodb://localhost:27017", "test_db")
+    assert mongodb_db_get_initial_view(db) == {}
+
+
+@mock.patch("platzky.db.mongodb_db.MongoClient")
+def test_mongodb_db_get_initial_view_no_config(mock_client):
+    mock_db = mock.Mock()
+    mock_client.return_value.__getitem__.return_value = mock_db
+    mock_db.config.find_one.return_value = None
+
+    db = MongoDB("mongodb://localhost:27017", "test_db")
+    assert mongodb_db_get_initial_view(db) == {}
+
+
 # Test get_visible_data and get_meta_data for google_json_db
 @mock.patch("platzky.db.google_json_db.Client")
 def test_google_json_db_get_visible_data(mock_cli):

tests/unit_tests/test_goodmap.py

@@ -18,6 +18,7 @@
 from goodmap import goodmap
 from goodmap.config import GoodmapConfig
 from goodmap.feature_flags import EnableAdminPanel
+from goodmap.initial_view import DEFAULT_CENTER, DEFAULT_MAX_ZOOM, DEFAULT_ZOOM
 from goodmap.plugin import (
     CAPABILITY_BASES,
     MapOverlayPluginBase,
@@ -45,9 +46,11 @@ def test_create_app_from_config():
             patch("goodmap.goodmap.get_location_obligatory_fields", return_value=[]),
             patch("goodmap.goodmap.get_category_data") as mock_get_category_data,
             patch("goodmap.goodmap.get_marker_styles") as mock_get_marker_styles,
+            patch("goodmap.goodmap.get_initial_view") as mock_get_initial_view,
         ):
             mock_get_category_data.return_value.return_value = {"categories": {}}
             mock_get_marker_styles.return_value.return_value = {}
+            mock_get_initial_view.return_value.return_value = {}
             goodmap.create_app_from_config(config)
             mock_platzky_app_creation.assert_called_once_with(
                 config,
@@ -166,6 +169,69 @@ def test_map_route_marker_styles():
     assert 'window.MARKER_STYLES={"colors":{},"icons":{}};' in response.data.decode("utf-8")
 
 
+def test_map_route_initial_view():
+    """The map opens where the data source says, via window.INITIAL_VIEW.
+
+    The view is resolved server-side into a complete {center, zoom, max_zoom}, so the
+    frontend never has to merge a partial declaration against defaults of its own.
+    """
+    app = goodmap.create_app_from_config(
+        GoodmapConfig(
+            APP_NAME="test_app",
+            SECRET_KEY="test_secret",
+            USE_WWW=False,
+            BLOG_PREFIX="/blog",
+            DB=JsonDbConfig(
+                DATA={
+                    "site_content": {"pages": []},
+                    "initial_view": {"center": [53.37, 22.89], "zoom": 8, "max_zoom": 17},
+                },
+                TYPE="json",
+            ),
+        )
+    )
+    app.config["WTF_CSRF_ENABLED"] = False  # NOSONAR
+
+    response_text = app.test_client().get("/map").data.decode("utf-8")
+    match = re.search(r"window\.INITIAL_VIEW\s*=\s*(.*?);", response_text)
+    assert match is not None
+    assert json.loads(match.group(1)) == {
+        "center": [53.37, 22.89],
+        "zoom": 8,
+        "max_zoom": 17,
+    }
+
+
+def test_map_route_initial_view_defaults_when_the_data_source_declares_none():
+    """Declaring a view is optional, and the page still gets a complete one - which is what
+    lets the frontend treat a missing window.INITIAL_VIEW as an error case rather than a
+    routine one."""
+    app = goodmap.create_app_from_config(_minimal_config())
+    app.config["WTF_CSRF_ENABLED"] = False  # NOSONAR
+
+    response_text = app.test_client().get("/map").data.decode("utf-8")
+    match = re.search(r"window\.INITIAL_VIEW\s*=\s*(.*?);", response_text)
+    assert match is not None
+    assert json.loads(match.group(1)) == {
+        "center": list(DEFAULT_CENTER),
+        "zoom": DEFAULT_ZOOM,
+        "max_zoom": DEFAULT_MAX_ZOOM,
+    }
+
+
+def test_map_route_initial_view_stays_in_step_with_startup():
+    """Resolved once at startup, like marker_styles: a view cannot change without a
+    restart, and a per-request read would only add a chance of the two disagreeing."""
+    app = goodmap.create_app_from_config(_minimal_config())
+    app.config["WTF_CSRF_ENABLED"] = False  # NOSONAR
+
+    with mock.patch.object(app.db, "get_initial_view") as fresh_read:
+        response_text = app.test_client().get("/map").data.decode("utf-8")
+
+    fresh_read.assert_not_called()
+    assert "INITIAL_VIEW" in response_text
+
+
 def test_map_route_marker_styles_stay_in_step_with_the_api():
     """window.MARKER_STYLES comes from the startup-time config, not a fresh read per
     request. The field /api/locations reads marker.icon from is fixed at startup, so a