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'}

@@ -125,6 +127,6 @@ export function SitePlannerToolbar({ onShowGuide, onToggleHistory, historyOpen, {uploadSlot}
}
- {bottomSlot &&
{bottomSlot}
} + {bottomSlot &&
{bottomSlot}
}
; } diff --git a/frontend/src/components/viewer/StreetViewPanel.test.tsx b/frontend/src/components/viewer/StreetViewPanel.test.tsx index 248bada58..f83c4963b 100644 --- a/frontend/src/components/viewer/StreetViewPanel.test.tsx +++ b/frontend/src/components/viewer/StreetViewPanel.test.tsx @@ -219,7 +219,11 @@ describe('student street render', () => { expect(mocks.direct.mock.calls[0][1].style).toBe('watercolour'); }); - it.each([['After Rain', 'after-rain'], ['Autumn', 'autumn']])('sends the selected %s style to Direct 3D', async (label, id) => { + it.each([ + ['Movie Still', 'movie-still'], + ['After Rain', 'after-rain'], + ['Autumn', 'autumn'], + ])('sends the selected %s style to Direct 3D', async (label, id) => { const capture = vi.fn().mockResolvedValue({ kind: 'model3d', direct3d: {} }); render(); fireEvent.click(screen.getByRole('button', { name: label })); @@ -228,7 +232,11 @@ describe('student street render', () => { expect(mocks.direct.mock.calls[0][1].style).toBe(id); }); - it.each([['After Rain', 'damp paving'], ['Autumn', 'existing deciduous']])('passes %s as a photographic style to Classic street rendering', async (label, detail) => { + it.each([ + ['Movie Still', 'fine film grain'], + ['After Rain', 'damp paving'], + ['Autumn', 'existing deciduous'], + ])('passes %s as a photographic style to Classic street rendering', async (label, detail) => { mocks.classic.mockResolvedValue({ imageUrl: 'data:image/png;base64,street', prompt: 'street' }); render(); fireEvent.click(screen.getByRole('button', { name: label })); diff --git a/frontend/src/components/viewer/StreetViewPanel.tsx b/frontend/src/components/viewer/StreetViewPanel.tsx index 62bd5e57a..5c5dff492 100644 --- a/frontend/src/components/viewer/StreetViewPanel.tsx +++ b/frontend/src/components/viewer/StreetViewPanel.tsx @@ -31,6 +31,7 @@ import { ImageModelSelect } from './ImageModelSelect'; import { useImageModelChoice } from './useImageModelChoice'; import { runImageModelBatch } from './runImageModelBatch'; import { RenderStyleGuideButton } from './RenderStyleGuideButton'; +import { MOVIE_STILL_PRESET } from './movieStillPreset'; import { AFTER_RAIN_PRESET, AUTUMN_PRESET } from './seasonalRenderPresets'; const COMPASS_LABELS: Record = { @@ -40,11 +41,12 @@ const COMPASS_LABELS: Record = { const STREET_VIEW_STYLES = [ ...streetViewStylePresets, + { ...MOVIE_STILL_PRESET, prompt: `${MOVIE_STILL_PRESET.prompt} ${MOVIE_STILL_PRESET.lighting}` }, { ...AFTER_RAIN_PRESET, prompt: `${AFTER_RAIN_PRESET.prompt} ${AFTER_RAIN_PRESET.lighting}` }, { ...AUTUMN_PRESET, prompt: `${AUTUMN_PRESET.prompt} ${AUTUMN_PRESET.lighting}` }, ]; const REALISTIC_STREET_STYLE_IDS = [ - 'photorealistic', 'photomontage', 'atmospheric', AFTER_RAIN_PRESET.id, AUTUMN_PRESET.id, 'winter', + 'photorealistic', 'photomontage', 'atmospheric', MOVIE_STILL_PRESET.id, AFTER_RAIN_PRESET.id, AUTUMN_PRESET.id, 'winter', ]; // UI grouping for the style picker — Plan group omitted because street view diff --git a/frontend/src/components/viewer/globe/GlobeAIRenderPanel.direct3d.test.ts b/frontend/src/components/viewer/globe/GlobeAIRenderPanel.direct3d.test.ts index 2688f6d46..6aa92ee5e 100644 --- a/frontend/src/components/viewer/globe/GlobeAIRenderPanel.direct3d.test.ts +++ b/frontend/src/components/viewer/globe/GlobeAIRenderPanel.direct3d.test.ts @@ -19,7 +19,7 @@ describe('Globe AI render panel Direct 3D styles', () => { expect(apiErrorMessage({response:{data:{detail:{message:'Output needs review.',billed:true}}}}, 'Failed')).toContain('This attempt was charged'); }); it('exposes every Classic aesthetic as a selectable Direct style', () => { - expect(STYLES).toHaveLength(24); + expect(STYLES).toHaveLength(25); expect(new Set(STYLES.map((style) => style.id))) .toEqual(new Set(Object.keys(GLOBE_STYLE_PROMPTS))); @@ -38,14 +38,14 @@ describe('Globe AI render panel Direct 3D styles', () => { it('groups all style buttons exactly once', () => { const groupedIds = STYLE_GROUPS.flatMap((group) => [...group.ids]); - expect(groupedIds).toHaveLength(24); - expect(new Set(groupedIds).size).toBe(24); + expect(groupedIds).toHaveLength(25); + expect(new Set(groupedIds).size).toBe(25); expect(new Set(groupedIds)).toEqual(new Set(STYLES.map((style) => style.id))); }); - it('lists After Rain and Autumn under Realistic', () => { + it('lists Movie Still, After Rain and Autumn under Realistic', () => { const realistic = STYLE_GROUPS.find((group) => group.label === 'Realistic'); - expect(realistic?.ids).toEqual(expect.arrayContaining(['after-rain', 'autumn'])); + expect(realistic?.ids).toEqual(expect.arrayContaining(['movie-still', 'after-rain', 'autumn'])); }); it('explains saved results and optional comparison before spend', () => { diff --git a/frontend/src/components/viewer/globe/GlobeAIRenderPanel.surface.test.tsx b/frontend/src/components/viewer/globe/GlobeAIRenderPanel.surface.test.tsx index b41a94afb..0c8cc252d 100644 --- a/frontend/src/components/viewer/globe/GlobeAIRenderPanel.surface.test.tsx +++ b/frontend/src/components/viewer/globe/GlobeAIRenderPanel.surface.test.tsx @@ -60,6 +60,7 @@ afterEach(() => vi.unstubAllGlobals()); describe('ground surfaces in Direct 3D rendering', () => { it.each([ ['Photo Realistic', 'photorealistic'], + ['Movie Still', 'movie-still'], ['After Rain', 'after-rain'], ['Autumn', 'autumn'], ])('sends %s from the aerial picker with the authored surface claim', async (label, style) => { diff --git a/frontend/src/components/viewer/globe/GlobeSitePlannerMap.tsx b/frontend/src/components/viewer/globe/GlobeSitePlannerMap.tsx index c7b2413e4..d6ea9269b 100644 --- a/frontend/src/components/viewer/globe/GlobeSitePlannerMap.tsx +++ b/frontend/src/components/viewer/globe/GlobeSitePlannerMap.tsx @@ -57,6 +57,7 @@ import { GlobeBuildingPlotLandscape } from './GlobeBuildingPlotLandscape'; import { BuildingLandscapeSurfaceProvider } from './BuildingFoundationSurface'; import { nativeStreetPreparationProblem } from './nativeStreetPilot'; import { appendStreetDrawingValue, finishDoubleClickValues, streetDrawingGeometry } from '@/features/pickPlace/streetDrawingGeometry'; +import { fitBridgeDrawingSpan } from '@/features/pickPlace/bridgeDrawingSpan'; import { usePublicRoadContext } from '@/features/pickPlace/usePublicRoadContext'; import { supportsPublicRoadSuggestions } from '@/features/pickPlace/publicRoadSuggestions'; import { Canvas, useThree } from '@react-three/fiber'; @@ -5209,14 +5210,15 @@ export function GlobeSitePlannerMap({ const tool = activeSitePlannerTool!; const min = minPointsForTool(tool); const isLineTool = isLinearTool(tool); + const bridge = tool === 'road' && modularBridgeProgramFor(activeToolProperties?.road_selected_variant_id); const canFinish = n >= min && !streetPreparationProblem; const canConnect = !isLineTool && canFinish && centerNearStartVertex; const placeLabel = canConnect ? 'Connect & Finish' : n === 0 - ? 'Place First Vertex' + ? bridge ? 'Place bridge start' : 'Place First Vertex' : isLineTool - ? 'Place Waypoint' + ? bridge ? n === 1 ? 'Set bridge end' : 'Adjust bridge end' : 'Place Waypoint' : 'Place Vertex'; return ( @@ -5276,19 +5278,20 @@ export function GlobeSitePlannerMap({ const label = activeToolProperties?.parking_layout_version === 1 ? 'Parking lot' : activeToolProperties?.ground_surface_material ? 'Ground surface' : activeToolProperties?.cartography_study ? 'Land-use zone' : getToolDisplayLabel(tool); const min = minPointsForTool(tool); const linear = isLinearTool(tool); + const bridge = tool === 'road' && modularBridgeProgramFor(activeToolProperties?.road_selected_variant_id); let measurement = ''; if (n >= 2 && linear) { - measurement = formatDistance(polylineLength(drawingPoints)); + measurement = formatDistance(polylineLength(fitBridgeDrawingSpan(drawingPoints, activeToolProperties))); } else if (n >= 3 && !linear) { measurement = formatDrawingArea(polygonAreaM2(drawingPoints)); } let mobileHint: string; if (n === 0) { - mobileHint = `Center the crosshair, then tap Place First Vertex`; + mobileHint = bridge ? 'Center the crosshair, then tap Place bridge start' : 'Center the crosshair, then tap Place First Vertex'; } else if (n < min) { - mobileHint = linear + mobileHint = bridge ? 'Move the crosshair toward the other side. The span fits automatically.' : linear ? `${n} waypoint${n > 1 ? 's' : ''} - need ${min} min - move under crosshair` : `${n} point${n > 1 ? 's' : ''} - need ${min} min - move under crosshair`; } else if (!linear && centerNearStartVertex) { @@ -5314,7 +5317,7 @@ export function GlobeSitePlannerMap({ return ( <> -
+
{mobileHint}
diff --git a/frontend/src/components/viewer/globe/imageStyles.ts b/frontend/src/components/viewer/globe/imageStyles.ts index f07ff00b0..0d2d7fd09 100644 --- a/frontend/src/components/viewer/globe/imageStyles.ts +++ b/frontend/src/components/viewer/globe/imageStyles.ts @@ -1,3 +1,4 @@ +import { MOVIE_STILL_PRESET } from '../movieStillPreset'; import { AFTER_RAIN_PRESET, AUTUMN_PRESET } from '../seasonalRenderPresets'; export const STYLES = [ @@ -6,6 +7,7 @@ export const STYLES = [ { id: 'photomontage', label: 'Photomontage' }, { id: 'development', label: 'Development' }, { id: 'atmospheric', label: 'Atmospheric' }, + { id: MOVIE_STILL_PRESET.id, label: MOVIE_STILL_PRESET.label }, { id: AFTER_RAIN_PRESET.id, label: AFTER_RAIN_PRESET.label }, { id: AUTUMN_PRESET.id, label: AUTUMN_PRESET.label }, { id: 'winter', label: 'Winter' }, @@ -35,7 +37,7 @@ export const STYLES = [ // UI grouping for the style picker — keeps the new-user taxonomy visible. // Update this when adding a style so it lands in the right group in the UI. export const STYLE_GROUPS = [ - { label: 'Realistic', ids: ['photorealistic', 'photomontage', 'development', 'atmospheric', AFTER_RAIN_PRESET.id, AUTUMN_PRESET.id, 'winter', 'night'] }, + { label: 'Realistic', ids: ['photorealistic', 'photomontage', 'development', 'atmospheric', MOVIE_STILL_PRESET.id, AFTER_RAIN_PRESET.id, AUTUMN_PRESET.id, 'winter', 'night'] }, { label: 'Accurate', ids: ['survey', 'documentary'] }, { label: 'Concept', ids: ['watercolour', 'charcoal', 'marker-render', 'pen-and-ink'] }, { label: 'Plan', ids: ['site-plan', 'site-plan-photo', 'blueprint', 'site-plan-watercolor'] }, diff --git a/frontend/src/components/viewer/globe/useDirect3DRender.test.ts b/frontend/src/components/viewer/globe/useDirect3DRender.test.ts index 9e2401942..5958b4a28 100644 --- a/frontend/src/components/viewer/globe/useDirect3DRender.test.ts +++ b/frontend/src/components/viewer/globe/useDirect3DRender.test.ts @@ -231,8 +231,8 @@ describe('Direct 3D presentation adapter', () => { expect(direct.render.savedRender).toBeUndefined(); }); - it('uses the same complete 24-style catalogue as Classic without changing Classic prompting', () => { - expect(DIRECT_3D_STYLE_IDS).toHaveLength(24); + it('uses the same complete 25-style catalogue as Classic without changing Classic prompting', () => { + expect(DIRECT_3D_STYLE_IDS).toHaveLength(25); expect(new Set(DIRECT_3D_STYLE_IDS)).toEqual(new Set(Object.keys(GLOBE_STYLE_PROMPTS))); expect(new Set(Object.keys(DIRECT_3D_DEFAULT_ART_DIRECTIONS))) .toEqual(new Set(DIRECT_3D_STYLE_IDS)); @@ -251,7 +251,7 @@ describe('Direct 3D presentation adapter', () => { ); } expect(DIRECT_3D_STYLE_IDS.filter((style) => resolveDirect3DPresentationMode(style) === 'scene')) - .toHaveLength(18); + .toHaveLength(19); }); it('keeps the selected Direct style while adding concise project-specific direction', () => { @@ -335,7 +335,7 @@ describe('Direct 3D presentation adapter', () => { expect(prompt).toContain('Keep cropped and occluded elements cropped and occluded'); }); - it.each(['photomontage', 'development', 'atmospheric', 'after-rain', 'autumn', 'winter', 'night'])('does not let the %s preset request new activity or site furniture', (style) => { + it.each(['photomontage', 'development', 'atmospheric', 'movie-still', 'after-rain', 'autumn', 'winter', 'night'])('does not let the %s preset request new activity or site furniture', (style) => { const direction = DIRECT_3D_DEFAULT_ART_DIRECTIONS[style]; expect(direction).not.toMatch(/pedestrians|cyclists?|cafe activity|moving cars|street life|freshly landscaped|headlight|taillight/i); const prompt = buildDirect3DVisualPrompt(style, undefined, capture); @@ -343,6 +343,7 @@ describe('Direct 3D presentation adapter', () => { }); it.each([ + ['movie-still', 'fine film grain', 'existing light fixture'], ['after-rain', 'damp paving', 'diffuse post-rain daylight'], ['autumn', 'existing deciduous', 'low autumn sunlight'], ])('keeps %s photographic and aligned to the source camera', (style, detail, lighting) => { diff --git a/frontend/src/components/viewer/globe/useDirect3DRender.ts b/frontend/src/components/viewer/globe/useDirect3DRender.ts index c2c38ce2c..4d94ab355 100644 --- a/frontend/src/components/viewer/globe/useDirect3DRender.ts +++ b/frontend/src/components/viewer/globe/useDirect3DRender.ts @@ -12,6 +12,7 @@ import { } from './useGlobeAIRender'; import type { Direct3DCaptureBundle, Direct3DProposalRole } from './direct3dCapture'; import type { ResidualLandscapeClaim } from './residualLandscape'; +import { MOVIE_STILL_PRESET } from '../movieStillPreset'; import { AFTER_RAIN_PRESET, AUTUMN_PRESET } from '../seasonalRenderPresets'; import { DEFAULT_OPENAI_IMAGE_MODEL, imageModelLabel, type ImageEngine } from '@/config/imageModels'; @@ -37,6 +38,7 @@ export const DIRECT_3D_DEFAULT_ART_DIRECTIONS: Readonly> photomontage: 'Create a professional architectural photomontage from the supplied camera, with photographic surface texture and coherent lighting across the proposal and surrounding city. Match sun direction, shadow length, atmospheric depth, grain and colour temperature so the existing objects share one believable exposure. Retain the existing material palette and reflect the visible sky in existing glazing. Finish only the buildings, planting, furniture and surfaces already present. Balanced exposure and muted natural colours, suitable for a planning presentation.', development: 'Create a polished completed-development visualization. Treat the existing construction as newly finished: crisp facades in their current material palette, clean glazing, readable entrance details and neatly maintained existing planting and paving. Bright optimistic daylight with gentle directional sun, soft contact shadows and balanced exposure. Keep the public-realm design and furnishing inventory exactly as captured. Aspirational but credible, with restrained saturation and realistic surface texture.', atmospheric: 'Create cinematic architectural photography with warm late-day directional light raking across the existing facades, long soft shadows, gentle golden haze and layered atmospheric depth. Bring out texture in the current material palette and a restrained warm glow behind existing glazing. Keep foreground details readable and retain the captured planting and furnishing arrangement. Serene, muted warm colours, soft highlights and subtle film grain.', + [MOVIE_STILL_PRESET.id]: `${MOVIE_STILL_PRESET.prompt} ${MOVIE_STILL_PRESET.lighting}`, [AFTER_RAIN_PRESET.id]: `${AFTER_RAIN_PRESET.prompt} ${AFTER_RAIN_PRESET.lighting}`, [AUTUMN_PRESET.id]: `${AUTUMN_PRESET.prompt} ${AUTUMN_PRESET.lighting}`, winter: 'Create convincing winter architectural photography. Add a thin snow treatment to existing roofs, lawns and planting beds while retaining their profiles. Show the existing walks cleared to their captured edges, bare deciduous branches and lightly snow-dusted evergreens in their original positions. Use cold overcast daylight, a pale grey-blue sky and soft blue-grey shadows with restrained warmth behind existing glazing. Keep facade identities and circulation clearly readable in a quiet desaturated palette.', diff --git a/frontend/src/components/viewer/globe/useGlobeAIRender.ts b/frontend/src/components/viewer/globe/useGlobeAIRender.ts index 4808c1676..6c264ca93 100644 --- a/frontend/src/components/viewer/globe/useGlobeAIRender.ts +++ b/frontend/src/components/viewer/globe/useGlobeAIRender.ts @@ -18,6 +18,7 @@ import { api, resolveApiFileUrl } from '@/services/api'; import { useViewerStore } from '@/store'; import { getActiveSiteBoundary } from '@/utils/siteBoundary'; import { getCustomZoneStyle } from '../customZoneStyle'; +import { MOVIE_STILL_PRESET } from '../movieStillPreset'; import { AFTER_RAIN_PRESET, AUTUMN_PRESET } from '../seasonalRenderPresets'; import { formatArea, polygonDimensionsMeters, resolveZoneColor } from '../mapEngine/geoUtils'; import { @@ -73,6 +74,7 @@ export const GLOBE_STYLE_PROMPTS: Record = { 'site-plan-photo': 'Professional near-top-down drone photomontage at 100m altitude, 15-20 degrees from nadir. DJI Mavic 3, Hasselblad sensor, 24mm lens f/5.6. Photorealistic materials, accurate short shadows, real rooftop equipment visible. Seamless integration with surrounding satellite context. Documentary drone survey photography of a completed development. CRITICAL: Replace all colored polygon fills completely with photorealistic materials. No flat green, red, blue, or orange overlay colors should remain visible.', 'site-plan-watercolor': 'Near-top-down architectural site plan as a hand-painted watercolor on textured paper, 15-20 degrees from nadir. Soft translucent washes — warm ochre for buildings, sage green for parks, soft grey for roads, ultramarine for water. Faint pencil construction lines beneath washes. Trees as loose circular watercolor daubs. Shadows as soft blue-grey washes. White paper glowing through as highlights. Pigment granulation, wet-on-wet blooms, bleeding edges at zone boundaries. Architectural competition entry quality.', blueprint: 'Architectural blueprint cyanotype rendering on aged blueprint paper. Strict orthographic projection looking straight down. Pure white linework on deep Prussian-blue ground — crisp construction lines defining building footprints, roads, property lines, landscape elements. Hatched line patterns indicate grass and pavement. Trees as small white circular symbols. Roads as parallel white lines. Faint vintage paper mottling. No tonal shading, no gradients, no realistic materials. Drafted-by-hand mid-20th-century architectural drawing convention.', + [MOVIE_STILL_PRESET.id]: MOVIE_STILL_PRESET.prompt, [AFTER_RAIN_PRESET.id]: AFTER_RAIN_PRESET.prompt, [AUTUMN_PRESET.id]: AUTUMN_PRESET.prompt, winter: 'Photorealistic winter scene. Snow-covered roofs with drift patterns. Bare deciduous trees, snow-laden evergreens. Frosted surfaces, salt-grit on plowed paths. Soft diffuse winter light, pale blue-grey sky, long blue-tinted shadows. Specular melt/ice sheen on horizontal surfaces. Warm window glow.', @@ -1324,6 +1326,7 @@ export function buildPrompt( photorealistic: 'Golden hour, low warm southwest sun creating strong directional light. Long crisp architectural shadows with deep material contrast — sunlit facades should read bright and textured, shadowed facades cool and recessive. Sharp highlight-to-shadow transitions emphasizing facade depth (cornices, mullions, balcony edges, podium returns) rather than flat global illumination.', winter: 'Soft diffuse winter daylight, low sun angle, long blue-tinted shadows, pale blue-grey overcast sky.', atmospheric: 'Dramatic golden hour, low-angle warm sun, long architectural shadows, volumetric haze.', + [MOVIE_STILL_PRESET.id]: MOVIE_STILL_PRESET.lighting, [AFTER_RAIN_PRESET.id]: AFTER_RAIN_PRESET.lighting, [AUTUMN_PRESET.id]: AUTUMN_PRESET.lighting, night: 'Moonlight and city glow, artificial lighting, warm window light.', diff --git a/frontend/src/components/viewer/movieStillPreset.ts b/frontend/src/components/viewer/movieStillPreset.ts new file mode 100644 index 000000000..746563d54 --- /dev/null +++ b/frontend/src/components/viewer/movieStillPreset.ts @@ -0,0 +1,6 @@ +export const MOVIE_STILL_PRESET = { + id: 'movie-still', + label: 'Movie Still', + prompt: 'A live-action film still with natural material colours, gentle highlight roll-off, readable shadows and fine film grain. Keep the captured camera, composition, aspect ratio and architecture. Use a depth of field appropriate to the view so the defining architecture stays legible. Fill the original frame edge to edge. Avoid heavy colour grading, exaggerated bloom and lens flares.', + lighting: 'Let a believable source such as the sky, daylight through glazing or an existing light fixture motivate the light. Use natural bounce and contact shadows with a coherent direction across the scene.', +} as const; diff --git a/frontend/src/components/viewer/renderStyleGuideData.ts b/frontend/src/components/viewer/renderStyleGuideData.ts index 4bcc8cad1..752a3a685 100644 --- a/frontend/src/components/viewer/renderStyleGuideData.ts +++ b/frontend/src/components/viewer/renderStyleGuideData.ts @@ -8,6 +8,7 @@ export const RENDER_STYLE_DIRECTIONS: Readonly> = photomontage: {summary:'A photographic finish that brings the proposal and its real surroundings into one coherent image.', goodFor:'Discussing a proposal in its neighbourhood context.'}, development: {summary:'Clean materials, crisp entrances and bright daylight give the existing design a newly finished appearance.', goodFor:'A polished development presentation.'}, atmospheric: {summary:'Warm late-day light, soft haze and layered shadows give the scene a quieter, cinematic mood.', goodFor:'Explaining the atmosphere of a place.'}, + 'movie-still': {summary:'Believable light, soft highlights, readable shadows and subtle grain give the image the character of a live-action film still.', goodFor:'Showing the street as the setting of a scene or introducing the site from above.'}, 'after-rain': {summary:'Soft daylight, damp pavement and small puddles bring out the texture of paving and brick.', goodFor:'Showing how streets and public spaces look just after a shower.'}, autumn: {summary:'Low sunlight, copper and gold foliage, and soft highlights on natural materials.', goodFor:'Showing how planting and streets feel in early autumn.'}, winter: {summary:'Cold daylight, snow and seasonal planting show the existing place in winter.', goodFor:'Considering how a community feels in a colder season.'}, diff --git a/frontend/src/components/viewer/useAIRender.ts b/frontend/src/components/viewer/useAIRender.ts index 21e66db35..020ab5004 100644 --- a/frontend/src/components/viewer/useAIRender.ts +++ b/frontend/src/components/viewer/useAIRender.ts @@ -22,6 +22,7 @@ import { resolveApiFileUrl } from '@/services/api'; import { getCustomZoneStyle } from './customZoneStyle'; import { prepareZonesForRender } from './resolvePlanZoneArchetypes'; import { getActiveSiteBoundary } from '@/utils/siteBoundary'; +import { MOVIE_STILL_PRESET } from './movieStillPreset'; import { AFTER_RAIN_PRESET, AUTUMN_PRESET } from './seasonalRenderPresets'; // --------------------------------------------------------------------------- @@ -153,6 +154,7 @@ export interface UseAIRenderReturn { export const AI_RENDER_STYLES: AIRenderStyle[] = [ ...aiRenderStylePresets, + MOVIE_STILL_PRESET, AFTER_RAIN_PRESET, AUTUMN_PRESET, ]; @@ -184,6 +186,7 @@ const GEMINI_STYLE_MODIFIERS: Record = { label: 'Atmospheric', prompt: 'Cinematic aerial architectural photograph with dramatic atmospheric conditions. CRITICAL: Replace all colored polygon fills with photorealistic building materials — real brick, stone, glass, concrete, metal roofing. No flat colored surfaces. Final minutes of golden hour, low-angle warm sunlight casting extremely long shadows. Towering cumulus clouds lit amber and rose overhead. Ground-level haze creating depth layers. Wet surfaces with mirror-like reflections. Interior lights glowing warm amber through windows. Medium format digital with exceptional dynamic range.', }, + [MOVIE_STILL_PRESET.id]: MOVIE_STILL_PRESET, [AFTER_RAIN_PRESET.id]: AFTER_RAIN_PRESET, [AUTUMN_PRESET.id]: AUTUMN_PRESET, 'site-plan': { diff --git a/frontend/src/data/catalogueHeroImages.json b/frontend/src/data/catalogueHeroImages.json index a99705fd1..62bbff945 100644 --- a/frontend/src/data/catalogueHeroImages.json +++ b/frontend/src/data/catalogueHeroImages.json @@ -205,9 +205,9 @@ "claude_public_realm:timber-covered-footbridge:0dbeb2731dbe": "/archetypes/streets/urban-pedestrian-footbridge/variant_2.png", "claude_public_realm:tied-arch-shared-bridge:7900ce3b41b0": "/archetypes/streets/shared-cycle-pedestrian-bridge/variant_1.png", "claude_public_realm:planted-green-bridge:d7dddc9371b5": "/archetypes/streets/landscape-park-pedestrian-bridge/variant_2.png", - "rlasm_terraced_science_centre": "/archetypes/buildings/terraced_science_centre/reference-e2aa32dd4cfa.png", - "rlasm_folded_roof_market_hall": "/archetypes/buildings/folded_roof_market_hall/reference-8ec8e9e318cc.png", - "rlasm_passage_tower": "/archetypes/buildings/passage_tower/reference-3073ee61b027.png", + "rlasm_terraced_science_centre": "/archetypes/buildings/terraced_science_centre/picker-street-v1.png", + "rlasm_folded_roof_market_hall": "/archetypes/buildings/folded_roof_market_hall/picker-street-v1.png", + "rlasm_passage_tower": "/archetypes/buildings/passage_tower/picker-street-v1.png", "london_crescent_terrace_bath_stone": "/archetypes/buildings/london-crescent-terrace/variant_0.png", "plus15_brutalist_concrete_office": "/archetypes/buildings/calgary-15-connected-tower/variant_0.png" } diff --git a/frontend/src/data/runtimeAssetManifest.json b/frontend/src/data/runtimeAssetManifest.json index 965457407..967d6e192 100644 --- a/frontend/src/data/runtimeAssetManifest.json +++ b/frontend/src/data/runtimeAssetManifest.json @@ -264,6 +264,7 @@ "src/components/viewer/globe/walkNavigation.ts", "src/components/viewer/globe/zoneSurfaceMode.ts", "src/components/viewer/mapEngine/geoUtils.ts", + "src/components/viewer/movieStillPreset.ts", "src/components/viewer/renderDraftStorage.ts", "src/components/viewer/renderStyleGuideData.ts", "src/components/viewer/resolvePlanZoneArchetypes.ts", @@ -487,6 +488,7 @@ "src/features/pickPlace/UserGeneratedBuildings.tsx", "src/features/pickPlace/assetRegistry.ts", "src/features/pickPlace/boundaryEdit.ts", + "src/features/pickPlace/bridgeDrawingSpan.ts", "src/features/pickPlace/brtConnections.ts", "src/features/pickPlace/buildingAssetRecovery.ts", "src/features/pickPlace/buildingFootprintProgram.ts", @@ -683,10 +685,10 @@ "src/utils/zoneIdentity.ts" ], "coverage": { - "explicitReferenceCount": 4213, + "explicitReferenceCount": 4236, "dynamicCollectionCount": 7, - "requiredFileCount": 5997, - "requiredLogicalBytes": 13127041711, + "requiredFileCount": 6020, + "requiredLogicalBytes": 13140325485, "missingReferenceCount": 0 }, "explicitReferences": [ @@ -5027,10 +5029,17 @@ "logicalBytes": 2798212, "lfsOid": "c571268e0568ef20c6b30c23f603cdac9893792bfe020ae4734d69be5ae828d1" }, + { + "url": "/archetypes/buildings/folded_roof_market_hall/picker-street-v1.png", + "sources": [ + "src/data/catalogueHeroImages.json" + ], + "logicalBytes": 2766668, + "lfsOid": "cc619fce53fe0eb8b962782ea5f150a447d758fa35831a816ea96fb1d8ff2fc9" + }, { "url": "/archetypes/buildings/folded_roof_market_hall/reference-8ec8e9e318cc.png", "sources": [ - "src/data/catalogueHeroImages.json", "src/data/validationCatalogue.json" ], "logicalBytes": 2267659, @@ -8515,10 +8524,17 @@ "logicalBytes": 1359469, "lfsOid": "66c7921271c2bb94bb21fa5c129b5a4386a33ed05cd86ff2befaa5d050d73e81" }, + { + "url": "/archetypes/buildings/passage_tower/picker-street-v1.png", + "sources": [ + "src/data/catalogueHeroImages.json" + ], + "logicalBytes": 2263104, + "lfsOid": "553dd66f3a18f2d120285ff0f812a4d7fd5ffff6cf5b31b149a9776c0c13c375" + }, { "url": "/archetypes/buildings/passage_tower/reference-3073ee61b027.png", "sources": [ - "src/data/catalogueHeroImages.json", "src/data/validationCatalogue.json" ], "logicalBytes": 1817594, @@ -9812,10 +9828,17 @@ "logicalBytes": 415608, "lfsOid": "b532ffc76d9d76844e5b3c312228eb9527e11368067eff6b63dea55347d242fc" }, + { + "url": "/archetypes/buildings/terraced_science_centre/picker-street-v1.png", + "sources": [ + "src/data/catalogueHeroImages.json" + ], + "logicalBytes": 2801338, + "lfsOid": "fa50f2746a9e4fbecc5305d9548b86bcfaca73fe2b8a427f6520ad1a9fc982bb" + }, { "url": "/archetypes/buildings/terraced_science_centre/reference-e2aa32dd4cfa.png", "sources": [ - "src/data/catalogueHeroImages.json", "src/data/validationCatalogue.json" ], "logicalBytes": 2167724, @@ -27665,6 +27688,156 @@ ], "logicalBytes": 7004 }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-aspen.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 211864, + "lfsOid": "02e4ae0b5dbcc3d04fcc3f321a7dfa029ebc296560498e261d83d4f9a7cb15dc" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-aspen.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 6328 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-bird-lime.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 389724, + "lfsOid": "5181ba497daa1fa46f18aaaf5282cfa854c3e01be1028ec169fa6e38d2f03368" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-bird-lime.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 11596 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-chevron.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 206624, + "lfsOid": "e829852cc99d3ac007958c8b3c5145640352cdbfecf8464ec3f994464b501226" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-chevron.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 8952 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-chinook.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 332484, + "lfsOid": "886325af44446b2a9f47b3f6c4af51384fc272866159e275f6ba60ea59ca5e4c" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-chinook.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 6816 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-confetti.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 338872, + "lfsOid": "e7ebf71efd470cbe34e5c5261e5bca4f29babd2933778957b3054562bacfe9aa" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-confetti.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 8488 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-foothills.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 350044, + "lfsOid": "52069e57008206d331dcaf44ca620de43903da1e1fd8374f8130f732b538c636" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-foothills.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 6586 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-mosaic.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 197732, + "lfsOid": "98507e497dbf080c9de7bef860326ff81b8eb5e03b530e429ddad5bba6d215de" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-mosaic.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 9206 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-plain.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 140500, + "lfsOid": "57f74d6ab2c7c6aa841eb1c2527d9a28fe6426b968b8d6552808dfcb47f86433" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-plain.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 3430 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-quilt.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 184276, + "lfsOid": "f67a1f836eb0efa082d81295cdf0b0f1c14b3a262ad320811acfc689cb4a217c" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-quilt.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 8146 + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-river.glb", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 298276, + "lfsOid": "5e52c559ee15d8a2351bd8c1292050d32aed3472e5cc967468b9d15098123449" + }, + { + "url": "/park-kits/calgary-details-v1/scooter-corral-river.webp", + "sources": [ + "src/features/parks/detailCatalogueExtras.json" + ], + "logicalBytes": 6388 + }, { "url": "/park-kits/calgary-details-v1/scooter-corral.glb", "sources": [ @@ -36489,9 +36662,9 @@ "/park-kits/" ], "reason": "Kit filenames are selected from typed park recipes and composed into URLs at runtime.", - "fileCount": 983, - "logicalBytes": 526895408, - "pathDigest": "2b047c768d6b26bbdfbbe22251e9dc63543f6e3e54a7dd17da034b997df48303" + "fileCount": 1003, + "logicalBytes": 529621740, + "pathDigest": "2275ce8e2b2c95d3a9f94d34e2d0ec7de206319aa0826c90a813d40c10d7bbc1" }, { "name": "public-realm-skins", diff --git a/frontend/src/features/parks/DetailCategoryTiles.tsx b/frontend/src/features/parks/DetailCategoryTiles.tsx index 647d3761f..21e324ba9 100644 --- a/frontend/src/features/parks/DetailCategoryTiles.tsx +++ b/frontend/src/features/parks/DetailCategoryTiles.tsx @@ -22,6 +22,7 @@ function DetailIllustration({ category }: { category: string }) { 'Shelters & markets': () => <>, 'Water & landmarks': () => <>, 'Traffic & safety': () => <>, + 'Shared micromobility': () => <>, }; return

{activeStreet.label} · {activeStreet.sectionWidth} m wide
{activeBridge - ? `Draw two endpoints, ${Math.ceil(activeBridge.minLengthM)}–${Math.floor(activeBridge.maxLengthM)} m apart. Move after the first click to preview the bridge in 3D. Further clicks adjust its end. Press Enter to finish.` + ? `Draw two endpoints. The bridge automatically fits a supported span (${Math.ceil(activeBridge.minLengthM)}–${Math.floor(activeBridge.maxLengthM)} m). Move the crosshair or pointer to preview it in 3D. Set the end, then tap Finish or press Enter.` : activeStreet.model.variantId === 'amsterdam_gracht_v1' ? 'Draw the canal to fit your site. Click route points to bend or extend it, then press Enter to finish. The banks stay 36 m wide; the arch stays its original size and fits on a straight stretch.' : 'Place the first point, then move to preview the street in 3D. Start near a site edge to snap an entrance, then draw inward. Enter finishes the route.'} diff --git a/frontend/src/features/pickPlace/StreetRoutePanel.tsx b/frontend/src/features/pickPlace/StreetRoutePanel.tsx index 2ec1005e4..e4309b577 100644 --- a/frontend/src/features/pickPlace/StreetRoutePanel.tsx +++ b/frontend/src/features/pickPlace/StreetRoutePanel.tsx @@ -33,16 +33,16 @@ export function StreetRoutePanel({ zone, disabled, onReshape, onClose, onDelete, ? `Draw two endpoints to set the bridge span. ${modularBridge.bridge.trafficKind==='rail'||modularBridge.bridge.trafficKind==='road'?'Elevated concept span; pedestrian walking access and automatic road/rail junctions are unsupported.':'The source-derived approaches stay with the bridge. Automatic road intersections are unsupported.'}` : 'Draw two endpoints to set the bridge span. The covered deck and compact stairs form one crossing; automatic road intersections and vehicle connections are unsupported.'; const canal = zone.properties?.road_selected_variant_id === CANAL_VARIANT; - const bend = isBrt||(specialist&&!canal)?null:addStreetBend(zone); + const bend = modularBridge||isBrt||(specialist&&!canal)?null:addStreetBend(zone); const asset = streetAssetForZone(zone); const width = streetSectionWidth(zone); const program = nativeStreetPilot(String(zone.properties?.road_selected_variant_id))?.program; const button = 'min-h-11 rounded-lg border border-slate-700 bg-white px-3 text-sm font-semibold text-slate-900 disabled:opacity-40'; return