Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java @ 7919:868f55932fe6
Removed serverside path for bed height epochs.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 06 Jun 2014 16:59:16 +0200 |
parents | b320826b1183 |
children | d77f53c1e5a1 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java Fri Jun 06 16:47:48 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java Fri Jun 06 16:59:16 2014 +0200 @@ -21,7 +21,6 @@ import org.dive4elements.artifacts.common.utils.XMLUtils; import org.dive4elements.artifacts.common.utils.XMLUtils.ElementCreator; -import org.dive4elements.river.model.BedHeightEpoch; import org.dive4elements.river.model.BedHeightSingle; import org.dive4elements.river.model.River; @@ -38,8 +37,6 @@ public static final String PREFIX_SINGLE = "single-"; - public static final String PREFIX_EPOCH = "epoch-"; - /** Private logger. */ private static final Logger logger = Logger.getLogger(SoundingsSelect.class); @@ -93,7 +90,6 @@ List<KVP<String, String>> kvp = new ArrayList<KVP<String, String>>(); appendSingles(river, kmLo, kmHi, creator, select, context); - appendEpochs(river, kmLo, kmHi, creator, select, context); return kvp.toArray(new KVP[kvp.size()]); } @@ -140,44 +136,6 @@ logger.debug(XMLUtils.toString(select)); } - - protected void appendEpochs( - River river, - double kmLo, - double kmHi, - ElementCreator creator, - Element select, - CallContext context - ) { - List<BedHeightEpoch> epochs = - BedHeightEpoch.getBedHeightEpochs(river, kmLo, kmHi); - - if (epochs != null) { - int size = epochs.size(); - - logger.debug("Found " + size + " epochs."); - - NumberFormat nf = Formatter.getCalculationKm(context.getMeta()); - for (int i = 0; i < size; i++) { - BedHeightEpoch e = epochs.get(i); - - String id = PREFIX_EPOCH + e.getId(); - String value = e.getDescription(); - - Element item = creator.create("item"); - creator.addAttr(item, "label", value, true); - creator.addAttr(item, "value", id, true); - creator.addAttr(item, "analyzed_range", - nf.format(e.getRange().getA()) + - " - " + - nf.format(e.getRange().getB())); - creator.addAttr(item, "year", e.getTimeInterval().getStartTime().toString()); - select.appendChild(item); - } - } - logger.debug("appended epochs"); - } - @Override protected Element createStaticData( D4EArtifact flys, @@ -220,10 +178,6 @@ if (value.indexOf(PREFIX_SINGLE) >= 0) { return getLabelForSingle(cc, value); } - else if (value.indexOf(PREFIX_EPOCH) >= 0) { - return getLabelForEpoch(cc, value); - } - return value; } @@ -249,27 +203,6 @@ } - protected String getLabelForEpoch(CallContext cc, String value) { - String id = value.replace(PREFIX_EPOCH, ""); - try { - BedHeightEpoch e = BedHeightEpoch.getBedHeightEpochById( - Integer.parseInt(id)); - - if (e != null) { - return e.getDescription(); - } - else { - return "no value for '" + id + "'"; - } - } - catch (NumberFormatException nfe) { - logger.warn("Could not parse id from string '" + id + "'", nfe); - } - - return "n.A."; - } - - /** * This method might be used to test, if a parameter name is handled by this * state.