mirror of
https://github.com/praktimarc/kst4contest.git
synced 2026-04-21 16:02:37 +02:00
added audio support
This commit is contained in:
@@ -1,5 +1,10 @@
|
||||
package kst4contest.locatorUtils;
|
||||
|
||||
import java.text.DecimalFormat;
|
||||
import java.text.NumberFormat;
|
||||
import java.text.ParseException;
|
||||
import java.util.Locale;
|
||||
|
||||
/**
|
||||
* Location class with methods allowing conversion to and from Maidenhead
|
||||
* locator (grid squares) based off of
|
||||
@@ -203,6 +208,28 @@ public class Location {
|
||||
return getDistanceKm(this, loc2);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param locator1 6 letter location string
|
||||
* @param locator2 6 letter location string
|
||||
* @return great circle distance in kilometers
|
||||
*/
|
||||
public double getDistanceKmByTwoLocatorStrings(String locator1,String locator2 ) {
|
||||
Location loc1 = new Location(locator1);
|
||||
Location loc2 = new Location(locator2);
|
||||
|
||||
Locale locale = new Locale("en", "UK");
|
||||
String pattern = "###.##";
|
||||
|
||||
DecimalFormat decimalFormat = (DecimalFormat)
|
||||
NumberFormat.getNumberInstance(locale);
|
||||
decimalFormat.applyPattern(pattern);
|
||||
|
||||
String format = decimalFormat.format(loc1.getDistanceKm(loc2));
|
||||
|
||||
// return df.format(number);
|
||||
return Double.parseDouble(format);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param loc2
|
||||
* second location
|
||||
@@ -278,6 +305,19 @@ public class Location {
|
||||
return getBearing(this, loc2);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
* @return bearing in degrees
|
||||
*/
|
||||
public double getBearingOfTwoLocatorStrings(String locator1, String locator2) {
|
||||
|
||||
Location loc1 = new Location(locator1);
|
||||
Location loc2 = new Location(locator2);
|
||||
|
||||
return getBearing(loc1, loc2);
|
||||
}
|
||||
|
||||
/**
|
||||
* @param loc1
|
||||
* source location
|
||||
|
||||
Reference in New Issue
Block a user