Mercurial > dive4elements > river
comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java @ 835:c89a42950d11
Removed the digitize controls from map widget that is used in the floodmap state.
flys-client/trunk@2548 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Wed, 24 Aug 2011 09:26:33 +0000 |
| parents | 1b9b7e9ab219 |
| children | 45791d12a1f4 |
comparison
equal
deleted
inserted
replaced
| 834:77469d7f3c93 | 835:c89a42950d11 |
|---|---|
| 221 | 221 |
| 222 | 222 |
| 223 protected String getGeoJSONFromDynamic(ArtifactDescription desc) { | 223 protected String getGeoJSONFromDynamic(ArtifactDescription desc) { |
| 224 DataList list = desc.getCurrentData(); | 224 DataList list = desc.getCurrentData(); |
| 225 | 225 |
| 226 if (list == null) { | |
| 227 return null; | |
| 228 } | |
| 229 | |
| 226 List<Data> datas = list.getAll(); | 230 List<Data> datas = list.getAll(); |
| 227 for (Data data: datas) { | 231 for (Data data: datas) { |
| 228 String key = data.getLabel(); | 232 String key = data.getLabel(); |
| 229 | 233 |
| 230 if (key != null && key.equals(BARRIERS_PARAMETER_KEY)) { | 234 if (key != null && key.equals(BARRIERS_PARAMETER_KEY)) { |
| 262 | 266 |
| 263 int num = themeList.getThemeCount(); | 267 int num = themeList.getThemeCount(); |
| 264 | 268 |
| 265 for (int i = 1; i <= num; i++) { | 269 for (int i = 1; i <= num; i++) { |
| 266 AttributedTheme theme = (AttributedTheme) themeList.getThemeAt(i); | 270 AttributedTheme theme = (AttributedTheme) themeList.getThemeAt(i); |
| 271 | |
| 272 if (theme == null) { | |
| 273 continue; | |
| 274 } | |
| 275 | |
| 267 String srid = theme.getAttr("srid"); | 276 String srid = theme.getAttr("srid"); |
| 268 | 277 |
| 269 if (srid != null && srid.length() > 0) { | 278 if (srid != null && srid.length() > 0) { |
| 270 return srid; | 279 return srid; |
| 271 } | 280 } |
| 282 | 291 |
| 283 Bounds extent = null; | 292 Bounds extent = null; |
| 284 | 293 |
| 285 for (int i = 1; i <= num; i++) { | 294 for (int i = 1; i <= num; i++) { |
| 286 AttributedTheme theme = (AttributedTheme) themeList.getThemeAt(i); | 295 AttributedTheme theme = (AttributedTheme) themeList.getThemeAt(i); |
| 296 | |
| 297 if (theme == null) { | |
| 298 continue; | |
| 299 } | |
| 300 | |
| 287 String tmp = theme.getAttr("extent"); | 301 String tmp = theme.getAttr("extent"); |
| 288 | 302 |
| 289 if (theme.getActive() == 1) { | 303 if (theme.getActive() == 1) { |
| 290 if (extent == null) { | 304 if (extent == null) { |
| 291 extent = boundsFromString(tmp); | 305 extent = boundsFromString(tmp); |
| 363 return wms; | 377 return wms; |
| 364 } | 378 } |
| 365 | 379 |
| 366 | 380 |
| 367 protected MapToolbar createControlPanel(Canvas wrapper) { | 381 protected MapToolbar createControlPanel(Canvas wrapper) { |
| 368 return new MapToolbar(floodMap, wrapper); | 382 return new MapToolbar(floodMap, wrapper, false); |
| 369 } | 383 } |
| 370 | 384 |
| 371 | 385 |
| 372 protected Canvas createThemePanel() { | 386 protected Canvas createThemePanel() { |
| 373 Canvas c = new Canvas(); | 387 Canvas c = new Canvas(); |