changeset 6520:494ff62089b3

Merged
author Sascha L. Teichmann <teichmann@intevation.de>
date Sat, 29 Jun 2013 09:32:44 +0200
parents 862c7f511c35 (current diff) 7285f6e1be3d (diff)
children bfcb513c1fda
files
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sat Jun 29 09:27:19 2013 +0200
+++ b/.hgtags	Sat Jun 29 09:32:44 2013 +0200
@@ -54,3 +54,4 @@
 5733d7f27196c5a8cf18231fbf187738f8fea560 3.0.7
 eec895f6ec801a7faaed96e9f01721e1143e7bb8 3.0.8
 41152c3a532d63a25e9fa348ca4286bdd76069ef 3.0.9
+5f4893db41e4fed644ddbd91bf4cdf0ac7952161 3.0.10
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java	Sat Jun 29 09:27:19 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java	Sat Jun 29 09:32:44 2013 +0200
@@ -19,6 +19,10 @@
 
 import org.apache.log4j.Logger;
 
+/**
+ * Number of FastCrossSectionLines, e.g. to store in cache and retrieve
+ * a single contain CrossSectionLine by its km.
+ */
 public class FastCrossSectionChunk
 implements   Serializable
 {
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java	Sat Jun 29 09:27:19 2013 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java	Sat Jun 29 09:32:44 2013 +0200
@@ -192,8 +192,9 @@
 
     /**
      * Add a Point (YZ,Index) to the current cross section line.
-     * @param y The y coordinate of new point.
-     * @param z The z coordinate of new point.
+     * @param y The y coordinate of new point in GK.
+     * @param z The z coordinate of new point in GK.
+     * @param height The hight (3rd coord) of point, in meter.
      * @param idx Ignored, the parameter of new point.
      * @return true if point could been added, false otherwise (e.g. not
      *         parsable y or z values.

http://dive4elements.wald.intevation.org