diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java @ 4668:87c938d082d6

Added facet for filtered flow velocity and removed filter from default facet.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 13 Dec 2012 15:54:49 +0100
parents 63368dcc3f94
children 756aba0d2a7a
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java	Wed Dec 12 10:42:38 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityFacet.java	Thu Dec 13 15:54:49 2012 +0100
@@ -42,36 +42,13 @@
     public Object getData(Artifact artifact, CallContext context) {
         logger.debug("Get data for flow velocity at index: " + index);
 
-        Double start = (Double)context.getContextValue("startkm");
-        Double end = (Double)context.getContextValue("endkm");
         FLYSArtifact flys = (FLYSArtifact) artifact;
 
         CalculationResult res = (CalculationResult)
             flys.compute(context, hash, stateId, type, false);
 
         FlowVelocityData[] data = (FlowVelocityData[]) res.getData();
-        if(start != null && end != null) {
-            FLYSContext fc = (FLYSContext)context.globalContext();
-            ZoomScale scales = (ZoomScale)fc.get("zoomscale");
-            RiverAccess access = new RiverAccess((FLYSArtifact)artifact);
-            String river = access.getRiver();
 
-            double radius = scales.getRadius(river, start, end);
-            FlowVelocityData oldData = data[index];
-            FlowVelocityData newData = new FlowVelocityData();
-            double[][] q = oldData.getQPoints();
-            double[][] totalV = MovingAverage.weighted(oldData.getTotalChannelPoints(), radius);
-            double[][] mainV = MovingAverage.weighted(oldData.getMainChannelPoints(), radius);
-            double[][] tau = MovingAverage.weighted(oldData.getTauPoints(), radius);
-            for(int j = 0; j < q[0].length; j++) {
-                newData.addKM(q[0][j]);
-                newData.addQ(q[1][j]);
-                newData.addTauMain(tau[1][j]);
-                newData.addVMain(mainV[1][j]);
-                newData.addVTotal(totalV[1][j]);
-            }
-            return newData;
-        }
         return data[index];
     }
 

http://dive4elements.wald.intevation.org