-
Notifications
You must be signed in to change notification settings - Fork 1
fix #65
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.
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
Merged
fix #65
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,11 @@ | ||
| import { makeSelectDistanceQuery } from "./make-select-distance-query"; | ||
|
|
||
| export function makeRadiusConditionQuery( | ||
| tableAlias: string, | ||
| prop: string, | ||
| ): string { | ||
| const distance = makeSelectDistanceQuery(tableAlias, prop); | ||
| return `${distance} <= :radius`; | ||
| return `ST_DWithin( | ||
| ${tableAlias}.${prop}, | ||
| ST_SetSRID(ST_MakePoint(:lng, :lat), 4326), | ||
| :radius * 1000 | ||
| )`; | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -2,5 +2,8 @@ export function makeSelectDistanceQuery( | |||||||||||||||||
| tableAlias: string, | ||||||||||||||||||
| prop: string | ||||||||||||||||||
| ): string { | ||||||||||||||||||
| return `ST_DistanceSphere(${tableAlias}.${prop}, ST_MakePoint(:lng, :lat)) / 1000`; | ||||||||||||||||||
| return `ST_DistanceSphere( | ||||||||||||||||||
| ${tableAlias}.${prop}, | ||||||||||||||||||
| ST_MakePoint(:lng, :lat) | ||||||||||||||||||
| ) / 1000`; | ||||||||||||||||||
|
Comment on lines
+5
to
+8
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The formatting of this multi-line template string has inconsistent indentation. Also, the division by the magic number
Suggested change
|
||||||||||||||||||
| } | ||||||||||||||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a great change to use spatial indexes! To improve readability and maintainability, I have a couple of suggestions:
4326(SRID for WGS84) and1000(km to m conversion factor) are used directly. It's a good practice to extract these into named constants at the module level, or at least add comments to clarify their purpose.Here's a suggestion that improves formatting and adds SQL comments to clarify the magic numbers.