Fixes bad POM file with ONOS commit 8c68536972f63069c263635c9d9f4f31d7f3e9a2

Change-Id: I7adb5a2d3738d53dbc41db7577768b0e7ced5450
Signed-off-by: Ashlee Young <ashlee@wildernessvoice.com>

3 files changed, 129 insertions, 2 deletions

diff --git a/framework/src/onos/utils/misc/src/main/java/org/onlab/util/GeoLocation.java b/framework/src/onos/utils/misc/src/main/java/org/onlab/util/GeoLocation.java
new file mode 100644
index 00000000..7e546531
--- /dev/null
+++ b/framework/src/onos/utils/misc/src/main/java/org/onlab/util/GeoLocation.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2014-2015 Open Networking Laboratory
+ *
+ * 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.onlab.util;
+
+import com.google.common.base.MoreObjects;
+
+/**
+ * Geo location specified in terms of longitude and latitude.
+ */
+public class GeoLocation {
+
+    public static final double EARTH_RADIUS_KM = 6378.1370D;
+
+    private final double latitude;
+    private final double longitude;
+
+    /**
+     * Creates a new location using the specified coordinates.
+     *
+     * @param latitude  latitude line
+     * @param longitude longitude line
+     */
+    public GeoLocation(double latitude, double longitude) {
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+
+    /**
+     * Returns the latitude of this location.
+     *
+     * @return latitude
+     */
+    public double latitude() {
+        return latitude;
+    }
+
+    /**
+     * Returns the longitude of this location.
+     *
+     * @return longitude
+     */
+    public double longitude() {
+        return longitude;
+    }
+
+    /**
+     * Returns the distance in kilometers, between this location and another.
+     *
+     * @param other other geo location
+     * @return distance in kilometers
+     */
+    public double kilometersTo(GeoLocation other) {
+        double hereLat = Math.toRadians(latitude);
+        double hereLon = Math.toRadians(longitude);
+        double thereLat = Math.toRadians(other.latitude);
+        double thereLon = Math.toRadians(other.longitude);
+
+        double cos = Math.sin(hereLat) * Math.sin(thereLat) +
+                Math.cos(hereLat) * Math.cos(thereLat) * Math.cos(hereLon - thereLon);
+        return Math.acos(cos) * EARTH_RADIUS_KM;
+    }
+
+    @Override
+    public String toString() {
+        return MoreObjects.toStringHelper(this)
+                .add("latitude", latitude)
+                .add("longitude", longitude)
+                .toString();
+    }
+
+}
diff --git a/framework/src/onos/utils/misc/src/main/java/org/onlab/util/Spectrum.java b/framework/src/onos/utils/misc/src/main/java/org/onlab/util/Spectrum.java
index 42d76090..ca01c6e3 100644
--- a/framework/src/onos/utils/misc/src/main/java/org/onlab/util/Spectrum.java
+++ b/framework/src/onos/utils/misc/src/main/java/org/onlab/util/Spectrum.java
@@ -19,11 +19,12 @@ package org.onlab.util;
  * Telecom optical wavelength bands: O, E, S, C, L and U bands.
  *
  * See ITU-T G-Series Recommendations, Supplement 39
+ * See ITU-T G.694.1 for center frequency definition.
  */
 public final class Spectrum {
 
-    private Spectrum() {
-    }
+    // Center frequency
+    public static final Frequency CENTER_FREQUENCY = Frequency.ofTHz(193.1);
 
     // O band (original): 1260 to 1360 nm
     public static final Frequency O_BAND_MIN = Frequency.ofTHz(220.436);
@@ -48,4 +49,7 @@ public final class Spectrum {
     // U band (ultra-long wavelength): 1625 to 1675 nm
     public static final Frequency U_BAND_MIN = Frequency.ofTHz(178.981);
     public static final Frequency U_BAND_MAX = Frequency.ofTHz(184.488);
+
+    private Spectrum() {
+    }
 }
diff --git a/framework/src/onos/utils/misc/src/test/java/org/onlab/util/GeoLocationTest.java b/framework/src/onos/utils/misc/src/test/java/org/onlab/util/GeoLocationTest.java
new file mode 100644
index 00000000..a497bcc4
--- /dev/null
+++ b/framework/src/onos/utils/misc/src/test/java/org/onlab/util/GeoLocationTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2014-2015 Open Networking Laboratory
+ *
+ * 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.onlab.util;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test suite of the geo location.
+ */
+public class GeoLocationTest {
+
+    @Test
+    public void basics() {
+        GeoLocation nLoc = new GeoLocation(40.7127, -74.0059);
+        GeoLocation wLoc = new GeoLocation(38.9047, -77.0164);
+
+        assertEquals("incorrect latitude", 40.7127, nLoc.latitude(), 0.0001);
+        assertEquals("incorrect longitude", -74.00598, nLoc.longitude(), 0.0001);
+        assertEquals("incorrect distance", 326.74, nLoc.kilometersTo(wLoc), 0.01);
+    }
+
+}
\ No newline at end of file