Rename _ol_render_ReplayType_ to ReplayType

2017-12-18 16:39:07 +01:00
parent dc70c4376d
commit 11f1c693a8
5 changed files with 41 additions and 55 deletions
--- a/src/ol/render/canvas/ReplayGroup.js
+++ b/src/ol/render/canvas/ReplayGroup.js
@@ -8,7 +8,7 @@ import {buffer, createEmpty, extendCoordinate} from '../../extent.js';
 import _ol_geom_flat_transform_ from '../../geom/flat/transform.js';
 import _ol_obj_ from '../../obj.js';
 import _ol_render_ReplayGroup_ from '../ReplayGroup.js';
-import _ol_render_ReplayType_ from '../ReplayType.js';
+import ReplayType from '../ReplayType.js';
 import _ol_render_canvas_Replay_ from '../canvas/Replay.js';
 import _ol_render_canvas_ImageReplay_ from '../canvas/ImageReplay.js';
 import _ol_render_canvas_LineStringReplay_ from '../canvas/LineStringReplay.js';
@@ -440,7 +440,7 @@ _ol_render_canvas_ReplayGroup_.prototype.replay = function(context,
      replay = replays[replayType];
      if (replay !== undefined) {
        if (opt_declutterReplays &&
-            (replayType == _ol_render_ReplayType_.IMAGE || replayType == _ol_render_ReplayType_.TEXT)) {
+            (replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) {
          var declutter = opt_declutterReplays[zIndexKey];
          if (!declutter) {
            opt_declutterReplays[zIndexKey] = [replay, transform.slice(0)];
@@ -490,7 +490,7 @@ _ol_render_canvas_ReplayGroup_.prototype.replayHitDetection_ = function(
      replay = replays[replayType];
      if (replay !== undefined) {
        if (opt_declutterReplays &&
-            (replayType == _ol_render_ReplayType_.IMAGE || replayType == _ol_render_ReplayType_.TEXT)) {
+            (replayType == ReplayType.IMAGE || replayType == ReplayType.TEXT)) {
          var declutter = opt_declutterReplays[zIndexKey];
          if (!declutter) {
            opt_declutterReplays[zIndexKey] = [replay, transform.slice(0)];
--- a/src/ol/render/replay.js
+++ b/src/ol/render/replay.js
@@ -1,7 +1,7 @@
 /**
 * @module ol/render/replay
 */
-import _ol_render_ReplayType_ from '../render/ReplayType.js';
+import ReplayType from '../render/ReplayType.js';
 var _ol_render_replay_ = {};


@@ -10,12 +10,12 @@ var _ol_render_replay_ = {};
 * @type {Array.<ol.render.ReplayType>}
 */
 _ol_render_replay_.ORDER = [
-  _ol_render_ReplayType_.POLYGON,
-  _ol_render_ReplayType_.CIRCLE,
-  _ol_render_ReplayType_.LINE_STRING,
-  _ol_render_ReplayType_.IMAGE,
-  _ol_render_ReplayType_.TEXT,
-  _ol_render_ReplayType_.DEFAULT
+  ReplayType.POLYGON,
+  ReplayType.CIRCLE,
+  ReplayType.LINE_STRING,
+  ReplayType.IMAGE,
+  ReplayType.TEXT,
+  ReplayType.DEFAULT
 ];

 /**
--- a/src/ol/render/webgl/Immediate.js
+++ b/src/ol/render/webgl/Immediate.js
@@ -4,7 +4,7 @@
 import {inherits} from '../../index.js';
 import {intersects} from '../../extent.js';
 import GeometryType from '../../geom/GeometryType.js';
-import _ol_render_ReplayType_ from '../ReplayType.js';
+import ReplayType from '../ReplayType.js';
 import _ol_render_VectorContext_ from '../VectorContext.js';
 import _ol_render_webgl_ReplayGroup_ from '../webgl/ReplayGroup.js';

@@ -95,7 +95,7 @@ inherits(_ol_render_webgl_Immediate_, _ol_render_VectorContext_);
 _ol_render_webgl_Immediate_.prototype.drawText_ = function(replayGroup, geometry) {
  var context = this.context_;
  var replay = /** @type {ol.render.webgl.TextReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.TEXT));
+    replayGroup.getReplay(0, ReplayType.TEXT));
  replay.setTextStyle(this.textStyle_);
  replay.drawText(geometry, null);
  replay.finish(context);
@@ -200,7 +200,7 @@ _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} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.IMAGE));
+    replayGroup.getReplay(0, ReplayType.IMAGE));
  replay.setImageStyle(this.imageStyle_);
  replay.drawPoint(geometry, data);
  replay.finish(context);
@@ -227,7 +227,7 @@ _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} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.IMAGE));
+    replayGroup.getReplay(0, ReplayType.IMAGE));
  replay.setImageStyle(this.imageStyle_);
  replay.drawMultiPoint(geometry, data);
  replay.finish(context);
@@ -253,7 +253,7 @@ _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} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.LINE_STRING));
+    replayGroup.getReplay(0, ReplayType.LINE_STRING));
  replay.setFillStrokeStyle(null, this.strokeStyle_);
  replay.drawLineString(geometry, data);
  replay.finish(context);
@@ -279,7 +279,7 @@ _ol_render_webgl_Immediate_.prototype.drawMultiLineString = function(geometry, d
  var context = this.context_;
  var replayGroup = new _ol_render_webgl_ReplayGroup_(1, this.extent_);
  var replay = /** @type {ol.render.webgl.LineStringReplay} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.LINE_STRING));
+    replayGroup.getReplay(0, ReplayType.LINE_STRING));
  replay.setFillStrokeStyle(null, this.strokeStyle_);
  replay.drawMultiLineString(geometry, data);
  replay.finish(context);
@@ -305,7 +305,7 @@ _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} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.POLYGON));
+    replayGroup.getReplay(0, ReplayType.POLYGON));
  replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
  replay.drawPolygon(geometry, data);
  replay.finish(context);
@@ -331,7 +331,7 @@ _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} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.POLYGON));
+    replayGroup.getReplay(0, ReplayType.POLYGON));
  replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
  replay.drawMultiPolygon(geometry, data);
  replay.finish(context);
@@ -357,7 +357,7 @@ _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} */ (
-    replayGroup.getReplay(0, _ol_render_ReplayType_.CIRCLE));
+    replayGroup.getReplay(0, ReplayType.CIRCLE));
  replay.setFillStrokeStyle(this.fillStyle_, this.strokeStyle_);
  replay.drawCircle(geometry, data);
  replay.finish(context);
--- a/src/ol/renderer/canvas/VectorTileLayer.js
+++ b/src/ol/renderer/canvas/VectorTileLayer.js
@@ -12,7 +12,7 @@ import {buffer, containsCoordinate, equals, getIntersection, getTopLeft, interse
 import _ol_layer_VectorTileRenderType_ from '../../layer/VectorTileRenderType.js';
 import {equivalent as equivalentProjection} from '../../proj.js';
 import _ol_proj_Units_ from '../../proj/Units.js';
-import _ol_render_ReplayType_ from '../../render/ReplayType.js';
+import ReplayType from '../../render/ReplayType.js';
 import _ol_render_canvas_ from '../../render/canvas.js';
 import _ol_render_canvas_ReplayGroup_ from '../../render/canvas/ReplayGroup.js';
 import _ol_render_replay_ from '../../render/replay.js';
@@ -98,9 +98,9 @@ _ol_renderer_canvas_VectorTileLayer_['create'] = function(mapRenderer, layer) {
 * @type {!Object.<string, Array.<ol.render.ReplayType>>}
 */
 _ol_renderer_canvas_VectorTileLayer_.IMAGE_REPLAYS = {
-  'image': [_ol_render_ReplayType_.POLYGON, _ol_render_ReplayType_.CIRCLE,
-    _ol_render_ReplayType_.LINE_STRING, _ol_render_ReplayType_.IMAGE, _ol_render_ReplayType_.TEXT],
-  'hybrid': [_ol_render_ReplayType_.POLYGON, _ol_render_ReplayType_.LINE_STRING]
+  'image': [ReplayType.POLYGON, ReplayType.CIRCLE,
+    ReplayType.LINE_STRING, ReplayType.IMAGE, ReplayType.TEXT],
+  'hybrid': [ReplayType.POLYGON, ReplayType.LINE_STRING]
 };


@@ -109,8 +109,8 @@ _ol_renderer_canvas_VectorTileLayer_.IMAGE_REPLAYS = {
 * @type {!Object.<string, Array.<ol.render.ReplayType>>}
 */
 _ol_renderer_canvas_VectorTileLayer_.VECTOR_REPLAYS = {
-  'image': [_ol_render_ReplayType_.DEFAULT],
-  'hybrid': [_ol_render_ReplayType_.IMAGE, _ol_render_ReplayType_.TEXT, _ol_render_ReplayType_.DEFAULT],
+  'image': [ReplayType.DEFAULT],
+  'hybrid': [ReplayType.IMAGE, ReplayType.TEXT, ReplayType.DEFAULT],
  'vector': _ol_render_replay_.ORDER
 };

--- a/src/ol/renderer/vector.js
+++ b/src/ol/renderer/vector.js
@@ -4,7 +4,7 @@
 import {getUid} from '../index.js';
 import ImageState from '../ImageState.js';
 import GeometryType from '../geom/GeometryType.js';
-import _ol_render_ReplayType_ from '../render/ReplayType.js';
+import ReplayType from '../render/ReplayType.js';
 var _ol_renderer_vector_ = {};


@@ -56,15 +56,13 @@ _ol_renderer_vector_.renderCircleGeometry_ = function(replayGroup, geometry, sty
  var fillStyle = style.getFill();
  var strokeStyle = style.getStroke();
  if (fillStyle || strokeStyle) {
-    var circleReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.CIRCLE);
+    var circleReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.CIRCLE);
    circleReplay.setFillStrokeStyle(fillStyle, strokeStyle);
    circleReplay.drawCircle(geometry, feature);
  }
  var textStyle = style.getText();
  if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
    textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
    textReplay.drawText(geometry, feature);
  }
@@ -146,7 +144,7 @@ _ol_renderer_vector_.renderGeometry_ = function(replayGroup, geometry, style, fe
    }
    return;
  }
-  var replay = replayGroup.getReplay(style.getZIndex(), _ol_render_ReplayType_.DEFAULT);
+  var replay = replayGroup.getReplay(style.getZIndex(), ReplayType.DEFAULT);
  replay.drawCustom(/** @type {ol.geom.SimpleGeometry} */ (geometry), feature, style.getRenderer());
 };

@@ -179,15 +177,13 @@ _ol_renderer_vector_.renderGeometryCollectionGeometry_ = function(replayGroup, g
 _ol_renderer_vector_.renderLineStringGeometry_ = function(replayGroup, geometry, style, feature) {
  var strokeStyle = style.getStroke();
  if (strokeStyle) {
-    var lineStringReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.LINE_STRING);
+    var lineStringReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.LINE_STRING);
    lineStringReplay.setFillStrokeStyle(null, strokeStyle);
    lineStringReplay.drawLineString(geometry, feature);
  }
  var textStyle = style.getText();
  if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
    textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
    textReplay.drawText(geometry, feature);
  }
@@ -204,15 +200,13 @@ _ol_renderer_vector_.renderLineStringGeometry_ = function(replayGroup, geometry,
 _ol_renderer_vector_.renderMultiLineStringGeometry_ = function(replayGroup, geometry, style, feature) {
  var strokeStyle = style.getStroke();
  if (strokeStyle) {
-    var lineStringReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.LINE_STRING);
+    var lineStringReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.LINE_STRING);
    lineStringReplay.setFillStrokeStyle(null, strokeStyle);
    lineStringReplay.drawMultiLineString(geometry, feature);
  }
  var textStyle = style.getText();
  if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
    textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
    textReplay.drawText(geometry, feature);
  }
@@ -230,15 +224,13 @@ _ol_renderer_vector_.renderMultiPolygonGeometry_ = function(replayGroup, geometr
  var fillStyle = style.getFill();
  var strokeStyle = style.getStroke();
  if (strokeStyle || fillStyle) {
-    var polygonReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.POLYGON);
+    var polygonReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.POLYGON);
    polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
    polygonReplay.drawMultiPolygon(geometry, feature);
  }
  var textStyle = style.getText();
  if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
    textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
    textReplay.drawText(geometry, feature);
  }
@@ -258,15 +250,13 @@ _ol_renderer_vector_.renderPointGeometry_ = function(replayGroup, geometry, styl
    if (imageStyle.getImageState() != ImageState.LOADED) {
      return;
    }
-    var imageReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.IMAGE);
+    var imageReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.IMAGE);
    imageReplay.setImageStyle(imageStyle, replayGroup.addDeclutter(false));
    imageReplay.drawPoint(geometry, feature);
  }
  var textStyle = style.getText();
  if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
    textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(!!imageStyle));
    textReplay.drawText(geometry, feature);
  }
