Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
68 changes: 67 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"check:deps": "npx taze@latest -Ilwr"
},
"dependencies": {
"@base-ui/react": "^1.1.0",
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
Expand Down
40 changes: 34 additions & 6 deletions src/components/settings-panel/settings-options.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,18 @@ interface EnumSetting {
enums: Array<{ key: string; text: string; value: string }>;
}

interface ListSetting {
name: string;
param: string;
description: string;
options: Array<string>;
}

interface SettingsGroup {
numeric: NumericSetting[];
boolean: BooleanSetting[];
enum: EnumSetting[];
list: ListSetting[];
}

export type SettingsProfile =
Expand All @@ -39,11 +47,13 @@ export type SettingsProfile =
const createSettings = (
numeric: NumericSetting[],
boolean: BooleanSetting[],
enumSettings: EnumSetting[] = []
enumSettings: EnumSetting[] = [],
listSettings: ListSetting[] = []
): SettingsGroup => ({
numeric: [...numeric],
boolean: [...boolean],
enum: enumSettings,
list: listSettings,
});

const length = {
Expand Down Expand Up @@ -256,6 +266,13 @@ const includeHot = {
"A boolean value which indicates the desire to include tolled HOV roads which require the driver to pay a toll if the occupant requirement isn't met. Default false.",
};

const speedTypes = {
name: 'Speed Types',
param: 'speed_types',
description: 'Which speed types to use.',
options: ['current', 'predicted', 'freeflow', 'constrained'],
};

const transitStartEndMaxDistance = {
name: 'Transit Start/End Max Distance',
param: 'transit_start_end_max_distance',
Expand Down Expand Up @@ -851,6 +868,7 @@ export const settingsInit = {
denoise: 0.1,
generalize: 0,
alternates: 0,
speed_types: ['current', 'freeflow', 'predicted', 'constrained'],
};

export const settingsInitTruckOverride = {
Expand Down Expand Up @@ -918,17 +936,23 @@ export const profileSettings: Record<SettingsProfile, SettingsGroup> = {
...borderSettings,
useTruckRoutes,
],
[hazardousMaterials, shortest, ignoreHierarchies]
[hazardousMaterials, shortest, ignoreHierarchies],
[],
[speedTypes]
),

car: createSettings(
[...commonVehicleProfileNumeric],
[...commonVehicleProfileBoolean]
[...commonVehicleProfileBoolean],
[],
[speedTypes]
),

bus: createSettings(
[length, weight, ...commonVehicleProfileNumeric],
[...commonVehicleProfileBoolean]
[...commonVehicleProfileBoolean],
[],
[speedTypes]
),

pedestrian: createSettings(
Expand All @@ -955,7 +979,9 @@ export const profileSettings: Record<SettingsProfile, SettingsGroup> = {
...gateSettings,
...borderSettings,
],
[shortest, ignoreHierarchies]
[shortest, ignoreHierarchies],
[],
[speedTypes]
),

bicycle: createSettings(
Expand All @@ -966,7 +992,9 @@ export const profileSettings: Record<SettingsProfile, SettingsGroup> = {

motorcycle: createSettings(
[...commonVehicleProfileNumeric],
[...commonVehicleProfileBoolean]
[...commonVehicleProfileBoolean],
[],
[speedTypes]
),
};

Expand Down
26 changes: 26 additions & 0 deletions src/components/settings-panel/settings-panel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { useDirectionsQuery } from '@/hooks/use-directions-queries';
import { useIsochronesQuery } from '@/hooks/use-isochrones-queries';
import { CollapsibleSection } from '@/components/ui/collapsible-section';
import { ServerSettings } from '@/components/settings-panel/server-settings';
import { MultiSelectSetting } from '../ui/multiselect-setting';

type ProfileWithSettings = Exclude<Profile, 'auto'>;

Expand Down Expand Up @@ -238,6 +239,31 @@ export const SettingsPanel = () => {
/>
)
)}
{profileSettings[profile as ProfileWithSettings].list.map(
(option, key) => {
console.log(`setting: ${settings[option.param]}`);
Copy link
Collaborator

Choose a reason for hiding this comment

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

should we remove console.logs?

Copy link
Member Author

Choose a reason for hiding this comment

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

whoops, thanks for catching those.


return (
<MultiSelectSetting
key={key}
id={option.param}
label={option.name}
description={option.description}
value={
(settings[option.param] as string[]) ?? ['current']
}
options={option.options}
onValueChange={(value) => {
console.log(value);
handleUpdateSettings({
name: option.param,
value,
});
}}
/>
);
}
)}
</div>
</CollapsibleSection>
)}
Expand Down
9 changes: 8 additions & 1 deletion src/components/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,14 @@ export interface PossibleSettings {
denoise: number;
generalize: number;
alternates: number;
[key: string]: string | number | boolean | GeoJSON.GeoJSON[] | undefined;
speed_types: string[];
[key: string]:
| string
| string[]
| number
| boolean
| GeoJSON.GeoJSON[]
| undefined;
}

export interface ParsedDirectionsGeometry {
Expand Down
Loading