Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/MapGenerator.java @ 2091:5d158f8ad080
#298 Fixed broken auto-zoom-to-wsplgen in floodmaps.
flys-artifacts/trunk@3616 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 06 Jan 2012 14:19:35 +0000 |
parents | 007a8f5ed9f1 |
children | 27cc95e65f18 |
comparison
equal
deleted
inserted
replaced
2090:17e7a0d063bd | 2091:5d158f8ad080 |
---|---|
101 | 101 |
102 setMaxExtent(extent); | 102 setMaxExtent(extent); |
103 setSrid(wms.getSrid()); | 103 setSrid(wms.getSrid()); |
104 | 104 |
105 if (FLOODMAP_WSPLGEN.equals(name)) { | 105 if (FLOODMAP_WSPLGEN.equals(name)) { |
106 if (initialExtent == null) { | 106 setInitialExtent(extent); |
107 setInitialExtent(extent); | |
108 } | |
109 | |
110 createWSPLGENLayer(flys, wms); | 107 createWSPLGENLayer(flys, wms); |
111 } | 108 } |
112 else if (FLOODMAP_BARRIERS.equals(name)) { | 109 else if (FLOODMAP_BARRIERS.equals(name)) { |
113 createBarriersLayer(flys, wms); | 110 createBarriersLayer(flys, wms); |
114 } | 111 } |
224 return; | 221 return; |
225 } | 222 } |
226 | 223 |
227 if (this.maxExtent == null) { | 224 if (this.maxExtent == null) { |
228 logger.debug("Set max extent to: " + maxExtent); | 225 logger.debug("Set max extent to: " + maxExtent); |
229 this.maxExtent = maxExtent; | 226 this.maxExtent = new Envelope(maxExtent); |
230 return; | 227 return; |
231 } | 228 } |
232 | 229 |
233 logger.debug("Expand max extent by: " + maxExtent); | |
234 logger.debug("Max extent before expanding: " + this.maxExtent); | |
235 this.maxExtent.expandToInclude(maxExtent); | 230 this.maxExtent.expandToInclude(maxExtent); |
236 logger.debug("Max extent after expanding: " + this.maxExtent); | |
237 } | 231 } |
238 | 232 |
239 | 233 |
240 protected void setInitialExtent(Envelope initialExtent) { | 234 protected void setInitialExtent(Envelope initialExtent) { |
241 if (initialExtent == null) { | 235 if (this.initialExtent == null && initialExtent != null) { |
242 return; | |
243 } | |
244 | |
245 if (this.initialExtent == null) { | |
246 logger.debug("Set initial extent to: " + initialExtent); | 236 logger.debug("Set initial extent to: " + initialExtent); |
247 this.initialExtent = initialExtent; | 237 this.initialExtent = new Envelope(initialExtent); |
248 return; | 238 } |
249 } | |
250 | |
251 logger.debug("Set initial extent to: " + initialExtent); | |
252 this.initialExtent = initialExtent; | |
253 } | 239 } |
254 | 240 |
255 | 241 |
256 protected void setSrid(String srid) { | 242 protected void setSrid(String srid) { |
257 if (srid == null || srid.length() == 0) { | 243 if (srid == null || srid.length() == 0) { |
262 } | 248 } |
263 | 249 |
264 | 250 |
265 protected void appendMapInformation(Element parent, ElementCreator c) { | 251 protected void appendMapInformation(Element parent, ElementCreator c) { |
266 String mE = GeometryUtils.jtsBoundsToOLBounds(this.maxExtent); | 252 String mE = GeometryUtils.jtsBoundsToOLBounds(this.maxExtent); |
267 logger.debug("BUILD MAX EXTENT OF:" + this.maxExtent); | |
268 logger.debug("BUILD MAX EXTENT:" + mE); | |
269 | 253 |
270 Element maxExtent = c.create("maxExtent"); | 254 Element maxExtent = c.create("maxExtent"); |
271 maxExtent.setTextContent(mE); | 255 maxExtent.setTextContent(mE); |
272 | 256 |
273 if(this.initialExtent != null) { | 257 if(this.initialExtent != null) { |
274 String iE = GeometryUtils.jtsBoundsToOLBounds(this.initialExtent); | 258 String iE = GeometryUtils.jtsBoundsToOLBounds(this.initialExtent); |
275 logger.debug("BUILD INITIAL EXTENT OF: " + this.initialExtent); | |
276 logger.debug("BUILD INITIAL EXTENT: " + iE); | |
277 Element initExtent = c.create("initialExtent"); | 259 Element initExtent = c.create("initialExtent"); |
278 initExtent.setTextContent(iE); | 260 initExtent.setTextContent(iE); |
279 parent.appendChild(initExtent); | 261 parent.appendChild(initExtent); |
280 } | 262 } |
281 | 263 |