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

Use blocked scoped variables

Browse Source 
In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).
This commit is contained in:
Tim Schaub
2018-01-11 23:32:36 -07:00
parent 0bf2b04dee
commit ad62739a6e
684 changed files with 18120 additions and 18184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

152
src/ol/render/webgl/Immediate.js
View File

@@ -20,7 +20,7 @@ import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js';
* @param {number} pixelRatio Pixel ratio.
* @struct
*/
var _ol_render_webgl_Immediate_ = function(context, center, resolution, rotation, size, extent, pixelRatio) {
const _ol_render_webgl_Immediate_ = function(context, center, resolution, rotation, size, extent, pixelRatio) {
VectorContext.call(this);
/**
@@ -93,20 +93,20 @@ inherits(_ol_render_webgl_Immediate_, VectorContext);
* @private
*/
_ol_render_webgl_Immediate_.prototype.drawText_ = function(replayGroup, geometry) {
var context = this.context_;
var replay = /** @type {ol.render.webgl.TextReplay} */ (
const context = this.context_;
const replay = /** @type {ol.render.webgl.TextReplay} */ (
replayGroup.getReplay(0, ReplayType.TEXT));
replay.setTextStyle(this.textStyle_);
replay.drawText(geometry, null);
replay.finish(context);
// default colors
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
};
@@ -135,7 +135,7 @@ _ol_render_webgl_Immediate_.prototype.setStyle = function(style) {
* @api
*/
_ol_render_webgl_Immediate_.prototype.drawGeometry = function(geometry) {
var type = geometry.getType();
const type = geometry.getType();
switch (type) {
case GeometryType.POINT:
this.drawPoint(/** @type {ol.geom.Point} */ (geometry), null);
@@ -172,7 +172,7 @@ _ol_render_webgl_Immediate_.prototype.drawGeometry = function(geometry) {
* @api
*/
_ol_render_webgl_Immediate_.prototype.drawFeature = function(feature, style) {
var geometry = style.getGeometryFunction()(feature);
const geometry = style.getGeometryFunction()(feature);
if (!geometry || !intersects(this.extent_, geometry.getExtent())) {
return;
}
@@ -185,8 +185,8 @@ _ol_render_webgl_Immediate_.prototype.drawFeature = function(feature, style) {
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawGeometryCollection = function(geometry, data) {
var geometries = geometry.getGeometriesArray();
var i, ii;
const geometries = geometry.getGeometriesArray();
let i, ii;
for (i = 0, ii = geometries.length; i < ii; ++i) {
this.drawGeometry(geometries[i]);
}
@@ -197,21 +197,21 @@ _ol_render_webgl_Immediate_.prototype.drawGeometryCollection = function(geometry
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawPoint = function(geometry, data) {
var context = this.context_;
var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
var replay = /** @type {ol.render.webgl.ImageReplay} */ (
const context = this.context_;
const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
const replay = /** @type {ol.render.webgl.ImageReplay} */ (
replayGroup.getReplay(0, ReplayType.IMAGE));
replay.setImageStyle(this.imageStyle_);
replay.drawPoint(geometry, data);
replay.finish(context);
// default colors
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
if (this.textStyle_) {
@@ -224,20 +224,20 @@ _ol_render_webgl_Immediate_.prototype.drawPoint = function(geometry, data) {
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawMultiPoint = function(geometry, data) {
var context = this.context_;
var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
var replay = /** @type {ol.render.webgl.ImageReplay} */ (
const context = this.context_;
const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
const replay = /** @type {ol.render.webgl.ImageReplay} */ (
replayGroup.getReplay(0, ReplayType.IMAGE));
replay.setImageStyle(this.imageStyle_);
replay.drawMultiPoint(geometry, data);
replay.finish(context);
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
if (this.textStyle_) {
@@ -250,20 +250,20 @@ _ol_render_webgl_Immediate_.prototype.drawMultiPoint = function(geometry, data)
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawLineString = function(geometry, data) {
var context = this.context_;
var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
var replay = /** @type {ol.render.webgl.LineStringReplay} */ (
const context = this.context_;
const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
const replay = /** @type {ol.render.webgl.LineStringReplay} */ (
replayGroup.getReplay(0, ReplayType.LINE_STRING));
replay.setFillStrokeStyle(null, this.strokeStyle_);
replay.drawLineString(geometry, data);
replay.finish(context);
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
if (this.textStyle_) {
@@ -276,20 +276,20 @@ _ol_render_webgl_Immediate_.prototype.drawLineString = function(geometry, data)
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawMultiLineString = function(geometry, data) {
var context = this.context_;
var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
var replay = /** @type {ol.render.webgl.LineStringReplay} */ (
const context = this.context_;
const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
const replay = /** @type {ol.render.webgl.LineStringReplay} */ (
replayGroup.getReplay(0, ReplayType.LINE_STRING));
replay.setFillStrokeStyle(null, this.strokeStyle_);
replay.drawMultiLineString(geometry, data);
replay.finish(context);
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
if (this.textStyle_) {
@@ -302,20 +302,20 @@ _ol_render_webgl_Immediate_.prototype.drawMultiLineString = function(geometry, d
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawPolygon = function(geometry, data) {
var context = this.context_;
var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
var replay = /** @type {ol.render.webgl.PolygonReplay} */ (
const context = this.context_;
const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
const replay = /** @type {ol.render.webgl.PolygonReplay} */ (
replayGroup.getReplay(0, ReplayType.POLYGON));
replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
replay.drawPolygon(geometry, data);
replay.finish(context);
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
if (this.textStyle_) {
@@ -328,20 +328,20 @@ _ol_render_webgl_Immediate_.prototype.drawPolygon = function(geometry, data) {
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawMultiPolygon = function(geometry, data) {
var context = this.context_;
var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
var replay = /** @type {ol.render.webgl.PolygonReplay} */ (
const context = this.context_;
const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
const replay = /** @type {ol.render.webgl.PolygonReplay} */ (
replayGroup.getReplay(0, ReplayType.POLYGON));
replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
replay.drawMultiPolygon(geometry, data);
replay.finish(context);
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
if (this.textStyle_) {
@@ -354,20 +354,20 @@ _ol_render_webgl_Immediate_.prototype.drawMultiPolygon = function(geometry, data
* @inheritDoc
*/
_ol_render_webgl_Immediate_.prototype.drawCircle = function(geometry, data) {
var context = this.context_;
var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
var replay = /** @type {ol.render.webgl.CircleReplay} */ (
const context = this.context_;
const replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
const replay = /** @type {ol.render.webgl.CircleReplay} */ (
replayGroup.getReplay(0, ReplayType.CIRCLE));
replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
replay.drawCircle(geometry, data);
replay.finish(context);
var opacity = 1;
var skippedFeatures = {};
var featureCallback;
var oneByOne = false;
const opacity = 1;
const skippedFeatures = {};
let featureCallback;
const oneByOne = false;
replay.replay(this.context_, this.center_, this.resolution_, this.rotation_,
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
this.size_, this.pixelRatio_, opacity, skippedFeatures, featureCallback,
oneByOne);
replay.getDeleteResourcesFunction(context)();
if (this.textStyle_) {