Mercurial > dive4elements > river
changeset 4011:bf687419feba
Merged
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 02 Oct 2012 09:25:41 +0200 |
| parents | efb067ab2ca4 (diff) 60d88ec49c3b (current diff) |
| children | 9743bf17fce3 |
| files | flys-artifacts/ChangeLog |
| diffstat | 4 files changed, 13 insertions(+), 57 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Oct 02 01:42:45 2012 +0200 +++ b/flys-artifacts/ChangeLog Tue Oct 02 09:25:41 2012 +0200 @@ -1,59 +1,9 @@ -2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> - - * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: - Fixed typo in TOTAL_SQL. Forget to join GSIEBSATZ table in FRACTIONS_SQL. - - * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: -2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> - - * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: - Totals are now fetched with separate SQL statement. Fixed join to - GEWAESSER table. - -2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> - - * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: - Wrote fractions SQL more compact. Fixed AIOOBE. - -2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> - - * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: - Fixed typo. - - * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: - Removed unused field from SQL query. - -2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> - - Finally calculate the S(Q) fractions. TODO: Split SQL into two queries. - - * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: - Make the fractions accessible. - - * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: - Calculate the fraction. - * flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: - Store new measurements for fractions in separate list. - -2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> - - * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: - Make it compilable again. - -2012-10-01 Sascha L. Teichmann <sascha.teichmann@intevation.de> - - * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java, - src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java: - Generate a second list of accumulated meassurements, - - * src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java: - Do not calculate the adjusted and sieve array for all measurements. - - * src/main/java/de/intevation/flys/artifacts/model/sq/Sieve.java: - Added diameter comparator. - - * src/main/java/de/intevation/flys/artifacts/model/sq/SieveArray.java: - Copy the data if total load is zero. +2012-10-01 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java, + flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java, + flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java: + Added TODOs for issue880. 2012-10-01 Björn Ricks <bjoern.ricks@intevation.de> @@ -204,7 +154,7 @@ 2012-09-27 Sascha L. Teichmann <sascha.teichmann@intevation.de> - * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java: + * src/main/java/de/intevation/flys/artifacts/model/sq/MeasurementFactory.java, Added more data fields from SedDB to calculate the fraction parts. src/main/java/de/intevation/flys/artifacts/model/sq/Measurement.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Tue Oct 02 01:42:45 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/AnnotationArtifact.java Tue Oct 02 09:25:41 2012 +0200 @@ -45,6 +45,7 @@ + artifact.identifier()); FLYSArtifact flys = (FLYSArtifact) artifact; + // TODO issue880: make annotations available _per type_ importData(flys, "river"); List<Facet> fs = new ArrayList<Facet>();
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java Tue Oct 02 01:42:45 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/AnnotationFacet.java Tue Oct 02 09:25:41 2012 +0200 @@ -62,6 +62,8 @@ */ @Override public Object getData(Artifact artifact, CallContext context) { + + // TODO issue880: Make annotations available _per type_ AnnotationArtifact annotationArtifact = (AnnotationArtifact) artifact; String riverName = FLYSUtils.getRivername((FLYSArtifact)artifact);
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java Tue Oct 02 01:42:45 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/LocationProvider.java Tue Oct 02 09:25:41 2012 +0200 @@ -10,6 +10,8 @@ import de.intevation.flys.artifacts.cache.CacheFactory; + +/** Make FastAnnotations (db unbound) available. */ public class LocationProvider { private static final Logger log = @@ -38,6 +40,7 @@ } protected static FastAnnotations getAnnotations(String river, double km) { + // TODO issue880: Make annotations available _per type_ Cache cache = CacheFactory.getCache(CACHE_KEY);