From 7016f72e88101b95895ec81759e4e721a66a50b2 Mon Sep 17 00:00:00 2001 From: Ben Steffensmeier Date: Mon, 1 Oct 2012 16:52:48 -0500 Subject: [PATCH] Issue #189 switch uengine to grid Former-commit-id: 55b665ecc63d591aa4eabb76bca2a623cc0b1a2a --- .../raytheon/edex/uengine/web/RunAction.java | 6 ++-- .../edex/uengine/web/ScriptTestDriver.java | 2 +- .../web/GridInterface.js | 36 +++++++++---------- .../web/templates/VM_global_library.vm | 6 ++-- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/RunAction.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/RunAction.java index e7867f6013..31fede40b7 100644 --- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/RunAction.java +++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/RunAction.java @@ -99,7 +99,7 @@ public class RunAction extends javax.servlet.http.HttpServlet implements actionXML = createActionASCII(request); } else if (requestType.equalsIgnoreCase("image")) { actionXML = createActionImage(request); - } else if (requestType.equalsIgnoreCase("grib")) { + } else if (requestType.equalsIgnoreCase("grid")) { actionXML = createActionGrib(request); } else if (requestType.equalsIgnoreCase("radar")) { actionXML = createActionRadar(request); @@ -200,7 +200,7 @@ public class RunAction extends javax.servlet.http.HttpServlet implements dataURI = makeImageDataURI(request); } else if (type.equalsIgnoreCase("ascii")) { dataURI = makeAsciiDataURI(request); - } else if (type.equalsIgnoreCase("grib")) { + } else if (type.equalsIgnoreCase("grid")) { dataURI = makeGribDataURI(request); } else if (type.equalsIgnoreCase("radar")) { dataURI = makeRadarDataURI(request); @@ -1563,7 +1563,7 @@ public class RunAction extends javax.servlet.http.HttpServlet implements } } StringBuffer dataUri = new StringBuffer(); - dataUri.append("/grib"); + dataUri.append("/grid"); dataUri.append("/").append(".+?"); dataUri.append("/").append(".+?"); dataUri.append("/").append(".+?"); diff --git a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/ScriptTestDriver.java b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/ScriptTestDriver.java index fdb062205b..b3b856516e 100644 --- a/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/ScriptTestDriver.java +++ b/edexOsgi/com.raytheon.edex.uengine/src/com/raytheon/edex/uengine/web/ScriptTestDriver.java @@ -82,7 +82,7 @@ public class ScriptTestDriver { if (pluginName == null) { script = new String(); } else { - if ("grib".equals(pluginName)) { + if ("grid".equals(pluginName)) { library = "GridRequest"; } else if ("satellite".equals(pluginName)) { library = "SatelliteRequest"; diff --git a/edexOsgi/com.raytheon.edex.uengine/web/GridInterface.js b/edexOsgi/com.raytheon.edex.uengine/web/GridInterface.js index d5ac5de4f0..5aa27f3da7 100644 --- a/edexOsgi/com.raytheon.edex.uengine/web/GridInterface.js +++ b/edexOsgi/com.raytheon.edex.uengine/web/GridInterface.js @@ -33,34 +33,34 @@ GridInterface.prototype.getData = function(type){ var self = this; switch(type){ case "model": - var queryArray = {"plugin":"grib"}; - RequestTestDriver.requestCatalog("modelInfo.modelName",queryArray,60000,function(output){self.processData(type,output);}); + var queryArray = {"plugin":"grid"}; + RequestTestDriver.requestCatalog("info.datasetId",queryArray,60000,function(output){self.processData(type,output);}); break; case "basetime": var model = this.model.options[this.model.selectedIndex].value; - var queryArray = {"plugin":"grib","modelInfo.modelName":model}; + var queryArray = {"plugin":"grid","info.datasetId":model}; RequestTestDriver.requestCatalog("dataTime",queryArray,60000,function(output){self.processData(type,output);}); break; case "parameter": var model = this.model.options[this.model.selectedIndex].value; var basetime = this.basetime.options[this.basetime.selectedIndex].value; - var queryArray = {"plugin":"grib","modelInfo.modelName":model,"dataTime":basetime}; - RequestTestDriver.requestCatalog("modelInfo.parameterName",queryArray,60000,function(output){self.processData(type,output);}); + var queryArray = {"plugin":"grid","info.datasetId":model,"dataTime":basetime}; + RequestTestDriver.requestCatalog("info.parameter.name",queryArray,60000,function(output){self.processData(type,output);}); break; case "level": var model = this.model.options[this.model.selectedIndex].value; var basetime = this.basetime.options[this.basetime.selectedIndex].value; var parameter = this.parameter.options[this.parameter.selectedIndex].value; - var queryArray = {"plugin":"grib","modelInfo.modelName":model,"dataTime":basetime,"modelInfo.parameterName":parameter}; - RequestTestDriver.requestCatalog("modelInfo.level.masterLevel.name",queryArray,60000,function(output){self.processData(type,output);}); + var queryArray = {"plugin":"grid","info.datasetId":model,"dataTime":basetime,"info.parameter.name":parameter}; + RequestTestDriver.requestCatalog("info.level.masterLevel.name",queryArray,60000,function(output){self.processData(type,output);}); break; case "levelone": var model = this.model.options[this.model.selectedIndex].value; var basetime = this.basetime.options[this.basetime.selectedIndex].value; var parameter = this.parameter.options[this.parameter.selectedIndex].value; var level = this.level.options[this.level.selectedIndex].value; - var queryArray = {"plugin":"grib","modelInfo.modelName":model,"dataTime":basetime,"modelInfo.parameterName":parameter,"modelInfo.level.masterLevel.name":level}; - RequestTestDriver.requestCatalog("modelInfo.level.levelonevalue",queryArray,60000,function(output){self.processData(type,output);}); + var queryArray = {"plugin":"grid","info.datasetId":model,"dataTime":basetime,"info.parameter.name":parameter,"info.level.masterLevel.name":level}; + RequestTestDriver.requestCatalog("info.level.levelonevalue",queryArray,60000,function(output){self.processData(type,output);}); break; case "leveltwo": var model = this.model.options[this.model.selectedIndex].value; @@ -68,9 +68,9 @@ GridInterface.prototype.getData = function(type){ var parameter = this.parameter.options[this.parameter.selectedIndex].value; var level = this.level.options[this.level.selectedIndex].value; var levelone = this.levelone.options[this.levelone.selectedIndex].value; - var queryArray = {"plugin":"grib","modelInfo.modelName":model,"dataTime":basetime,"modelInfo.parameterName":parameter,"modelInfo.level.masterLevel.name":level, -"modelInfo.level.levelonevalue":levelone}; - RequestTestDriver.requestCatalog("modelInfo.level.leveltwovalue",queryArray,60000,function(output){self.processData(type,output);}); + var queryArray = {"plugin":"grid","info.datasetId":model,"dataTime":basetime,"info.parameter.name":parameter,"info.level.masterLevel.name":level, +"info.level.levelonevalue":levelone}; + RequestTestDriver.requestCatalog("info.level.leveltwovalue",queryArray,60000,function(output){self.processData(type,output);}); break; case "colormap": RequestTestDriver.requestColormaps(60000,function(output){self.processData(type,output);}); @@ -198,14 +198,14 @@ GridInterface.prototype.createScript = function(){ var engine = document.getElementById("scriptInterface").checked ? "imagejs" : "image"; if (this.leveltwo.selectedIndex >= 0) { var leveltwo = this.leveltwo.options[this.leveltwo.selectedIndex].value; - var queryArray = {"pluginName":"grib","modelInfo.modelName":model,"dataTime":basetime, - "modelInfo.parameterName":parameter,"modelInfo.level.masterLevel.name":level, - "modelInfo.level.levelonevalue":levelone, "modelInfo.level.leveltwovalue":leveltwo, + var queryArray = {"pluginName":"grid","info.datasetId":model,"dataTime":basetime, + "info.parameter.name":parameter,"info.level.masterLevel.name":level, + "info.level.levelonevalue":levelone, "info.level.leveltwovalue":leveltwo, "colormap":colormap,"reproject":reproject,"format":format}; } else { - var queryArray = {"pluginName":"grib","modelInfo.modelName":model,"dataTime":basetime, - "modelInfo.parameterName":parameter,"modelInfo.level.masterLevel.name":level, - "modelInfo.level.levelonevalue":levelone, "colormap":colormap,"reproject":reproject,"format":format}; + var queryArray = {"pluginName":"grid","info.datasetId":model,"dataTime":basetime, + "info.parameter.name":parameter,"info.level.masterLevel.name":level, + "info.level.levelonevalue":levelone, "colormap":colormap,"reproject":reproject,"format":format}; } ScriptTestDriver.createScript(queryArray,count,engine,function(output){self.processScript(output);}); } diff --git a/edexOsgi/com.raytheon.edex.uengine/web/templates/VM_global_library.vm b/edexOsgi/com.raytheon.edex.uengine/web/templates/VM_global_library.vm index 949545ec7c..5121f72a34 100644 --- a/edexOsgi/com.raytheon.edex.uengine/web/templates/VM_global_library.vm +++ b/edexOsgi/com.raytheon.edex.uengine/web/templates/VM_global_library.vm @@ -52,7 +52,7 @@ dataRequest.execute(); #set($reproject = $scriptMetadata.remove("reproject").constraintValue) #set($format = $scriptMetadata.remove("format").constraintValue) import ${scriptLibrary} -#if($pluginName == "grib") +#if($pluginName == "grid") dataRequest = ${scriptLibrary}.${scriptLibrary}("${pluginName}") #else dataRequest = ${scriptLibrary}.${scriptLibrary}() @@ -77,7 +77,7 @@ dataRequest.addParameter("${key}", "${constraint.constraintValue}") #end #end #end -#if(${pluginName} == "grib") +#if(${pluginName} == "grid") dataRequest.setScaleFactor(1) #end dataRequest.setFormat("${format}") @@ -111,7 +111,7 @@ dataRequest.addParameter("${key}", "${constraint.constraintValue}"); #end #end #end -#if(${pluginName} == "grib") +#if(${pluginName} == "grid") dataRequest.setScaleFactor(1); #end dataRequest.setFormat("${format}");