Rename ol.render.IRender to ol.render.IVectorContext

externs/oli.js

@@ -96,8 +96,8 @@ oli.render.Event.prototype.frameState;
 oli.render.Event.prototype.glContext;
 
 
-/** @type {ol.render.IRender|undefined} */
+/** @type {ol.render.IVectorContext|undefined} */
-oli.render.Event.prototype.render;
+oli.render.Event.prototype.vectorContext;
 
 
 

src/ol/featureoverlay.js

@@ -145,13 +145,13 @@ ol.FeatureOverlay.prototype.handleMapPostCompose_ = function(event) {
     return;
   }
   var resolution = event.frameState.view2DState.resolution;
-  var render = event.render;
+  var vectorContext = event.vectorContext;
   var i, ii, feature, styles;
   this.features_.forEach(function(feature) {
     styles = this.styleFunction_(feature, resolution);
     ii = styles.length;
     for (i = 0; i < ii; ++i) {
-      render.drawFeature(feature, styles[i]);
+      vectorContext.drawFeature(feature, styles[i]);
     }
   }, this);
 };

src/ol/render/box.js

@@ -100,7 +100,7 @@ ol.render.Box.prototype.handleMapPostCompose_ = function(event) {
   var style = this.style_;
   goog.asserts.assert(!goog.isNull(style));
   // use drawAsync(Infinity) to draw above everything
-  event.render.drawAsync(Infinity, function(render) {
+  event.vectorContext.drawAsync(Infinity, function(render) {
     render.setFillStrokeStyle(style.getFill(), style.getStroke());
     render.drawPolygonGeometry(geometry, null);
   });

src/ol/render/canvas/canvasimmediate.js

@@ -11,7 +11,7 @@ goog.require('goog.vec.Mat4');
 goog.require('ol.color');
 goog.require('ol.extent');
 goog.require('ol.geom.flat');
-goog.require('ol.render.IRender');
+goog.require('ol.render.IVectorContext');
 goog.require('ol.render.canvas');
 goog.require('ol.vec.Mat4');
 
@@ -19,7 +19,7 @@ goog.require('ol.vec.Mat4');
 
 /**
  * @constructor
- * @implements {ol.render.IRender}
+ * @implements {ol.render.IVectorContext}
  * @param {CanvasRenderingContext2D} context Context.
  * @param {number} pixelRatio Pixel ratio.
  * @param {ol.Extent} extent Extent.

src/ol/render/canvas/canvasreplay.js

@@ -15,8 +15,8 @@ goog.require('ol.color');
 goog.require('ol.extent');
 goog.require('ol.geom.flat');
 goog.require('ol.geom.simplify');
-goog.require('ol.render.IRender');
 goog.require('ol.render.IReplayGroup');
+goog.require('ol.render.IVectorContext');
 goog.require('ol.render.canvas');
 goog.require('ol.vec.Mat4');
 
@@ -44,7 +44,7 @@ ol.render.canvas.Instruction = {
 
 /**
  * @constructor
- * @implements {ol.render.IRender}
+ * @implements {ol.render.IVectorContext}
  * @param {number} tolerance Tolerance.
  * @protected
  * @struct

src/ol/render/ireplay.js

@@ -1,7 +1,7 @@
 goog.provide('ol.render.IReplayGroup');
 
 goog.require('goog.functions');
-goog.require('ol.render.IRender');
+goog.require('ol.render.IVectorContext');
 
 
 /**
@@ -45,7 +45,7 @@ ol.render.IReplayGroup.prototype.finish = function() {
 /**
  * @param {number|undefined} zIndex Z index.
  * @param {ol.render.ReplayType} replayType Replay type.
- * @return {ol.render.IRender} Replay.
+ * @return {ol.render.IVectorContext} Replay.
  */
 ol.render.IReplayGroup.prototype.getReplay = function(zIndex, replayType) {
 };

src/ol/render/ivectorcontext.js

@@ -1,13 +1,13 @@
 // FIXME remove trailing "Geometry" in method names
 
-goog.provide('ol.render.IRender');
+goog.provide('ol.render.IVectorContext');
 
 
 
 /**
  * @interface
  */
-ol.render.IRender = function() {
+ol.render.IVectorContext = function() {
 };
 
 
@@ -15,7 +15,7 @@ ol.render.IRender = function() {
  * @param {number} zIndex Z index.
  * @param {function(ol.render.canvas.Immediate)} callback Callback.
  */
-ol.render.IRender.prototype.drawAsync = function(zIndex, callback) {
+ol.render.IVectorContext.prototype.drawAsync = function(zIndex, callback) {
 };
 
 
@@ -23,7 +23,7 @@ ol.render.IRender.prototype.drawAsync = function(zIndex, callback) {
  * @param {ol.geom.Circle} circleGeometry Circle geometry.
  * @param {Object} data Opaque data object,
  */
-ol.render.IRender.prototype.drawCircleGeometry =
+ol.render.IVectorContext.prototype.drawCircleGeometry =
     function(circleGeometry, data) {
 };
 
@@ -32,7 +32,7 @@ ol.render.IRender.prototype.drawCircleGeometry =
  * @param {ol.Feature} feature Feature.
  * @param {ol.style.Style} style Style.
  */
-ol.render.IRender.prototype.drawFeature = function(feature, style) {
+ol.render.IVectorContext.prototype.drawFeature = function(feature, style) {
 };
 
 
@@ -41,7 +41,7 @@ ol.render.IRender.prototype.drawFeature = function(feature, style) {
  *     collection.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawGeometryCollectionGeometry =
+ol.render.IVectorContext.prototype.drawGeometryCollectionGeometry =
     function(geometryCollectionGeometry, data) {
 };
 
@@ -50,7 +50,8 @@ ol.render.IRender.prototype.drawGeometryCollectionGeometry =
  * @param {ol.geom.Point} pointGeometry Point geometry.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawPointGeometry = function(pointGeometry, data) {
+ol.render.IVectorContext.prototype.drawPointGeometry =
+    function(pointGeometry, data) {
 };
 
 
@@ -58,7 +59,7 @@ ol.render.IRender.prototype.drawPointGeometry = function(pointGeometry, data) {
  * @param {ol.geom.LineString} lineStringGeometry Line string geometry.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawLineStringGeometry =
+ol.render.IVectorContext.prototype.drawLineStringGeometry =
     function(lineStringGeometry, data) {
 };
 
@@ -68,7 +69,7 @@ ol.render.IRender.prototype.drawLineStringGeometry =
  *     MultiLineString geometry.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawMultiLineStringGeometry =
+ol.render.IVectorContext.prototype.drawMultiLineStringGeometry =
     function(multiLineStringGeometry, data) {
 };
 
@@ -77,7 +78,7 @@ ol.render.IRender.prototype.drawMultiLineStringGeometry =
  * @param {ol.geom.MultiPoint} multiPointGeometry MultiPoint geometry.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawMultiPointGeometry =
+ol.render.IVectorContext.prototype.drawMultiPointGeometry =
     function(multiPointGeometry, data) {
 };
 
@@ -86,7 +87,7 @@ ol.render.IRender.prototype.drawMultiPointGeometry =
  * @param {ol.geom.MultiPolygon} multiPolygonGeometry MultiPolygon geometry.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawMultiPolygonGeometry =
+ol.render.IVectorContext.prototype.drawMultiPolygonGeometry =
     function(multiPolygonGeometry, data) {
 };
 
@@ -95,7 +96,7 @@ ol.render.IRender.prototype.drawMultiPolygonGeometry =
  * @param {ol.geom.Polygon} polygonGeometry Polygon geometry.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawPolygonGeometry =
+ol.render.IVectorContext.prototype.drawPolygonGeometry =
     function(polygonGeometry, data) {
 };
 
@@ -108,7 +109,7 @@ ol.render.IRender.prototype.drawPolygonGeometry =
  * @param {ol.geom.Geometry} geometry Geometry.
  * @param {Object} data Opaque data object.
  */
-ol.render.IRender.prototype.drawText =
+ol.render.IVectorContext.prototype.drawText =
     function(flatCoordinates, offset, end, stride, geometry, data) {
 };
 
@@ -117,7 +118,7 @@ ol.render.IRender.prototype.drawText =
  * @param {ol.style.Fill} fillStyle Fill style.
  * @param {ol.style.Stroke} strokeStyle Stroke style.
  */
-ol.render.IRender.prototype.setFillStrokeStyle =
+ol.render.IVectorContext.prototype.setFillStrokeStyle =
     function(fillStyle, strokeStyle) {
 };
 
@@ -125,12 +126,12 @@ ol.render.IRender.prototype.setFillStrokeStyle =
 /**
  * @param {ol.style.Image} imageStyle Image style.
  */
-ol.render.IRender.prototype.setImageStyle = function(imageStyle) {
+ol.render.IVectorContext.prototype.setImageStyle = function(imageStyle) {
 };
 
 
 /**
  * @param {ol.style.Text} textStyle Text style.
  */
-ol.render.IRender.prototype.setTextStyle = function(textStyle) {
+ol.render.IVectorContext.prototype.setTextStyle = function(textStyle) {
 };

src/ol/render/renderevent.js

@@ -2,7 +2,7 @@ goog.provide('ol.render.Event');
 goog.provide('ol.render.EventType');
 
 goog.require('goog.events.Event');
-goog.require('ol.render.IRender');
+goog.require('ol.render.IVectorContext');
 
 
 /**
@@ -21,21 +21,21 @@ ol.render.EventType = {
  * @implements {oli.render.Event}
  * @param {ol.render.EventType} type Type.
  * @param {Object=} opt_target Target.
- * @param {ol.render.IRender=} opt_render Render.
+ * @param {ol.render.IVectorContext=} opt_vectorContext Vector context.
  * @param {ol.FrameState=} opt_frameState Frame state.
  * @param {?CanvasRenderingContext2D=} opt_context Context.
  * @param {?ol.webgl.Context=} opt_glContext WebGL Context.
  */
 ol.render.Event = function(
-    type, opt_target, opt_render, opt_frameState, opt_context,
+    type, opt_target, opt_vectorContext, opt_frameState, opt_context,
     opt_glContext) {
 
   goog.base(this, type, opt_target);
 
   /**
-   * @type {ol.render.IRender|undefined}
+   * @type {ol.render.IVectorContext|undefined}
    */
-  this.render = opt_render;
+  this.vectorContext = opt_vectorContext;
 
   /**
    * @type {ol.FrameState|undefined}

src/ol/render/webgl/webglimmediate.js

@@ -4,7 +4,7 @@ goog.provide('ol.render.webgl.Immediate');
 
 /**
  * @constructor
- * @implements {ol.render.IRender}
+ * @implements {ol.render.IVectorContext}
  * @param {ol.webgl.Context} context Context.
  * @param {number} pixelRatio Pixel ratio.
  * @struct