From 4261523720f0c865ad7dfada1665f566833299aa Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Thu, 4 Aug 2016 16:10:37 -0600 Subject: [PATCH 01/68] Test that all files have a single provide named like the path --- Makefile | 4 +++ package.json | 1 + test/node/.eslintrc | 5 ++++ test/node/one-provide.js | 64 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) create mode 100644 test/node/.eslintrc create mode 100644 test/node/one-provide.js diff --git a/Makefile b/Makefile index fe150e5bf3..1653ae9157 100644 --- a/Makefile +++ b/Makefile @@ -135,6 +135,10 @@ serve: build/test_requires.js build/test_rendering_requires.js test: build/timestamps/node-modules-timestamp build/test_requires.js node tasks/test.js +.PHONY: test-node +test-node: build/timestamps/node-modules-timestamp + ./node_modules/.bin/mocha test/node + .PHONY: test-coverage test-coverage: build/timestamps/node-modules-timestamp node tasks/test-coverage.js diff --git a/package.json b/package.json index 15027d950e..86870e097b 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "postinstall": "closure-util update", "start": "node tasks/serve.js", "pretest": "eslint tasks test test_rendering src examples", + "test-node": "mocha test/node", "test": "node tasks/test.js", "debug-server": "node tasks/serve-lib.js" }, diff --git a/test/node/.eslintrc b/test/node/.eslintrc new file mode 100644 index 0000000000..22abc7fb2b --- /dev/null +++ b/test/node/.eslintrc @@ -0,0 +1,5 @@ +{ + "env": { + "es6": true + } +} diff --git a/test/node/one-provide.js b/test/node/one-provide.js new file mode 100644 index 0000000000..53064f03a3 --- /dev/null +++ b/test/node/one-provide.js @@ -0,0 +1,64 @@ +const assert = require('assert'); +const fs = require('fs'); +const glob = require('glob'); +const path = require('path'); + +const src = path.join(__dirname, '..', '..', 'src'); + +const PROVIDE_RE = /^goog.provide\('(.*)'\);/ + +describe('each file', () => { + + const provides = {}; + + before(done => { + glob('**/*.js', {cwd: src}, function(err, files) { + if (err) { + return done(err); + } + let count = files.length; + let called = false; + files.forEach(file => { + fs.readFile(path.join(src, file), (err, data) => { + if (!called && err) { + called = true; + return done(err); + } + provides[file] = []; + String(data).split('\n').forEach(line => { + const match = line.match(PROVIDE_RE); + if (match) { + provides[file].push(match[1]); + } + }); + --count; + if (count === 0 && !called) { + called = true; + return done(); + } + }); + }); + }); + }); + + it('has a single provide', () => { + for (let file in provides) { + assert.equal(provides[file].length, 1, 'expected a single provide: ' + file); + } + }); + + it('has a path that maps to the provide', () => { + for (let file in provides) { + const provide = provides[file][0]; + let ext; + if (file.endsWith('index.js')) { + ext = path.sep + 'index.js'; + } else { + ext = '.js'; + } + const mapped = provide.split('.').map(part => part.toLowerCase()).join(path.sep) + ext; + assert.equal(mapped, file, 'expected provide to be like the path: ' + file); + } + }); + +}); From ffe3565166cff3a907aa120e26400cf75457396d Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 10:21:19 -0600 Subject: [PATCH 02/68] Single provide from ol/collection.js --- changelog/upgrade-notes.md | 7 ++ externs/oli.js | 4 +- src/ol/collection.js | 102 ++++++++++++------------ src/ol/interaction/modifyinteraction.js | 9 +-- src/ol/interaction/selectinteraction.js | 10 +-- src/ol/interaction/snapinteraction.js | 14 ++-- src/ol/layer/layergroup.js | 10 +-- src/ol/map.js | 25 +++--- src/ol/source/vectorsource.js | 5 +- test/spec/ol/collection.test.js | 23 +++--- 10 files changed, 103 insertions(+), 106 deletions(-) diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index b9dd996646..e386e0399c 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -12,6 +12,13 @@ This option was previously needed to use named colors with the WebGL renderer bu The URL constructor is supported by all modern browsers, but not by older ones, such as IE. To use the KML format in such older browsers, a URL polyfill will have to be loaded before use. +#### Changes only relevant to those who compile their applications together with the Closure Compiler + +A number of internal types have been renamed. This will not affect those who use the API provided by the library, but if you are compiling your application together with OpenLayers and using type names, you'll need to do the following: + + * rename `ol.CollectionEvent` to `ol.Collection.Event` + * rename `ol.CollectionEventType` to `ol.Collection.EventType` + ### v3.17.0 #### `ol.source.MapQuest` removal diff --git a/externs/oli.js b/externs/oli.js index d7cdcce0eb..305b8fe033 100644 --- a/externs/oli.js +++ b/externs/oli.js @@ -52,13 +52,13 @@ oli.events.Event.prototype.stopPropagation = function() {}; /** * @interface */ -oli.CollectionEvent = function() {}; +oli.Collection.Event = function() {}; /** * @type {*} */ -oli.CollectionEvent.prototype.element; +oli.Collection.Event.prototype.element; /** diff --git a/src/ol/collection.js b/src/ol/collection.js index 5ee4271eae..191b389a8d 100644 --- a/src/ol/collection.js +++ b/src/ol/collection.js @@ -4,58 +4,11 @@ */ goog.provide('ol.Collection'); -goog.provide('ol.CollectionEvent'); -goog.provide('ol.CollectionEventType'); goog.require('ol.events.Event'); goog.require('ol.Object'); -/** - * @enum {string} - */ -ol.CollectionEventType = { - /** - * Triggered when an item is added to the collection. - * @event ol.CollectionEvent#add - * @api stable - */ - ADD: 'add', - /** - * Triggered when an item is removed from the collection. - * @event ol.CollectionEvent#remove - * @api stable - */ - REMOVE: 'remove' -}; - - -/** - * @classdesc - * Events emitted by {@link ol.Collection} instances are instances of this - * type. - * - * @constructor - * @extends {ol.events.Event} - * @implements {oli.CollectionEvent} - * @param {ol.CollectionEventType} type Type. - * @param {*=} opt_element Element. - */ -ol.CollectionEvent = function(type, opt_element) { - - ol.events.Event.call(this, type); - - /** - * The element that is added to or removed from the collection. - * @type {*} - * @api stable - */ - this.element = opt_element; - -}; -ol.inherits(ol.CollectionEvent, ol.events.Event); - - /** * @enum {string} */ @@ -74,7 +27,7 @@ ol.CollectionProperty = { * * @constructor * @extends {ol.Object} - * @fires ol.CollectionEvent + * @fires ol.Collection.Event * @param {!Array.=} opt_array Array. * @template T * @api stable @@ -181,7 +134,7 @@ ol.Collection.prototype.insertAt = function(index, elem) { this.array_.splice(index, 0, elem); this.updateLength_(); this.dispatchEvent( - new ol.CollectionEvent(ol.CollectionEventType.ADD, elem)); + new ol.Collection.Event(ol.Collection.EventType.ADD, elem)); }; @@ -239,7 +192,7 @@ ol.Collection.prototype.removeAt = function(index) { this.array_.splice(index, 1); this.updateLength_(); this.dispatchEvent( - new ol.CollectionEvent(ol.CollectionEventType.REMOVE, prev)); + new ol.Collection.Event(ol.Collection.EventType.REMOVE, prev)); return prev; }; @@ -256,9 +209,9 @@ ol.Collection.prototype.setAt = function(index, elem) { var prev = this.array_[index]; this.array_[index] = elem; this.dispatchEvent( - new ol.CollectionEvent(ol.CollectionEventType.REMOVE, prev)); + new ol.Collection.Event(ol.Collection.EventType.REMOVE, prev)); this.dispatchEvent( - new ol.CollectionEvent(ol.CollectionEventType.ADD, elem)); + new ol.Collection.Event(ol.Collection.EventType.ADD, elem)); } else { var j; for (j = n; j < index; ++j) { @@ -275,3 +228,48 @@ ol.Collection.prototype.setAt = function(index, elem) { ol.Collection.prototype.updateLength_ = function() { this.set(ol.CollectionProperty.LENGTH, this.array_.length); }; + + +/** + * @enum {string} + */ +ol.Collection.EventType = { + /** + * Triggered when an item is added to the collection. + * @event ol.Collection.Event#add + * @api stable + */ + ADD: 'add', + /** + * Triggered when an item is removed from the collection. + * @event ol.Collection.Event#remove + * @api stable + */ + REMOVE: 'remove' +}; + + +/** + * @classdesc + * Events emitted by {@link ol.Collection} instances are instances of this + * type. + * + * @constructor + * @extends {ol.events.Event} + * @implements {oli.Collection.Event} + * @param {ol.Collection.EventType} type Type. + * @param {*=} opt_element Element. + */ +ol.Collection.Event = function(type, opt_element) { + + ol.events.Event.call(this, type); + + /** + * The element that is added to or removed from the collection. + * @type {*} + * @api stable + */ + this.element = opt_element; + +}; +ol.inherits(ol.Collection.Event, ol.events.Event); diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modifyinteraction.js index 542bcf2634..c934d14c08 100644 --- a/src/ol/interaction/modifyinteraction.js +++ b/src/ol/interaction/modifyinteraction.js @@ -6,7 +6,6 @@ goog.require('ol.events.Event'); goog.require('ol.events.EventType'); goog.require('ol'); goog.require('ol.Collection'); -goog.require('ol.CollectionEventType'); goog.require('ol.Feature'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserPointerEvent'); @@ -232,9 +231,9 @@ ol.interaction.Modify = function(options) { this.features_ = options.features; this.features_.forEach(this.addFeature_, this); - ol.events.listen(this.features_, ol.CollectionEventType.ADD, + ol.events.listen(this.features_, ol.Collection.EventType.ADD, this.handleFeatureAdd_, this); - ol.events.listen(this.features_, ol.CollectionEventType.REMOVE, + ol.events.listen(this.features_, ol.Collection.EventType.REMOVE, this.handleFeatureRemove_, this); /** @@ -327,7 +326,7 @@ ol.interaction.Modify.prototype.setMap = function(map) { /** - * @param {ol.CollectionEvent} evt Event. + * @param {ol.Collection.Event} evt Event. * @private */ ol.interaction.Modify.prototype.handleFeatureAdd_ = function(evt) { @@ -349,7 +348,7 @@ ol.interaction.Modify.prototype.handleFeatureChange_ = function(evt) { /** - * @param {ol.CollectionEvent} evt Event. + * @param {ol.Collection.Event} evt Event. * @private */ ol.interaction.Modify.prototype.handleFeatureRemove_ = function(evt) { diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/selectinteraction.js index f2e739d2ad..56e11868f8 100644 --- a/src/ol/interaction/selectinteraction.js +++ b/src/ol/interaction/selectinteraction.js @@ -3,7 +3,7 @@ goog.provide('ol.interaction.SelectEvent'); goog.provide('ol.interaction.SelectEventType'); goog.require('ol.functions'); -goog.require('ol.CollectionEventType'); +goog.require('ol.Collection'); goog.require('ol.Feature'); goog.require('ol.array'); goog.require('ol.events'); @@ -185,9 +185,9 @@ ol.interaction.Select = function(opt_options) { this.featureLayerAssociation_ = {}; var features = this.featureOverlay_.getSource().getFeaturesCollection(); - ol.events.listen(features, ol.CollectionEventType.ADD, + ol.events.listen(features, ol.Collection.EventType.ADD, this.addFeature_, this); - ol.events.listen(features, ol.CollectionEventType.REMOVE, + ol.events.listen(features, ol.Collection.EventType.REMOVE, this.removeFeature_, this); }; @@ -355,7 +355,7 @@ ol.interaction.Select.getDefaultStyleFunction = function() { /** - * @param {ol.CollectionEvent} evt Event. + * @param {ol.Collection.Event} evt Event. * @private */ ol.interaction.Select.prototype.addFeature_ = function(evt) { @@ -367,7 +367,7 @@ ol.interaction.Select.prototype.addFeature_ = function(evt) { /** - * @param {ol.CollectionEvent} evt Event. + * @param {ol.Collection.Event} evt Event. * @private */ ol.interaction.Select.prototype.removeFeature_ = function(evt) { diff --git a/src/ol/interaction/snapinteraction.js b/src/ol/interaction/snapinteraction.js index 8276c9d638..fcbb248864 100644 --- a/src/ol/interaction/snapinteraction.js +++ b/src/ol/interaction/snapinteraction.js @@ -3,8 +3,6 @@ goog.provide('ol.interaction.SnapProperty'); goog.require('ol'); goog.require('ol.Collection'); -goog.require('ol.CollectionEvent'); -goog.require('ol.CollectionEventType'); goog.require('ol.Feature'); goog.require('ol.Object'); goog.require('ol.Observable'); @@ -232,14 +230,14 @@ ol.interaction.Snap.prototype.getFeatures_ = function() { /** - * @param {ol.source.VectorEvent|ol.CollectionEvent} evt Event. + * @param {ol.source.VectorEvent|ol.Collection.Event} evt Event. * @private */ ol.interaction.Snap.prototype.handleFeatureAdd_ = function(evt) { var feature; if (evt instanceof ol.source.VectorEvent) { feature = evt.feature; - } else if (evt instanceof ol.CollectionEvent) { + } else if (evt instanceof ol.Collection.Event) { feature = evt.element; } this.addFeature(/** @type {ol.Feature} */ (feature)); @@ -247,14 +245,14 @@ ol.interaction.Snap.prototype.handleFeatureAdd_ = function(evt) { /** - * @param {ol.source.VectorEvent|ol.CollectionEvent} evt Event. + * @param {ol.source.VectorEvent|ol.Collection.Event} evt Event. * @private */ ol.interaction.Snap.prototype.handleFeatureRemove_ = function(evt) { var feature; if (evt instanceof ol.source.VectorEvent) { feature = evt.feature; - } else if (evt instanceof ol.CollectionEvent) { + } else if (evt instanceof ol.Collection.Event) { feature = evt.element; } this.removeFeature(/** @type {ol.Feature} */ (feature)); @@ -342,9 +340,9 @@ ol.interaction.Snap.prototype.setMap = function(map) { if (map) { if (this.features_) { keys.push( - ol.events.listen(this.features_, ol.CollectionEventType.ADD, + ol.events.listen(this.features_, ol.Collection.EventType.ADD, this.handleFeatureAdd_, this), - ol.events.listen(this.features_, ol.CollectionEventType.REMOVE, + ol.events.listen(this.features_, ol.Collection.EventType.REMOVE, this.handleFeatureRemove_, this) ); } else if (this.source_) { diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index 87e6167b5a..c63b6b4cda 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -1,8 +1,6 @@ goog.provide('ol.layer.Group'); goog.require('ol.Collection'); -goog.require('ol.CollectionEvent'); -goog.require('ol.CollectionEventType'); goog.require('ol.Object'); goog.require('ol.ObjectEventType'); goog.require('ol.events'); @@ -97,9 +95,9 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) { var layers = this.getLayers(); this.layersListenerKeys_.push( - ol.events.listen(layers, ol.CollectionEventType.ADD, + ol.events.listen(layers, ol.Collection.EventType.ADD, this.handleLayersAdd_, this), - ol.events.listen(layers, ol.CollectionEventType.REMOVE, + ol.events.listen(layers, ol.Collection.EventType.REMOVE, this.handleLayersRemove_, this)); for (var id in this.listenerKeys_) { @@ -124,7 +122,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) { /** - * @param {ol.CollectionEvent} collectionEvent Collection event. + * @param {ol.Collection.Event} collectionEvent Collection event. * @private */ ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) { @@ -143,7 +141,7 @@ ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) { /** - * @param {ol.CollectionEvent} collectionEvent Collection event. + * @param {ol.Collection.Event} collectionEvent Collection event. * @private */ ol.layer.Group.prototype.handleLayersRemove_ = function(collectionEvent) { diff --git a/src/ol/map.js b/src/ol/map.js index 62e2ca4009..c5b1f2864e 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -7,7 +7,6 @@ goog.provide('ol.MapProperty'); goog.require('goog.async.nextTick'); goog.require('ol.Collection'); -goog.require('ol.CollectionEventType'); goog.require('ol.MapBrowserEvent'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserEventHandler'); @@ -404,17 +403,17 @@ ol.Map = function(options) { control.setMap(this); }, this); - ol.events.listen(this.controls_, ol.CollectionEventType.ADD, + ol.events.listen(this.controls_, ol.Collection.EventType.ADD, /** - * @param {ol.CollectionEvent} event Collection event. + * @param {ol.Collection.Event} event Collection event. */ function(event) { event.element.setMap(this); }, this); - ol.events.listen(this.controls_, ol.CollectionEventType.REMOVE, + ol.events.listen(this.controls_, ol.Collection.EventType.REMOVE, /** - * @param {ol.CollectionEvent} event Collection event. + * @param {ol.Collection.Event} event Collection event. */ function(event) { event.element.setMap(null); @@ -429,17 +428,17 @@ ol.Map = function(options) { interaction.setMap(this); }, this); - ol.events.listen(this.interactions_, ol.CollectionEventType.ADD, + ol.events.listen(this.interactions_, ol.Collection.EventType.ADD, /** - * @param {ol.CollectionEvent} event Collection event. + * @param {ol.Collection.Event} event Collection event. */ function(event) { event.element.setMap(this); }, this); - ol.events.listen(this.interactions_, ol.CollectionEventType.REMOVE, + ol.events.listen(this.interactions_, ol.Collection.EventType.REMOVE, /** - * @param {ol.CollectionEvent} event Collection event. + * @param {ol.Collection.Event} event Collection event. */ function(event) { event.element.setMap(null); @@ -447,17 +446,17 @@ ol.Map = function(options) { this.overlays_.forEach(this.addOverlayInternal_, this); - ol.events.listen(this.overlays_, ol.CollectionEventType.ADD, + ol.events.listen(this.overlays_, ol.Collection.EventType.ADD, /** - * @param {ol.CollectionEvent} event Collection event. + * @param {ol.Collection.Event} event Collection event. */ function(event) { this.addOverlayInternal_(/** @type {ol.Overlay} */ (event.element)); }, this); - ol.events.listen(this.overlays_, ol.CollectionEventType.REMOVE, + ol.events.listen(this.overlays_, ol.Collection.EventType.REMOVE, /** - * @param {ol.CollectionEvent} event Collection event. + * @param {ol.Collection.Event} event Collection event. */ function(event) { var id = event.element.getId(); diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vectorsource.js index 4a0974515c..4cb81e3527 100644 --- a/src/ol/source/vectorsource.js +++ b/src/ol/source/vectorsource.js @@ -7,7 +7,6 @@ goog.provide('ol.source.VectorEventType'); goog.require('ol'); goog.require('ol.Collection'); -goog.require('ol.CollectionEventType'); goog.require('ol.Feature'); goog.require('ol.ObjectEventType'); goog.require('ol.array'); @@ -348,7 +347,7 @@ ol.source.Vector.prototype.bindFeaturesCollection_ = function(collection) { modifyingCollection = false; } }); - ol.events.listen(collection, ol.CollectionEventType.ADD, + ol.events.listen(collection, ol.Collection.EventType.ADD, function(evt) { if (!modifyingCollection) { modifyingCollection = true; @@ -356,7 +355,7 @@ ol.source.Vector.prototype.bindFeaturesCollection_ = function(collection) { modifyingCollection = false; } }, this); - ol.events.listen(collection, ol.CollectionEventType.REMOVE, + ol.events.listen(collection, ol.Collection.EventType.REMOVE, function(evt) { if (!modifyingCollection) { modifyingCollection = true; diff --git a/test/spec/ol/collection.test.js b/test/spec/ol/collection.test.js index 94fd5443e9..468f0eecae 100644 --- a/test/spec/ol/collection.test.js +++ b/test/spec/ol/collection.test.js @@ -114,7 +114,7 @@ describe('ol.collection', function() { it('fires a remove event', function() { var collection = new ol.Collection([0, 1, 2]); var cb = sinon.spy(); - ol.events.listen(collection, ol.CollectionEventType.REMOVE, cb); + ol.events.listen(collection, ol.Collection.EventType.REMOVE, cb); expect(collection.remove(1)).to.eql(1); expect(cb).to.be.called(); expect(cb.lastCall.args[0].element).to.eql(1); @@ -137,11 +137,11 @@ describe('ol.collection', function() { it('does dispatch events', function() { var collection = new ol.Collection(['a', 'b']); var added, removed; - ol.events.listen(collection, ol.CollectionEventType.ADD, function(e) { + ol.events.listen(collection, ol.Collection.EventType.ADD, function(e) { added = e.element; }); ol.events.listen( - collection, ol.CollectionEventType.REMOVE, function(e) { + collection, ol.Collection.EventType.REMOVE, function(e) { removed = e.element; }); collection.setAt(1, 1); @@ -155,7 +155,7 @@ describe('ol.collection', function() { var collection = new ol.Collection(['a']); var removed; ol.events.listen( - collection, ol.CollectionEventType.REMOVE, function(e) { + collection, ol.Collection.EventType.REMOVE, function(e) { removed = e.element; }); collection.pop(); @@ -168,7 +168,7 @@ describe('ol.collection', function() { var collection = new ol.Collection([0, 2]); var added; ol.events.listen( - collection, ol.CollectionEventType.ADD, function(e) { + collection, ol.Collection.EventType.ADD, function(e) { added = e.element; }); collection.insertAt(1, 1); @@ -180,7 +180,7 @@ describe('ol.collection', function() { it('triggers events properly', function() { var added = []; ol.events.listen( - collection, ol.CollectionEventType.ADD, function(e) { + collection, ol.Collection.EventType.ADD, function(e) { added.push(e.element); }); collection.setAt(2, 0); @@ -229,7 +229,7 @@ describe('ol.collection', function() { it('triggers add when pushing', function() { var collection = new ol.Collection(); var elem; - ol.events.listen(collection, ol.CollectionEventType.ADD, function(e) { + ol.events.listen(collection, ol.Collection.EventType.ADD, function(e) { elem = e.element; }); collection.push(1); @@ -246,8 +246,8 @@ describe('ol.collection', function() { }); describe('setAt', function() { it('triggers remove', function() { - ol.events.listen(collection, ol.CollectionEventType.ADD, cb1); - ol.events.listen(collection, ol.CollectionEventType.REMOVE, cb2); + ol.events.listen(collection, ol.Collection.EventType.ADD, cb1); + ol.events.listen(collection, ol.Collection.EventType.REMOVE, cb2); collection.setAt(0, 2); expect(cb2.lastCall.args[0].element).to.eql(1); expect(cb1.lastCall.args[0].element).to.eql(2); @@ -255,7 +255,7 @@ describe('ol.collection', function() { }); describe('pop', function() { it('triggers remove', function() { - ol.events.listen(collection, ol.CollectionEventType.REMOVE, cb1); + ol.events.listen(collection, ol.Collection.EventType.REMOVE, cb1); collection.pop(); expect(cb1.lastCall.args[0].element).to.eql(1); }); @@ -273,7 +273,7 @@ describe('ol.collection', function() { it('fires events', function() { var collection = new ol.Collection(); var elems = []; - ol.events.listen(collection, ol.CollectionEventType.ADD, function(e) { + ol.events.listen(collection, ol.Collection.EventType.ADD, function(e) { elems.push(e.element); }); collection.extend([1, 2]); @@ -286,4 +286,3 @@ describe('ol.collection', function() { goog.require('ol.events'); goog.require('ol.Collection'); -goog.require('ol.CollectionEventType'); From cb1b3a09b3364ab86b82b0e2c9c0437765498cc3 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 10:49:19 -0600 Subject: [PATCH 03/68] Move ol/color/color.js to ol/color.js --- src/ol/{color => }/color.js | 0 src/ol/{color => }/color.jsdoc | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/{color => }/color.js (100%) rename src/ol/{color => }/color.jsdoc (100%) diff --git a/src/ol/color/color.js b/src/ol/color.js similarity index 100% rename from src/ol/color/color.js rename to src/ol/color.js diff --git a/src/ol/color/color.jsdoc b/src/ol/color.jsdoc similarity index 100% rename from src/ol/color/color.jsdoc rename to src/ol/color.jsdoc From f7a02ba6af79368ec5a6a335cc9cff0322027f7f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 10:52:38 -0600 Subject: [PATCH 04/68] Move ol/control/attributioncontrol.js to ol/control/attribution.js --- src/ol/control/{attributioncontrol.js => attribution.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{attributioncontrol.js => attribution.js} (100%) diff --git a/src/ol/control/attributioncontrol.js b/src/ol/control/attribution.js similarity index 100% rename from src/ol/control/attributioncontrol.js rename to src/ol/control/attribution.js From 909253a48f57bfe085242b5aa25661506962ca09 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 10:54:36 -0600 Subject: [PATCH 05/68] Move ol/control/controldefaults.js to ol/control/index.js --- src/ol/control/{controldefaults.js => index.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{controldefaults.js => index.js} (100%) diff --git a/src/ol/control/controldefaults.js b/src/ol/control/index.js similarity index 100% rename from src/ol/control/controldefaults.js rename to src/ol/control/index.js From 571a583e109f76acb4cb23409c7621a592cf5eaa Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:03:37 -0600 Subject: [PATCH 06/68] Move ol/control/fullscreencontrol.js to ol/control/fullscreen.js --- src/ol/control/{fullscreencontrol.js => fullscreen.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{fullscreencontrol.js => fullscreen.js} (100%) diff --git a/src/ol/control/fullscreencontrol.js b/src/ol/control/fullscreen.js similarity index 100% rename from src/ol/control/fullscreencontrol.js rename to src/ol/control/fullscreen.js From f1ebcae72a367cba4d015d37be4854b90ae5ceff Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:04:31 -0600 Subject: [PATCH 07/68] Move ol/control/mousepositioncontrol.js to ol/control/mouseposition.js --- src/ol/control/{mousepositioncontrol.js => mouseposition.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{mousepositioncontrol.js => mouseposition.js} (100%) diff --git a/src/ol/control/mousepositioncontrol.js b/src/ol/control/mouseposition.js similarity index 100% rename from src/ol/control/mousepositioncontrol.js rename to src/ol/control/mouseposition.js From 0e8845230db994ff8d2532f0bd92521c2f448ec3 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:05:16 -0600 Subject: [PATCH 08/68] Move ol/control/rotatecontrol.js to ol/control/rotate.js --- src/ol/control/{rotatecontrol.js => rotate.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{rotatecontrol.js => rotate.js} (100%) diff --git a/src/ol/control/rotatecontrol.js b/src/ol/control/rotate.js similarity index 100% rename from src/ol/control/rotatecontrol.js rename to src/ol/control/rotate.js From 30c4e5c635947aea1de5a8190e9ee4b99a335430 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:05:59 -0600 Subject: [PATCH 09/68] Move ol/control/overviewmapcontrol.js to ol/control/overviewmap.js --- src/ol/control/{overviewmapcontrol.js => overviewmap.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{overviewmapcontrol.js => overviewmap.js} (100%) diff --git a/src/ol/control/overviewmapcontrol.js b/src/ol/control/overviewmap.js similarity index 100% rename from src/ol/control/overviewmapcontrol.js rename to src/ol/control/overviewmap.js From 0c9abf52572539d99b73296373a25ece435ac785 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:07:12 -0600 Subject: [PATCH 10/68] Move ol/control/scalelinecontrol.js to ol/control/scaleline.js --- src/ol/control/{scalelinecontrol.js => scaleline.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{scalelinecontrol.js => scaleline.js} (100%) diff --git a/src/ol/control/scalelinecontrol.js b/src/ol/control/scaleline.js similarity index 100% rename from src/ol/control/scalelinecontrol.js rename to src/ol/control/scaleline.js From c398f1cacbe16e2c1c4dd86fbfe4332a5126f30c Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:08:35 -0600 Subject: [PATCH 11/68] Swap expectations --- test/node/one-provide.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/node/one-provide.js b/test/node/one-provide.js index 53064f03a3..f4a75d7633 100644 --- a/test/node/one-provide.js +++ b/test/node/one-provide.js @@ -57,7 +57,7 @@ describe('each file', () => { ext = '.js'; } const mapped = provide.split('.').map(part => part.toLowerCase()).join(path.sep) + ext; - assert.equal(mapped, file, 'expected provide to be like the path: ' + file); + assert.equal(file, mapped, 'expected path to be like the provide: ' + file); } }); From ce0cb1392daacfbc46f4f6afabb1ef4213ce4b1b Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:09:11 -0600 Subject: [PATCH 12/68] Move ol/control/zoomcontrol.js to ol/control/zoom.js --- src/ol/control/{zoomcontrol.js => zoom.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{zoomcontrol.js => zoom.js} (100%) diff --git a/src/ol/control/zoomcontrol.js b/src/ol/control/zoom.js similarity index 100% rename from src/ol/control/zoomcontrol.js rename to src/ol/control/zoom.js From a53f4b34017ac878467c1b06562d7728155828ae Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:09:45 -0600 Subject: [PATCH 13/68] Move ol/control/zoomslidercontrol.js to ol/control/zoomslider.js --- src/ol/control/{zoomslidercontrol.js => zoomslide.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{zoomslidercontrol.js => zoomslide.js} (100%) diff --git a/src/ol/control/zoomslidercontrol.js b/src/ol/control/zoomslide.js similarity index 100% rename from src/ol/control/zoomslidercontrol.js rename to src/ol/control/zoomslide.js From 395f3bcbcf1ea43141c18790509ab3e0cd36f227 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:10:50 -0600 Subject: [PATCH 14/68] Move ol/control/zoomslide.js to ol/control/zoomslider.js --- src/ol/control/{zoomslide.js => zoomslider.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{zoomslide.js => zoomslider.js} (100%) diff --git a/src/ol/control/zoomslide.js b/src/ol/control/zoomslider.js similarity index 100% rename from src/ol/control/zoomslide.js rename to src/ol/control/zoomslider.js From adbfb7a35561f1efbb4dc329330098688f531135 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:11:24 -0600 Subject: [PATCH 15/68] Move ol/control/zoomtoextentcontrol.js to ol/control/zoomtoextent.js --- src/ol/control/{zoomtoextentcontrol.js => zoomtoextent.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/control/{zoomtoextentcontrol.js => zoomtoextent.js} (100%) diff --git a/src/ol/control/zoomtoextentcontrol.js b/src/ol/control/zoomtoextent.js similarity index 100% rename from src/ol/control/zoomtoextentcontrol.js rename to src/ol/control/zoomtoextent.js From 8e381c1b2a8a584875e2002e1733b5fb61269114 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:12:28 -0600 Subject: [PATCH 16/68] Move ol/dom/dom.js to ol/dom.js --- src/ol/{dom => }/dom.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/{dom => }/dom.js (100%) diff --git a/src/ol/dom/dom.js b/src/ol/dom.js similarity index 100% rename from src/ol/dom/dom.js rename to src/ol/dom.js From cc5b02a40f85071e40d558f5685925bbf97a7c90 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:13:15 -0600 Subject: [PATCH 17/68] Move ol/format/featureformat.js to ol/format/feature.js --- src/ol/format/{featureformat.js => feature.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{featureformat.js => feature.js} (100%) diff --git a/src/ol/format/featureformat.js b/src/ol/format/feature.js similarity index 100% rename from src/ol/format/featureformat.js rename to src/ol/format/feature.js From c452caa51367fb93c9518d430d1ad9abcc568478 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:13:40 -0600 Subject: [PATCH 18/68] Move ol/format/esrijsonformat.js to ol/format/esrijson.js --- src/ol/format/{esrijsonformat.js => esrijson.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{esrijsonformat.js => esrijson.js} (100%) diff --git a/src/ol/format/esrijsonformat.js b/src/ol/format/esrijson.js similarity index 100% rename from src/ol/format/esrijsonformat.js rename to src/ol/format/esrijson.js From ba36e05bd6743911dd37f6d4ec1ed970b183f36f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:15:04 -0600 Subject: [PATCH 19/68] Move ol/format/format.js to ol/format/formattype.js --- src/ol/format/{format.js => formattype.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{format.js => formattype.js} (100%) diff --git a/src/ol/format/format.js b/src/ol/format/formattype.js similarity index 100% rename from src/ol/format/format.js rename to src/ol/format/formattype.js From 0b3db7c56465a4b98775df9aa8f87b73730343df Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:15:34 -0600 Subject: [PATCH 20/68] Move ol/format/geojsonformat.js to ol/format/geojson.js --- src/ol/format/{geojsonformat.js => geojson.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{geojsonformat.js => geojson.js} (100%) diff --git a/src/ol/format/geojsonformat.js b/src/ol/format/geojson.js similarity index 100% rename from src/ol/format/geojsonformat.js rename to src/ol/format/geojson.js From 9a3131084ba43453435dff3f858943b9fe4344f6 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:17:48 -0600 Subject: [PATCH 21/68] Move ol/format/gml/gml2format.js to ol/format/gml2.js --- src/ol/format/{gml/gml2format.js => gml2.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{gml/gml2format.js => gml2.js} (100%) diff --git a/src/ol/format/gml/gml2format.js b/src/ol/format/gml2.js similarity index 100% rename from src/ol/format/gml/gml2format.js rename to src/ol/format/gml2.js From 66f7d3c37046d8a6cf934a7ebeeaf506121adeed Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:18:37 -0600 Subject: [PATCH 22/68] Move ol/format/gml/gml3format.js to ol/format/gml3.js --- src/ol/format/{gml/gml3format.js => gml3.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{gml/gml3format.js => gml3.js} (100%) diff --git a/src/ol/format/gml/gml3format.js b/src/ol/format/gml3.js similarity index 100% rename from src/ol/format/gml/gml3format.js rename to src/ol/format/gml3.js From 9d7479fb653fac92a1727d55df5d991580a33db7 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:20:22 -0600 Subject: [PATCH 23/68] Move ol/format/gml/gmlbaseformat.js to ol/format/gmlbase.js --- src/ol/format/{gml/gmlbaseformat.js => gmlbase.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{gml/gmlbaseformat.js => gmlbase.js} (100%) diff --git a/src/ol/format/gml/gmlbaseformat.js b/src/ol/format/gmlbase.js similarity index 100% rename from src/ol/format/gml/gmlbaseformat.js rename to src/ol/format/gmlbase.js From a7f348f4a54ef447892a6e3f3886430237b6f4f6 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:24:48 -0600 Subject: [PATCH 24/68] Add ol/format/gml.js for ol.format.GML --- src/ol/format/gml.js | 42 ++++++++++++++++++++++++++++++++++++++++++ src/ol/format/gml3.js | 40 ---------------------------------------- 2 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 src/ol/format/gml.js diff --git a/src/ol/format/gml.js b/src/ol/format/gml.js new file mode 100644 index 0000000000..2200af011b --- /dev/null +++ b/src/ol/format/gml.js @@ -0,0 +1,42 @@ +goog.provide('ol.format.GML'); + +goog.require('ol.format.GML3'); + + +/** + * @classdesc + * Feature format for reading and writing data in the GML format + * version 3.1.1. + * Currently only supports GML 3.1.1 Simple Features profile. + * + * @constructor + * @param {olx.format.GMLOptions=} opt_options + * Optional configuration object. + * @extends {ol.format.GMLBase} + * @api stable + */ +ol.format.GML = ol.format.GML3; + + +/** + * Encode an array of features in GML 3.1.1 Simple Features. + * + * @function + * @param {Array.} features Features. + * @param {olx.format.WriteOptions=} opt_options Options. + * @return {string} Result. + * @api stable + */ +ol.format.GML.prototype.writeFeatures; + + +/** + * Encode an array of features in the GML 3.1.1 format as an XML node. + * + * @function + * @param {Array.} features Features. + * @param {olx.format.WriteOptions=} opt_options Options. + * @return {Node} Node. + * @api + */ +ol.format.GML.prototype.writeFeaturesNode; diff --git a/src/ol/format/gml3.js b/src/ol/format/gml3.js index 32455cfe23..da0fa63353 100644 --- a/src/ol/format/gml3.js +++ b/src/ol/format/gml3.js @@ -1,4 +1,3 @@ -goog.provide('ol.format.GML'); goog.provide('ol.format.GML3'); goog.require('ol'); @@ -1292,42 +1291,3 @@ ol.format.GML3.prototype.writeFeaturesNode = function(features, opt_options) { this.writeFeatureMembers_(node, features, [context]); return node; }; - - -/** - * @classdesc - * Feature format for reading and writing data in the GML format - * version 3.1.1. - * Currently only supports GML 3.1.1 Simple Features profile. - * - * @constructor - * @param {olx.format.GMLOptions=} opt_options - * Optional configuration object. - * @extends {ol.format.GMLBase} - * @api stable - */ -ol.format.GML = ol.format.GML3; - - -/** - * Encode an array of features in GML 3.1.1 Simple Features. - * - * @function - * @param {Array.} features Features. - * @param {olx.format.WriteOptions=} opt_options Options. - * @return {string} Result. - * @api stable - */ -ol.format.GML.prototype.writeFeatures; - - -/** - * Encode an array of features in the GML 3.1.1 format as an XML node. - * - * @function - * @param {Array.} features Features. - * @param {olx.format.WriteOptions=} opt_options Options. - * @return {Node} Node. - * @api - */ -ol.format.GML.prototype.writeFeaturesNode; From 23d5bb58891432339730f9265703405a54fc0706 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:25:32 -0600 Subject: [PATCH 25/68] Move ol/format/gpxformat.js to ol/format/gpx.js --- src/ol/format/{gpxformat.js => gpx.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{gpxformat.js => gpx.js} (100%) diff --git a/src/ol/format/gpxformat.js b/src/ol/format/gpx.js similarity index 100% rename from src/ol/format/gpxformat.js rename to src/ol/format/gpx.js From 5d22542a38d570340d3a80987ddc33e93abc3783 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:26:03 -0600 Subject: [PATCH 26/68] Move ol/format/igcformat.js to ol/format/igc.js --- src/ol/format/{igcformat.js => igc.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{igcformat.js => igc.js} (100%) diff --git a/src/ol/format/igcformat.js b/src/ol/format/igc.js similarity index 100% rename from src/ol/format/igcformat.js rename to src/ol/format/igc.js From 5134c13f5b7fcb11c58aa9878c75dd86c5a90fca Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:26:41 -0600 Subject: [PATCH 27/68] Move ol/format/jsonfeatureformat.js to ol/format/jsonfeature.js --- src/ol/format/{jsonfeatureformat.js => jsonfeature.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{jsonfeatureformat.js => jsonfeature.js} (100%) diff --git a/src/ol/format/jsonfeatureformat.js b/src/ol/format/jsonfeature.js similarity index 100% rename from src/ol/format/jsonfeatureformat.js rename to src/ol/format/jsonfeature.js From c6880e5d23ec5ab01ea75ea4bb59194363fad3b4 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:27:12 -0600 Subject: [PATCH 28/68] Move ol/format/kmlformat.js to ol/format/kml.js --- src/ol/format/{kmlformat.js => kml.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{kmlformat.js => kml.js} (100%) diff --git a/src/ol/format/kmlformat.js b/src/ol/format/kml.js similarity index 100% rename from src/ol/format/kmlformat.js rename to src/ol/format/kml.js From 458b35d5d6c9d6fc0dd333fc151d5cdc110be5e1 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:27:38 -0600 Subject: [PATCH 29/68] Move ol/format/mvtformat.js to ol/format/mvt.js --- src/ol/format/{mvtformat.js => mvt.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{mvtformat.js => mvt.js} (100%) diff --git a/src/ol/format/mvtformat.js b/src/ol/format/mvt.js similarity index 100% rename from src/ol/format/mvtformat.js rename to src/ol/format/mvt.js From 24e9751f40c6fb20c8d190b80b03737d3ebfb495 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:28:10 -0600 Subject: [PATCH 30/68] Move ol/format/osmxmlformat.js to ol/format/osmxml.js --- src/ol/format/{osmxmlformat.js => osmxml.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{osmxmlformat.js => osmxml.js} (100%) diff --git a/src/ol/format/osmxmlformat.js b/src/ol/format/osmxml.js similarity index 100% rename from src/ol/format/osmxmlformat.js rename to src/ol/format/osmxml.js From 8e1b084906ac50a8250d525578f5d9c8f900bc77 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:28:41 -0600 Subject: [PATCH 31/68] Move ol/format/owsformat.js to ol/format/ows.js --- src/ol/format/{owsformat.js => ows.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{owsformat.js => ows.js} (100%) diff --git a/src/ol/format/owsformat.js b/src/ol/format/ows.js similarity index 100% rename from src/ol/format/owsformat.js rename to src/ol/format/ows.js From 35e7addb5ed23c82f0dec29e0850496c9602fed9 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:29:12 -0600 Subject: [PATCH 32/68] Move ol/format/polylineformat.js to ol/format/polyline.js --- src/ol/format/{polylineformat.js => polyline.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{polylineformat.js => polyline.js} (100%) diff --git a/src/ol/format/polylineformat.js b/src/ol/format/polyline.js similarity index 100% rename from src/ol/format/polylineformat.js rename to src/ol/format/polyline.js From 257e54645cdc80101e32686677568ecd9a00d836 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:29:43 -0600 Subject: [PATCH 33/68] Move ol/format/textfeatureformat.js to ol/format/textfeature.js --- src/ol/format/{textfeatureformat.js => textfeature.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{textfeatureformat.js => textfeature.js} (100%) diff --git a/src/ol/format/textfeatureformat.js b/src/ol/format/textfeature.js similarity index 100% rename from src/ol/format/textfeatureformat.js rename to src/ol/format/textfeature.js From 2a539ea7a4fdab478f85a258fa6d2ea037e2c5d1 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:30:08 -0600 Subject: [PATCH 34/68] Move ol/format/topojsonformat.js to ol/format/topojson.js --- src/ol/format/{topojsonformat.js => topojson.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{topojsonformat.js => topojson.js} (100%) diff --git a/src/ol/format/topojsonformat.js b/src/ol/format/topojson.js similarity index 100% rename from src/ol/format/topojsonformat.js rename to src/ol/format/topojson.js From e0adcc0175d5a843beb6db7f2b866a5b665220c8 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:30:43 -0600 Subject: [PATCH 35/68] Move ol/format/wfsformat.js to ol/format/wfs.js --- src/ol/format/{wfsformat.js => wfs.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{wfsformat.js => wfs.js} (100%) diff --git a/src/ol/format/wfsformat.js b/src/ol/format/wfs.js similarity index 100% rename from src/ol/format/wfsformat.js rename to src/ol/format/wfs.js From a1e06297abc0144f0d97a2a2e92f17ab44697638 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:31:27 -0600 Subject: [PATCH 36/68] Move ol/format/wmsgetfeatureinfoformat.js to ol/format/wmsgetfeatureinfo.js --- .../format/{wmsgetfeatureinfoformat.js => wmsgetfeatureinfo.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{wmsgetfeatureinfoformat.js => wmsgetfeatureinfo.js} (100%) diff --git a/src/ol/format/wmsgetfeatureinfoformat.js b/src/ol/format/wmsgetfeatureinfo.js similarity index 100% rename from src/ol/format/wmsgetfeatureinfoformat.js rename to src/ol/format/wmsgetfeatureinfo.js From eba48454dc9004a79dad30e0713bf4c37766dae9 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:31:54 -0600 Subject: [PATCH 37/68] Move ol/format/wktformat.js to ol/format/wkt.js --- src/ol/format/{wktformat.js => wkt.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{wktformat.js => wkt.js} (100%) diff --git a/src/ol/format/wktformat.js b/src/ol/format/wkt.js similarity index 100% rename from src/ol/format/wktformat.js rename to src/ol/format/wkt.js From 71a2f1b9af92a1cd9d4cae24b460a6d42ec722fa Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:32:15 -0600 Subject: [PATCH 38/68] Move ol/format/wmscapabilitiesformat.js to ol/format/wmscapabilities.js --- src/ol/format/{wmscapabilitiesformat.js => wmscapabilities.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{wmscapabilitiesformat.js => wmscapabilities.js} (100%) diff --git a/src/ol/format/wmscapabilitiesformat.js b/src/ol/format/wmscapabilities.js similarity index 100% rename from src/ol/format/wmscapabilitiesformat.js rename to src/ol/format/wmscapabilities.js From 62403c578019887735a81ccabbda96cd6bf8f43f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:32:44 -0600 Subject: [PATCH 39/68] Move ol/format/wmtscapabilitiesformat.js to ol/format/wmtscapabilities.js --- src/ol/format/{wmtscapabilitiesformat.js => wmtscapabilities.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{wmtscapabilitiesformat.js => wmtscapabilities.js} (100%) diff --git a/src/ol/format/wmtscapabilitiesformat.js b/src/ol/format/wmtscapabilities.js similarity index 100% rename from src/ol/format/wmtscapabilitiesformat.js rename to src/ol/format/wmtscapabilities.js From db6fa60937c997ffda127952c87b46ee918271f4 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:33:12 -0600 Subject: [PATCH 40/68] Move ol/format/xlinkformat.js to ol/format/xlink.js --- src/ol/format/{xlinkformat.js => xlink.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{xlinkformat.js => xlink.js} (100%) diff --git a/src/ol/format/xlinkformat.js b/src/ol/format/xlink.js similarity index 100% rename from src/ol/format/xlinkformat.js rename to src/ol/format/xlink.js From 9827937faf48ff780bcd19939df76cac13b65d42 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:33:51 -0600 Subject: [PATCH 41/68] Move ol/format/xmlfeatureformat.js to ol/format/xmlfeature.js --- src/ol/format/{xmlfeatureformat.js => xmlfeature.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{xmlfeatureformat.js => xmlfeature.js} (100%) diff --git a/src/ol/format/xmlfeatureformat.js b/src/ol/format/xmlfeature.js similarity index 100% rename from src/ol/format/xmlfeatureformat.js rename to src/ol/format/xmlfeature.js From 4f51149ff169460bc03af5b33f2463440f874f3f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:34:16 -0600 Subject: [PATCH 42/68] Move ol/format/xmlformat.js to ol/format/xml.js --- src/ol/format/{xmlformat.js => xml.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{xmlformat.js => xml.js} (100%) diff --git a/src/ol/format/xmlformat.js b/src/ol/format/xml.js similarity index 100% rename from src/ol/format/xmlformat.js rename to src/ol/format/xml.js From 2e88cc7daf30011ab61ef42ebef71542e1182e10 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:34:38 -0600 Subject: [PATCH 43/68] Move ol/format/xsdformat.js to ol/format/xsd.js --- src/ol/format/{xsdformat.js => xsd.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/format/{xsdformat.js => xsd.js} (100%) diff --git a/src/ol/format/xsdformat.js b/src/ol/format/xsd.js similarity index 100% rename from src/ol/format/xsdformat.js rename to src/ol/format/xsd.js From 684af3503c6ae32b444f03d214431b13fb2254b1 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:35:55 -0600 Subject: [PATCH 44/68] Move ol/geom/flat/areaflatgeom.js to ol/geom/flat/area.js --- src/ol/geom/flat/{areaflatgeom.js => area.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/geom/flat/{areaflatgeom.js => area.js} (100%) diff --git a/src/ol/geom/flat/areaflatgeom.js b/src/ol/geom/flat/area.js similarity index 100% rename from src/ol/geom/flat/areaflatgeom.js rename to src/ol/geom/flat/area.js From 386e215b47790f6f5399ac4d4e2b7e665088dfd4 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:43:14 -0600 Subject: [PATCH 45/68] Rename control tests for consistency --- .../ol/control/{fullscreencontrol.test.js => fullscreen.test.js} | 0 .../{mousepositioncontrol.test.js => mouseposition.test.js} | 0 .../control/{overviewmapcontrol.test.js => overviewmap.test.js} | 0 test/spec/ol/control/{rotatecontrol.test.js => rotate.test.js} | 0 .../ol/control/{scalelinecontrol.test.js => scaleline.test.js} | 0 test/spec/ol/control/{zoomcontrol.test.js => zoom.test.js} | 0 .../ol/control/{zoomslidercontrol.test.js => zoomslider.test.js} | 0 .../control/{zoomtoextentcontrol.test.js => zoomtoextent.test.js} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename test/spec/ol/control/{fullscreencontrol.test.js => fullscreen.test.js} (100%) rename test/spec/ol/control/{mousepositioncontrol.test.js => mouseposition.test.js} (100%) rename test/spec/ol/control/{overviewmapcontrol.test.js => overviewmap.test.js} (100%) rename test/spec/ol/control/{rotatecontrol.test.js => rotate.test.js} (100%) rename test/spec/ol/control/{scalelinecontrol.test.js => scaleline.test.js} (100%) rename test/spec/ol/control/{zoomcontrol.test.js => zoom.test.js} (100%) rename test/spec/ol/control/{zoomslidercontrol.test.js => zoomslider.test.js} (100%) rename test/spec/ol/control/{zoomtoextentcontrol.test.js => zoomtoextent.test.js} (100%) diff --git a/test/spec/ol/control/fullscreencontrol.test.js b/test/spec/ol/control/fullscreen.test.js similarity index 100% rename from test/spec/ol/control/fullscreencontrol.test.js rename to test/spec/ol/control/fullscreen.test.js diff --git a/test/spec/ol/control/mousepositioncontrol.test.js b/test/spec/ol/control/mouseposition.test.js similarity index 100% rename from test/spec/ol/control/mousepositioncontrol.test.js rename to test/spec/ol/control/mouseposition.test.js diff --git a/test/spec/ol/control/overviewmapcontrol.test.js b/test/spec/ol/control/overviewmap.test.js similarity index 100% rename from test/spec/ol/control/overviewmapcontrol.test.js rename to test/spec/ol/control/overviewmap.test.js diff --git a/test/spec/ol/control/rotatecontrol.test.js b/test/spec/ol/control/rotate.test.js similarity index 100% rename from test/spec/ol/control/rotatecontrol.test.js rename to test/spec/ol/control/rotate.test.js diff --git a/test/spec/ol/control/scalelinecontrol.test.js b/test/spec/ol/control/scaleline.test.js similarity index 100% rename from test/spec/ol/control/scalelinecontrol.test.js rename to test/spec/ol/control/scaleline.test.js diff --git a/test/spec/ol/control/zoomcontrol.test.js b/test/spec/ol/control/zoom.test.js similarity index 100% rename from test/spec/ol/control/zoomcontrol.test.js rename to test/spec/ol/control/zoom.test.js diff --git a/test/spec/ol/control/zoomslidercontrol.test.js b/test/spec/ol/control/zoomslider.test.js similarity index 100% rename from test/spec/ol/control/zoomslidercontrol.test.js rename to test/spec/ol/control/zoomslider.test.js diff --git a/test/spec/ol/control/zoomtoextentcontrol.test.js b/test/spec/ol/control/zoomtoextent.test.js similarity index 100% rename from test/spec/ol/control/zoomtoextentcontrol.test.js rename to test/spec/ol/control/zoomtoextent.test.js From e8205a8293b4c4c1316f861bc2224db84d3bbb66 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:52:05 -0600 Subject: [PATCH 46/68] Rename format tests for consistency --- test/spec/ol/format/{esrijsonformat.test.js => esrijson.test.js} | 0 test/spec/ol/format/{geojsonformat.test.js => geojson.test.js} | 0 test/spec/ol/format/{gmlformat.test.js => gml.test.js} | 0 test/spec/ol/format/{gpxformat.test.js => gpx.test.js} | 0 test/spec/ol/format/{igcformat.test.js => igc.test.js} | 0 test/spec/ol/format/{kmlformat.test.js => kml.test.js} | 0 test/spec/ol/format/{mvtformat.test.js => mvt.test.js} | 0 test/spec/ol/format/{osmxmlformat.test.js => osmxml.test.js} | 0 test/spec/ol/format/{owsformat.test.js => ows.test.js} | 0 test/spec/ol/format/{polylineformat.test.js => polyline.test.js} | 0 test/spec/ol/format/{wfsformat.test.js => wfs.test.js} | 0 test/spec/ol/format/{wktformat.test.js => wkt.test.js} | 0 ...{wmsgetfeatureinfoformat.test.js => wmsgetfeatureinfo.test.js} | 0 .../{wmtscapabilitiesformat.test.js => wmtscapabilities.test.js} | 0 test/spec/ol/format/{xsdformat.test.js => xsd.test.js} | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename test/spec/ol/format/{esrijsonformat.test.js => esrijson.test.js} (100%) rename test/spec/ol/format/{geojsonformat.test.js => geojson.test.js} (100%) rename test/spec/ol/format/{gmlformat.test.js => gml.test.js} (100%) rename test/spec/ol/format/{gpxformat.test.js => gpx.test.js} (100%) rename test/spec/ol/format/{igcformat.test.js => igc.test.js} (100%) rename test/spec/ol/format/{kmlformat.test.js => kml.test.js} (100%) rename test/spec/ol/format/{mvtformat.test.js => mvt.test.js} (100%) rename test/spec/ol/format/{osmxmlformat.test.js => osmxml.test.js} (100%) rename test/spec/ol/format/{owsformat.test.js => ows.test.js} (100%) rename test/spec/ol/format/{polylineformat.test.js => polyline.test.js} (100%) rename test/spec/ol/format/{wfsformat.test.js => wfs.test.js} (100%) rename test/spec/ol/format/{wktformat.test.js => wkt.test.js} (100%) rename test/spec/ol/format/{wmsgetfeatureinfoformat.test.js => wmsgetfeatureinfo.test.js} (100%) rename test/spec/ol/format/{wmtscapabilitiesformat.test.js => wmtscapabilities.test.js} (100%) rename test/spec/ol/format/{xsdformat.test.js => xsd.test.js} (100%) diff --git a/test/spec/ol/format/esrijsonformat.test.js b/test/spec/ol/format/esrijson.test.js similarity index 100% rename from test/spec/ol/format/esrijsonformat.test.js rename to test/spec/ol/format/esrijson.test.js diff --git a/test/spec/ol/format/geojsonformat.test.js b/test/spec/ol/format/geojson.test.js similarity index 100% rename from test/spec/ol/format/geojsonformat.test.js rename to test/spec/ol/format/geojson.test.js diff --git a/test/spec/ol/format/gmlformat.test.js b/test/spec/ol/format/gml.test.js similarity index 100% rename from test/spec/ol/format/gmlformat.test.js rename to test/spec/ol/format/gml.test.js diff --git a/test/spec/ol/format/gpxformat.test.js b/test/spec/ol/format/gpx.test.js similarity index 100% rename from test/spec/ol/format/gpxformat.test.js rename to test/spec/ol/format/gpx.test.js diff --git a/test/spec/ol/format/igcformat.test.js b/test/spec/ol/format/igc.test.js similarity index 100% rename from test/spec/ol/format/igcformat.test.js rename to test/spec/ol/format/igc.test.js diff --git a/test/spec/ol/format/kmlformat.test.js b/test/spec/ol/format/kml.test.js similarity index 100% rename from test/spec/ol/format/kmlformat.test.js rename to test/spec/ol/format/kml.test.js diff --git a/test/spec/ol/format/mvtformat.test.js b/test/spec/ol/format/mvt.test.js similarity index 100% rename from test/spec/ol/format/mvtformat.test.js rename to test/spec/ol/format/mvt.test.js diff --git a/test/spec/ol/format/osmxmlformat.test.js b/test/spec/ol/format/osmxml.test.js similarity index 100% rename from test/spec/ol/format/osmxmlformat.test.js rename to test/spec/ol/format/osmxml.test.js diff --git a/test/spec/ol/format/owsformat.test.js b/test/spec/ol/format/ows.test.js similarity index 100% rename from test/spec/ol/format/owsformat.test.js rename to test/spec/ol/format/ows.test.js diff --git a/test/spec/ol/format/polylineformat.test.js b/test/spec/ol/format/polyline.test.js similarity index 100% rename from test/spec/ol/format/polylineformat.test.js rename to test/spec/ol/format/polyline.test.js diff --git a/test/spec/ol/format/wfsformat.test.js b/test/spec/ol/format/wfs.test.js similarity index 100% rename from test/spec/ol/format/wfsformat.test.js rename to test/spec/ol/format/wfs.test.js diff --git a/test/spec/ol/format/wktformat.test.js b/test/spec/ol/format/wkt.test.js similarity index 100% rename from test/spec/ol/format/wktformat.test.js rename to test/spec/ol/format/wkt.test.js diff --git a/test/spec/ol/format/wmsgetfeatureinfoformat.test.js b/test/spec/ol/format/wmsgetfeatureinfo.test.js similarity index 100% rename from test/spec/ol/format/wmsgetfeatureinfoformat.test.js rename to test/spec/ol/format/wmsgetfeatureinfo.test.js diff --git a/test/spec/ol/format/wmtscapabilitiesformat.test.js b/test/spec/ol/format/wmtscapabilities.test.js similarity index 100% rename from test/spec/ol/format/wmtscapabilitiesformat.test.js rename to test/spec/ol/format/wmtscapabilities.test.js diff --git a/test/spec/ol/format/xsdformat.test.js b/test/spec/ol/format/xsd.test.js similarity index 100% rename from test/spec/ol/format/xsdformat.test.js rename to test/spec/ol/format/xsd.test.js From 035885c25dd220c1323abbf07091b167415bca29 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 11:58:07 -0600 Subject: [PATCH 47/68] Move interaction files so they are named like their provides --- .../{doubleclickzoominteraction.js => doubleclickzoom.js} | 0 src/ol/interaction/{draganddropinteraction.js => draganddrop.js} | 0 src/ol/interaction/{dragboxinteraction.js => dragbox.js} | 0 src/ol/interaction/{dragpaninteraction.js => dragpan.js} | 0 src/ol/interaction/{dragrotateinteraction.js => dragrotate.js} | 0 .../{dragrotateandzoominteraction.js => dragrotateandzoom.js} | 0 src/ol/interaction/{dragzoominteraction.js => dragzoom.js} | 0 src/ol/interaction/{drawinteraction.js => draw.js} | 0 src/ol/interaction/{interactiondefaults.js => index.js} | 0 src/ol/interaction/{keyboardpaninteraction.js => keyboardpan.js} | 0 .../interaction/{keyboardzoominteraction.js => keyboardzoom.js} | 0 src/ol/interaction/{modifyinteraction.js => modify.js} | 0 .../{mousewheelzoominteraction.js => mousewheelzoom.js} | 0 src/ol/interaction/{pinchrotateinteraction.js => pinchrotate.js} | 0 src/ol/interaction/{pinchzoominteraction.js => pinchzoom.js} | 0 src/ol/interaction/{pointerinteraction.js => pointer.js} | 0 src/ol/interaction/{selectinteraction.js => select.js} | 0 src/ol/interaction/{snapinteraction.js => snap.js} | 0 src/ol/interaction/{translateinteraction.js => translate.js} | 0 .../{draganddropinteraction.test.js => draganddrop.test.js} | 0 ...rotateandzoominteraction.test.js => dragrotateandzoom.test.js} | 0 .../interaction/{dragzoominteraction.test.js => dragzoom.test.js} | 0 .../spec/ol/interaction/{drawinteraction.test.js => draw.test.js} | 0 .../{keyboardpaninteraction.test.js => keyboardpan.test.js} | 0 .../{keyboardzoominteraction.test.js => keyboardzoom.test.js} | 0 .../ol/interaction/{modifyinteraction.test.js => modify.test.js} | 0 .../{mousewheelzoominteraction.test.js => mousewheelzoom.test.js} | 0 .../ol/interaction/{selectinteraction.test.js => select.test.js} | 0 .../spec/ol/interaction/{snapinteraction.test.js => snap.test.js} | 0 .../{translateinteraction.test.js => translate.test.js} | 0 30 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/interaction/{doubleclickzoominteraction.js => doubleclickzoom.js} (100%) rename src/ol/interaction/{draganddropinteraction.js => draganddrop.js} (100%) rename src/ol/interaction/{dragboxinteraction.js => dragbox.js} (100%) rename src/ol/interaction/{dragpaninteraction.js => dragpan.js} (100%) rename src/ol/interaction/{dragrotateinteraction.js => dragrotate.js} (100%) rename src/ol/interaction/{dragrotateandzoominteraction.js => dragrotateandzoom.js} (100%) rename src/ol/interaction/{dragzoominteraction.js => dragzoom.js} (100%) rename src/ol/interaction/{drawinteraction.js => draw.js} (100%) rename src/ol/interaction/{interactiondefaults.js => index.js} (100%) rename src/ol/interaction/{keyboardpaninteraction.js => keyboardpan.js} (100%) rename src/ol/interaction/{keyboardzoominteraction.js => keyboardzoom.js} (100%) rename src/ol/interaction/{modifyinteraction.js => modify.js} (100%) rename src/ol/interaction/{mousewheelzoominteraction.js => mousewheelzoom.js} (100%) rename src/ol/interaction/{pinchrotateinteraction.js => pinchrotate.js} (100%) rename src/ol/interaction/{pinchzoominteraction.js => pinchzoom.js} (100%) rename src/ol/interaction/{pointerinteraction.js => pointer.js} (100%) rename src/ol/interaction/{selectinteraction.js => select.js} (100%) rename src/ol/interaction/{snapinteraction.js => snap.js} (100%) rename src/ol/interaction/{translateinteraction.js => translate.js} (100%) rename test/spec/ol/interaction/{draganddropinteraction.test.js => draganddrop.test.js} (100%) rename test/spec/ol/interaction/{dragrotateandzoominteraction.test.js => dragrotateandzoom.test.js} (100%) rename test/spec/ol/interaction/{dragzoominteraction.test.js => dragzoom.test.js} (100%) rename test/spec/ol/interaction/{drawinteraction.test.js => draw.test.js} (100%) rename test/spec/ol/interaction/{keyboardpaninteraction.test.js => keyboardpan.test.js} (100%) rename test/spec/ol/interaction/{keyboardzoominteraction.test.js => keyboardzoom.test.js} (100%) rename test/spec/ol/interaction/{modifyinteraction.test.js => modify.test.js} (100%) rename test/spec/ol/interaction/{mousewheelzoominteraction.test.js => mousewheelzoom.test.js} (100%) rename test/spec/ol/interaction/{selectinteraction.test.js => select.test.js} (100%) rename test/spec/ol/interaction/{snapinteraction.test.js => snap.test.js} (100%) rename test/spec/ol/interaction/{translateinteraction.test.js => translate.test.js} (100%) diff --git a/src/ol/interaction/doubleclickzoominteraction.js b/src/ol/interaction/doubleclickzoom.js similarity index 100% rename from src/ol/interaction/doubleclickzoominteraction.js rename to src/ol/interaction/doubleclickzoom.js diff --git a/src/ol/interaction/draganddropinteraction.js b/src/ol/interaction/draganddrop.js similarity index 100% rename from src/ol/interaction/draganddropinteraction.js rename to src/ol/interaction/draganddrop.js diff --git a/src/ol/interaction/dragboxinteraction.js b/src/ol/interaction/dragbox.js similarity index 100% rename from src/ol/interaction/dragboxinteraction.js rename to src/ol/interaction/dragbox.js diff --git a/src/ol/interaction/dragpaninteraction.js b/src/ol/interaction/dragpan.js similarity index 100% rename from src/ol/interaction/dragpaninteraction.js rename to src/ol/interaction/dragpan.js diff --git a/src/ol/interaction/dragrotateinteraction.js b/src/ol/interaction/dragrotate.js similarity index 100% rename from src/ol/interaction/dragrotateinteraction.js rename to src/ol/interaction/dragrotate.js diff --git a/src/ol/interaction/dragrotateandzoominteraction.js b/src/ol/interaction/dragrotateandzoom.js similarity index 100% rename from src/ol/interaction/dragrotateandzoominteraction.js rename to src/ol/interaction/dragrotateandzoom.js diff --git a/src/ol/interaction/dragzoominteraction.js b/src/ol/interaction/dragzoom.js similarity index 100% rename from src/ol/interaction/dragzoominteraction.js rename to src/ol/interaction/dragzoom.js diff --git a/src/ol/interaction/drawinteraction.js b/src/ol/interaction/draw.js similarity index 100% rename from src/ol/interaction/drawinteraction.js rename to src/ol/interaction/draw.js diff --git a/src/ol/interaction/interactiondefaults.js b/src/ol/interaction/index.js similarity index 100% rename from src/ol/interaction/interactiondefaults.js rename to src/ol/interaction/index.js diff --git a/src/ol/interaction/keyboardpaninteraction.js b/src/ol/interaction/keyboardpan.js similarity index 100% rename from src/ol/interaction/keyboardpaninteraction.js rename to src/ol/interaction/keyboardpan.js diff --git a/src/ol/interaction/keyboardzoominteraction.js b/src/ol/interaction/keyboardzoom.js similarity index 100% rename from src/ol/interaction/keyboardzoominteraction.js rename to src/ol/interaction/keyboardzoom.js diff --git a/src/ol/interaction/modifyinteraction.js b/src/ol/interaction/modify.js similarity index 100% rename from src/ol/interaction/modifyinteraction.js rename to src/ol/interaction/modify.js diff --git a/src/ol/interaction/mousewheelzoominteraction.js b/src/ol/interaction/mousewheelzoom.js similarity index 100% rename from src/ol/interaction/mousewheelzoominteraction.js rename to src/ol/interaction/mousewheelzoom.js diff --git a/src/ol/interaction/pinchrotateinteraction.js b/src/ol/interaction/pinchrotate.js similarity index 100% rename from src/ol/interaction/pinchrotateinteraction.js rename to src/ol/interaction/pinchrotate.js diff --git a/src/ol/interaction/pinchzoominteraction.js b/src/ol/interaction/pinchzoom.js similarity index 100% rename from src/ol/interaction/pinchzoominteraction.js rename to src/ol/interaction/pinchzoom.js diff --git a/src/ol/interaction/pointerinteraction.js b/src/ol/interaction/pointer.js similarity index 100% rename from src/ol/interaction/pointerinteraction.js rename to src/ol/interaction/pointer.js diff --git a/src/ol/interaction/selectinteraction.js b/src/ol/interaction/select.js similarity index 100% rename from src/ol/interaction/selectinteraction.js rename to src/ol/interaction/select.js diff --git a/src/ol/interaction/snapinteraction.js b/src/ol/interaction/snap.js similarity index 100% rename from src/ol/interaction/snapinteraction.js rename to src/ol/interaction/snap.js diff --git a/src/ol/interaction/translateinteraction.js b/src/ol/interaction/translate.js similarity index 100% rename from src/ol/interaction/translateinteraction.js rename to src/ol/interaction/translate.js diff --git a/test/spec/ol/interaction/draganddropinteraction.test.js b/test/spec/ol/interaction/draganddrop.test.js similarity index 100% rename from test/spec/ol/interaction/draganddropinteraction.test.js rename to test/spec/ol/interaction/draganddrop.test.js diff --git a/test/spec/ol/interaction/dragrotateandzoominteraction.test.js b/test/spec/ol/interaction/dragrotateandzoom.test.js similarity index 100% rename from test/spec/ol/interaction/dragrotateandzoominteraction.test.js rename to test/spec/ol/interaction/dragrotateandzoom.test.js diff --git a/test/spec/ol/interaction/dragzoominteraction.test.js b/test/spec/ol/interaction/dragzoom.test.js similarity index 100% rename from test/spec/ol/interaction/dragzoominteraction.test.js rename to test/spec/ol/interaction/dragzoom.test.js diff --git a/test/spec/ol/interaction/drawinteraction.test.js b/test/spec/ol/interaction/draw.test.js similarity index 100% rename from test/spec/ol/interaction/drawinteraction.test.js rename to test/spec/ol/interaction/draw.test.js diff --git a/test/spec/ol/interaction/keyboardpaninteraction.test.js b/test/spec/ol/interaction/keyboardpan.test.js similarity index 100% rename from test/spec/ol/interaction/keyboardpaninteraction.test.js rename to test/spec/ol/interaction/keyboardpan.test.js diff --git a/test/spec/ol/interaction/keyboardzoominteraction.test.js b/test/spec/ol/interaction/keyboardzoom.test.js similarity index 100% rename from test/spec/ol/interaction/keyboardzoominteraction.test.js rename to test/spec/ol/interaction/keyboardzoom.test.js diff --git a/test/spec/ol/interaction/modifyinteraction.test.js b/test/spec/ol/interaction/modify.test.js similarity index 100% rename from test/spec/ol/interaction/modifyinteraction.test.js rename to test/spec/ol/interaction/modify.test.js diff --git a/test/spec/ol/interaction/mousewheelzoominteraction.test.js b/test/spec/ol/interaction/mousewheelzoom.test.js similarity index 100% rename from test/spec/ol/interaction/mousewheelzoominteraction.test.js rename to test/spec/ol/interaction/mousewheelzoom.test.js diff --git a/test/spec/ol/interaction/selectinteraction.test.js b/test/spec/ol/interaction/select.test.js similarity index 100% rename from test/spec/ol/interaction/selectinteraction.test.js rename to test/spec/ol/interaction/select.test.js diff --git a/test/spec/ol/interaction/snapinteraction.test.js b/test/spec/ol/interaction/snap.test.js similarity index 100% rename from test/spec/ol/interaction/snapinteraction.test.js rename to test/spec/ol/interaction/snap.test.js diff --git a/test/spec/ol/interaction/translateinteraction.test.js b/test/spec/ol/interaction/translate.test.js similarity index 100% rename from test/spec/ol/interaction/translateinteraction.test.js rename to test/spec/ol/interaction/translate.test.js From f07f78fbd7b7e13b9c9e6f932e5ccfa07eded3ac Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 12:33:00 -0600 Subject: [PATCH 48/68] Move flat geom files so they are named like their provides --- src/ol/geom/flat/{centerflatgeom.js => center.js} | 0 src/ol/geom/flat/{closestflatgeom.js => closest.js} | 0 src/ol/geom/flat/{containsflatgeom.js => contains.js} | 0 src/ol/geom/flat/{deflateflatgeom.js => deflate.js} | 0 src/ol/geom/flat/{flipflatgeom.js => flip.js} | 0 src/ol/geom/flat/{geodesicflatgeom.js => geodesic.js} | 0 src/ol/geom/flat/{inflateflatgeom.js => inflate.js} | 0 src/ol/geom/flat/{interiorpointflatgeom.js => interiorpoint.js} | 0 src/ol/geom/flat/{interpolateflatgeom.js => interpolate.js} | 0 src/ol/geom/flat/{lengthflatgeom.js => length.js} | 0 src/ol/geom/flat/{orientflatgeom.js => orient.js} | 0 src/ol/geom/flat/{reverseflatgeom.js => reverse.js} | 0 src/ol/geom/flat/{segmentsflatgeom.js => segments.js} | 0 src/ol/geom/flat/{simplifyflatgeom.js => simplify.js} | 0 src/ol/geom/flat/{transformflatgeom.js => transform.js} | 0 test/spec/ol/geom/flat/{areaflatgeom.test.js => area.test.js} | 0 test/spec/ol/geom/flat/{centerflatgeom.test.js => center.test.js} | 0 .../ol/geom/flat/{closestflatgeom.test.js => closest.test.js} | 0 .../ol/geom/flat/{deflateflatgeom.test.js => deflate.test.js} | 0 test/spec/ol/geom/flat/{flipflatgeom.test.js => flip.test.js} | 0 .../ol/geom/flat/{inflateflatgeom.test.js => inflate.test.js} | 0 .../flat/{interpolateflatgeom.test.js => interpolate.test.js} | 0 ...{intersectsextentflatgeom.test.js => intersectsextent.test.js} | 0 test/spec/ol/geom/flat/{lengthflatgeom.test.js => length.test.js} | 0 test/spec/ol/geom/flat/{orientflatgeom.test.js => orient.test.js} | 0 .../ol/geom/flat/{reverseflatgeom.test.js => reverse.test.js} | 0 .../ol/geom/flat/{segmentsflatgeom.test.js => segments.test.js} | 0 .../ol/geom/flat/{simplifyflatgeom.test.js => simplify.test.js} | 0 .../ol/geom/flat/{transformflatgeom.test.js => transform.test.js} | 0 29 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/geom/flat/{centerflatgeom.js => center.js} (100%) rename src/ol/geom/flat/{closestflatgeom.js => closest.js} (100%) rename src/ol/geom/flat/{containsflatgeom.js => contains.js} (100%) rename src/ol/geom/flat/{deflateflatgeom.js => deflate.js} (100%) rename src/ol/geom/flat/{flipflatgeom.js => flip.js} (100%) rename src/ol/geom/flat/{geodesicflatgeom.js => geodesic.js} (100%) rename src/ol/geom/flat/{inflateflatgeom.js => inflate.js} (100%) rename src/ol/geom/flat/{interiorpointflatgeom.js => interiorpoint.js} (100%) rename src/ol/geom/flat/{interpolateflatgeom.js => interpolate.js} (100%) rename src/ol/geom/flat/{lengthflatgeom.js => length.js} (100%) rename src/ol/geom/flat/{orientflatgeom.js => orient.js} (100%) rename src/ol/geom/flat/{reverseflatgeom.js => reverse.js} (100%) rename src/ol/geom/flat/{segmentsflatgeom.js => segments.js} (100%) rename src/ol/geom/flat/{simplifyflatgeom.js => simplify.js} (100%) rename src/ol/geom/flat/{transformflatgeom.js => transform.js} (100%) rename test/spec/ol/geom/flat/{areaflatgeom.test.js => area.test.js} (100%) rename test/spec/ol/geom/flat/{centerflatgeom.test.js => center.test.js} (100%) rename test/spec/ol/geom/flat/{closestflatgeom.test.js => closest.test.js} (100%) rename test/spec/ol/geom/flat/{deflateflatgeom.test.js => deflate.test.js} (100%) rename test/spec/ol/geom/flat/{flipflatgeom.test.js => flip.test.js} (100%) rename test/spec/ol/geom/flat/{inflateflatgeom.test.js => inflate.test.js} (100%) rename test/spec/ol/geom/flat/{interpolateflatgeom.test.js => interpolate.test.js} (100%) rename test/spec/ol/geom/flat/{intersectsextentflatgeom.test.js => intersectsextent.test.js} (100%) rename test/spec/ol/geom/flat/{lengthflatgeom.test.js => length.test.js} (100%) rename test/spec/ol/geom/flat/{orientflatgeom.test.js => orient.test.js} (100%) rename test/spec/ol/geom/flat/{reverseflatgeom.test.js => reverse.test.js} (100%) rename test/spec/ol/geom/flat/{segmentsflatgeom.test.js => segments.test.js} (100%) rename test/spec/ol/geom/flat/{simplifyflatgeom.test.js => simplify.test.js} (100%) rename test/spec/ol/geom/flat/{transformflatgeom.test.js => transform.test.js} (100%) diff --git a/src/ol/geom/flat/centerflatgeom.js b/src/ol/geom/flat/center.js similarity index 100% rename from src/ol/geom/flat/centerflatgeom.js rename to src/ol/geom/flat/center.js diff --git a/src/ol/geom/flat/closestflatgeom.js b/src/ol/geom/flat/closest.js similarity index 100% rename from src/ol/geom/flat/closestflatgeom.js rename to src/ol/geom/flat/closest.js diff --git a/src/ol/geom/flat/containsflatgeom.js b/src/ol/geom/flat/contains.js similarity index 100% rename from src/ol/geom/flat/containsflatgeom.js rename to src/ol/geom/flat/contains.js diff --git a/src/ol/geom/flat/deflateflatgeom.js b/src/ol/geom/flat/deflate.js similarity index 100% rename from src/ol/geom/flat/deflateflatgeom.js rename to src/ol/geom/flat/deflate.js diff --git a/src/ol/geom/flat/flipflatgeom.js b/src/ol/geom/flat/flip.js similarity index 100% rename from src/ol/geom/flat/flipflatgeom.js rename to src/ol/geom/flat/flip.js diff --git a/src/ol/geom/flat/geodesicflatgeom.js b/src/ol/geom/flat/geodesic.js similarity index 100% rename from src/ol/geom/flat/geodesicflatgeom.js rename to src/ol/geom/flat/geodesic.js diff --git a/src/ol/geom/flat/inflateflatgeom.js b/src/ol/geom/flat/inflate.js similarity index 100% rename from src/ol/geom/flat/inflateflatgeom.js rename to src/ol/geom/flat/inflate.js diff --git a/src/ol/geom/flat/interiorpointflatgeom.js b/src/ol/geom/flat/interiorpoint.js similarity index 100% rename from src/ol/geom/flat/interiorpointflatgeom.js rename to src/ol/geom/flat/interiorpoint.js diff --git a/src/ol/geom/flat/interpolateflatgeom.js b/src/ol/geom/flat/interpolate.js similarity index 100% rename from src/ol/geom/flat/interpolateflatgeom.js rename to src/ol/geom/flat/interpolate.js diff --git a/src/ol/geom/flat/lengthflatgeom.js b/src/ol/geom/flat/length.js similarity index 100% rename from src/ol/geom/flat/lengthflatgeom.js rename to src/ol/geom/flat/length.js diff --git a/src/ol/geom/flat/orientflatgeom.js b/src/ol/geom/flat/orient.js similarity index 100% rename from src/ol/geom/flat/orientflatgeom.js rename to src/ol/geom/flat/orient.js diff --git a/src/ol/geom/flat/reverseflatgeom.js b/src/ol/geom/flat/reverse.js similarity index 100% rename from src/ol/geom/flat/reverseflatgeom.js rename to src/ol/geom/flat/reverse.js diff --git a/src/ol/geom/flat/segmentsflatgeom.js b/src/ol/geom/flat/segments.js similarity index 100% rename from src/ol/geom/flat/segmentsflatgeom.js rename to src/ol/geom/flat/segments.js diff --git a/src/ol/geom/flat/simplifyflatgeom.js b/src/ol/geom/flat/simplify.js similarity index 100% rename from src/ol/geom/flat/simplifyflatgeom.js rename to src/ol/geom/flat/simplify.js diff --git a/src/ol/geom/flat/transformflatgeom.js b/src/ol/geom/flat/transform.js similarity index 100% rename from src/ol/geom/flat/transformflatgeom.js rename to src/ol/geom/flat/transform.js diff --git a/test/spec/ol/geom/flat/areaflatgeom.test.js b/test/spec/ol/geom/flat/area.test.js similarity index 100% rename from test/spec/ol/geom/flat/areaflatgeom.test.js rename to test/spec/ol/geom/flat/area.test.js diff --git a/test/spec/ol/geom/flat/centerflatgeom.test.js b/test/spec/ol/geom/flat/center.test.js similarity index 100% rename from test/spec/ol/geom/flat/centerflatgeom.test.js rename to test/spec/ol/geom/flat/center.test.js diff --git a/test/spec/ol/geom/flat/closestflatgeom.test.js b/test/spec/ol/geom/flat/closest.test.js similarity index 100% rename from test/spec/ol/geom/flat/closestflatgeom.test.js rename to test/spec/ol/geom/flat/closest.test.js diff --git a/test/spec/ol/geom/flat/deflateflatgeom.test.js b/test/spec/ol/geom/flat/deflate.test.js similarity index 100% rename from test/spec/ol/geom/flat/deflateflatgeom.test.js rename to test/spec/ol/geom/flat/deflate.test.js diff --git a/test/spec/ol/geom/flat/flipflatgeom.test.js b/test/spec/ol/geom/flat/flip.test.js similarity index 100% rename from test/spec/ol/geom/flat/flipflatgeom.test.js rename to test/spec/ol/geom/flat/flip.test.js diff --git a/test/spec/ol/geom/flat/inflateflatgeom.test.js b/test/spec/ol/geom/flat/inflate.test.js similarity index 100% rename from test/spec/ol/geom/flat/inflateflatgeom.test.js rename to test/spec/ol/geom/flat/inflate.test.js diff --git a/test/spec/ol/geom/flat/interpolateflatgeom.test.js b/test/spec/ol/geom/flat/interpolate.test.js similarity index 100% rename from test/spec/ol/geom/flat/interpolateflatgeom.test.js rename to test/spec/ol/geom/flat/interpolate.test.js diff --git a/test/spec/ol/geom/flat/intersectsextentflatgeom.test.js b/test/spec/ol/geom/flat/intersectsextent.test.js similarity index 100% rename from test/spec/ol/geom/flat/intersectsextentflatgeom.test.js rename to test/spec/ol/geom/flat/intersectsextent.test.js diff --git a/test/spec/ol/geom/flat/lengthflatgeom.test.js b/test/spec/ol/geom/flat/length.test.js similarity index 100% rename from test/spec/ol/geom/flat/lengthflatgeom.test.js rename to test/spec/ol/geom/flat/length.test.js diff --git a/test/spec/ol/geom/flat/orientflatgeom.test.js b/test/spec/ol/geom/flat/orient.test.js similarity index 100% rename from test/spec/ol/geom/flat/orientflatgeom.test.js rename to test/spec/ol/geom/flat/orient.test.js diff --git a/test/spec/ol/geom/flat/reverseflatgeom.test.js b/test/spec/ol/geom/flat/reverse.test.js similarity index 100% rename from test/spec/ol/geom/flat/reverseflatgeom.test.js rename to test/spec/ol/geom/flat/reverse.test.js diff --git a/test/spec/ol/geom/flat/segmentsflatgeom.test.js b/test/spec/ol/geom/flat/segments.test.js similarity index 100% rename from test/spec/ol/geom/flat/segmentsflatgeom.test.js rename to test/spec/ol/geom/flat/segments.test.js diff --git a/test/spec/ol/geom/flat/simplifyflatgeom.test.js b/test/spec/ol/geom/flat/simplify.test.js similarity index 100% rename from test/spec/ol/geom/flat/simplifyflatgeom.test.js rename to test/spec/ol/geom/flat/simplify.test.js diff --git a/test/spec/ol/geom/flat/transformflatgeom.test.js b/test/spec/ol/geom/flat/transform.test.js similarity index 100% rename from test/spec/ol/geom/flat/transformflatgeom.test.js rename to test/spec/ol/geom/flat/transform.test.js From 8ae6ffefc01661b3bcc62391b6b09688491e9818 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 12:37:35 -0600 Subject: [PATCH 49/68] Move layer files so they are named like their provides --- src/ol/layer/{layerbase.js => base.js} | 0 src/ol/layer/{layergroup.js => group.js} | 0 src/ol/layer/{heatmaplayer.js => heatmap.js} | 0 src/ol/layer/{imagelayer.js => image.js} | 0 src/ol/layer/{tilelayer.js => tile.js} | 0 src/ol/layer/{vectorlayer.js => vector.js} | 0 src/ol/layer/{vectortilelayer.js => vectortile.js} | 0 test/spec/ol/layer/{layergroup.test.js => group.test.js} | 2 +- test/spec/ol/layer/{heatmaplayer.test.js => heatmap.test.js} | 0 test/spec/ol/layer/{tilelayer.test.js => tile.test.js} | 0 test/spec/ol/layer/{vectorlayer.test.js => vector.test.js} | 0 .../ol/layer/{vectortilelayer.test.js => vectortile.test.js} | 0 12 files changed, 1 insertion(+), 1 deletion(-) rename src/ol/layer/{layerbase.js => base.js} (100%) rename src/ol/layer/{layergroup.js => group.js} (100%) rename src/ol/layer/{heatmaplayer.js => heatmap.js} (100%) rename src/ol/layer/{imagelayer.js => image.js} (100%) rename src/ol/layer/{tilelayer.js => tile.js} (100%) rename src/ol/layer/{vectorlayer.js => vector.js} (100%) rename src/ol/layer/{vectortilelayer.js => vectortile.js} (100%) rename test/spec/ol/layer/{layergroup.test.js => group.test.js} (99%) rename test/spec/ol/layer/{heatmaplayer.test.js => heatmap.test.js} (100%) rename test/spec/ol/layer/{tilelayer.test.js => tile.test.js} (100%) rename test/spec/ol/layer/{vectorlayer.test.js => vector.test.js} (100%) rename test/spec/ol/layer/{vectortilelayer.test.js => vectortile.test.js} (100%) diff --git a/src/ol/layer/layerbase.js b/src/ol/layer/base.js similarity index 100% rename from src/ol/layer/layerbase.js rename to src/ol/layer/base.js diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/group.js similarity index 100% rename from src/ol/layer/layergroup.js rename to src/ol/layer/group.js diff --git a/src/ol/layer/heatmaplayer.js b/src/ol/layer/heatmap.js similarity index 100% rename from src/ol/layer/heatmaplayer.js rename to src/ol/layer/heatmap.js diff --git a/src/ol/layer/imagelayer.js b/src/ol/layer/image.js similarity index 100% rename from src/ol/layer/imagelayer.js rename to src/ol/layer/image.js diff --git a/src/ol/layer/tilelayer.js b/src/ol/layer/tile.js similarity index 100% rename from src/ol/layer/tilelayer.js rename to src/ol/layer/tile.js diff --git a/src/ol/layer/vectorlayer.js b/src/ol/layer/vector.js similarity index 100% rename from src/ol/layer/vectorlayer.js rename to src/ol/layer/vector.js diff --git a/src/ol/layer/vectortilelayer.js b/src/ol/layer/vectortile.js similarity index 100% rename from src/ol/layer/vectortilelayer.js rename to src/ol/layer/vectortile.js diff --git a/test/spec/ol/layer/layergroup.test.js b/test/spec/ol/layer/group.test.js similarity index 99% rename from test/spec/ol/layer/layergroup.test.js rename to test/spec/ol/layer/group.test.js index 9c568e9e16..6fec9270d8 100644 --- a/test/spec/ol/layer/layergroup.test.js +++ b/test/spec/ol/layer/group.test.js @@ -1,4 +1,4 @@ -goog.provide('ol.test.layer.LayerGroup'); +goog.provide('ol.test.layer.Group'); describe('ol.layer.Group', function() { diff --git a/test/spec/ol/layer/heatmaplayer.test.js b/test/spec/ol/layer/heatmap.test.js similarity index 100% rename from test/spec/ol/layer/heatmaplayer.test.js rename to test/spec/ol/layer/heatmap.test.js diff --git a/test/spec/ol/layer/tilelayer.test.js b/test/spec/ol/layer/tile.test.js similarity index 100% rename from test/spec/ol/layer/tilelayer.test.js rename to test/spec/ol/layer/tile.test.js diff --git a/test/spec/ol/layer/vectorlayer.test.js b/test/spec/ol/layer/vector.test.js similarity index 100% rename from test/spec/ol/layer/vectorlayer.test.js rename to test/spec/ol/layer/vector.test.js diff --git a/test/spec/ol/layer/vectortilelayer.test.js b/test/spec/ol/layer/vectortile.test.js similarity index 100% rename from test/spec/ol/layer/vectortilelayer.test.js rename to test/spec/ol/layer/vectortile.test.js From aab8a7c4eb5dccfb82ef7496a1ebe1a13a72ddba Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 12:40:52 -0600 Subject: [PATCH 50/68] Move proj files so they are named like their provides --- src/ol/proj/{epsg3857projection.js => epsg3857.js} | 0 src/ol/proj/{epsg4326projection.js => epsg4326.js} | 0 src/ol/proj/{proj.js => index.js} | 0 src/ol/proj/{proj.jsdoc => index.jsdoc} | 0 .../spec/ol/proj/{epsg3857projection.test.js => epsg3857.test.js} | 0 test/spec/ol/proj/{proj.test.js => index.test.js} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/proj/{epsg3857projection.js => epsg3857.js} (100%) rename src/ol/proj/{epsg4326projection.js => epsg4326.js} (100%) rename src/ol/proj/{proj.js => index.js} (100%) rename src/ol/proj/{proj.jsdoc => index.jsdoc} (100%) rename test/spec/ol/proj/{epsg3857projection.test.js => epsg3857.test.js} (100%) rename test/spec/ol/proj/{proj.test.js => index.test.js} (100%) diff --git a/src/ol/proj/epsg3857projection.js b/src/ol/proj/epsg3857.js similarity index 100% rename from src/ol/proj/epsg3857projection.js rename to src/ol/proj/epsg3857.js diff --git a/src/ol/proj/epsg4326projection.js b/src/ol/proj/epsg4326.js similarity index 100% rename from src/ol/proj/epsg4326projection.js rename to src/ol/proj/epsg4326.js diff --git a/src/ol/proj/proj.js b/src/ol/proj/index.js similarity index 100% rename from src/ol/proj/proj.js rename to src/ol/proj/index.js diff --git a/src/ol/proj/proj.jsdoc b/src/ol/proj/index.jsdoc similarity index 100% rename from src/ol/proj/proj.jsdoc rename to src/ol/proj/index.jsdoc diff --git a/test/spec/ol/proj/epsg3857projection.test.js b/test/spec/ol/proj/epsg3857.test.js similarity index 100% rename from test/spec/ol/proj/epsg3857projection.test.js rename to test/spec/ol/proj/epsg3857.test.js diff --git a/test/spec/ol/proj/proj.test.js b/test/spec/ol/proj/index.test.js similarity index 100% rename from test/spec/ol/proj/proj.test.js rename to test/spec/ol/proj/index.test.js From 6b883afa351def3c4e5be8de43bf9f48b9497943 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 12:50:28 -0600 Subject: [PATCH 51/68] Move render files so they are named like their provides --- src/ol/render/canvas/{canvasimmediate.js => immediate.js} | 0 src/ol/render/canvas/{canvas.js => index.js} | 0 src/ol/render/canvas/{canvas.jsdoc => index.jsdoc} | 0 src/ol/render/canvas/{canvasreplay.js => replay.js} | 0 src/ol/render/{renderevent.js => event.js} | 0 src/ol/render/{renderfeature.js => feature.js} | 0 src/ol/render/{ireplay.js => ireplaygroup.js} | 0 src/ol/render/webgl/{webglreplay.js => imagereplay.js} | 0 src/ol/render/webgl/{webglimmediate.js => immediate.js} | 0 .../render/{canvasimmediate.test.js => canvas/immediate.test.js} | 0 test/spec/ol/render/{canvas.test.js => canvas/index.test.js} | 0 test/spec/ol/render/{renderfeature.test.js => feature.test.js} | 0 test/spec/ol/render/{webglreplay.test.js => webgl/replay.test.js} | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/render/canvas/{canvasimmediate.js => immediate.js} (100%) rename src/ol/render/canvas/{canvas.js => index.js} (100%) rename src/ol/render/canvas/{canvas.jsdoc => index.jsdoc} (100%) rename src/ol/render/canvas/{canvasreplay.js => replay.js} (100%) rename src/ol/render/{renderevent.js => event.js} (100%) rename src/ol/render/{renderfeature.js => feature.js} (100%) rename src/ol/render/{ireplay.js => ireplaygroup.js} (100%) rename src/ol/render/webgl/{webglreplay.js => imagereplay.js} (100%) rename src/ol/render/webgl/{webglimmediate.js => immediate.js} (100%) rename test/spec/ol/render/{canvasimmediate.test.js => canvas/immediate.test.js} (100%) rename test/spec/ol/render/{canvas.test.js => canvas/index.test.js} (100%) rename test/spec/ol/render/{renderfeature.test.js => feature.test.js} (100%) rename test/spec/ol/render/{webglreplay.test.js => webgl/replay.test.js} (100%) diff --git a/src/ol/render/canvas/canvasimmediate.js b/src/ol/render/canvas/immediate.js similarity index 100% rename from src/ol/render/canvas/canvasimmediate.js rename to src/ol/render/canvas/immediate.js diff --git a/src/ol/render/canvas/canvas.js b/src/ol/render/canvas/index.js similarity index 100% rename from src/ol/render/canvas/canvas.js rename to src/ol/render/canvas/index.js diff --git a/src/ol/render/canvas/canvas.jsdoc b/src/ol/render/canvas/index.jsdoc similarity index 100% rename from src/ol/render/canvas/canvas.jsdoc rename to src/ol/render/canvas/index.jsdoc diff --git a/src/ol/render/canvas/canvasreplay.js b/src/ol/render/canvas/replay.js similarity index 100% rename from src/ol/render/canvas/canvasreplay.js rename to src/ol/render/canvas/replay.js diff --git a/src/ol/render/renderevent.js b/src/ol/render/event.js similarity index 100% rename from src/ol/render/renderevent.js rename to src/ol/render/event.js diff --git a/src/ol/render/renderfeature.js b/src/ol/render/feature.js similarity index 100% rename from src/ol/render/renderfeature.js rename to src/ol/render/feature.js diff --git a/src/ol/render/ireplay.js b/src/ol/render/ireplaygroup.js similarity index 100% rename from src/ol/render/ireplay.js rename to src/ol/render/ireplaygroup.js diff --git a/src/ol/render/webgl/webglreplay.js b/src/ol/render/webgl/imagereplay.js similarity index 100% rename from src/ol/render/webgl/webglreplay.js rename to src/ol/render/webgl/imagereplay.js diff --git a/src/ol/render/webgl/webglimmediate.js b/src/ol/render/webgl/immediate.js similarity index 100% rename from src/ol/render/webgl/webglimmediate.js rename to src/ol/render/webgl/immediate.js diff --git a/test/spec/ol/render/canvasimmediate.test.js b/test/spec/ol/render/canvas/immediate.test.js similarity index 100% rename from test/spec/ol/render/canvasimmediate.test.js rename to test/spec/ol/render/canvas/immediate.test.js diff --git a/test/spec/ol/render/canvas.test.js b/test/spec/ol/render/canvas/index.test.js similarity index 100% rename from test/spec/ol/render/canvas.test.js rename to test/spec/ol/render/canvas/index.test.js diff --git a/test/spec/ol/render/renderfeature.test.js b/test/spec/ol/render/feature.test.js similarity index 100% rename from test/spec/ol/render/renderfeature.test.js rename to test/spec/ol/render/feature.test.js diff --git a/test/spec/ol/render/webglreplay.test.js b/test/spec/ol/render/webgl/replay.test.js similarity index 100% rename from test/spec/ol/render/webglreplay.test.js rename to test/spec/ol/render/webgl/replay.test.js From 424f3e5577b8ef950746979971650358b48431a4 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 12:57:57 -0600 Subject: [PATCH 52/68] Move renderer files so they are named like their provides --- .../canvas/{canvasimagelayerrenderer.js => imagelayer.js} | 0 src/ol/renderer/canvas/{canvaslayerrenderer.js => layer.js} | 0 src/ol/renderer/canvas/{canvasmaprenderer.js => map.js} | 0 .../renderer/canvas/{canvastilelayerrenderer.js => tilelayer.js} | 0 .../canvas/{canvasvectorlayerrenderer.js => vectorlayer.js} | 0 .../{canvasvectortilelayerrenderer.js => vectortilelayer.js} | 0 src/ol/renderer/dom/{domimagelayerrenderer.js => imagelayer.js} | 0 src/ol/renderer/dom/{domlayerrenderer.js => layer.js} | 0 src/ol/renderer/dom/{dommaprenderer.js => map.js} | 0 src/ol/renderer/dom/{domtilelayerrenderer.js => tilelayer.js} | 0 src/ol/renderer/dom/{domvectorlayerrenderer.js => vectorlayer.js} | 0 src/ol/renderer/{layerrenderer.js => layer.js} | 0 src/ol/renderer/{maprenderer.js => map.js} | 0 src/ol/{render => renderer}/vector.js | 0 .../renderer/webgl/{webglimagelayerrenderer.js => imagelayer.js} | 0 src/ol/renderer/webgl/{webgllayerrenderer.js => layer.js} | 0 src/ol/renderer/webgl/{webglmaprenderer.js => map.js} | 0 src/ol/renderer/webgl/{webgltilelayerrenderer.js => tilelayer.js} | 0 .../webgl/{webglvectorlayerrenderer.js => vectorlayer.js} | 0 .../canvas/{canvaslayerrenderer.test.js => layer.test.js} | 0 .../ol/renderer/canvas/{canvasmaprenderer.test.js => map.test.js} | 0 .../ol/renderer/canvas/{canvasreplay.test.js => replay.test.js} | 0 .../{canvasvectorlayerrenderer.test.js => vectorlayer.test.js} | 0 ...vasvectortilelayerrenderer.test.js => vectortilelayer.test.js} | 0 test/spec/ol/renderer/{layerrenderer.test.js => layer.test.js} | 0 test/spec/ol/renderer/{maprenderer.test.js => map.test.js} | 0 test/spec/ol/{render => renderer}/vector.test.js | 0 .../webgl/{webglimagelayerrenderer.test.js => imagelayer.test.js} | 0 28 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/renderer/canvas/{canvasimagelayerrenderer.js => imagelayer.js} (100%) rename src/ol/renderer/canvas/{canvaslayerrenderer.js => layer.js} (100%) rename src/ol/renderer/canvas/{canvasmaprenderer.js => map.js} (100%) rename src/ol/renderer/canvas/{canvastilelayerrenderer.js => tilelayer.js} (100%) rename src/ol/renderer/canvas/{canvasvectorlayerrenderer.js => vectorlayer.js} (100%) rename src/ol/renderer/canvas/{canvasvectortilelayerrenderer.js => vectortilelayer.js} (100%) rename src/ol/renderer/dom/{domimagelayerrenderer.js => imagelayer.js} (100%) rename src/ol/renderer/dom/{domlayerrenderer.js => layer.js} (100%) rename src/ol/renderer/dom/{dommaprenderer.js => map.js} (100%) rename src/ol/renderer/dom/{domtilelayerrenderer.js => tilelayer.js} (100%) rename src/ol/renderer/dom/{domvectorlayerrenderer.js => vectorlayer.js} (100%) rename src/ol/renderer/{layerrenderer.js => layer.js} (100%) rename src/ol/renderer/{maprenderer.js => map.js} (100%) rename src/ol/{render => renderer}/vector.js (100%) rename src/ol/renderer/webgl/{webglimagelayerrenderer.js => imagelayer.js} (100%) rename src/ol/renderer/webgl/{webgllayerrenderer.js => layer.js} (100%) rename src/ol/renderer/webgl/{webglmaprenderer.js => map.js} (100%) rename src/ol/renderer/webgl/{webgltilelayerrenderer.js => tilelayer.js} (100%) rename src/ol/renderer/webgl/{webglvectorlayerrenderer.js => vectorlayer.js} (100%) rename test/spec/ol/renderer/canvas/{canvaslayerrenderer.test.js => layer.test.js} (100%) rename test/spec/ol/renderer/canvas/{canvasmaprenderer.test.js => map.test.js} (100%) rename test/spec/ol/renderer/canvas/{canvasreplay.test.js => replay.test.js} (100%) rename test/spec/ol/renderer/canvas/{canvasvectorlayerrenderer.test.js => vectorlayer.test.js} (100%) rename test/spec/ol/renderer/canvas/{canvasvectortilelayerrenderer.test.js => vectortilelayer.test.js} (100%) rename test/spec/ol/renderer/{layerrenderer.test.js => layer.test.js} (100%) rename test/spec/ol/renderer/{maprenderer.test.js => map.test.js} (100%) rename test/spec/ol/{render => renderer}/vector.test.js (100%) rename test/spec/ol/renderer/webgl/{webglimagelayerrenderer.test.js => imagelayer.test.js} (100%) diff --git a/src/ol/renderer/canvas/canvasimagelayerrenderer.js b/src/ol/renderer/canvas/imagelayer.js similarity index 100% rename from src/ol/renderer/canvas/canvasimagelayerrenderer.js rename to src/ol/renderer/canvas/imagelayer.js diff --git a/src/ol/renderer/canvas/canvaslayerrenderer.js b/src/ol/renderer/canvas/layer.js similarity index 100% rename from src/ol/renderer/canvas/canvaslayerrenderer.js rename to src/ol/renderer/canvas/layer.js diff --git a/src/ol/renderer/canvas/canvasmaprenderer.js b/src/ol/renderer/canvas/map.js similarity index 100% rename from src/ol/renderer/canvas/canvasmaprenderer.js rename to src/ol/renderer/canvas/map.js diff --git a/src/ol/renderer/canvas/canvastilelayerrenderer.js b/src/ol/renderer/canvas/tilelayer.js similarity index 100% rename from src/ol/renderer/canvas/canvastilelayerrenderer.js rename to src/ol/renderer/canvas/tilelayer.js diff --git a/src/ol/renderer/canvas/canvasvectorlayerrenderer.js b/src/ol/renderer/canvas/vectorlayer.js similarity index 100% rename from src/ol/renderer/canvas/canvasvectorlayerrenderer.js rename to src/ol/renderer/canvas/vectorlayer.js diff --git a/src/ol/renderer/canvas/canvasvectortilelayerrenderer.js b/src/ol/renderer/canvas/vectortilelayer.js similarity index 100% rename from src/ol/renderer/canvas/canvasvectortilelayerrenderer.js rename to src/ol/renderer/canvas/vectortilelayer.js diff --git a/src/ol/renderer/dom/domimagelayerrenderer.js b/src/ol/renderer/dom/imagelayer.js similarity index 100% rename from src/ol/renderer/dom/domimagelayerrenderer.js rename to src/ol/renderer/dom/imagelayer.js diff --git a/src/ol/renderer/dom/domlayerrenderer.js b/src/ol/renderer/dom/layer.js similarity index 100% rename from src/ol/renderer/dom/domlayerrenderer.js rename to src/ol/renderer/dom/layer.js diff --git a/src/ol/renderer/dom/dommaprenderer.js b/src/ol/renderer/dom/map.js similarity index 100% rename from src/ol/renderer/dom/dommaprenderer.js rename to src/ol/renderer/dom/map.js diff --git a/src/ol/renderer/dom/domtilelayerrenderer.js b/src/ol/renderer/dom/tilelayer.js similarity index 100% rename from src/ol/renderer/dom/domtilelayerrenderer.js rename to src/ol/renderer/dom/tilelayer.js diff --git a/src/ol/renderer/dom/domvectorlayerrenderer.js b/src/ol/renderer/dom/vectorlayer.js similarity index 100% rename from src/ol/renderer/dom/domvectorlayerrenderer.js rename to src/ol/renderer/dom/vectorlayer.js diff --git a/src/ol/renderer/layerrenderer.js b/src/ol/renderer/layer.js similarity index 100% rename from src/ol/renderer/layerrenderer.js rename to src/ol/renderer/layer.js diff --git a/src/ol/renderer/maprenderer.js b/src/ol/renderer/map.js similarity index 100% rename from src/ol/renderer/maprenderer.js rename to src/ol/renderer/map.js diff --git a/src/ol/render/vector.js b/src/ol/renderer/vector.js similarity index 100% rename from src/ol/render/vector.js rename to src/ol/renderer/vector.js diff --git a/src/ol/renderer/webgl/webglimagelayerrenderer.js b/src/ol/renderer/webgl/imagelayer.js similarity index 100% rename from src/ol/renderer/webgl/webglimagelayerrenderer.js rename to src/ol/renderer/webgl/imagelayer.js diff --git a/src/ol/renderer/webgl/webgllayerrenderer.js b/src/ol/renderer/webgl/layer.js similarity index 100% rename from src/ol/renderer/webgl/webgllayerrenderer.js rename to src/ol/renderer/webgl/layer.js diff --git a/src/ol/renderer/webgl/webglmaprenderer.js b/src/ol/renderer/webgl/map.js similarity index 100% rename from src/ol/renderer/webgl/webglmaprenderer.js rename to src/ol/renderer/webgl/map.js diff --git a/src/ol/renderer/webgl/webgltilelayerrenderer.js b/src/ol/renderer/webgl/tilelayer.js similarity index 100% rename from src/ol/renderer/webgl/webgltilelayerrenderer.js rename to src/ol/renderer/webgl/tilelayer.js diff --git a/src/ol/renderer/webgl/webglvectorlayerrenderer.js b/src/ol/renderer/webgl/vectorlayer.js similarity index 100% rename from src/ol/renderer/webgl/webglvectorlayerrenderer.js rename to src/ol/renderer/webgl/vectorlayer.js diff --git a/test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js b/test/spec/ol/renderer/canvas/layer.test.js similarity index 100% rename from test/spec/ol/renderer/canvas/canvaslayerrenderer.test.js rename to test/spec/ol/renderer/canvas/layer.test.js diff --git a/test/spec/ol/renderer/canvas/canvasmaprenderer.test.js b/test/spec/ol/renderer/canvas/map.test.js similarity index 100% rename from test/spec/ol/renderer/canvas/canvasmaprenderer.test.js rename to test/spec/ol/renderer/canvas/map.test.js diff --git a/test/spec/ol/renderer/canvas/canvasreplay.test.js b/test/spec/ol/renderer/canvas/replay.test.js similarity index 100% rename from test/spec/ol/renderer/canvas/canvasreplay.test.js rename to test/spec/ol/renderer/canvas/replay.test.js diff --git a/test/spec/ol/renderer/canvas/canvasvectorlayerrenderer.test.js b/test/spec/ol/renderer/canvas/vectorlayer.test.js similarity index 100% rename from test/spec/ol/renderer/canvas/canvasvectorlayerrenderer.test.js rename to test/spec/ol/renderer/canvas/vectorlayer.test.js diff --git a/test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js b/test/spec/ol/renderer/canvas/vectortilelayer.test.js similarity index 100% rename from test/spec/ol/renderer/canvas/canvasvectortilelayerrenderer.test.js rename to test/spec/ol/renderer/canvas/vectortilelayer.test.js diff --git a/test/spec/ol/renderer/layerrenderer.test.js b/test/spec/ol/renderer/layer.test.js similarity index 100% rename from test/spec/ol/renderer/layerrenderer.test.js rename to test/spec/ol/renderer/layer.test.js diff --git a/test/spec/ol/renderer/maprenderer.test.js b/test/spec/ol/renderer/map.test.js similarity index 100% rename from test/spec/ol/renderer/maprenderer.test.js rename to test/spec/ol/renderer/map.test.js diff --git a/test/spec/ol/render/vector.test.js b/test/spec/ol/renderer/vector.test.js similarity index 100% rename from test/spec/ol/render/vector.test.js rename to test/spec/ol/renderer/vector.test.js diff --git a/test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js b/test/spec/ol/renderer/webgl/imagelayer.test.js similarity index 100% rename from test/spec/ol/renderer/webgl/webglimagelayerrenderer.test.js rename to test/spec/ol/renderer/webgl/imagelayer.test.js From 8d9398a965ad594877dac33c2fa47b0629b70276 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:00:40 -0600 Subject: [PATCH 53/68] Move ol/reproj/reproj.js to ol/reproj/index.js --- src/ol/reproj/{reproj.js => index.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/reproj/{reproj.js => index.js} (100%) diff --git a/src/ol/reproj/reproj.js b/src/ol/reproj/index.js similarity index 100% rename from src/ol/reproj/reproj.js rename to src/ol/reproj/index.js From e07596846dff78ba44ce6bf47140a7b4b1e3efad Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:05:05 -0600 Subject: [PATCH 54/68] Move source files so they are named like their provides --- src/ol/source/{bingmapssource.js => bingmaps.js} | 0 src/ol/source/{clustersource.js => cluster.js} | 0 src/ol/source/{imagesource.js => image.js} | 0 src/ol/source/{imagearcgisrestsource.js => imagearcgisrest.js} | 0 src/ol/source/{imagecanvassource.js => imagecanvas.js} | 0 src/ol/source/{imagemapguidesource.js => imagemapguide.js} | 0 src/ol/source/{imagestaticsource.js => imagestatic.js} | 0 src/ol/source/{imagevectorsource.js => imagevector.js} | 0 src/ol/source/{imagewmssource.js => imagewms.js} | 0 src/ol/source/{osmsource.js => osm.js} | 0 src/ol/source/{rastersource.js => raster.js} | 0 src/ol/source/{stamensource.js => stamen.js} | 0 src/ol/source/{tilesource.js => tile.js} | 0 src/ol/source/{tilearcgisrestsource.js => tilearcgisrest.js} | 0 src/ol/source/{tiledebugsource.js => tiledebug.js} | 0 src/ol/source/{tileimagesource.js => tileimage.js} | 0 src/ol/source/{tilejsonsource.js => tilejson.js} | 0 src/ol/source/{tileutfgridsource.js => tileutfgrid.js} | 0 src/ol/source/{tilewmssource.js => tilewms.js} | 0 src/ol/source/{urltilesource.js => urltile.js} | 0 src/ol/source/{vectorsource.js => vector.js} | 0 src/ol/source/{vectortilesource.js => vectortile.js} | 0 src/ol/source/{wmssource.js => wms.js} | 0 src/ol/source/{wmssource.jsdoc => wms.jsdoc} | 0 src/ol/source/{wmtssource.js => wmts.js} | 0 src/ol/source/{xyzsource.js => xyz.js} | 0 src/ol/source/{zoomifysource.js => zoomify.js} | 0 test/spec/ol/source/{bingmapssource.test.js => bingmaps.test.js} | 0 test/spec/ol/source/{cartodbsource.test.js => cartodb.test.js} | 0 test/spec/ol/source/{clustersource.test.js => cluster.test.js} | 0 .../{imagearcgisrestsource.test.js => imagearcgisrest.test.js} | 0 .../ol/source/{imagestaticsource.test.js => imagestatic.test.js} | 0 test/spec/ol/source/{imagewmssource.test.js => imagewms.test.js} | 0 test/spec/ol/source/{rastersource.test.js => raster.test.js} | 0 test/spec/ol/source/{stamensource.test.js => stamen.test.js} | 0 test/spec/ol/source/{tilesource.test.js => tile.test.js} | 0 .../{tilearcgisrestsource.test.js => tilearcgisrest.test.js} | 0 .../spec/ol/source/{tileimagesource.test.js => tileimage.test.js} | 0 test/spec/ol/source/{tilejsonsource.test.js => tilejson.test.js} | 0 .../ol/source/{tileutfgridsource.test.js => tileutfgrid.test.js} | 0 test/spec/ol/source/{tilewmssource.test.js => tilewms.test.js} | 0 test/spec/ol/source/{urltilesource.test.js => urltile.test.js} | 0 test/spec/ol/source/{vectorsource.test.js => vector.test.js} | 0 .../ol/source/{vectortilesource.test.js => vectortile.test.js} | 0 test/spec/ol/source/{wmtssource.test.js => wmts.test.js} | 0 test/spec/ol/source/{xyzsource.test.js => xyz.test.js} | 0 test/spec/ol/source/{zoomifysource.test.js => zoomify.test.js} | 0 47 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/source/{bingmapssource.js => bingmaps.js} (100%) rename src/ol/source/{clustersource.js => cluster.js} (100%) rename src/ol/source/{imagesource.js => image.js} (100%) rename src/ol/source/{imagearcgisrestsource.js => imagearcgisrest.js} (100%) rename src/ol/source/{imagecanvassource.js => imagecanvas.js} (100%) rename src/ol/source/{imagemapguidesource.js => imagemapguide.js} (100%) rename src/ol/source/{imagestaticsource.js => imagestatic.js} (100%) rename src/ol/source/{imagevectorsource.js => imagevector.js} (100%) rename src/ol/source/{imagewmssource.js => imagewms.js} (100%) rename src/ol/source/{osmsource.js => osm.js} (100%) rename src/ol/source/{rastersource.js => raster.js} (100%) rename src/ol/source/{stamensource.js => stamen.js} (100%) rename src/ol/source/{tilesource.js => tile.js} (100%) rename src/ol/source/{tilearcgisrestsource.js => tilearcgisrest.js} (100%) rename src/ol/source/{tiledebugsource.js => tiledebug.js} (100%) rename src/ol/source/{tileimagesource.js => tileimage.js} (100%) rename src/ol/source/{tilejsonsource.js => tilejson.js} (100%) rename src/ol/source/{tileutfgridsource.js => tileutfgrid.js} (100%) rename src/ol/source/{tilewmssource.js => tilewms.js} (100%) rename src/ol/source/{urltilesource.js => urltile.js} (100%) rename src/ol/source/{vectorsource.js => vector.js} (100%) rename src/ol/source/{vectortilesource.js => vectortile.js} (100%) rename src/ol/source/{wmssource.js => wms.js} (100%) rename src/ol/source/{wmssource.jsdoc => wms.jsdoc} (100%) rename src/ol/source/{wmtssource.js => wmts.js} (100%) rename src/ol/source/{xyzsource.js => xyz.js} (100%) rename src/ol/source/{zoomifysource.js => zoomify.js} (100%) rename test/spec/ol/source/{bingmapssource.test.js => bingmaps.test.js} (100%) rename test/spec/ol/source/{cartodbsource.test.js => cartodb.test.js} (100%) rename test/spec/ol/source/{clustersource.test.js => cluster.test.js} (100%) rename test/spec/ol/source/{imagearcgisrestsource.test.js => imagearcgisrest.test.js} (100%) rename test/spec/ol/source/{imagestaticsource.test.js => imagestatic.test.js} (100%) rename test/spec/ol/source/{imagewmssource.test.js => imagewms.test.js} (100%) rename test/spec/ol/source/{rastersource.test.js => raster.test.js} (100%) rename test/spec/ol/source/{stamensource.test.js => stamen.test.js} (100%) rename test/spec/ol/source/{tilesource.test.js => tile.test.js} (100%) rename test/spec/ol/source/{tilearcgisrestsource.test.js => tilearcgisrest.test.js} (100%) rename test/spec/ol/source/{tileimagesource.test.js => tileimage.test.js} (100%) rename test/spec/ol/source/{tilejsonsource.test.js => tilejson.test.js} (100%) rename test/spec/ol/source/{tileutfgridsource.test.js => tileutfgrid.test.js} (100%) rename test/spec/ol/source/{tilewmssource.test.js => tilewms.test.js} (100%) rename test/spec/ol/source/{urltilesource.test.js => urltile.test.js} (100%) rename test/spec/ol/source/{vectorsource.test.js => vector.test.js} (100%) rename test/spec/ol/source/{vectortilesource.test.js => vectortile.test.js} (100%) rename test/spec/ol/source/{wmtssource.test.js => wmts.test.js} (100%) rename test/spec/ol/source/{xyzsource.test.js => xyz.test.js} (100%) rename test/spec/ol/source/{zoomifysource.test.js => zoomify.test.js} (100%) diff --git a/src/ol/source/bingmapssource.js b/src/ol/source/bingmaps.js similarity index 100% rename from src/ol/source/bingmapssource.js rename to src/ol/source/bingmaps.js diff --git a/src/ol/source/clustersource.js b/src/ol/source/cluster.js similarity index 100% rename from src/ol/source/clustersource.js rename to src/ol/source/cluster.js diff --git a/src/ol/source/imagesource.js b/src/ol/source/image.js similarity index 100% rename from src/ol/source/imagesource.js rename to src/ol/source/image.js diff --git a/src/ol/source/imagearcgisrestsource.js b/src/ol/source/imagearcgisrest.js similarity index 100% rename from src/ol/source/imagearcgisrestsource.js rename to src/ol/source/imagearcgisrest.js diff --git a/src/ol/source/imagecanvassource.js b/src/ol/source/imagecanvas.js similarity index 100% rename from src/ol/source/imagecanvassource.js rename to src/ol/source/imagecanvas.js diff --git a/src/ol/source/imagemapguidesource.js b/src/ol/source/imagemapguide.js similarity index 100% rename from src/ol/source/imagemapguidesource.js rename to src/ol/source/imagemapguide.js diff --git a/src/ol/source/imagestaticsource.js b/src/ol/source/imagestatic.js similarity index 100% rename from src/ol/source/imagestaticsource.js rename to src/ol/source/imagestatic.js diff --git a/src/ol/source/imagevectorsource.js b/src/ol/source/imagevector.js similarity index 100% rename from src/ol/source/imagevectorsource.js rename to src/ol/source/imagevector.js diff --git a/src/ol/source/imagewmssource.js b/src/ol/source/imagewms.js similarity index 100% rename from src/ol/source/imagewmssource.js rename to src/ol/source/imagewms.js diff --git a/src/ol/source/osmsource.js b/src/ol/source/osm.js similarity index 100% rename from src/ol/source/osmsource.js rename to src/ol/source/osm.js diff --git a/src/ol/source/rastersource.js b/src/ol/source/raster.js similarity index 100% rename from src/ol/source/rastersource.js rename to src/ol/source/raster.js diff --git a/src/ol/source/stamensource.js b/src/ol/source/stamen.js similarity index 100% rename from src/ol/source/stamensource.js rename to src/ol/source/stamen.js diff --git a/src/ol/source/tilesource.js b/src/ol/source/tile.js similarity index 100% rename from src/ol/source/tilesource.js rename to src/ol/source/tile.js diff --git a/src/ol/source/tilearcgisrestsource.js b/src/ol/source/tilearcgisrest.js similarity index 100% rename from src/ol/source/tilearcgisrestsource.js rename to src/ol/source/tilearcgisrest.js diff --git a/src/ol/source/tiledebugsource.js b/src/ol/source/tiledebug.js similarity index 100% rename from src/ol/source/tiledebugsource.js rename to src/ol/source/tiledebug.js diff --git a/src/ol/source/tileimagesource.js b/src/ol/source/tileimage.js similarity index 100% rename from src/ol/source/tileimagesource.js rename to src/ol/source/tileimage.js diff --git a/src/ol/source/tilejsonsource.js b/src/ol/source/tilejson.js similarity index 100% rename from src/ol/source/tilejsonsource.js rename to src/ol/source/tilejson.js diff --git a/src/ol/source/tileutfgridsource.js b/src/ol/source/tileutfgrid.js similarity index 100% rename from src/ol/source/tileutfgridsource.js rename to src/ol/source/tileutfgrid.js diff --git a/src/ol/source/tilewmssource.js b/src/ol/source/tilewms.js similarity index 100% rename from src/ol/source/tilewmssource.js rename to src/ol/source/tilewms.js diff --git a/src/ol/source/urltilesource.js b/src/ol/source/urltile.js similarity index 100% rename from src/ol/source/urltilesource.js rename to src/ol/source/urltile.js diff --git a/src/ol/source/vectorsource.js b/src/ol/source/vector.js similarity index 100% rename from src/ol/source/vectorsource.js rename to src/ol/source/vector.js diff --git a/src/ol/source/vectortilesource.js b/src/ol/source/vectortile.js similarity index 100% rename from src/ol/source/vectortilesource.js rename to src/ol/source/vectortile.js diff --git a/src/ol/source/wmssource.js b/src/ol/source/wms.js similarity index 100% rename from src/ol/source/wmssource.js rename to src/ol/source/wms.js diff --git a/src/ol/source/wmssource.jsdoc b/src/ol/source/wms.jsdoc similarity index 100% rename from src/ol/source/wmssource.jsdoc rename to src/ol/source/wms.jsdoc diff --git a/src/ol/source/wmtssource.js b/src/ol/source/wmts.js similarity index 100% rename from src/ol/source/wmtssource.js rename to src/ol/source/wmts.js diff --git a/src/ol/source/xyzsource.js b/src/ol/source/xyz.js similarity index 100% rename from src/ol/source/xyzsource.js rename to src/ol/source/xyz.js diff --git a/src/ol/source/zoomifysource.js b/src/ol/source/zoomify.js similarity index 100% rename from src/ol/source/zoomifysource.js rename to src/ol/source/zoomify.js diff --git a/test/spec/ol/source/bingmapssource.test.js b/test/spec/ol/source/bingmaps.test.js similarity index 100% rename from test/spec/ol/source/bingmapssource.test.js rename to test/spec/ol/source/bingmaps.test.js diff --git a/test/spec/ol/source/cartodbsource.test.js b/test/spec/ol/source/cartodb.test.js similarity index 100% rename from test/spec/ol/source/cartodbsource.test.js rename to test/spec/ol/source/cartodb.test.js diff --git a/test/spec/ol/source/clustersource.test.js b/test/spec/ol/source/cluster.test.js similarity index 100% rename from test/spec/ol/source/clustersource.test.js rename to test/spec/ol/source/cluster.test.js diff --git a/test/spec/ol/source/imagearcgisrestsource.test.js b/test/spec/ol/source/imagearcgisrest.test.js similarity index 100% rename from test/spec/ol/source/imagearcgisrestsource.test.js rename to test/spec/ol/source/imagearcgisrest.test.js diff --git a/test/spec/ol/source/imagestaticsource.test.js b/test/spec/ol/source/imagestatic.test.js similarity index 100% rename from test/spec/ol/source/imagestaticsource.test.js rename to test/spec/ol/source/imagestatic.test.js diff --git a/test/spec/ol/source/imagewmssource.test.js b/test/spec/ol/source/imagewms.test.js similarity index 100% rename from test/spec/ol/source/imagewmssource.test.js rename to test/spec/ol/source/imagewms.test.js diff --git a/test/spec/ol/source/rastersource.test.js b/test/spec/ol/source/raster.test.js similarity index 100% rename from test/spec/ol/source/rastersource.test.js rename to test/spec/ol/source/raster.test.js diff --git a/test/spec/ol/source/stamensource.test.js b/test/spec/ol/source/stamen.test.js similarity index 100% rename from test/spec/ol/source/stamensource.test.js rename to test/spec/ol/source/stamen.test.js diff --git a/test/spec/ol/source/tilesource.test.js b/test/spec/ol/source/tile.test.js similarity index 100% rename from test/spec/ol/source/tilesource.test.js rename to test/spec/ol/source/tile.test.js diff --git a/test/spec/ol/source/tilearcgisrestsource.test.js b/test/spec/ol/source/tilearcgisrest.test.js similarity index 100% rename from test/spec/ol/source/tilearcgisrestsource.test.js rename to test/spec/ol/source/tilearcgisrest.test.js diff --git a/test/spec/ol/source/tileimagesource.test.js b/test/spec/ol/source/tileimage.test.js similarity index 100% rename from test/spec/ol/source/tileimagesource.test.js rename to test/spec/ol/source/tileimage.test.js diff --git a/test/spec/ol/source/tilejsonsource.test.js b/test/spec/ol/source/tilejson.test.js similarity index 100% rename from test/spec/ol/source/tilejsonsource.test.js rename to test/spec/ol/source/tilejson.test.js diff --git a/test/spec/ol/source/tileutfgridsource.test.js b/test/spec/ol/source/tileutfgrid.test.js similarity index 100% rename from test/spec/ol/source/tileutfgridsource.test.js rename to test/spec/ol/source/tileutfgrid.test.js diff --git a/test/spec/ol/source/tilewmssource.test.js b/test/spec/ol/source/tilewms.test.js similarity index 100% rename from test/spec/ol/source/tilewmssource.test.js rename to test/spec/ol/source/tilewms.test.js diff --git a/test/spec/ol/source/urltilesource.test.js b/test/spec/ol/source/urltile.test.js similarity index 100% rename from test/spec/ol/source/urltilesource.test.js rename to test/spec/ol/source/urltile.test.js diff --git a/test/spec/ol/source/vectorsource.test.js b/test/spec/ol/source/vector.test.js similarity index 100% rename from test/spec/ol/source/vectorsource.test.js rename to test/spec/ol/source/vector.test.js diff --git a/test/spec/ol/source/vectortilesource.test.js b/test/spec/ol/source/vectortile.test.js similarity index 100% rename from test/spec/ol/source/vectortilesource.test.js rename to test/spec/ol/source/vectortile.test.js diff --git a/test/spec/ol/source/wmtssource.test.js b/test/spec/ol/source/wmts.test.js similarity index 100% rename from test/spec/ol/source/wmtssource.test.js rename to test/spec/ol/source/wmts.test.js diff --git a/test/spec/ol/source/xyzsource.test.js b/test/spec/ol/source/xyz.test.js similarity index 100% rename from test/spec/ol/source/xyzsource.test.js rename to test/spec/ol/source/xyz.test.js diff --git a/test/spec/ol/source/zoomifysource.test.js b/test/spec/ol/source/zoomify.test.js similarity index 100% rename from test/spec/ol/source/zoomifysource.test.js rename to test/spec/ol/source/zoomify.test.js From c0e375412f22e285343ea15285309bfe29977687 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:07:24 -0600 Subject: [PATCH 55/68] Move sphere files so they are named like their provides --- src/ol/sphere/{sphere.js => index.js} | 0 src/ol/sphere/{wgs84sphere.js => wgs84.js} | 0 test/spec/ol/sphere/{sphere.test.js => index.test.js} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/sphere/{sphere.js => index.js} (100%) rename src/ol/sphere/{wgs84sphere.js => wgs84.js} (100%) rename test/spec/ol/sphere/{sphere.test.js => index.test.js} (100%) diff --git a/src/ol/sphere/sphere.js b/src/ol/sphere/index.js similarity index 100% rename from src/ol/sphere/sphere.js rename to src/ol/sphere/index.js diff --git a/src/ol/sphere/wgs84sphere.js b/src/ol/sphere/wgs84.js similarity index 100% rename from src/ol/sphere/wgs84sphere.js rename to src/ol/sphere/wgs84.js diff --git a/test/spec/ol/sphere/sphere.test.js b/test/spec/ol/sphere/index.test.js similarity index 100% rename from test/spec/ol/sphere/sphere.test.js rename to test/spec/ol/sphere/index.test.js From 9da581cb8ff457fa21ddb65b73980546734348ca Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:10:51 -0600 Subject: [PATCH 56/68] Move style files so they are named like their provide --- src/ol/style/{circlestyle.js => circle.js} | 0 src/ol/style/{fillstyle.js => fill.js} | 0 src/ol/style/{iconstyle.js => icon.js} | 0 src/ol/style/{imagestyle.js => image.js} | 0 src/ol/style/{regularshapestyle.js => regularshape.js} | 0 src/ol/style/{strokestyle.js => stroke.js} | 0 src/ol/style/{textstyle.js => text.js} | 0 test/spec/ol/style/{circlestyle.test.js => circle.test.js} | 0 test/spec/ol/style/{iconstyle.test.js => icon.test.js} | 0 .../ol/style/{regularshapestyle.test.js => regularshape.test.js} | 0 test/spec/ol/style/{textstyle.test.js => text.test.js} | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/style/{circlestyle.js => circle.js} (100%) rename src/ol/style/{fillstyle.js => fill.js} (100%) rename src/ol/style/{iconstyle.js => icon.js} (100%) rename src/ol/style/{imagestyle.js => image.js} (100%) rename src/ol/style/{regularshapestyle.js => regularshape.js} (100%) rename src/ol/style/{strokestyle.js => stroke.js} (100%) rename src/ol/style/{textstyle.js => text.js} (100%) rename test/spec/ol/style/{circlestyle.test.js => circle.test.js} (100%) rename test/spec/ol/style/{iconstyle.test.js => icon.test.js} (100%) rename test/spec/ol/style/{regularshapestyle.test.js => regularshape.test.js} (100%) rename test/spec/ol/style/{textstyle.test.js => text.test.js} (100%) diff --git a/src/ol/style/circlestyle.js b/src/ol/style/circle.js similarity index 100% rename from src/ol/style/circlestyle.js rename to src/ol/style/circle.js diff --git a/src/ol/style/fillstyle.js b/src/ol/style/fill.js similarity index 100% rename from src/ol/style/fillstyle.js rename to src/ol/style/fill.js diff --git a/src/ol/style/iconstyle.js b/src/ol/style/icon.js similarity index 100% rename from src/ol/style/iconstyle.js rename to src/ol/style/icon.js diff --git a/src/ol/style/imagestyle.js b/src/ol/style/image.js similarity index 100% rename from src/ol/style/imagestyle.js rename to src/ol/style/image.js diff --git a/src/ol/style/regularshapestyle.js b/src/ol/style/regularshape.js similarity index 100% rename from src/ol/style/regularshapestyle.js rename to src/ol/style/regularshape.js diff --git a/src/ol/style/strokestyle.js b/src/ol/style/stroke.js similarity index 100% rename from src/ol/style/strokestyle.js rename to src/ol/style/stroke.js diff --git a/src/ol/style/textstyle.js b/src/ol/style/text.js similarity index 100% rename from src/ol/style/textstyle.js rename to src/ol/style/text.js diff --git a/test/spec/ol/style/circlestyle.test.js b/test/spec/ol/style/circle.test.js similarity index 100% rename from test/spec/ol/style/circlestyle.test.js rename to test/spec/ol/style/circle.test.js diff --git a/test/spec/ol/style/iconstyle.test.js b/test/spec/ol/style/icon.test.js similarity index 100% rename from test/spec/ol/style/iconstyle.test.js rename to test/spec/ol/style/icon.test.js diff --git a/test/spec/ol/style/regularshapestyle.test.js b/test/spec/ol/style/regularshape.test.js similarity index 100% rename from test/spec/ol/style/regularshapestyle.test.js rename to test/spec/ol/style/regularshape.test.js diff --git a/test/spec/ol/style/textstyle.test.js b/test/spec/ol/style/text.test.js similarity index 100% rename from test/spec/ol/style/textstyle.test.js rename to test/spec/ol/style/text.test.js From 97d403784d538e42fbdad3650eae8f70cdc45a1c Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:12:24 -0600 Subject: [PATCH 57/68] Move tilegrid files so they are named like their provides --- src/ol/tilegrid/{wmtstilegrid.js => wmts.js} | 0 test/spec/ol/tilegrid/{wmtstilegrid.test.js => wmts.test.js} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/ol/tilegrid/{wmtstilegrid.js => wmts.js} (100%) rename test/spec/ol/tilegrid/{wmtstilegrid.test.js => wmts.test.js} (100%) diff --git a/src/ol/tilegrid/wmtstilegrid.js b/src/ol/tilegrid/wmts.js similarity index 100% rename from src/ol/tilegrid/wmtstilegrid.js rename to src/ol/tilegrid/wmts.js diff --git a/test/spec/ol/tilegrid/wmtstilegrid.test.js b/test/spec/ol/tilegrid/wmts.test.js similarity index 100% rename from test/spec/ol/tilegrid/wmtstilegrid.test.js rename to test/spec/ol/tilegrid/wmts.test.js From 4c8b583e3033f48c925726c3e794491a098c84d6 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:13:28 -0600 Subject: [PATCH 58/68] Move ol/webgl/webgl.js to ol/webgl/index.js --- src/ol/webgl/{webgl.js => index.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/webgl/{webgl.js => index.js} (100%) diff --git a/src/ol/webgl/webgl.js b/src/ol/webgl/index.js similarity index 100% rename from src/ol/webgl/webgl.js rename to src/ol/webgl/index.js From e631913c8f6793ffe0701c239f22b918e39a87e7 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:14:49 -0600 Subject: [PATCH 59/68] Move ol/control.jsdoc to ol/control/index.jsdoc --- src/ol/{control.jsdoc => control/index.jsdoc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/{control.jsdoc => control/index.jsdoc} (100%) diff --git a/src/ol/control.jsdoc b/src/ol/control/index.jsdoc similarity index 100% rename from src/ol/control.jsdoc rename to src/ol/control/index.jsdoc From bbf91b347755f32894dd7cde622af8bee25ea236 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:16:09 -0600 Subject: [PATCH 60/68] Move ol/format.jsdoc to ol/format/index.jsdoc --- src/ol/{format.jsdoc => format/index.jsdoc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/{format.jsdoc => format/index.jsdoc} (100%) diff --git a/src/ol/format.jsdoc b/src/ol/format/index.jsdoc similarity index 100% rename from src/ol/format.jsdoc rename to src/ol/format/index.jsdoc From 1b8310a6fe14a737469da5f000756dbbc9f60d61 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 13:21:38 -0600 Subject: [PATCH 61/68] Rename ol/objectutil.js to ol/obj.js --- src/ol/control/attribution.js | 12 ++++---- src/ol/events.js | 6 ++-- src/ol/format/esrijson.js | 6 ++-- src/ol/format/geojson.js | 6 ++-- src/ol/format/gml3.js | 12 ++++---- src/ol/format/gmlbase.js | 4 +-- src/ol/format/kml.js | 4 +-- src/ol/format/osmxml.js | 4 +-- src/ol/format/topojson.js | 4 +-- src/ol/format/wfs.js | 12 ++++---- src/ol/format/wmsgetfeatureinfo.js | 4 +-- src/ol/geom/geometrycollection.js | 4 +-- src/ol/geom/simplegeometry.js | 4 +-- src/ol/image.js | 4 +-- src/ol/imagetile.js | 4 +-- src/ol/interaction/pointer.js | 4 +-- src/ol/interaction/select.js | 4 +-- src/ol/interaction/snap.js | 4 +-- src/ol/layer/base.js | 4 +-- src/ol/layer/group.js | 6 ++-- src/ol/layer/heatmap.js | 4 +-- src/ol/layer/layer.js | 4 +-- src/ol/layer/tile.js | 4 +-- src/ol/layer/vector.js | 4 +-- src/ol/layer/vectortile.js | 4 +-- src/ol/map.js | 4 +-- src/ol/{objectutil.js => obj.js} | 10 +++---- src/ol/object.js | 4 +-- src/ol/proj/index.js | 4 +-- src/ol/render/canvas/replay.js | 6 ++-- src/ol/render/webgl/imagereplay.js | 6 ++-- src/ol/reproj/tile.js | 4 +-- src/ol/source/cartodb.js | 4 +-- src/ol/source/imagearcgisrest.js | 6 ++-- src/ol/source/imagemapguide.js | 6 ++-- src/ol/source/imagewms.js | 8 ++--- src/ol/source/raster.js | 6 ++-- src/ol/source/tilearcgisrest.js | 6 ++-- src/ol/source/tilewms.js | 8 ++--- src/ol/source/vector.js | 14 ++++----- src/ol/source/wmts.js | 8 ++--- src/ol/structs/lrucache.js | 4 +-- src/ol/structs/priorityqueue.js | 4 +-- src/ol/structs/rbush.js | 4 +-- src/ol/tilegrid/tilegrid.js | 4 +-- src/ol/webgl/context.js | 8 ++--- test/spec/ol/feature.test.js | 4 +-- test/spec/ol/layer/group.test.js | 12 ++++---- test/spec/ol/objectutil.test.js | 30 +++++++++---------- test/spec/ol/pointer/touchsource.test.js | 4 +-- test_rendering/spec/ol/layer/image.test.js | 4 +-- test_rendering/spec/ol/layer/tile.test.js | 4 +-- .../spec/ol/layer/vectortile.test.js | 4 +-- 53 files changed, 161 insertions(+), 161 deletions(-) rename src/ol/{objectutil.js => obj.js} (86%) diff --git a/src/ol/control/attribution.js b/src/ol/control/attribution.js index ec7c67f94e..c5820016bf 100644 --- a/src/ol/control/attribution.js +++ b/src/ol/control/attribution.js @@ -9,7 +9,7 @@ goog.require('ol.control.Control'); goog.require('ol.css'); goog.require('ol.events'); goog.require('ol.events.EventType'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -155,7 +155,7 @@ ol.control.Attribution.prototype.getSourceAttributions = function(frameState) { var intersectsTileRange; var layerStatesArray = frameState.layerStatesArray; /** @type {Object.} */ - var attributions = ol.object.assign({}, frameState.attributions); + var attributions = ol.obj.assign({}, frameState.attributions); /** @type {Object.} */ var hiddenAttributions = {}; var projection = /** @type {!ol.proj.Projection} */ (frameState.viewState.projection); @@ -266,14 +266,14 @@ ol.control.Attribution.prototype.updateElement_ = function(frameState) { } var renderVisible = - !ol.object.isEmpty(this.attributionElementRenderedVisible_) || - !ol.object.isEmpty(frameState.logos); + !ol.obj.isEmpty(this.attributionElementRenderedVisible_) || + !ol.obj.isEmpty(frameState.logos); if (this.renderedVisible_ != renderVisible) { this.element.style.display = renderVisible ? '' : 'none'; this.renderedVisible_ = renderVisible; } if (renderVisible && - ol.object.isEmpty(this.attributionElementRenderedVisible_)) { + ol.obj.isEmpty(this.attributionElementRenderedVisible_)) { this.element.classList.add('ol-logo-only'); } else { this.element.classList.remove('ol-logo-only'); @@ -323,7 +323,7 @@ ol.control.Attribution.prototype.insertLogos_ = function(frameState) { } } - this.logoLi_.style.display = !ol.object.isEmpty(logos) ? '' : 'none'; + this.logoLi_.style.display = !ol.obj.isEmpty(logos) ? '' : 'none'; }; diff --git a/src/ol/events.js b/src/ol/events.js index d8244e2112..20fe8e97c6 100644 --- a/src/ol/events.js +++ b/src/ol/events.js @@ -2,7 +2,7 @@ goog.provide('ol.events'); goog.provide('ol.events.EventType'); goog.provide('ol.events.KeyCode'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -140,7 +140,7 @@ ol.events.removeListeners_ = function(target, type) { if (listeners) { for (var i = 0, ii = listeners.length; i < ii; ++i) { target.removeEventListener(type, listeners[i].boundListener); - ol.object.clear(listeners[i]); + ol.obj.clear(listeners[i]); } listeners.length = 0; var listenerMap = target.ol_lm; @@ -270,7 +270,7 @@ ol.events.unlistenByKey = function(key) { ol.events.removeListeners_(key.target, key.type); } } - ol.object.clear(key); + ol.obj.clear(key); } }; diff --git a/src/ol/format/esrijson.js b/src/ol/format/esrijson.js index bafe6e858a..6e006d2ba8 100644 --- a/src/ol/format/esrijson.js +++ b/src/ol/format/esrijson.js @@ -15,7 +15,7 @@ goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.geom.flat.orient'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); @@ -70,7 +70,7 @@ ol.format.EsriJSON.readGeometry_ = function(object, opt_options) { } else if (object.rings) { var layout = ol.format.EsriJSON.getGeometryLayout_(object); var rings = ol.format.EsriJSON.convertRings_(object.rings, layout); - object = /** @type {EsriJSONGeometry} */(ol.object.assign({}, object)); + object = /** @type {EsriJSONGeometry} */(ol.obj.assign({}, object)); if (rings.length === 1) { type = ol.geom.GeometryType.POLYGON; object.rings = rings[0]; @@ -635,7 +635,7 @@ ol.format.EsriJSON.prototype.writeFeatureObject = function( } var properties = feature.getProperties(); delete properties[feature.getGeometryName()]; - if (!ol.object.isEmpty(properties)) { + if (!ol.obj.isEmpty(properties)) { object['attributes'] = properties; } else { object['attributes'] = {}; diff --git a/src/ol/format/geojson.js b/src/ol/format/geojson.js index eee8a870e4..c0342f1495 100644 --- a/src/ol/format/geojson.js +++ b/src/ol/format/geojson.js @@ -13,7 +13,7 @@ goog.require('ol.geom.MultiPoint'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); @@ -206,7 +206,7 @@ ol.format.GeoJSON.writeEmptyGeometryCollectionGeometry_ = function(geometry) { ol.format.GeoJSON.writeGeometryCollectionGeometry_ = function( geometry, opt_options) { var geometries = geometry.getGeometriesArray().map(function(geometry) { - var options = ol.object.assign({}, opt_options); + var options = ol.obj.assign({}, opt_options); delete options.featureProjection; return ol.format.GeoJSON.writeGeometry_(geometry, options); }); @@ -526,7 +526,7 @@ ol.format.GeoJSON.prototype.writeFeatureObject = function(feature, opt_options) } var properties = feature.getProperties(); delete properties[feature.getGeometryName()]; - if (!ol.object.isEmpty(properties)) { + if (!ol.obj.isEmpty(properties)) { object.properties = properties; } else { object.properties = null; diff --git a/src/ol/format/gml3.js b/src/ol/format/gml3.js index da0fa63353..8615f09383 100644 --- a/src/ol/format/gml3.js +++ b/src/ol/format/gml3.js @@ -15,7 +15,7 @@ goog.require('ol.geom.MultiLineString'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.xml'); @@ -984,7 +984,7 @@ ol.format.GML3.prototype.writeCurveSegments_ = function(node, line, objectStack) */ ol.format.GML3.prototype.writeGeometryElement = function(node, geometry, objectStack) { var context = /** @type {olx.format.WriteOptions} */ (objectStack[objectStack.length - 1]); - var item = ol.object.assign({}, context); + var item = ol.obj.assign({}, context); item.node = node; var value; if (Array.isArray(geometry)) { @@ -1042,7 +1042,7 @@ ol.format.GML3.prototype.writeFeatureElement = function(node, feature, objectSta } } } - var item = ol.object.assign({}, context); + var item = ol.obj.assign({}, context); item.node = node; ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ (item), context.serializers, @@ -1066,7 +1066,7 @@ ol.format.GML3.prototype.writeFeatureMembers_ = function(node, features, objectS serializers[featureNS] = {}; serializers[featureNS][featureType] = ol.xml.makeChildAppender( this.writeFeatureElement, this); - var item = ol.object.assign({}, context); + var item = ol.obj.assign({}, context); item.node = node; ol.xml.pushSerializeAndPop(/** @type {ol.XmlNodeStackItem} */ (item), @@ -1243,7 +1243,7 @@ ol.format.GML3.prototype.writeGeometryNode = function(geometry, opt_options) { curve: this.curve_, surface: this.surface_, multiSurface: this.multiSurface_, multiCurve: this.multiCurve_}; if (opt_options) { - ol.object.assign(context, opt_options); + ol.obj.assign(context, opt_options); } this.writeGeometryElement(geom, geometry, [context]); return geom; @@ -1286,7 +1286,7 @@ ol.format.GML3.prototype.writeFeaturesNode = function(features, opt_options) { featureType: this.featureType }; if (opt_options) { - ol.object.assign(context, opt_options); + ol.obj.assign(context, opt_options); } this.writeFeatureMembers_(node, features, [context]); return node; diff --git a/src/ol/format/gmlbase.js b/src/ol/format/gmlbase.js index 2ade5560f1..2952e3745a 100644 --- a/src/ol/format/gmlbase.js +++ b/src/ol/format/gmlbase.js @@ -16,7 +16,7 @@ goog.require('ol.geom.MultiPoint'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.xml'); @@ -629,7 +629,7 @@ ol.format.GMLBase.prototype.readFeaturesFromNode = function(node, opt_options) { featureNS: this.featureNS }; if (opt_options) { - ol.object.assign(options, this.getReadOptions(node, opt_options)); + ol.obj.assign(options, this.getReadOptions(node, opt_options)); } var features = this.readFeaturesInternal(node, [options]); return features || []; diff --git a/src/ol/format/kml.js b/src/ol/format/kml.js index ed23d994a7..71bccceb57 100644 --- a/src/ol/format/kml.js +++ b/src/ol/format/kml.js @@ -25,7 +25,7 @@ goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); goog.require('ol.math'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.style.Fill'); goog.require('ol.style.Icon'); @@ -311,7 +311,7 @@ ol.format.KML.createNameStyleFunction_ = function(foundStyle, name) { textAlign = 'left'; } } - if (!ol.object.isEmpty(foundStyle.getText())) { + if (!ol.obj.isEmpty(foundStyle.getText())) { textStyle = /** @type {ol.style.Text} */ (goog.object.clone(foundStyle.getText())); textStyle.setText(name); diff --git a/src/ol/format/osmxml.js b/src/ol/format/osmxml.js index f3b7500edc..b2c8d085b8 100644 --- a/src/ol/format/osmxml.js +++ b/src/ol/format/osmxml.js @@ -9,7 +9,7 @@ goog.require('ol.geom.GeometryLayout'); goog.require('ol.geom.LineString'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.xml'); @@ -72,7 +72,7 @@ ol.format.OSMXML.readNode_ = function(node, objectStack) { var values = ol.xml.pushParseAndPop({ tags: {} }, ol.format.OSMXML.NODE_PARSERS_, node, objectStack); - if (!ol.object.isEmpty(values.tags)) { + if (!ol.obj.isEmpty(values.tags)) { var geometry = new ol.geom.Point(coordinates); ol.format.Feature.transformWithOptions(geometry, false, options); var feature = new ol.Feature(geometry); diff --git a/src/ol/format/topojson.js b/src/ol/format/topojson.js index 5a8d8955c5..145598680b 100644 --- a/src/ol/format/topojson.js +++ b/src/ol/format/topojson.js @@ -9,7 +9,7 @@ goog.require('ol.geom.MultiPoint'); goog.require('ol.geom.MultiPolygon'); goog.require('ol.geom.Point'); goog.require('ol.geom.Polygon'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); @@ -297,7 +297,7 @@ ol.format.TopoJSON.prototype.readFeaturesFromObject = function( } /** @type {Array.} */ var features = []; - var topoJSONFeatures = ol.object.getValues(topoJSONTopology.objects); + var topoJSONFeatures = ol.obj.getValues(topoJSONTopology.objects); var i, ii; var feature; for (i = 0, ii = topoJSONFeatures.length; i < ii; ++i) { diff --git a/src/ol/format/wfs.js b/src/ol/format/wfs.js index 7fa5a15572..5fc8d3eb64 100644 --- a/src/ol/format/wfs.js +++ b/src/ol/format/wfs.js @@ -15,7 +15,7 @@ goog.require('ol.format.ogc.filter.IsLike'); goog.require('ol.format.XMLFeature'); goog.require('ol.format.XSD'); goog.require('ol.geom.Geometry'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.xml'); @@ -109,7 +109,7 @@ ol.format.WFS.prototype.readFeaturesFromNode = function(node, opt_options) { 'featureType': this.featureType_, 'featureNS': this.featureNS_ }); - ol.object.assign(context, this.getReadOptions(node, + ol.obj.assign(context, this.getReadOptions(node, opt_options ? opt_options : {})); var objectStack = [context]; this.gmlFormat_.FEATURE_COLLECTION_PARSERS[ol.format.GMLBase.GMLNS][ @@ -526,7 +526,7 @@ ol.format.WFS.writeQuery_ = function(node, featureType, objectStack) { ol.xml.setAttributeNS(node, ol.format.WFS.XMLNS, 'xmlns:' + featurePrefix, featureNS); } - var item = /** @type {ol.XmlNodeStackItem} */ (ol.object.assign({}, context)); + var item = /** @type {ol.XmlNodeStackItem} */ (ol.obj.assign({}, context)); item.node = node; ol.xml.pushSerializeAndPop(item, ol.format.WFS.QUERY_SERIALIZERS_, @@ -767,7 +767,7 @@ ol.format.WFS.GETFEATURE_SERIALIZERS_ = { */ ol.format.WFS.writeGetFeature_ = function(node, featureTypes, objectStack) { var context = /** @type {Object} */ (objectStack[objectStack.length - 1]); - var item = /** @type {ol.XmlNodeStackItem} */ (ol.object.assign({}, context)); + var item = /** @type {ol.XmlNodeStackItem} */ (ol.obj.assign({}, context)); item.node = node; ol.xml.pushSerializeAndPop(item, ol.format.WFS.GETFEATURE_SERIALIZERS_, @@ -873,7 +873,7 @@ ol.format.WFS.prototype.writeTransaction = function(inserts, updates, deletes, obj = {node: node, 'featureNS': options.featureNS, 'featureType': options.featureType, 'featurePrefix': options.featurePrefix, 'srsName': options.srsName}; - ol.object.assign(obj, baseObj); + ol.obj.assign(obj, baseObj); ol.xml.pushSerializeAndPop(obj, ol.format.WFS.TRANSACTION_SERIALIZERS_, ol.xml.makeSimpleNodeFactory('Insert'), inserts, @@ -883,7 +883,7 @@ ol.format.WFS.prototype.writeTransaction = function(inserts, updates, deletes, obj = {node: node, 'featureNS': options.featureNS, 'featureType': options.featureType, 'featurePrefix': options.featurePrefix, 'srsName': options.srsName}; - ol.object.assign(obj, baseObj); + ol.obj.assign(obj, baseObj); ol.xml.pushSerializeAndPop(obj, ol.format.WFS.TRANSACTION_SERIALIZERS_, ol.xml.makeSimpleNodeFactory('Update'), updates, diff --git a/src/ol/format/wmsgetfeatureinfo.js b/src/ol/format/wmsgetfeatureinfo.js index ef9bbe6359..d51ad912fe 100644 --- a/src/ol/format/wmsgetfeatureinfo.js +++ b/src/ol/format/wmsgetfeatureinfo.js @@ -3,7 +3,7 @@ goog.provide('ol.format.WMSGetFeatureInfo'); goog.require('ol.array'); goog.require('ol.format.GML2'); goog.require('ol.format.XMLFeature'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.xml'); @@ -147,7 +147,7 @@ ol.format.WMSGetFeatureInfo.prototype.readFeatures; ol.format.WMSGetFeatureInfo.prototype.readFeaturesFromNode = function(node, opt_options) { var options = {}; if (opt_options) { - ol.object.assign(options, this.getReadOptions(node, opt_options)); + ol.obj.assign(options, this.getReadOptions(node, opt_options)); } return this.readFeatures_(node, [options]); }; diff --git a/src/ol/geom/geometrycollection.js b/src/ol/geom/geometrycollection.js index 774ff75978..58450b6328 100644 --- a/src/ol/geom/geometrycollection.js +++ b/src/ol/geom/geometrycollection.js @@ -5,7 +5,7 @@ goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryType'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -160,7 +160,7 @@ ol.geom.GeometryCollection.prototype.getGeometriesArray = function() { */ ol.geom.GeometryCollection.prototype.getSimplifiedGeometry = function(squaredTolerance) { if (this.simplifiedGeometryRevision != this.getRevision()) { - ol.object.clear(this.simplifiedGeometryCache); + ol.obj.clear(this.simplifiedGeometryCache); this.simplifiedGeometryMaxMinSquaredTolerance = 0; this.simplifiedGeometryRevision = this.getRevision(); } diff --git a/src/ol/geom/simplegeometry.js b/src/ol/geom/simplegeometry.js index 73732d7292..dbc739ec4a 100644 --- a/src/ol/geom/simplegeometry.js +++ b/src/ol/geom/simplegeometry.js @@ -5,7 +5,7 @@ goog.require('ol.extent'); goog.require('ol.geom.Geometry'); goog.require('ol.geom.GeometryLayout'); goog.require('ol.geom.flat.transform'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -146,7 +146,7 @@ ol.geom.SimpleGeometry.prototype.getLayout = function() { */ ol.geom.SimpleGeometry.prototype.getSimplifiedGeometry = function(squaredTolerance) { if (this.simplifiedGeometryRevision != this.getRevision()) { - ol.object.clear(this.simplifiedGeometryCache); + ol.obj.clear(this.simplifiedGeometryCache); this.simplifiedGeometryMaxMinSquaredTolerance = 0; this.simplifiedGeometryRevision = this.getRevision(); } diff --git a/src/ol/image.js b/src/ol/image.js index 081157b450..b180c504b9 100644 --- a/src/ol/image.js +++ b/src/ol/image.js @@ -5,7 +5,7 @@ goog.require('ol.ImageState'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -80,7 +80,7 @@ ol.Image.prototype.getImage = function(opt_context) { var key = ol.getUid(opt_context); if (key in this.imageByContext_) { return this.imageByContext_[key]; - } else if (ol.object.isEmpty(this.imageByContext_)) { + } else if (ol.obj.isEmpty(this.imageByContext_)) { image = this.image_; } else { image = /** @type {Image} */ (this.image_.cloneNode(false)); diff --git a/src/ol/imagetile.js b/src/ol/imagetile.js index 104651d644..3fc9072891 100644 --- a/src/ol/imagetile.js +++ b/src/ol/imagetile.js @@ -4,7 +4,7 @@ goog.require('ol.Tile'); goog.require('ol.TileState'); goog.require('ol.events'); goog.require('ol.events.EventType'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -86,7 +86,7 @@ ol.ImageTile.prototype.getImage = function(opt_context) { var key = ol.getUid(opt_context); if (key in this.imageByContext_) { return this.imageByContext_[key]; - } else if (ol.object.isEmpty(this.imageByContext_)) { + } else if (ol.obj.isEmpty(this.imageByContext_)) { image = this.image_; } else { image = /** @type {Image} */ (this.image_.cloneNode(false)); diff --git a/src/ol/interaction/pointer.js b/src/ol/interaction/pointer.js index 18a8522b71..c133c10161 100644 --- a/src/ol/interaction/pointer.js +++ b/src/ol/interaction/pointer.js @@ -4,7 +4,7 @@ goog.require('ol'); goog.require('ol.MapBrowserEvent.EventType'); goog.require('ol.MapBrowserPointerEvent'); goog.require('ol.interaction.Interaction'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -131,7 +131,7 @@ ol.interaction.Pointer.prototype.updateTrackedPointers_ = function(mapBrowserEve // update only when there was a pointerdown event for this pointer this.trackedPointers_[event.pointerId] = event; } - this.targetPointers = ol.object.getValues(this.trackedPointers_); + this.targetPointers = ol.obj.getValues(this.trackedPointers_); } }; diff --git a/src/ol/interaction/select.js b/src/ol/interaction/select.js index 56e11868f8..ef634e00b0 100644 --- a/src/ol/interaction/select.js +++ b/src/ol/interaction/select.js @@ -12,7 +12,7 @@ goog.require('ol.events.condition'); goog.require('ol.geom.GeometryType'); goog.require('ol.interaction.Interaction'); goog.require('ol.layer.Vector'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.source.Vector'); @@ -256,7 +256,7 @@ ol.interaction.Select.handleEvent = function(mapBrowserEvent) { // Replace the currently selected feature(s) with the feature(s) at the // pixel, or clear the selected feature(s) if there is no feature at // the pixel. - ol.object.clear(this.featureLayerAssociation_); + ol.obj.clear(this.featureLayerAssociation_); map.forEachFeatureAtPixel(mapBrowserEvent.pixel, /** * @param {ol.Feature|ol.render.Feature} feature Feature. diff --git a/src/ol/interaction/snap.js b/src/ol/interaction/snap.js index fcbb248864..cc8de4e282 100644 --- a/src/ol/interaction/snap.js +++ b/src/ol/interaction/snap.js @@ -13,7 +13,7 @@ goog.require('ol.extent'); goog.require('ol.geom.Geometry'); goog.require('ol.interaction.Pointer'); goog.require('ol.functions'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.source.Vector'); goog.require('ol.source.VectorEvent'); goog.require('ol.source.VectorEventType'); @@ -605,7 +605,7 @@ ol.interaction.Snap.handleEvent_ = function(evt) { * @private */ ol.interaction.Snap.handleUpEvent_ = function(evt) { - var featuresToUpdate = ol.object.getValues(this.pendingFeatures_); + var featuresToUpdate = ol.obj.getValues(this.pendingFeatures_); if (featuresToUpdate.length) { featuresToUpdate.forEach(this.updateFeature_, this); this.pendingFeatures_ = {}; diff --git a/src/ol/layer/base.js b/src/ol/layer/base.js index da7103c170..b1e4ebc55a 100644 --- a/src/ol/layer/base.js +++ b/src/ol/layer/base.js @@ -4,7 +4,7 @@ goog.provide('ol.layer.LayerProperty'); goog.require('ol'); goog.require('ol.Object'); goog.require('ol.math'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.source.State'); @@ -42,7 +42,7 @@ ol.layer.Base = function(options) { /** * @type {Object.} */ - var properties = ol.object.assign({}, options); + var properties = ol.obj.assign({}, options); properties[ol.layer.LayerProperty.OPACITY] = options.opacity !== undefined ? options.opacity : 1; properties[ol.layer.LayerProperty.VISIBLE] = diff --git a/src/ol/layer/group.js b/src/ol/layer/group.js index c63b6b4cda..f982001055 100644 --- a/src/ol/layer/group.js +++ b/src/ol/layer/group.js @@ -7,7 +7,7 @@ goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.layer.Base'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.source.State'); @@ -34,7 +34,7 @@ ol.layer.Group = function(opt_options) { var options = opt_options || {}; var baseOptions = /** @type {olx.layer.GroupOptions} */ - (ol.object.assign({}, options)); + (ol.obj.assign({}, options)); delete baseOptions.layers; var layers = options.layers; @@ -103,7 +103,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) { for (var id in this.listenerKeys_) { this.listenerKeys_[id].forEach(ol.events.unlistenByKey); } - ol.object.clear(this.listenerKeys_); + ol.obj.clear(this.listenerKeys_); var layersArray = layers.getArray(); var i, ii, layer; diff --git a/src/ol/layer/heatmap.js b/src/ol/layer/heatmap.js index 1c8366e303..ce2fabaaf3 100644 --- a/src/ol/layer/heatmap.js +++ b/src/ol/layer/heatmap.js @@ -6,7 +6,7 @@ goog.require('ol.Object'); goog.require('ol.dom'); goog.require('ol.layer.Vector'); goog.require('ol.math'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.render.EventType'); goog.require('ol.style.Icon'); goog.require('ol.style.Style'); @@ -38,7 +38,7 @@ ol.layer.HeatmapLayerProperty = { ol.layer.Heatmap = function(opt_options) { var options = opt_options ? opt_options : {}; - var baseOptions = ol.object.assign({}, options); + var baseOptions = ol.obj.assign({}, options); delete baseOptions.gradient; delete baseOptions.radius; diff --git a/src/ol/layer/layer.js b/src/ol/layer/layer.js index 8665dd9ea5..f3e321978d 100644 --- a/src/ol/layer/layer.js +++ b/src/ol/layer/layer.js @@ -6,7 +6,7 @@ goog.require('ol'); goog.require('ol.Object'); goog.require('ol.layer.Base'); goog.require('ol.layer.LayerProperty'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.render.EventType'); goog.require('ol.source.State'); @@ -34,7 +34,7 @@ goog.require('ol.source.State'); */ ol.layer.Layer = function(options) { - var baseOptions = ol.object.assign({}, options); + var baseOptions = ol.obj.assign({}, options); delete baseOptions.source; ol.layer.Base.call(this, /** @type {olx.layer.BaseOptions} */ (baseOptions)); diff --git a/src/ol/layer/tile.js b/src/ol/layer/tile.js index f8bf8f35ac..d445523f61 100644 --- a/src/ol/layer/tile.js +++ b/src/ol/layer/tile.js @@ -2,7 +2,7 @@ goog.provide('ol.layer.Tile'); goog.require('ol'); goog.require('ol.layer.Layer'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -31,7 +31,7 @@ ol.layer.TileProperty = { ol.layer.Tile = function(opt_options) { var options = opt_options ? opt_options : {}; - var baseOptions = ol.object.assign({}, options); + var baseOptions = ol.obj.assign({}, options); delete baseOptions.preload; delete baseOptions.useInterimTilesOnError; diff --git a/src/ol/layer/vector.js b/src/ol/layer/vector.js index c829cb7255..1cc0d0c8c7 100644 --- a/src/ol/layer/vector.js +++ b/src/ol/layer/vector.js @@ -2,7 +2,7 @@ goog.provide('ol.layer.Vector'); goog.require('ol'); goog.require('ol.layer.Layer'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.style.Style'); @@ -37,7 +37,7 @@ ol.layer.Vector = function(opt_options) { typeof options.renderOrder === 'function', 'renderOrder must be a comparator function'); - var baseOptions = ol.object.assign({}, options); + var baseOptions = ol.obj.assign({}, options); delete baseOptions.style; delete baseOptions.renderBuffer; diff --git a/src/ol/layer/vectortile.js b/src/ol/layer/vectortile.js index df4ba65846..fd84333365 100644 --- a/src/ol/layer/vectortile.js +++ b/src/ol/layer/vectortile.js @@ -1,7 +1,7 @@ goog.provide('ol.layer.VectorTile'); goog.require('ol.layer.Vector'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -48,7 +48,7 @@ ol.layer.VectorTileRenderType = { ol.layer.VectorTile = function(opt_options) { var options = opt_options ? opt_options : {}; - var baseOptions = ol.object.assign({}, options); + var baseOptions = ol.obj.assign({}, options); delete baseOptions.preload; delete baseOptions.useInterimTilesOnError; diff --git a/src/ol/map.js b/src/ol/map.js index c5b1f2864e..227c728c09 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -30,7 +30,7 @@ goog.require('ol.has'); goog.require('ol.interaction'); goog.require('ol.layer.Group'); goog.require('ol.transform'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.proj.common'); goog.require('ol.renderer.Map'); @@ -1258,7 +1258,7 @@ ol.Map.prototype.renderFrame_ = function(time) { index: this.frameIndex_++, layerStates: layerStates, layerStatesArray: layerStatesArray, - logos: ol.object.assign({}, this.logos_), + logos: ol.obj.assign({}, this.logos_), pixelRatio: this.pixelRatio_, pixelToCoordinateTransform: this.pixelToCoordinateTransform_, postRenderFunctions: [], diff --git a/src/ol/objectutil.js b/src/ol/obj.js similarity index 86% rename from src/ol/objectutil.js rename to src/ol/obj.js index 8ada4e7996..5549b373dc 100644 --- a/src/ol/objectutil.js +++ b/src/ol/obj.js @@ -1,4 +1,4 @@ -goog.provide('ol.object'); +goog.provide('ol.obj'); /** @@ -10,7 +10,7 @@ goog.provide('ol.object'); * @param {...Object} var_sources The source object(s). * @return {!Object} The modified target object. */ -ol.object.assign = (typeof Object.assign === 'function') ? Object.assign : function(target, var_sources) { +ol.obj.assign = (typeof Object.assign === 'function') ? Object.assign : function(target, var_sources) { if (target === undefined || target === null) { throw new TypeError('Cannot convert undefined or null to object'); } @@ -34,7 +34,7 @@ ol.object.assign = (typeof Object.assign === 'function') ? Object.assign : funct * Removes all properties from an object. * @param {Object} object The object to clear. */ -ol.object.clear = function(object) { +ol.obj.clear = function(object) { for (var property in object) { delete object[property]; } @@ -47,7 +47,7 @@ ol.object.clear = function(object) { * @return {!Array} The property values. * @template K,V */ -ol.object.getValues = function(object) { +ol.obj.getValues = function(object) { var values = []; for (var property in object) { values.push(object[property]); @@ -61,7 +61,7 @@ ol.object.getValues = function(object) { * @param {Object} object The object to check. * @return {boolean} The object is empty. */ -ol.object.isEmpty = function(object) { +ol.obj.isEmpty = function(object) { var property; for (property in object) { return false; diff --git a/src/ol/object.js b/src/ol/object.js index 8f8e0630ad..c9bd22c6b6 100644 --- a/src/ol/object.js +++ b/src/ol/object.js @@ -5,7 +5,7 @@ goog.provide('ol.ObjectEventType'); goog.require('ol.Observable'); goog.require('ol.events'); goog.require('ol.events.Event'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -170,7 +170,7 @@ ol.Object.prototype.getKeys = function() { * @api stable */ ol.Object.prototype.getProperties = function() { - return ol.object.assign({}, this.values_); + return ol.obj.assign({}, this.values_); }; diff --git a/src/ol/proj/index.js b/src/ol/proj/index.js index d51972e760..37d7ad187b 100644 --- a/src/ol/proj/index.js +++ b/src/ol/proj/index.js @@ -5,7 +5,7 @@ goog.provide('ol.proj.Units'); goog.require('ol'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.sphere.NORMAL'); @@ -614,7 +614,7 @@ ol.proj.removeTransform = function(source, destination) { 'destinationCode should be in transforms of sourceCode'); var transform = transforms[sourceCode][destinationCode]; delete transforms[sourceCode][destinationCode]; - if (ol.object.isEmpty(transforms[sourceCode])) { + if (ol.obj.isEmpty(transforms[sourceCode])) { delete transforms[sourceCode]; } return transform; diff --git a/src/ol/render/canvas/replay.js b/src/ol/render/canvas/replay.js index 279446e14b..ff7c0bb0fa 100644 --- a/src/ol/render/canvas/replay.js +++ b/src/ol/render/canvas/replay.js @@ -19,7 +19,7 @@ goog.require('ol.extent.Relationship'); goog.require('ol.geom.flat.simplify'); goog.require('ol.geom.flat.transform'); goog.require('ol.has'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.render.IReplayGroup'); goog.require('ol.render.VectorContext'); goog.require('ol.render.canvas'); @@ -248,7 +248,7 @@ ol.render.canvas.Replay.prototype.replay_ = function( goog.DEBUG && console.assert(pixelCoordinates === this.pixelCoordinates_, 'pixelCoordinates should be the same as this.pixelCoordinates_'); } - var skipFeatures = !ol.object.isEmpty(skippedFeaturesHash); + var skipFeatures = !ol.obj.isEmpty(skippedFeaturesHash); var i = 0; // instruction index var ii = instructions.length; // end of instructions var d = 0; // data index @@ -1957,7 +1957,7 @@ ol.render.canvas.ReplayGroup.prototype.getReplay = function(zIndex, replayType) * @inheritDoc */ ol.render.canvas.ReplayGroup.prototype.isEmpty = function() { - return ol.object.isEmpty(this.replaysByZIndex_); + return ol.obj.isEmpty(this.replaysByZIndex_); }; diff --git a/src/ol/render/webgl/imagereplay.js b/src/ol/render/webgl/imagereplay.js index 2f817d3770..f662b72252 100644 --- a/src/ol/render/webgl/imagereplay.js +++ b/src/ol/render/webgl/imagereplay.js @@ -3,7 +3,7 @@ goog.provide('ol.render.webgl.ReplayGroup'); goog.require('ol.transform'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.render.IReplayGroup'); goog.require('ol.render.VectorContext'); goog.require('ol.render.webgl.imagereplay.shader.Default'); @@ -617,7 +617,7 @@ ol.render.webgl.ImageReplay.prototype.drawReplay_ = function(gl, context, skippe ol.webgl.UNSIGNED_INT : ol.webgl.UNSIGNED_SHORT; var elementSize = context.hasOESElementIndexUint ? 4 : 2; - if (!ol.object.isEmpty(skippedFeaturesHash)) { + if (!ol.obj.isEmpty(skippedFeaturesHash)) { this.drawReplaySkipping_( gl, skippedFeaturesHash, textures, groupIndices, elementType, elementSize); @@ -998,7 +998,7 @@ ol.render.webgl.ReplayGroup.prototype.getReplay = function(zIndex, replayType) { * @inheritDoc */ ol.render.webgl.ReplayGroup.prototype.isEmpty = function() { - return ol.object.isEmpty(this.replays_); + return ol.obj.isEmpty(this.replays_); }; diff --git a/src/ol/reproj/tile.js b/src/ol/reproj/tile.js index 670c08dc34..0ebbdf6fb3 100644 --- a/src/ol/reproj/tile.js +++ b/src/ol/reproj/tile.js @@ -6,7 +6,7 @@ goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.math'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.reproj'); goog.require('ol.reproj.Triangulation'); @@ -223,7 +223,7 @@ ol.reproj.Tile.prototype.getImage = function(opt_context) { var key = ol.getUid(opt_context); if (key in this.canvasByContext_) { return this.canvasByContext_[key]; - } else if (ol.object.isEmpty(this.canvasByContext_)) { + } else if (ol.obj.isEmpty(this.canvasByContext_)) { image = this.canvas_; } else { image = /** @type {HTMLCanvasElement} */ (this.canvas_.cloneNode(false)); diff --git a/src/ol/source/cartodb.js b/src/ol/source/cartodb.js index 3a302b4749..9d3f5f1b81 100644 --- a/src/ol/source/cartodb.js +++ b/src/ol/source/cartodb.js @@ -1,6 +1,6 @@ goog.provide('ol.source.CartoDB'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.source.State'); goog.require('ol.source.XYZ'); @@ -73,7 +73,7 @@ ol.source.CartoDB.prototype.getConfig = function() { * @api */ ol.source.CartoDB.prototype.updateConfig = function(config) { - ol.object.assign(this.config_, config); + ol.obj.assign(this.config_, config); this.initializeMap_(); }; diff --git a/src/ol/source/imagearcgisrest.js b/src/ol/source/imagearcgisrest.js index d9e4cf0267..e598c73167 100644 --- a/src/ol/source/imagearcgisrest.js +++ b/src/ol/source/imagearcgisrest.js @@ -5,7 +5,7 @@ goog.require('ol.Image'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.source.Image'); goog.require('ol.uri'); @@ -129,7 +129,7 @@ ol.source.ImageArcGISRest.prototype.getImageInternal = function(extent, resoluti 'FORMAT': 'PNG32', 'TRANSPARENT': true }; - ol.object.assign(params, this.params_); + ol.obj.assign(params, this.params_); extent = extent.slice(); var centerX = (extent[0] + extent[2]) / 2; @@ -260,7 +260,7 @@ ol.source.ImageArcGISRest.prototype.setUrl = function(url) { * @api stable */ ol.source.ImageArcGISRest.prototype.updateParams = function(params) { - ol.object.assign(this.params_, params); + ol.obj.assign(this.params_, params); this.image_ = null; this.changed(); }; diff --git a/src/ol/source/imagemapguide.js b/src/ol/source/imagemapguide.js index 1487b77554..b018504e4d 100644 --- a/src/ol/source/imagemapguide.js +++ b/src/ol/source/imagemapguide.js @@ -4,7 +4,7 @@ goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.Image'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.source.Image'); goog.require('ol.uri'); @@ -191,7 +191,7 @@ ol.source.ImageMapGuide.getScale = function(extent, size, metersPerUnit, dpi) { * @api stable */ ol.source.ImageMapGuide.prototype.updateParams = function(params) { - ol.object.assign(this.params_, params); + ol.obj.assign(this.params_, params); this.changed(); }; @@ -221,7 +221,7 @@ ol.source.ImageMapGuide.prototype.getUrl = function(baseUrl, params, extent, siz 'SETVIEWCENTERX': center[0], 'SETVIEWCENTERY': center[1] }; - ol.object.assign(baseParams, params); + ol.obj.assign(baseParams, params); return ol.uri.appendParams(baseUrl, baseParams); }; diff --git a/src/ol/source/imagewms.js b/src/ol/source/imagewms.js index 3dc5cba63d..aac0cba38e 100644 --- a/src/ol/source/imagewms.js +++ b/src/ol/source/imagewms.js @@ -7,7 +7,7 @@ goog.require('ol.Image'); goog.require('ol.events'); goog.require('ol.events.EventType'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.source.Image'); goog.require('ol.source.wms'); @@ -154,7 +154,7 @@ ol.source.ImageWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resolut 'TRANSPARENT': true, 'QUERY_LAYERS': this.params_['LAYERS'] }; - ol.object.assign(baseParams, this.params_, params); + ol.obj.assign(baseParams, this.params_, params); var x = Math.floor((coordinate[0] - extent[0]) / resolution); var y = Math.floor((extent[3] - coordinate[1]) / resolution); @@ -226,7 +226,7 @@ ol.source.ImageWMS.prototype.getImageInternal = function(extent, resolution, pix 'FORMAT': 'image/png', 'TRANSPARENT': true }; - ol.object.assign(params, this.params_); + ol.obj.assign(params, this.params_); this.imageSize_[0] = Math.ceil(imageWidth * this.ratio_); this.imageSize_[1] = Math.ceil(imageHeight * this.ratio_); @@ -358,7 +358,7 @@ ol.source.ImageWMS.prototype.setUrl = function(url) { * @api stable */ ol.source.ImageWMS.prototype.updateParams = function(params) { - ol.object.assign(this.params_, params); + ol.obj.assign(this.params_, params); this.updateV13_(); this.image_ = null; this.changed(); diff --git a/src/ol/source/raster.js b/src/ol/source/raster.js index 6ceb09750a..64a8c8e901 100644 --- a/src/ol/source/raster.js +++ b/src/ol/source/raster.js @@ -14,7 +14,7 @@ goog.require('ol.ext.pixelworks'); goog.require('ol.extent'); goog.require('ol.layer.Image'); goog.require('ol.layer.Tile'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.renderer.canvas.ImageLayer'); goog.require('ol.renderer.canvas.TileLayer'); goog.require('ol.source.Image'); @@ -181,10 +181,10 @@ ol.source.Raster.prototype.setOperation = function(operation, opt_lib) { ol.source.Raster.prototype.updateFrameState_ = function(extent, resolution, projection) { var frameState = /** @type {olx.FrameState} */ ( - ol.object.assign({}, this.frameState_)); + ol.obj.assign({}, this.frameState_)); frameState.viewState = /** @type {olx.ViewState} */ ( - ol.object.assign({}, frameState.viewState)); + ol.obj.assign({}, frameState.viewState)); var center = ol.extent.getCenter(extent); var width = Math.round(ol.extent.getWidth(extent) / resolution); diff --git a/src/ol/source/tilearcgisrest.js b/src/ol/source/tilearcgisrest.js index 9e4c2f62fe..e4edbe5d88 100644 --- a/src/ol/source/tilearcgisrest.js +++ b/src/ol/source/tilearcgisrest.js @@ -2,7 +2,7 @@ goog.provide('ol.source.TileArcGISRest'); goog.require('ol'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.math'); goog.require('ol.proj'); goog.require('ol.size'); @@ -154,7 +154,7 @@ ol.source.TileArcGISRest.prototype.fixedTileUrlFunction = function(tileCoord, pi 'FORMAT': 'PNG32', 'TRANSPARENT': true }; - ol.object.assign(baseParams, this.params_); + ol.obj.assign(baseParams, this.params_); return this.getRequestUrl_(tileCoord, tileSize, tileExtent, pixelRatio, projection, baseParams); @@ -167,6 +167,6 @@ ol.source.TileArcGISRest.prototype.fixedTileUrlFunction = function(tileCoord, pi * @api stable */ ol.source.TileArcGISRest.prototype.updateParams = function(params) { - ol.object.assign(this.params_, params); + ol.obj.assign(this.params_, params); this.changed(); }; diff --git a/src/ol/source/tilewms.js b/src/ol/source/tilewms.js index 38fff284bb..e887e99c8b 100644 --- a/src/ol/source/tilewms.js +++ b/src/ol/source/tilewms.js @@ -6,7 +6,7 @@ goog.provide('ol.source.TileWMS'); goog.require('ol'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.math'); goog.require('ol.proj'); goog.require('ol.size'); @@ -153,7 +153,7 @@ ol.source.TileWMS.prototype.getGetFeatureInfoUrl = function(coordinate, resoluti 'TRANSPARENT': true, 'QUERY_LAYERS': this.params_['LAYERS'] }; - ol.object.assign(baseParams, this.params_, params); + ol.obj.assign(baseParams, this.params_, params); var x = Math.floor((coordinate[0] - tileExtent[0]) / tileResolution); var y = Math.floor((tileExtent[3] - coordinate[1]) / tileResolution); @@ -348,7 +348,7 @@ ol.source.TileWMS.prototype.fixedTileUrlFunction = function(tileCoord, pixelRati 'FORMAT': 'image/png', 'TRANSPARENT': true }; - ol.object.assign(baseParams, this.params_); + ol.obj.assign(baseParams, this.params_); return this.getRequestUrl_(tileCoord, tileSize, tileExtent, pixelRatio, projection, baseParams); @@ -369,7 +369,7 @@ ol.source.TileWMS.prototype.setUrls = function(urls) { * @api stable */ ol.source.TileWMS.prototype.updateParams = function(params) { - ol.object.assign(this.params_, params); + ol.obj.assign(this.params_, params); this.resetCoordKeyPrefix_(); this.updateV13_(); this.setKey(this.getKeyForParams_()); diff --git a/src/ol/source/vector.js b/src/ol/source/vector.js index 4cb81e3527..1d3f3dc814 100644 --- a/src/ol/source/vector.js +++ b/src/ol/source/vector.js @@ -16,7 +16,7 @@ goog.require('ol.events.EventType'); goog.require('ol.extent'); goog.require('ol.featureloader'); goog.require('ol.loadingstrategy'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.source.Source'); goog.require('ol.source.State'); @@ -394,11 +394,11 @@ ol.source.Vector.prototype.clear = function(opt_fast) { if (this.featuresCollection_) { this.featuresCollection_.clear(); } - goog.DEBUG && console.assert(ol.object.isEmpty(this.featureChangeKeys_), + goog.DEBUG && console.assert(ol.obj.isEmpty(this.featureChangeKeys_), 'featureChangeKeys is an empty object now'); - goog.DEBUG && console.assert(ol.object.isEmpty(this.idIndex_), + goog.DEBUG && console.assert(ol.obj.isEmpty(this.idIndex_), 'idIndex is an empty object now'); - goog.DEBUG && console.assert(ol.object.isEmpty(this.undefIdIndex_), + goog.DEBUG && console.assert(ol.obj.isEmpty(this.undefIdIndex_), 'undefIdIndex is an empty object now'); if (this.featuresRtree_) { @@ -552,9 +552,9 @@ ol.source.Vector.prototype.getFeatures = function() { features = this.featuresCollection_.getArray(); } else if (this.featuresRtree_) { features = this.featuresRtree_.getAll(); - if (!ol.object.isEmpty(this.nullGeometryFeatures_)) { + if (!ol.obj.isEmpty(this.nullGeometryFeatures_)) { ol.array.extend( - features, ol.object.getValues(this.nullGeometryFeatures_)); + features, ol.obj.getValues(this.nullGeometryFeatures_)); } } return /** @type {Array.} */ (features); @@ -771,7 +771,7 @@ ol.source.Vector.prototype.handleFeatureChange_ = function(event) { */ ol.source.Vector.prototype.isEmpty = function() { return this.featuresRtree_.isEmpty() && - ol.object.isEmpty(this.nullGeometryFeatures_); + ol.obj.isEmpty(this.nullGeometryFeatures_); }; diff --git a/src/ol/source/wmts.js b/src/ol/source/wmts.js index f0d1e6a9f3..61c3fa8cd5 100644 --- a/src/ol/source/wmts.js +++ b/src/ol/source/wmts.js @@ -4,7 +4,7 @@ goog.provide('ol.source.WMTSRequestEncoding'); goog.require('ol.TileUrlFunction'); goog.require('ol.array'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.source.TileImage'); goog.require('ol.tilegrid.WMTS'); @@ -101,7 +101,7 @@ ol.source.WMTS = function(options) { }; if (requestEncoding == ol.source.WMTSRequestEncoding.KVP) { - ol.object.assign(context, { + ol.obj.assign(context, { 'Service': 'WMTS', 'Request': 'GetTile', 'Version': this.version_, @@ -143,7 +143,7 @@ ol.source.WMTS = function(options) { 'TileCol': tileCoord[1], 'TileRow': -tileCoord[2] - 1 }; - ol.object.assign(localContext, dimensions); + ol.obj.assign(localContext, dimensions); var url = template; if (requestEncoding == ol.source.WMTSRequestEncoding.KVP) { url = ol.uri.appendParams(url, localContext); @@ -276,7 +276,7 @@ ol.source.WMTS.prototype.getKeyForDimensions_ = function() { * @api */ ol.source.WMTS.prototype.updateDimensions = function(dimensions) { - ol.object.assign(this.dimensions_, dimensions); + ol.obj.assign(this.dimensions_, dimensions); this.setKey(this.getKeyForDimensions_()); }; diff --git a/src/ol/structs/lrucache.js b/src/ol/structs/lrucache.js index 4c658c6243..b8735f573b 100644 --- a/src/ol/structs/lrucache.js +++ b/src/ol/structs/lrucache.js @@ -1,6 +1,6 @@ goog.provide('ol.structs.LRUCache'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -46,7 +46,7 @@ if (goog.DEBUG) { */ ol.structs.LRUCache.prototype.assertValid = function() { if (this.count_ === 0) { - console.assert(ol.object.isEmpty(this.entries_), + console.assert(ol.obj.isEmpty(this.entries_), 'entries must be an empty object (count = 0)'); console.assert(!this.oldest_, 'oldest must be null (count = 0)'); diff --git a/src/ol/structs/priorityqueue.js b/src/ol/structs/priorityqueue.js index d00b8d0dca..dc2dfb9270 100644 --- a/src/ol/structs/priorityqueue.js +++ b/src/ol/structs/priorityqueue.js @@ -1,6 +1,6 @@ goog.provide('ol.structs.PriorityQueue'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -89,7 +89,7 @@ if (goog.DEBUG) { ol.structs.PriorityQueue.prototype.clear = function() { this.elements_.length = 0; this.priorities_.length = 0; - ol.object.clear(this.queuedElements_); + ol.obj.clear(this.queuedElements_); }; diff --git a/src/ol/structs/rbush.js b/src/ol/structs/rbush.js index 9aca9027da..0d3c56f244 100644 --- a/src/ol/structs/rbush.js +++ b/src/ol/structs/rbush.js @@ -2,7 +2,7 @@ goog.provide('ol.structs.RBush'); goog.require('ol.ext.rbush'); goog.require('ol.extent'); -goog.require('ol.object'); +goog.require('ol.obj'); /** @@ -243,7 +243,7 @@ ol.structs.RBush.prototype.forEach_ = function(values, callback, opt_this) { * @return {boolean} Is empty. */ ol.structs.RBush.prototype.isEmpty = function() { - return ol.object.isEmpty(this.items_); + return ol.obj.isEmpty(this.items_); }; diff --git a/src/ol/tilegrid/tilegrid.js b/src/ol/tilegrid/tilegrid.js index facc390a07..79930a3f4b 100644 --- a/src/ol/tilegrid/tilegrid.js +++ b/src/ol/tilegrid/tilegrid.js @@ -6,7 +6,7 @@ goog.require('ol.array'); goog.require('ol.extent'); goog.require('ol.extent.Corner'); goog.require('ol.math'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.proj.METERS_PER_UNIT'); goog.require('ol.proj.Projection'); @@ -558,7 +558,7 @@ ol.tilegrid.createForExtent = function(extent, opt_maxZoom, opt_tileSize, opt_co */ ol.tilegrid.createXYZ = function(opt_options) { var options = /** @type {olx.tilegrid.TileGridOptions} */ ({}); - ol.object.assign(options, opt_options !== undefined ? + ol.obj.assign(options, opt_options !== undefined ? opt_options : /** @type {olx.tilegrid.XYZOptions} */ ({})); if (options.extent === undefined) { options.extent = ol.proj.get('EPSG:3857').getExtent(); diff --git a/src/ol/webgl/context.js b/src/ol/webgl/context.js index ef0fdf2eb2..e2cfa0b213 100644 --- a/src/ol/webgl/context.js +++ b/src/ol/webgl/context.js @@ -4,7 +4,7 @@ goog.require('ol'); goog.require('ol.Disposable'); goog.require('ol.array'); goog.require('ol.events'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); goog.require('ol.webgl.WebGLContextEventType'); @@ -263,9 +263,9 @@ ol.webgl.Context.prototype.getProgram = function( * FIXME empy description for jsdoc */ ol.webgl.Context.prototype.handleWebGLContextLost = function() { - ol.object.clear(this.bufferCache_); - ol.object.clear(this.shaderCache_); - ol.object.clear(this.programCache_); + ol.obj.clear(this.bufferCache_); + ol.obj.clear(this.shaderCache_); + ol.obj.clear(this.programCache_); this.currentProgram_ = null; this.hitDetectionFramebuffer_ = null; this.hitDetectionTexture_ = null; diff --git a/test/spec/ol/feature.test.js b/test/spec/ol/feature.test.js index 6612064cf8..fc4ab12bf8 100644 --- a/test/spec/ol/feature.test.js +++ b/test/spec/ol/feature.test.js @@ -81,7 +81,7 @@ describe('ol.Feature', function() { it('is empty by default', function() { var feature = new ol.Feature(); var properties = feature.getProperties(); - expect(ol.object.isEmpty(properties)).to.be(true); + expect(ol.obj.isEmpty(properties)).to.be(true); }); }); @@ -464,5 +464,5 @@ describe('ol.Feature.createStyleFunction()', function() { goog.require('ol.Feature'); goog.require('ol.geom.Point'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.style.Style'); diff --git a/test/spec/ol/layer/group.test.js b/test/spec/ol/layer/group.test.js index 6fec9270d8..f389779fc9 100644 --- a/test/spec/ol/layer/group.test.js +++ b/test/spec/ol/layer/group.test.js @@ -364,9 +364,9 @@ describe('ol.layer.Group', function() { expect(layerStatesArray[0]).to.eql(layer1.getLayerState()); // layer state should match except for layer reference - var layerState = ol.object.assign({}, layerStatesArray[0]); + var layerState = ol.obj.assign({}, layerStatesArray[0]); delete layerState.layer; - var groupState = ol.object.assign({}, layerGroup.getLayerState()); + var groupState = ol.obj.assign({}, layerGroup.getLayerState()); delete groupState.layer; expect(layerState).to.eql(groupState); @@ -413,14 +413,14 @@ describe('ol.layer.Group', function() { var groupState, layerState; // layer state should match except for layer reference - layerState = ol.object.assign({}, layerStatesArray[0]); + layerState = ol.obj.assign({}, layerStatesArray[0]); delete layerState.layer; - groupState = ol.object.assign({}, layerGroup.getLayerState()); + groupState = ol.obj.assign({}, layerGroup.getLayerState()); delete groupState.layer; expect(layerState).to.eql(groupState); // layer state should be transformed (and we ignore layer reference) - layerState = ol.object.assign({}, layerStatesArray[1]); + layerState = ol.obj.assign({}, layerStatesArray[1]); delete layerState.layer; expect(layerState).to.eql({ opacity: 0.25, @@ -495,6 +495,6 @@ goog.require('ol.events'); goog.require('ol.extent'); goog.require('ol.layer.Group'); goog.require('ol.layer.Layer'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.renderer.Map'); goog.require('ol.source.Source'); diff --git a/test/spec/ol/objectutil.test.js b/test/spec/ol/objectutil.test.js index e3a91c0a6c..fc6f59ebf1 100644 --- a/test/spec/ol/objectutil.test.js +++ b/test/spec/ol/objectutil.test.js @@ -1,10 +1,10 @@ goog.provide('ol.test.object'); -describe('ol.object.assign()', function() { +describe('ol.obj.assign()', function() { it('is an alias for Object.assign() where available', function() { if (typeof Object.assign === 'function') { - expect(ol.object.assign).to.be(Object.assign); + expect(ol.obj.assign).to.be(Object.assign); } }); @@ -20,7 +20,7 @@ describe('ol.object.assign()', function() { targetProp1: 'targetValue1' }; - var assigned = ol.object.assign(target, source); + var assigned = ol.obj.assign(target, source); expect(assigned).to.be(target); expect(assigned.sourceProp1).to.be('sourceValue1'); expect(assigned.sourceProp2).to.be('sourceValue2'); @@ -30,11 +30,11 @@ describe('ol.object.assign()', function() { }); -describe('ol.object.clear()', function() { +describe('ol.obj.clear()', function() { it('removes all properties from an object', function() { - var clear = ol.object.clear; - var isEmpty = ol.object.isEmpty; + var clear = ol.obj.clear; + var isEmpty = ol.obj.isEmpty; expect(isEmpty(clear({foo: 'bar'}))).to.be(true); expect(isEmpty(clear({foo: 'bar', num: 42}))).to.be(true); expect(isEmpty(clear({}))).to.be(true); @@ -43,24 +43,24 @@ describe('ol.object.clear()', function() { }); -describe('ol.object.getValues()', function() { +describe('ol.obj.getValues()', function() { it('gets a list of property values from an object', function() { - expect(ol.object.getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']); - expect(ol.object.getValues(null)).to.eql([]); + expect(ol.obj.getValues({foo: 'bar', num: 42}).sort()).to.eql([42, 'bar']); + expect(ol.obj.getValues(null)).to.eql([]); }); }); -describe('ol.object.isEmpty()', function() { +describe('ol.obj.isEmpty()', function() { it('checks if an object has any properties', function() { - expect(ol.object.isEmpty({})).to.be(true); - expect(ol.object.isEmpty(null)).to.be(true); - expect(ol.object.isEmpty({foo: 'bar'})).to.be(false); - expect(ol.object.isEmpty({foo: false})).to.be(false); + expect(ol.obj.isEmpty({})).to.be(true); + expect(ol.obj.isEmpty(null)).to.be(true); + expect(ol.obj.isEmpty({foo: 'bar'})).to.be(false); + expect(ol.obj.isEmpty({foo: false})).to.be(false); }); }); -goog.require('ol.object'); +goog.require('ol.obj'); diff --git a/test/spec/ol/pointer/touchsource.test.js b/test/spec/ol/pointer/touchsource.test.js index d4eec899b4..bd3014346d 100644 --- a/test/spec/ol/pointer/touchsource.test.js +++ b/test/spec/ol/pointer/touchsource.test.js @@ -119,7 +119,7 @@ describe('ol.pointer.TouchSource', function() { touches = touches !== undefined ? touches : changedTouches; var event = new ol.events.Event(type); - ol.object.assign(event, { + ol.obj.assign(event, { touches: touches, changedTouches: changedTouches }); @@ -131,7 +131,7 @@ goog.require('ol.events'); goog.require('ol.events.Event'); goog.require('ol.events.EventTarget'); goog.require('ol.has'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.pointer.PointerEvent'); goog.require('ol.pointer.PointerEventHandler'); goog.require('ol.pointer.TouchSource'); diff --git a/test_rendering/spec/ol/layer/image.test.js b/test_rendering/spec/ol/layer/image.test.js index 079c956a52..7befd59253 100644 --- a/test_rendering/spec/ol/layer/image.test.js +++ b/test_rendering/spec/ol/layer/image.test.js @@ -44,7 +44,7 @@ describe('ol.rendering.layer.Image', function() { var options = { source: source }; - ol.object.assign(options, layerOptions); + ol.obj.assign(options, layerOptions); map.addLayer(new ol.layer.Image(options)); }); } @@ -112,6 +112,6 @@ describe('ol.rendering.layer.Image', function() { goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.layer.Image'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.source.ImageStatic'); diff --git a/test_rendering/spec/ol/layer/tile.test.js b/test_rendering/spec/ol/layer/tile.test.js index 25eb53b874..7f03f2b87e 100644 --- a/test_rendering/spec/ol/layer/tile.test.js +++ b/test_rendering/spec/ol/layer/tile.test.js @@ -44,7 +44,7 @@ describe('ol.rendering.layer.Tile', function() { var options = { source: source }; - ol.object.assign(options, layerOptions[i] || layerOptions); + ol.obj.assign(options, layerOptions[i] || layerOptions); map.addLayer(new ol.layer.Tile(options)); }); } @@ -252,7 +252,7 @@ goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.geom.Point'); goog.require('ol.layer.Tile'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.proj'); goog.require('ol.source.TileImage'); goog.require('ol.source.XYZ'); diff --git a/test_rendering/spec/ol/layer/vectortile.test.js b/test_rendering/spec/ol/layer/vectortile.test.js index 86dc75e7fb..bb249babd1 100644 --- a/test_rendering/spec/ol/layer/vectortile.test.js +++ b/test_rendering/spec/ol/layer/vectortile.test.js @@ -42,7 +42,7 @@ describe('ol.rendering.layer.VectorTile', function() { var options = { source: source }; - ol.object.assign(options, layerOptions); + ol.obj.assign(options, layerOptions); map.addLayer(new ol.layer.VectorTile(options)); } @@ -78,5 +78,5 @@ goog.require('ol.Map'); goog.require('ol.View'); goog.require('ol.format.MVT'); goog.require('ol.layer.VectorTile'); -goog.require('ol.object'); +goog.require('ol.obj'); goog.require('ol.source.VectorTile'); From 12e81e5487aaa82928edd203c8374367c63ad384 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 14:28:50 -0600 Subject: [PATCH 62/68] Clean up WebGL provides --- Makefile | 4 +- .../defaultshader.glsl} | 4 +- .../render/webgl/imagereplay/defaultshader.js | 145 +++++++++++++++++ .../{imagereplay.js => imagereplay/index.js} | 13 +- .../render/webgl/webglimagedefaultshader.js | 147 ------------------ ...lmapdefault.glsl => defaultmapshader.glsl} | 4 +- src/ol/renderer/webgl/defaultmapshader.js | 121 ++++++++++++++ src/ol/renderer/webgl/layer.js | 14 +- src/ol/renderer/webgl/tilelayer.js | 16 +- ...bgltilelayer.glsl => tilelayershader.glsl} | 4 +- src/ol/renderer/webgl/tilelayershader.js | 109 +++++++++++++ .../renderer/webgl/webglmapdefaultshader.js | 123 --------------- src/ol/renderer/webgl/webgltilelayershader.js | 111 ------------- src/ol/webgl/context.js | 4 +- src/ol/webgl/fragment.js | 25 +++ src/ol/webgl/shader.js | 43 ----- src/ol/webgl/shader.mustache | 46 +++--- src/ol/webgl/vertex.js | 25 +++ 18 files changed, 474 insertions(+), 484 deletions(-) rename src/ol/render/webgl/{webglimagedefault.glsl => imagereplay/defaultshader.glsl} (89%) create mode 100644 src/ol/render/webgl/imagereplay/defaultshader.js rename src/ol/render/webgl/{imagereplay.js => imagereplay/index.js} (98%) delete mode 100644 src/ol/render/webgl/webglimagedefaultshader.js rename src/ol/renderer/webgl/{webglmapdefault.glsl => defaultmapshader.glsl} (84%) create mode 100644 src/ol/renderer/webgl/defaultmapshader.js rename src/ol/renderer/webgl/{webgltilelayer.glsl => tilelayershader.glsl} (79%) create mode 100644 src/ol/renderer/webgl/tilelayershader.js delete mode 100644 src/ol/renderer/webgl/webglmapdefaultshader.js delete mode 100644 src/ol/renderer/webgl/webgltilelayershader.js create mode 100644 src/ol/webgl/fragment.js create mode 100644 src/ol/webgl/vertex.js diff --git a/Makefile b/Makefile index 1653ae9157..a31cab75ce 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ OS := $(shell uname) BRANCH := $(shell git rev-parse --abbrev-ref HEAD) SRC_GLSL := $(shell find src -type f -name '*.glsl') -SRC_SHADER_JS := $(patsubst %.glsl,%shader.js,$(SRC_GLSL)) +SRC_SHADER_JS := $(patsubst %shader.glsl,%shader.js,$(SRC_GLSL)) SRC_JS := $(filter-out $(SRC_SHADER_JS),$(shell find src -name '*.js')) SRC_JSDOC = $(shell find src -type f -name '*.jsdoc') @@ -302,5 +302,5 @@ build/test_rendering_requires.js: $(SPEC_RENDERING_JS) @mkdir -p $(@D) @node tasks/generate-requires.js $^ > $@ -%shader.js: %.glsl src/ol/webgl/shader.mustache bin/pyglslunit.py build/timestamps/node-modules-timestamp +%shader.js: %shader.glsl src/ol/webgl/shader.mustache bin/pyglslunit.py build/timestamps/node-modules-timestamp @python bin/pyglslunit.py --input $< | ./node_modules/.bin/mustache - src/ol/webgl/shader.mustache > $@ diff --git a/src/ol/render/webgl/webglimagedefault.glsl b/src/ol/render/webgl/imagereplay/defaultshader.glsl similarity index 89% rename from src/ol/render/webgl/webglimagedefault.glsl rename to src/ol/render/webgl/imagereplay/defaultshader.glsl index 15d2bce128..7eb34517d2 100644 --- a/src/ol/render/webgl/webglimagedefault.glsl +++ b/src/ol/render/webgl/imagereplay/defaultshader.glsl @@ -1,5 +1,5 @@ -//! NAMESPACE=ol.render.webgl.imagereplay.shader.Default -//! CLASS=ol.render.webgl.imagereplay.shader.Default +//! NAMESPACE=ol.renderer.webgl.imagereplay.defaultshader +//! CLASS=ol.renderer.webgl.imagereplay.defaultshader //! COMMON diff --git a/src/ol/render/webgl/imagereplay/defaultshader.js b/src/ol/render/webgl/imagereplay/defaultshader.js new file mode 100644 index 0000000000..6fc6d2144b --- /dev/null +++ b/src/ol/render/webgl/imagereplay/defaultshader.js @@ -0,0 +1,145 @@ +// This file is automatically generated, do not edit +goog.provide('ol.renderer.webgl.imagereplay.defaultshader'); + +goog.require('ol.webgl.Fragment'); +goog.require('ol.webgl.Vertex'); + + +/** + * @constructor + * @extends {ol.webgl.Fragment} + * @struct + */ +ol.renderer.webgl.imagereplay.defaultshader.Fragment = function() { + ol.webgl.Fragment.call(this, ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE); +}; +ol.inherits(ol.renderer.webgl.imagereplay.defaultshader.Fragment, ol.webgl.Fragment); +goog.addSingletonGetter(ol.renderer.webgl.imagereplay.defaultshader.Fragment); + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\nvarying float v_opacity;\n\nuniform float u_opacity;\nuniform sampler2D u_image;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_image, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n float alpha = texColor.a * v_opacity * u_opacity;\n if (alpha == 0.0) {\n discard;\n }\n gl_FragColor.a = alpha;\n}\n'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;varying float b;uniform float k;uniform sampler2D l;void main(void){vec4 texColor=texture2D(l,a);gl_FragColor.rgb=texColor.rgb;float alpha=texColor.a*b*k;if(alpha==0.0){discard;}gl_FragColor.a=alpha;}'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE = goog.DEBUG ? + ol.renderer.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE : + ol.renderer.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE; + + +/** + * @constructor + * @extends {ol.webgl.Vertex} + * @struct + */ +ol.renderer.webgl.imagereplay.defaultshader.Vertex = function() { + ol.webgl.Vertex.call(this, ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE); +}; +ol.inherits(ol.renderer.webgl.imagereplay.defaultshader.Vertex, ol.webgl.Vertex); +goog.addSingletonGetter(ol.renderer.webgl.imagereplay.defaultshader.Vertex); + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\nvarying float v_opacity;\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec2 a_offsets;\nattribute float a_opacity;\nattribute float a_rotateWithView;\n\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_offsetScaleMatrix;\nuniform mat4 u_offsetRotateMatrix;\n\nvoid main(void) {\n mat4 offsetMatrix = u_offsetScaleMatrix;\n if (a_rotateWithView == 1.0) {\n offsetMatrix = u_offsetScaleMatrix * u_offsetRotateMatrix;\n }\n vec4 offsets = offsetMatrix * vec4(a_offsets, 0., 0.);\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.) + offsets;\n v_texCoord = a_texCoord;\n v_opacity = a_opacity;\n}\n\n\n'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;varying float b;attribute vec2 c;attribute vec2 d;attribute vec2 e;attribute float f;attribute float g;uniform mat4 h;uniform mat4 i;uniform mat4 j;void main(void){mat4 offsetMatrix=i;if(g==1.0){offsetMatrix=i*j;}vec4 offsets=offsetMatrix*vec4(e,0.,0.);gl_Position=h*vec4(c,0.,1.)+offsets;a=d;b=f;}'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE = goog.DEBUG ? + ol.renderer.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE : + ol.renderer.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE; + + +/** + * @constructor + * @param {WebGLRenderingContext} gl GL. + * @param {WebGLProgram} program Program. + * @struct + */ +ol.renderer.webgl.imagereplay.defaultshader.Locations = function(gl, program) { + + /** + * @type {WebGLUniformLocation} + */ + this.u_image = gl.getUniformLocation( + program, goog.DEBUG ? 'u_image' : 'l'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_offsetRotateMatrix = gl.getUniformLocation( + program, goog.DEBUG ? 'u_offsetRotateMatrix' : 'j'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_offsetScaleMatrix = gl.getUniformLocation( + program, goog.DEBUG ? 'u_offsetScaleMatrix' : 'i'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_opacity = gl.getUniformLocation( + program, goog.DEBUG ? 'u_opacity' : 'k'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_projectionMatrix = gl.getUniformLocation( + program, goog.DEBUG ? 'u_projectionMatrix' : 'h'); + + /** + * @type {number} + */ + this.a_offsets = gl.getAttribLocation( + program, goog.DEBUG ? 'a_offsets' : 'e'); + + /** + * @type {number} + */ + this.a_opacity = gl.getAttribLocation( + program, goog.DEBUG ? 'a_opacity' : 'f'); + + /** + * @type {number} + */ + this.a_position = gl.getAttribLocation( + program, goog.DEBUG ? 'a_position' : 'c'); + + /** + * @type {number} + */ + this.a_rotateWithView = gl.getAttribLocation( + program, goog.DEBUG ? 'a_rotateWithView' : 'g'); + + /** + * @type {number} + */ + this.a_texCoord = gl.getAttribLocation( + program, goog.DEBUG ? 'a_texCoord' : 'd'); +}; diff --git a/src/ol/render/webgl/imagereplay.js b/src/ol/render/webgl/imagereplay/index.js similarity index 98% rename from src/ol/render/webgl/imagereplay.js rename to src/ol/render/webgl/imagereplay/index.js index f662b72252..5549d88851 100644 --- a/src/ol/render/webgl/imagereplay.js +++ b/src/ol/render/webgl/imagereplay/index.js @@ -6,10 +6,7 @@ goog.require('ol.extent'); goog.require('ol.obj'); goog.require('ol.render.IReplayGroup'); goog.require('ol.render.VectorContext'); -goog.require('ol.render.webgl.imagereplay.shader.Default'); -goog.require('ol.render.webgl.imagereplay.shader.Default.Locations'); -goog.require('ol.render.webgl.imagereplay.shader.DefaultFragment'); -goog.require('ol.render.webgl.imagereplay.shader.DefaultVertex'); +goog.require('ol.renderer.webgl.imagereplay.defaultshader'); goog.require('ol.vec.Mat4'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); @@ -105,7 +102,7 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) { /** * @private - * @type {ol.render.webgl.imagereplay.shader.Default.Locations} + * @type {ol.renderer.webgl.imagereplay.defaultshader.Locations} */ this.defaultLocations_ = null; @@ -518,16 +515,16 @@ ol.render.webgl.ImageReplay.prototype.replay = function(context, // get the program var fragmentShader = - ol.render.webgl.imagereplay.shader.DefaultFragment.getInstance(); + ol.renderer.webgl.imagereplay.defaultshader.Fragment.getInstance(); var vertexShader = - ol.render.webgl.imagereplay.shader.DefaultVertex.getInstance(); + ol.renderer.webgl.imagereplay.defaultshader.Vertex.getInstance(); var program = context.getProgram(fragmentShader, vertexShader); // get the locations var locations; if (!this.defaultLocations_) { locations = - new ol.render.webgl.imagereplay.shader.Default.Locations(gl, program); + new ol.renderer.webgl.imagereplay.defaultshader.Locations(gl, program); this.defaultLocations_ = locations; } else { locations = this.defaultLocations_; diff --git a/src/ol/render/webgl/webglimagedefaultshader.js b/src/ol/render/webgl/webglimagedefaultshader.js deleted file mode 100644 index 95069eb2d6..0000000000 --- a/src/ol/render/webgl/webglimagedefaultshader.js +++ /dev/null @@ -1,147 +0,0 @@ -// This file is automatically generated, do not edit -goog.provide('ol.render.webgl.imagereplay.shader.Default'); -goog.provide('ol.render.webgl.imagereplay.shader.Default.Locations'); -goog.provide('ol.render.webgl.imagereplay.shader.DefaultFragment'); -goog.provide('ol.render.webgl.imagereplay.shader.DefaultVertex'); - -goog.require('ol.webgl.shader'); - - -/** - * @constructor - * @extends {ol.webgl.shader.Fragment} - * @struct - */ -ol.render.webgl.imagereplay.shader.DefaultFragment = function() { - ol.webgl.shader.Fragment.call(this, ol.render.webgl.imagereplay.shader.DefaultFragment.SOURCE); -}; -ol.inherits(ol.render.webgl.imagereplay.shader.DefaultFragment, ol.webgl.shader.Fragment); -goog.addSingletonGetter(ol.render.webgl.imagereplay.shader.DefaultFragment); - - -/** - * @const - * @type {string} - */ -ol.render.webgl.imagereplay.shader.DefaultFragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\nvarying float v_opacity;\n\nuniform float u_opacity;\nuniform sampler2D u_image;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_image, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n float alpha = texColor.a * v_opacity * u_opacity;\n if (alpha == 0.0) {\n discard;\n }\n gl_FragColor.a = alpha;\n}\n'; - - -/** - * @const - * @type {string} - */ -ol.render.webgl.imagereplay.shader.DefaultFragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;varying float b;uniform float k;uniform sampler2D l;void main(void){vec4 texColor=texture2D(l,a);gl_FragColor.rgb=texColor.rgb;float alpha=texColor.a*b*k;if(alpha==0.0){discard;}gl_FragColor.a=alpha;}'; - - -/** - * @const - * @type {string} - */ -ol.render.webgl.imagereplay.shader.DefaultFragment.SOURCE = goog.DEBUG ? - ol.render.webgl.imagereplay.shader.DefaultFragment.DEBUG_SOURCE : - ol.render.webgl.imagereplay.shader.DefaultFragment.OPTIMIZED_SOURCE; - - -/** - * @constructor - * @extends {ol.webgl.shader.Vertex} - * @struct - */ -ol.render.webgl.imagereplay.shader.DefaultVertex = function() { - ol.webgl.shader.Vertex.call(this, ol.render.webgl.imagereplay.shader.DefaultVertex.SOURCE); -}; -ol.inherits(ol.render.webgl.imagereplay.shader.DefaultVertex, ol.webgl.shader.Vertex); -goog.addSingletonGetter(ol.render.webgl.imagereplay.shader.DefaultVertex); - - -/** - * @const - * @type {string} - */ -ol.render.webgl.imagereplay.shader.DefaultVertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\nvarying float v_opacity;\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec2 a_offsets;\nattribute float a_opacity;\nattribute float a_rotateWithView;\n\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_offsetScaleMatrix;\nuniform mat4 u_offsetRotateMatrix;\n\nvoid main(void) {\n mat4 offsetMatrix = u_offsetScaleMatrix;\n if (a_rotateWithView == 1.0) {\n offsetMatrix = u_offsetScaleMatrix * u_offsetRotateMatrix;\n }\n vec4 offsets = offsetMatrix * vec4(a_offsets, 0., 0.);\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.) + offsets;\n v_texCoord = a_texCoord;\n v_opacity = a_opacity;\n}\n\n\n'; - - -/** - * @const - * @type {string} - */ -ol.render.webgl.imagereplay.shader.DefaultVertex.OPTIMIZED_SOURCE = 'varying vec2 a;varying float b;attribute vec2 c;attribute vec2 d;attribute vec2 e;attribute float f;attribute float g;uniform mat4 h;uniform mat4 i;uniform mat4 j;void main(void){mat4 offsetMatrix=i;if(g==1.0){offsetMatrix=i*j;}vec4 offsets=offsetMatrix*vec4(e,0.,0.);gl_Position=h*vec4(c,0.,1.)+offsets;a=d;b=f;}'; - - -/** - * @const - * @type {string} - */ -ol.render.webgl.imagereplay.shader.DefaultVertex.SOURCE = goog.DEBUG ? - ol.render.webgl.imagereplay.shader.DefaultVertex.DEBUG_SOURCE : - ol.render.webgl.imagereplay.shader.DefaultVertex.OPTIMIZED_SOURCE; - - -/** - * @constructor - * @param {WebGLRenderingContext} gl GL. - * @param {WebGLProgram} program Program. - * @struct - */ -ol.render.webgl.imagereplay.shader.Default.Locations = function(gl, program) { - - /** - * @type {WebGLUniformLocation} - */ - this.u_image = gl.getUniformLocation( - program, goog.DEBUG ? 'u_image' : 'l'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_offsetRotateMatrix = gl.getUniformLocation( - program, goog.DEBUG ? 'u_offsetRotateMatrix' : 'j'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_offsetScaleMatrix = gl.getUniformLocation( - program, goog.DEBUG ? 'u_offsetScaleMatrix' : 'i'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_opacity = gl.getUniformLocation( - program, goog.DEBUG ? 'u_opacity' : 'k'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_projectionMatrix = gl.getUniformLocation( - program, goog.DEBUG ? 'u_projectionMatrix' : 'h'); - - /** - * @type {number} - */ - this.a_offsets = gl.getAttribLocation( - program, goog.DEBUG ? 'a_offsets' : 'e'); - - /** - * @type {number} - */ - this.a_opacity = gl.getAttribLocation( - program, goog.DEBUG ? 'a_opacity' : 'f'); - - /** - * @type {number} - */ - this.a_position = gl.getAttribLocation( - program, goog.DEBUG ? 'a_position' : 'c'); - - /** - * @type {number} - */ - this.a_rotateWithView = gl.getAttribLocation( - program, goog.DEBUG ? 'a_rotateWithView' : 'g'); - - /** - * @type {number} - */ - this.a_texCoord = gl.getAttribLocation( - program, goog.DEBUG ? 'a_texCoord' : 'd'); -}; diff --git a/src/ol/renderer/webgl/webglmapdefault.glsl b/src/ol/renderer/webgl/defaultmapshader.glsl similarity index 84% rename from src/ol/renderer/webgl/webglmapdefault.glsl rename to src/ol/renderer/webgl/defaultmapshader.glsl index b07838dc3b..4ac4d9d2fd 100644 --- a/src/ol/renderer/webgl/webglmapdefault.glsl +++ b/src/ol/renderer/webgl/defaultmapshader.glsl @@ -1,5 +1,5 @@ -//! NAMESPACE=ol.renderer.webgl.map.shader.Default -//! CLASS=ol.renderer.webgl.map.shader.Default +//! NAMESPACE=ol.renderer.webgl.defaultmapshader +//! CLASS=ol.renderer.webgl.defaultmapshader //! COMMON diff --git a/src/ol/renderer/webgl/defaultmapshader.js b/src/ol/renderer/webgl/defaultmapshader.js new file mode 100644 index 0000000000..35d01d4003 --- /dev/null +++ b/src/ol/renderer/webgl/defaultmapshader.js @@ -0,0 +1,121 @@ +// This file is automatically generated, do not edit +goog.provide('ol.renderer.webgl.defaultmapshader'); + +goog.require('ol.webgl.Fragment'); +goog.require('ol.webgl.Vertex'); + + +/** + * @constructor + * @extends {ol.webgl.Fragment} + * @struct + */ +ol.renderer.webgl.defaultmapshader.Fragment = function() { + ol.webgl.Fragment.call(this, ol.renderer.webgl.defaultmapshader.Fragment.SOURCE); +}; +ol.inherits(ol.renderer.webgl.defaultmapshader.Fragment, ol.webgl.Fragment); +goog.addSingletonGetter(ol.renderer.webgl.defaultmapshader.Fragment); + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.defaultmapshader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform float u_opacity;\nuniform sampler2D u_texture;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_texture, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n gl_FragColor.a = texColor.a * u_opacity;\n}\n'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;uniform float f;uniform sampler2D g;void main(void){vec4 texColor=texture2D(g,a);gl_FragColor.rgb=texColor.rgb;gl_FragColor.a=texColor.a*f;}'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.defaultmapshader.Fragment.SOURCE = goog.DEBUG ? + ol.renderer.webgl.defaultmapshader.Fragment.DEBUG_SOURCE : + ol.renderer.webgl.defaultmapshader.Fragment.OPTIMIZED_SOURCE; + + +/** + * @constructor + * @extends {ol.webgl.Vertex} + * @struct + */ +ol.renderer.webgl.defaultmapshader.Vertex = function() { + ol.webgl.Vertex.call(this, ol.renderer.webgl.defaultmapshader.Vertex.SOURCE); +}; +ol.inherits(ol.renderer.webgl.defaultmapshader.Vertex, ol.webgl.Vertex); +goog.addSingletonGetter(ol.renderer.webgl.defaultmapshader.Vertex); + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.defaultmapshader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\n\nuniform mat4 u_texCoordMatrix;\nuniform mat4 u_projectionMatrix;\n\nvoid main(void) {\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.);\n v_texCoord = (u_texCoordMatrix * vec4(a_texCoord, 0., 1.)).st;\n}\n\n\n'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform mat4 d;uniform mat4 e;void main(void){gl_Position=e*vec4(b,0.,1.);a=(d*vec4(c,0.,1.)).st;}'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.defaultmapshader.Vertex.SOURCE = goog.DEBUG ? + ol.renderer.webgl.defaultmapshader.Vertex.DEBUG_SOURCE : + ol.renderer.webgl.defaultmapshader.Vertex.OPTIMIZED_SOURCE; + + +/** + * @constructor + * @param {WebGLRenderingContext} gl GL. + * @param {WebGLProgram} program Program. + * @struct + */ +ol.renderer.webgl.defaultmapshader.Locations = function(gl, program) { + + /** + * @type {WebGLUniformLocation} + */ + this.u_opacity = gl.getUniformLocation( + program, goog.DEBUG ? 'u_opacity' : 'f'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_projectionMatrix = gl.getUniformLocation( + program, goog.DEBUG ? 'u_projectionMatrix' : 'e'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_texCoordMatrix = gl.getUniformLocation( + program, goog.DEBUG ? 'u_texCoordMatrix' : 'd'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_texture = gl.getUniformLocation( + program, goog.DEBUG ? 'u_texture' : 'g'); + + /** + * @type {number} + */ + this.a_position = gl.getAttribLocation( + program, goog.DEBUG ? 'a_position' : 'b'); + + /** + * @type {number} + */ + this.a_texCoord = gl.getAttribLocation( + program, goog.DEBUG ? 'a_texCoord' : 'c'); +}; diff --git a/src/ol/renderer/webgl/layer.js b/src/ol/renderer/webgl/layer.js index c38cfef778..536289deb3 100644 --- a/src/ol/renderer/webgl/layer.js +++ b/src/ol/renderer/webgl/layer.js @@ -5,10 +5,7 @@ goog.require('ol.render.Event'); goog.require('ol.render.EventType'); goog.require('ol.render.webgl.Immediate'); goog.require('ol.renderer.Layer'); -goog.require('ol.renderer.webgl.map.shader.Default'); -goog.require('ol.renderer.webgl.map.shader.Default.Locations'); -goog.require('ol.renderer.webgl.map.shader.DefaultFragment'); -goog.require('ol.renderer.webgl.map.shader.DefaultVertex'); +goog.require('ol.renderer.webgl.defaultmapshader'); goog.require('ol.vec.Mat4'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); @@ -80,7 +77,7 @@ ol.renderer.webgl.Layer = function(mapRenderer, layer) { /** * @private - * @type {ol.renderer.webgl.map.shader.Default.Locations} + * @type {ol.renderer.webgl.defaultmapshader.Locations} */ this.defaultLocations_ = null; @@ -148,16 +145,15 @@ ol.renderer.webgl.Layer.prototype.composeFrame = function(frameState, layerState var gl = context.getGL(); - var fragmentShader = - ol.renderer.webgl.map.shader.DefaultFragment.getInstance(); - var vertexShader = ol.renderer.webgl.map.shader.DefaultVertex.getInstance(); + var fragmentShader = ol.renderer.webgl.defaultmapshader.Fragment.getInstance(); + var vertexShader = ol.renderer.webgl.defaultmapshader.Vertex.getInstance(); var program = context.getProgram(fragmentShader, vertexShader); var locations; if (!this.defaultLocations_) { locations = - new ol.renderer.webgl.map.shader.Default.Locations(gl, program); + new ol.renderer.webgl.defaultmapshader.Locations(gl, program); this.defaultLocations_ = locations; } else { locations = this.defaultLocations_; diff --git a/src/ol/renderer/webgl/tilelayer.js b/src/ol/renderer/webgl/tilelayer.js index 5674335a78..564d1fdf2d 100644 --- a/src/ol/renderer/webgl/tilelayer.js +++ b/src/ol/renderer/webgl/tilelayer.js @@ -11,9 +11,7 @@ goog.require('ol.extent'); goog.require('ol.layer.Tile'); goog.require('ol.math'); goog.require('ol.renderer.webgl.Layer'); -goog.require('ol.renderer.webgl.tilelayer.shader.Fragment'); -goog.require('ol.renderer.webgl.tilelayer.shader.Locations'); -goog.require('ol.renderer.webgl.tilelayer.shader.Vertex'); +goog.require('ol.renderer.webgl.tilelayershader'); goog.require('ol.size'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); @@ -31,20 +29,20 @@ ol.renderer.webgl.TileLayer = function(mapRenderer, tileLayer) { /** * @private - * @type {ol.webgl.shader.Fragment} + * @type {ol.webgl.Fragment} */ this.fragmentShader_ = - ol.renderer.webgl.tilelayer.shader.Fragment.getInstance(); + ol.renderer.webgl.tilelayershader.Fragment.getInstance(); /** * @private - * @type {ol.webgl.shader.Vertex} + * @type {ol.webgl.Vertex} */ - this.vertexShader_ = ol.renderer.webgl.tilelayer.shader.Vertex.getInstance(); + this.vertexShader_ = ol.renderer.webgl.tilelayershader.Vertex.getInstance(); /** * @private - * @type {ol.renderer.webgl.tilelayer.shader.Locations} + * @type {ol.renderer.webgl.tilelayershader.Locations} */ this.locations_ = null; @@ -213,7 +211,7 @@ ol.renderer.webgl.TileLayer.prototype.prepareFrame = function(frameState, layerS context.useProgram(program); if (!this.locations_) { this.locations_ = - new ol.renderer.webgl.tilelayer.shader.Locations(gl, program); + new ol.renderer.webgl.tilelayershader.Locations(gl, program); } context.bindBuffer(ol.webgl.ARRAY_BUFFER, this.renderArrayBuffer_); diff --git a/src/ol/renderer/webgl/webgltilelayer.glsl b/src/ol/renderer/webgl/tilelayershader.glsl similarity index 79% rename from src/ol/renderer/webgl/webgltilelayer.glsl rename to src/ol/renderer/webgl/tilelayershader.glsl index 5262f97c26..28ba7f6524 100644 --- a/src/ol/renderer/webgl/webgltilelayer.glsl +++ b/src/ol/renderer/webgl/tilelayershader.glsl @@ -1,5 +1,5 @@ -//! NAMESPACE=ol.renderer.webgl.tilelayer.shader -//! CLASS=ol.renderer.webgl.tilelayer.shader. +//! NAMESPACE=ol.renderer.webgl.tilelayershader +//! CLASS=ol.renderer.webgl.tilelayershader //! COMMON diff --git a/src/ol/renderer/webgl/tilelayershader.js b/src/ol/renderer/webgl/tilelayershader.js new file mode 100644 index 0000000000..11db8e3b39 --- /dev/null +++ b/src/ol/renderer/webgl/tilelayershader.js @@ -0,0 +1,109 @@ +// This file is automatically generated, do not edit +goog.provide('ol.renderer.webgl.tilelayershader'); + +goog.require('ol.webgl.Fragment'); +goog.require('ol.webgl.Vertex'); + + +/** + * @constructor + * @extends {ol.webgl.Fragment} + * @struct + */ +ol.renderer.webgl.tilelayershader.Fragment = function() { + ol.webgl.Fragment.call(this, ol.renderer.webgl.tilelayershader.Fragment.SOURCE); +}; +ol.inherits(ol.renderer.webgl.tilelayershader.Fragment, ol.webgl.Fragment); +goog.addSingletonGetter(ol.renderer.webgl.tilelayershader.Fragment); + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.tilelayershader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform sampler2D u_texture;\n\nvoid main(void) {\n gl_FragColor = texture2D(u_texture, v_texCoord);\n}\n'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;uniform sampler2D e;void main(void){gl_FragColor=texture2D(e,a);}'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.tilelayershader.Fragment.SOURCE = goog.DEBUG ? + ol.renderer.webgl.tilelayershader.Fragment.DEBUG_SOURCE : + ol.renderer.webgl.tilelayershader.Fragment.OPTIMIZED_SOURCE; + + +/** + * @constructor + * @extends {ol.webgl.Vertex} + * @struct + */ +ol.renderer.webgl.tilelayershader.Vertex = function() { + ol.webgl.Vertex.call(this, ol.renderer.webgl.tilelayershader.Vertex.SOURCE); +}; +ol.inherits(ol.renderer.webgl.tilelayershader.Vertex, ol.webgl.Vertex); +goog.addSingletonGetter(ol.renderer.webgl.tilelayershader.Vertex); + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.tilelayershader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nuniform vec4 u_tileOffset;\n\nvoid main(void) {\n gl_Position = vec4(a_position * u_tileOffset.xy + u_tileOffset.zw, 0., 1.);\n v_texCoord = a_texCoord;\n}\n\n\n'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform vec4 d;void main(void){gl_Position=vec4(b*d.xy+d.zw,0.,1.);a=c;}'; + + +/** + * @const + * @type {string} + */ +ol.renderer.webgl.tilelayershader.Vertex.SOURCE = goog.DEBUG ? + ol.renderer.webgl.tilelayershader.Vertex.DEBUG_SOURCE : + ol.renderer.webgl.tilelayershader.Vertex.OPTIMIZED_SOURCE; + + +/** + * @constructor + * @param {WebGLRenderingContext} gl GL. + * @param {WebGLProgram} program Program. + * @struct + */ +ol.renderer.webgl.tilelayershader.Locations = function(gl, program) { + + /** + * @type {WebGLUniformLocation} + */ + this.u_texture = gl.getUniformLocation( + program, goog.DEBUG ? 'u_texture' : 'e'); + + /** + * @type {WebGLUniformLocation} + */ + this.u_tileOffset = gl.getUniformLocation( + program, goog.DEBUG ? 'u_tileOffset' : 'd'); + + /** + * @type {number} + */ + this.a_position = gl.getAttribLocation( + program, goog.DEBUG ? 'a_position' : 'b'); + + /** + * @type {number} + */ + this.a_texCoord = gl.getAttribLocation( + program, goog.DEBUG ? 'a_texCoord' : 'c'); +}; diff --git a/src/ol/renderer/webgl/webglmapdefaultshader.js b/src/ol/renderer/webgl/webglmapdefaultshader.js deleted file mode 100644 index b9b963fe3b..0000000000 --- a/src/ol/renderer/webgl/webglmapdefaultshader.js +++ /dev/null @@ -1,123 +0,0 @@ -// This file is automatically generated, do not edit -goog.provide('ol.renderer.webgl.map.shader.Default'); -goog.provide('ol.renderer.webgl.map.shader.Default.Locations'); -goog.provide('ol.renderer.webgl.map.shader.DefaultFragment'); -goog.provide('ol.renderer.webgl.map.shader.DefaultVertex'); - -goog.require('ol.webgl.shader'); - - -/** - * @constructor - * @extends {ol.webgl.shader.Fragment} - * @struct - */ -ol.renderer.webgl.map.shader.DefaultFragment = function() { - ol.webgl.shader.Fragment.call(this, ol.renderer.webgl.map.shader.DefaultFragment.SOURCE); -}; -ol.inherits(ol.renderer.webgl.map.shader.DefaultFragment, ol.webgl.shader.Fragment); -goog.addSingletonGetter(ol.renderer.webgl.map.shader.DefaultFragment); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.map.shader.DefaultFragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform float u_opacity;\nuniform sampler2D u_texture;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_texture, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n gl_FragColor.a = texColor.a * u_opacity;\n}\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.map.shader.DefaultFragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;uniform float f;uniform sampler2D g;void main(void){vec4 texColor=texture2D(g,a);gl_FragColor.rgb=texColor.rgb;gl_FragColor.a=texColor.a*f;}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.map.shader.DefaultFragment.SOURCE = goog.DEBUG ? - ol.renderer.webgl.map.shader.DefaultFragment.DEBUG_SOURCE : - ol.renderer.webgl.map.shader.DefaultFragment.OPTIMIZED_SOURCE; - - -/** - * @constructor - * @extends {ol.webgl.shader.Vertex} - * @struct - */ -ol.renderer.webgl.map.shader.DefaultVertex = function() { - ol.webgl.shader.Vertex.call(this, ol.renderer.webgl.map.shader.DefaultVertex.SOURCE); -}; -ol.inherits(ol.renderer.webgl.map.shader.DefaultVertex, ol.webgl.shader.Vertex); -goog.addSingletonGetter(ol.renderer.webgl.map.shader.DefaultVertex); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.map.shader.DefaultVertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\n\nuniform mat4 u_texCoordMatrix;\nuniform mat4 u_projectionMatrix;\n\nvoid main(void) {\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.);\n v_texCoord = (u_texCoordMatrix * vec4(a_texCoord, 0., 1.)).st;\n}\n\n\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.map.shader.DefaultVertex.OPTIMIZED_SOURCE = 'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform mat4 d;uniform mat4 e;void main(void){gl_Position=e*vec4(b,0.,1.);a=(d*vec4(c,0.,1.)).st;}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.map.shader.DefaultVertex.SOURCE = goog.DEBUG ? - ol.renderer.webgl.map.shader.DefaultVertex.DEBUG_SOURCE : - ol.renderer.webgl.map.shader.DefaultVertex.OPTIMIZED_SOURCE; - - -/** - * @constructor - * @param {WebGLRenderingContext} gl GL. - * @param {WebGLProgram} program Program. - * @struct - */ -ol.renderer.webgl.map.shader.Default.Locations = function(gl, program) { - - /** - * @type {WebGLUniformLocation} - */ - this.u_opacity = gl.getUniformLocation( - program, goog.DEBUG ? 'u_opacity' : 'f'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_projectionMatrix = gl.getUniformLocation( - program, goog.DEBUG ? 'u_projectionMatrix' : 'e'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_texCoordMatrix = gl.getUniformLocation( - program, goog.DEBUG ? 'u_texCoordMatrix' : 'd'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_texture = gl.getUniformLocation( - program, goog.DEBUG ? 'u_texture' : 'g'); - - /** - * @type {number} - */ - this.a_position = gl.getAttribLocation( - program, goog.DEBUG ? 'a_position' : 'b'); - - /** - * @type {number} - */ - this.a_texCoord = gl.getAttribLocation( - program, goog.DEBUG ? 'a_texCoord' : 'c'); -}; diff --git a/src/ol/renderer/webgl/webgltilelayershader.js b/src/ol/renderer/webgl/webgltilelayershader.js deleted file mode 100644 index db10984478..0000000000 --- a/src/ol/renderer/webgl/webgltilelayershader.js +++ /dev/null @@ -1,111 +0,0 @@ -// This file is automatically generated, do not edit -goog.provide('ol.renderer.webgl.tilelayer.shader'); -goog.provide('ol.renderer.webgl.tilelayer.shader.Locations'); -goog.provide('ol.renderer.webgl.tilelayer.shader.Fragment'); -goog.provide('ol.renderer.webgl.tilelayer.shader.Vertex'); - -goog.require('ol.webgl.shader'); - - -/** - * @constructor - * @extends {ol.webgl.shader.Fragment} - * @struct - */ -ol.renderer.webgl.tilelayer.shader.Fragment = function() { - ol.webgl.shader.Fragment.call(this, ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE); -}; -ol.inherits(ol.renderer.webgl.tilelayer.shader.Fragment, ol.webgl.shader.Fragment); -goog.addSingletonGetter(ol.renderer.webgl.tilelayer.shader.Fragment); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.tilelayer.shader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\n\n\nuniform sampler2D u_texture;\n\nvoid main(void) {\n gl_FragColor = texture2D(u_texture, v_texCoord);\n}\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.tilelayer.shader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;uniform sampler2D e;void main(void){gl_FragColor=texture2D(e,a);}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.tilelayer.shader.Fragment.SOURCE = goog.DEBUG ? - ol.renderer.webgl.tilelayer.shader.Fragment.DEBUG_SOURCE : - ol.renderer.webgl.tilelayer.shader.Fragment.OPTIMIZED_SOURCE; - - -/** - * @constructor - * @extends {ol.webgl.shader.Vertex} - * @struct - */ -ol.renderer.webgl.tilelayer.shader.Vertex = function() { - ol.webgl.shader.Vertex.call(this, ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE); -}; -ol.inherits(ol.renderer.webgl.tilelayer.shader.Vertex, ol.webgl.shader.Vertex); -goog.addSingletonGetter(ol.renderer.webgl.tilelayer.shader.Vertex); - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.tilelayer.shader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\n\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nuniform vec4 u_tileOffset;\n\nvoid main(void) {\n gl_Position = vec4(a_position * u_tileOffset.xy + u_tileOffset.zw, 0., 1.);\n v_texCoord = a_texCoord;\n}\n\n\n'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.tilelayer.shader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;attribute vec2 b;attribute vec2 c;uniform vec4 d;void main(void){gl_Position=vec4(b*d.xy+d.zw,0.,1.);a=c;}'; - - -/** - * @const - * @type {string} - */ -ol.renderer.webgl.tilelayer.shader.Vertex.SOURCE = goog.DEBUG ? - ol.renderer.webgl.tilelayer.shader.Vertex.DEBUG_SOURCE : - ol.renderer.webgl.tilelayer.shader.Vertex.OPTIMIZED_SOURCE; - - -/** - * @constructor - * @param {WebGLRenderingContext} gl GL. - * @param {WebGLProgram} program Program. - * @struct - */ -ol.renderer.webgl.tilelayer.shader.Locations = function(gl, program) { - - /** - * @type {WebGLUniformLocation} - */ - this.u_texture = gl.getUniformLocation( - program, goog.DEBUG ? 'u_texture' : 'e'); - - /** - * @type {WebGLUniformLocation} - */ - this.u_tileOffset = gl.getUniformLocation( - program, goog.DEBUG ? 'u_tileOffset' : 'd'); - - /** - * @type {number} - */ - this.a_position = gl.getAttribLocation( - program, goog.DEBUG ? 'a_position' : 'b'); - - /** - * @type {number} - */ - this.a_texCoord = gl.getAttribLocation( - program, goog.DEBUG ? 'a_texCoord' : 'c'); -}; diff --git a/src/ol/webgl/context.js b/src/ol/webgl/context.js index e2cfa0b213..1a5f084e2d 100644 --- a/src/ol/webgl/context.js +++ b/src/ol/webgl/context.js @@ -233,8 +233,8 @@ ol.webgl.Context.prototype.getShader = function(shaderObject) { * Get the program from the cache if it's in the cache. Otherwise create * the WebGL program, attach the shaders to it, and add an entry to the * cache. - * @param {ol.webgl.shader.Fragment} fragmentShaderObject Fragment shader. - * @param {ol.webgl.shader.Vertex} vertexShaderObject Vertex shader. + * @param {ol.webgl.Fragment} fragmentShaderObject Fragment shader. + * @param {ol.webgl.Vertex} vertexShaderObject Vertex shader. * @return {WebGLProgram} Program. */ ol.webgl.Context.prototype.getProgram = function( diff --git a/src/ol/webgl/fragment.js b/src/ol/webgl/fragment.js new file mode 100644 index 0000000000..49bb0f0445 --- /dev/null +++ b/src/ol/webgl/fragment.js @@ -0,0 +1,25 @@ +goog.provide('ol.webgl.Fragment'); + +goog.require('ol'); +goog.require('ol.webgl'); +goog.require('ol.webgl.Shader'); + + +/** + * @constructor + * @extends {ol.webgl.Shader} + * @param {string} source Source. + * @struct + */ +ol.webgl.Fragment = function(source) { + ol.webgl.Shader.call(this, source); +}; +ol.inherits(ol.webgl.Fragment, ol.webgl.Shader); + + +/** + * @inheritDoc + */ +ol.webgl.Fragment.prototype.getType = function() { + return ol.webgl.FRAGMENT_SHADER; +}; diff --git a/src/ol/webgl/shader.js b/src/ol/webgl/shader.js index 6c5de0d5ea..1a26cccf1c 100644 --- a/src/ol/webgl/shader.js +++ b/src/ol/webgl/shader.js @@ -1,7 +1,4 @@ -goog.provide('ol.webgl.Fragment'); goog.provide('ol.webgl.Shader'); -goog.provide('ol.webgl.Vertex'); -goog.provide('ol.webgl.shader'); goog.require('ol.functions'); goog.require('ol.webgl'); @@ -42,43 +39,3 @@ ol.webgl.Shader.prototype.getSource = function() { * @return {boolean} Is animated? */ ol.webgl.Shader.prototype.isAnimated = ol.functions.FALSE; - - -/** - * @constructor - * @extends {ol.webgl.Shader} - * @param {string} source Source. - * @struct - */ -ol.webgl.shader.Fragment = function(source) { - ol.webgl.Shader.call(this, source); -}; -ol.inherits(ol.webgl.shader.Fragment, ol.webgl.Shader); - - -/** - * @inheritDoc - */ -ol.webgl.shader.Fragment.prototype.getType = function() { - return ol.webgl.FRAGMENT_SHADER; -}; - - -/** - * @constructor - * @extends {ol.webgl.Shader} - * @param {string} source Source. - * @struct - */ -ol.webgl.shader.Vertex = function(source) { - ol.webgl.Shader.call(this, source); -}; -ol.inherits(ol.webgl.shader.Vertex, ol.webgl.Shader); - - -/** - * @inheritDoc - */ -ol.webgl.shader.Vertex.prototype.getType = function() { - return ol.webgl.VERTEX_SHADER; -}; diff --git a/src/ol/webgl/shader.mustache b/src/ol/webgl/shader.mustache index 401fffbfd6..f50b0ac4ba 100644 --- a/src/ol/webgl/shader.mustache +++ b/src/ol/webgl/shader.mustache @@ -1,80 +1,78 @@ // This file is automatically generated, do not edit goog.provide('{{namespace}}'); -goog.provide('{{namespace}}.Locations'); -goog.provide('{{className}}Fragment'); -goog.provide('{{className}}Vertex'); -goog.require('ol.webgl.shader'); +goog.require('ol.webgl.Fragment'); +goog.require('ol.webgl.Vertex'); /** * @constructor - * @extends {ol.webgl.shader.Fragment} + * @extends {ol.webgl.Fragment} * @struct */ -{{className}}Fragment = function() { - ol.webgl.shader.Fragment.call(this, {{className}}Fragment.SOURCE); +{{className}}.Fragment = function() { + ol.webgl.Fragment.call(this, {{className}}.Fragment.SOURCE); }; -ol.inherits({{className}}Fragment, ol.webgl.shader.Fragment); -goog.addSingletonGetter({{className}}Fragment); +ol.inherits({{className}}.Fragment, ol.webgl.Fragment); +goog.addSingletonGetter({{className}}.Fragment); /** * @const * @type {string} */ -{{className}}Fragment.DEBUG_SOURCE = 'precision mediump float;\n{{{getOriginalFragmentSource}}}'; +{{className}}.Fragment.DEBUG_SOURCE = 'precision mediump float;\n{{{getOriginalFragmentSource}}}'; /** * @const * @type {string} */ -{{className}}Fragment.OPTIMIZED_SOURCE = 'precision mediump float;{{{getFragmentSource}}}'; +{{className}}.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;{{{getFragmentSource}}}'; /** * @const * @type {string} */ -{{className}}Fragment.SOURCE = goog.DEBUG ? - {{className}}Fragment.DEBUG_SOURCE : - {{className}}Fragment.OPTIMIZED_SOURCE; +{{className}}.Fragment.SOURCE = goog.DEBUG ? + {{className}}.Fragment.DEBUG_SOURCE : + {{className}}.Fragment.OPTIMIZED_SOURCE; /** * @constructor - * @extends {ol.webgl.shader.Vertex} + * @extends {ol.webgl.Vertex} * @struct */ -{{className}}Vertex = function() { - ol.webgl.shader.Vertex.call(this, {{className}}Vertex.SOURCE); +{{className}}.Vertex = function() { + ol.webgl.Vertex.call(this, {{className}}.Vertex.SOURCE); }; -ol.inherits({{className}}Vertex, ol.webgl.shader.Vertex); -goog.addSingletonGetter({{className}}Vertex); +ol.inherits({{className}}.Vertex, ol.webgl.Vertex); +goog.addSingletonGetter({{className}}.Vertex); /** * @const * @type {string} */ -{{className}}Vertex.DEBUG_SOURCE = '{{{getOriginalVertexSource}}}'; +{{className}}.Vertex.DEBUG_SOURCE = '{{{getOriginalVertexSource}}}'; /** * @const * @type {string} */ -{{className}}Vertex.OPTIMIZED_SOURCE = '{{{getVertexSource}}}'; +{{className}}.Vertex.OPTIMIZED_SOURCE = '{{{getVertexSource}}}'; /** * @const * @type {string} */ -{{className}}Vertex.SOURCE = goog.DEBUG ? - {{className}}Vertex.DEBUG_SOURCE : - {{className}}Vertex.OPTIMIZED_SOURCE; +{{className}}.Vertex.SOURCE = goog.DEBUG ? + {{className}}.Vertex.DEBUG_SOURCE : + {{className}}.Vertex.OPTIMIZED_SOURCE; /** diff --git a/src/ol/webgl/vertex.js b/src/ol/webgl/vertex.js new file mode 100644 index 0000000000..024c7dc012 --- /dev/null +++ b/src/ol/webgl/vertex.js @@ -0,0 +1,25 @@ +goog.provide('ol.webgl.Vertex'); + +goog.require('ol'); +goog.require('ol.webgl'); +goog.require('ol.webgl.Shader'); + + +/** + * @constructor + * @extends {ol.webgl.Shader} + * @param {string} source Source. + * @struct + */ +ol.webgl.Vertex = function(source) { + ol.webgl.Shader.call(this, source); +}; +ol.inherits(ol.webgl.Vertex, ol.webgl.Shader); + + +/** + * @inheritDoc + */ +ol.webgl.Vertex.prototype.getType = function() { + return ol.webgl.VERTEX_SHADER; +}; From 295abebcecf89d50e440e77cd395380eebf811f3 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 14:39:53 -0600 Subject: [PATCH 63/68] Additional upgrade notes --- changelog/upgrade-notes.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index e386e0399c..7b266677a3 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -16,8 +16,20 @@ The URL constructor is supported by all modern browsers, but not by older ones, A number of internal types have been renamed. This will not affect those who use the API provided by the library, but if you are compiling your application together with OpenLayers and using type names, you'll need to do the following: - * rename `ol.CollectionEvent` to `ol.Collection.Event` * rename `ol.CollectionEventType` to `ol.Collection.EventType` + * rename `ol.CollectionEvent` to `ol.Collection.Event` + * rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.renderer.webgl.imagereplay.defaultshader.Locations` + * rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.renderer.webgl.imagereplay.defaultshader.Fragment` + * rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.renderer.webgl.imagereplay.defaultshader.Vertex` + * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations` + * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations` + * rename `ol.renderer.webgl.map.shader.DefaultFragment` to `ol.renderer.webgl.defaultmapshader.Fragment` + * rename `ol.renderer.webgl.map.shader.DefaultVertex` to `ol.renderer.webgl.defaultmapshader.Vertex` + * rename `ol.renderer.webgl.tilelayer.shader.Fragment` to `ol.renderer.webgl.tilelayershader.Fragment` + * rename `ol.renderer.webgl.tilelayer.shader.Locations` to `ol.renderer.webgl.tilelayershader.Locations` + * rename `ol.renderer.webgl.tilelayer.shader.Vertex` to `ol.renderer.webgl.tilelayershader.Vertex` + * rename `ol.webgl.shader.Fragment` to `ol.webgl.Fragment` + * rename `ol.webgl.shader.Vertex` to `ol.webgl.Vertex` ### v3.17.0 From f5cbfdff047a98336ccc518fc066a81d425a3a6f Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 14:47:42 -0600 Subject: [PATCH 64/68] Move ol/ol.js to ol/index.js --- src/ol/{ol.js => index.js} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/ol/{ol.js => index.js} (100%) diff --git a/src/ol/ol.js b/src/ol/index.js similarity index 100% rename from src/ol/ol.js rename to src/ol/index.js From b47dc998a3003063083503c1c6bdc62205f5848a Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 14:51:57 -0600 Subject: [PATCH 65/68] More WebGL name corrections --- changelog/upgrade-notes.md | 6 +-- src/ol/render/canvas/replay.js | 2 +- .../webgl/imagereplay/defaultshader.glsl | 4 +- .../render/webgl/imagereplay/defaultshader.js | 40 +++++++++---------- src/ol/render/webgl/imagereplay/index.js | 10 ++--- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/changelog/upgrade-notes.md b/changelog/upgrade-notes.md index 7b266677a3..82818a00f1 100644 --- a/changelog/upgrade-notes.md +++ b/changelog/upgrade-notes.md @@ -18,9 +18,9 @@ A number of internal types have been renamed. This will not affect those who us * rename `ol.CollectionEventType` to `ol.Collection.EventType` * rename `ol.CollectionEvent` to `ol.Collection.Event` - * rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.renderer.webgl.imagereplay.defaultshader.Locations` - * rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.renderer.webgl.imagereplay.defaultshader.Fragment` - * rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.renderer.webgl.imagereplay.defaultshader.Vertex` + * rename `ol.render.webgl.imagereplay.shader.Default.Locations` to `ol.render.webgl.imagereplay.defaultshader.Locations` + * rename `ol.render.webgl.imagereplay.shader.DefaultFragment` to `ol.render.webgl.imagereplay.defaultshader.Fragment` + * rename `ol.render.webgl.imagereplay.shader.DefaultVertex` to `ol.render.webgl.imagereplay.defaultshader.Vertex` * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations` * rename `ol.renderer.webgl.map.shader.Default.Locations` to `ol.renderer.webgl.defaultmapshader.Locations` * rename `ol.renderer.webgl.map.shader.DefaultFragment` to `ol.renderer.webgl.defaultmapshader.Fragment` diff --git a/src/ol/render/canvas/replay.js b/src/ol/render/canvas/replay.js index ff7c0bb0fa..c9351c8858 100644 --- a/src/ol/render/canvas/replay.js +++ b/src/ol/render/canvas/replay.js @@ -1,10 +1,10 @@ // FIXME add option to apply snapToPixel to all coordinates? // FIXME can eliminate empty set styles and strokes (when all geoms skipped) +goog.provide('ol.render.canvas.Replay'); goog.provide('ol.render.canvas.ImageReplay'); goog.provide('ol.render.canvas.LineStringReplay'); goog.provide('ol.render.canvas.PolygonReplay'); -goog.provide('ol.render.canvas.Replay'); goog.provide('ol.render.canvas.ReplayGroup'); goog.provide('ol.render.canvas.TextReplay'); diff --git a/src/ol/render/webgl/imagereplay/defaultshader.glsl b/src/ol/render/webgl/imagereplay/defaultshader.glsl index 7eb34517d2..1d37462aea 100644 --- a/src/ol/render/webgl/imagereplay/defaultshader.glsl +++ b/src/ol/render/webgl/imagereplay/defaultshader.glsl @@ -1,5 +1,5 @@ -//! NAMESPACE=ol.renderer.webgl.imagereplay.defaultshader -//! CLASS=ol.renderer.webgl.imagereplay.defaultshader +//! NAMESPACE=ol.render.webgl.imagereplay.defaultshader +//! CLASS=ol.render.webgl.imagereplay.defaultshader //! COMMON diff --git a/src/ol/render/webgl/imagereplay/defaultshader.js b/src/ol/render/webgl/imagereplay/defaultshader.js index 6fc6d2144b..e1944c2fe6 100644 --- a/src/ol/render/webgl/imagereplay/defaultshader.js +++ b/src/ol/render/webgl/imagereplay/defaultshader.js @@ -1,5 +1,5 @@ // This file is automatically generated, do not edit -goog.provide('ol.renderer.webgl.imagereplay.defaultshader'); +goog.provide('ol.render.webgl.imagereplay.defaultshader'); goog.require('ol.webgl.Fragment'); goog.require('ol.webgl.Vertex'); @@ -10,34 +10,34 @@ goog.require('ol.webgl.Vertex'); * @extends {ol.webgl.Fragment} * @struct */ -ol.renderer.webgl.imagereplay.defaultshader.Fragment = function() { - ol.webgl.Fragment.call(this, ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE); +ol.render.webgl.imagereplay.defaultshader.Fragment = function() { + ol.webgl.Fragment.call(this, ol.render.webgl.imagereplay.defaultshader.Fragment.SOURCE); }; -ol.inherits(ol.renderer.webgl.imagereplay.defaultshader.Fragment, ol.webgl.Fragment); -goog.addSingletonGetter(ol.renderer.webgl.imagereplay.defaultshader.Fragment); +ol.inherits(ol.render.webgl.imagereplay.defaultshader.Fragment, ol.webgl.Fragment); +goog.addSingletonGetter(ol.render.webgl.imagereplay.defaultshader.Fragment); /** * @const * @type {string} */ -ol.renderer.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\nvarying float v_opacity;\n\nuniform float u_opacity;\nuniform sampler2D u_image;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_image, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n float alpha = texColor.a * v_opacity * u_opacity;\n if (alpha == 0.0) {\n discard;\n }\n gl_FragColor.a = alpha;\n}\n'; +ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE = 'precision mediump float;\nvarying vec2 v_texCoord;\nvarying float v_opacity;\n\nuniform float u_opacity;\nuniform sampler2D u_image;\n\nvoid main(void) {\n vec4 texColor = texture2D(u_image, v_texCoord);\n gl_FragColor.rgb = texColor.rgb;\n float alpha = texColor.a * v_opacity * u_opacity;\n if (alpha == 0.0) {\n discard;\n }\n gl_FragColor.a = alpha;\n}\n'; /** * @const * @type {string} */ -ol.renderer.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;varying float b;uniform float k;uniform sampler2D l;void main(void){vec4 texColor=texture2D(l,a);gl_FragColor.rgb=texColor.rgb;float alpha=texColor.a*b*k;if(alpha==0.0){discard;}gl_FragColor.a=alpha;}'; +ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE = 'precision mediump float;varying vec2 a;varying float b;uniform float k;uniform sampler2D l;void main(void){vec4 texColor=texture2D(l,a);gl_FragColor.rgb=texColor.rgb;float alpha=texColor.a*b*k;if(alpha==0.0){discard;}gl_FragColor.a=alpha;}'; /** * @const * @type {string} */ -ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE = goog.DEBUG ? - ol.renderer.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE : - ol.renderer.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE; +ol.render.webgl.imagereplay.defaultshader.Fragment.SOURCE = goog.DEBUG ? + ol.render.webgl.imagereplay.defaultshader.Fragment.DEBUG_SOURCE : + ol.render.webgl.imagereplay.defaultshader.Fragment.OPTIMIZED_SOURCE; /** @@ -45,34 +45,34 @@ ol.renderer.webgl.imagereplay.defaultshader.Fragment.SOURCE = goog.DEBUG ? * @extends {ol.webgl.Vertex} * @struct */ -ol.renderer.webgl.imagereplay.defaultshader.Vertex = function() { - ol.webgl.Vertex.call(this, ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE); +ol.render.webgl.imagereplay.defaultshader.Vertex = function() { + ol.webgl.Vertex.call(this, ol.render.webgl.imagereplay.defaultshader.Vertex.SOURCE); }; -ol.inherits(ol.renderer.webgl.imagereplay.defaultshader.Vertex, ol.webgl.Vertex); -goog.addSingletonGetter(ol.renderer.webgl.imagereplay.defaultshader.Vertex); +ol.inherits(ol.render.webgl.imagereplay.defaultshader.Vertex, ol.webgl.Vertex); +goog.addSingletonGetter(ol.render.webgl.imagereplay.defaultshader.Vertex); /** * @const * @type {string} */ -ol.renderer.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\nvarying float v_opacity;\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec2 a_offsets;\nattribute float a_opacity;\nattribute float a_rotateWithView;\n\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_offsetScaleMatrix;\nuniform mat4 u_offsetRotateMatrix;\n\nvoid main(void) {\n mat4 offsetMatrix = u_offsetScaleMatrix;\n if (a_rotateWithView == 1.0) {\n offsetMatrix = u_offsetScaleMatrix * u_offsetRotateMatrix;\n }\n vec4 offsets = offsetMatrix * vec4(a_offsets, 0., 0.);\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.) + offsets;\n v_texCoord = a_texCoord;\n v_opacity = a_opacity;\n}\n\n\n'; +ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE = 'varying vec2 v_texCoord;\nvarying float v_opacity;\n\nattribute vec2 a_position;\nattribute vec2 a_texCoord;\nattribute vec2 a_offsets;\nattribute float a_opacity;\nattribute float a_rotateWithView;\n\nuniform mat4 u_projectionMatrix;\nuniform mat4 u_offsetScaleMatrix;\nuniform mat4 u_offsetRotateMatrix;\n\nvoid main(void) {\n mat4 offsetMatrix = u_offsetScaleMatrix;\n if (a_rotateWithView == 1.0) {\n offsetMatrix = u_offsetScaleMatrix * u_offsetRotateMatrix;\n }\n vec4 offsets = offsetMatrix * vec4(a_offsets, 0., 0.);\n gl_Position = u_projectionMatrix * vec4(a_position, 0., 1.) + offsets;\n v_texCoord = a_texCoord;\n v_opacity = a_opacity;\n}\n\n\n'; /** * @const * @type {string} */ -ol.renderer.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;varying float b;attribute vec2 c;attribute vec2 d;attribute vec2 e;attribute float f;attribute float g;uniform mat4 h;uniform mat4 i;uniform mat4 j;void main(void){mat4 offsetMatrix=i;if(g==1.0){offsetMatrix=i*j;}vec4 offsets=offsetMatrix*vec4(e,0.,0.);gl_Position=h*vec4(c,0.,1.)+offsets;a=d;b=f;}'; +ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE = 'varying vec2 a;varying float b;attribute vec2 c;attribute vec2 d;attribute vec2 e;attribute float f;attribute float g;uniform mat4 h;uniform mat4 i;uniform mat4 j;void main(void){mat4 offsetMatrix=i;if(g==1.0){offsetMatrix=i*j;}vec4 offsets=offsetMatrix*vec4(e,0.,0.);gl_Position=h*vec4(c,0.,1.)+offsets;a=d;b=f;}'; /** * @const * @type {string} */ -ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE = goog.DEBUG ? - ol.renderer.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE : - ol.renderer.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE; +ol.render.webgl.imagereplay.defaultshader.Vertex.SOURCE = goog.DEBUG ? + ol.render.webgl.imagereplay.defaultshader.Vertex.DEBUG_SOURCE : + ol.render.webgl.imagereplay.defaultshader.Vertex.OPTIMIZED_SOURCE; /** @@ -81,7 +81,7 @@ ol.renderer.webgl.imagereplay.defaultshader.Vertex.SOURCE = goog.DEBUG ? * @param {WebGLProgram} program Program. * @struct */ -ol.renderer.webgl.imagereplay.defaultshader.Locations = function(gl, program) { +ol.render.webgl.imagereplay.defaultshader.Locations = function(gl, program) { /** * @type {WebGLUniformLocation} diff --git a/src/ol/render/webgl/imagereplay/index.js b/src/ol/render/webgl/imagereplay/index.js index 5549d88851..12663bcb4d 100644 --- a/src/ol/render/webgl/imagereplay/index.js +++ b/src/ol/render/webgl/imagereplay/index.js @@ -6,7 +6,7 @@ goog.require('ol.extent'); goog.require('ol.obj'); goog.require('ol.render.IReplayGroup'); goog.require('ol.render.VectorContext'); -goog.require('ol.renderer.webgl.imagereplay.defaultshader'); +goog.require('ol.render.webgl.imagereplay.defaultshader'); goog.require('ol.vec.Mat4'); goog.require('ol.webgl'); goog.require('ol.webgl.Buffer'); @@ -102,7 +102,7 @@ ol.render.webgl.ImageReplay = function(tolerance, maxExtent) { /** * @private - * @type {ol.renderer.webgl.imagereplay.defaultshader.Locations} + * @type {ol.render.webgl.imagereplay.defaultshader.Locations} */ this.defaultLocations_ = null; @@ -515,16 +515,16 @@ ol.render.webgl.ImageReplay.prototype.replay = function(context, // get the program var fragmentShader = - ol.renderer.webgl.imagereplay.defaultshader.Fragment.getInstance(); + ol.render.webgl.imagereplay.defaultshader.Fragment.getInstance(); var vertexShader = - ol.renderer.webgl.imagereplay.defaultshader.Vertex.getInstance(); + ol.render.webgl.imagereplay.defaultshader.Vertex.getInstance(); var program = context.getProgram(fragmentShader, vertexShader); // get the locations var locations; if (!this.defaultLocations_) { locations = - new ol.renderer.webgl.imagereplay.defaultshader.Locations(gl, program); + new ol.render.webgl.imagereplay.defaultshader.Locations(gl, program); this.defaultLocations_ = locations; } else { locations = this.defaultLocations_; From 4460147291d1d1a1819a325f222e08a2a87335d0 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 15:00:43 -0600 Subject: [PATCH 66/68] Allow ol/typedefs.js to be missing a provide --- test/node/one-provide.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/node/one-provide.js b/test/node/one-provide.js index f4a75d7633..22cad85a3a 100644 --- a/test/node/one-provide.js +++ b/test/node/one-provide.js @@ -50,6 +50,10 @@ describe('each file', () => { it('has a path that maps to the provide', () => { for (let file in provides) { const provide = provides[file][0]; + if (!provide) { + assert.equal(file, path.join('ol', 'typedefs.js'), 'only ol/typedefs.js can be missing a provide'); + continue; + } let ext; if (file.endsWith('index.js')) { ext = path.sep + 'index.js'; From b1593124ba56e1adc5d9f7409aa1f5ba8616b80c Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sat, 6 Aug 2016 15:01:32 -0600 Subject: [PATCH 67/68] Put the primary provide first --- src/ol/interaction/dragbox.js | 2 +- src/ol/renderer/map.js | 2 +- src/ol/source/raster.js | 2 +- src/ol/style/atlasmanager.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ol/interaction/dragbox.js b/src/ol/interaction/dragbox.js index 275e2ec067..c7229f1f52 100644 --- a/src/ol/interaction/dragbox.js +++ b/src/ol/interaction/dragbox.js @@ -1,6 +1,6 @@ // FIXME draw drag box -goog.provide('ol.DragBoxEvent'); goog.provide('ol.interaction.DragBox'); +goog.provide('ol.DragBoxEvent'); goog.require('ol.events.Event'); goog.require('ol'); diff --git a/src/ol/renderer/map.js b/src/ol/renderer/map.js index 7aae3cc0a8..439e103937 100644 --- a/src/ol/renderer/map.js +++ b/src/ol/renderer/map.js @@ -1,5 +1,5 @@ -goog.provide('ol.RendererType'); goog.provide('ol.renderer.Map'); +goog.provide('ol.RendererType'); goog.require('ol.transform'); goog.require('ol'); diff --git a/src/ol/source/raster.js b/src/ol/source/raster.js index 64a8c8e901..b27ad04750 100644 --- a/src/ol/source/raster.js +++ b/src/ol/source/raster.js @@ -1,5 +1,5 @@ -goog.provide('ol.RasterOperationType'); goog.provide('ol.source.Raster'); +goog.provide('ol.RasterOperationType'); goog.provide('ol.source.RasterEvent'); goog.provide('ol.source.RasterEventType'); diff --git a/src/ol/style/atlasmanager.js b/src/ol/style/atlasmanager.js index e606fc2ad2..0b99b7a37f 100644 --- a/src/ol/style/atlasmanager.js +++ b/src/ol/style/atlasmanager.js @@ -1,5 +1,5 @@ -goog.provide('ol.style.Atlas'); goog.provide('ol.style.AtlasManager'); +goog.provide('ol.style.Atlas'); goog.require('ol'); goog.require('ol.dom'); From 02ff448d33b200d814aa64420ebfd1e0d98a17da Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Sun, 7 Aug 2016 10:55:50 -0600 Subject: [PATCH 68/68] Test that files are named like their default export --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a31cab75ce..b0b4bf4149 100644 --- a/Makefile +++ b/Makefile @@ -86,7 +86,7 @@ check-deps: done ;\ .PHONY: ci -ci: lint build test test-rendering compile-examples check-examples apidoc +ci: lint build test test-rendering test-node compile-examples check-examples apidoc .PHONY: compile-examples compile-examples: build/compiled-examples/all.combined.js @@ -137,7 +137,7 @@ test: build/timestamps/node-modules-timestamp build/test_requires.js .PHONY: test-node test-node: build/timestamps/node-modules-timestamp - ./node_modules/.bin/mocha test/node + ./node_modules/.bin/mocha test/node --fgrep 'has a path that maps to the provide' .PHONY: test-coverage test-coverage: build/timestamps/node-modules-timestamp