Skip to content

make the form work with other infra types #667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Pete-Y-CS wants to merge 6 commits into
base: infrastructure-taxonomy-crossings
Choose a base branch
from
Open

make the form work with other infra types #667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a96a07
make the form work with other infra types
Pete-Y-CS Jul 21, 2026
ac73dd4
Add Bec's updated infrastructure info
Pete-Y-CS Jul 29, 2026
fb1a411
Delete src/lib/sketch/v3/infrastructure 3.json
Pete-Y-CS Jul 30, 2026
0f5f460
Remove wrong comment
Pete-Y-CS Jul 30, 2026
1c8a95b
Do not show 'measures' or 'features' if none exist for subtype-contex…
Pete-Y-CS Jul 30, 2026
410cfdb
formatting
Pete-Y-CS Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 45 additions & 20 deletions src/lib/sketch/v3/InfrastructureTypeSubform.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,24 @@
import MeasureSubform from "./MeasureSubform.svelte";

export let intervention: V3Intervention;
const intervention_type_options: InfrastructureSubtype[] =
intervention.intervention_type !== ""
? infrastructureFormInformation[intervention.intervention_type].types
$: intervention_type_options = getInterventionTypeOptions(

@Pete-Y-CS Pete-Y-CS Jul 30, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is important so that the options in the component change whenever a new intervention type is selected

intervention.intervention_type,
);

function getInterventionTypeOptions(
interventionType:
| "amenity"
| "bus_stop_treatment"
| "crossing"
| "junction_treatment"
| "link_segment"
| "place-making"
| "",
): InfrastructureSubtype[] {
return interventionType !== ""
? infrastructureFormInformation[interventionType].types
: [];
}

function getSubtypeObject(
subtype: string,
Expand Down Expand Up @@ -44,11 +58,18 @@
return [original, capitalisedSubsstrings.join(" ")];
}

const subtypes: [string, string][] = intervention_type_options.map(
(type_options) => {
return formatForRadio(type_options.name);
},
);
$: subtypes = getSubtypes(intervention_type_options);

function getSubtypes(
interventionTypeOptions: InfrastructureSubtype[],
): [string, string][] {
if (!interventionTypeOptions) {
return [];
}
return interventionTypeOptions.map((type_option) => {
return formatForRadio(type_option.name);
});
}

$: subtypeObject = getSubtypeObject(
intervention.properties.intervention_subtype,
Expand Down Expand Up @@ -148,25 +169,29 @@
}
</script>

<Radio
label={"Intervention Subtype"}
choices={subtypes}
bind:value={intervention.properties.intervention_subtype}
/>
<Radio
label={"Context"}
choices={contexts}
bind:value={intervention.properties.context}
/>
{#if subtypeObject && subtypeObject.possible_measurements}
{#if subtypes.length > 0}
<Radio
label={"Intervention Subtype"}
choices={subtypes}
bind:value={intervention.properties.intervention_subtype}
/>
{/if}
{#if contexts.length > 0}
<Radio
label={"Context"}
choices={contexts}
bind:value={intervention.properties.context}
/>
{/if}
{#if subtypeObject && subtypeObject.possible_measurements && subtypeObject.possible_measurements.length > 0}
<h2>Measures</h2>
{#each subtypeObject.possible_measurements as _measureObject, index}
<MeasureSubform
bind:interventionMeasure={intervention.properties.measurements[index]}
/>
{/each}
{/if}
{#if contextObject && contextObject.possible_features}
{#if contextObject && contextObject.possible_features && contextObject.possible_features.length > 0}
<h2>Features</h2>
{#each contextObject.possible_features as featureObject, index}
<FeatureSubform
Expand Down
Loading
Loading