fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-03-19 09:00:51 +00:00
Code Issues Projects Releases Wiki Activity

Geo: support units only in abbreviated form.

Browse Source 
I'm not a strong believer in multiple syntax for the same stuff, so
now units can be specified only as m, km, ft, mi.
This commit is contained in:
antirez 2015-06-29 16:02:33 +02:00
parent 083acbebc8
commit 69c5b27273
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/geo.c
View File

@ -121,17 +121,17 @@ int longLatFromMember(robj *zobj, robj *member, double *xy) {
double extractUnitOrReply(redisClient *c, robj *unit) { double extractUnitOrReply(redisClient *c, robj *unit) {
char *u = unit->ptr; char *u = unit->ptr;
if (!strcmp(u, "m") || !strncmp(u, "meter", 5)) { if (!strcmp(u, "m")) {
return 1; return 1;
} else if (!strcmp(u, "ft") || !strncmp(u, "feet", 4)) { } else if (!strcmp(u, "km")) {
return 0.3048;
} else if (!strcmp(u, "mi") || !strncmp(u, "mile", 4)) {
return 1609.34;
} else if (!strcmp(u, "km") || !strncmp(u, "kilometer", 9)) {
return 1000; return 1000;
} else if (!strcmp(u, "ft")) {
return 0.3048;
} else if (!strcmp(u, "mi")) {
return 1609.34;
} else { } else {
addReplyError(c, "unsupported unit provided. please use meters (m), " addReplyError(c,
"kilometers (km), miles (mi), or feet (ft)"); "unsupported unit provided. please use m, km, ft, mi");
return -1; return -1;
} }
} }