Remove ol.RendererHints.createFromQueryData

This commit is contained in:
Antoine Abt
2014-02-13 16:42:13 +01:00
parent 21bfdb1d1e
commit 4dd8c248f5
3 changed files with 0 additions and 73 deletions

View File

@@ -21,6 +21,3 @@
@exportProperty ol.Map.prototype.render
@exportProperty ol.Map.prototype.requestRenderFrame
@exportProperty ol.Map.prototype.updateSize
@exportSymbol ol.RendererHints
@exportProperty ol.RendererHints.createFromQueryData

View File

@@ -5,7 +5,6 @@
goog.provide('ol.Map');
goog.provide('ol.MapProperty');
goog.provide('ol.RendererHint');
goog.provide('ol.RendererHints');
goog.require('goog.Uri.QueryData');
goog.require('goog.array');
@@ -1453,24 +1452,6 @@ ol.Map.createOptionsInternal = function(options) {
};
/**
* @param {goog.Uri.QueryData=} opt_queryData Query data.
* @return {Array.<ol.RendererHint>} Renderer hints.
*/
ol.RendererHints.createFromQueryData = function(opt_queryData) {
var query = goog.global.location.search.substring(1),
queryData = goog.isDef(opt_queryData) ?
opt_queryData : new goog.Uri.QueryData(query);
if (queryData.containsKey('renderers')) {
return queryData.get('renderers').split(',');
} else if (queryData.containsKey('renderer')) {
return [queryData.get('renderer')];
} else {
return ol.DEFAULT_RENDERER_HINTS;
}
};
ol.proj.common.add();

View File

@@ -1,53 +1,4 @@
goog.provide('ol.test.Map');
goog.provide('ol.test.RendererHints');
describe('ol.RendererHints', function() {
describe('#createFromQueryData()', function() {
var savedGoogGlobal;
beforeEach(function() {
savedGoogGlobal = goog.global;
goog.global = {};
});
afterEach(function() {
goog.global = savedGoogGlobal;
});
it('returns defaults when no query string', function() {
goog.global.location = {search: ''};
var hints = ol.RendererHints.createFromQueryData();
expect(hints).to.be(ol.DEFAULT_RENDERER_HINTS);
});
it('returns defaults when no "renderer" or "renderers"', function() {
goog.global.location = {search: '?foo=bar'};
var hints = ol.RendererHints.createFromQueryData();
expect(hints).to.be(ol.DEFAULT_RENDERER_HINTS);
});
it('returns array of one for "renderer"', function() {
goog.global.location = {search: '?renderer=bogus'};
var hints = ol.RendererHints.createFromQueryData();
expect(hints).to.eql(['bogus']);
});
it('accepts comma delimited list for "renderers"', function() {
goog.global.location = {search: '?renderers=one,two'};
var hints = ol.RendererHints.createFromQueryData();
expect(hints).to.eql(['one', 'two']);
});
it('works with "renderer" in second position', function() {
goog.global.location = {search: '?foo=bar&renderer=one'};
var hints = ol.RendererHints.createFromQueryData();
expect(hints).to.eql(['one']);
});
});
});
describe('ol.Map', function() {
@@ -242,8 +193,6 @@ goog.require('goog.dispose');
goog.require('goog.dom');
goog.require('ol.Map');
goog.require('ol.MapEvent');
goog.require('ol.RendererHint');
goog.require('ol.RendererHints');
goog.require('ol.View2D');
goog.require('ol.interaction');
goog.require('ol.interaction.Interaction');