diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/src/gov/nasa/msfc/sport/edex/plugin/lma/LmaDecoder.java b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/src/gov/nasa/msfc/sport/edex/plugin/lma/LmaDecoder.java index ddc3134c0a..170b9b4a13 100755 --- a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/src/gov/nasa/msfc/sport/edex/plugin/lma/LmaDecoder.java +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/src/gov/nasa/msfc/sport/edex/plugin/lma/LmaDecoder.java @@ -64,7 +64,7 @@ public class LmaDecoder { */ public PluginDataObject[] decode(File fileInput) throws Exception { //Create an empty records to hold the data once decoded. - GridRecord[] records = null; + List recordsList = new ArrayList(); /** The variable dictionary used to check which variables are supported by the ingest **/ LMAVarsDict lmaVarsDict = LMAVarsDict.getInstance(); @@ -105,7 +105,6 @@ public class LmaDecoder { float dy= yresAtt.getNumericValue().floatValue(); int nx = file.findDimension("x").getLength(); int ny = file.findDimension("y").getLength(); - int nz = file.findDimension("levels_17").getLength(); //Construct the grid coverage with attributes GridCoverage cov =createMapCoverage(centerLon, centerLat, nx, ny, dx, dy); //Lookup Coverage to make sure it does not already exist in the db. @@ -129,17 +128,15 @@ public class LmaDecoder { String[] listOfVariablesToProcess = new String[sizeOfVariablesToProcess]; varsToProcessList.toArray(listOfVariablesToProcess); - // - //Create initial Grid Record array - int count =0; - records = new GridRecord[sizeOfVariablesToProcess*nz]; + //Iterate over variables and create GridRecords for each variable and level for (int i = 0; i0) { + GridRecord[] records = new GridRecord[recordsList.size()]; + recordsList.toArray(records); + return records; + } else { + return null; + } } diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_1.cmap b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_1.cmap new file mode 100644 index 0000000000..c543aad171 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_1.cmap @@ -0,0 +1,258 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_2.cmap b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_2.cmap new file mode 100644 index 0000000000..6e67d83842 --- /dev/null +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_2.cmap @@ -0,0 +1,261 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/lma/nalma.cmap b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_default.cmap similarity index 99% rename from edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/lma/nalma.cmap rename to edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_default.cmap index af7db68192..dd45f170a6 100644 --- a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/lma/nalma.cmap +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/colormaps/LMA/LMA_default.cmap @@ -3,9 +3,9 @@ This is a colormap file that is read via JaXB to marshel the ColorMap class. ======================--> - - - + + + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml index 528f5ea94e..6b2e35ee45 100644 --- a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/menus/lma/lma.xml @@ -9,7 +9,7 @@ - + /grid/NALMA/%/%/lmamsd @@ -17,7 +17,7 @@ - + /grid/NALMA/%/%/lmafed @@ -25,7 +25,7 @@ - + /grid/NALMA/%/%/lmafid @@ -33,7 +33,7 @@ - + /grid/NALMA/%/%/lmamfd @@ -41,7 +41,7 @@ - + /grid/NALMA/%/%/lmaroc @@ -49,7 +49,7 @@ - + @@ -59,7 +59,7 @@ - + /grid/DCLMA/%/%/lmafed @@ -67,7 +67,7 @@ - + /grid/DCLMA/%/%/lmafid @@ -75,7 +75,7 @@ - + /grid/DCLMA/%/%/lmamfd @@ -83,7 +83,7 @@ - + @@ -94,7 +94,7 @@ - + /grid/KLDAR/%/%/lmafed @@ -102,7 +102,7 @@ - + /grid/KLDAR/%/%/lmafid @@ -110,7 +110,7 @@ - + /grid/KLDAR/%/%/lmamfd @@ -118,7 +118,7 @@ - + @@ -129,7 +129,7 @@ - + /grid/OKLMA/%/%/lmafed @@ -137,7 +137,7 @@ - + /grid/OKLMA/%/%/lmafid @@ -145,7 +145,7 @@ - + /grid/OKLMA/%/%/lmamfd @@ -153,7 +153,7 @@ - + @@ -164,7 +164,7 @@ - + /grid/COLMA/%/%/lmafed @@ -172,7 +172,7 @@ - + /grid/COLMA/%/%/lmafid @@ -180,7 +180,7 @@ - + /grid/COLMA/%/%/lmamfd @@ -188,7 +188,7 @@ - + @@ -199,7 +199,7 @@ - + /grid/HGLMA/%/%/lmafed @@ -207,7 +207,7 @@ - + /grid/HGLMA/%/%/lmafid @@ -215,7 +215,7 @@ - + /grid/HGLMA/%/%/lmamfd @@ -223,7 +223,7 @@ - + @@ -234,7 +234,7 @@ - + /grid/WTLMA/%/%/lmafed @@ -242,7 +242,7 @@ - + /grid/WTLMA/%/%/lmafid @@ -250,7 +250,7 @@ - + /grid/WTLMA/%/%/lmamfd @@ -258,7 +258,7 @@ - + @@ -269,7 +269,7 @@ - + /grid/CFLMA/%/%/lmafed @@ -277,7 +277,7 @@ - + /grid/CFLMA/%/%/lmafid @@ -285,7 +285,7 @@ - + /grid/CFLMA/%/%/lmamfd @@ -293,7 +293,7 @@ - + @@ -304,7 +304,7 @@ - + /grid/LLLMA/%/%/lmafed @@ -312,7 +312,7 @@ - + /grid/LLLMA/%/%/lmafid @@ -320,7 +320,7 @@ - + /grid/LLLMA/%/%/lmamfd @@ -328,7 +328,7 @@ - + @@ -340,7 +340,7 @@ - + /grid/KSCLMA/%/%/lmafed @@ -348,7 +348,7 @@ - + /grid/KSCLMA/%/%/lmafid @@ -356,7 +356,7 @@ - + /grid/KSCLMA/%/%/lmamfd @@ -364,7 +364,7 @@ - + @@ -375,7 +375,7 @@ - + /grid/NGLMA/%/%/lmafed @@ -383,7 +383,7 @@ - + /grid/NGLMA/%/%/lmafid @@ -391,7 +391,7 @@ - + /grid/NGLMA/%/%/lmamfd @@ -399,7 +399,7 @@ - + @@ -410,7 +410,7 @@ - + /grid/ONLMA/%/%/lmafed @@ -418,7 +418,7 @@ - + /grid/ONLMA/%/%/lmafid @@ -426,7 +426,7 @@ - + /grid/ONLMA/%/%/lmamfd @@ -434,7 +434,7 @@ - + @@ -445,7 +445,7 @@ - + /grid/WILMA/%/%/lmafed @@ -453,7 +453,7 @@ - + /grid/WILMA/%/%/lmafid @@ -461,7 +461,7 @@ - + /grid/WILMA/%/%/lmamfd @@ -469,7 +469,7 @@ - + @@ -480,7 +480,7 @@ - + /grid/WSLMA/%/%/lmafed @@ -488,7 +488,7 @@ - + /grid/WSLMA/%/%/lmafid @@ -496,7 +496,7 @@ - + /grid/WSLMA/%/%/lmamfd @@ -504,7 +504,7 @@ - + @@ -517,7 +517,7 @@ - + /grid/PGNA/%/%/lmafid @@ -525,7 +525,7 @@ - + /grid/PGNA/%/%/lmamfd @@ -533,7 +533,7 @@ - + /grid/PGNA/%/%/lmasum @@ -541,7 +541,7 @@ - + @@ -552,7 +552,7 @@ - + /grid/PGDC/%/%/lmafid @@ -560,7 +560,7 @@ - + /grid/PGDC/%/%/lmamfd @@ -568,7 +568,7 @@ - + /grid/PGDC/%/%/lmasum @@ -576,7 +576,7 @@ - + @@ -587,7 +587,7 @@ - + /grid/PGSC/%/%/lmafid @@ -595,7 +595,7 @@ - + /grid/PGSC/%/%/lmamfd @@ -603,7 +603,7 @@ - + /grid/PGSC/%/%/lmasum @@ -611,7 +611,7 @@ - + @@ -622,7 +622,7 @@ - + /grid/PGOK/%/%/lmafid @@ -630,7 +630,7 @@ - + /grid/PGOK/%/%/lmamfd @@ -638,7 +638,7 @@ - + /grid/PGOK/%/%/lmasum @@ -646,7 +646,7 @@ - + @@ -657,7 +657,7 @@ - + /grid/PGCO/%/%/lmafid @@ -665,7 +665,7 @@ - + /grid/PGCO/%/%/lmamfd @@ -673,7 +673,7 @@ - + /grid/PGCO/%/%/lmasum @@ -681,7 +681,7 @@ - + @@ -692,7 +692,7 @@ - + /grid/PGHG/%/%/lmafid @@ -700,7 +700,7 @@ - + /grid/PGHG/%/%/lmamfd @@ -708,7 +708,7 @@ - + /grid/PGHG/%/%/lmasum @@ -716,7 +716,7 @@ - + @@ -727,7 +727,7 @@ - + /grid/PGWT/%/%/lmafid @@ -735,7 +735,7 @@ - + /grid/PGWT/%/%/lmamfd @@ -743,7 +743,7 @@ - + /grid/PGWT/%/%/lmasum @@ -751,7 +751,7 @@ - + @@ -762,7 +762,7 @@ - + /grid/PGCF/%/%/lmafid @@ -770,7 +770,7 @@ - + /grid/PGCF/%/%/lmamfd @@ -778,7 +778,7 @@ - + /grid/PGCF/%/%/lmasum @@ -786,7 +786,7 @@ - + @@ -797,7 +797,7 @@ - + /grid/PGLL/%/%/lmafid @@ -805,7 +805,7 @@ - + /grid/PGLL/%/%/lmamfd @@ -813,7 +813,7 @@ - + /grid/PGLL/%/%/lmasum @@ -821,7 +821,7 @@ - + diff --git a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/styleRules/lma/lmaImageryStyleRules.xml b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/styleRules/lma/lmaImageryStyleRules.xml index a205e89da4..f4b6c76f0d 100644 --- a/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/styleRules/lma/lmaImageryStyleRules.xml +++ b/edexOsgi/gov.nasa.msfc.sport.edex.plugin.lma/utility/common_static/base/styleRules/lma/lmaImageryStyleRules.xml @@ -8,7 +8,7 @@ 50.0 100.0 150.0 200.0 - lma/nalma + LMA/LMA_default 0.0 500.0 @@ -16,34 +16,18 @@ - - - lmamsd - - - - 50.0 100.0 150.0 - - lma/nalma - - 0.0 - 200.0 - - - lmafed lmafid lmamfd - lmasum 10.0 20.0 30.0 - lma/nalma + LMA/LMA_default 0.0 110.0 @@ -60,14 +44,28 @@ -1.0 0.0 1.0 - lma/nalma + LMA/LMA_default -3.0 3.0 - + + + lmasum + + + + 50.0 100.0 150.0 200.0 + + LMA/LMA_default + + 0.0 + 400.0 + + +