[Dive4elements-commits] [PATCH 3 of 5] Split HWSArtifact into HWSPoints and HWSLines
Wald Commits
scm-commit at wald.intevation.org
Wed Mar 20 16:37:29 CET 2013
# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1363793609 -3600
# Node ID 0b5c0c15b13f615aab55765a1b087d8d2ef36b2e
# Parent 615e25b6440e6a822213762e2d3838f958b795d6
Split HWSArtifact into HWSPoints and HWSLines
diff -r 615e25b6440e -r 0b5c0c15b13f flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHWSLinesArtifact.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHWSLinesArtifact.java Wed Mar 20 16:33:29 2013 +0100
@@ -0,0 +1,165 @@
+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.HWSLine;
+import de.intevation.flys.model.River;
+
+import de.intevation.flys.artifacts.model.FacetTypes;
+import de.intevation.flys.artifacts.model.RiverFactory;
+import de.intevation.flys.utils.FLYSUtils;
+import de.intevation.flys.utils.GeometryUtils;
+
+
+public class WMSHWSLinesArtifact extends WMSDBArtifact {
+
+ public static final String NAME = "hws_lines";
+
+
+ private static final Logger logger =
+ Logger.getLogger(WMSHWSLinesArtifact.class);
+
+
+ @Override
+ public void setup(
+ String identifier,
+ ArtifactFactory factory,
+ Object context,
+ CallMeta callMeta,
+ Document data)
+ {
+ logger.debug("WMSHWSLinesArtifact.setup");
+
+ super.setup(identifier, factory, context, callMeta, data);
+ }
+
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
+
+ @Override
+ public State getCurrentState(Object cc) {
+ State s = new HWSLinesState(this);
+
+ List<Facet> fs = getFacets(getCurrentStateId());
+
+ DefaultOutput o = new DefaultOutput(
+ "floodmap",
+ "floodmap",
+ "image/png",
+ fs,
+ "map");
+
+ s.getOutputs().add(o);
+
+ return s;
+ }
+
+
+ public static class HWSLinesState extends WMSDBState implements FacetTypes
+ {
+ private static final Logger logger =
+ Logger.getLogger(HWSLinesState.class);
+
+ protected int riverId;
+
+ public HWSLinesState(WMSDBArtifact artifact) {
+ super(artifact);
+ riverId = 0;
+ }
+
+ public int getRiverId() {
+ if (riverId == 0) {
+ String ids = artifact.getDataAsString("ids");
+ String[] parts = ids.split(";");
+
+ try {
+ riverId = Integer.parseInt(parts[0]);
+ }
+ catch (NumberFormatException nfe) {
+ logger.error("Cannot parse river id from '" + parts[0] + "'");
+ }
+ }
+
+ return riverId;
+ }
+
+ @Override
+ protected String getFacetType() {
+ return FLOODMAP_HWS_LINES;
+ }
+
+ @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(boolean reproject) {
+ List<HWSLine> hws = HWSLine.getLines(getRiverId(), getName());
+
+ Envelope max = null;
+
+ for (HWSLine h: hws) {
+ Envelope env = h.getGeom().getEnvelopeInternal();
+
+ if (max == null) {
+ max = env;
+ continue;
+ }
+
+ max.expandToInclude(env);
+ }
+
+ return max != null && reproject
+ ? GeometryUtils.transform(max, getSrid())
+ : max;
+ }
+
+ @Override
+ protected String getFilter() {
+ return "river_id=" + String.valueOf(getRiverId())
+ + " AND name='" + getName() + "'";
+ }
+
+ @Override
+ protected String getDataString() {
+ String srid = getSrid();
+
+ if (FLYSUtils.isUsingOracle()) {
+ return "geom FROM hws_lines USING SRID " + srid;
+ }
+ else {
+ return "geom FROM hws_lines USING UNIQUE id USING SRID " + srid;
+ }
+ }
+
+ @Override
+ protected String getGeometryType() {
+ return "LINE";
+ }
+ }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 615e25b6440e -r 0b5c0c15b13f flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHWSPointsArtifact.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHWSPointsArtifact.java Wed Mar 20 16:33:29 2013 +0100
@@ -0,0 +1,165 @@
+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.HWSPoint;
+import de.intevation.flys.model.River;
+
+import de.intevation.flys.artifacts.model.FacetTypes;
+import de.intevation.flys.artifacts.model.RiverFactory;
+import de.intevation.flys.utils.FLYSUtils;
+import de.intevation.flys.utils.GeometryUtils;
+
+
+public class WMSHWSPointsArtifact extends WMSDBArtifact {
+
+ public static final String NAME = "hws_points";
+
+
+ private static final Logger logger =
+ Logger.getLogger(WMSHWSPointsArtifact.class);
+
+
+ @Override
+ public void setup(
+ String identifier,
+ ArtifactFactory factory,
+ Object context,
+ CallMeta callMeta,
+ Document data)
+ {
+ logger.debug("WMSHWSPointsArtifact.setup");
+
+ super.setup(identifier, factory, context, callMeta, data);
+ }
+
+
+ @Override
+ public String getName() {
+ return NAME;
+ }
+
+
+ @Override
+ public State getCurrentState(Object cc) {
+ State s = new HWSPointsState(this);
+
+ List<Facet> fs = getFacets(getCurrentStateId());
+
+ DefaultOutput o = new DefaultOutput(
+ "floodmap",
+ "floodmap",
+ "image/png",
+ fs,
+ "map");
+
+ s.getOutputs().add(o);
+
+ return s;
+ }
+
+
+ public static class HWSPointsState extends WMSDBState implements FacetTypes
+ {
+ private static final Logger logger =
+ Logger.getLogger(HWSPointsState.class);
+
+ protected int riverId;
+
+ public HWSPointsState(WMSDBArtifact artifact) {
+ super(artifact);
+ riverId = 0;
+ }
+
+ public int getRiverId() {
+ if (riverId == 0) {
+ String ids = artifact.getDataAsString("ids");
+ String[] parts = ids.split(";");
+
+ try {
+ riverId = Integer.parseInt(parts[0]);
+ }
+ catch (NumberFormatException nfe) {
+ logger.error("Cannot parse river id from '" + parts[0] + "'");
+ }
+ }
+
+ return riverId;
+ }
+
+ @Override
+ protected String getFacetType() {
+ return FLOODMAP_HWS_POINTS;
+ }
+
+ @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(boolean reproject) {
+ List<HWSPoint> hws = HWSPoint.getPoints(getRiverId(), getName());
+
+ Envelope max = null;
+
+ for (HWSPoint h: hws) {
+ Envelope env = h.getGeom().getEnvelopeInternal();
+
+ if (max == null) {
+ max = env;
+ continue;
+ }
+
+ max.expandToInclude(env);
+ }
+
+ return max != null && reproject
+ ? GeometryUtils.transform(max, getSrid())
+ : max;
+ }
+
+ @Override
+ protected String getFilter() {
+ return "river_id=" + String.valueOf(getRiverId())
+ + " AND name='" + getName() + "'";
+ }
+
+ @Override
+ protected String getDataString() {
+ String srid = getSrid();
+
+ if (FLYSUtils.isUsingOracle()) {
+ return "geom FROM hws_points USING SRID " + srid;
+ }
+ else {
+ return "geom FROM hws_points USING UNIQUE id USING SRID " + srid;
+ }
+ }
+
+ @Override
+ protected String getGeometryType() {
+ return "POINT";
+ }
+ }
+}
+// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 615e25b6440e -r 0b5c0c15b13f flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WMSHwsArtifact.java Wed Mar 20 16:32:07 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +0,0 @@
-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.HWSLine;
-import de.intevation.flys.model.River;
-
-import de.intevation.flys.artifacts.model.FacetTypes;
-import de.intevation.flys.artifacts.model.RiverFactory;
-import de.intevation.flys.utils.FLYSUtils;
-import de.intevation.flys.utils.GeometryUtils;
-
-
-public class WMSHwsArtifact extends WMSDBArtifact {
-
- public static final String NAME = "hws";
-
-
- private static final Logger logger =
- Logger.getLogger(WMSHwsArtifact.class);
-
-
- @Override
- public void setup(
- String identifier,
- ArtifactFactory factory,
- Object context,
- CallMeta callMeta,
- Document data)
- {
- logger.debug("WMSHwsArtifact.setup");
-
- super.setup(identifier, factory, context, callMeta, data);
- }
-
-
- @Override
- public String getName() {
- return NAME;
- }
-
-
- @Override
- public State getCurrentState(Object cc) {
- State s = new HwsState(this);
-
- List<Facet> fs = getFacets(getCurrentStateId());
-
- DefaultOutput o = new DefaultOutput(
- "floodmap",
- "floodmap",
- "image/png",
- fs,
- "map");
-
- s.getOutputs().add(o);
-
- return s;
- }
-
-
- public static class HwsState extends WMSDBState implements FacetTypes
- {
- private static final Logger logger =
- Logger.getLogger(HwsState.class);
-
- protected int riverId;
-
- public HwsState(WMSDBArtifact artifact) {
- super(artifact);
- riverId = 0;
- }
-
- public int getRiverId() {
- if (riverId == 0) {
- String ids = artifact.getDataAsString("ids");
- String[] parts = ids.split(";");
-
- try {
- riverId = Integer.parseInt(parts[0]);
- }
- catch (NumberFormatException nfe) {
- logger.error("Cannot parse river id from '" + parts[0] + "'");
- }
- }
-
- return riverId;
- }
-
- @Override
- protected String getFacetType() {
- return FLOODMAP_HWS;
- }
-
- @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(boolean reproject) {
- List<HWSLine> hws = HWSLine.getLines(getRiverId(), getName());
-
- Envelope max = null;
-
- for (HWSLine h: hws) {
- Envelope env = h.getGeom().getEnvelopeInternal();
-
- if (max == null) {
- max = env;
- continue;
- }
-
- max.expandToInclude(env);
- }
-
- return max != null && reproject
- ? GeometryUtils.transform(max, getSrid())
- : max;
- }
-
- @Override
- protected String getFilter() {
- return "river_id=" + String.valueOf(getRiverId())
- + " AND name='" + getName() + "'";
- }
-
- @Override
- protected String getDataString() {
- String srid = getSrid();
-
- if (FLYSUtils.isUsingOracle()) {
- return "geom FROM hws USING SRID " + srid;
- }
- else {
- return "geom FROM hws USING UNIQUE id USING SRID " + srid;
- }
- }
-
- @Override
- protected String getGeometryType() {
- return "LINE";
- }
- } // end of WMSKmState
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
More information about the Dive4elements-commits
mailing list