Move render intent enum to feature

src/ol/feature.js

@@ -1,6 +1,7 @@
 goog.provide('ol.Feature');
 goog.provide('ol.FeatureEvent');
 goog.provide('ol.FeatureEventType');
+goog.provide('ol.FeatureRenderIntent');
 
 goog.require('goog.events');
 goog.require('goog.events.Event');
@@ -8,7 +9,6 @@ goog.require('goog.events.EventType');
 goog.require('ol.Object');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryEvent');
-goog.require('ol.layer.VectorLayerRenderIntent');
 
 
 
@@ -51,10 +51,10 @@ ol.Feature = function(opt_values) {
 
   /**
    * The render intent for this feature.
-   * @type {ol.layer.VectorLayerRenderIntent|string}
+   * @type {ol.FeatureRenderIntent|string}
    * @private
    */
-  this.renderIntent_ = ol.layer.VectorLayerRenderIntent.DEFAULT;
+  this.renderIntent_ = ol.FeatureRenderIntent.DEFAULT;
 
   /**
    * @type {Array.<ol.style.Symbolizer>}
@@ -247,6 +247,18 @@ ol.Feature.prototype.setSymbolizers = function(symbolizers) {
 ol.Feature.DEFAULT_GEOMETRY = 'geometry';
 
 
+/**
+ * @enum {string}
+ */
+ol.FeatureRenderIntent = {
+  DEFAULT: 'default',
+  FUTURE: 'future',
+  HIDDEN: 'hidden',
+  SELECTED: 'selected',
+  TEMPORARY: 'temporary'
+};
+
+
 /**
  * @enum {string}
  */

src/ol/interaction/drawinteraction.js

@@ -4,6 +4,7 @@ goog.require('goog.asserts');
 
 goog.require('ol.Coordinate');
 goog.require('ol.Feature');
+goog.require('ol.FeatureRenderIntent');
 goog.require('ol.Map');
 goog.require('ol.MapBrowserEvent');
 goog.require('ol.MapBrowserEvent.EventType');
@@ -16,7 +17,6 @@ goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
 goog.require('ol.interaction.Interaction');
 goog.require('ol.layer.Vector');
-goog.require('ol.layer.VectorLayerRenderIntent');
 goog.require('ol.source.Vector');
 
 
@@ -233,7 +233,7 @@ ol.interaction.Draw.prototype.startDrawing_ = function(event) {
   var start = event.getCoordinate();
   this.finishCoordinate_ = start;
   var sketchFeature = new ol.Feature();
-  sketchFeature.setRenderIntent(ol.layer.VectorLayerRenderIntent.SELECTED);
+  sketchFeature.setRenderIntent(ol.FeatureRenderIntent.SELECTED);
   var features = [sketchFeature];
   var geometry;
   if (this.mode_ === ol.interaction.DrawMode.POINT) {
@@ -242,7 +242,7 @@ ol.interaction.Draw.prototype.startDrawing_ = function(event) {
     var sketchPoint = new ol.Feature({
       geom: new ol.geom.Point(start.slice())
     });
-    sketchPoint.setRenderIntent(ol.layer.VectorLayerRenderIntent.TEMPORARY);
+    sketchPoint.setRenderIntent(ol.FeatureRenderIntent.TEMPORARY);
     this.sketchPoint_ = sketchPoint;
     features.push(sketchPoint);
 
@@ -325,7 +325,7 @@ ol.interaction.Draw.prototype.addToDrawing_ = function(event) {
 ol.interaction.Draw.prototype.finishDrawing_ = function(event) {
   var sketchFeature = this.abortDrawing_();
   goog.asserts.assert(!goog.isNull(sketchFeature));
-  sketchFeature.setRenderIntent(ol.layer.VectorLayerRenderIntent.DEFAULT);
+  sketchFeature.setRenderIntent(ol.FeatureRenderIntent.DEFAULT);
   var geometry = sketchFeature.getGeometry();
   var coordinates = geometry.getCoordinates();
   if (this.mode_ === ol.interaction.DrawMode.LINESTRING) {

src/ol/interaction/modifyinteraction.js

@@ -6,6 +6,7 @@ goog.require('goog.events');
 goog.require('goog.functions');
 goog.require('ol.CollectionEventType');
 goog.require('ol.Feature');
+goog.require('ol.FeatureRenderIntent');
 goog.require('ol.MapBrowserEvent.EventType');
 goog.require('ol.ViewHint');
 goog.require('ol.coordinate');
@@ -18,7 +19,6 @@ goog.require('ol.geom.Polygon');
 goog.require('ol.interaction.Drag');
 goog.require('ol.layer.Layer');
 goog.require('ol.layer.Vector');
-goog.require('ol.layer.VectorLayerRenderIntent');
 goog.require('ol.source.Vector');
 goog.require('ol.source.VectorEventType');
 goog.require('ol.structs.RBush');
@@ -273,7 +273,7 @@ ol.interaction.Modify.prototype.handleIntentChange_ = function(evt) {
   for (var i = 0, ii = features.length; i < ii; ++i) {
     var feature = features[i];
     var renderIntent = feature.getRenderIntent();
-    if (renderIntent == ol.layer.VectorLayerRenderIntent.SELECTED) {
+    if (renderIntent == ol.FeatureRenderIntent.SELECTED) {
       this.addIndex_([feature], layer);
     } else {
       this.removeIndex_([feature]);
@@ -356,7 +356,7 @@ ol.interaction.Modify.prototype.handleDragStart = function(evt) {
   this.dragSegments_ = [];
   var vertexFeature = this.vertexFeature_;
   if (!goog.isNull(vertexFeature) && vertexFeature.getRenderIntent() !=
-      ol.layer.VectorLayerRenderIntent.HIDDEN) {
+      ol.FeatureRenderIntent.HIDDEN) {
     var renderIntent = vertexFeature.getRenderIntent();
     var insertVertices = [];
     var vertex = vertexFeature.getGeometry().getCoordinates();
@@ -375,7 +375,7 @@ ol.interaction.Modify.prototype.handleDragStart = function(evt) {
         original.setSymbolizers(feature.getSymbolizers());
         feature.setOriginal(original);
       }
-      if (renderIntent == ol.layer.VectorLayerRenderIntent.TEMPORARY) {
+      if (renderIntent == ol.FeatureRenderIntent.TEMPORARY) {
         if (ol.coordinate.equals(segment[0], vertex)) {
           dragSegments.push([node, 0]);
         } else if (ol.coordinate.equals(segment[1], vertex)) {
@@ -470,7 +470,7 @@ ol.interaction.Modify.prototype.handleMouseMove_ = function(evt) {
   var vertexFeature = this.vertexFeature_;
   var rBush = this.rBush_;
   var nodes = rBush.getAllInExtent(box);
-  var renderIntent = ol.layer.VectorLayerRenderIntent.HIDDEN;
+  var renderIntent = ol.FeatureRenderIntent.HIDDEN;
   if (nodes.length > 0) {
     nodes.sort(sortByDistance);
     var node = nodes[0];
@@ -484,10 +484,10 @@ ol.interaction.Modify.prototype.handleMouseMove_ = function(evt) {
       var squaredDist1 = ol.coordinate.squaredDistance(vertexPixel, pixel1);
       var squaredDist2 = ol.coordinate.squaredDistance(vertexPixel, pixel2);
       var dist = Math.sqrt(Math.min(squaredDist1, squaredDist2));
-      renderIntent = ol.layer.VectorLayerRenderIntent.FUTURE;
+      renderIntent = ol.FeatureRenderIntent.FUTURE;
       if (dist <= 10) {
         vertex = squaredDist1 > squaredDist2 ? segment[1] : segment[0];
-        renderIntent = ol.layer.VectorLayerRenderIntent.TEMPORARY;
+        renderIntent = ol.FeatureRenderIntent.TEMPORARY;
       }
       vertexFeature = this.createOrUpdateVertexFeature_(node.style, vertex);
       this.modifiable_ = true;

src/ol/interaction/selectinteraction.js

@@ -3,11 +3,11 @@ goog.provide('ol.interaction.Select');
 goog.require('goog.array');
 goog.require('goog.asserts');
 goog.require('ol.Feature');
+goog.require('ol.FeatureRenderIntent');
 goog.require('ol.events.ConditionType');
 goog.require('ol.events.condition');
 goog.require('ol.interaction.Interaction');
 goog.require('ol.layer.Vector');
-goog.require('ol.layer.VectorLayerRenderIntent');
 
 
 
@@ -102,16 +102,16 @@ ol.interaction.Select.prototype.select =
     if (clear) {
       for (var j = selectedFeatures.length - 1; j >= 0; --j) {
         selectedFeatures[j].setRenderIntent(
-            ol.layer.VectorLayerRenderIntent.DEFAULT);
+            ol.FeatureRenderIntent.DEFAULT);
       }
     }
     for (var j = featuresToSelect.length - 1; j >= 0; --j) {
       var feature = featuresToSelect[j];
       // TODO: Make toggle configurable
       feature.setRenderIntent(feature.getRenderIntent() ==
-          ol.layer.VectorLayerRenderIntent.SELECTED ?
+          ol.FeatureRenderIntent.SELECTED ?
-              ol.layer.VectorLayerRenderIntent.DEFAULT :
+              ol.FeatureRenderIntent.DEFAULT :
-              ol.layer.VectorLayerRenderIntent.SELECTED);
+              ol.FeatureRenderIntent.SELECTED);
     }
     // TODO: Dispatch an event with selectedFeatures and unselectedFeatures
   }

src/ol/layer/vectorlayer.js

@@ -3,8 +3,8 @@ goog.provide('ol.layer.Vector');
 goog.require('goog.array');
 goog.require('goog.object');
 goog.require('ol.Feature');
+goog.require('ol.FeatureRenderIntent');
 goog.require('ol.layer.Layer');
-goog.require('ol.layer.VectorLayerRenderIntent');
 goog.require('ol.source.Vector');
 goog.require('ol.source.VectorEventType');
 goog.require('ol.style');
@@ -120,5 +120,5 @@ ol.layer.Vector.uidTransformFeatureInfo = function(features) {
  * @return {boolean} Whether the feature is selected.
  */
 ol.layer.Vector.selectedFeaturesFilter = function(feature) {
-  return feature.getRenderIntent() == ol.layer.VectorLayerRenderIntent.SELECTED;
+  return feature.getRenderIntent() == ol.FeatureRenderIntent.SELECTED;
 };

src/ol/layer/vectorlayerrenderintent.js

@@ -1,13 +0,0 @@
-goog.provide('ol.layer.VectorLayerRenderIntent');
-
-
-/**
- * @enum {string}
- */
-ol.layer.VectorLayerRenderIntent = {
-  DEFAULT: 'default',
-  FUTURE: 'future',
-  HIDDEN: 'hidden',
-  SELECTED: 'selected',
-  TEMPORARY: 'temporary'
-};

src/ol/renderer/canvas/canvasvectorlayerrenderer.js

@@ -6,6 +6,7 @@ goog.require('goog.dom.TagName');
 goog.require('goog.events');
 goog.require('goog.object');
 goog.require('goog.vec.Mat4');
+goog.require('ol.FeatureRenderIntent');
 goog.require('ol.Pixel');
 goog.require('ol.TileCache');
 goog.require('ol.TileCoord');
@@ -14,7 +15,6 @@ goog.require('ol.ViewHint');
 goog.require('ol.extent');
 goog.require('ol.geom.GeometryType');
 goog.require('ol.layer.Vector');
-goog.require('ol.layer.VectorLayerRenderIntent');
 goog.require('ol.renderer.canvas.Layer');
 goog.require('ol.renderer.canvas.Vector');
 goog.require('ol.source.VectorEventType');
@@ -277,7 +277,7 @@ ol.renderer.canvas.VectorLayer.prototype.getFeaturesForPixel =
     for (var id in candidates) {
       candidate = candidates[id];
       if (candidate.getRenderIntent() ==
-          ol.layer.VectorLayerRenderIntent.HIDDEN) {
+          ol.FeatureRenderIntent.HIDDEN) {
         continue;
       }
       geom = candidate.getGeometry();

src/ol/renderer/canvas/canvasvectorrenderer.js

@@ -8,6 +8,7 @@ goog.require('goog.events');
 goog.require('goog.events.EventType');
 goog.require('goog.vec.Mat4');
 goog.require('ol.Feature');
+goog.require('ol.FeatureRenderIntent');
 goog.require('ol.geom.AbstractCollection');
 goog.require('ol.geom.Geometry');
 goog.require('ol.geom.GeometryType');
@@ -17,7 +18,6 @@ goog.require('ol.geom.MultiPoint');
 goog.require('ol.geom.MultiPolygon');
 goog.require('ol.geom.Point');
 goog.require('ol.geom.Polygon');
-goog.require('ol.layer.VectorLayerRenderIntent');
 goog.require('ol.style.IconLiteral');
 goog.require('ol.style.LineLiteral');
 goog.require('ol.style.Literal');
@@ -160,7 +160,7 @@ ol.renderer.canvas.Vector.prototype.renderLineStringFeatures_ =
   context.beginPath();
   for (i = 0, ii = features.length; i < ii; ++i) {
     feature = features[i];
-    if (feature.getRenderIntent() == ol.layer.VectorLayerRenderIntent.HIDDEN) {
+    if (feature.getRenderIntent() == ol.FeatureRenderIntent.HIDDEN) {
       continue;
     }
     id = goog.getUid(feature);
@@ -249,7 +249,7 @@ ol.renderer.canvas.Vector.prototype.renderPointFeatures_ =
   context.globalAlpha = alpha;
   for (i = 0, ii = features.length; i < ii; ++i) {
     feature = features[i];
-    if (feature.getRenderIntent() == ol.layer.VectorLayerRenderIntent.HIDDEN) {
+    if (feature.getRenderIntent() == ol.FeatureRenderIntent.HIDDEN) {
       continue;
     }
     id = goog.getUid(feature);
@@ -325,7 +325,7 @@ ol.renderer.canvas.Vector.prototype.renderText_ =
 
   for (var i = 0, ii = features.length; i < ii; ++i) {
     feature = features[i];
-    if (feature.getRenderIntent() == ol.layer.VectorLayerRenderIntent.HIDDEN) {
+    if (feature.getRenderIntent() == ol.FeatureRenderIntent.HIDDEN) {
       continue;
     }
     vecs = ol.renderer.canvas.Vector.getLabelVectors(
@@ -393,7 +393,7 @@ ol.renderer.canvas.Vector.prototype.renderPolygonFeatures_ =
   context.beginPath();
   for (i = 0, ii = features.length; i < ii; ++i) {
     feature = features[i];
-    if (feature.getRenderIntent() == ol.layer.VectorLayerRenderIntent.HIDDEN) {
+    if (feature.getRenderIntent() == ol.FeatureRenderIntent.HIDDEN) {
       continue;
     }
     geometry = feature.getGeometry();