Mercurial > dive4elements > river
changeset 1856:410e40b88c7a
Added new WMSCatchmentArtifact for displaying catchments in maps.
flys-artifacts/trunk@3203 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 09 Nov 2011 16:28:29 +0000 |
| parents | b4798f15edc7 |
| children | 7fc87a67e6f7 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/doc/conf/conf.xml flys-artifacts/doc/conf/meta-data.xml flys-artifacts/doc/conf/themes.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java flys-artifacts/src/main/resources/messages.properties flys-artifacts/src/main/resources/messages_de.properties flys-artifacts/src/main/resources/messages_de_DE.properties flys-artifacts/src/main/resources/messages_en.properties |
| diffstat | 11 files changed, 226 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/ChangeLog Wed Nov 09 16:28:29 2011 +0000 @@ -1,3 +1,26 @@ +2011-11-09 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java: New + Artifact that is used to create WMS layers for catchments in maps. + + * doc/conf/conf.xml: Registered the new WMSCatchmentArtifact. + + * src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java: Added + a new type 'floodmap.catchment'. + + * doc/conf/artifacts/winfo.xml: Registered the 'floodmap.catchment' facet + for floodmaps. + + * doc/conf/themes.xml: Added a theme for 'floodmap.catchment' facets. + + * doc/conf/meta-data.xml: Added configuration for 'catchments'. + + * src/main/resources/messages.properties, + src/main/resources/messages_de_DE.properties, + src/main/resources/messages_en.properties, + src/main/resources/messages_de.properties: Added facet titles for + 'floodmap.catchment' facets. + 2011-11-09 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java: New
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/doc/conf/artifacts/winfo.xml Wed Nov 09 16:28:29 2011 +0000 @@ -375,6 +375,7 @@ <facet name="floodmap.kms"/> <facet name="floodmap.qps"/> <facet name="floodmap.hws"/> + <facet name="floodmap.catchment"/> </facets> </outputmode> <outputmode name="wsplgen_report" description="output.wsplgen_report" mime-type="text/xml" type="report">
--- a/flys-artifacts/doc/conf/conf.xml Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/doc/conf/conf.xml Wed Nov 09 16:28:29 2011 +0000 @@ -26,6 +26,9 @@ <artifact-factory name="wmshwsfactory" description="Factory to create an artifact that generates WMS facets for CrossSectionTracks." ttl="3600000" artifact="de.intevation.flys.artifacts.WMSHwsArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> + <artifact-factory name="wmscatchmentfactory" description="Factory to create an artifact that generates WMS facets for CrossSectionTracks." + ttl="3600000" + artifact="de.intevation.flys.artifacts.WMSCatchmentArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory> <artifact-factory name="wmsbackground" description="Factory to create an artifact to be used in WINFO" ttl="3600000" artifact="de.intevation.flys.artifacts.WMSBackgroundArtifact">de.intevation.artifactdatabase.DefaultArtifactFactory</artifact-factory>
--- a/flys-artifacts/doc/conf/meta-data.xml Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/doc/conf/meta-data.xml Wed Nov 09 16:28:29 2011 +0000 @@ -549,6 +549,22 @@ </dc:elements> </dc:context> </dc:macro> + <dc:macro name="flood-map-catchments"> + <dc:context> + <dc:statement> + SELECT count(*) as km_exists + FROM catchment WHERE river_id = ${river_id} + </dc:statement> + <dc:elements> + <dc:if test="$km_exists>0"> + <catchments> + <dc:attribute name="factory" value="wmscatchmentfactory"/> + <dc:attribute name="ids" value="${river_id}"/> + </catchments> + </dc:if> + </dc:elements> + </dc:context> + </dc:macro> <dc:macro name="flood-map-complete"> <kilometrage> <riveraxis> @@ -558,6 +574,7 @@ <dc:call-macro name="flood-map-km"/> <dc:call-macro name="flood-map-qps"/> <dc:call-macro name="flood-map-hws"/> + <dc:call-macro name="flood-map-catchments"/> </kilometrage> <rastermap> <background>
--- a/flys-artifacts/doc/conf/themes.xml Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/doc/conf/themes.xml Wed Nov 09 16:28:29 2011 +0000 @@ -745,6 +745,13 @@ </fields> </theme> + <theme name="Catchment"> + <fields> + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0"/> + <field name="linesize" type="int" display="Liniendicke" default="5" hints="h"/> + </fields> + </theme> + <!-- Mappings are following now. A mapping maps between a name of a facet @@ -829,6 +836,7 @@ <mapping from="floodmap.kms" to="Kms"/> <mapping from="floodmap.qps" to="Qps"/> <mapping from="floodmap.hws" to="Hws"/> + <mapping from="floodmap.catchment" to="Catchment"/> <mapping from="other.wkms" to="WKms"/> <mapping from="other.wqkms" to="WQKms"/> <mapping from="heightmarks_points" to="heightmarks_points"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSCatchmentArtifact.java Wed Nov 09 16:28:29 2011 +0000 @@ -0,0 +1,169 @@ +package de.intevation.flys.artifacts; + +import java.util.List; + +import org.w3c.dom.Document; + +import org.apache.log4j.Logger; + +import com.vividsolutions.jts.geom.Envelope; + +import de.intevation.artifacts.ArtifactFactory; +import de.intevation.artifacts.CallMeta; + +import de.intevation.artifactdatabase.state.DefaultOutput; +import de.intevation.artifactdatabase.state.Facet; +import de.intevation.artifactdatabase.state.State; + +import de.intevation.flys.model.Catchment; +import de.intevation.flys.model.River; + +import de.intevation.flys.artifacts.model.FacetTypes; +import de.intevation.flys.artifacts.model.RiverFactory; +import de.intevation.flys.artifacts.resources.Resources; +import de.intevation.flys.utils.FLYSUtils; + + +public class WMSCatchmentArtifact extends WMSDBArtifact { + + public static final String NAME = "catchment"; + + + private static final Logger logger = + Logger.getLogger(WMSCatchmentArtifact.class); + + + @Override + public void setup( + String identifier, + ArtifactFactory factory, + Object context, + CallMeta callMeta, + Document data) + { + logger.debug("WMSCatchmentArtifact.setup"); + + super.setup(identifier, factory, context, callMeta, data); + } + + + @Override + public String getName() { + return NAME; + } + + + @Override + public State getCurrentState(Object cc) { + State s = new CatchmentState(this); + + List<Facet> fs = facets.get(getCurrentStateId()); + + DefaultOutput o = new DefaultOutput( + "floodmap", + "floodmap", + "image/png", + fs, + "map"); + + s.getOutputs().add(o); + + return s; + } + + + public static class CatchmentState extends WMSDBState implements FacetTypes + { + private static final Logger logger = + Logger.getLogger(CatchmentState.class); + + protected int riverId; + + public CatchmentState(WMSDBArtifact artifact) { + super(artifact); + riverId = 0; + } + + public int getRiverId() { + if (riverId == 0) { + String ids = artifact.getDataAsString("ids"); + + try { + riverId = Integer.valueOf(ids); + } + catch (NumberFormatException nfe) { + logger.error("Cannot parse river id from '" + ids + "'"); + } + } + + return riverId; + } + + @Override + protected String getFacetType() { + return FLOODMAP_CATCHMENT; + } + + @Override + protected String getTitle(CallMeta meta) { + return Resources.getMsg( + meta, + FLOODMAP_CATCHMENT, + FLOODMAP_CATCHMENT); + } + + @Override + protected String getUrl() { + return FLYSUtils.getUserWMSUrl(artifact.identifier()); + } + + @Override + protected String getSrid() { + River river = RiverFactory.getRiver(getRiverId()); + return FLYSUtils.getRiverSrid(river.getName()); + } + + @Override + protected Envelope getExtent() { + List<Catchment> catchments = Catchment.getCatchments(getRiverId()); + + Envelope max = null; + + for (Catchment c: catchments) { + Envelope env = c.getGeom().getEnvelopeInternal(); + + if (max == null) { + max = env; + continue; + } + + max.expandToInclude(env); + } + + return max; + } + + @Override + protected String getFilter() { + return "river_id=" + String.valueOf(getRiverId()); + } + + @Override + protected String getDataString() { + String srid = getSrid(); + + if (FLYSUtils.isUsingOracle()) { + return "geom FROM catchment USING SRID " + srid; + } + else { + return "geom FROM catchment USING UNIQUE id USING SRID " + srid; + } + } + + @Override + protected String getGeometryType() { + return "POLYGON"; + } + } // end of WMSKmState +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Wed Nov 09 16:28:29 2011 +0000 @@ -9,6 +9,7 @@ String FLOODMAP_KMS = "floodmap.kms"; String FLOODMAP_QPS = "floodmap.qps"; String FLOODMAP_HWS = "floodmap.hws"; + String FLOODMAP_CATCHMENT = "floodmap.catchment"; String DISCHARGE_LONGITUDINAL_W = "discharge_longitudinal_section.w"; String DISCHARGE_LONGITUDINAL_Q = "discharge_longitudinal_section.q";
--- a/flys-artifacts/src/main/resources/messages.properties Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages.properties Wed Nov 09 16:28:29 2011 +0000 @@ -89,6 +89,7 @@ floodmap.kms = Kilometrage floodmap.qps = Crosssection Tracks floodmap.hws = Flood Control Works +floodmap.catchment = Catchment wsplgen.job.queued = WSPLGEN job in queue. wsplgen.job.error = An unexpected error while starting WSPLGEN occured.
--- a/flys-artifacts/src/main/resources/messages_de.properties Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages_de.properties Wed Nov 09 16:28:29 2011 +0000 @@ -89,6 +89,7 @@ floodmap.kms = Kilometrierung floodmap.qps = Querprofilspuren floodmap.hws = Hochwasserschutzanlagen +floodmap.catchment = Einzugsgebiet wsplgen.job.queued = WSPLGEN Berechnung befindet sich in Warteschlange. wsplgen.job.error = Ein unerwarteter Fehler beim Starten von WSPLGEN ist aufgetreten.
--- a/flys-artifacts/src/main/resources/messages_de_DE.properties Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages_de_DE.properties Wed Nov 09 16:28:29 2011 +0000 @@ -89,6 +89,7 @@ floodmap.kms = Kilometrierung floodmap.qps = Querprofilspuren floodmap.hws = Hochwasserschutzanlagen +floodmap.catchment = Einzugsgebiet wsplgen.job.queued = WSPLGEN Berechnung befindet sich in Warteschlange. wsplgen.job.error = Ein unerwarteter Fehler beim Starten von WSPLGEN ist aufgetreten.
--- a/flys-artifacts/src/main/resources/messages_en.properties Wed Nov 09 16:07:07 2011 +0000 +++ b/flys-artifacts/src/main/resources/messages_en.properties Wed Nov 09 16:28:29 2011 +0000 @@ -87,6 +87,7 @@ floodmap.kms = Kilometrage floodmap.qps = Crosssection Tracks floodmap.hws = Flood Control Works +floodmap.catchment = Catchment wsplgen.job.queued = WSPLGEN job in queue. wsplgen.job.error = An unexpected error while starting WSPLGEN occured.