Fix some problems

geoext · May 28, 2021 · c844f67 · c844f67
1 parent 63c9397
commit c844f67
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 20 deletions.
diff --git a/classic/selection/FeatureModelMixin.js b/classic/selection/FeatureModelMixin.js
@@ -31,6 +31,7 @@ Ext.define('GeoExt.selection.FeatureModelMixin', {
             bindComponent: 'bindFeatureModel'
         },
         before: {
+            constructor: 'onConstruct',
             onSelectChange: 'beforeSelectChange'
         }
     },
@@ -111,8 +112,8 @@ Ext.define('GeoExt.selection.FeatureModelMixin', {
      */
     selectedFeatures: null,
 
-    constructor: function() {
-        me.callParent(arguments);
+    onConstruct: function() {
+        var me = this;
 
         me.onSelectFeatAdd = me.onSelectFeatAdd.bind(me);
         me.onSelectFeatRemove = me.onSelectFeatRemove.bind(me);
@@ -130,7 +131,7 @@ Ext.define('GeoExt.selection.FeatureModelMixin', {
         me.selectedFeatures = new ol.Collection();
 
         // detect a layer from the store if not passed in
-        if (!me.layer || !me.layer instanceof ol.layer.Vector) {
+        if (!me.layer || !(me.layer instanceof ol.layer.Vector)) {
             var store = me.getStore();
             if (store && store.getLayer && store.getLayer() &&
                 store.getLayer() instanceof ol.layer.Vector) {

diff --git a/src/component/OverviewMap.js b/src/component/OverviewMap.js
@@ -610,19 +610,9 @@ Ext.define('GeoExt.component.OverviewMap', {
                 // call fit to assure that resolutions are available on
                 // overviewView
 
-                // Check for backwards compatibility
-                if (GeoExt.util.Version.isOl3()) {
-                    overviewView.fit(
-                        parentExtentProjected,
-                        me.getMap().getSize(),
-                        {constrainResolution: false}
-                    );
-                } else {
-                    overviewView.fit(
-                        parentExtentProjected,
-                        {constrainResolution: false}
-                    );
-                }
+                overviewView.fit(
+                    parentExtentProjected
+                );
                 overviewView.set(
                     'resolution',
                     me.getMagnification() * overviewView.getResolution()

diff --git a/src/data/store/Layers.js b/src/data/store/Layers.js
@@ -83,17 +83,17 @@ Ext.define('GeoExt.data.store.Layers', {
     constructor: function(config) {
         var me = this;
 
+        me.onAddLayer = me.onAddLayer.bind(me);
+        me.onRemoveLayer = me.onRemoveLayer.bind(me);
+        me.onChangeLayer = me.onChangeLayer.bind(me);
+
         me.callParent([config]);
 
         if (config.map) {
             this.bindMap(config.map);
         } else if (config.layers) {
             this.bindLayers(config.layers);
         }
-
-        me.onAddLayer = me.onAddLayer.bind(me);
-        me.onRemoveLayer = me.onRemoveLayer.bind(me);
-        me.onChangeLayer = me.onChangeLayer.bind(me);
     },
 
     /**