mirror of
https://github.com/fluencelabs/redis
synced 2025-03-23 02:50:50 +00:00
7f4ac3d19c
Current todo:
- replace functions in zset.{c,h} with a new unified Redis
zset access API.
Once we get the zset interface fixed, we can squash
relevant commits in this branch and have one nice commit
to merge into unstable.
This commit adds:
- Geo commands
- Tests; runnable with: ./runtest --single unit/geo
- Geo helpers in deps/geohash-int/
- src/geo.{c,h} and src/geojson.{c,h} implementing geo commands
- Updated build configurations to get everything working
- TEMPORARY: src/zset.{c,h} implementing zset score and zset
range reading without writing to client output buffers.
- Modified linkage of one t_zset.c function for use in zset.c
Conflicts:
src/Makefile
src/redis.c
79 lines
3.7 KiB
C
79 lines
3.7 KiB
C
/*
|
|
* Copyright (c) 2013-2014, yinqiwen <yinqiwen@gmail.com>
|
|
* Copyright (c) 2014, Matt Stancliff <matt@genges.com>.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions are met:
|
|
*
|
|
* * Redistributions of source code must retain the above copyright notice,
|
|
* this list of conditions and the following disclaimer.
|
|
* * Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* * Neither the name of Redis nor the names of its contributors may be used
|
|
* to endorse or promote products derived from this software without
|
|
* specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
|
|
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
|
* THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#ifndef GEOHASH_HELPER_HPP_
|
|
#define GEOHASH_HELPER_HPP_
|
|
|
|
#include <math.h>
|
|
#include <stdbool.h>
|
|
#include "geohash.h"
|
|
|
|
#define GZERO(s) s.bits = s.step = 0;
|
|
#define GISZERO(s) (!s.bits && !s.step)
|
|
#define GISNOTZERO(s) (s.bits || s.step)
|
|
|
|
typedef uint64_t GeoHashFix52Bits;
|
|
typedef uint64_t GeoHashVarBits;
|
|
|
|
typedef struct {
|
|
GeoHashBits hash;
|
|
GeoHashArea area;
|
|
GeoHashNeighbors neighbors;
|
|
} GeoHashRadius;
|
|
|
|
int GeoHashBitsComparator(const GeoHashBits *a, const GeoHashBits *b);
|
|
uint8_t geohashEstimateStepsByRadius(double range_meters);
|
|
bool geohashBoundingBox(double latitude, double longitude, double radius_meters,
|
|
double *bounds);
|
|
GeoHashRadius geohashGetAreasByRadius(uint8_t coord_type, double latitude,
|
|
double longitude, double radius_meters);
|
|
GeoHashRadius geohashGetAreasByRadiusWGS84(double latitude, double longitude,
|
|
double radius_meters);
|
|
GeoHashRadius geohashGetAreasByRadiusMercator(double latitude, double longitude,
|
|
double radius_meters);
|
|
GeoHashFix52Bits geohashAlign52Bits(const GeoHashBits hash);
|
|
double geohashGetXMercator(double longtitude);
|
|
double geohashGetYMercator(double latitude);
|
|
double geohashGetXWGS84(double x);
|
|
double geohashGetYWGS84(double y);
|
|
bool geohashVerifyCoordinates(uint8_t coord_type, double x, double y);
|
|
bool geohashGetDistanceIfInRadius(uint8_t coord_type, double x1, double y1,
|
|
double x2, double y2, double radius,
|
|
double *distance);
|
|
bool geohashGetDistanceIfInRadiusWGS84(double x1, double y1, double x2,
|
|
double y2, double radius,
|
|
double *distance);
|
|
bool geohashGetDistanceSquaredIfInRadiusMercator(double x1, double y1,
|
|
double x2, double y2,
|
|
double radius,
|
|
double *distance);
|
|
|
|
#endif /* GEOHASH_HELPER_HPP_ */
|