Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java @ 8747:e9d912c97fa8
We expect that every river has only one RiverAxis of kind 1
This allowed to reduce code duplication and some cleanups.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 05 Jun 2015 16:56:47 +0200 |
| parents | e4606eae8ea5 |
| children | a58cbb1b7371 |
comparison
equal
deleted
inserted
replaced
| 8746:e701ef544ffa | 8747:e9d912c97fa8 |
|---|---|
| 67 | 67 |
| 68 List<River> rivers = RiverFactory.getRivers(); | 68 List<River> rivers = RiverFactory.getRivers(); |
| 69 List<String> riverFiles = new ArrayList<String>(); | 69 List<String> riverFiles = new ArrayList<String>(); |
| 70 | 70 |
| 71 for (River river : rivers) { | 71 for (River river : rivers) { |
| 72 // We expect that every river has only one RiverAxis. | 72 RiverAxis riverAxis = null; |
| 73 // This is not correct but currently the case here, see | |
| 74 // RiverAxis.java. | |
| 75 List<RiverAxis> riverAxis = null; | |
| 76 try { | 73 try { |
| 77 riverAxis = RiverAxis.getRiverAxis(river.getName()); | 74 riverAxis = RiverAxis.getRiverAxis(river.getName()); |
| 78 } | 75 } |
| 79 catch (HibernateException iae) { | 76 catch (HibernateException iae) { |
| 80 log.error("No valid riveraxis found for " + river.getName()); | 77 log.error("No valid riveraxis found for " + river.getName()); |
| 83 | 80 |
| 84 if (riverAxis == null) { | 81 if (riverAxis == null) { |
| 85 log.warn("River " + river.getName() + " has no river axis!"); | 82 log.warn("River " + river.getName() + " has no river axis!"); |
| 86 continue; | 83 continue; |
| 87 } | 84 } |
| 88 if (riverAxis.get(0).getGeom() == null) { | 85 if (riverAxis.getGeom() == null) { |
| 89 log.warn("River " + river.getName() + | 86 log.warn("River " + river.getName() + |
| 90 " has no riveraxis geometry!"); | 87 " has no riveraxis geometry!"); |
| 91 continue; | 88 continue; |
| 92 } | 89 } |
| 93 MultiLineString geom = riverAxis.get(0).getGeom(); | 90 MultiLineString geom = riverAxis.getGeom(); |
| 94 Envelope extent = geom.getEnvelopeInternal(); | 91 Envelope extent = geom.getEnvelopeInternal(); |
| 95 | 92 |
| 96 createRiverAxisLayer( | 93 createRiverAxisLayer( |
| 97 river.getName(), | 94 river.getName(), |
| 98 river.getId(), | 95 river.getId(), |