honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

we normalize lat, TODO not needed

This commit is contained in:
Shay Banon 2012-02-09 09:25:20 +02:00
parent 676f115a26
commit 6b2b797e92
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/elasticsearch/index/search/geo/GeoDistance.java
View File

@ -24,8 +24,6 @@ import org.elasticsearch.common.unit.DistanceUnit;
/** /**
* Geo distance calculation. * Geo distance calculation.
*
*
*/ */
public enum GeoDistance { public enum GeoDistance {
/** /**
@ -55,7 +53,6 @@ public enum GeoDistance {
FACTOR() { FACTOR() {
@Override @Override
public double calculate(double sourceLatitude, double sourceLongitude, double targetLatitude, double targetLongitude, DistanceUnit unit) { public double calculate(double sourceLatitude, double sourceLongitude, double targetLatitude, double targetLongitude, DistanceUnit unit) {
// TODO: we might want to normalize longitude as we did in LatLng...
double longitudeDifference = targetLongitude - sourceLongitude; double longitudeDifference = targetLongitude - sourceLongitude;
double a = Math.toRadians(90D - sourceLatitude); double a = Math.toRadians(90D - sourceLatitude);
double c = Math.toRadians(90D - targetLatitude); double c = Math.toRadians(90D - targetLatitude);
@ -78,7 +75,6 @@ public enum GeoDistance {
ARC() { ARC() {
@Override @Override
public double calculate(double sourceLatitude, double sourceLongitude, double targetLatitude, double targetLongitude, DistanceUnit unit) { public double calculate(double sourceLatitude, double sourceLongitude, double targetLatitude, double targetLongitude, DistanceUnit unit) {
// TODO: we might want to normalize longitude as we did in LatLng...
double longitudeDifference = targetLongitude - sourceLongitude; double longitudeDifference = targetLongitude - sourceLongitude;
double a = Math.toRadians(90D - sourceLatitude); double a = Math.toRadians(90D - sourceLatitude);
double c = Math.toRadians(90D - targetLatitude); double c = Math.toRadians(90D - targetLatitude);
@ -286,7 +282,6 @@ public enum GeoDistance {
@Override @Override
public double calculate(double targetLatitude, double targetLongitude) { public double calculate(double targetLatitude, double targetLongitude) {
// TODO: we might want to normalize longitude as we did in LatLng...
double longitudeDifference = targetLongitude - sourceLongitude; double longitudeDifference = targetLongitude - sourceLongitude;
double c = Math.toRadians(90D - targetLatitude); double c = Math.toRadians(90D - targetLatitude);
return (cosA * Math.cos(c)) + (sinA * Math.sin(c) * Math.cos(Math.toRadians(longitudeDifference))); return (cosA * Math.cos(c)) + (sinA * Math.sin(c) * Math.cos(Math.toRadians(longitudeDifference)));
@ -315,7 +310,6 @@ public enum GeoDistance {
@Override @Override
public double calculate(double targetLatitude, double targetLongitude) { public double calculate(double targetLatitude, double targetLongitude) {
// TODO: we might want to normalize longitude as we did in LatLng...
double longitudeDifference = targetLongitude - sourceLongitude; double longitudeDifference = targetLongitude - sourceLongitude;
double c = Math.toRadians(90D - targetLatitude); double c = Math.toRadians(90D - targetLatitude);
double factor = (cosA * Math.cos(c)) + (sinA * Math.sin(c) * Math.cos(Math.toRadians(longitudeDifference))); double factor = (cosA * Math.cos(c)) + (sinA * Math.sin(c) * Math.cos(Math.toRadians(longitudeDifference)));