From 788cd01af7307f1b1c572b12517ddd240b57ee89 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Mon, 1 Oct 2012 17:59:17 -0500 Subject: [PATCH] Issue #189 update grid resource reprojection to match ss_builds Former-commit-id: b6c6543bed50235623ce4adccc4ac1d269060a08 [formerly 326acb6c15a8ca0ff63f975ad5ac541568c2b507] [formerly c503a9b94c1a4c3dadc08b21a1a1d1c3bfc0646e] [formerly a6168a2e88b0fdb203336b8a9cdc6909c4014f02 [formerly c503a9b94c1a4c3dadc08b21a1a1d1c3bfc0646e [formerly 4a2a57ae5e7b380141910106aa016c6c4ef46d82]]] Former-commit-id: a6168a2e88b0fdb203336b8a9cdc6909c4014f02 Former-commit-id: 07a39cc465cd988ae0573e4334384317c8422139 [formerly 8c21bc8510c327f0ea0b73cafaaa1cb3c23279bc] Former-commit-id: 2c82f142ca9887dbe26fa3dc071da45b672f8d33 --- .../com/raytheon/viz/grid/rsc/general/D2DGridResource.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java index 6e78915c6d..7dcb7c5bf5 100644 --- a/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java +++ b/cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java @@ -58,6 +58,7 @@ import com.raytheon.viz.grid.rsc.GridNameGenerator; import com.raytheon.viz.grid.rsc.GridNameGenerator.IGridNameResource; import com.raytheon.viz.grid.rsc.GridNameGenerator.LegendParameters; import com.raytheon.viz.grid.rsc.GridResourceData; +import com.raytheon.viz.grid.util.ConformalityUtil; import com.raytheon.viz.grid.xml.FieldDisplayTypesFactory; import com.vividsolutions.jts.geom.Coordinate; @@ -131,9 +132,8 @@ public class D2DGridResource extends GridResource implements GeneralGridData data = getData(dataRecs, location.getGridGeometry(), dataUnit); if (location != null && location.getSpacingUnit().equals("degree")) { - double dx = location.getDx(); - Integer nx = location.getNx(); - if (dx * nx >= 360) { + if (!ConformalityUtil.testConformality(location.getGridGeometry(), + descriptor.getGridGeometry())) { data = reprojectData(data); } }