Fixes for issue openhab#3104

paolodenti · Oct 1, 2015 · d68c3df · d68c3df
1 parent c5d02be
commit d68c3df
Show file tree

Hide file tree

Showing 2 changed files with 250 additions and 240 deletions.
diff --git a/...e/org.openhab.core.library/src/main/java/org/openhab/core/library/items/LocationItem.java b/...e/org.openhab.core.library/src/main/java/org/openhab/core/library/items/LocationItem.java
@@ -1,73 +1,74 @@
-/**
- * Copyright (c) 2010-2015, openHAB.org and others.
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- */
-package org.openhab.core.library.items;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.openhab.core.items.GenericItem;
-import org.openhab.core.library.types.DecimalType;
-import org.openhab.core.library.types.PointType;
-import org.openhab.core.types.Command;
-import org.openhab.core.types.State;
-import org.openhab.core.types.UnDefType;
-
-/**
- * A LocationItem can be used to store GPS related informations, addresses...
- * This is useful for location awareness related functions
- * 
- * @author Gaël L'hopital
- * @since 1.7.0
- */
-public class LocationItem extends GenericItem {
-	private static List<Class<? extends State>> acceptedDataTypes = new ArrayList<Class<? extends State>>();
-	private static List<Class<? extends Command>> acceptedCommandTypes = new ArrayList<Class<? extends Command>>();
-
-	static {
-		acceptedDataTypes.add(PointType.class);
-		acceptedDataTypes.add(UnDefType.class);
-	}
-
-	public LocationItem(String name) {
-		super(name);
-	}
-
-	public List<Class<? extends State>> getAcceptedDataTypes() {
-		return acceptedDataTypes;
-	}
-
-	public List<Class<? extends Command>> getAcceptedCommandTypes() {
-		return acceptedCommandTypes;
-	}
-
-	/**
-	 * Compute the distance with another Point type,
-	 * http://stackoverflow.com/questions/837872/calculate-distance-in-meters-when-you-know-longitude-and-latitude-in-java
-	 * @return distance between the two points in meters
-	 */
-	public DecimalType distanceFrom(PointType away){
-
-		double dist = -1;
-
-		if ((away != null) && (this.state instanceof PointType)) {
-
-			PointType me = (PointType) this.state;
-
-			double dLat = Math.pow(Math.sin(Math.toRadians(away.getLatitude().doubleValue() - me.getLatitude().doubleValue()) / 2),2);
-			double dLng = Math.pow(Math.sin(Math.toRadians(away.getLongitude().doubleValue() - me.getLongitude().doubleValue()) / 2),2);
-			double a = dLat + Math.cos(Math.toRadians(me.getLatitude().doubleValue()))  
-							* Math.cos(Math.toRadians(away.getLatitude().doubleValue())) * dLng;
-
-			dist = PointType.WGS84_a * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
-		}
-
-		return new DecimalType(dist);
-	}
-
-}
+/**
+ * Copyright (c) 2010-2015, openHAB.org and others.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.openhab.core.library.items;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.openhab.core.items.GenericItem;
+import org.openhab.core.library.types.DecimalType;
+import org.openhab.core.library.types.PointType;
+import org.openhab.core.types.Command;
+import org.openhab.core.types.State;
+import org.openhab.core.types.UnDefType;
+
+/**
+ * A LocationItem can be used to store GPS related informations, addresses...
+ * This is useful for location awareness related functions
+ * 
+ * @author Gaël L'hopital
+ * @since 1.7.0
+ */
+public class LocationItem extends GenericItem {
+	private static List<Class<? extends State>> acceptedDataTypes = new ArrayList<Class<? extends State>>();
+	private static List<Class<? extends Command>> acceptedCommandTypes = new ArrayList<Class<? extends Command>>();
+
+	static {
+		acceptedDataTypes.add(PointType.class);
+		acceptedDataTypes.add(UnDefType.class);
+		acceptedCommandTypes.add(PointType.class);
+	}
+
+	public LocationItem(String name) {
+		super(name);
+	}
+
+	public List<Class<? extends State>> getAcceptedDataTypes() {
+		return acceptedDataTypes;
+	}
+
+	public List<Class<? extends Command>> getAcceptedCommandTypes() {
+		return acceptedCommandTypes;
+	}
+
+	/**
+	 * Compute the distance with another Point type,
+	 * http://stackoverflow.com/questions/837872/calculate-distance-in-meters-when-you-know-longitude-and-latitude-in-java
+	 * @return distance between the two points in meters
+	 */
+	public DecimalType distanceFrom(PointType away){
+
+		double dist = -1;
+
+		if ((away != null) && (this.state instanceof PointType)) {
+
+			PointType me = (PointType) this.state;
+
+			double dLat = Math.pow(Math.sin(Math.toRadians(away.getLatitude().doubleValue() - me.getLatitude().doubleValue()) / 2),2);
+			double dLng = Math.pow(Math.sin(Math.toRadians(away.getLongitude().doubleValue() - me.getLongitude().doubleValue()) / 2),2);
+			double a = dLat + Math.cos(Math.toRadians(me.getLatitude().doubleValue()))  
+							* Math.cos(Math.toRadians(away.getLatitude().doubleValue())) * dLng;
+
+			dist = PointType.WGS84_a * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1-a));
+		}
+
+		return new DecimalType(dist);
+	}
+
+}