redis/go-redis
1
0
Fork 0
mirror of https://github.com/redis/go-redis.git synced 2025-07-28 06:42:00 +03:00
Code Activity

Rename GeoPosition to GeoPos for consistency with Redis Server. Simplify code where possible.

Browse Source
This commit is contained in:
Vladimir Mihailenco
2016-08-22 09:39:22 +00:00
parent 5e72ba7620
commit 235dc49d5f
3 changed files with 45 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
command.go
View File

@ -806,10 +806,6 @@ type GeoLocation struct {
GeoHash int64
}
type GeoPosition struct {
Longitude, Latitude float64
}
// GeoRadiusQuery is used with GeoRadius to query geospatial index.
type GeoRadiusQuery struct {
Radius float64
@ -886,10 +882,16 @@ func (cmd *GeoLocationCmd) readReply(cn *pool.Conn) error {
return nil
}
//------------------------------------------------------------------------------
type GeoPos struct {
Longitude, Latitude float64
}
type GeoPosCmd struct {
baseCmd
positions []*GeoPosition
positions []*GeoPos
}
func NewGeoPosCmd(args ...interface{}) *GeoPosCmd {
@ -897,11 +899,11 @@ func NewGeoPosCmd(args ...interface{}) *GeoPosCmd {
return &GeoPosCmd{baseCmd: cmd}
}
func (cmd *GeoPosCmd) Val() []*GeoPosition {
func (cmd *GeoPosCmd) Val() []*GeoPos {
return cmd.positions
}
func (cmd *GeoPosCmd) Result() ([]*GeoPosition, error) {
func (cmd *GeoPosCmd) Result() ([]*GeoPos, error) {
return cmd.Val(), cmd.Err()
}
@ -915,12 +917,12 @@ func (cmd *GeoPosCmd) reset() {
}
func (cmd *GeoPosCmd) readReply(cn *pool.Conn) error {
reply, err := cn.Rd.ReadArrayReply(newGeoPositionSliceParser())
reply, err := cn.Rd.ReadArrayReply(geoPosSliceParser)
if err != nil {
cmd.err = err
return err
}
cmd.positions = reply.([]*GeoPosition)
cmd.positions = reply.([]*GeoPos)
return nil
}