[FIX] fix ol v5 #123

Viglino · Jun 27, 2018 · b8dfba1 · b8dfba1
1 parent d658b8d
commit b8dfba1
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 14 deletions.
diff --git a/src/control/CanvasAttribution.js b/src/control/CanvasAttribution.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Attribution from 'ol/control/attribution'
 import ol_style_Style from 'ol/style/style'
 import ol_color from 'ol/color'
@@ -67,7 +68,7 @@ ol_control_CanvasAttribution.prototype.setStyle = function (style)
  */
 ol_control_CanvasAttribution.prototype.setMap = function (map)
 {	var oldmap = this.getMap();
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_ScaleLine.prototype.setMap.call(this, map);

diff --git a/src/control/CanvasScaleLine.js b/src/control/CanvasScaleLine.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_ScaleLine from 'ol/control/scaleline'
 import ol_style_Style from 'ol/style/style'
 import ol_color from 'ol/color'
@@ -39,7 +40,7 @@ ol.inherits(ol_control_CanvasScaleLine, ol_control_ScaleLine);
  */
 ol_control_CanvasScaleLine.prototype.setMap = function (map)
 {	var oldmap = this.getMap();
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_ScaleLine.prototype.setMap.call(this, map);

diff --git a/src/control/CanvasTitle.js b/src/control/CanvasTitle.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 import ol_color from 'ol/color'
 import ol_style_Style from 'ol/style/style'
@@ -50,7 +51,7 @@ ol.inherits(ol_control_CanvasTitle, ol_control_Control);
  */
 ol_control_CanvasTitle.prototype.setMap = function (map)
 {	var oldmap = this.getMap();
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_Control.prototype.setMap.call(this, map);

diff --git a/src/control/Cloud.js b/src/control/Cloud.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 
 /** ol_control_Cloud adds an old map effect on a canvas renderer.
@@ -53,7 +54,7 @@ ol.inherits(ol_control_Cloud, ol_control_Control);
  * @api stable
  */
 ol_control_Cloud.prototype.setMap = function (map) {
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_Control.prototype.setMap.call(this, map);

diff --git a/src/control/Compass.js b/src/control/Compass.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 
 /**
@@ -58,7 +59,7 @@ ol.inherits(ol_control_Compass, ol_control_Control);
  */
 ol_control_Compass.prototype.setMap = function (map)
 {	var oldmap = this.getMap();
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_Control.prototype.setMap.call(this, map);

diff --git a/src/control/Globe.js b/src/control/Globe.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 import ol_Map from 'ol/map'
 import ol_Collection from 'ol/collection'
@@ -103,7 +104,7 @@ ol.inherits(ol_control_Globe, ol_control_Control);
  * @param {ol.Map} map The map instance.
  */
 ol_control_Globe.prototype.setMap = function(map) {
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_Control.prototype.setMap.call(this, map);

diff --git a/src/control/Graticule.js b/src/control/Graticule.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 import ol_proj_Projection from 'ol/proj/projection'
 import ol_style_Style from 'ol/style/style'
@@ -76,7 +77,7 @@ ol.inherits(ol_control_Graticule, ol_control_Control);
  */
 ol_control_Graticule.prototype.setMap = function (map) {
 	var oldmap = this.getMap();
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_Control.prototype.setMap.call(this, map);

diff --git a/src/control/GridReference.js b/src/control/GridReference.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 import ol_style_Style from 'ol/style/style'
 import ol_style_Stroke from 'ol/style/stroke'
@@ -183,7 +184,7 @@ ol_control_GridReference.prototype.getReference = function (coords)
  */
 ol_control_GridReference.prototype.setMap = function (map)
 {	var oldmap = this.getMap();
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_Control.prototype.setMap.call(this, map);

diff --git a/src/control/LayerSwitcher.js b/src/control/LayerSwitcher.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 import ol_layer_Tile from 'ol/layer/tile'
 import ol_layer_Vector from 'ol/layer/vector'
@@ -130,9 +131,9 @@ ol_control_LayerSwitcher.prototype.setMap = function(map)
 	this.drawPanel();
 
 	if (this._listener) {
-		if (this._listener) ol.Observable.unByKey(this._listener.change);
-		if (this._listener) ol.Observable.unByKey(this._listener.moveend);
-		if (this._listener) ol.Observable.unByKey(this._listener.size);
+		if (this._listener) ol_Observable.unByKey(this._listener.change);
+		if (this._listener) ol_Observable.unByKey(this._listener.moveend);
+		if (this._listener) ol_Observable.unByKey(this._listener.size);
 	}
 	this._listener = null;
 

diff --git a/src/control/Overview.js b/src/control/Overview.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 import ol_geom_Polygon from 'ol/geom/polygon'
 import ol_geom_Point from 'ol/geom/point'
@@ -191,7 +192,7 @@ ol_control_Overview.prototype.setPosition = function(align)
  * @param {ol.Map} map The map instance.
  */
 ol_control_Overview.prototype.setMap = function(map) {
-	if (this._listener) ol.Observable.unByKey(this._listener);
+	if (this._listener) ol_Observable.unByKey(this._listener);
 	this._listener = null;
 
 	ol_control_Control.prototype.setMap.call(this, map);

diff --git a/src/control/Permalink.js b/src/control/Permalink.js
@@ -4,6 +4,7 @@
 */
 
 import ol from 'ol'
+import ol_Observable from 'ol/Observable'
 import ol_control_Control from 'ol/control/control'
 import ol_proj from 'ol/proj'
 
@@ -78,8 +79,8 @@ ol.inherits(ol_control_Permalink, ol_control_Control);
  */
 ol_control_Permalink.prototype.setMap = function(map) {
 	if (this._listener) {
-		ol.Observable.unByKey(this._listener.change);
-		ol.Observable.unByKey(this._listener.moveend);
+		ol_Observable.unByKey(this._listener.change);
+		ol_Observable.unByKey(this._listener.moveend);
 	}
 	this._listener = null;