From 4d8e42f460d078246ffb4a7a5ccf267ecd0423e6 Mon Sep 17 00:00:00 2001
From: Ben Steffensmeier <Benjamin.P.Steffensmeier@raytheon.com>
Date: Tue, 2 Oct 2012 17:05:21 -0500
Subject: [PATCH] Issue #189 updates to GFE from code review

Former-commit-id: 8afcbace624e947e41c6d6cac12bb07a00560b61 [formerly 3ff63d4ad3fb46da377c0ab8a2622efb5814992e [formerly a64647ddbd4f062602f092b828c080af2550f31a]]
Former-commit-id: 3ff63d4ad3fb46da377c0ab8a2622efb5814992e
Former-commit-id: bf80df292762364cc494c5372317a1e4805dd81b
---
 .../raytheon/edex/plugin/gfe/db/dao/GFEDao.java   |  5 ++---
 .../gfe/server/database/D2DGridDatabase.java      | 15 +++------------
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
index 49fcbde16b..5ae034e737 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
@@ -658,7 +658,6 @@ public class GFEDao extends DefaultPluginDao {
                                 + id.getDbId().getSiteId(), e);
             }
         }
-        // }
 
         return null;
     }
@@ -851,8 +850,8 @@ public class GFEDao extends DefaultPluginDao {
             List<DataTime> results = executeD2DParmQuery(id);
             for (DataTime o : results) {
                 if (isMos(id)) {
-                    timeList.add(new TimeRange(o.getValidPeriod().getEnd(),
-                            o.getValidPeriod().getDuration()));
+                    timeList.add(new TimeRange(o.getValidPeriod().getEnd(), o
+                            .getValidPeriod().getDuration()));
                 } else {
                     timeList.add(o.getValidPeriod());
                 }
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
index 8c61443ca9..3e561d3faa 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
@@ -38,7 +38,6 @@ import com.raytheon.edex.plugin.gfe.config.IFPServerConfig;
 import com.raytheon.edex.plugin.gfe.config.IFPServerConfigManager;
 import com.raytheon.edex.plugin.gfe.db.dao.GFEDao;
 import com.raytheon.edex.plugin.gfe.exception.GfeConfigurationException;
-import com.raytheon.edex.plugin.grib.spatial.GribSpatialCache;
 import com.raytheon.edex.plugin.grib.util.GribParamInfoLookup;
 import com.raytheon.edex.plugin.grib.util.ParameterInfo;
 import com.raytheon.edex.util.Util;
@@ -94,7 +93,7 @@ public class D2DGridDatabase extends VGridDatabase {
             .getHandler(D2DGridDatabase.class);
 
     /** The remap object used for resampling grids */
-    private Map<String, RemapGrid> remap = new HashMap<String, RemapGrid>();
+    private Map<Integer, RemapGrid> remap = new HashMap<Integer, RemapGrid>();
 
     /** The destination GridLocation (The local GFE grid coverage) */
     private GridLocation outputLoc;
@@ -114,24 +113,16 @@ public class D2DGridDatabase extends VGridDatabase {
         valid = this.dbId.isValid();
 
         if (valid) {
-            String gfeModelName = dbId.getModelName();
-
             outputLoc = this.config.dbDomain();
-
-            String d2dModelName = this.config.d2dModelNameMapping(gfeModelName);
-            for (GridCoverage awipsGrid : GribSpatialCache.getInstance()
-                    .getGridsForModel(d2dModelName)) {
-                getOrCreateRemap(awipsGrid);
-            }
         }
     }
 
     private RemapGrid getOrCreateRemap(GridCoverage awipsGrid) {
-        RemapGrid remap = this.remap.get(awipsGrid.getName());
+        RemapGrid remap = this.remap.get(awipsGrid.getId());
         if (remap == null) {
             GridLocation inputLoc = GfeUtil.transformGridCoverage(awipsGrid);
             remap = new RemapGrid(inputLoc, outputLoc);
-            this.remap.put(awipsGrid.getName(), remap);
+            this.remap.put(awipsGrid.getId(), remap);
         }
         return remap;
     }