--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java	Fri Jul 08 08:54:08 2011 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapOutputTab.java	Fri Jul 08 14:56:02 2011 +0000
@@ -1,21 +1,38 @@
 package de.intevation.flys.client.client.ui.map;
 
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.VerticalPanel;
+import com.google.gwt.user.client.ui.Widget;
+
+import com.smartgwt.client.widgets.Button;
 import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.events.ClickEvent;
+import com.smartgwt.client.widgets.events.ClickHandler;
 import com.smartgwt.client.widgets.layout.HLayout;
 
+import org.gwtopenmaps.openlayers.client.Bounds;
+import org.gwtopenmaps.openlayers.client.LonLat;
+import org.gwtopenmaps.openlayers.client.layer.WMS;
+import org.gwtopenmaps.openlayers.client.layer.WMSParams;
+
+
 import de.intevation.flys.client.shared.model.Collection;
 import de.intevation.flys.client.shared.model.OutputMode;
 
 import de.intevation.flys.client.client.ui.CollectionView;
 import de.intevation.flys.client.client.ui.OutputTab;
+import de.intevation.flys.client.client.ui.chart.ChartThemePanel;
 
 
 public class MapOutputTab extends OutputTab {
 
     protected CollectionView parent;
 
+    protected Canvas controlPanel;
     protected Canvas themePanel;
-    protected Canvas mapPanel;
+    protected Widget mapPanel;
+
+    protected FloodMap floodMap;
 
 
     public MapOutputTab(
@@ -27,21 +44,79 @@
         super(title, collection, mode);
         this.parent = collectionView;
 
+        floodMap = new FloodMap();
+
         initLayout();
+        initLayers();
     }
 
 
     protected void initLayout() {
-        themePanel = createThemePanel();
-        mapPanel   = createMapPanel();
+        Canvas  wrapper = new Canvas();
+        wrapper.setWidth100();
+        wrapper.setHeight100();
 
+        VerticalPanel vlayout = new VerticalPanel();
+        vlayout.setWidth("100%");
+
+        controlPanel = createControlPanel();
+        themePanel   = createThemePanel();
+        mapPanel     = floodMap.getMapWidget();
+
+        final HorizontalPanel layout = new HorizontalPanel();
+        layout.setWidth("100%");
+        layout.setHeight("635px");
+
+        layout.add(themePanel);
+        layout.add(mapPanel);
+
+        vlayout.add(controlPanel);
+        vlayout.add(layout);
+
+        wrapper.addChild(vlayout);
+
+        setPane(wrapper);
+    }
+
+
+    protected void initLayers() {
+        // TODO Initialize correct layers here
+
+        String url    = "http://vmap0.tiles.osgeo.org/wms/vmap0";
+        String layers = "basic";
+
+        WMSParams params = new WMSParams();
+        params.setLayers(layers);
+        params.setFormat("image/png");
+        params.setIsTransparent(false);
+        params.setMaxExtent(new Bounds(90, 180, -90, -180));
+
+        WMS wms = new WMS("vmap0", url, params);
+        wms.setIsBaseLayer(true);
+        wms.setIsVisible(true);
+
+        floodMap.getMap().addLayer(wms);
+        floodMap.getMap().setCenter(new LonLat(0, 0));
+    }
+
+
+    protected Canvas createControlPanel() {
         HLayout layout = new HLayout();
         layout.setWidth100();
-        layout.setHeight100();
-        layout.addMember(themePanel);
-        layout.addMember(mapPanel);
+        layout.setHeight(30);
+        layout.setMembersMargin(5);
+        layout.setBorder("1px solid black");
 
-        setPane(layout);
+        Button zoomToMax = new Button("Max Extent");
+        zoomToMax.addClickHandler(new ClickHandler() {
+            public void onClick(ClickEvent event) {
+                floodMap.getMap().zoomToMaxExtent();
+            }
+        });
+
+        layout.addMember(zoomToMax);
+
+        return layout;
     }
 
 
@@ -49,17 +124,10 @@
         Canvas c = new Canvas();
         c.setWidth(200);
         c.setHeight100();
-        c.setBorder("1px solid blue");
-
-        return c;
-    }
+        c.setBorder("1px solid black");
 
-
-    protected Canvas createMapPanel() {
-        Canvas c = new Canvas();
-        c.setWidth("*");
-        c.setHeight100();
-        c.setBorder("1px solid green");
+        ChartThemePanel ctp = new ChartThemePanel(collection, mode);
+        c.addChild(ctp);
 
         return c;
     }