comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/WDifferencesState.java @ 6618:e8e76d50d119

issue1399: Use WKms instead of WQKms object, as W-Difference artifact themselves only deliver WKms, and no Q-Difference is ever built.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 19 Jul 2013 13:36:45 +0200
parents 7216143665d9
children a3d4153afb16
comparison
equal deleted inserted replaced
6617:67b4728723df 6618:e8e76d50d119
111 111
112 if (d4eArtifact instanceof WINFOArtifact) { 112 if (d4eArtifact instanceof WINFOArtifact) {
113 logger.debug("Get WKms from WINFOArtifact"); 113 logger.debug("Get WKms from WINFOArtifact");
114 WINFOArtifact flys = (WINFOArtifact) d4eArtifact; 114 WINFOArtifact flys = (WINFOArtifact) d4eArtifact;
115 115
116 WQKms[] wqkms = (WQKms[]) flys.getWaterlevelData(). 116 WKms[] wkms = (WKms[]) flys.getWaterlevelData(context).
117 getData(); 117 getData();
118 if (wqkms == null) { 118 if (wkms == null || wkms.length == 0) {
119 logger.warn("no waterlevels in artifact"); 119 logger.warn("no waterlevels in artifact");
120 } 120 }
121 else if (wqkms.length < idx+1) { 121 else if (wkms.length < idx+1) {
122 logger.warn("not enough waterlevels in artifact"); 122 logger.warn("Not enough waterlevels in artifact.");
123 return new WQKms(); 123 return new WQKms();
124 } 124 }
125 return wqkms[idx]; 125 return wkms[idx];
126 } 126 }
127 else if (d4eArtifact instanceof MINFOArtifact) { 127 else if (d4eArtifact instanceof MINFOArtifact) {
128 logger.debug("Get WKms from MINFOArtifact"); 128 logger.debug("Get WKms from MINFOArtifact");
129 CalculationResult r = (CalculationResult) 129 CalculationResult r = (CalculationResult)
130 d4eArtifact.compute(context, ComputeType.ADVANCE, false); 130 d4eArtifact.compute(context, ComputeType.ADVANCE, false);

http://dive4elements.wald.intevation.org