diff backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java @ 9034:8aa7d9eaaa21

Added bed_height_values section heights height01 to height10
author mschaefer
date Mon, 30 Apr 2018 10:13:15 +0200
parents 2693bfaf503d
children 4c5eeaff554c
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Fri Apr 27 17:41:59 2018 +0200
+++ b/backend/src/main/java/org/dive4elements/river/importer/parsers/BedHeightParser.java	Mon Apr 30 10:13:15 2018 +0200
@@ -90,7 +90,17 @@
         GAP("Datenl.cke.*"), //
         WIDTH("Peilbreite\\s*\\[(.*)\\].*"), //
         MINHEIGHT("Minimale Sohlh.he\\s*\\[(.*)\\].*"), //
-        MAXHEIGHT("Maximale Sohlh.he\\s*\\[(.*)\\].*");
+        MAXHEIGHT("Maximale Sohlh.he\\s*\\[(.*)\\].*"), //
+        HEIGHT01("Feld\\s*1\\s*\\[(.*)\\].*"), //
+        HEIGHT02("Feld\\s*2\\s*\\[(.*)\\].*"), //
+        HEIGHT03("Feld\\s*3\\s*\\[(.*)\\].*"), //
+        HEIGHT04("Feld\\s*4\\s*\\[(.*)\\].*"), //
+        HEIGHT05("Feld\\s*5\\s*\\[(.*)\\].*"), //
+        HEIGHT06("Feld\\s*6\\s*\\[(.*)\\].*"), //
+        HEIGHT07("Feld\\s*7\\s*\\[(.*)\\].*"), //
+        HEIGHT08("Feld\\s*8\\s*\\[(.*)\\].*"), //
+        HEIGHT09("Feld\\s*9\\s*\\[(.*)\\].*"), //
+        HEIGHT10("Feld\\s*10\\s*\\[(.*)\\].*");
 
         private final Pattern pattern;
 
@@ -101,6 +111,10 @@
         public Pattern getPattern() {
             return this.pattern;
         }
+
+        public static ColTitlePattern getSectionPattern(final int index) {
+            return ColTitlePattern.valueOf(String.format("HEIGHT%02d", index));
+        }
     }
 
     private final EnumMap<ColTitlePattern, Integer> cols = new EnumMap<>(ColTitlePattern.class);
@@ -401,6 +415,8 @@
         final ImportBedHeightValue value = new ImportBedHeightValue(obj, km, parse(values, ColTitlePattern.HEIGHT),
                 parse(values, ColTitlePattern.UNCERTAINTY), parse(values, ColTitlePattern.GAP), parse(values, ColTitlePattern.WIDTH),
                 parse(values, ColTitlePattern.MINHEIGHT), parse(values, ColTitlePattern.MAXHEIGHT));
+        for (int i = 1; i <= 10; i++)
+            value.setSectionHeight(i, parse(values, ColTitlePattern.getSectionPattern(i)));
 
         obj.addValue(value);
     }

http://dive4elements.wald.intevation.org