# HG changeset patch # User Sascha L. Teichmann # Date 1372491164 -7200 # Node ID 494ff62089b305d5a51a1197ac6edf3277c46c11 # Parent 862c7f511c355e8f52a687ddd400cb5ee17056de# Parent 7285f6e1be3d40fc220334966a175d1167e59ee0 Merged diff -r 862c7f511c35 -r 494ff62089b3 .hgtags --- 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 diff -r 862c7f511c35 -r 494ff62089b3 artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java --- 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 { diff -r 862c7f511c35 -r 494ff62089b3 backend/src/main/java/org/dive4elements/river/importer/parsers/W80CSVParser.java --- 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.