diff --git a/backend/app/api/v1/lego_assembly.py b/backend/app/api/v1/lego_assembly.py
index d0452e7a7..7814cd72c 100644
--- a/backend/app/api/v1/lego_assembly.py
+++ b/backend/app/api/v1/lego_assembly.py
@@ -1324,9 +1324,22 @@ def _public_realm_recipe_for_zone(
validate_street_plan_centerline_wgs84(
source_geometry,
properties.get("plan_centerline"),
+ properties=properties,
)
)
if not centerline_is_valid:
+ from app.services.native_modular_bridge import is_modular_bridge
+
+ if is_modular_bridge(properties):
+ raise HTTPException(
+ status_code=422,
+ detail={
+ "code": "invalid_plan_centerline",
+ "message": "Keep the bridge footprint aligned with its current supported two-endpoint route.",
+ "zone_id": str(zone.id),
+ "kind": kind,
+ },
+ )
recovered_centerline = recover_street_plan_centerline_wgs84(source_geometry)
if recovered_centerline and validate_street_plan_centerline_wgs84(
source_geometry,
diff --git a/backend/app/data/project_detail_models.json b/backend/app/data/project_detail_models.json
index 16bfe4509..a2a874d69 100644
--- a/backend/app/data/project_detail_models.json
+++ b/backend/app/data/project_detail_models.json
@@ -687,6 +687,16 @@
"detail-yyc-district-barrier-seventeenth-ave",
"detail-yyc-district-barrier-seventeenth-ave-single",
"detail-yyc-city-ghost-barrier",
- "detail-yyc-city-ghost-barrier-pink"
+ "detail-yyc-city-ghost-barrier-pink",
+ "detail-yyc-scooter-corral-plain",
+ "detail-yyc-scooter-corral-foothills",
+ "detail-yyc-scooter-corral-chinook",
+ "detail-yyc-scooter-corral-river",
+ "detail-yyc-scooter-corral-mosaic",
+ "detail-yyc-scooter-corral-chevron",
+ "detail-yyc-scooter-corral-quilt",
+ "detail-yyc-scooter-corral-aspen",
+ "detail-yyc-scooter-corral-confetti",
+ "detail-yyc-scooter-corral-bird-lime"
]
}
diff --git a/backend/app/schemas/direct_3d_render.py b/backend/app/schemas/direct_3d_render.py
index 5ae0091e2..4a9858da7 100644
--- a/backend/app/schemas/direct_3d_render.py
+++ b/backend/app/schemas/direct_3d_render.py
@@ -30,6 +30,7 @@
"photomontage",
"development",
"atmospheric",
+ "movie-still",
"after-rain",
"autumn",
"winter",
diff --git a/backend/app/services/direct_3d_render.py b/backend/app/services/direct_3d_render.py
index 86509cdc0..edabca077 100644
--- a/backend/app/services/direct_3d_render.py
+++ b/backend/app/services/direct_3d_render.py
@@ -3217,6 +3217,7 @@ def assess_reproject_output_sanity(
"photomontage": "a polished architectural photomontage integrated seamlessly into the photographed city",
"development": "a completed-development visualization with crisp facades, credible roofs and public realm",
"atmospheric": "warm atmospheric architectural photography with soft haze, directional light and planted depth",
+ "movie-still": "a live-action film still with believable light, gentle highlight roll-off and fine film grain",
"after-rain": "architectural photography after a shower, with diffuse daylight, damp paving and small broken reflections",
"autumn": "architectural photography in early autumn, with low sunlight and varied gold, copper and green deciduous foliage",
"winter": "convincing winter architectural photography with seasonal vegetation, snow and cold daylight",
@@ -3352,6 +3353,7 @@ def _presentation_prompt(
"photomontage",
"development",
"atmospheric",
+ "movie-still",
"after-rain",
"autumn",
"winter",
diff --git a/backend/app/services/native_bridge_clearance.py b/backend/app/services/native_bridge_clearance.py
index fa4e77f9e..de655d49a 100644
--- a/backend/app/services/native_bridge_clearance.py
+++ b/backend/app/services/native_bridge_clearance.py
@@ -15,8 +15,42 @@
_AREA_TOLERANCE_M2 = 1e-6
+def validate_modular_bridge_footprint(geometry, properties):
+ """Match a source bridge to its authored axis, even when width > span.
+
+ Generic road principal-axis recovery is not valid for these wide stair and
+ approach reservations. Retain the same 10 cm corridor tolerance as clearance.
+ """
+ validate_specialist_properties(properties)
+ if not isinstance(geometry, Polygon) or geometry.is_empty or not geometry.is_valid or geometry.interiors:
+ raise ValueError("Keep a complete valid modular bridge footprint.")
+ profile = modular_bridge_profile(properties["road_selected_variant_id"])
+ route = properties["plan_centerline"]
+ if not isinstance(route, list):
+ raise ValueError("Modular bridge clearance requires its explicit saved two-endpoint coordinate array.")
+ origin = route[0]
+ sx = 111320 * math.cos(math.radians(origin[1]))
+
+ def local(point):
+ return ((point[0] - origin[0]) * sx, (point[1] - origin[1]) * 111320)
+
+ dx, dy = local(route[-1])
+ length = math.hypot(dx, dy)
+ ux, uy = dx / length, dy / length
+ half = profile["widthM"] / 2
+ occupied = Polygon(
+ [
+ (ux * along - uy * across, uy * along + ux * across)
+ for along, across in ((0, -half), (length, -half), (length, half), (0, half))
+ ]
+ )
+ footprint = Polygon([local(point) for point in geometry.exterior.coords])
+ if not occupied.buffer(0.1).covers(footprint) or not footprint.buffer(0.1).covers(occupied):
+ raise ValueError("Keep the modular bridge footprint aligned with its current saved two-endpoint route.")
+
+
def _validate_bridge_pair(bridge_coordinates, bridge_properties, other_coordinates, other_properties):
- validate_specialist_properties(bridge_properties)
+ validate_modular_bridge_footprint(Polygon(bridge_coordinates), bridge_properties)
profile = modular_bridge_profile(bridge_properties["road_selected_variant_id"])
route = bridge_properties["plan_centerline"]
if not isinstance(route, list):
@@ -41,9 +75,6 @@ def corridor(start, end):
)
occupied = corridor(0, length)
- footprint = Polygon([local(point) for point in bridge_coordinates])
- if not occupied.buffer(0.1).covers(footprint) or not footprint.buffer(0.1).covers(occupied):
- raise ValueError("Keep the modular bridge footprint aligned with its current saved two-endpoint route.")
other = Polygon([local(point) for point in other_coordinates])
overlap = occupied.intersection(other)
if overlap.area <= _AREA_TOLERANCE_M2:
diff --git a/backend/app/services/plan_geometry/generator.py b/backend/app/services/plan_geometry/generator.py
index b646d491b..d4582c6ed 100644
--- a/backend/app/services/plan_geometry/generator.py
+++ b/backend/app/services/plan_geometry/generator.py
@@ -383,6 +383,8 @@ def recover_street_plan_centerline_wgs84(
def validate_street_plan_centerline_wgs84(
zone_wgs84: BaseGeometry,
value: Any,
+ *,
+ properties: dict[str, Any] | None = None,
) -> bool:
"""Whether saved centreline metadata still describes this street polygon.
@@ -421,6 +423,20 @@ def validate_street_plan_centerline_wgs84(
return False
coordinates.append((longitude, latitude))
+ # Source bridge reservations can be wider than their shortest valid span.
+ # Their exact two-point programme and full footprint, not the polygon's
+ # longest edge, define the travel axis. Ordinary road recovery stays strict.
+ from app.services.native_modular_bridge import is_modular_bridge
+
+ if is_modular_bridge(properties):
+ from app.services.native_bridge_clearance import validate_modular_bridge_footprint
+
+ try:
+ validate_modular_bridge_footprint(zone_wgs84, {**properties, "plan_centerline": value})
+ except (ValueError, TypeError, KeyError):
+ return False
+ return True
+
try:
centerline_wgs84 = LineString(coordinates)
except (TypeError, ValueError):
diff --git a/backend/app/services/public_realm_lego.py b/backend/app/services/public_realm_lego.py
index 2ca09ab3d..4f4f3cdea 100644
--- a/backend/app/services/public_realm_lego.py
+++ b/backend/app/services/public_realm_lego.py
@@ -37,7 +37,6 @@
project_geometry,
)
-
PUBLIC_REALM_RECIPE_PROPERTY = "public_realm_lego"
PUBLIC_REALM_FALLBACK_PROPERTY = "public_realm_fallback"
PUBLIC_REALM_SCHEMA_VERSION = 1
@@ -2769,7 +2768,7 @@ def plan_public_realm_zone_recipe(
if is_street and props.get("plan_centerline") is not None:
from app.services.plan_geometry.generator import validate_street_plan_centerline_wgs84
- if validate_street_plan_centerline_wgs84(geometry_wgs84, props["plan_centerline"]):
+ if validate_street_plan_centerline_wgs84(geometry_wgs84, props["plan_centerline"], properties=props):
centerline_metric = project_geometry(LineString(props["plan_centerline"]), transformer)
if is_modular_bridge(props):
from app.services.native_modular_bridge import modular_bridge_route_length
@@ -2777,9 +2776,11 @@ def plan_public_realm_zone_recipe(
width = props["width"]
if centerline_metric is None:
raise ValueError("Modular bridge needs its current two-endpoint route inside the occupied footprint.")
- ribbon = centerline_metric.buffer(width / 2, cap_style=2, join_style=2)
- if not ribbon.buffer(0.1).covers(metric_geometry) or not metric_geometry.buffer(0.1).covers(ribbon):
- raise ValueError("Keep the complete modular bridge footprint at its native width and route length.")
+ from app.services.native_bridge_clearance import validate_modular_bridge_footprint
+
+ # Match the source bridge's authored metric frame for both length and
+ # occupied width. UTM reprojection can shift a wide ring's edge >10 cm.
+ validate_modular_bridge_footprint(geometry_wgs84, props)
target = StreetSegmentTarget(
row_width_m=width, length_m=round(modular_bridge_route_length(props["plan_centerline"]), 3)
)
diff --git a/backend/tests/test_bridge_drawn_centerline.py b/backend/tests/test_bridge_drawn_centerline.py
new file mode 100644
index 000000000..a662849f2
--- /dev/null
+++ b/backend/tests/test_bridge_drawn_centerline.py
@@ -0,0 +1,89 @@
+"""A source bridge's valid span may be shorter than its occupied width."""
+
+import copy
+import math
+import uuid
+
+import pytest
+from fastapi import HTTPException
+from geoalchemy2.shape import from_shape
+from shapely.geometry import Polygon
+
+from app.api.v1.lego_assembly import _public_realm_recipe_for_zone
+from app.models.models import SiteZone
+from app.services.native_modular_bridge import MODULAR_BRIDGE_IDENTITIES, modular_bridge_profile
+from app.services.native_source_bridge import SOURCE_BRIDGE_LANES
+from app.services.plan_geometry.generator import validate_street_plan_centerline_wgs84
+
+
+def source(length=None, angle=0, variant="weathering_steel_v_footbridge_route_v1"):
+ profile = modular_bridge_profile(variant)
+ length = length or profile["program"]["minLengthM"] + 0.001
+ width = profile["widthM"]
+ sx = 111320 * math.cos(math.radians(51))
+
+ def point(along, across=0):
+ return [
+ -114 + (along * math.cos(angle) - across * math.sin(angle)) / sx,
+ 51 + (along * math.sin(angle) + across * math.cos(angle)) / 111320,
+ ]
+
+ polygon = Polygon([point(0, -width / 2), point(length, -width / 2), point(length, width / 2), point(0, width / 2)])
+ props = {
+ "road_selected_variant_id": variant,
+ "road_archetype_id": profile["sourceArchetypeId"],
+ "width": width,
+ "lane_count": SOURCE_BRIDGE_LANES.get(variant, 0),
+ "plan_centerline": [point(0), point(length)],
+ "plan_route_controls": [point(0), point(length)],
+ }
+ return polygon, props
+
+
+@pytest.mark.parametrize("angle", [0, 0.7, math.pi / 2, math.pi])
+def test_native_bridge_compiler_preserves_a_valid_shorter_than_width_authored_span(angle):
+ polygon, props = source(angle=angle)
+ before = copy.deepcopy(props)
+ zone = SiteZone(id=uuid.uuid4(), zone_type="road", geometry=from_shape(polygon, srid=4326), properties=props)
+ recipe = _public_realm_recipe_for_zone(zone, "street")
+ assert recipe["variant_id"] == props["road_selected_variant_id"]
+ assert recipe["target"]["row_width_m"] == 52
+ assert recipe["target"]["length_m"] == pytest.approx(48.987, abs=0.002)
+ assert zone.properties == before
+
+
+@pytest.mark.parametrize("damage", ["shift", "width", "length", "bend", "missing", "nonfinite"])
+def test_native_bridge_centerline_dispatch_rejects_stale_or_forged_geometry(damage):
+ polygon, props = source()
+ if damage == "shift":
+ props["plan_centerline"] = [[x + 0.0001, y] for x, y in props["plan_centerline"]]
+ elif damage == "width":
+ props["width"] = 51
+ elif damage == "length":
+ props["plan_centerline"][1][0] += 0.001
+ elif damage == "bend":
+ props["plan_centerline"].insert(1, [-114.0001, 51.0001])
+ elif damage == "missing":
+ props.pop("plan_centerline")
+ else:
+ props["plan_centerline"][0][0] = math.nan
+ assert not validate_street_plan_centerline_wgs84(polygon, props.get("plan_centerline"), properties=props)
+ zone = SiteZone(id=uuid.uuid4(), zone_type="road", geometry=from_shape(polygon, srid=4326), properties=props)
+ with pytest.raises(HTTPException) as exc:
+ _public_realm_recipe_for_zone(zone, "street")
+ assert exc.value.status_code == 422
+ assert "public_realm_lego" not in zone.properties
+
+
+@pytest.mark.parametrize("variant", list(MODULAR_BRIDGE_IDENTITIES))
+@pytest.mark.parametrize("bound", ["minLengthM", "maxLengthM"])
+@pytest.mark.parametrize("angle", [0, 0.7, math.pi / 2, math.pi])
+def test_bridge_minimum_and_maximum_spans_compile_in_the_authored_metric_frame(variant, bound, angle):
+ program = modular_bridge_profile(variant)["program"]
+ length = program[bound] + (0.001 if bound == "minLengthM" else -0.001)
+ polygon, props = source(length=length, angle=angle, variant=variant)
+ zone = SiteZone(id=uuid.uuid4(), zone_type="road", geometry=from_shape(polygon, srid=4326), properties=props)
+ recipe = _public_realm_recipe_for_zone(zone, "street")
+ assert recipe["variant_id"] == variant
+ assert recipe["target"]["length_m"] == pytest.approx(length, abs=0.001)
+ assert zone.properties["plan_centerline"] == props["plan_centerline"]
diff --git a/backend/tests/test_direct_3d_render.py b/backend/tests/test_direct_3d_render.py
index 3a651bd73..3dd5b6642 100644
--- a/backend/tests/test_direct_3d_render.py
+++ b/backend/tests/test_direct_3d_render.py
@@ -2355,9 +2355,13 @@ def test_provider_first_prompts_use_one_concise_natural_design_lock():
@pytest.mark.parametrize("view_mode", ["aerial", "street"])
@pytest.mark.parametrize(
("style", "treatment"),
- [("after-rain", "broken reflections"), ("autumn", "deciduous foliage")],
+ [
+ ("movie-still", "gentle highlight roll-off"),
+ ("after-rain", "broken reflections"),
+ ("autumn", "deciduous foliage"),
+ ],
)
-def test_seasonal_presentation_keeps_the_source_camera(style, treatment, view_mode):
+def test_photographic_preset_keeps_the_source_camera(style, treatment, view_mode):
request = _request(presentation_mode="scene", style=style, fidelity_policy="balanced")
prompt = _presentation_prompt(
"",
diff --git a/backend/tests/test_project_details.py b/backend/tests/test_project_details.py
index acae925fc..6ca8fae52 100644
--- a/backend/tests/test_project_details.py
+++ b/backend/tests/test_project_details.py
@@ -434,7 +434,7 @@ async def test_claude_detail_packs_save_reload_and_preserve_legacy_details(monke
root = Path(__file__).resolve().parents[2]
choices = json.loads((root / "frontend/src/features/parks/detailCatalogueExtras.json").read_text(encoding="utf-8"))
choices = [c for c in choices if c.get("sourceKit") in {"calgary-details-v1", "prairie-foliage-v1"}]
- assert len(choices) == 240
+ assert len(choices) == 250
placements = {"trees": [], "props": []}
for choice in choices:
field = "trees" if choice["kind"] == "tree" else "props"
@@ -442,7 +442,7 @@ async def test_claude_detail_packs_save_reload_and_preserve_legacy_details(monke
{"id": choice["id"], "lng": -114.1, "lat": 51.05, "angle": 45, "variant": choice["id"]}
)
assert len(placements["trees"]) == 50
- assert len(placements["props"]) == 190
+ assert len(placements["props"]) == 200
monkeypatch.setattr(endpoint, "check_project_permission", AsyncMock(return_value="editor"))
db, row = session({"other": {"keep": True}})
project_id = uuid.uuid4()
@@ -468,7 +468,7 @@ def test_expanded_catalogue_accepts_existing_kit_parts_and_matches_frontend():
root = Path(__file__).resolve().parents[2]
choices = json.loads((root / "frontend/src/features/parks/detailCatalogueExtras.json").read_text())
- assert len(choices) == 395
+ assert len(choices) == 405
choices += json.loads((root / "frontend/src/features/parks/recoveredDetails.json").read_text())
choices += json.loads((root / "frontend/src/features/parks/trafficSafetyCatalogue.json").read_text())
# Local preview IDs must round-trip before their public picker gate is lifted.
diff --git a/docs/SCOOTER_CORRALS_2026-11-18.md b/docs/SCOOTER_CORRALS_2026-11-18.md
new file mode 100644
index 000000000..f462ea5b9
--- /dev/null
+++ b/docs/SCOOTER_CORRALS_2026-11-18.md
@@ -0,0 +1,137 @@
+# E-scooter corrals for Add details
+
+## Scope
+
+Add the City of Calgary's e-scooter corral: the galvanized pipe enclosure with
+four art panels that the City places on sidewalks and curb extensions for shared
+e-scooters. It extends `calgary-details-v1` (now 164 objects, IDs prefixed
+`detail-yyc-`), with a tenth version that has a shared fleet parked inside.
+
+All scooter items sit in a new category, **Shared micromobility**, with its own
+tile: a scooter parked in front of a corral. The category holds the ten corrals
+below and the older e-scooter parking corral, which moved there from Street
+furniture. Searching `e-scooter corral` lists all eleven.
+
+| Item | Panels | Triangles |
+|---|---|---:|
+| E-scooter corral · plain panels | Blank, ready for art | 1,222 |
+| E-scooter corral · Foothills sunrise | Sunrise over peaks, foothills and prairie | 3,060 |
+| E-scooter corral · Chinook arch | Chinook arch of sunset cloud over the range | 2,906 |
+| E-scooter corral · River ribbons | Flowing bands of river blue and green | 2,606 |
+| E-scooter corral · Triangle mosaic | Bright mosaic of irregular triangles | 1,724 |
+| E-scooter corral · Chevrons | Bold zigzag chevrons | 1,802 |
+| E-scooter corral · Prairie quilt | Quilt blocks of barn red, mustard and denim | 1,606 |
+| E-scooter corral · Aspen grove | White aspen trunks under a gold canopy | 1,848 |
+| E-scooter corral · Confetti | Bright dots on deep teal | 2,962 |
+| E-scooter corral · Bird and Lime fleet | Triangle mosaic, with two scooters and an e-bike from each fleet parked inside | 3,408 |
+
+The older **E-scooter parking corral** (`detail-yyc-scooter-corral`), a painted
+on-street bay with a low rail, a sign and four scooters, is a different thing.
+Its model is unchanged; only its category moved. Projects save item IDs, not
+categories, so placed corrals are unaffected.
+
+## Source
+
+The City's standard drawing **P2023-589-0001A**, "E-scooter corrals assembly",
+Fleet Services, initial release 2024-02-21, sheets 1 and 2, supplied with two
+photographs of corrals in use. The drawing and photographs are not kept in the
+repository.
+
+Read from the drawing, in inches:
+
+- A U of 1-1/2 in schedule 40 galvanized pipe, 1.900 in outside, open on one
+ long side. Posts stand 48 in apart, centre to centre: three along the long
+ side, 96 in, and one at the open end of each 48 in return. Five posts in all.
+- Each post stands in a floor flange. Slip-on rail fittings join the posts and
+ rails: a 90° elbow at the top of each open-end post, a three-way corner at the
+ two long-side corners, a tee at the top of the middle post, and through-tees
+ at the bottom rail.
+- Two rails to each of the four bays, 28 in apart centre to centre. The fittings
+ top out at 36 in.
+- Four identical panels, 40 by 26 in, each held to its rails by four clamps.
+
+## What was built
+
+- Every dimension above, in metres from inches. The model is 2.61 by 1.32 m over
+ its flanges and 0.92 m tall. The long side runs along x; the open side faces
+ the other way.
+- Posts and rails are 8-sided pipes. Each fitting is drawn as one squarish
+ block per pipe that enters it, which closes the corner between them as the
+ cast fittings do. Each flange is an oval plate with a socket. Each clamp is a
+ collar on the rail with a lug over the panel's edge.
+- Panels are 6 mm thick, centred in the plane of their rails.
+
+**The artwork is original.** The photographs show corrals wrapped with real
+artists' murals. Those belong to their artists and are not reproduced. The
+panels carry the eight original designs already painted on the road barriers
+([mural barriers](MURAL_BARRIERS_2026-11-17.md)), so a corral can match the
+barriers beside a patio. Each design keeps its true proportions: one panel
+shows 1.16 m of the 3 m mural at full height. The four outer faces run as one
+continuous strip, from the left return round the long side to the right
+return, and the inner faces run the other way round, so the picture also reads
+continuously from inside. Each face reads left to right when faced. As on the
+barriers, a mural replaces the panel's face rather than lying on it, so nothing
+can flicker.
+
+The files follow the kit convention: linear vertex colours, flat normals, one
+matte mesh, no textures. The ten total 2,650,396 bytes and 23,144 triangles,
+each under the kit's limit of 3,500 triangles and 400 KB. The 155 earlier
+models are byte-identical.
+
+## The Bird and Lime fleet version
+
+Asked for by name: the Triangle mosaic corral with shared vehicles parked inside,
+two Bird scooters, two Lime scooters, a Bird e-bike and a Lime e-bike
+([review and card](calgary-details-v1/scooter-corral-fleet.jpg)).
+
+- **Colours only.** Lime's vehicles are lime green and white, Bird's black with
+ white details. No logos or wordmarks are drawn; the names and their marks
+ belong to their companies, and the description says so.
+- **Lean models.** The kit's bicycle is 1,388 triangles, too many for six vehicles
+ in one item, so the fleet has its own: a stand-up scooter of 252 triangles and a
+ step-through e-bike of 376, on solid cast wheels with a front basket, rear rack,
+ battery and centre stand.
+- **Parked nose-in.** Every vehicle points at the long side, as riders leave
+ them. The scooters stand alternately deeper and shallower, so their handlebars
+ pass one another. The e-bikes are 1.76 m long, longer than the corral is deep,
+ so their rear wheels stand out of the open side; the item is 1.86 m deep.
+- **Turned half round.** This version alone has its open side toward the viewer,
+ so the card shows the fleet rather than the back of the panels. Rotate it after
+ placing like any other item.
+- 3,408 triangles and 389,724 bytes, inside the kit's limits. A tools test
+ requires every vehicle to stand on the ground, clear of both returns and short
+ of the long side's panel.
+
+## Verification
+
+- Every corral was rendered at eye level, oblique and card size, and reviewed:
+ [review sheet](calgary-details-v1/scooter-corral-review.jpg),
+ [close views](calgary-details-v1/scooter-corral-close.jpg),
+ [catalogue cards](calgary-details-v1/scooter-corral-cards.jpg). Agent review
+ passed; independent human visual acceptance is open.
+- A tools test checks the drawing's dimensions: 96 by 48 in between post
+ centres, about 36 in tall, rails 28 in apart, five posts, 40 by 26 in panels.
+ It requires each of the eight panel faces to be covered by its artwork exactly
+ once, with no gap and nothing past a panel's edge, and each design to carry the
+ same name and colour as the road barrier of that name.
+- A tools test requires all ten scooter items, and only them, in Shared
+ micromobility, and a tile drawing for the category. A frontend test requires
+ the category to list exactly these ten, and Street furniture to list none.
+- The tools, hosted-asset, frontend park and backend detail tests pass, with 249
+ local rows and 405 extras.
+- Runtime asset manifest: 6,009 required files (+20). The manifest generator
+ needs every referenced file on disk, including the 370 recovered details, which
+ are not tracked files. They were installed from their archive in Git LFS with
+ `scripts/hydrate_recovered_details.py`, which checks every hash, and removed
+ afterwards. The only rows that changed are the 20 new files and the totals, and
+ one source file added by the latest release merge.
+
+- Lint with zero warnings and the type check pass on the changed files.
+- Production build with CI settings, then `check-budget`: all budgets met, with
+ 7,212.0 KB of JavaScript against 8,512 KB. This was measured before the
+ category tile was added; the tile is one small SVG drawing. The build needs the
+ recovered details on disk; they were installed from their archive in Git LFS
+ with `scripts/hydrate_recovered_details.py`, which checks every file's hash, and
+ removed afterwards.
+
+Not done here: placing them on the live map, which needs a real map key.
diff --git a/docs/calgary-details-v1/scooter-corral-cards.jpg b/docs/calgary-details-v1/scooter-corral-cards.jpg
new file mode 100644
index 000000000..1e93652d8
Binary files /dev/null and b/docs/calgary-details-v1/scooter-corral-cards.jpg differ
diff --git a/docs/calgary-details-v1/scooter-corral-close.jpg b/docs/calgary-details-v1/scooter-corral-close.jpg
new file mode 100644
index 000000000..711c86e59
Binary files /dev/null and b/docs/calgary-details-v1/scooter-corral-close.jpg differ
diff --git a/docs/calgary-details-v1/scooter-corral-fleet.jpg b/docs/calgary-details-v1/scooter-corral-fleet.jpg
new file mode 100644
index 000000000..2ed4f7587
Binary files /dev/null and b/docs/calgary-details-v1/scooter-corral-fleet.jpg differ
diff --git a/docs/calgary-details-v1/scooter-corral-review.jpg b/docs/calgary-details-v1/scooter-corral-review.jpg
new file mode 100644
index 000000000..929142163
Binary files /dev/null and b/docs/calgary-details-v1/scooter-corral-review.jpg differ
diff --git a/frontend/e2e/projects.spec.ts b/frontend/e2e/projects.spec.ts
index d5ef47146..fd27288fd 100644
--- a/frontend/e2e/projects.spec.ts
+++ b/frontend/e2e/projects.spec.ts
@@ -262,4 +262,22 @@ test.describe('Project management', () => {
await expect(page.getByRole('button', { name, exact: true })).toHaveCount(0);
}
});
+
+ test('scrolls from More Tools to the lower controls in a short workspace', async ({ page }) => {
+ await page.setViewportSize({ width: 1240, height: 620 });
+ await authenticateUser(page);
+
+ await page.route('**/api/v1/projects/proj-1', route => route.fulfill({ json: MOCK_PROJECTS[0] }));
+ await page.route('**/api/v1/activity/**', route => route.fulfill({ json: [] }));
+ await page.route('**/api/v1/annotations/**', route => route.fulfill({ json: [] }));
+
+ await page.goto('/projects/proj-1');
+ await revealPlanningTools(page);
+
+ const water = page.getByRole('button', { name: 'Water', exact: true });
+ await expect(water).not.toBeInViewport();
+ await page.getByRole('button', { name: 'More Tools', exact: true }).hover();
+ await page.mouse.wheel(0, 540);
+ await expect(water).toBeInViewport({ ratio: 0.8 });
+ });
});
diff --git a/frontend/public/archetypes/buildings/folded_roof_market_hall/picker-street-v1.png b/frontend/public/archetypes/buildings/folded_roof_market_hall/picker-street-v1.png
new file mode 100644
index 000000000..e903d584a
--- /dev/null
+++ b/frontend/public/archetypes/buildings/folded_roof_market_hall/picker-street-v1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc619fce53fe0eb8b962782ea5f150a447d758fa35831a816ea96fb1d8ff2fc9
+size 2766668
diff --git a/frontend/public/archetypes/buildings/passage_tower/picker-street-v1.png b/frontend/public/archetypes/buildings/passage_tower/picker-street-v1.png
new file mode 100644
index 000000000..6e276412c
--- /dev/null
+++ b/frontend/public/archetypes/buildings/passage_tower/picker-street-v1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:553dd66f3a18f2d120285ff0f812a4d7fd5ffff6cf5b31b149a9776c0c13c375
+size 2263104
diff --git a/frontend/public/archetypes/buildings/terraced_science_centre/picker-street-v1.png b/frontend/public/archetypes/buildings/terraced_science_centre/picker-street-v1.png
new file mode 100644
index 000000000..4655a06d7
--- /dev/null
+++ b/frontend/public/archetypes/buildings/terraced_science_centre/picker-street-v1.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fa50f2746a9e4fbecc5305d9548b86bcfaca73fe2b8a427f6520ad1a9fc982bb
+size 2801338
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-aspen.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-aspen.glb
new file mode 100644
index 000000000..08f4ddd5e
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-aspen.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:02e4ae0b5dbcc3d04fcc3f321a7dfa029ebc296560498e261d83d4f9a7cb15dc
+size 211864
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-aspen.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-aspen.webp
new file mode 100644
index 000000000..8866fcf38
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-aspen.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-bird-lime.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-bird-lime.glb
new file mode 100644
index 000000000..3b4745006
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-bird-lime.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5181ba497daa1fa46f18aaaf5282cfa854c3e01be1028ec169fa6e38d2f03368
+size 389724
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-bird-lime.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-bird-lime.webp
new file mode 100644
index 000000000..03cacb18f
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-bird-lime.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-chevron.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chevron.glb
new file mode 100644
index 000000000..aa9cd3c75
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chevron.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e829852cc99d3ac007958c8b3c5145640352cdbfecf8464ec3f994464b501226
+size 206624
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-chevron.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chevron.webp
new file mode 100644
index 000000000..3ccaa193d
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chevron.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-chinook.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chinook.glb
new file mode 100644
index 000000000..8196fdf1c
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chinook.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:886325af44446b2a9f47b3f6c4af51384fc272866159e275f6ba60ea59ca5e4c
+size 332484
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-chinook.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chinook.webp
new file mode 100644
index 000000000..51f0f2ca0
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-chinook.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-confetti.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-confetti.glb
new file mode 100644
index 000000000..f950368f6
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-confetti.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7ebf71efd470cbe34e5c5261e5bca4f29babd2933778957b3054562bacfe9aa
+size 338872
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-confetti.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-confetti.webp
new file mode 100644
index 000000000..63c51da85
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-confetti.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-foothills.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-foothills.glb
new file mode 100644
index 000000000..c6f9fce78
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-foothills.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:52069e57008206d331dcaf44ca620de43903da1e1fd8374f8130f732b538c636
+size 350044
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-foothills.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-foothills.webp
new file mode 100644
index 000000000..50253a69c
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-foothills.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-mosaic.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-mosaic.glb
new file mode 100644
index 000000000..1be608ecb
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-mosaic.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:98507e497dbf080c9de7bef860326ff81b8eb5e03b530e429ddad5bba6d215de
+size 197732
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-mosaic.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-mosaic.webp
new file mode 100644
index 000000000..e42b2b904
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-mosaic.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-plain.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-plain.glb
new file mode 100644
index 000000000..248131666
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-plain.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:57f74d6ab2c7c6aa841eb1c2527d9a28fe6426b968b8d6552808dfcb47f86433
+size 140500
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-plain.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-plain.webp
new file mode 100644
index 000000000..79e362162
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-plain.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-quilt.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-quilt.glb
new file mode 100644
index 000000000..b16e44c34
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-quilt.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f67a1f836eb0efa082d81295cdf0b0f1c14b3a262ad320811acfc689cb4a217c
+size 184276
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-quilt.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-quilt.webp
new file mode 100644
index 000000000..fc2772a9d
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-quilt.webp differ
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-river.glb b/frontend/public/park-kits/calgary-details-v1/scooter-corral-river.glb
new file mode 100644
index 000000000..7baaa3764
--- /dev/null
+++ b/frontend/public/park-kits/calgary-details-v1/scooter-corral-river.glb
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5e52c559ee15d8a2351bd8c1292050d32aed3472e5cc967468b9d15098123449
+size 298276
diff --git a/frontend/public/park-kits/calgary-details-v1/scooter-corral-river.webp b/frontend/public/park-kits/calgary-details-v1/scooter-corral-river.webp
new file mode 100644
index 000000000..ad5c6f5a2
Binary files /dev/null and b/frontend/public/park-kits/calgary-details-v1/scooter-corral-river.webp differ
diff --git a/frontend/scripts/packed-catalogue.mjs b/frontend/scripts/packed-catalogue.mjs
index 19c82fdd9..f736b4156 100644
--- a/frontend/scripts/packed-catalogue.mjs
+++ b/frontend/scripts/packed-catalogue.mjs
@@ -12,6 +12,8 @@ const HANDOFF_CATALOGUES = /\/src\/(?:data\/(?:cataloguePlanningHistory|catalogu
const STATIC_METADATA = /\/src\/(?:data\/(?:archetypeVisualSystem|catalogueOctober2026|claudeBuildingRelease|claudeFiveTrial|courtOnlySports|finalFiveBuildingBatch|flexibleParks|localTowerStoreyPrograms|neighborhoodParkV0StickerKit|parkadeFamilyTrial|stickerMethodPilots|transportStandardEntries|aiRenderStylePresets|streetViewStylePresets)|features\/(?:policyPlans\/data\/(?:beltlinePlanIndex|localPlanIndex)|referenceLayers\/calgaryBylawCatalogue))\.json$/;
+const Z85_CATALOGUES = /\/src\/(?:data\/(?:buildingArchetypes|nativeStreetPilots|openSpaceArchetypes)|features\/parks\/detailCatalogueExtras)\.json$/;
+
/** Retain all legacy IDs, reference paths and prompts without compiling several
* megabytes of JSON into JavaScript object literals. Three already ships this
* small inflater; no additional browser dependency or network request is needed. */
@@ -82,8 +84,9 @@ export function packedCatalogue() {
}
if (!DATA_CATALOGUES.test(filename) && !FEATURE_CATALOGUES.test(filename) && !HANDOFF_CATALOGUES.test(filename) && !STATIC_METADATA.test(filename)) return null;
const source = readFileSync(id, 'utf8');
+ const encoding = Z85_CATALOGUES.test(filename) ? 'z85' : 'base64';
return { code: packCatalogue(filename.endsWith('/src/data/classroomStarter.json')
- ? productionStarter(source) : source, { encoding: /\/src\/data\/(?:buildingArchetypes|nativeStreetPilots|openSpaceArchetypes)\.json$/.test(filename) ? 'z85' : 'base64' }), map: null };
+ ? productionStarter(source) : source, { encoding }), map: null };
},
};
}
diff --git a/frontend/scripts/packed-catalogue.test.mjs b/frontend/scripts/packed-catalogue.test.mjs
index 7474bcd59..63d6ff09f 100644
--- a/frontend/scripts/packed-catalogue.test.mjs
+++ b/frontend/scripts/packed-catalogue.test.mjs
@@ -12,9 +12,14 @@ import { packCatalogue, packedCatalogue, productionStarter } from './packed-cata
const inflater = pathToFileURL(resolve('node_modules/three/examples/jsm/libs/fflate.module.js')).href;
-for (const [filename, minimumSaving] of [['buildingArchetypes.json', 20000], ['nativeStreetPilots.json', 4000], ['openSpaceArchetypes.json', 8000]]) {
- test(`${filename}: production transport recovers bridge headroom without changing catalogue values`, async () => {
- const path = resolve('src/data', filename), source = readFileSync(path, 'utf8');
+for (const [filename, minimumSaving] of [
+ ['data/buildingArchetypes.json', 20000],
+ ['data/nativeStreetPilots.json', 4000],
+ ['data/openSpaceArchetypes.json', 8000],
+ ['features/parks/detailCatalogueExtras.json', 2500],
+]) {
+ test(`${filename}: production transport reduces bundle size without changing catalogue values`, async () => {
+ const path = resolve('src', filename), source = readFileSync(path, 'utf8');
const module = packedCatalogue().transform('', path).code.replace('three/examples/jsm/libs/fflate.module.js', inflater);
const decoded = await import(`data:text/javascript,${encodeURIComponent(module)}`);
assert.deepEqual(decoded.default, JSON.parse(source));
diff --git a/frontend/src/components/viewer/AIRenderPanel.tsx b/frontend/src/components/viewer/AIRenderPanel.tsx
index 708fbbfbe..83d68501f 100644
--- a/frontend/src/components/viewer/AIRenderPanel.tsx
+++ b/frontend/src/components/viewer/AIRenderPanel.tsx
@@ -21,6 +21,7 @@ import { useAuthStore } from '@/store';
import { saveRenderedImage } from '@/utils/renderPersistence';
import { isTextEntryTarget } from '@/utils/domEvents';
import { getActiveSiteBoundary } from '@/utils/siteBoundary';
+import { MOVIE_STILL_PRESET } from './movieStillPreset';
import { AFTER_RAIN_PRESET, AUTUMN_PRESET } from './seasonalRenderPresets';
// ---------------------------------------------------------------------------
@@ -30,7 +31,7 @@ import { AFTER_RAIN_PRESET, AUTUMN_PRESET } from './seasonalRenderPresets';
// in the picker. Update this when adding a style so it lands in the right group.
const STYLE_GROUPS = [
- { label: 'Realistic', ids: ['photorealistic', 'photomontage', 'atmospheric', AFTER_RAIN_PRESET.id, AUTUMN_PRESET.id, 'winter'] },
+ { label: 'Realistic', ids: ['photorealistic', 'photomontage', 'atmospheric', MOVIE_STILL_PRESET.id, AFTER_RAIN_PRESET.id, AUTUMN_PRESET.id, 'winter'] },
{ label: 'Concept', ids: ['watercolour', 'charcoal', 'pen-and-ink'] },
{ label: 'Plan', ids: ['site-plan', 'site-plan-photo', 'blueprint', 'site-plan-watercolor'] },
{ label: 'Stylized', ids: ['isometric', 'clay-maquette', 'woodblock'] },
diff --git a/frontend/src/components/viewer/SitePlannerToolbar.tsx b/frontend/src/components/viewer/SitePlannerToolbar.tsx
index daf53fb1e..74ee4c986 100644
--- a/frontend/src/components/viewer/SitePlannerToolbar.tsx
+++ b/frontend/src/components/viewer/SitePlannerToolbar.tsx
@@ -50,6 +50,8 @@ export function SitePlannerToolbar({ onShowGuide, onToggleHistory, historyOpen,
const parksSubtype: ParksSubtype = 'park';
const [showAdvanced, setShowAdvanced] = useState(false);
const isSidebar = layout === 'sidebar';
+ // The surrounding project sheet contains scrolling in sidebar mode.
+ const scrollContainment = isSidebar ? 'overscroll-auto' : 'overscroll-contain';
const activeCoreTool = mapToolToCoreTool(activeSitePlannerTool);
const selectedParksSubtype = activeSitePlannerTool === 'parking' ? 'plaza' : activeSitePlannerTool === 'green_space' ? 'park' : parksSubtype;
const focusStyle = 'focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-[#151515]';
@@ -76,7 +78,7 @@ export function SitePlannerToolbar({ onShowGuide, onToggleHistory, historyOpen,
};
return
-
+
{placementSlot}
{!streetInPlacement && <>
{placementSlot ? 'Connect your community' : 'Draw your community'}