Add missing semicolon
This commit is contained in:
@@ -155,7 +155,7 @@ map.on('click', function(evt) {
|
|||||||
var stroke = new ol.style.Stroke({
|
var stroke = new ol.style.Stroke({
|
||||||
color: 'rgba(255,0,0,0.9)',
|
color: 'rgba(255,0,0,0.9)',
|
||||||
width: 1
|
width: 1
|
||||||
})
|
});
|
||||||
var style = new ol.style.Style({
|
var style = new ol.style.Style({
|
||||||
stroke: stroke,
|
stroke: stroke,
|
||||||
image: new ol.style.Circle({
|
image: new ol.style.Circle({
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ var style = new ol.style.Style({
|
|||||||
fill: fill,
|
fill: fill,
|
||||||
stroke: stroke
|
stroke: stroke
|
||||||
})
|
})
|
||||||
})
|
});
|
||||||
vectorContext.setStyle(style);
|
vectorContext.setStyle(style);
|
||||||
|
|
||||||
vectorContext.drawGeometry(new ol.geom.LineString([[10, 10], [90, 90]]));
|
vectorContext.drawGeometry(new ol.geom.LineString([[10, 10], [90, 90]]));
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ ol.array.binarySearch = function(haystack, needle, opt_comparator) {
|
|||||||
|
|
||||||
/* Key not found. */
|
/* Key not found. */
|
||||||
return found ? low : ~low;
|
return found ? low : ~low;
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param {Array.<number>} arr Array.
|
* @param {Array.<number>} arr Array.
|
||||||
@@ -188,11 +188,11 @@ ol.array.flatten = function(arr) {
|
|||||||
ol.array.extend = function(arr, data) {
|
ol.array.extend = function(arr, data) {
|
||||||
var i;
|
var i;
|
||||||
var extension = goog.isArrayLike(data) ? data : [data];
|
var extension = goog.isArrayLike(data) ? data : [data];
|
||||||
var length = extension.length
|
var length = extension.length;
|
||||||
for (i = 0; i < length; i++) {
|
for (i = 0; i < length; i++) {
|
||||||
arr[arr.length] = extension[i];
|
arr[arr.length] = extension[i];
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -208,7 +208,7 @@ ol.array.remove = function(arr, obj) {
|
|||||||
arr.splice(i, 1);
|
arr.splice(i, 1);
|
||||||
}
|
}
|
||||||
return found;
|
return found;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -228,7 +228,7 @@ ol.array.find = function(arr, func) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -247,7 +247,7 @@ ol.array.equals = function(arr1, arr2) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -267,7 +267,7 @@ ol.array.stableSort = function(arr, compareFnc) {
|
|||||||
for (i = 0; i < arr.length; i++) {
|
for (i = 0; i < arr.length; i++) {
|
||||||
arr[i] = tmp[i].value;
|
arr[i] = tmp[i].value;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -282,7 +282,7 @@ ol.array.findIndex = function(arr, func) {
|
|||||||
return !func(el, idx, arr);
|
return !func(el, idx, arr);
|
||||||
});
|
});
|
||||||
return found ? index : -1;
|
return found ? index : -1;
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -300,4 +300,4 @@ ol.array.isSorted = function(arr, opt_func, opt_strict) {
|
|||||||
var res = compare(arr[index - 1], currentVal);
|
var res = compare(arr[index - 1], currentVal);
|
||||||
return !(res > 0 || opt_strict && res === 0);
|
return !(res > 0 || opt_strict && res === 0);
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ ol.control.MousePosition = function(opt_options) {
|
|||||||
var options = opt_options ? opt_options : {};
|
var options = opt_options ? opt_options : {};
|
||||||
|
|
||||||
var element = document.createElement('DIV');
|
var element = document.createElement('DIV');
|
||||||
element.className = options.className !== undefined ? options.className : 'ol-mouse-position'
|
element.className = options.className !== undefined ? options.className : 'ol-mouse-position';
|
||||||
|
|
||||||
var render = options.render ?
|
var render = options.render ?
|
||||||
options.render : ol.control.MousePosition.render;
|
options.render : ol.control.MousePosition.render;
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ ol.events.bindListener_ = function(listenerObj) {
|
|||||||
ol.events.unlistenByKey(listenerObj);
|
ol.events.unlistenByKey(listenerObj);
|
||||||
}
|
}
|
||||||
return listener.call(bindTo, evt);
|
return listener.call(bindTo, evt);
|
||||||
}
|
};
|
||||||
listenerObj.boundListener = boundListener;
|
listenerObj.boundListener = boundListener;
|
||||||
return boundListener;
|
return boundListener;
|
||||||
};
|
};
|
||||||
@@ -150,7 +150,7 @@ ol.events.removeListeners_ = function(target, type) {
|
|||||||
if (listeners) {
|
if (listeners) {
|
||||||
for (var i = 0, ii = listeners.length; i < ii; ++i) {
|
for (var i = 0, ii = listeners.length; i < ii; ++i) {
|
||||||
target.removeEventListener(type, listeners[i].boundListener);
|
target.removeEventListener(type, listeners[i].boundListener);
|
||||||
ol.object.clear(listeners[i])
|
ol.object.clear(listeners[i]);
|
||||||
}
|
}
|
||||||
listeners.length = 0;
|
listeners.length = 0;
|
||||||
var listenerMap = target[ol.events.LISTENER_MAP_PROP_];
|
var listenerMap = target[ol.events.LISTENER_MAP_PROP_];
|
||||||
|
|||||||
@@ -157,7 +157,7 @@ ol.interaction.DragAndDrop.prototype.setMap = function(map) {
|
|||||||
ol.interaction.DragAndDrop.handleStop_, this),
|
ol.interaction.DragAndDrop.handleStop_, this),
|
||||||
ol.events.listen(dropArea, ol.events.EventType.DROP,
|
ol.events.listen(dropArea, ol.events.EventType.DROP,
|
||||||
ol.interaction.DragAndDrop.handleStop_, this)
|
ol.interaction.DragAndDrop.handleStop_, this)
|
||||||
]
|
];
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -42,14 +42,14 @@ ol.interaction.KeyboardPan = function(opt_options) {
|
|||||||
this.defaultCondition_ = function(mapBrowserEvent) {
|
this.defaultCondition_ = function(mapBrowserEvent) {
|
||||||
return ol.events.condition.noModifierKeys(mapBrowserEvent) &&
|
return ol.events.condition.noModifierKeys(mapBrowserEvent) &&
|
||||||
ol.events.condition.targetNotEditable(mapBrowserEvent);
|
ol.events.condition.targetNotEditable(mapBrowserEvent);
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
* @type {ol.events.ConditionType}
|
* @type {ol.events.ConditionType}
|
||||||
*/
|
*/
|
||||||
this.condition_ = options.condition !== undefined ?
|
this.condition_ = options.condition !== undefined ?
|
||||||
options.condition : this.defaultCondition_
|
options.condition : this.defaultCondition_;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @private
|
* @private
|
||||||
|
|||||||
@@ -117,7 +117,7 @@ ol.interaction.Modify = function(options) {
|
|||||||
this.defaultDeleteCondition_ = function(mapBrowserEvent) {
|
this.defaultDeleteCondition_ = function(mapBrowserEvent) {
|
||||||
return ol.events.condition.noModifierKeys(mapBrowserEvent) &&
|
return ol.events.condition.noModifierKeys(mapBrowserEvent) &&
|
||||||
ol.events.condition.singleClick(mapBrowserEvent);
|
ol.events.condition.singleClick(mapBrowserEvent);
|
||||||
}
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @type {ol.events.ConditionType}
|
* @type {ol.events.ConditionType}
|
||||||
|
|||||||
@@ -259,7 +259,7 @@ ol.renderer.canvas.TileLayer.prototype.renderTileImages = function(context, fram
|
|||||||
drawOffsetX = (drawSize - width) / 2 / drawScale;
|
drawOffsetX = (drawSize - width) / 2 / drawScale;
|
||||||
drawOffsetY = (drawSize - height) / 2 / drawScale;
|
drawOffsetY = (drawSize - height) / 2 / drawScale;
|
||||||
pixelScale *= drawScale;
|
pixelScale *= drawScale;
|
||||||
offsetX = Math.round(drawScale * (offsetX + drawOffsetX))
|
offsetX = Math.round(drawScale * (offsetX + drawOffsetX));
|
||||||
offsetY = Math.round(drawScale * (offsetY + drawOffsetY));
|
offsetY = Math.round(drawScale * (offsetY + drawOffsetY));
|
||||||
}
|
}
|
||||||
// for performance reasons, context.save / context.restore is not used
|
// for performance reasons, context.save / context.restore is not used
|
||||||
|
|||||||
@@ -445,4 +445,4 @@ ol.renderer.canvas.VectorTileLayer.prototype.renderTileImage_ = function(
|
|||||||
replayState.replayGroup.replay(tileContext, pixelRatio,
|
replayState.replayGroup.replay(tileContext, pixelRatio,
|
||||||
tileTransform, 0, frameState.skippedFeatureUids || {}, replays);
|
tileTransform, 0, frameState.skippedFeatureUids || {}, replays);
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ ol.reproj.browserAntialiasesClip_ = (function(winNav, winChrome) {
|
|||||||
isOpera == false && // Not Opera
|
isOpera == false && // Not Opera
|
||||||
isIEedge == false // Not Edge
|
isIEedge == false // Not Edge
|
||||||
);
|
);
|
||||||
})(goog.global.navigator, goog.global.chrome)
|
})(goog.global.navigator, goog.global.chrome);
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -148,7 +148,7 @@ ol.source.CartoDB.prototype.handleInitResponse_ = function(paramHash, event) {
|
|||||||
*/
|
*/
|
||||||
ol.source.CartoDB.prototype.handleInitError_ = function(event) {
|
ol.source.CartoDB.prototype.handleInitError_ = function(event) {
|
||||||
this.setState(ol.source.State.ERROR);
|
this.setState(ol.source.State.ERROR);
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -99,7 +99,7 @@ ol.source.Source.toAttributionsArray_ = function(attributionLike) {
|
|||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ ol.style.AtlasManager.prototype.add = function(id, width, height,
|
|||||||
// the hit-detection atlas, to make sure that the offset is the same for
|
// the hit-detection atlas, to make sure that the offset is the same for
|
||||||
// the original image and the hit-detection image.
|
// the original image and the hit-detection image.
|
||||||
var renderHitCallback = opt_renderHitCallback !== undefined ?
|
var renderHitCallback = opt_renderHitCallback !== undefined ?
|
||||||
opt_renderHitCallback : ol.nullFunction
|
opt_renderHitCallback : ol.nullFunction;
|
||||||
|
|
||||||
/** @type {?ol.style.AtlasInfo} */
|
/** @type {?ol.style.AtlasInfo} */
|
||||||
var hitInfo = this.add_(true,
|
var hitInfo = this.add_(true,
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ ol.uri.appendParams = function(uri, params) {
|
|||||||
return k + '=' + encodeURIComponent(params[k]);
|
return k + '=' + encodeURIComponent(params[k]);
|
||||||
}).join('&');
|
}).join('&');
|
||||||
// remove any trailing ? or &
|
// remove any trailing ? or &
|
||||||
uri = uri.replace(/[?&]$/, '')
|
uri = uri.replace(/[?&]$/, '');
|
||||||
// append ? or & depending on whether uri has existing parameters
|
// append ? or & depending on whether uri has existing parameters
|
||||||
uri = uri.indexOf('?') === -1 ? uri + '?' : uri + '&'
|
uri = uri.indexOf('?') === -1 ? uri + '?' : uri + '&';
|
||||||
return uri + qs;
|
return uri + qs;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
goog.provide('ol.test.control.ScaleLine');
|
goog.provide('ol.test.control.ScaleLine');
|
||||||
|
|
||||||
describe('ol.control.ScaleLine', function() {
|
describe('ol.control.ScaleLine', function() {
|
||||||
var mapDiv
|
var mapDiv;
|
||||||
var map;
|
var map;
|
||||||
beforeEach(function() {
|
beforeEach(function() {
|
||||||
mapDiv = document.createElement('div');
|
mapDiv = document.createElement('div');
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ describe('ol.dom', function() {
|
|||||||
|
|
||||||
// revert mock-ups
|
// revert mock-ups
|
||||||
goog.userAgent.IE = originalIsIE;
|
goog.userAgent.IE = originalIsIE;
|
||||||
goog.userAgent.isVersionOrHigher = originalIsVersionOrHigher
|
goog.userAgent.isVersionOrHigher = originalIsVersionOrHigher;
|
||||||
});
|
});
|
||||||
|
|
||||||
it('sets transform origin *only* for IE 9', function() {
|
it('sets transform origin *only* for IE 9', function() {
|
||||||
@@ -201,7 +201,7 @@ describe('ol.dom', function() {
|
|||||||
};
|
};
|
||||||
ol.dom.canUseCssTransform = function() {
|
ol.dom.canUseCssTransform = function() {
|
||||||
return true;
|
return true;
|
||||||
}
|
};
|
||||||
|
|
||||||
// test
|
// test
|
||||||
ol.dom.transformElement2D(element, transform);
|
ol.dom.transformElement2D(element, transform);
|
||||||
@@ -224,7 +224,7 @@ describe('ol.dom', function() {
|
|||||||
};
|
};
|
||||||
ol.dom.canUseCssTransform = function() {
|
ol.dom.canUseCssTransform = function() {
|
||||||
return true;
|
return true;
|
||||||
}
|
};
|
||||||
|
|
||||||
// test
|
// test
|
||||||
ol.dom.transformElement2D(element, transformFloat, 2);
|
ol.dom.transformElement2D(element, transformFloat, 2);
|
||||||
@@ -245,7 +245,7 @@ describe('ol.dom', function() {
|
|||||||
};
|
};
|
||||||
ol.dom.canUseCssTransform = function() {
|
ol.dom.canUseCssTransform = function() {
|
||||||
return false;
|
return false;
|
||||||
}
|
};
|
||||||
|
|
||||||
// test
|
// test
|
||||||
ol.dom.transformElement2D(element, transform);
|
ol.dom.transformElement2D(element, transform);
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ describe('ol.events', function() {
|
|||||||
listenerObj.listener = function() {
|
listenerObj.listener = function() {
|
||||||
expect(this).to.equal(bindTo);
|
expect(this).to.equal(bindTo);
|
||||||
expect(unlistenSpy.firstCall.args[0]).to.eql(listenerObj);
|
expect(unlistenSpy.firstCall.args[0]).to.eql(listenerObj);
|
||||||
}
|
};
|
||||||
var boundListener = ol.events.bindListener_(listenerObj);
|
var boundListener = ol.events.bindListener_(listenerObj);
|
||||||
expect(listenerObj.boundListener).to.equal(boundListener);
|
expect(listenerObj.boundListener).to.equal(boundListener);
|
||||||
boundListener();
|
boundListener();
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ describe('ol.ImageTile', function() {
|
|||||||
var tileLoadFunction = ol.source.Image.defaultImageLoadFunction;
|
var tileLoadFunction = ol.source.Image.defaultImageLoadFunction;
|
||||||
var tile = new ol.ImageTile(tileCoord, state, src, null, tileLoadFunction);
|
var tile = new ol.ImageTile(tileCoord, state, src, null, tileLoadFunction);
|
||||||
|
|
||||||
var previousState = tile.getState()
|
var previousState = tile.getState();
|
||||||
|
|
||||||
ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) {
|
ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) {
|
||||||
var state = tile.getState();
|
var state = tile.getState();
|
||||||
@@ -36,7 +36,7 @@ describe('ol.ImageTile', function() {
|
|||||||
var tileLoadFunction = ol.source.Image.defaultImageLoadFunction;
|
var tileLoadFunction = ol.source.Image.defaultImageLoadFunction;
|
||||||
var tile = new ol.ImageTile(tileCoord, state, src, null, tileLoadFunction);
|
var tile = new ol.ImageTile(tileCoord, state, src, null, tileLoadFunction);
|
||||||
|
|
||||||
var previousState = tile.getState()
|
var previousState = tile.getState();
|
||||||
|
|
||||||
ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) {
|
ol.events.listen(tile, ol.events.EventType.CHANGE, function(event) {
|
||||||
var state = tile.getState();
|
var state = tile.getState();
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ describe('ol.interaction.DragAndDrop', function() {
|
|||||||
return viewport;
|
return viewport;
|
||||||
},
|
},
|
||||||
getView: function() {
|
getView: function() {
|
||||||
return new ol.View()
|
return new ol.View();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
interaction = new ol.interaction.DragAndDrop({
|
interaction = new ol.interaction.DragAndDrop({
|
||||||
@@ -100,7 +100,7 @@ describe('ol.interaction.DragAndDrop', function() {
|
|||||||
features: [{type: 'Feature', id: '1'}]
|
features: [{type: 'Feature', id: '1'}]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
};
|
||||||
viewport.dispatchEvent(event);
|
viewport.dispatchEvent(event);
|
||||||
expect(event.dataTransfer.dropEffect).to.be('copy');
|
expect(event.dataTransfer.dropEffect).to.be('copy');
|
||||||
expect(event.propagationStopped).to.be(true);
|
expect(event.propagationStopped).to.be(true);
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ describe('ol.layer.VectorTile', function() {
|
|||||||
|
|
||||||
it('provides default renderMode', function() {
|
it('provides default renderMode', function() {
|
||||||
expect(layer.getRenderMode()).to.be('hybrid');
|
expect(layer.getRenderMode()).to.be('hybrid');
|
||||||
})
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ describe('ol.render.Box', function() {
|
|||||||
expect(obj).to.be.a(ol.render.Box);
|
expect(obj).to.be.a(ol.render.Box);
|
||||||
expect(obj).to.be.a(ol.Disposable);
|
expect(obj).to.be.a(ol.Disposable);
|
||||||
obj.dispose();
|
obj.dispose();
|
||||||
})
|
});
|
||||||
it('creates an absolutely positioned DIV with a className', function() {
|
it('creates an absolutely positioned DIV with a className', function() {
|
||||||
expect(box.element_).to.be.a(HTMLDivElement);
|
expect(box.element_).to.be.a(HTMLDivElement);
|
||||||
expect(box.element_.style.position).to.be('absolute');
|
expect(box.element_.style.position).to.be('absolute');
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ describe('ol.render.canvas.Immediate', function() {
|
|||||||
if (instruction.args) {
|
if (instruction.args) {
|
||||||
parts.push('args: [' + instruction.args.map(function(arg) {
|
parts.push('args: [' + instruction.args.map(function(arg) {
|
||||||
if (typeof arg === 'number') {
|
if (typeof arg === 'number') {
|
||||||
return arg.toFixed(9)
|
return arg.toFixed(9);
|
||||||
} else {
|
} else {
|
||||||
return arg;
|
return arg;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ describe('ol.renderer.canvas.Layer', function() {
|
|||||||
};
|
};
|
||||||
renderer.getImageTransform = function() {
|
renderer.getImageTransform = function() {
|
||||||
return goog.vec.Mat4.createNumberIdentity();
|
return goog.vec.Mat4.createNumberIdentity();
|
||||||
}
|
};
|
||||||
ol.renderer.Map.prototype.calculateMatrices2D(frameState);
|
ol.renderer.Map.prototype.calculateMatrices2D(frameState);
|
||||||
var layerState = layer.getLayerState();
|
var layerState = layer.getLayerState();
|
||||||
var context = {
|
var context = {
|
||||||
@@ -41,7 +41,7 @@ describe('ol.renderer.canvas.Layer', function() {
|
|||||||
lineTo: sinon.spy(),
|
lineTo: sinon.spy(),
|
||||||
clip: sinon.spy(),
|
clip: sinon.spy(),
|
||||||
drawImage: sinon.spy()
|
drawImage: sinon.spy()
|
||||||
}
|
};
|
||||||
renderer.composeFrame(frameState, layerState, context);
|
renderer.composeFrame(frameState, layerState, context);
|
||||||
expect(context.save.callCount).to.be(1);
|
expect(context.save.callCount).to.be(1);
|
||||||
expect(context.translate.callCount).to.be(0);
|
expect(context.translate.callCount).to.be(0);
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
|
|||||||
var tile;
|
var tile;
|
||||||
tileCallback = function(t) {
|
tileCallback = function(t) {
|
||||||
tile = t;
|
tile = t;
|
||||||
}
|
};
|
||||||
map.renderSync();
|
map.renderSync();
|
||||||
expect(tile.getProjection()).to.equal(ol.proj.get('EPSG:3857'));
|
expect(tile.getProjection()).to.equal(ol.proj.get('EPSG:3857'));
|
||||||
expect(feature1.getGeometry().getCoordinates()).to.eql(
|
expect(feature1.getGeometry().getCoordinates()).to.eql(
|
||||||
@@ -124,7 +124,7 @@ describe('ol.renderer.canvas.VectorTileLayer', function() {
|
|||||||
tileCallback = function(t) {
|
tileCallback = function(t) {
|
||||||
t.setProjection(proj);
|
t.setProjection(proj);
|
||||||
tile = t;
|
tile = t;
|
||||||
}
|
};
|
||||||
map.renderSync();
|
map.renderSync();
|
||||||
expect(tile.getProjection()).to.equal(proj);
|
expect(tile.getProjection()).to.equal(proj);
|
||||||
expect(feature1.getGeometry().getCoordinates()).to.eql([1, -1]);
|
expect(feature1.getGeometry().getCoordinates()).to.eql([1, -1]);
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ describe('ol.source.Cluster', function() {
|
|||||||
expect(source.getFeatures().length).to.be(1);
|
expect(source.getFeatures().length).to.be(1);
|
||||||
expect(source.getFeatures()[0].get('features').length).to.be(2);
|
expect(source.getFeatures()[0].get('features').length).to.be(2);
|
||||||
});
|
});
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
goog.require('ol.Feature');
|
goog.require('ol.Feature');
|
||||||
|
|||||||
@@ -149,7 +149,7 @@ describe('ol.source.Source', function() {
|
|||||||
});
|
});
|
||||||
it('accepts an array with a string and an ol.Attribution', function() {
|
it('accepts an array with a string and an ol.Attribution', function() {
|
||||||
var attribution = new ol.Attribution({html: 'Dumpty'});
|
var attribution = new ol.Attribution({html: 'Dumpty'});
|
||||||
source.setAttributions(['Humpty', attribution])
|
source.setAttributions(['Humpty', attribution]);
|
||||||
var attributions = source.getAttributions();
|
var attributions = source.getAttributions();
|
||||||
expect(attributions).to.not.be(null);
|
expect(attributions).to.not.be(null);
|
||||||
expect(attributions).to.have.length(2);
|
expect(attributions).to.have.length(2);
|
||||||
|
|||||||
@@ -95,7 +95,7 @@ describe('ol.source.TileUTFGrid', function() {
|
|||||||
// locally available tileJson (from `before`)
|
// locally available tileJson (from `before`)
|
||||||
source.handleTileJSONResponse(tileJson);
|
source.handleTileJSONResponse(tileJson);
|
||||||
|
|
||||||
var tileGrid = source.getTileGrid()
|
var tileGrid = source.getTileGrid();
|
||||||
expect(tileGrid).to.not.be(null);
|
expect(tileGrid).to.not.be(null);
|
||||||
expect(tileGrid).to.be.an(ol.tilegrid.TileGrid);
|
expect(tileGrid).to.be.an(ol.tilegrid.TileGrid);
|
||||||
});
|
});
|
||||||
@@ -142,7 +142,7 @@ describe('ol.source.TileUTFGrid', function() {
|
|||||||
var tileGrid = source.getTileGrid();
|
var tileGrid = source.getTileGrid();
|
||||||
var maxZoom = tileGrid.getMaxZoom();
|
var maxZoom = tileGrid.getMaxZoom();
|
||||||
expect(maxZoom).to.eql(tileJson.maxzoom);
|
expect(maxZoom).to.eql(tileJson.maxzoom);
|
||||||
})
|
});
|
||||||
|
|
||||||
it('sets up a template', function() {
|
it('sets up a template', function() {
|
||||||
var source = getTileUTFGrid();
|
var source = getTileUTFGrid();
|
||||||
@@ -169,9 +169,9 @@ describe('ol.source.TileUTFGrid', function() {
|
|||||||
expect(attributions).to.not.be(null);
|
expect(attributions).to.not.be(null);
|
||||||
expect(attributions).to.have.length(1);
|
expect(attributions).to.have.length(1);
|
||||||
expect(attributions[0].getHTML()).to.be(tileJson.attribution);
|
expect(attributions[0].getHTML()).to.be(tileJson.attribution);
|
||||||
var tileRanges = attributions[0].tileRanges_
|
var tileRanges = attributions[0].tileRanges_;
|
||||||
for (var z = tileJson.minzoom; z <= tileJson.maxzoom; z++) {
|
for (var z = tileJson.minzoom; z <= tileJson.maxzoom; z++) {
|
||||||
var key = z.toString()
|
var key = z.toString();
|
||||||
expect(key in tileRanges).to.be(true);
|
expect(key in tileRanges).to.be(true);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -207,7 +207,7 @@ describe('ol.source.TileUTFGrid', function() {
|
|||||||
done();
|
done();
|
||||||
});
|
});
|
||||||
client.addEventListener('error', function() {
|
client.addEventListener('error', function() {
|
||||||
done(new Error('Failed to fetch local grid.json'))
|
done(new Error('Failed to fetch local grid.json'));
|
||||||
});
|
});
|
||||||
client.open('GET', 'spec/ol/data/mapbox-geography-class-1-1-0.grid.json');
|
client.open('GET', 'spec/ol/data/mapbox-geography-class-1-1-0.grid.json');
|
||||||
client.send();
|
client.send();
|
||||||
|
|||||||
@@ -190,7 +190,7 @@ describe('ol.source.Zoomify', function() {
|
|||||||
|
|
||||||
it('returns expected tileClass instances via "getTile"', function() {
|
it('returns expected tileClass instances via "getTile"', function() {
|
||||||
var source = getZoomifySource();
|
var source = getZoomifySource();
|
||||||
var tile = source.getTile(0, 0, -1, 1, proj)
|
var tile = source.getTile(0, 0, -1, 1, proj);
|
||||||
expect(tile).to.be.an(ol.source.ZoomifyTile_);
|
expect(tile).to.be.an(ol.source.ZoomifyTile_);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ describe('ol.structs.PriorityQueue', function() {
|
|||||||
|
|
||||||
var identity = function(a) {
|
var identity = function(a) {
|
||||||
return a;
|
return a;
|
||||||
}
|
};
|
||||||
|
|
||||||
describe('when empty', function() {
|
describe('when empty', function() {
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ goog.require('ol.style.IconOrigin');
|
|||||||
describe('ol.style.Icon', function() {
|
describe('ol.style.Icon', function() {
|
||||||
var size = [36, 48];
|
var size = [36, 48];
|
||||||
var src = 'data:image/gif;base64,' +
|
var src = 'data:image/gif;base64,' +
|
||||||
'R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs='
|
'R0lGODlhAQABAIAAAP///wAAACwAAAAAAQABAAACAkQBADs=';
|
||||||
|
|
||||||
describe('constructor', function() {
|
describe('constructor', function() {
|
||||||
|
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ describe('ol.rendering.layer.Tile', function() {
|
|||||||
e.vectorContext.drawPoint(new ol.geom.Point(
|
e.vectorContext.drawPoint(new ol.geom.Point(
|
||||||
ol.proj.transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
|
ol.proj.transform([-123, 38], 'EPSG:4326', 'EPSG:3857')));
|
||||||
});
|
});
|
||||||
}
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
afterEach(function() {
|
afterEach(function() {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ describe('ol.rendering.layer.Vector', function() {
|
|||||||
[center[0] - r, center[1] + r],
|
[center[0] - r, center[1] + r],
|
||||||
[center[0] - r, center[1] - r]
|
[center[0] - r, center[1] - r]
|
||||||
]
|
]
|
||||||
])))
|
])));
|
||||||
}
|
}
|
||||||
|
|
||||||
describe('vector layer', function() {
|
describe('vector layer', function() {
|
||||||
@@ -61,7 +61,7 @@ describe('ol.rendering.layer.Vector', function() {
|
|||||||
map.once('postrender', function() {
|
map.once('postrender', function() {
|
||||||
expectResemble(map, 'spec/ol/layer/expected/vector-canvas.png',
|
expectResemble(map, 'spec/ol/layer/expected/vector-canvas.png',
|
||||||
17, done);
|
17, done);
|
||||||
})
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user