Add projection argument when loading features

openlayers · Mar 12, 2014 · 52523fc · 52523fc
1 parent eec1727
commit 52523fc
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc
@@ -892,7 +892,7 @@
  * @typedef {Object} olx.source.RemoteVectorOptions
  * @property {Array.<ol.Attribution>|undefined} attributions Attributions.
  * @property {ol.Extent|undefined} extent Extent.
- * @property {function(ol.Extent, number): string} extentUrlFunction Extent URL function.
+ * @property {function(ol.Extent, number, ol.proj.Projection): string} extentUrlFunction Extent URL function.
  * @property {Object.<string, string>|undefined} headers Headers.
  * @property {ol.format.Feature} format Format.
  * @property {function(ol.Extent, number): Array.<ol.Extent>} loadingFunction Loading function.

diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js
@@ -213,12 +213,14 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
   }
 
   var frameStateExtent = frameState.extent;
-  var frameStateResolution = frameState.view2DState.resolution;
+  var view2DState = frameState.view2DState;
+  var projection = view2DState.projection;
+  var resolution = view2DState.resolution;
   var pixelRatio = frameState.pixelRatio;
   var vectorLayerRevision = vectorLayer.getRevision();
 
   if (!this.dirty_ &&
-      this.renderedResolution_ == frameStateResolution &&
+      this.renderedResolution_ == resolution &&
       this.renderedRevision_ == vectorLayerRevision &&
       ol.extent.containsExtent(this.renderedExtent_, frameStateExtent)) {
     return;
@@ -242,22 +244,21 @@ ol.renderer.canvas.VectorLayer.prototype.prepareFrame =
   if (!goog.isDef(styleFunction)) {
     styleFunction = ol.feature.defaultStyleFunction;
   }
-  var tolerance = frameStateResolution / (2 * pixelRatio);
+  var tolerance = resolution / (2 * pixelRatio);
   var replayGroup = new ol.render.canvas.ReplayGroup(tolerance, extent);
-  vectorSource.loadFeatures(extent, frameStateResolution);
+  vectorSource.loadFeatures(extent, resolution, projection);
   vectorSource.forEachFeatureInExtent(extent,
       /**
        * @param {ol.Feature} feature Feature.
        */
       function(feature) {
-        var dirty =
-            this.renderFeature(feature, frameStateResolution, pixelRatio,
-                styleFunction, replayGroup);
+        var dirty = this.renderFeature(
+            feature, resolution, pixelRatio, styleFunction, replayGroup);
         this.dirty_ = this.dirty_ || dirty;
       }, this);
   replayGroup.finish();
 
-  this.renderedResolution_ = frameStateResolution;
+  this.renderedResolution_ = resolution;
   this.renderedRevision_ = vectorLayerRevision;
   this.replayGroup_ = replayGroup;
 

diff --git a/src/ol/source/remotevectorsource.js b/src/ol/source/remotevectorsource.js
@@ -38,7 +38,7 @@ ol.source.RemoteVector = function(options) {
 
   /**
    * @private
-   * @type {function(ol.Extent, number): string}
+   * @type {function(ol.Extent, number, ol.proj.Projection): string}
    */
   this.extentUrlFunction_ = options.extentUrlFunction;
 
@@ -74,7 +74,8 @@ ol.source.RemoteVector.prototype.addFeaturesInternal = function(features) {
 /**
  * @inheritDoc
  */
-ol.source.RemoteVector.prototype.loadFeatures = function(extent, resolution) {
+ol.source.RemoteVector.prototype.loadFeatures =
+    function(extent, resolution, projection) {
   var loadedExtents = this.loadedExtents_;
   var extentsToLoad = this.loadingFunction_(extent, resolution);
   var i, ii;
@@ -89,7 +90,7 @@ ol.source.RemoteVector.prototype.loadFeatures = function(extent, resolution) {
           return ol.extent.containsExtent(object.extent, extentToLoad);
         });
     if (!alreadyLoaded) {
-      var url = this.extentUrlFunction_(extentToLoad, resolution);
+      var url = this.extentUrlFunction_(extentToLoad, resolution, projection);
       this.loadFeaturesFromURL(url);
       loadedExtents.insert(extentToLoad, {extent: extentToLoad.slice()});
     }

diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js
@@ -13,6 +13,7 @@ goog.require('goog.events.Event');
 goog.require('goog.events.EventType');
 goog.require('goog.object');
 goog.require('ol.ObjectEventType');
+goog.require('ol.proj');
 goog.require('ol.source.Source');
 goog.require('ol.structs.RBush');
 
@@ -329,6 +330,7 @@ ol.source.Vector.prototype.isEmpty = function() {
 /**
  * @param {ol.Extent} extent Extent.
  * @param {number} resolution Resolution.
+ * @param {ol.proj.Projection} projection Projection.
  */
 ol.source.Vector.prototype.loadFeatures = goog.nullFunction;