[PATCH] Backed out changeset 74a437805e2a

Wald Commits scm-commit at wald.intevation.org
Wed Aug 14 16:56:21 CEST 2013


# HG changeset patch
# User Sascha L. Teichmann <teichmann at intevation.de>
# Date 1376491835 -7200
# Node ID 8c7433b8656d9df08e3394fc1104456cb889aa4e
# Parent  eb4b123daaf7c95413e41384552d15b7b2b148a4
Backed out changeset 74a437805e2a

Description does not match. Why changing logging behavior? Why re-sorting imports? This can be done (if there is really a reason to do so) in separate commits with adequate descriptions.

diff -r eb4b123daaf7 -r 8c7433b8656d artifacts/doc/conf/mapserver/barrier_lines_class.vm
--- a/artifacts/doc/conf/mapserver/barrier_lines_class.vm	Wed Aug 14 16:24:12 2013 +0200
+++ b/artifacts/doc/conf/mapserver/barrier_lines_class.vm	Wed Aug 14 16:50:35 2013 +0200
@@ -1,6 +1,6 @@
 CLASS
     NAME "Damm"
-    EXPRESSION /damm/i
+    EXPRESSION ("[TYP]"="Damm")
     STYLE
         SIZE 5
         OUTLINECOLOR "#008000"
@@ -8,7 +8,7 @@
 END
 CLASS
     NAME "Rohr 1"
-    EXPRESSION /rohr.1/i
+    EXPRESSION ("[TYP]"="Rohr 1")
     STYLE
         SIZE 5
         OUTLINECOLOR "#800080"
@@ -16,7 +16,7 @@
 END
 CLASS
     NAME "Rohr 2"
-    EXPRESSION /rohr.2/i
+    EXPRESSION ("[TYP]"="Rohr 2")
     STYLE
         SIZE 5
         OUTLINECOLOR "#808080"
@@ -24,7 +24,7 @@
 END
 CLASS
     NAME "Graben"
-    EXPRESSION /graben/i
+    EXPRESSION ("[TYP]"="Graben")
     STYLE
         SIZE 5
         OUTLINECOLOR "#800000"
@@ -32,7 +32,7 @@
 END
 CLASS
     NAME "Ringdeich"
-    EXPRESSION /ringdeich/i
+    EXPRESSION ("[TYP]"="Ringdeich")
     STYLE
         SIZE 5
         OUTLINECOLOR "#800000"
diff -r eb4b123daaf7 -r 8c7433b8656d artifacts/doc/conf/mapserver/barrier_polygons_class.vm
--- a/artifacts/doc/conf/mapserver/barrier_polygons_class.vm	Wed Aug 14 16:24:12 2013 +0200
+++ b/artifacts/doc/conf/mapserver/barrier_polygons_class.vm	Wed Aug 14 16:50:35 2013 +0200
@@ -1,6 +1,6 @@
 CLASS
     NAME "Ringdeich"
-    EXPRESSION /ringdeich/i
+    EXPRESSION ("[TYP]"="Ringdeich")
     STYLE
         SIZE 5
         OUTLINECOLOR "#FF8000"
diff -r eb4b123daaf7 -r 8c7433b8656d artifacts/doc/conf/mapserver/mapfile.vm
--- a/artifacts/doc/conf/mapserver/mapfile.vm	Wed Aug 14 16:24:12 2013 +0200
+++ b/artifacts/doc/conf/mapserver/mapfile.vm	Wed Aug 14 16:50:35 2013 +0200
@@ -14,8 +14,7 @@
     END
 
     DEBUG 5
-    CONFIG "MS_ERRORFILE" "stderr"
-    # CONFIG "MS_ERRORFILE" "/tmp/flys-user-wms.log"
+    CONFIG "MS_ERRORFILE" "/tmp/flys-user-wms.log"
 
     WEB
       METADATA
