Mercurial > dive4elements > river
changeset 2595:b23c956c5aa2
Fixed broken Floodmaps in datacage for floodmap output.
flys-artifacts/trunk@4157 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Fri, 16 Mar 2012 09:51:51 +0000 |
| parents | 226c360febae |
| children | 00cf69edfcc0 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/mapserver/db_layer.vm flys-artifacts/doc/conf/meta-data.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java |
| diffstat | 4 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Mar 16 09:32:29 2012 +0000 +++ b/flys-artifacts/ChangeLog Fri Mar 16 09:51:51 2012 +0000 @@ -1,3 +1,16 @@ +2012-03-16 Ingo Weinzierl <ingo@intevation.de> + + * doc/conf/mapserver/db_layer.vm: Set the FILTER expression into double + quotes (") instead of single quotes (') which allows single quotes in + expressions. + + * doc/conf/meta-data.xml: Moved the floodmaps from kilometrage to its + parent folder. + + * src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java: + Fixed broken filter expression and set geometry type (MapServer does not + know a 'MULTIPOLYGON'). + 2012-03-16 Raimund Renkert <raimund.renkert@intevation.de> * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java:
--- a/flys-artifacts/doc/conf/mapserver/db_layer.vm Fri Mar 16 09:32:29 2012 +0000 +++ b/flys-artifacts/doc/conf/mapserver/db_layer.vm Fri Mar 16 09:51:51 2012 +0000 @@ -6,7 +6,7 @@ CONNECTION "$LAYER.getConnection()" DATA "$LAYER.getData()" - FILTER '$LAYER.getFilter()' + FILTER "$LAYER.getFilter()" EXTENT $LAYER.getExtent() STATUS ON
--- a/flys-artifacts/doc/conf/meta-data.xml Fri Mar 16 09:32:29 2012 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Fri Mar 16 09:51:51 2012 +0000 @@ -801,8 +801,8 @@ <dc:call-macro name="flood-map-lines"/> <dc:call-macro name="flood-map-buildings"/> <dc:call-macro name="flood-map-fixpoints"/> - <dc:call-macro name="flood-map-uesk"/> </kilometrage> + <dc:call-macro name="flood-map-uesk"/> <rastermap> <background> <dc:attribute name="factory" value="wmsbackground"/>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java Fri Mar 16 09:32:29 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSFloodmapsArtifact.java Fri Mar 16 09:51:51 2012 +0000 @@ -161,7 +161,7 @@ @Override protected String getFilter() { return "river_id=" + String.valueOf(getRiverId()) - + "name=" + getFloodmapName(); + + " AND name='" + getFloodmapName() + "'"; } @Override @@ -178,7 +178,7 @@ @Override protected String getGeometryType() { - return "MULTIPOLYGON"; + return "POLYGON"; } } // end of WMSKmState }