[PATCH 2 of 3] Changed order of iota result themes

Wald Commits scm-commit at wald.intevation.org
Mon Oct 1 15:54:53 CEST 2018


# HG changeset patch
# User gernotbelger
# Date 1538402092 -7200
# Node ID 17e4defa8dac1f7bdd43b1fb3b94a1c8bf5ac500
# Parent  1f12a56c9e0f75375c9d5f23873fea18a08df5d5
Changed order of iota result themes

diff -r 1f12a56c9e0f -r 17e4defa8dac artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java	Mon Oct 01 15:54:48 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineState.java	Mon Oct 01 15:54:52 2018 +0200
@@ -93,10 +93,8 @@
             facets.add(SalixLineProcessor.createSalixLineRawFacet(context, hash, stateId, facetIndex++, 0));
             facets.add(SalixLineProcessor.createSalixMnwMwFilteredFacet(context, hash, stateId, facetIndex++, 0));
             facets.add(SalixLineProcessor.createSalixMnwMwRawFacet(context, hash, stateId, facetIndex++, 0));
-            facets.add(SalixLineProcessor.createSalixRankFacet(context, hash, stateId, facetIndex++, 0));
 
             facets.add(SalixLineProcessor.createSalixCrossSectionFacet(context, type, hash, stateId, facetIndex++));
-            facets.add(VegetationZonesCrossSectionProcessor.createDefaultVegetationZonesCrossSectionFacet(context.getMeta()));
 
             for (int i = 0; i <= result.getScenarioCount() - 1; i++) {
                 final String scenarioLabel = result.getScenarioLabel(i);
@@ -111,6 +109,9 @@
             for (final SalixWaterlevel knownWaterlevel : SalixLineCrossSectionIndexData.SalixWaterlevel.values())
                 facets.add(SalixLineProcessor.createSalixWaterlevelCrossSectionFacet(context, type, hash, stateId, knownWaterlevel, facetIndex++));
 
+            facets.add(VegetationZonesCrossSectionProcessor.createDefaultVegetationZonesCrossSectionFacet(context.getMeta()));
+            facets.add(SalixLineProcessor.createSalixRankFacet(context, hash, stateId, facetIndex++, 0));
+
             final Facet csv = new DataFacet(FacetTypes.CSV, "CSV data", ComputeType.ADVANCE, hash, stateId);
             final Facet pdf = new DataFacet(FacetTypes.PDF, "PDF data", ComputeType.ADVANCE, hash, stateId);
 


More information about the Dive4Elements-commits mailing list