From 876960a2cb9d64ab573c267811a24528e7a4db36 Mon Sep 17 00:00:00 2001
From: Mike Duff <michael.duff@raytheon.com>
Date: Tue, 2 Jul 2013 16:08:37 -0500
Subject: [PATCH] Issue #2132 - review comments

Change-Id: I65b880b5f96471b6f8e0f5ae89ee3981a96a1094

Former-commit-id: 2618c1a4e4eb26b8a39dd1e21788d7beed40f708 [formerly 4399429e745aaffdcdbe157c2c2c1a04b5b90641 [formerly 7a85b96863dece9c1b5a356f4e929665e0ce03f8]]
Former-commit-id: 4399429e745aaffdcdbe157c2c2c1a04b5b90641
Former-commit-id: 57d37e9761c09fc205f6ce3fe9c6bf5f73bb38b9
---
 .../viz/datadelivery/common/ui/AreaComp.java  |  4 ++--
 .../datadelivery/registry/EnvelopeUtils.java  | 21 +++----------------
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java
index 26932e75c8..d4bc98330c 100644
--- a/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java
+++ b/cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/common/ui/AreaComp.java
@@ -734,8 +734,8 @@ public class AreaComp extends Composite implements ISubset {
             // the dialog should always use an envelope in the same crs as the
             // data.
             try {
-                dlgEnvelope = MapUtil.reprojectAndIntersect(fullEnvelope,
-                        dlgEnvelope);
+                dlgEnvelope = MapUtil.reprojectAndIntersect(dlgEnvelope,
+                        fullEnvelope);
             } catch (TransformException e) {
                 statusHandler.handle(Priority.PROBLEM, e.getLocalizedMessage(),
                         e);
diff --git a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/EnvelopeUtils.java b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/EnvelopeUtils.java
index 6de17bfdd0..4b8187b33b 100644
--- a/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/EnvelopeUtils.java
+++ b/edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/EnvelopeUtils.java
@@ -286,6 +286,9 @@ public class EnvelopeUtils {
         try {
             ReferencedEnvelope e = new ReferencedEnvelope(crs);
 
+            latLon1 = normalizeLongitude(e, latLon1);
+            latLon2 = normalizeLongitude(e, latLon2);
+
             DirectPosition2D dp1 = new DirectPosition2D(latLon1.x, latLon1.y);
             DirectPosition2D dp2 = new DirectPosition2D(latLon2.x, latLon2.y);
             MathTransform transform = MapUtil.getTransformFromLatLon(crs);
@@ -321,9 +324,6 @@ public class EnvelopeUtils {
      */
     public static ReferencedEnvelope createSubenvelopeFromLatLon(
             Envelope envelope, Coordinate latLon1, Coordinate latLon2) {
-        latLon1 = EnvelopeUtils.convertToEastWest(latLon1);
-        latLon2 = EnvelopeUtils.convertToEastWest(latLon2);
-
         ReferencedEnvelope result = createEnvelopeFromLatLon(
                 envelope.getCoordinateReferenceSystem(), latLon1, latLon2);
         return new ReferencedEnvelope(result.intersection(reference(envelope)),
@@ -358,19 +358,4 @@ public class EnvelopeUtils {
             return new ReferencedEnvelope(envelope);
         }
     }
-
-    /**
-     * Convert coordinate value to East/West.
-     * 
-     * @param coord
-     *            Coordinate to convert
-     * @return converted coordinate
-     */
-    public static Coordinate convertToEastWest(Coordinate coord) {
-        if (coord.x > 180) {
-            coord.x = coord.x - 360;
-        }
-
-        return coord;
-    }
 }