ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename ol.browserfeature to ol.has

Browse Source
This commit is contained in:
Tim Schaub
2014-08-21 14:46:10 -06:00
parent 403e87f697
commit 947b049799
21 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/bind-input.js
View File

@@ -1,17 +1,17 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.browserfeature');
goog.require('ol.control');
goog.require('ol.dom.Input');
goog.require('ol.has');
goog.require('ol.layer.Tile');
goog.require('ol.source.OSM');
function checkWebGL(evt) {
document.getElementById('no-webgl').style.display =
ol.browserfeature.HAS_WEBGL ? 'none' : '';
ol.has.WEBGL ? 'none' : '';
document.getElementById('has-webgl').style.display =
ol.browserfeature.HAS_WEBGL && !evt.glContext ? '' : 'none';
ol.has.WEBGL && !evt.glContext ? '' : 'none';
document.getElementById('webgl').style.display =
evt.glContext ? '' : 'none';
}

4
examples/brightness-contrast.js
View File

@@ -1,6 +1,6 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuest');
@@ -14,7 +14,7 @@ function setResetContrastButtonHTML() {
resetContrast.innerHTML = 'Contrast (' + layer.getContrast().toFixed(3) + ')';
}
if (!ol.browserfeature.HAS_WEBGL) {
if (!ol.has.WEBGL) {
var info = document.getElementById('no-webgl');
/**
* display error message

4
examples/hue-saturation.js
View File

@@ -1,6 +1,6 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.layer.Tile');
goog.require('ol.proj');
goog.require('ol.source.BingMaps');
@@ -15,7 +15,7 @@ function setResetSaturationButtonHTML() {
layer.getSaturation().toFixed(2) + ')';
}
if (!ol.browserfeature.HAS_WEBGL) {
if (!ol.has.WEBGL) {
var info = document.getElementById('no-webgl');
/**
* display error message

4
examples/layer-clipping-webgl.js
View File

@@ -1,11 +1,11 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.browserfeature');
goog.require('ol.control');
goog.require('ol.has');
goog.require('ol.layer.Tile');
goog.require('ol.source.OSM');
if (!ol.browserfeature.HAS_WEBGL) {
if (!ol.has.WEBGL) {
var info = document.getElementById('no-webgl');
/**
* display error message

4
examples/side-by-side.js
View File

@@ -1,6 +1,6 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.layer.Tile');
goog.require('ol.source.MapQuest');
@@ -19,7 +19,7 @@ var domMap = new ol.Map({
})
});
if (ol.browserfeature.HAS_WEBGL) {
if (ol.has.WEBGL) {
var webglMap = new ol.Map({
renderer: 'webgl',
target: 'webglMap'

4
examples/wmts-hidpi.js
View File

@@ -1,6 +1,6 @@
goog.require('ol.Map');
goog.require('ol.View');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.layer.Tile');
goog.require('ol.source.WMTS');
goog.require('ol.tilegrid.WMTS');
@@ -20,7 +20,7 @@ var urls = [
// HiDPI support:
// * Use 'bmaphidpi' layer (pixel ratio 2) for device pixel ratio > 1
// * Use 'geolandbasemap' layer (pixel ratio 1) for device pixel ratio == 1
var hiDPI = ol.browserfeature.DEVICE_PIXEL_RATIO > 1;
var hiDPI = ol.has.DEVICE_PIXEL_RATIO > 1;
var source = new ol.source.WMTS({
projection: 'EPSG:3857',

4
src/ol/binary.js
View File

@@ -5,7 +5,7 @@ goog.provide('ol.binary.IReader');
goog.require('goog.asserts');
goog.require('goog.userAgent');
goog.require('ol.browserfeature');
goog.require('ol.has');
@@ -29,7 +29,7 @@ ol.binary.Buffer = function(data) {
*/
ol.binary.Buffer.prototype.getReader = function() {
var data = this.data_;
if (ol.browserfeature.HAS_ARRAY_BUFFER) {
if (ol.has.ARRAY_BUFFER) {
var arrayBuffer;
if (data instanceof ArrayBuffer) {
arrayBuffer = data;

3
src/ol/browserfeature.jsdoc
View File

@@ -1,3 +0,0 @@
/**
* @namespace ol.browserfeature
*/

4
src/ol/deviceorientation.js
View File

@@ -4,7 +4,7 @@ goog.provide('ol.DeviceOrientationProperty');
goog.require('goog.events');
goog.require('goog.math');
goog.require('ol.Object');
goog.require('ol.browserfeature');
goog.require('ol.has');
/**
@@ -221,7 +221,7 @@ goog.exportProperty(
* @private
*/
ol.DeviceOrientation.prototype.handleTrackingChanged_ = function() {
if (ol.browserfeature.HAS_DEVICE_ORIENTATION) {
if (ol.has.DEVICE_ORIENTATION) {
var tracking = this.getTracking();
if (tracking && goog.isNull(this.listenerKey_)) {
this.listenerKey_ = goog.events.listen(goog.global, 'deviceorientation',

4
src/ol/format/binaryfeatureformat.js
View File

@@ -2,9 +2,9 @@ goog.provide('ol.format.BinaryFeature');
goog.require('goog.asserts');
goog.require('ol.binary.Buffer');
goog.require('ol.browserfeature');
goog.require('ol.format.Feature');
goog.require('ol.format.FormatType');
goog.require('ol.has');
goog.require('ol.proj');
@@ -25,7 +25,7 @@ goog.inherits(ol.format.BinaryFeature, ol.format.Feature);
* @return {ol.binary.Buffer} Buffer.
*/
ol.format.BinaryFeature.getBuffer_ = function(source) {
if (ol.browserfeature.HAS_ARRAY_BUFFER && source instanceof ArrayBuffer) {
if (ol.has.ARRAY_BUFFER && source instanceof ArrayBuffer) {
return new ol.binary.Buffer(source);
} else if (goog.isString(source)) {
return new ol.binary.Buffer(source);

4
src/ol/geolocation.js
View File

@@ -8,9 +8,9 @@ goog.require('goog.events.EventType');
goog.require('goog.math');
goog.require('ol.Coordinate');
goog.require('ol.Object');
goog.require('ol.browserfeature');
goog.require('ol.geom.Geometry');
goog.require('ol.geom.Polygon');
goog.require('ol.has');
goog.require('ol.proj');
goog.require('ol.sphere.WGS84');
@@ -130,7 +130,7 @@ ol.Geolocation.prototype.handleProjectionChanged_ = function() {
* @private
*/
ol.Geolocation.prototype.handleTrackingChanged_ = function() {
if (ol.browserfeature.HAS_GEOLOCATION) {
if (ol.has.GEOLOCATION) {
var tracking = this.getTracking();
if (tracking && !goog.isDef(this.watchId_)) {
this.watchId_ = goog.global.navigator.geolocation.watchPosition(

26
src/ol/browserfeature.js → src/ol/has.js
View File

@@ -1,4 +1,4 @@
goog.provide('ol.browserfeature');
goog.provide('ol.has');
goog.require('goog.dom');
goog.require('goog.dom.TagName');
@@ -14,7 +14,7 @@ goog.require('ol.webgl');
* @type {number}
* @api
*/
ol.browserfeature.DEVICE_PIXEL_RATIO = goog.global.devicePixelRatio || 1;
ol.has.DEVICE_PIXEL_RATIO = goog.global.devicePixelRatio || 1;
/**
@@ -22,14 +22,14 @@ ol.browserfeature.DEVICE_PIXEL_RATIO = goog.global.devicePixelRatio || 1;
* @const
* @type {boolean}
*/
ol.browserfeature.HAS_ARRAY_BUFFER = 'ArrayBuffer' in goog.global;
ol.has.ARRAY_BUFFER = 'ArrayBuffer' in goog.global;
/**
* True if the browser's Canvas implementation implements {get,set}LineDash.
* @type {boolean}
*/
ol.browserfeature.HAS_CANVAS_LINE_DASH = false;
ol.has.CANVAS_LINE_DASH = false;
/**
@@ -38,7 +38,7 @@ ol.browserfeature.HAS_CANVAS_LINE_DASH = false;
* @type {boolean}
* @api
*/
ol.browserfeature.HAS_CANVAS = ol.ENABLE_CANVAS && (
ol.has.CANVAS = ol.ENABLE_CANVAS && (
/**
* @return {boolean} Canvas supported.
*/
@@ -52,7 +52,7 @@ ol.browserfeature.HAS_CANVAS = ol.ENABLE_CANVAS && (
return false;
} else {
if (goog.isDef(context.setLineDash)) {
ol.browserfeature.HAS_CANVAS_LINE_DASH = true;
ol.has.CANVAS_LINE_DASH = true;
}
return true;
}
@@ -68,7 +68,7 @@ ol.browserfeature.HAS_CANVAS = ol.ENABLE_CANVAS && (
* @type {boolean}
* @api
*/
ol.browserfeature.HAS_DEVICE_ORIENTATION =
ol.has.DEVICE_ORIENTATION =
'DeviceOrientationEvent' in goog.global;
@@ -77,7 +77,7 @@ ol.browserfeature.HAS_DEVICE_ORIENTATION =
* @const
* @type {boolean}
*/
ol.browserfeature.HAS_DOM = ol.ENABLE_DOM;
ol.has.DOM = ol.ENABLE_DOM;
/**
@@ -86,7 +86,7 @@ ol.browserfeature.HAS_DOM = ol.ENABLE_DOM;
* @type {boolean}
* @api
*/
ol.browserfeature.HAS_GEOLOCATION = 'geolocation' in goog.global.navigator;
ol.has.GEOLOCATION = 'geolocation' in goog.global.navigator;
/**
@@ -95,7 +95,7 @@ ol.browserfeature.HAS_GEOLOCATION = 'geolocation' in goog.global.navigator;
* @type {boolean}
* @api
*/
ol.browserfeature.HAS_TOUCH = ol.ASSUME_TOUCH || 'ontouchstart' in goog.global;
ol.has.TOUCH = ol.ASSUME_TOUCH || 'ontouchstart' in goog.global;
/**
@@ -103,7 +103,7 @@ ol.browserfeature.HAS_TOUCH = ol.ASSUME_TOUCH || 'ontouchstart' in goog.global;
* @const
* @type {boolean}
*/
ol.browserfeature.HAS_POINTER = 'PointerEvent' in goog.global;
ol.has.POINTER = 'PointerEvent' in goog.global;
/**
@@ -111,7 +111,7 @@ ol.browserfeature.HAS_POINTER = 'PointerEvent' in goog.global;
* @const
* @type {boolean}
*/
ol.browserfeature.HAS_MSPOINTER =
ol.has.MSPOINTER =
!!(goog.global.navigator.msPointerEnabled);
@@ -121,7 +121,7 @@ ol.browserfeature.HAS_MSPOINTER =
* @type {boolean}
* @api
*/
ol.browserfeature.HAS_WEBGL = ol.ENABLE_WEBGL && (
ol.has.WEBGL = ol.ENABLE_WEBGL && (
/**
* @return {boolean} WebGL supported.
*/

3
src/ol/has.jsdoc Normal file
View File

@@ -0,0 +1,3 @@
/**
* @namespace ol.has
*/

12
src/ol/map.js
View File

@@ -45,9 +45,9 @@ goog.require('ol.Size');
goog.require('ol.TileQueue');
goog.require('ol.View');
goog.require('ol.ViewHint');
goog.require('ol.browserfeature');
goog.require('ol.control');
goog.require('ol.extent');
goog.require('ol.has');
goog.require('ol.interaction');
goog.require('ol.layer.Base');
goog.require('ol.layer.Group');
@@ -170,7 +170,7 @@ ol.Map = function(options) {
* @type {number}
*/
this.pixelRatio_ = goog.isDef(options.pixelRatio) ?
options.pixelRatio : ol.browserfeature.DEVICE_PIXEL_RATIO;
options.pixelRatio : ol.has.DEVICE_PIXEL_RATIO;
/**
* @private
@@ -240,7 +240,7 @@ ol.Map = function(options) {
this.viewport_.style.height = '100%';
// prevent page zoom on IE >= 10 browsers
this.viewport_.style.msTouchAction = 'none';
if (ol.browserfeature.HAS_TOUCH) {
if (ol.has.TOUCH) {
this.viewport_.className = 'ol-touch';
}
@@ -1465,17 +1465,17 @@ ol.Map.createOptionsInternal = function(options) {
/** @type {ol.RendererType} */
var rendererType = rendererTypes[i];
if (ol.ENABLE_CANVAS && rendererType == ol.RendererType.CANVAS) {
if (ol.browserfeature.HAS_CANVAS) {
if (ol.has.CANVAS) {
rendererConstructor = ol.renderer.canvas.Map;
break;
}
} else if (ol.ENABLE_DOM && rendererType == ol.RendererType.DOM) {
if (ol.browserfeature.HAS_DOM) {
if (ol.has.DOM) {
rendererConstructor = ol.renderer.dom.Map;
break;
}
} else if (ol.ENABLE_WEBGL && rendererType == ol.RendererType.WEBGL) {
if (ol.browserfeature.HAS_WEBGL) {
if (ol.has.WEBGL) {
rendererConstructor = ol.renderer.webgl.Map;
break;
}

8
src/ol/pointer/pointereventhandler.js
View File

@@ -36,7 +36,7 @@ goog.require('goog.events.BrowserEvent');
goog.require('goog.events.Event');
goog.require('goog.events.EventTarget');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.pointer.MouseSource');
goog.require('ol.pointer.MsSource');
goog.require('ol.pointer.NativeSource');
@@ -88,15 +88,15 @@ goog.inherits(ol.pointer.PointerEventHandler, goog.events.EventTarget);
* that generate pointer events.
*/
ol.pointer.PointerEventHandler.prototype.registerSources = function() {
if (ol.browserfeature.HAS_POINTER) {
if (ol.has.POINTER) {
this.registerSource('native', new ol.pointer.NativeSource(this));
} else if (ol.browserfeature.HAS_MSPOINTER) {
} else if (ol.has.MSPOINTER) {
this.registerSource('ms', new ol.pointer.MsSource(this));
} else {
var mouseSource = new ol.pointer.MouseSource(this);
this.registerSource('mouse', mouseSource);
if (ol.browserfeature.HAS_TOUCH) {
if (ol.has.TOUCH) {
this.registerSource('touch',
new ol.pointer.TouchSource(this, mouseSource));
}

6
src/ol/render/canvas/canvasimmediate.js
View File

@@ -8,10 +8,10 @@ goog.require('goog.array');
goog.require('goog.asserts');
goog.require('goog.object');
goog.require('goog.vec.Mat4');
goog.require('ol.browserfeature');
goog.require('ol.color');
goog.require('ol.extent');
goog.require('ol.geom.flat.transform');
goog.require('ol.has');
goog.require('ol.render.IVectorContext');
goog.require('ol.render.canvas');
goog.require('ol.vec.Mat4');
@@ -764,7 +764,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ =
var contextStrokeState = this.contextStrokeState_;
if (goog.isNull(contextStrokeState)) {
context.lineCap = strokeState.lineCap;
if (ol.browserfeature.HAS_CANVAS_LINE_DASH) {
if (ol.has.CANVAS_LINE_DASH) {
context.setLineDash(strokeState.lineDash);
}
context.lineJoin = strokeState.lineJoin;
@@ -783,7 +783,7 @@ ol.render.canvas.Immediate.prototype.setContextStrokeState_ =
if (contextStrokeState.lineCap != strokeState.lineCap) {
contextStrokeState.lineCap = context.lineCap = strokeState.lineCap;
}
if (ol.browserfeature.HAS_CANVAS_LINE_DASH) {
if (ol.has.CANVAS_LINE_DASH) {
if (!goog.array.equals(
contextStrokeState.lineDash, strokeState.lineDash)) {
context.setLineDash(contextStrokeState.lineDash = strokeState.lineDash);

4
src/ol/render/canvas/canvasreplay.js
View File

@@ -9,13 +9,13 @@ goog.require('goog.asserts');
goog.require('goog.object');
goog.require('goog.vec.Mat4');
goog.require('ol.array');
goog.require('ol.browserfeature');
goog.require('ol.color');
goog.require('ol.dom');
goog.require('ol.extent');
goog.require('ol.extent.Relationship');
goog.require('ol.geom.flat.simplify');
goog.require('ol.geom.flat.transform');
goog.require('ol.has');
goog.require('ol.render.IReplayGroup');
goog.require('ol.render.IVectorContext');
goog.require('ol.render.canvas');
@@ -425,7 +425,7 @@ ol.render.canvas.Replay.prototype.replay_ = function(
context.lineCap = /** @type {string} */ (instruction[3]);
context.lineJoin = /** @type {string} */ (instruction[4]);
context.miterLimit = /** @type {number} */ (instruction[5]);
if (ol.browserfeature.HAS_CANVAS_LINE_DASH) {
if (ol.has.CANVAS_LINE_DASH) {
context.setLineDash(/** @type {Array.<number>} */ (instruction[6]));
}
++i;

6
src/ol/source/formatvectorsource.js
View File

@@ -10,8 +10,8 @@ goog.require('goog.net.EventType');
goog.require('goog.net.XhrIo');
goog.require('goog.net.XhrIo.ResponseType');
goog.require('goog.userAgent');
goog.require('ol.browserfeature');
goog.require('ol.format.FormatType');
goog.require('ol.has');
goog.require('ol.proj');
goog.require('ol.source.State');
goog.require('ol.source.Vector');
@@ -60,7 +60,7 @@ ol.source.FormatVector.prototype.loadFeaturesFromURL =
var responseType;
// FIXME maybe use ResponseType.DOCUMENT?
if (type == ol.format.FormatType.BINARY &&
ol.browserfeature.HAS_ARRAY_BUFFER) {
ol.has.ARRAY_BUFFER) {
responseType = goog.net.XhrIo.ResponseType.ARRAY_BUFFER;
} else {
responseType = goog.net.XhrIo.ResponseType.TEXT;
@@ -80,7 +80,7 @@ ol.source.FormatVector.prototype.loadFeaturesFromURL =
/** @type {ArrayBuffer|Document|Node|Object|string|undefined} */
var source;
if (type == ol.format.FormatType.BINARY &&
ol.browserfeature.HAS_ARRAY_BUFFER) {
ol.has.ARRAY_BUFFER) {
source = xhrIo.getResponse();
goog.asserts.assertInstanceof(source, ArrayBuffer);
} else if (type == ol.format.FormatType.JSON) {

8
test/spec/ol/pointer/mousesource.test.js
View File

@@ -11,9 +11,9 @@ describe('ol.pointer.MouseSource', function() {
target = goog.dom.createElement(goog.dom.TagName.DIV);
// make sure that a mouse and touch event source is used
ol.browserfeature.HAS_POINTER = false;
ol.browserfeature.HAS_MSPOINTER = false;
ol.browserfeature.HAS_TOUCH = true;
ol.has.POINTER = false;
ol.has.MSPOINTER = false;
ol.has.TOUCH = true;
handler = new ol.pointer.PointerEventHandler(target);
eventSpy = sinon.spy();
@@ -95,7 +95,7 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.BrowserEvent');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.pointer.MouseSource');
goog.require('ol.pointer.PointerEvent');
goog.require('ol.pointer.PointerEventHandler');

6
test/spec/ol/pointer/pointereventhandler.test.js
View File

@@ -9,8 +9,8 @@ describe('ol.pointer.PointerEventHandler', function() {
target = goog.dom.createElement(goog.dom.TagName.DIV);
// make sure that a mouse event source is used
ol.browserfeature.HAS_POINTER = false;
ol.browserfeature.HAS_MSPOINTER = false;
ol.has.POINTER = false;
ol.has.MSPOINTER = false;
handler = new ol.pointer.PointerEventHandler(target);
eventSpy = sinon.spy();
@@ -164,7 +164,7 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.BrowserEvent');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.pointer.MouseSource');
goog.require('ol.pointer.PointerEvent');
goog.require('ol.pointer.PointerEventHandler');

8
test/spec/ol/pointer/touchsource.test.js
View File

@@ -11,9 +11,9 @@ describe('ol.pointer.TouchSource', function() {
target = goog.dom.createElement(goog.dom.TagName.DIV);
// make sure that a mouse and touch event source is used
ol.browserfeature.HAS_POINTER = false;
ol.browserfeature.HAS_MSPOINTER = false;
ol.browserfeature.HAS_TOUCH = true;
ol.has.POINTER = false;
ol.has.MSPOINTER = false;
ol.has.TOUCH = true;
handler = new ol.pointer.PointerEventHandler(target);
eventSpy = sinon.spy();
@@ -133,7 +133,7 @@ goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.BrowserEvent');
goog.require('ol.browserfeature');
goog.require('ol.has');
goog.require('ol.pointer.PointerEvent');
goog.require('ol.pointer.PointerEventHandler');
goog.require('ol.pointer.TouchSource');