Skip to content

Fix/near maxdistance params #969

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

Merged
zven merged 3 commits into from
Jun 18, 2026
+16 −4
Merged

Fix/near maxdistance params #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
302744f
fix: normalize maxdistance case
jona159 Jun 8, 2026
924fae1
fix: geography cast to return within meters
jona159 Jun 8, 2026
46af8a9
Merge branch 'dev' into fix/near-maxdistance-params
jona159 Jun 17, 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
6 changes: 3 additions & 3 deletions app/db/models/device.server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,10 +724,10 @@ const buildWhereClause = function buildWhereClause(
if (near && maxDistance !== undefined) {
clause.push(
sql`ST_DWithin(
ST_SetSRID(ST_MakePoint(${device.longitude}, ${device.latitude}), 4326),
ST_SetSRID(ST_MakePoint(${near[1]}, ${near[0]}), 4326),
ST_SetSRID(ST_MakePoint(${device.longitude}, ${device.latitude}), 4326)::geography,
ST_SetSRID(ST_MakePoint(${near[1]}, ${near[0]}), 4326)::geography,
${maxDistance}
)`,
)`,
)
}

Expand Down
14 changes: 13 additions & 1 deletion app/routes/api.boxes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,10 +138,22 @@ export const middleware: Route.MiddlewareFunction[] = [
requestContentTypeJson(['POST']),
]

function normalizeBoxesQueryParams(query: Record<string, unknown>) {
const maxDistance = query.maxDistance ?? query.maxdistance

return {
...query,
maxDistance,
}
}

export async function loader({ request }: Route.LoaderArgs) {
const url = new URL(request.url)
const queryObj = Object.fromEntries(url.searchParams)
const parseResult = DevicesQuerySchema.safeParse(queryObj)

const normalizedQueryObj = normalizeBoxesQueryParams(queryObj)

const parseResult = DevicesQuerySchema.safeParse(normalizedQueryObj)

if (!parseResult.success) {
const { fieldErrors } = parseResult.error.flatten()
Expand Down
Loading