Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion .github/workflows/backend-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
permissions:
contents: read
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
permissions:
contents: read
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
permissions:
contents: read
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
permissions:
contents: read
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
with:
persist-credentials: false
- uses: docker/setup-qemu-action@c7c53464625b32c7a7e944ae62b3e17d2b600130 # v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-pull-request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
checks: write
pull-requests: write
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
with:
persist-credentials: false

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
contents: read
deployments: write
steps:
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
with:
persist-credentials: false

Expand Down
26 changes: 26 additions & 0 deletions frontend/src/types/leaflet.heat.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import "leaflet";

declare module "leaflet" {
export type HeatLatLngTuple = [number, number, number];

export interface ColorGradientConfig {
[key: number]: string;
}

export interface HeatMapOptions {
minOpacity?: number | undefined;
maxZoom?: number | undefined;
max?: number | undefined;
radius?: number | undefined;
blur?: number | undefined;
gradient?: ColorGradientConfig | undefined;
}

export interface HeatLayer extends TileLayer {
setOptions(options: HeatMapOptions): HeatLayer;
addLatLng(latlng: LatLng | HeatLatLngTuple): HeatLayer;
setLatLngs(latlngs: Array<LatLng | HeatLatLngTuple>): HeatLayer;
}

export function heatLayer(latlngs: Array<LatLng | HeatLatLngTuple>, options: HeatMapOptions): HeatLayer;
}
4 changes: 2 additions & 2 deletions frontend/src/util/layer-construction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import L, {
CircleMarker,
circleMarker,
GeoJSON,
HeatLatLngTuple,
Layer,
LayerGroup,
LeafletMouseEvent,
PathOptions
} from "leaflet";
import "leaflet.heat";

import {Colors} from "../config";
import {RelayLocationDto} from "../dto/relay";
Expand Down Expand Up @@ -255,7 +255,7 @@ export const calculateFamilyColor = (familyId: number) => {
}

export const buildRelayHeatmapLayer = (relays: RelayLocationDto[]): LayerGroup => {
const coordinates = new Array<HeatLatLngTuple>()
const coordinates = new Array<L.HeatLatLngTuple>()
relays.forEach(relay => coordinates.push([relay.lat, relay.long, 1]))
return L.heatLayer(coordinates, {
radius: 25,
Expand Down
17 changes: 17 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@
"/leaflet/"
]
},
{
"description": "Require manual review for frontend dependency updates",
"matchManagers": [
"npm"
],
"matchFileNames": [
"frontend/package.json"
],
"automerge": false
},
{
"description": "Limit react version to ensure compatibility with react-infinite-scroller",
"matchPackageNames": [
Expand All @@ -49,6 +59,13 @@
],
"enabled": false
},
{
"description": "Limit @types/leaflet.heat version to ensure compatibility with leaflet heatmap",
"matchPackageNames": [
"@types/leaflet.heat"
],
"enabled": false
},
{
"description": "Keep all @mui packages on major version 5",
"matchPackageNames": [
Expand Down
Loading