diff -r eb4b123daaf7 -r 8c7433b8656d artifacts/doc/conf/mapserver/river-mapfile.vm
--- a/artifacts/doc/conf/mapserver/river-mapfile.vm	Wed Aug 14 16:24:12 2013 +0200
+++ b/artifacts/doc/conf/mapserver/river-mapfile.vm	Wed Aug 14 16:50:35 2013 +0200
@@ -14,8 +14,7 @@
     END
 
     DEBUG 3
-    CONFIG "MS_ERRORFILE" "stderr"
-    # CONFIG "MS_ERRORFILE" "/tmp/flys-rivers-wms.log"
+    CONFIG "MS_ERRORFILE" "/tmp/flys-rivers-wms.log"
 
     WEB
       METADATA
diff -r eb4b123daaf7 -r 8c7433b8656d artifacts/doc/conf/mapserver/shapefile_layer.vm
--- a/artifacts/doc/conf/mapserver/shapefile_layer.vm	Wed Aug 14 16:24:12 2013 +0200
+++ b/artifacts/doc/conf/mapserver/shapefile_layer.vm	Wed Aug 14 16:50:35 2013 +0200
@@ -21,8 +21,6 @@
             "wms_group_title" "$LAYER.getGroupTitle()"
         #end
     END
-    
-    CLASSITEM "TYP"
 
     #if ( !$LAYER.getStyle() )
         #if ( $LAYER.getGroupTitle() )
diff -r eb4b123daaf7 -r 8c7433b8656d artifacts/src/main/java/org/dive4elements/river/exports/MapGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MapGenerator.java	Wed Aug 14 16:24:12 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/MapGenerator.java	Wed Aug 14 16:50:35 2013 +0200
@@ -8,16 +8,6 @@
 
 package org.dive4elements.river.exports;
 
-import com.vividsolutions.jts.geom.Envelope;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
 import org.dive4elements.artifactdatabase.data.StateData;
 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet;
 import org.dive4elements.artifactdatabase.state.Facet;
@@ -37,9 +27,20 @@
 import org.dive4elements.river.utils.ArtifactMapfileGenerator;
 import org.dive4elements.river.utils.GeometryUtils;
 import org.dive4elements.river.utils.ThemeUtil;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.log4j.Logger;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
+import com.vividsolutions.jts.geom.Envelope;
+
 
 public class MapGenerator implements OutGenerator, FacetTypes {
 
@@ -119,11 +120,9 @@
                 setInitialExtent(extent);
                 createWSPLGENLayer(flys, wms, attr);
             }
