--- a/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java	Fri Jun 05 16:53:07 2015 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/RiverMapfileGenerator.java	Fri Jun 05 16:56:47 2015 +0200
@@ -69,10 +69,7 @@
         List<String> riverFiles = new ArrayList<String>();
 
         for (River river : rivers) {
-            // We expect that every river has only one RiverAxis.
-            // This is not correct but currently the case here, see
-            // RiverAxis.java.
-            List<RiverAxis> riverAxis = null;
+            RiverAxis riverAxis = null;
             try {
                 riverAxis = RiverAxis.getRiverAxis(river.getName());
             }
@@ -85,12 +82,12 @@
                 log.warn("River " + river.getName() + " has no river axis!");
                 continue;
             }
-            if (riverAxis.get(0).getGeom() == null) {
+            if (riverAxis.getGeom() == null) {
                 log.warn("River " + river.getName() +
                     " has no riveraxis geometry!");
                 continue;
             }
-            MultiLineString geom = riverAxis.get(0).getGeom();
+            MultiLineString geom = riverAxis.getGeom();
             Envelope extent = geom.getEnvelopeInternal();
 
             createRiverAxisLayer(