ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Named exports from ol/events

Browse Source
This commit is contained in:
Tim Schaub
2018-01-24 10:09:57 -07:00
parent 1786bbbe80
commit 7e7631c42a
74 changed files with 437 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ol/reproj/Image.js
View File

@@ -5,7 +5,7 @@ import {ERROR_THRESHOLD} from './common.js';
import {inherits} from '../index.js';
import _ol_ImageBase_ from '../ImageBase.js';
import ImageState from '../ImageState.js';
import _ol_events_ from '../events.js';
import {listen, unlistenByKey} from '../events.js';
import EventType from '../events/EventType.js';
import {getCenter, getIntersection, getHeight, getWidth} from '../extent.js';
import _ol_reproj_ from '../reproj.js';
@@ -172,7 +172,7 @@ ReprojImage.prototype.load = function() {
if (sourceState == ImageState.LOADED || sourceState == ImageState.ERROR) {
this.reproject_();
} else {
this.sourceListenerKey_ = _ol_events_.listen(this.sourceImage_,
this.sourceListenerKey_ = listen(this.sourceImage_,
EventType.CHANGE, function(e) {
const sourceState = this.sourceImage_.getState();
if (sourceState == ImageState.LOADED || sourceState == ImageState.ERROR) {
@@ -190,7 +190,7 @@ ReprojImage.prototype.load = function() {
* @private
*/
ReprojImage.prototype.unlistenSource_ = function() {
_ol_events_.unlistenByKey(/** @type {!ol.EventsKey} */ (this.sourceListenerKey_));
unlistenByKey(/** @type {!ol.EventsKey} */ (this.sourceListenerKey_));
this.sourceListenerKey_ = null;
};
export default ReprojImage;

8
src/ol/reproj/Tile.js
View File

@@ -5,7 +5,7 @@ import {ERROR_THRESHOLD} from './common.js';
import {inherits} from '../index.js';
import Tile from '../Tile.js';
import TileState from '../TileState.js';
import _ol_events_ from '../events.js';
import {listen, unlistenByKey} from '../events.js';
import EventType from '../events/EventType.js';
import {getArea, getCenter, getIntersection} from '../extent.js';
import {clamp} from '../math.js';
@@ -264,13 +264,13 @@ ReprojTile.prototype.load = function() {
if (state == TileState.IDLE || state == TileState.LOADING) {
leftToLoad++;
const sourceListenKey = _ol_events_.listen(tile, EventType.CHANGE,
const sourceListenKey = listen(tile, EventType.CHANGE,
function(e) {
const state = tile.getState();
if (state == TileState.LOADED ||
state == TileState.ERROR ||
state == TileState.EMPTY) {
_ol_events_.unlistenByKey(sourceListenKey);
unlistenByKey(sourceListenKey);
leftToLoad--;
if (leftToLoad === 0) {
this.unlistenSources_();
@@ -300,7 +300,7 @@ ReprojTile.prototype.load = function() {
* @private
*/
ReprojTile.prototype.unlistenSources_ = function() {
this.sourcesListenerKeys_.forEach(_ol_events_.unlistenByKey);
this.sourcesListenerKeys_.forEach(unlistenByKey);
this.sourcesListenerKeys_ = null;
};
export default ReprojTile;