Skip to content

Add support for sorting by distance #1

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
merged 2 commits into from
Sep 17, 2019
Merged

Add support for sorting by distance #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bce268
Add function for sort by distance
0xTim Sep 17, 2019
a4fa1d2
Tit
0xTim Sep 17, 2019
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
29 changes: 29 additions & 0 deletions Sources/FluentPostGIS/Queries/QueryBuilder+Sort.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
import FluentPostgreSQL

extension QueryBuilder where
Database: QuerySupporting,
Database.QuerySort: SQLOrderBy,
Database.QueryFilter: SQLExpression,
Database.QueryFilterValue == Database.QueryFilter
{
@discardableResult
public func sortByDistance<T,V>(between key: KeyPath<Result, T>, _ filter: V) -> Self
where T: GeometryConvertible, V: GeometryConvertible {
return self.sort(Database.distanceSort(between: Database.queryField(.keyPath(key)), Database.queryFilterValueGeographic(filter)))
}

}

extension QuerySupporting where
QuerySort: SQLOrderBy
{
public static func distanceSort(between field: QueryField, _ filter: QueryFilterValue) -> QuerySort {
let args: [QuerySort.Expression.Function.Argument] = [
GenericSQLFunctionArgument<PostgreSQLExpression>.expression(PostgreSQLExpression.column(field as! PostgreSQLColumnIdentifier)),
GenericSQLFunctionArgument<PostgreSQLExpression>.expression(filter as! PostgreSQLExpression),
] as! [QuerySort.Expression.Function.Argument]
return .orderBy(.function("ST_Distance", args), .ascending)
}
}