[PATCH 2 of 5] Removed serverside path for bed height epochs
Wald Commits
scm-commit at wald.intevation.org
Fri Jun 6 17:02:17 CEST 2014
# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1402066756 -7200
# Node ID 868f55932fe6ebb53415cf338669812d3c4b150e
# Parent 5813c206ff64e854cb93bb5c3968be067ef7bd23
Removed serverside path for bed height epochs.
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/doc/conf/artifacts/minfo.xml
--- a/artifacts/doc/conf/artifacts/minfo.xml Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/doc/conf/artifacts/minfo.xml Fri Jun 06 16:59:16 2014 +0200
@@ -35,7 +35,7 @@
<transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition">
<from state="state.minfo.calculation_mode"/>
- <to state="state.minfo.bed.year_epoch"/>
+ <to state="state.minfo.bed.difference_select"/>
<condition data="calculation_mode" value="calc.bed.diff" operator="equal"/>
</transition>
@@ -51,10 +51,6 @@
<data name="ld_to" type="Double" />
</state>
- <state id="state.minfo.bed.year_epoch" description="state.minfo.bed.year_epoch" state="org.dive4elements.river.artifacts.states.minfo.YearEpochSelect" helpText="help.state.minfo.bed.year_epoch">
- <data name="ye_select" type="String" />
- </state>
-
<state id="state.minfo.sq.location" description="state.minfo.sq.location" state="org.dive4elements.river.artifacts.states.LocationSelect" helpText="help.state.minfo.sq.location">
<data name="ld_locations" type="double"/>
</state>
@@ -82,11 +78,6 @@
</transition>
<transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
- <from state="state.minfo.bed.year_epoch"/>
- <to state="state.minfo.bed.difference_select"/>
- </transition>
-
- <transition transition="org.dive4elements.river.artifacts.transitions.DefaultTransition">
<from state="state.minfo.bed.location"/>
<to state="state.minfo.bed.periods"/>
</transition>
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java Fri Jun 06 16:59:16 2014 +0200
@@ -95,46 +95,6 @@
return type;
}
- public String getYearEpoch() {
- if (yearEpoch == null) {
- yearEpoch = getString("ye_select");
- }
- return yearEpoch;
- }
-
-
- public int[] getBedHeightEpochIDs() {
- if (epochIDs == null) {
- String data = getString("soundings");
-
- if (data == null) {
- logger.warn("No 'soundings' parameter specified!");
- return null;
- }
-
- String[] parts = data.split(";");
-
- TIntArrayList ids = new TIntArrayList();
-
- for (String part: parts) {
- if (part.indexOf(SoundingsSelect.PREFIX_EPOCH) >= 0) {
- String tmp = part.replace(SoundingsSelect.PREFIX_EPOCH, "");
-
- try {
- ids.add(Integer.parseInt(tmp));
- }
- catch (NumberFormatException nfe) {
- logger.warn("Cannot parse int from string: '" + tmp + "'");
- }
- }
- }
-
- epochIDs = ids.toNativeArray();
- }
-
- return epochIDs;
- }
-
public Integer getHeightId() {
if (heightId == null) {
heightId = getInteger("height_id");
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Fri Jun 06 16:59:16 2014 +0200
@@ -174,7 +174,6 @@
WD("wdifferences"),
BHDY("bedheight_difference_height_year"),
BDY("bed_difference_year"),
- BDE("bed_difference_epoch"),
FWQC("fix_wq_curve"),
FDWC("fix_deltawt_curve"),
FLSC("fix_longitudinal_section_curve"),
@@ -338,8 +337,6 @@
String BED_DIFFERENCE_YEAR_FILTERED = "bedheight_difference.year.filtered";
String BED_DIFFERENCE_HEIGHT_YEAR = "bedheight_difference.height_year";
String BED_DIFFERENCE_HEIGHT_YEAR_FILTERED = "bedheight_difference.height_year.filtered";
- String BED_DIFFERENCE_EPOCH = "bedheight_difference.epoch";
- String BED_DIFFERENCE_EPOCH_FILTERED = "bedheight_difference.epoch.filtered";
String BED_DIFFERENCE_MORPH_WIDTH1 = "bedheight_difference.morph_width1";
String BED_DIFFERENCE_MORPH_WIDTH2 = "bedheight_difference.morph_width2";
String BED_DIFFERENCE_SOUNDING_WIDTH = "bedheight_difference.sounding_width";
@@ -347,10 +344,6 @@
String BED_DIFFERENCE_YEAR_HEIGHT2 = "bedheight_difference.year.height2";
String BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED = "bedheight_difference.year.height1.filtered";
String BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED = "bedheight_difference.year.height2.filtered";
- String BED_DIFFERENCE_EPOCH_HEIGHT1 = "bedheight_difference.epoch.height1";
- String BED_DIFFERENCE_EPOCH_HEIGHT2 = "bedheight_difference.epoch.height2";
- String BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED = "bedheight_difference.epoch.height1.filtered";
- String BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED = "bedheight_difference.epoch.height2.filtered";
String MORPHOLOGIC_WIDTH = "morph-width";
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightCalculation.java Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MiddleBedHeightCalculation.java Fri Jun 06 16:59:16 2014 +0200
@@ -16,8 +16,6 @@
import org.dive4elements.artifacts.Artifact;
import org.dive4elements.artifacts.common.utils.DateUtils;
-import org.dive4elements.river.model.BedHeightEpoch;
-import org.dive4elements.river.model.BedHeightEpochValue;
import org.dive4elements.river.model.BedHeightSingle;
import org.dive4elements.river.model.BedHeightSingleValue;
import org.dive4elements.river.model.TimeInterval;
@@ -35,7 +33,6 @@
logger.info("MiddleBedHeightCalculation.calculate");
int[] singleIds = access.getBedHeightSingleIDs();
- int[] epochIds = access.getBedHeightEpochIDs();
if (logger.isDebugEnabled()) {
@@ -45,16 +42,11 @@
if (singleIds != null) {
logger.debug(" " + singleIds.length + " single bedheight ids");
}
-
- if (epochIds != null) {
- logger.debug(" " + epochIds.length + " epoch bedheight ids");
- }
}
List<BedHeightSingle> singles = getSingles(access, singleIds);
- List<BedHeightEpoch> epochs = getEpochs(access, epochIds);
- return buildCalculationResult(access, singles, epochs);
+ return buildCalculationResult(access, singles);
}
@@ -80,32 +72,9 @@
}
- protected List<BedHeightEpoch> getEpochs(
- BedHeightAccess access,
- int[] ids
- ) {
- List<BedHeightEpoch> epochs = new ArrayList<BedHeightEpoch>();
-
- for (int id: ids) {
- BedHeightEpoch e = BedHeightEpoch.getBedHeightEpochById(id);
-
- if (e != null) {
- epochs.add(e);
- }
- else {
- logger.warn("Cannot find Epoch by id: " + id);
- // TODO ADD WARNING
- }
- }
-
- return epochs;
- }
-
-
protected CalculationResult buildCalculationResult(
BedHeightAccess access,
- List<BedHeightSingle> singles,
- List<BedHeightEpoch> epochs
+ List<BedHeightSingle> singles
) {
logger.info("MiddleBedHeightCalculation.buildCalculationResult");
@@ -122,14 +91,6 @@
}
}
- for (BedHeightEpoch epoch: epochs) {
- MiddleBedHeightData d = prepareEpochData(epoch, kmLo, kmHi);
-
- if (d != null) {
- data.add(d);
- }
- }
-
logger.debug("Calculation results in " + data.size() + " data objects.");
return new CalculationResult((MiddleBedHeightData[])
@@ -186,43 +147,5 @@
return data;
}
-
-
- /** Create MiddleBedHeightData to return. */
- protected MiddleBedHeightData prepareEpochData(
- BedHeightEpoch epoch,
- double kmLo,
- double kmHi
- ) {
- logger.debug("Prepare data for epoch: " + epoch.getDescription());
-
- TimeInterval ti = epoch.getTimeInterval();
-
- List<BedHeightEpochValue> values =
- BedHeightEpochValue.getBedHeightEpochValues(epoch, kmLo, kmHi);
-
- MiddleBedHeightData data = new MiddleBedHeightData(
- DateUtils.getYearFromDate(ti.getStartTime()),
- DateUtils.getYearFromDate(ti.getStopTime()),
- epoch.getEvaluationBy(),
- epoch.getDescription()
- );
-
- for (BedHeightEpochValue value: values) {
- data.addKM(value.getStation().doubleValue());
- if (value.getHeight() != null) {
- data.addMiddleHeight(value.getHeight().doubleValue());
- data.addIsEmpty(false);
- }
- else {
- data.addMiddleHeight(Double.NaN);
- data.addIsEmpty(true);
- }
- }
-
- logger.debug("Epoch contains " + values.size() + " values");
-
- return data;
- }
}
// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Fri Jun 06 16:59:16 2014 +0200
@@ -29,7 +29,6 @@
Logger.getLogger(BedDiffCalculation.class);
protected String river;
- protected String yearEpoch;
protected int [][] heightIds;
public BedDiffCalculation() {
@@ -39,7 +38,6 @@
logger.info("BedDiffCalculation.calculate");
String river = access.getRiverName();
- String yearEpoch = access.getYearEpoch();
int [][] heightIds = access.extractHeightIds(context);
if (river == null) {
@@ -47,13 +45,8 @@
addProblem("minfo.missing.river");
}
- if (yearEpoch == null) {
- addProblem("minfo.missing.year_epoch");
- }
-
if (!hasProblems()) {
this.river = river;
- this.yearEpoch = yearEpoch;
this.heightIds = heightIds;
return internalCalculate();
}
@@ -62,7 +55,6 @@
}
private CalculationResult internalCalculate() {
-
BedDiffYearResult [] results = new BedDiffYearResult[heightIds.length];
for (int i = 0; i < heightIds.length; i++) {
@@ -70,21 +62,6 @@
results[i] = calculateYearDifference(pair);
}
return new CalculationResult(results, this);
- // Currently epochs are handled like single years. To handle epochs
- // uncomment the follwing code and use an if-clause in the code above.
-/*
- if (yearEpoch.equals("epoch")) {
- BedDiffEpochResult [] results = new BedDiffEpochResult[heightIds.length];
-
- for (int i = 0; i < heightIds.length; i++) {
- BedHeight[] pair = getHeightPair(heightIds[i], "epoch");
- results[i] = calculateEpochDifference(pair);
- }
- return new CalculationResult(results, this);
- }
-
- return new CalculationResult();
- */
}
/** Get two BedHeights from factory. */
@@ -95,36 +72,6 @@
};
}
- private BedDiffEpochResult calculateEpochDifference(BedHeightData[] pair) {
-
- BedHeightData bh1 = pair[0];
- BedHeightData bh2 = pair[1];
-
- TDoubleArrayList stations = bh1.getStations();
- int size = stations.size();
-
- TDoubleArrayList diffRes = new TDoubleArrayList(size);
- TDoubleArrayList kms = new TDoubleArrayList(size);
- TDoubleArrayList heights1 = new TDoubleArrayList(size);
- TDoubleArrayList heights2 = new TDoubleArrayList(size);
-
- for (int i = 0; i < size; i++) {
- double station = stations.getQuick(i);
- double h1 = bh1.getHeight(station);
- double h2 = bh2.getHeight(station);
- double hDiff = h1 - h2;
- if (!Double.isNaN(hDiff)) {
- diffRes.add(hDiff);
- kms.add(station);
- heights1.add(h1);
- heights2.add(h2);
- }
- }
- Date start = ((BedHeightEpochData)bh1).getStart();
- Date end = ((BedHeightEpochData)bh2).getEnd();
- return new BedDiffEpochResult(kms, diffRes, heights1, heights2, start, end);
- }
-
private BedDiffYearResult calculateYearDifference(BedHeightData[] pair) {
logger.debug("BedDiffCalculation.calculateYearDifference");
BedHeightSingleData s1 = (BedHeightSingleData) pair[0];
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Fri Jun 06 16:59:16 2014 +0200
@@ -40,26 +40,11 @@
" ORDER BY bhsv.station";
- /** Query to get name for wst_id and column_pos. */
- public static final String SQL_SELECT_EPOCH =
- "SELECT bv.height, bv.station, ti.start_time, ti.stop_time" +
- " FROM bed_height_epoch b" +
- " JOIN bed_height_epoch_values bv ON b.id = bv.bed_height_epoch_id" +
- " JOIN time_intervals ti ON b.time_interval_id = ti.id" +
- " WHERE b.id = :height_id" +
- " ORDER BY bhsv.station";
-
/** Query to get name (description) for wst_id. */
public static final String SQL_SELECT_DESCR_SINGLE =
"SELECT description FROM bed_height_single "+
"WHERE id = :height_id";
- /** Query to get name (description) for wst_id. */
- public static final String SQL_SELECT_DESCR_EPOCH =
- "SELECT description from bed_height_epoch "+
- "WHERE id = :height_id";
-
-
private BedHeightFactory() {
}
@@ -108,11 +93,6 @@
.addScalar("description", StandardBasicTypes.STRING);
nameQuery.setInteger("height_id", height_id);
}
- else if (type.equals("epoch")) {
- nameQuery = session.createSQLQuery(SQL_SELECT_DESCR_EPOCH)
- .addScalar("description", StandardBasicTypes.STRING);
- nameQuery.setInteger("height_id", height_id);
- }
else {
return "none";
}
@@ -165,26 +145,6 @@
}
return height;
}
- else if (type.equals("epoch")) {
- BedHeightEpochData height =
- new BedHeightEpochData(getHeightName(type, height_id));
- sqlQuery = session.createSQLQuery(SQL_SELECT_EPOCH)
- .addScalar("height", StandardBasicTypes.DOUBLE)
- .addScalar("station", StandardBasicTypes.DOUBLE)
- .addScalar("start_time", StandardBasicTypes.DATE)
- .addScalar("stop_time", StandardBasicTypes.DATE);
- sqlQuery.setInteger("height_id", height_id);
- List<Object []> results = sqlQuery.list();
-
- for (Object [] row: results) {
- height.add(
- (Double) row[0],
- (Double) row[1],
- (Date) row[2],
- (Date) row[3]);
- }
- return height;
- }
return new BedHeightData();
}
}
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/states/SoundingsSelect.java
--- 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.
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferenceSelect.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferenceSelect.java Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferenceSelect.java Fri Jun 06 16:59:16 2014 +0200
@@ -55,23 +55,6 @@
return "";
}
- @Override
- protected Element[] createItems(
- XMLUtils.ElementCreator ec,
- Artifact artifact,
- String name,
- CallContext context)
- {
- Element[] elements = new Element[1];
- BedHeightAccess bha = new BedHeightAccess((D4EArtifact)artifact);
- String time = bha.getYearEpoch();
- elements[0] = createItem(
- ec,
- new String[] {"year-epoch", time});
-
- return elements;
- }
-
/**
* Creates the data element used for the static part of DESCRIBE document.
*/
diff -r 5813c206ff64 -r 868f55932fe6 artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java Fri Jun 06 16:47:48 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java Fri Jun 06 16:59:16 2014 +0200
@@ -25,9 +25,6 @@
import org.dive4elements.river.artifacts.model.DataFacet;
import org.dive4elements.river.artifacts.model.FacetTypes;
import org.dive4elements.river.artifacts.model.minfo.BedDiffCalculation;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochFacet;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochFilterFacet;
-import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochResult;
import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFacet;
import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFilterFacet;
import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
@@ -47,7 +44,6 @@
/** The logger used in this class. */
private static Logger logger = Logger.getLogger(DifferencesState.class);
public static final String I18N_DIFF_YEAR = "beddifference.year";
- public static final String I18N_DIFF_EPOCH = "beddifference.epoch";
public static final String I18N_FACET_BED_DIFF_YEAR = "facet.bedheight.diff.year";
public static final String I18N_FACET_BED_DIFF_YEAR_RAW = "facet.bedheight.diff.year.raw";
@@ -56,8 +52,6 @@
public static final String I18N_FACET_BED_DIFF_SOUNDING = "facet.bedheight.diff.sounding";
public static final String I18N_FACET_BED_DIFF_MORPH1 = "facet.bedheight.diff.morph1";
public static final String I18N_FACET_BED_DIFF_MORPH2 = "facet.bedheight.diff.morph2";
- public static final String I18N_FACET_BED_DIFF_EPOCH = "facet.bedheight.diff.epoch";
- public static final String I18N_FACET_BED_DIFF_EPOCH_RAW = "facet.bedheight.diff.epoch.raw";
public static final String I18N_FACET_BED_DIFF_HEIGHT1 = "facet.bedheight.diff.height1";
public static final String I18N_FACET_BED_DIFF_HEIGHT1_RAW = "facet.bedheight.diff.height1.raw";
public static final String I18N_FACET_BED_DIFF_HEIGHT2 = "facet.bedheight.diff.height2";
@@ -224,72 +218,6 @@
stateId,
hash));
}
- if (results[idx] instanceof BedDiffEpochResult) {
- newFacets.add(new BedDiffEpochFacet(
- idx,
- BED_DIFFERENCE_EPOCH,
- createBedDiffEpochDescription(
- meta,
- (BedDiffEpochResult)results[idx],
- true),
- ComputeType.ADVANCE,
- stateId,
- hash));
- newFacets.add(new BedDiffEpochFacet(
- idx,
- BED_DIFFERENCE_EPOCH_HEIGHT1,
- createBedDiffHeightEpochDescription(
- meta,
- (BedDiffEpochResult)results[idx],
- 0,
- true),
- ComputeType.ADVANCE,
- stateId,
- hash));
- newFacets.add(new BedDiffEpochFacet(
- idx,
- BED_DIFFERENCE_EPOCH_HEIGHT2,
- createBedDiffHeightEpochDescription(
- meta,
- (BedDiffEpochResult)results[idx],
- 1,
- true),
- ComputeType.ADVANCE,
- stateId,
- hash));
- newFacets.add(new BedDiffEpochFilterFacet(
- idx,
- BED_DIFFERENCE_EPOCH_FILTERED,
- createBedDiffEpochDescription(
- meta,
- (BedDiffEpochResult)results[idx],
- false),
- ComputeType.ADVANCE,
- stateId,
- hash));
- newFacets.add(new BedDiffEpochFilterFacet(
- idx,
- BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED,
- createBedDiffHeightEpochDescription(
- meta,
- (BedDiffEpochResult)results[idx],
- 0,
- false),
- ComputeType.ADVANCE,
- stateId,
- hash));
- newFacets.add(new BedDiffEpochFilterFacet(
- idx,
- BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED,
- createBedDiffHeightEpochDescription(
- meta,
- (BedDiffEpochResult)results[idx],
- 1,
- false),
- ComputeType.ADVANCE,
- stateId,
- hash));
- }
}
}
@@ -315,34 +243,6 @@
}
}
- private String createBedDiffHeightEpochDescription(
- CallMeta meta,
- BedDiffEpochResult result,
- int ndx,
- boolean raw
- ) {
- DateFormat df = Formatter.getDateFormatter(meta, "yyyy");
- String range =
- df.format(result.getStart())
- + " - " +
- df.format(result.getEnd());
-
- String i18nHeight1 = I18N_FACET_BED_DIFF_HEIGHT1;
- String i18nHeight2 = I18N_FACET_BED_DIFF_HEIGHT2;
- if (raw) {
- i18nHeight1 = I18N_FACET_BED_DIFF_HEIGHT1_RAW;
- i18nHeight2 = I18N_FACET_BED_DIFF_HEIGHT2_RAW;
- }
- if (ndx == 0) {
- return Resources.getMsg(meta, i18nHeight1,
- i18nHeight1, new Object[] { range });
- }
- else {
- return Resources.getMsg(meta, i18nHeight2,
- i18nHeight2, new Object[] {range});
- }
- }
-
protected String createBedDiffYearDescription(
CallMeta meta,
BedDiffYearResult result,
@@ -389,23 +289,6 @@
return Resources.getMsg(meta, i18n, i18n, new Object[] { range });
}
- protected String createBedDiffEpochDescription(
- CallMeta meta,
- BedDiffEpochResult result,
- boolean raw) {
- DateFormat df = Formatter.getDateFormatter(meta, "yyyy");
- String range =
- df.format(result.getStart())
- + " - " +
- df.format(result.getEnd());
-
- String i18n = I18N_FACET_BED_DIFF_EPOCH;
- if (raw) {
- i18n = I18N_FACET_BED_DIFF_EPOCH_RAW;
- }
- return Resources.getMsg(meta, i18n, i18n, new Object[] { range });
- }
-
static {
// Active/deactivate facets.
FacetActivity.Registry.getInstance().register(
@@ -418,12 +301,7 @@
String output
) {
String name = facet.getName();
- if (name.equals(BED_DIFFERENCE_EPOCH) ||
- name.equals(BED_DIFFERENCE_EPOCH_HEIGHT1) ||
- name.equals(BED_DIFFERENCE_EPOCH_HEIGHT2) ||
- name.equals(BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED) ||
- name.equals(BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED) ||
- name.equals(BED_DIFFERENCE_HEIGHT_YEAR) ||
+ if (name.equals(BED_DIFFERENCE_HEIGHT_YEAR) ||
name.equals(BED_DIFFERENCE_YEAR) ||
name.equals(BED_DIFFERENCE_YEAR_HEIGHT1) ||
name.equals(BED_DIFFERENCE_YEAR_HEIGHT2) ||
@@ -432,7 +310,6 @@
return Boolean.FALSE;
}
else if (name.equals(BED_DIFFERENCE_SOUNDING_WIDTH) ||
- name.equals(BED_DIFFERENCE_EPOCH_FILTERED) ||
name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) ||
name.equals(BED_DIFFERENCE_YEAR_FILTERED)) {
return Boolean.TRUE;
More information about the Dive4Elements-commits
mailing list