Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java @ 704:eab5e5089d77
Merged revisions 2127-2133,2136-2137,2140,2143-2144,2146,2150-2151,2153-2154 via svnmerge from
svn+ssh://teichmann@thoe/home/projects/Geospatial/bsh-generischer-viewer/Material/SVN/flys-artifacts/branches/facets-slt
........
r2127 | ingo | 2011-06-16 09:50:56 +0200 (Do, 16 Jun 2011) | 1 line
Added a compute() method to WINFOArtifact which acts as a dispatcher for different computations. It triggers a calculation based on ComputeCallbacks that are generated by the current states.
........
r2128 | ingo | 2011-06-16 10:25:06 +0200 (Do, 16 Jun 2011) | 1 line
Moved Waterlevel state into the correct package.
........
r2129 | ingo | 2011-06-16 10:43:58 +0200 (Do, 16 Jun 2011) | 1 line
Added two more compute() methods to ComputeCallback to distinguish between different phases of the artifact.
........
r2130 | ingo | 2011-06-16 10:57:05 +0200 (Do, 16 Jun 2011) | 1 line
Use enums to dispatch computeFeed() and computeAdvance().
........
r2131 | ingo | 2011-06-16 11:04:59 +0200 (Do, 16 Jun 2011) | 1 line
Store facets for each state.
........
r2132 | ingo | 2011-06-16 12:05:44 +0200 (Do, 16 Jun 2011) | 1 line
Generated facets for each output aspect.
........
r2133 | ingo | 2011-06-16 15:24:00 +0200 (Do, 16 Jun 2011) | 1 line
Write computed facets into artifacts describe document.
........
r2136 | ingo | 2011-06-16 16:10:49 +0200 (Do, 16 Jun 2011) | 1 line
Add index and description of facets to collections describe document.
........
r2137 | ingo | 2011-06-16 16:31:41 +0200 (Do, 16 Jun 2011) | 1 line
OutGenerators doOut() takes a facet object now instead of just its name.
........
r2140 | ingo | 2011-06-17 11:19:43 +0200 (Fr, 17 Jun 2011) | 1 line
OutGenerators use now facets to fetch necessary data.
........
r2143 | teichmann | 2011-06-17 12:40:54 +0200 (Fr, 17 Jun 2011) | 1 line
Removed ComputeCallback because this was thought too complicated. Fixed issue with facets not be re-generated if same state is entered again.
........
r2144 | teichmann | 2011-06-17 13:08:31 +0200 (Fr, 17 Jun 2011) | 1 line
make getGauges() more robust
........
r2146 | teichmann | 2011-06-17 13:23:57 +0200 (Fr, 17 Jun 2011) | 1 line
mico opt: inter cmps are faster than str cmps.
........
r2150 | teichmann | 2011-06-17 15:10:20 +0200 (Fr, 17 Jun 2011) | 1 line
call computeAdvance() if we want to advance.
........
r2151 | teichmann | 2011-06-17 15:45:50 +0200 (Fr, 17 Jun 2011) | 1 line
Base WST/CSV exports on facets. TODO: generate the facets.
........
r2153 | teichmann | 2011-06-17 16:03:29 +0200 (Fr, 17 Jun 2011) | 1 line
Add facet to access raw computed data.
........
r2154 | teichmann | 2011-06-17 16:37:09 +0200 (Fr, 17 Jun 2011) | 1 line
Generate data facets for the computed states.
........
flys-artifacts/trunk@2156 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 17 Jun 2011 16:17:03 +0000 |
parents | b972eba2ed8a |
children | 853dceead0f4 |
comparison
equal
deleted
inserted
replaced
685:d45c3ddaed1b | 704:eab5e5089d77 |
---|---|
1 package de.intevation.flys.artifacts.states; | 1 package de.intevation.flys.artifacts.states; |
2 | |
3 import java.util.List; | |
4 import java.util.Map; | |
2 | 5 |
3 import org.apache.log4j.Logger; | 6 import org.apache.log4j.Logger; |
4 | 7 |
5 import org.w3c.dom.Element; | 8 import org.w3c.dom.Element; |
6 | 9 |
11 | 14 |
12 import de.intevation.artifacts.common.utils.XMLUtils; | 15 import de.intevation.artifacts.common.utils.XMLUtils; |
13 | 16 |
14 import de.intevation.artifactdatabase.ProtocolUtils; | 17 import de.intevation.artifactdatabase.ProtocolUtils; |
15 import de.intevation.artifactdatabase.data.StateData; | 18 import de.intevation.artifactdatabase.data.StateData; |
19 import de.intevation.artifactdatabase.state.Facet; | |
16 | 20 |
17 import de.intevation.flys.model.River; | 21 import de.intevation.flys.model.River; |
18 | 22 |
19 import de.intevation.flys.artifacts.FLYSArtifact; | 23 import de.intevation.flys.artifacts.FLYSArtifact; |
24 import de.intevation.flys.artifacts.WINFOArtifact; | |
25 | |
20 import de.intevation.flys.artifacts.model.RiverFactory; | 26 import de.intevation.flys.artifacts.model.RiverFactory; |
27 | |
21 import de.intevation.flys.artifacts.resources.Resources; | 28 import de.intevation.flys.artifacts.resources.Resources; |
22 | 29 |
23 /** | 30 /** |
24 * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> | 31 * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> |
25 */ | 32 */ |
288 } | 295 } |
289 } | 296 } |
290 | 297 |
291 return values.toNativeArray(); | 298 return values.toNativeArray(); |
292 } | 299 } |
300 | |
301 | |
302 @Override | |
303 public Object computeFeed( | |
304 FLYSArtifact artifact, | |
305 String hash, | |
306 CallContext context, | |
307 List<Facet> facets, | |
308 Object old | |
309 ) { | |
310 WINFOArtifact winfo = (WINFOArtifact)artifact; | |
311 | |
312 Map<String, double [][]> res; | |
313 | |
314 if (old instanceof Map<?, ?>) { | |
315 res = (Map<String, double [][]>)old; | |
316 } | |
317 else { | |
318 res = winfo.getDischargeCurveData(); | |
319 } | |
320 | |
321 // TODO: Generate facets! | |
322 | |
323 | |
324 return res; | |
325 } | |
293 } | 326 } |
294 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : | 327 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : |