Commit ae5fd115 authored by antirez's avatar antirez
Browse files

Geo: more x,y renamed lat,lon

parent a3018a21
...@@ -560,8 +560,8 @@ void geoDecodeCommand(redisClient *c) { ...@@ -560,8 +560,8 @@ void geoDecodeCommand(redisClient *c) {
geohash.step = GEO_STEP_MAX; geohash.step = GEO_STEP_MAX;
geohashDecodeWGS84(geohash, &area); geohashDecodeWGS84(geohash, &area);
double y = (area.latitude.min + area.latitude.max) / 2; double lat = (area.latitude.min + area.latitude.max) / 2;
double x = (area.longitude.min + area.longitude.max) / 2; double lon = (area.longitude.min + area.longitude.max) / 2;
/* Returning three nested replies */ /* Returning three nested replies */
addReplyMultiBulkLen(c, 3); addReplyMultiBulkLen(c, 3);
...@@ -578,8 +578,8 @@ void geoDecodeCommand(redisClient *c) { ...@@ -578,8 +578,8 @@ void geoDecodeCommand(redisClient *c) {
/* Last, the averaged center of this bounding box */ /* Last, the averaged center of this bounding box */
addReplyMultiBulkLen(c, 2); addReplyMultiBulkLen(c, 2);
addReplyDouble(c, y); addReplyDouble(c, lat);
addReplyDouble(c, x); addReplyDouble(c, lon);
} }
void geoEncodeCommand(redisClient *c) { void geoEncodeCommand(redisClient *c) {
...@@ -613,8 +613,8 @@ void geoEncodeCommand(redisClient *c) { ...@@ -613,8 +613,8 @@ void geoEncodeCommand(redisClient *c) {
GeoHashArea area; GeoHashArea area;
geohashDecodeWGS84(geohash, &area); geohashDecodeWGS84(geohash, &area);
double y = (area.latitude.min + area.latitude.max) / 2; double lat = (area.latitude.min + area.latitude.max) / 2;
double x = (area.longitude.min + area.longitude.max) / 2; double lon = (area.longitude.min + area.longitude.max) / 2;
/* Return four nested multibulk replies. */ /* Return four nested multibulk replies. */
addReplyMultiBulkLen(c, 4); addReplyMultiBulkLen(c, 4);
...@@ -634,6 +634,6 @@ void geoEncodeCommand(redisClient *c) { ...@@ -634,6 +634,6 @@ void geoEncodeCommand(redisClient *c) {
/* Return the averaged center */ /* Return the averaged center */
addReplyMultiBulkLen(c, 2); addReplyMultiBulkLen(c, 2);
addReplyDouble(c, y); addReplyDouble(c, lat);
addReplyDouble(c, x); addReplyDouble(c, lon);
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment