Merge pull request #1303 from OpenGeoscience/internal-vgl

refactor: Move vgl locally

docs/developers.rst

@@ -51,12 +51,12 @@ so there is no need to rerun this command unless you add a new file.
 
 There are a number of utilities present in the file ``tests/test-utils.js``
 that developers can use to make better unit tests. For example, a mocked
-vgl renderer can be used to hit code paths within webgl rendered layers. There
-are also methods for mocking global methods like ``requestAnimationFrame``
-to test complex, asynchronous code paths in a stable and repeatable manner.
-The `Sinon <https://sinonjs.org/>`_ testing library is also available to
-generate stubs, spies, and mocked methods. Because all tests share
-a global scope, they should be careful to clean up all mocking and
+webgl renderer can be used to hit code paths within webgl rendered layers.
+There are also methods for mocking global methods like
+``requestAnimationFrame`` to test complex, asynchronous code paths in a stable
+and repeatable manner. The `Sinon <https://sinonjs.org/>`_ testing library is
+also available to generate stubs, spies, and mocked methods. Because all tests
+share a global scope, they should be careful to clean up all mocking and
 instrumentation after running. Ideally, each test should be runnable
 independently and use jasmines ``beforeEach`` and ``afterEach`` methods
 for setup and tear down.

package.json

@@ -23,8 +23,7 @@
  "kdbush": "^4.0.0",
  "mousetrap": "^1.6.5",
  "polybooljs": "git+https://github.com/manubb/polybooljs#eps-logic",
- "proj4": "^2.7.5",
- "vgl": "0.3.11"
+ "proj4": "^2.7.5"
  },
  "optionalDependencies": {
  "@egjs/hammerjs": "^2.0.8",

src/index.js

@@ -8,10 +8,6 @@
 /*
  * Bundled with the following libraries:
  *
- * vgl
- * @copyright 2014-2016, Kitware, Inc.
- * @license Apache-2.0
- *
  * Proj4js
  * @copyright 2014, Mike Adair, Richard Greenwood, Didier Richard, Stephen Irons, Olivier Terral and Calvin Metcalf
  * @license MIT
@@ -99,7 +95,8 @@ module.exports = $.extend({
  svg: require('./svg'),
  vtkjs: require('./vtkjs'),
  webgl: require('./webgl'),
- gui: require('./ui')
+ gui: require('./ui'),
+ vgl: require('./vgl')
 }, require('./registry'));
 
 if (window && !window.$) {

src/util/common.js

@@ -328,7 +328,7 @@ var util = {
  * is the correct size, return it. Otherwise, allocate a new buffer; any
  * data in an old buffer is discarded.
  *
- * @param {vgl.geometryData} geom The geometry to reference and modify.
+ * @param {geo.vgl.geometryData} geom The geometry to reference and modify.
  * @param {string} srcName The name of the source.
  * @param {number} len The number of elements for the array.
  * @param {number} [allowLarger=0.2] If the existing buffer is larger than

src/util/mockVGL.js

@@ -18,7 +18,7 @@ module.exports = {};
  */
 module.exports.mockWebglRenderer = function mockWebglRenderer(supported) {
  'use strict';
- var vgl = require('vgl');
+ var vgl = require('../vgl');
 
  if (supported === undefined) {
  supported = true;
@@ -189,7 +189,7 @@ module.exports.mockWebglRenderer = function mockWebglRenderer(supported) {
  * @alias geo.util.restoreWebglRenderer
  */
 module.exports.restoreWebglRenderer = function () {
- var vgl = require('vgl');
+ var vgl = require('../vgl');
 
  if (vgl._mocked) {
  vgl.renderWindow = _renderWindow;