diff artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java @ 8169:856701739443

Handle missing years in bed height differences without assuming an unknown year to be BC 1.
author "Tom Gottfried <tom@intevation.de>"
date Mon, 01 Sep 2014 09:43:55 +0200
parents a709e6334c4a
children e4606eae8ea5
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java	Fri Aug 29 17:00:26 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/BedHeightsArtifact.java	Mon Sep 01 09:43:55 2014 +0200
@@ -89,7 +89,7 @@
         if (code != null) {
             String [] parts = code.split("-");
 
-            if (parts.length >= 4) {
+            if (parts.length >= 3) {
                 // The setting is a bit complicated:
                 // This artifact can spawn epoch type bedheight facets,
                 // 'singlevalue'/singleyear bedheight facets or
@@ -104,7 +104,6 @@
                     facetType = BEDHEIGHT_SOUNDING_WIDTH;
                 }
                 addStringData("height_id", parts[2]);
-                addStringData("time", parts[3]);
                 addStringData("type", type);
                 String btype = type;
                 int hId = Integer.parseInt(parts[2]);
@@ -134,6 +133,9 @@
 
                 addFacets(STATIC_STATE_NAME, facets);
             }
+            else {
+                logger.error("Invalid datacage ID '" + code + "'");
+            }
         }
         super.setup(identifier, factory, context, callMeta, data, loadFacets);
     }

http://dive4elements.wald.intevation.org