From 8cc4ae8dbd29ad0506c9299a8deb009aa8b82d87 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Mon, 18 Nov 2013 17:54:04 -0700 Subject: [PATCH] Separate load requests from feature requests This separates the action of requesting an extent to be loaded from the action of requesting cached features. The renderer (or any other consumer of a vector source) calls load to request a data extent. A `featureload` event fires when new features are loaded. The renderer (or any other consumer) separately asks for cached features given an extent. This vector source only loads features once, but this separation will also work with sources that make multiple requests for data in different extents. This also removes the `data` option from the vector source in favor of a `features` option. Since we no longer have shared data structures for geometries, people can manually create features and pass them to a vector source. The `addFeatures` method is exported as well. This is used to add features to a source that don't have a representation on the "remote" (or server). --- examples/draw-features.js | 2 +- examples/icon.js | 29 +- examples/style-rules.js | 161 ++++------- src/objectliterals.jsdoc | 11 +- src/ol/interaction/drawinteraction.js | 2 +- src/ol/interaction/modifyinteraction.js | 2 +- .../canvas/canvasvectorlayerrenderer.js | 16 +- src/ol/source/vectorsource.exports | 1 + src/ol/source/vectorsource.js | 251 +++++++++--------- test/spec/ol/source/vectorsource.test.js | 65 ----- 10 files changed, 214 insertions(+), 326 deletions(-) diff --git a/examples/draw-features.js b/examples/draw-features.js index 637035f756..1d48f6d9b4 100644 --- a/examples/draw-features.js +++ b/examples/draw-features.js @@ -18,7 +18,7 @@ var raster = new ol.layer.Tile({ }); var vector = new ol.layer.Vector({ - source: new ol.source.Vector({parser: null}), + source: new ol.source.Vector(), style: new ol.style.Style({ rules: [ new ol.style.Rule({ diff --git a/examples/icon.js b/examples/icon.js index 07ef45ce88..d41c2f5517 100644 --- a/examples/icon.js +++ b/examples/icon.js @@ -1,11 +1,12 @@ +goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.Overlay'); goog.require('ol.OverlayPositioning'); goog.require('ol.RendererHint'); goog.require('ol.View2D'); +goog.require('ol.geom.Point'); goog.require('ol.layer.Tile'); goog.require('ol.layer.Vector'); -goog.require('ol.parser.GeoJSON'); goog.require('ol.source.TileJSON'); goog.require('ol.source.Vector'); goog.require('ol.style.Icon'); @@ -18,22 +19,6 @@ var raster = new ol.layer.Tile({ }) }); -var data = { - type: 'FeatureCollection', - features: [{ - type: 'Feature', - properties: { - name: 'Null Island', - population: 4000, - rainfall: 500 - }, - geometry: { - type: 'Point', - coordinates: [0, 0] - } - }] -}; - var style = new ol.style.Style({ symbolizers: [ new ol.style.Icon({ @@ -45,8 +30,14 @@ var style = new ol.style.Style({ var vector = new ol.layer.Vector({ source: new ol.source.Vector({ - parser: new ol.parser.GeoJSON(), - data: data + features: [ + new ol.Feature({ + name: 'Null Island', + population: 4000, + rainfall: 500, + geometry: new ol.geom.Point([0, 0]) + }) + ] }), style: style }); diff --git a/examples/style-rules.js b/examples/style-rules.js index c730704afc..c78bcb207f 100644 --- a/examples/style-rules.js +++ b/examples/style-rules.js @@ -1,11 +1,12 @@ +goog.require('ol.Feature'); goog.require('ol.Map'); goog.require('ol.RendererHint'); goog.require('ol.View2D'); goog.require('ol.control'); goog.require('ol.expr'); +goog.require('ol.geom.LineString'); +goog.require('ol.geom.Point'); goog.require('ol.layer.Vector'); -goog.require('ol.parser.GeoJSON'); -goog.require('ol.proj'); goog.require('ol.source.Vector'); goog.require('ol.style.Fill'); goog.require('ol.style.Rule'); @@ -62,108 +63,60 @@ var style = new ol.style.Style({rules: [ var vector = new ol.layer.Vector({ style: style, source: new ol.source.Vector({ - data: { - 'type': 'FeatureCollection', - 'features': [{ - 'type': 'Feature', - 'properties': { - 'color': '#BADA55', - 'where': 'inner' - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [[-10000000, -10000000], [10000000, 10000000]] - } - }, { - 'type': 'Feature', - 'properties': { - 'color': '#BADA55', - 'where': 'inner' - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [[-10000000, 10000000], [10000000, -10000000]] - } - }, { - 'type': 'Feature', - 'properties': { - 'color': '#013', - 'where': 'outer' - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [[-10000000, -10000000], [-10000000, 10000000]] - } - }, { - 'type': 'Feature', - 'properties': { - 'color': '#013', - 'where': 'outer' - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [[-10000000, 10000000], [10000000, 10000000]] - } - }, { - 'type': 'Feature', - 'properties': { - 'color': '#013', - 'where': 'outer' - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [[10000000, 10000000], [10000000, -10000000]] - } - }, { - 'type': 'Feature', - 'properties': { - 'color': '#013', - 'where': 'outer' - }, - 'geometry': { - 'type': 'LineString', - 'coordinates': [[10000000, -10000000], [-10000000, -10000000]] - } - }, { - 'type': 'Feature', - 'properties': { - 'label': 'South' - }, - 'geometry': { - 'type': 'Point', - 'coordinates': [0, -6000000] - } - }, { - 'type': 'Feature', - 'properties': { - 'label': 'West' - }, - 'geometry': { - 'type': 'Point', - 'coordinates': [-6000000, 0] - } - }, { - 'type': 'Feature', - 'properties': { - 'label': 'North' - }, - 'geometry': { - 'type': 'Point', - 'coordinates': [0, 6000000] - } - }, { - 'type': 'Feature', - 'properties': { - 'label': 'East' - }, - 'geometry': { - 'type': 'Point', - 'coordinates': [6000000, 0] - } - }] - }, - parser: new ol.parser.GeoJSON(), - projection: ol.proj.get('EPSG:3857') + features: [ + new ol.Feature({ + color: '#BADA55', + where: 'inner', + geometry: new ol.geom.LineString( + [[-10000000, -10000000], [10000000, 10000000]]) + }), + new ol.Feature({ + color: '#BADA55', + where: 'inner', + geometry: new ol.geom.LineString( + [[-10000000, 10000000], [10000000, -10000000]]) + }), + new ol.Feature({ + color: '#013', + where: 'outer', + geometry: new ol.geom.LineString( + [[-10000000, -10000000], [-10000000, 10000000]]) + }), + new ol.Feature({ + color: '#013', + where: 'outer', + geometry: new ol.geom.LineString( + [[-10000000, 10000000], [10000000, 10000000]]) + }), + new ol.Feature({ + color: '#013', + where: 'outer', + geometry: new ol.geom.LineString( + [[10000000, 10000000], [10000000, -10000000]]) + }), + new ol.Feature({ + color: '#013', + where: 'outer', + geometry: new ol.geom.LineString( + [[10000000, -10000000], [-10000000, -10000000]]) + }), + new ol.Feature({ + label: 'South', + geometry: new ol.geom.Point([0, -6000000]) + }), + new ol.Feature({ + label: 'West', + geometry: new ol.geom.Point([-6000000, 0]) + }), + new ol.Feature({ + label: 'North', + geometry: new ol.geom.Point([0, 6000000]) + }), + new ol.Feature({ + label: 'East', + geometry: new ol.geom.Point([6000000, 0]) + }) + ] }) }); diff --git a/src/objectliterals.jsdoc b/src/objectliterals.jsdoc index d416c8b63e..83e0e9a6e1 100644 --- a/src/objectliterals.jsdoc +++ b/src/objectliterals.jsdoc @@ -718,16 +718,19 @@ /** * @typedef {Object} ol.source.VectorOptions * @property {Array.|undefined} attributions Attributions. - * @property {Object|string|undefined} data Data to parse. + * @property {Array.|undefined} features Any features to be added + * to the source. Providing features is an alternative to providing + * `url` and `parser` options. * @property {ol.Extent|undefined} extent Extent. * @property {string|undefined} logo Logo. - * @property {ol.parser.Parser} parser Parser instance to parse data - * provided as `data` or fetched from `url`. + * @property {ol.parser.Parser|undefined} parser Parser instance to parse data + * fetched from `url`. * @property {ol.proj.ProjectionLike|undefined} projection Projection. Usually the * projection is provided by the parser, so this only needs to be set if * the parser does not know the SRS (e.g. in some GML flavors), or if the * projection determined by the parser needs to be overridden. - * @property {string|undefined} url Server url providing the vector data. + * @property {string|undefined} url Server url providing the vector data. If + * provided, the `parser` option must also be supplied. * @todo stability experimental */ diff --git a/src/ol/interaction/drawinteraction.js b/src/ol/interaction/drawinteraction.js index b46e6d2050..8a698818a1 100644 --- a/src/ol/interaction/drawinteraction.js +++ b/src/ol/interaction/drawinteraction.js @@ -113,7 +113,7 @@ ol.interaction.Draw.prototype.setMap = function(map) { if (!goog.isNull(map)) { if (goog.isNull(this.sketchLayer_)) { var layer = new ol.layer.Vector({ - source: new ol.source.Vector({parser: null}), + source: new ol.source.Vector(), style: this.layer_.getStyle() }); layer.setTemporary(true); diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index 020dd95d4e..692c0cd74d 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -134,7 +134,7 @@ ol.interaction.Modify.prototype.setMap = function(map) { } if (goog.isNull(this.sketchLayer_)) { var sketchLayer = new ol.layer.Vector({ - source: new ol.source.Vector({parser: null}) + source: new ol.source.Vector() }); this.sketchLayer_ = sketchLayer; sketchLayer.setTemporary(true); diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js index 605018c03f..6ec6e528dc 100644 --- a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js +++ b/src/ol/renderer/canvas/canvasvectorlayerrenderer.js @@ -92,6 +92,7 @@ ol.renderer.canvas.VectorLayer = function(mapRenderer, layer) { var source = layer.getSource(); goog.events.listen(source, [ + ol.source.VectorEventType.LOAD, ol.source.VectorEventType.ADD, ol.source.VectorEventType.CHANGE, ol.source.VectorEventType.REMOVE, @@ -427,6 +428,15 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame = this.tileArchetype_.height = tileSize[1]; } + /** + * Let the source to know what data extent we want loaded. As there may + * already be features loaded, we continue with rendering after this request. + * If this results in loading new features, a new rendering will be triggered. + */ + var layer = this.getVectorLayer(); + var source = layer.getVectorSource(); + source.load(tileRangeExtent, projection); + /** * Prepare the sketch canvas. This covers the currently visible tile range * and will have rendered all newly visible features. @@ -474,8 +484,6 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame = var tile, tileCoord, key, x, y, i, type; var deferred = false; var dirty = false; - var layer = this.getVectorLayer(); - var source = layer.getSource(); var tileExtent, featuresObject, tileHasFeatures; fetchTileData: for (x = tileRange.minX; x <= tileRange.maxX; ++x) { @@ -491,8 +499,8 @@ ol.renderer.canvas.VectorLayer.prototype.renderFrame = tileExtent[1] -= tileGutter; tileExtent[3] += tileGutter; tileHasFeatures = false; - featuresObject = source.getFeaturesObjectForExtent(tileExtent, - projection, this.requestMapRenderFrame_); + featuresObject = source.getFeaturesObjectForExtent( + tileExtent, projection); if (goog.isNull(featuresObject)) { deferred = true; break fetchTileData; diff --git a/src/ol/source/vectorsource.exports b/src/ol/source/vectorsource.exports index d7842f5b84..b864def335 100644 --- a/src/ol/source/vectorsource.exports +++ b/src/ol/source/vectorsource.exports @@ -1 +1,2 @@ @exportClass ol.source.Vector ol.source.VectorOptions +@exportProperty ol.source.Vector.prototype.addFeatures diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 0e049b8e93..fb2a20f57a 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -3,6 +3,7 @@ goog.provide('ol.source.Vector'); goog.provide('ol.source.VectorEventType'); goog.require('goog.asserts'); +goog.require('goog.async.nextTick'); goog.require('goog.events'); goog.require('goog.events.Event'); goog.require('goog.net.XhrIo'); @@ -36,17 +37,12 @@ ol.source.VectorLoadState = { ol.source.Vector = function(opt_options) { var options = goog.isDef(opt_options) ? opt_options : {}; - /** - * @private - * @type {Object|string} - */ - this.data_ = goog.isDef(options.data) ? options.data : null; - - /** - * @private - * @type {ol.source.VectorLoadState} - */ - this.loadState_ = ol.source.VectorLoadState.IDLE; + goog.base(this, { + attributions: options.attributions, + extent: options.extent, + logo: options.logo, + projection: options.projection + }); /** * @private @@ -60,23 +56,126 @@ ol.source.Vector = function(opt_options) { */ this.url_ = options.url; + /** + * @private + * @type {ol.source.VectorLoadState} + */ + this.loadState_ = goog.isDef(this.url_) ? + ol.source.VectorLoadState.IDLE : ol.source.VectorLoadState.LOADED; + /** * @type {ol.source.FeatureCache} * @private */ this.featureCache_ = new ol.source.FeatureCache(); - goog.base(this, { - attributions: options.attributions, - extent: options.extent, - logo: options.logo, - projection: options.projection - }); + // add any user provided features + if (goog.isDef(options.features)) { + this.addFeatures(options.features); + } + }; goog.inherits(ol.source.Vector, ol.source.Source); /** + * Request for new features to be loaded. + * @param {ol.Extent} extent Desired extent. + * @param {ol.proj.Projection} projection Desired projection. + * @return {boolean} New features will be loaded. + */ +ol.source.Vector.prototype.load = function(extent, projection) { + var requested = false; + if (this.loadState_ === ol.source.VectorLoadState.IDLE) { + goog.asserts.assertString(this.url_); + this.loadState_ = ol.source.VectorLoadState.LOADING; + goog.net.XhrIo.send(this.url_, goog.bind(function(event) { + var xhr = event.target; + if (xhr.isSuccess()) { + // parsing may be asynchronous, so we don't set load state here + this.parseFeaturesString_(xhr.getResponseText(), projection); + } else { + this.loadState_ = ol.source.VectorLoadState.ERROR; + } + }, this)); + requested = true; + } + return requested; +}; + + +/** + * Parse features from a string. + * @param {string} data Feature data. + * @param {ol.proj.Projection} projection The target projection. + * @private + */ +ol.source.Vector.prototype.parseFeaturesString_ = function(data, projection) { + if (goog.isFunction(this.parser_.readFeaturesFromStringAsync)) { + this.parser_.readFeaturesFromStringAsync(data, goog.bind(function(result) { + this.handleReadResult_(result, projection); + }, this)); + } else { + goog.asserts.assert( + goog.isFunction(this.parser_.readFeaturesFromString), + 'Expected parser with a readFeaturesFromString method.'); + this.handleReadResult_( + this.parser_.readFeaturesFromString(data), projection); + } +}; + + +/** + * Handle the read result from a parser. + * TODO: make parsers accept a target projection (see #1287) + * @param {ol.parser.ReadFeaturesResult} result Read features result. + * @param {ol.proj.Projection} projection The desired projection. + * @private + */ +ol.source.Vector.prototype.handleReadResult_ = function(result, projection) { + var features = result.features; + var sourceProjection = this.getProjection(); + if (goog.isNull(sourceProjection)) { + sourceProjection = result.metadata.projection; + } + var transform = ol.proj.getTransform(sourceProjection, projection); + var extent = ol.extent.createEmpty(); + var geometry = null; + var feature; + for (var i = 0, ii = features.length; i < ii; ++i) { + feature = features[i]; + geometry = feature.getGeometry(); + if (!goog.isNull(geometry)) { + geometry.transform(transform); + ol.extent.extend(extent, geometry.getBounds()); + } + this.loadFeature_(feature); + } + this.loadState_ = ol.source.VectorLoadState.LOADED; + // called in the next tick to normalize load event for sync/async parsing + goog.async.nextTick(function() { + this.dispatchEvent(new ol.source.VectorEvent(ol.source.VectorEventType.LOAD, + features, [extent])); + }, this); +}; + + +/** + * Load a feature. + * @param {ol.Feature} feature Feature to load. + * @private + */ +ol.source.Vector.prototype.loadFeature_ = function(feature) { + goog.events.listen(feature, ol.FeatureEventType.CHANGE, + this.handleFeatureChange_, false, this); + goog.events.listen(feature, ol.FeatureEventType.INTENTCHANGE, + this.handleIntentChange_, false, this); + this.featureCache_.add(feature); +}; + + +/** + * Add newly created features to the source. * @param {Array.} features Array of features. */ ol.source.Vector.prototype.addFeatures = function(features) { @@ -84,15 +183,11 @@ ol.source.Vector.prototype.addFeatures = function(features) { feature, geometry; for (var i = 0, ii = features.length; i < ii; ++i) { feature = features[i]; - this.featureCache_.add(feature); + this.loadFeature_(feature); geometry = feature.getGeometry(); if (!goog.isNull(geometry)) { ol.extent.extend(extent, geometry.getBounds()); } - goog.events.listen(feature, ol.FeatureEventType.CHANGE, - this.handleFeatureChange_, false, this); - goog.events.listen(feature, ol.FeatureEventType.INTENTCHANGE, - this.handleIntentChange_, false, this); } this.dispatchEvent(new ol.source.VectorEvent(ol.source.VectorEventType.ADD, features, [extent])); @@ -125,79 +220,17 @@ ol.source.Vector.prototype.getFeatures = function(opt_filter) { /** * Get all features whose bounding box intersects the provided extent. This - * method is intended for being called by the renderer. When null is returned, - * the renderer should not waste time rendering, and `opt_callback` is - * usually a function that requests a renderFrame, which will be called as soon - * as the data for `extent` is available. + * method is intended for being called by the renderer. * * @param {ol.Extent} extent Bounding extent. * @param {ol.proj.Projection} projection Target projection. - * @param {function()=} opt_callback Callback to call when data is parsed. - * @return {Object.} Features or null if source is loading - * data for `extent`. + * @return {Object.} Features lookup object. */ ol.source.Vector.prototype.getFeaturesObjectForExtent = function(extent, - projection, opt_callback) { - var state = this.prepareFeatures_(extent, projection, opt_callback); - var lookup = null; - if (state !== ol.source.VectorLoadState.LOADING) { - lookup = this.featureCache_.getFeaturesObjectForExtent(extent); - } - return lookup; -}; - - -/** - * @param {Object|Element|Document|string} data Feature data. - * @param {ol.proj.Projection} projection This sucks. The layer should be a - * view in one projection. - * @private - */ -ol.source.Vector.prototype.parseFeatures_ = function(data, projection) { - - var addFeatures = function(data) { - var features = data.features; - var sourceProjection = this.getProjection(); - if (goog.isNull(sourceProjection)) { - sourceProjection = data.metadata.projection; - } - var transform = ol.proj.getTransform(sourceProjection, projection); - var geometry = null; - for (var i = 0, ii = features.length; i < ii; ++i) { - geometry = features[i].getGeometry(); - if (!goog.isNull(geometry)) { - geometry.transform(transform); - } - } - this.addFeatures(features); - }; - - var result; - var parser = this.parser_; - if (goog.isString(data)) { - if (goog.isFunction(parser.readFeaturesFromStringAsync)) { - parser.readFeaturesFromStringAsync(data, goog.bind(addFeatures, this)); - } else { - goog.asserts.assert( - goog.isFunction(parser.readFeaturesFromString), - 'Expected parser with a readFeaturesFromString method.'); - result = parser.readFeaturesFromString(data); - addFeatures.call(this, result); - } - } else if (goog.isObject(data)) { - if (goog.isFunction(parser.readFeaturesFromObjectAsync)) { - parser.readFeaturesFromObjectAsync(data, goog.bind(addFeatures, this)); - } else { - goog.asserts.assert( - goog.isFunction(parser.readFeaturesFromObject), - 'Expected parser with a readFeaturesFromObject method.'); - result = parser.readFeaturesFromObject(data); - addFeatures.call(this, result); - } - } else { - // TODO: parse more data types - throw new Error('Data type not supported: ' + data); - } + projection) { + // TODO: create forEachFeatureInExtent method instead + // TODO: transform if requested project is different than loaded projection + return this.featureCache_.getFeaturesObjectForExtent(extent); }; @@ -241,43 +274,6 @@ ol.source.Vector.prototype.handleIntentChange_ = function(evt) { }; -/** - * @param {ol.Extent} extent Extent that needs to be fetched. - * @param {ol.proj.Projection} projection Projection of the view. - * @param {function()=} opt_callback Callback which is called when features are - * parsed after loading. - * @return {ol.source.VectorLoadState} The current load state. - * @private - */ -ol.source.Vector.prototype.prepareFeatures_ = function(extent, projection, - opt_callback) { - // TODO: Implement strategies. BBOX aware strategies will need the extent. - if (goog.isDef(this.url_) && - this.loadState_ == ol.source.VectorLoadState.IDLE) { - this.loadState_ = ol.source.VectorLoadState.LOADING; - goog.net.XhrIo.send(this.url_, goog.bind(function(event) { - var xhr = event.target; - if (xhr.isSuccess()) { - // TODO: Get source projection from data if supported by parser. - this.parseFeatures_(xhr.getResponseText(), projection); - this.loadState_ = ol.source.VectorLoadState.LOADED; - if (goog.isDef(opt_callback)) { - opt_callback(); - } - } else { - // TODO: Error handling. - this.loadState_ = ol.source.VectorLoadState.ERROR; - } - }, this)); - } else if (!goog.isNull(this.data_)) { - this.parseFeatures_(this.data_, projection); - this.data_ = null; - this.loadState_ = ol.source.VectorLoadState.LOADED; - } - return this.loadState_; -}; - - /** * Remove features from the layer. * @param {Array.} features Features to remove. @@ -332,6 +328,7 @@ goog.inherits(ol.source.VectorEvent, goog.events.Event); * @enum {string} */ ol.source.VectorEventType = { + LOAD: 'featureload', ADD: 'featureadd', CHANGE: 'featurechange', INTENTCHANGE: 'featureintentchange', diff --git a/test/spec/ol/source/vectorsource.test.js b/test/spec/ol/source/vectorsource.test.js index d40c31cc9d..3ed5181df2 100644 --- a/test/spec/ol/source/vectorsource.test.js +++ b/test/spec/ol/source/vectorsource.test.js @@ -21,69 +21,6 @@ describe('ol.source.Vector', function() { }); }); - describe('#prepareFeatures_', function() { - it('loads and parses data from a file', function(done) { - var source = new ol.source.Vector({ - url: 'spec/ol/parser/geojson/countries.geojson', - parser: new ol.parser.GeoJSON() - }); - source.prepareFeatures_([-180, -90, 180, 90], - ol.proj.get('EPSG:4326'), - function() { - expect(source.loadState_).to.be(ol.source.VectorLoadState.LOADED); - expect(goog.object.getCount( - source.featureCache_.getFeaturesObject())).to.be(179); - done(); - }); - }); - - it('parses inline data', function() { - var source = new ol.source.Vector({ - data: { - 'type': 'FeatureCollection', - 'features': [{ - 'type': 'Feature', - 'geometry': { - 'type': 'Point', - 'coordinates': [0, -6000000] - } - }, { - 'type': 'Feature', - 'geometry': { - 'type': 'Point', - 'coordinates': [-6000000, 0] - } - }, { - 'type': 'Feature', - 'geometry': { - 'type': 'Point', - 'coordinates': [0, 6000000] - } - }, { - 'type': 'Feature', - 'geometry': { - 'type': 'Point', - 'coordinates': [6000000, 0] - } - }] - }, - parser: new ol.parser.GeoJSON(), - projection: ol.proj.get('EPSG:4326') - }); - source.prepareFeatures_([-180, -90, 180, 90], - ol.proj.get('EPSG:4326'), - function() { - expect(source.loadState_).to.be(ol.source.VectorLoadState.LOADED); - expect(goog.object.getCount( - source.featureCache_.getFeaturesObject())).to.be(4); - done(); - }); - }); - - - - }); - describe('featurechange event', function() { var source, features; @@ -151,8 +88,6 @@ goog.require('goog.object'); goog.require('ol.Feature'); goog.require('ol.geom.LineString'); goog.require('ol.geom.Point'); -goog.require('ol.parser.GeoJSON'); -goog.require('ol.proj'); goog.require('ol.source.FeatureCache'); goog.require('ol.source.Source'); goog.require('ol.source.Vector');