Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/sq/SQStaticState.java @ 8543:9a5b3079aad4
(issue1750) Take Static SQ Relations based on a range and merge them together
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 13 Feb 2015 14:59:16 +0100 |
| parents | d4c501d2c098 |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 8542:7b210881d6db | 8543:9a5b3079aad4 |
|---|---|
| 66 log.error("Unparseable measurement station: " + measurementStation); | 66 log.error("Unparseable measurement station: " + measurementStation); |
| 67 return null; | 67 return null; |
| 68 } | 68 } |
| 69 log.debug("Parsed measurement station: " + ms); | 69 log.debug("Parsed measurement station: " + ms); |
| 70 | 70 |
| 71 sqRelations = StaticSQFactory.getSQRelations(river, ms); | 71 sqRelations = StaticSQFactory.getSQRelationsForLocation(river, ms); |
| 72 DateFormat df = new SimpleDateFormat("yyyy"); | 72 DateFormat df = new SimpleDateFormat("yyyy"); |
| 73 | 73 |
| 74 for (StaticSQRelation.Parameter p: StaticSQRelation.Parameter.values()) { | 74 for (StaticSQRelation.Parameter p: StaticSQRelation.Parameter.values()) { |
| 75 log.debug("parameter: " + p.toString()); | 75 log.debug("parameter: " + p.toString()); |
| 76 List<StaticSQRelation> relations = | 76 List<StaticSQRelation> relations = |
| 141 log.error("Unparseable measurement station: " + measurementStation); | 141 log.error("Unparseable measurement station: " + measurementStation); |
| 142 return null; | 142 return null; |
| 143 } | 143 } |
| 144 log.debug("Parsed measurement station: " + ms); | 144 log.debug("Parsed measurement station: " + ms); |
| 145 | 145 |
| 146 sqRelations = StaticSQFactory.getSQRelations(river, ms); | 146 sqRelations = StaticSQFactory.getSQRelationsForLocation(river, ms); |
| 147 } | 147 } |
| 148 | 148 |
| 149 DateFormat df = new SimpleDateFormat("yyyy"); | 149 DateFormat df = new SimpleDateFormat("yyyy"); |
| 150 | 150 |
| 151 for (StaticSQRelation.Parameter p: StaticSQRelation.Parameter.values()) { | 151 for (StaticSQRelation.Parameter p: StaticSQRelation.Parameter.values()) { |