From d2e89a2c1aa8f787bc0a296f588295ad1a5f76f2 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 24 Aug 2016 10:46:48 +0500 Subject: - Added speed converting in NotificationFormatter - Used constants in UnitsConverter --- src/org/traccar/helper/UnitsConverter.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'src/org/traccar/helper') diff --git a/src/org/traccar/helper/UnitsConverter.java b/src/org/traccar/helper/UnitsConverter.java index fe42d9ee2..4bc7348db 100644 --- a/src/org/traccar/helper/UnitsConverter.java +++ b/src/org/traccar/helper/UnitsConverter.java @@ -17,23 +17,36 @@ package org.traccar.helper; public final class UnitsConverter { + private static final double KNOTS_TO_KPH_RATIO = 0.539957; + private static final double KNOTS_TO_MPH_RATIO = 0.868976; + private static final double KNOTS_TO_MPS_RATIO = 1.94384; + private static final double KNOTS_TO_CPS_RATIO = 0.0194384449; + private UnitsConverter() { } public static double knotsFromKph(double value) { // km/h - return value * 0.539957; + return value * KNOTS_TO_KPH_RATIO; + } + + public static double kphFromKnots(double value) { + return value / KNOTS_TO_KPH_RATIO; } public static double knotsFromMph(double value) { - return value * 0.868976; + return value * KNOTS_TO_MPH_RATIO; + } + + public static double mphFromKnots(double value) { + return value / KNOTS_TO_MPH_RATIO; } public static double knotsFromMps(double value) { // m/s - return value * 1.94384; + return value * KNOTS_TO_MPS_RATIO; } public static double knotsFromCps(double value) { // cm/s - return value * 0.0194384449; + return value * KNOTS_TO_CPS_RATIO; } } -- cgit v1.2.3