Lint & small changes
This commit is contained in:
parent
0c6d207967
commit
55238f59aa
21 changed files with 2522 additions and 423 deletions
|
|
@ -75,6 +75,12 @@ export function useMapData({
|
|||
|
||||
const usePostcodeView = zoom >= POSTCODE_ZOOM_THRESHOLD;
|
||||
|
||||
// Determine if the current viewFeature is an enum (for enum_dist param)
|
||||
const viewFeatureIsEnum = useMemo(
|
||||
() => (viewFeature ? features.find((f) => f.name === viewFeature)?.type === 'enum' : false),
|
||||
[viewFeature, features]
|
||||
);
|
||||
|
||||
const buildFilterParam = useCallback(
|
||||
(): string => buildFilterString(filters, features),
|
||||
[filters, features]
|
||||
|
|
@ -134,6 +140,7 @@ export function useMapData({
|
|||
if (filtersStr) params.set('filters', filtersStr);
|
||||
params.set('fields', fieldsParam);
|
||||
if (dragTravelParam) params.set('travel', dragTravelParam);
|
||||
if (viewFeatureIsEnum && viewFeature) params.set('enum_dist', viewFeature);
|
||||
|
||||
fetch(apiUrl('postcodes', params), authHeaders({ signal: dragAbortRef.current.signal }))
|
||||
.then((res) => res.json())
|
||||
|
|
@ -151,6 +158,7 @@ export function useMapData({
|
|||
if (filtersStr) params.set('filters', filtersStr);
|
||||
params.set('fields', fieldsParam);
|
||||
if (dragTravelParam) params.set('travel', dragTravelParam);
|
||||
if (viewFeatureIsEnum && viewFeature) params.set('enum_dist', viewFeature);
|
||||
|
||||
fetch(apiUrl('hexagons', params), authHeaders({ signal: dragAbortRef.current.signal }))
|
||||
.then((res) => res.json())
|
||||
|
|
@ -168,7 +176,18 @@ export function useMapData({
|
|||
dragAbortRef.current = null;
|
||||
}
|
||||
};
|
||||
}, [activeFeature, bounds, resolution, filters, features, usePostcodeView, travelParam, buildTravelParam]);
|
||||
}, [
|
||||
activeFeature,
|
||||
bounds,
|
||||
resolution,
|
||||
filters,
|
||||
features,
|
||||
usePostcodeView,
|
||||
travelParam,
|
||||
buildTravelParam,
|
||||
viewFeature,
|
||||
viewFeatureIsEnum,
|
||||
]);
|
||||
|
||||
// Fetch hexagons or postcodes when bounds/filters change
|
||||
useEffect(() => {
|
||||
|
|
@ -196,6 +215,7 @@ export function useMapData({
|
|||
if (travelParam) {
|
||||
params.set('travel', travelParam);
|
||||
}
|
||||
if (viewFeatureIsEnum && viewFeature) params.set('enum_dist', viewFeature);
|
||||
const res = await fetch(
|
||||
apiUrl('postcodes', params),
|
||||
authHeaders({
|
||||
|
|
@ -226,6 +246,7 @@ export function useMapData({
|
|||
if (travelParam) {
|
||||
params.set('travel', travelParam);
|
||||
}
|
||||
if (viewFeatureIsEnum && viewFeature) params.set('enum_dist', viewFeature);
|
||||
const res = await fetch(
|
||||
apiUrl('hexagons', params),
|
||||
authHeaders({
|
||||
|
|
@ -268,7 +289,16 @@ export function useMapData({
|
|||
clearTimeout(debounceRef.current);
|
||||
}
|
||||
};
|
||||
}, [resolution, bounds, filters, buildFilterParam, viewFeature, usePostcodeView, travelParam]);
|
||||
}, [
|
||||
resolution,
|
||||
bounds,
|
||||
filters,
|
||||
buildFilterParam,
|
||||
viewFeature,
|
||||
viewFeatureIsEnum,
|
||||
usePostcodeView,
|
||||
travelParam,
|
||||
]);
|
||||
|
||||
// Use drag data when it matches the current view feature, otherwise fall back to rawData
|
||||
const data =
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue