Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/FlowVelocityState.java @ 7668:e0219f4079a8
issue1688: In flow velocity, discharges are now initially inactive.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Fri, 06 Dec 2013 15:36:47 +0100 |
parents | 173d872a374c |
children | e4606eae8ea5 |
comparison
equal
deleted
inserted
replaced
7667:a6363e080e2c | 7668:e0219f4079a8 |
---|---|
284 String output | 284 String output |
285 ) { | 285 ) { |
286 String name = facet.getName(); | 286 String name = facet.getName(); |
287 if (name.equals(FLOW_VELOCITY_MAINCHANNEL_FILTERED) || | 287 if (name.equals(FLOW_VELOCITY_MAINCHANNEL_FILTERED) || |
288 name.equals(FLOW_VELOCITY_TAU_FILTERED) || | 288 name.equals(FLOW_VELOCITY_TAU_FILTERED) || |
289 name.equals(FLOW_VELOCITY_DISCHARGE) || | |
290 name.equals(FLOW_VELOCITY_TOTALCHANNEL_FILTERED)) { | 289 name.equals(FLOW_VELOCITY_TOTALCHANNEL_FILTERED)) { |
291 return Boolean.TRUE; | 290 return Boolean.TRUE; |
292 } | 291 } |
293 else if (name.equals(FLOW_VELOCITY_MAINCHANNEL) || | 292 else if (name.equals(FLOW_VELOCITY_MAINCHANNEL) || |
294 name.equals(FLOW_VELOCITY_TAU) || | 293 name.equals(FLOW_VELOCITY_TAU) || |
295 name.equals(FLOW_VELOCITY_TOTALCHANNEL)) { | 294 name.equals(FLOW_VELOCITY_TOTALCHANNEL) || |
295 name.equals(FLOW_VELOCITY_DISCHARGE) | |
296 ) { | |
296 return Boolean.FALSE; | 297 return Boolean.FALSE; |
297 } | 298 } |
298 else { | 299 else { |
299 return null; | 300 return null; |
300 } | 301 } |