-            // FIXME: Already generated by HWSBarrierState
-            // wms has a wrong SRID which would break that layer
-            //else if (FLOODMAP_USERSHAPE.equals(name)) {
-            //    createUserShapeLayer(flys, wms);
-            //}
+            else if (FLOODMAP_USERSHAPE.equals(name)) {
+                createUserShapeLayer(flys, wms);
+            }
             else {
                 logger.debug("doOut: createDatabaseLayer for facet name: " + name);
                 createDatabaseLayer(flys, wms, attr);
diff -r eb4b123daaf7 -r 8c7433b8656d artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java
--- a/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java	Wed Aug 14 16:24:12 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/ArtifactMapfileGenerator.java	Wed Aug 14 16:50:35 2013 +0200
@@ -8,13 +8,6 @@
 
 package org.dive4elements.river.utils;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.apache.velocity.Template;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.D4EArtifact;
 import org.dive4elements.river.artifacts.access.RiverAccess;
@@ -23,7 +16,14 @@
 import org.dive4elements.river.artifacts.model.map.WMSLayerFacet;
 import org.dive4elements.river.artifacts.model.map.WSPLGENLayerFacet;
 import org.dive4elements.river.artifacts.resources.Resources;
-import org.dive4elements.river.artifacts.states.FloodMapState;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.List;
+
+import org.apache.log4j.Logger;
+import org.apache.velocity.Template;
 import org.geotools.data.shapefile.ShpFiles;
 import org.geotools.data.shapefile.shp.ShapefileHeader;
 import org.geotools.data.shapefile.shp.ShapefileReader;
@@ -135,11 +135,11 @@
         ShapefileReader sfr = new ShapefileReader(sf, true, false, null);
         ShapefileHeader sfh = sfr.getHeader();
 
-        String group      = MS_USERSHAPE_PREFIX + uuid;
+        String group      = uuid + MS_USERSHAPE_PREFIX;
         String groupTitle = "I18N_USER_SHAPE_TITLE";
 
         LayerInfo info = new LayerInfo();
-        info.setName(MS_LAYER_PREFIX + FloodMapState.WSPLGEN_USER_RGD + uuid);
+        info.setName(MS_USERSHAPE_PREFIX + uuid);
         if (sfh.getShapeType().isLineType()) {
             info.setType("LINE");
         }
@@ -156,11 +156,7 @@
         info.setGroupTitle(groupTitle);
         info.setSrid(wms.getSrid());
 
-        //String nameUser = MS_LAYER_PREFIX + wms.getName();
-        // TODO: This rewrites the user-rgd mapfile fragment generated by
-        // HWSBarrierState. Otherwise we would have to fragments with same
-        // layer name. Should be refactored...
-        String nameUser = MS_LAYER_PREFIX + "user-rgd";
+        String nameUser = MS_LAYER_PREFIX + wms.getName();
 
         Template tpl = getTemplateByName(SHP_LAYER_TEMPLATE);
         if (tpl == null) {
diff -r eb4b123daaf7 -r 8c7433b8656d gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/WMSLayersTree.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/WMSLayersTree.java	Wed Aug 14 16:24:12 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/map/WMSLayersTree.java	Wed Aug 14 16:50:35 2013 +0200
@@ -8,15 +8,16 @@
 
 package org.dive4elements.river.client.client.ui.map;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.google.gwt.core.client.GWT;
+
 import com.smartgwt.client.types.TreeModelType;
 import com.smartgwt.client.widgets.tree.Tree;
 import com.smartgwt.client.widgets.tree.TreeGrid;
 import com.smartgwt.client.widgets.tree.TreeNode;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.dive4elements.river.client.shared.model.Capabilities;
 import org.dive4elements.river.client.shared.model.WMSLayer;
 
@@ -118,13 +119,6 @@
 
 
     protected WMSLayerNode buildTreeNode(WMSLayer wms) {
-        // FIXME: Is it correct to hide all layers with queryable=0 ?
-        // FIXME: Only for getFeatureInfo requests
-        //if (!wms.isQueryable()) {
-        //    GWT.log("WMSLayer " + wms.getName() + " is not queryable!");
-        //    return null;
-        //}
-
         if (srs != null && srs.length() > 0) {
             return wms.supportsSrs(srs) ? new WMSLayerNode(wms) : null;
         }
diff -r eb4b123daaf7 -r 8c7433b8656d gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java
--- a/gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java	Wed Aug 14 16:24:12 2013 +0200
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/server/CapabilitiesParser.java	Wed Aug 14 16:50:35 2013 +0200
@@ -8,6 +8,12 @@
 
 package org.dive4elements.river.client.server;
 
+import org.dive4elements.artifacts.common.utils.XMLUtils;
+import org.dive4elements.river.client.shared.exceptions.ServerException;
+import org.dive4elements.river.client.shared.model.Capabilities;
+import org.dive4elements.river.client.shared.model.ContactInformation;
+import org.dive4elements.river.client.shared.model.WMSLayer;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
@@ -21,11 +27,6 @@
 import javax.xml.xpath.XPathConstants;
 
 import org.apache.log4j.Logger;
-import org.dive4elements.artifacts.common.utils.XMLUtils;
-import org.dive4elements.river.client.shared.exceptions.ServerException;
-import org.dive4elements.river.client.shared.model.Capabilities;
-import org.dive4elements.river.client.shared.model.ContactInformation;
-import org.dive4elements.river.client.shared.model.WMSLayer;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;


More information about the Dive4elements-commits mailing list