# This is a combination of 6 commits.tree d49629c8be1f334fd453a4725d9…

…71b604440f421

parent eadc82f
author Jakob Miksch <[email protected]> 1598862052 +0200
committer Jakob Miksch <[email protected]> 1598862071 +0200

# This is a combination of 4 commits.
# This is the 1st commit message:

WIP

WIP - loading from JSON seems to work

# This is the commit message #2:

Cleanup

# This is the commit message #3:

Basic later tree works

# This is the commit message #4:

Feature Info works

# This is the commit message #6:

Zoom Button works

webapp/app/util/Layer.js

@@ -21,5 +21,5 @@ Ext.define("MalawiAtlas.util.Layer", {
     });
 
     return flatLayers;
-  },
+  }
 });

webapp/app/util/Map.js

@@ -4,34 +4,34 @@ var olMap = new ol.Map({
   controls: ol.control.defaults({
     attributionOptions: {
       collapsible: false,
-      collapsed: false,
-    },
+      collapsed: false
+    }
   }),
   view: new ol.View({
     center: ol.proj.fromLonLat([34.3, -13.2]),
-    zoom: 7,
-  }),
+    zoom: 7
+  })
 });
 
 olMap.addControl(
   new ol.control.ScaleLine({
-    minWidth: 120,
+    minWidth: 120
   })
 );
 
 olMap.addControl(
   new ol.control.OverviewMap({
     layers: [
       new ol.layer.Tile({
-        source: new ol.source.OSM(),
-      }),
-    ],
+        source: new ol.source.OSM()
+      })
+    ]
   })
 );
 
 var measurePopup = Ext.create("GeoExt.component.Popup", {
   map: olMap,
-  width: 140,
+  width: 140
 });
 
 var measureVectorSource = new ol.source.Vector();
@@ -41,20 +41,20 @@ var measureLayer = new ol.layer.Vector({
   source: measureVectorSource,
   style: new ol.style.Style({
     fill: new ol.style.Fill({
-      color: "rgba(255, 20, 20, 0.2)",
+      color: "rgba(255, 20, 20, 0.2)"
     }),
     stroke: new ol.style.Stroke({
       color: "#ff0033",
       width: 2,
-      lineDash: [10, 10],
+      lineDash: [10, 10]
     }),
     image: new ol.style.Circle({
       radius: 7,
       fill: new ol.style.Fill({
-        color: "#ff0033",
-      }),
-    }),
-  }),
+        color: "#ff0033"
+      })
+    })
+  })
 });
 
 olMap.addLayer(measureLayer);
@@ -74,7 +74,7 @@ Ext.define("MalawiAtlas.util.Map", {
     var view = me.map.getView();
     view.fit(extent, {
       duration: 2000,
-      nearest: true,
+      nearest: true
     });
   },
 
@@ -84,5 +84,5 @@ Ext.define("MalawiAtlas.util.Map", {
   getOlMap: function () {
     var me = this;
     return me.map;
-  },
+  }
 });

webapp/app/view/layer/LayerTree.js

@@ -19,6 +19,9 @@ Ext.define("MalawiAtlas.view.layer.LayerTree", {
     }
   },
 
+  // empty store will be filled later
+  store: {},
+
   columns: [
     {
       xtype: "treecolumn",
@@ -57,33 +60,5 @@ Ext.define("MalawiAtlas.view.layer.LayerTree", {
       isDisabled: "isGroup",
       handler: "showOpacitySlider"
     }
-  ],
-
-  initComponent: function () {
-    var me = this;
-
-    // TODO: start loading layer tree once the config JSON has been loaded
-
-    var olMap = MalawiAtlas.util.Map.getOlMap();
-
-    // TODO: use top level GeoExt function like in legend
-    var layerArray = [];
-    olMap.getLayers().forEach(function (layer) {
-      if (layer.get("basemap") != true && layer.get("measurementLayer") != true)
-        layerArray.push(layer);
-    });
-
-    var treeStore = Ext.create("GeoExt.data.store.LayersTree", {
-      layerGroup: new ol.layer.Group({
-        layers: layerArray
-      })
-    });
-
-    me.store = treeStore;
-
-    // uncomment, if layer tree shall be expanded
-    // me.expandAll();
-
-    me.callParent();
-  }
+  ]
 });