[Dive4elements-commits] [PATCH 01 of 10] ExtremeCompute: Improve naming of facets

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1351843834 -3600
# Node ID 375550eb45b73cac3288e1abe4e126651f0a9815
# Parent  d095b426777295d6933972230520a9289e399997
ExtremeCompute: Improve naming of facets.

diff -r d095b4267772 -r 375550eb45b7 flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java	Fri Nov 02 12:01:32 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/extreme/ExtremeCompute.java	Fri Nov 02 09:10:34 2012 +0100
@@ -77,21 +77,10 @@
         for (int i = 0; i < wqkms.length; i++) {
             String name = wqkms[i].getName();
 
-            // Ext.Calc has wqkmsName(i)
-            String nameW = "WW";//TODO: FLYSUtils.createWspWTitle(artifact, context, name);
-            String nameQ = "QQ";//FLYSUtils.createWspQTitle(artifact, context, name);
-
-            // Hotfix for theme names. Themes with the same name cause problems
-            // aggregating chart legend items.
-            if (i > 0 && name.equals(wqkms[i - 1].getName())) {
-                nameW += "; Q=" + wqkms[i].get(0, new double[3])[1];
-                nameQ += " = " + wqkms[i].get(0, new double[3])[1];
-            }
-
             Facet w = new WaterlevelFacet(
-                i, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, id, hash);
+                i, LONGITUDINAL_W, "W("+name+")", ComputeType.ADVANCE, id, hash);
             Facet q = new WaterlevelFacet(
-                i, LONGITUDINAL_Q, nameQ, ComputeType.ADVANCE, id, hash);
+                i, LONGITUDINAL_Q, name, ComputeType.ADVANCE, id, hash);
 
             // TODO add more facets like:
             // csv, data, pdf wst facet, data facet