From 0ae47e65d4f7367525efc15b25663015dc5cd997 Mon Sep 17 00:00:00 2001
From: Olivier Girondel <olivier@biniou.info>
Date: Mon, 20 Aug 2018 15:56:07 +0200
Subject: [PATCH] Remove DistanceCalculator class

---
 .../traccar/client/DistanceCalculator.java    | 33 -------------------
 .../org/traccar/client/PositionProvider.java  |  2 +-
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 app/src/main/java/org/traccar/client/DistanceCalculator.java

diff --git a/app/src/main/java/org/traccar/client/DistanceCalculator.java b/app/src/main/java/org/traccar/client/DistanceCalculator.java
deleted file mode 100644
index f0c7146..0000000
--- a/app/src/main/java/org/traccar/client/DistanceCalculator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2017 Anton Tananaev (anton@traccar.org)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.traccar.client;
-
-public final class DistanceCalculator {
-
-    private static final double EQUATORIAL_EARTH_RADIUS = 6378.1370;
-    private static final double DEG_TO_RAD = Math.PI / 180;
-
-    public static double distance(double lat1, double lon1, double lat2, double lon2) {
-        double dlong = (lon2 - lon1) * DEG_TO_RAD;
-        double dlat = (lat2 - lat1) * DEG_TO_RAD;
-        double a = Math.pow(Math.sin(dlat / 2), 2)
-                + Math.cos(lat1 * DEG_TO_RAD) * Math.cos(lat2 * DEG_TO_RAD) * Math.pow(Math.sin(dlong / 2), 2);
-        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-        double d = EQUATORIAL_EARTH_RADIUS * c;
-        return d * 1000;
-    }
-
-}
diff --git a/app/src/main/java/org/traccar/client/PositionProvider.java b/app/src/main/java/org/traccar/client/PositionProvider.java
index e859ce0..a88d6fb 100644
--- a/app/src/main/java/org/traccar/client/PositionProvider.java
+++ b/app/src/main/java/org/traccar/client/PositionProvider.java
@@ -101,7 +101,7 @@ public class PositionProvider implements LostApiClient.ConnectionCallbacks, Loca
     public void onLocationChanged(Location location) {
         if (location != null && (lastLocation == null
                 || location.getTime() - lastLocation.getTime() >= interval
-                || distance > 0 && DistanceCalculator.distance(location.getLatitude(), location.getLongitude(), lastLocation.getLatitude(), lastLocation.getLongitude()) >= distance
+                || distance > 0 && location.distanceTo(lastLocation) >= distance
                 || angle > 0 && Math.abs(location.getBearing() - lastLocation.getBearing()) >= angle)) {
             Log.i(TAG, "location new");
             lastLocation = location;