Mercurial > dive4elements > river
diff flys-backend/src/main/java/de/intevation/flys/importer/parsers/DA66Parser.java @ 4735:94b39073f0f7
Moved EpsilonComparator to utils package becaus its not only useful for TIM parsing. Used EpsilonComparator in DA60 and DA66 case. Maybe TODO: Use in PRF, too.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Tue, 01 Jan 2013 13:54:08 +0100 |
| parents | 0df1cac6c4b5 |
| children | c10103dc202f |
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/importer/parsers/DA66Parser.java Sun Dec 30 10:56:52 2012 +0100 +++ b/flys-backend/src/main/java/de/intevation/flys/importer/parsers/DA66Parser.java Tue Jan 01 13:54:08 2013 +0100 @@ -1,22 +1,24 @@ package de.intevation.flys.importer.parsers; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Map; -import java.util.List; -import java.util.TreeMap; +import de.intevation.artifacts.common.utils.FileTools; -import java.util.regex.Pattern; -import java.util.regex.Matcher; +import de.intevation.flys.importer.XY; + +import de.intevation.flys.utils.EpsilonComparator; import java.io.File; import java.io.IOException; -import org.apache.log4j.Logger; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.TreeMap; -import de.intevation.flys.importer.XY; +import java.util.regex.Matcher; +import java.util.regex.Pattern; -import de.intevation.artifacts.common.utils.FileTools; +import org.apache.log4j.Logger; /** @@ -78,7 +80,7 @@ POINT_4_ID(15), POINT_4_Y (16), POINT_4_Z (17); - + private int idx; FIELD(int idx) { this.idx = idx; @@ -172,7 +174,7 @@ /** Trivial constructor. */ public DA66Parser() { - data = new TreeMap<Double, List<XY>>(); + data = new TreeMap<Double, List<XY>>(EpsilonComparator.CMP); } @@ -266,8 +268,8 @@ return false; } - Double iy; - Double iz; + double iy; + double iz; try { iy = Double.parseDouble(y) / 1000d; iz = Double.parseDouble(z) / 1000d; @@ -278,7 +280,7 @@ } // We ignore idx, and increment instead. - Integer index; + int index; int lastPointIdx = lastPointIdx(); if (lastPointIdx <= 0) { index = 1;