Feature/upstream merge #456
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-apple Fix squished dropdown on Safari.
…k-colour New colour for 'Other Metal'
* Material of window frames. * Reorder items on dropdown list for window materials. * fix category
* add construction_material_window_frame map style * apply line trick to planning_combined styling
…ow_frames_map_style add construction_material_window_frame map style
Co-authored-by: Copilot <[email protected]>
…ge-overlay-button-formatting Change overlay button formatting.
…ature/upstream_merge with adjustment to cover all switchers
There was a problem hiding this comment.
Pull request overview
This PR merges upstream changes that add a new "window frame material" feature to the building construction data model and standardizes UI button labels across map overlay controls.
Key Changes
- Added database fields and UI for capturing window frame material data (wood, metal, plastic, other, or no windows)
- Standardized map overlay toggle button labels to use bracketed [on]/[off] suffixes for consistency
- Updated map style colors for "Other Metal" construction materials and "World Heritage Site" designations
Reviewed changes
Copilot reviewed 28 out of 28 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| migrations/057.window_frame_material.up.sql | Adds three new database columns for window frame material data and source tracking |
| migrations/057.window_frame_material.down.sql | Provides rollback script to remove window frame material columns |
| app/src/tiles/dataDefinition.ts | Adds SQL query to generate map tiles for window frame material visualization |
| app/src/frontend/config/tileserver-config.ts | Registers the window frame material tileset type |
| app/src/frontend/config/data-fields-config.ts | Defines field configuration including dropdown options and source tracking fields |
| app/src/frontend/config/category-maps-config.ts | Defines map legend and color scheme for window frame materials, updates colors for "Other Metal" and "World Heritage Site" |
| app/src/frontend/building/data-containers/construction-design.tsx | Adds UI components for editing and verifying window frame material data |
| app/src/api/config/dataFields.ts | Enables edit and verify permissions for the new window frame material fields |
| app/map_styles/polygon.xml | Implements map styling rules for window frame materials with appropriate colors and borders |
| app/src/frontend/map/*-switcher.tsx (multiple files) | Standardizes button text to use [on]/[off] bracketed notation for all map overlay toggles |
| app/src/frontend/map/legend.css | Adds minimum height to legend elements for better visual consistency |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
| <button className="btn btn-outline btn-outline-dark" | ||
| type="submit"> | ||
| {(creative === 'enabled')? 'Enterprise Zones on' : 'Creative Enterprise Zones off'} | ||
| {(creative === 'enabled')? 'Creative Enterprise Zones [on]' : 'Creative Enterprise Zones [off]'} |
There was a problem hiding this comment.
The enabled and disabled states of this button display inconsistent text. When enabled, it shows "Creative Enterprise Zones [on]" but the original disabled text was "Creative Enterprise Zones off". However, the removed line shows "Enterprise Zones on" which suggests the enabled state text was incomplete. This creates a mismatch where the button labels differ not just in their on/off state but in the feature name itself. The button should consistently use either "Enterprise Zones" or "Creative Enterprise Zones" for both states.
Suggested change
| {(creative === 'enabled')? 'Creative Enterprise Zones [on]' : 'Creative Enterprise Zones [off]'} | |
| {(creative === 'enabled') ? 'Creative Enterprise Zones on' : 'Creative Enterprise Zones off'} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.