@@ -286,15 +276,13 @@ _ol_renderer_vector_.renderMultiPointGeometry_ = function(replayGroup, geometry,
    if (imageStyle.getImageState() != ImageState.LOADED) {
      return;
    }
-    var imageReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.IMAGE);
+    var imageReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.IMAGE);
    imageReplay.setImageStyle(imageStyle, replayGroup.addDeclutter(false));
    imageReplay.drawMultiPoint(geometry, feature);
  }
  var textStyle = style.getText();
  if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
    textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(!!imageStyle));
    textReplay.drawText(geometry, feature);
  }
@@ -312,15 +300,13 @@ _ol_renderer_vector_.renderPolygonGeometry_ = function(replayGroup, geometry, st
  var fillStyle = style.getFill();
  var strokeStyle = style.getStroke();
  if (fillStyle || strokeStyle) {
-    var polygonReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.POLYGON);
+    var polygonReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.POLYGON);
    polygonReplay.setFillStrokeStyle(fillStyle, strokeStyle);
    polygonReplay.drawPolygon(geometry, feature);
  }
  var textStyle = style.getText();
  if (textStyle) {
-    var textReplay = replayGroup.getReplay(
-        style.getZIndex(), _ol_render_ReplayType_.TEXT);
+    var textReplay = replayGroup.getReplay(style.getZIndex(), ReplayType.TEXT);
    textReplay.setTextStyle(textStyle, replayGroup.addDeclutter(false));
    textReplay.drawText(geometry, feature);
  }