diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationState.java @ 9481:787fc085459b

TSV introduced; uinfo.inundationWMS-Config
author gernotbelger
date Wed, 12 Sep 2018 10:55:09 +0200
parents 0633f963c5be
children 992c188b7330
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationState.java	Mon Sep 10 17:06:23 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/inundationduration/InundationDurationState.java	Wed Sep 12 10:55:09 2018 +0200
@@ -35,7 +35,7 @@
 
     private static final long serialVersionUID = 1L;
 
-    private static final String LABEL_URL_SEPARATOR = ";";// always sync with client (ExportPanel)
+    private static final String LABEL_URL_SEPARATOR = ";LABEL_URL_SEPARATOR;";// always sync with client (ExportPanel)
 
     /**
      * From this state can only be continued trivially.
@@ -94,10 +94,10 @@
             final String url = layer.getUrl();
 
             final WMSLayerFacet wmsFacet = new WMSLayerFacet(index, FLOODMAP_EXTERNAL_WMS_INUNDATIONDUR + index, label, type, getID(), hash, url);
+            wmsFacet.addLayer(layer.getLayer());
+
             facets.add(wmsFacet);
 
-            wmsFacet.addLayer("OSM-WMS-Dienst");
-
             // wmsFacet.setExtent(getExtent(false));
             // wmsFacet.setOriginalExtent(getExtent(true));
             wmsFacet.setSrid(getSrid());
@@ -110,8 +110,6 @@
 
         // tODO: create layer links: filter by "showLayerLink"
 
-        // tODO: create layer links: filter by "showLayerLink"
-
         final Calculation report = res.getReport();
         if (report.hasProblems())
             facets.add(new ReportFacet(ComputeType.ADVANCE, hash, this.id));
@@ -119,10 +117,10 @@
         return res;
     }
 
-    private CalculationResult doCompute(final UINFOArtifact sinfo, final CallContext context, final Object old) {
+    private CalculationResult doCompute(final UINFOArtifact artifact, final CallContext context, final Object old) {
         if (old instanceof CalculationResult)
             return (CalculationResult) old;
 
-        return new InundationDurationCalculation(context).calculate(sinfo);
+        return new InundationDurationCalculation(context).calculate(artifact);
     }
 }
\ No newline at end of file

http://dive4elements.wald.intevation.org