UDST · robhawkes · Jun 3, 2017 · Feb 2, 2019
diff --git a/.babelrc b/.babelrc
diff --git a/.editorconfig b/.editorconfig
diff --git a/.eslintrc b/.eslintrc
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
diff --git a/.gitignore b/.gitignore
diff --git a/.jscsrc b/.jscsrc
diff --git a/.npmignore b/.npmignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/dist/vizicities-worker.js b/dist/vizicities-worker.js
diff --git a/dist/vizicities-worker.min.js b/dist/vizicities-worker.min.js
diff --git a/dist/vizicities-worker.min.js.map b/dist/vizicities-worker.min.js.map
diff --git a/dist/vizicities.css b/dist/vizicities.css
diff --git a/dist/vizicities.js b/dist/vizicities.js
diff --git a/dist/vizicities.min.js b/dist/vizicities.min.js
diff --git a/dist/vizicities.min.js.map b/dist/vizicities.min.js.map
diff --git a/examples/all-the-things/index.html b/examples/all-the-things/index.html
diff --git a/examples/all-the-things/main.css b/examples/all-the-things/main.css
diff --git a/examples/all-the-things/main.js b/examples/all-the-things/main.js
diff --git a/examples/basic/index.html b/examples/basic/index.html
diff --git a/examples/basic/main.css b/examples/basic/main.css
diff --git a/examples/basic/main.js b/examples/basic/main.js
diff --git a/examples/colour-by-height/index.html b/examples/colour-by-height/index.html
diff --git a/examples/colour-by-height/main.css b/examples/colour-by-height/main.css
diff --git a/examples/colour-by-height/main.js b/examples/colour-by-height/main.js
diff --git a/examples/geojson/index.html b/examples/geojson/index.html
diff --git a/examples/geojson/main.css b/examples/geojson/main.css
diff --git a/examples/geojson/main.js b/examples/geojson/main.js
diff --git a/examples/interactive/index.html b/examples/interactive/index.html
diff --git a/examples/interactive/main.css b/examples/interactive/main.css
diff --git a/examples/interactive/main.js b/examples/interactive/main.js
diff --git a/examples/lots-of-features/index.html b/examples/lots-of-features/index.html
diff --git a/examples/lots-of-features/main.css b/examples/lots-of-features/main.css
diff --git a/examples/lots-of-features/main.js b/examples/lots-of-features/main.js
diff --git a/examples/mta-routes/index.html b/examples/mta-routes/index.html
diff --git a/examples/mta-routes/main.css b/examples/mta-routes/main.css
diff --git a/examples/mta-routes/main.js b/examples/mta-routes/main.js
diff --git a/examples/tile-events/index.html b/examples/tile-events/index.html
diff --git a/examples/tile-events/main.css b/examples/tile-events/main.css
diff --git a/examples/tile-events/main.js b/examples/tile-events/main.js
diff --git a/examples/vendor/TweenMax.min.js b/examples/vendor/TweenMax.min.js
diff --git a/examples/vendor/chroma.min.js b/examples/vendor/chroma.min.js
diff --git a/examples/vendor/three.js b/examples/vendor/three.js
diff --git a/examples/vendor/three.min.js b/examples/vendor/three.min.js
diff --git a/examples/vendor/threex.rendererstats.js b/examples/vendor/threex.rendererstats.js
diff --git a/examples/web-workers-all-the-things/index.html b/examples/web-workers-all-the-things/index.html
diff --git a/examples/web-workers-all-the-things/main.css b/examples/web-workers-all-the-things/main.css
diff --git a/examples/web-workers-all-the-things/main.js b/examples/web-workers-all-the-things/main.js
diff --git a/examples/web-workers-all-the-things/vizicities-worker.js b/examples/web-workers-all-the-things/vizicities-worker.js
diff --git a/examples/web-workers-basic/index.html b/examples/web-workers-basic/index.html
diff --git a/examples/web-workers-basic/main.css b/examples/web-workers-basic/main.css
diff --git a/examples/web-workers-basic/main.js b/examples/web-workers-basic/main.js
diff --git a/examples/web-workers-basic/vizicities-worker.js b/examples/web-workers-basic/vizicities-worker.js
diff --git a/examples/web-workers-geojson/index.html b/examples/web-workers-geojson/index.html
diff --git a/examples/web-workers-geojson/main.css b/examples/web-workers-geojson/main.css
diff --git a/examples/web-workers-geojson/main.js b/examples/web-workers-geojson/main.js
diff --git a/examples/web-workers-geojson/vizicities-worker.js b/examples/web-workers-geojson/vizicities-worker.js
diff --git a/examples/web-workers-outlines/index.html b/examples/web-workers-outlines/index.html
diff --git a/examples/web-workers-outlines/main.css b/examples/web-workers-outlines/main.css
diff --git a/examples/web-workers-outlines/main.js b/examples/web-workers-outlines/main.js
diff --git a/examples/web-workers-outlines/vizicities-worker.js b/examples/web-workers-outlines/vizicities-worker.js
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
diff --git a/package.json b/package.json
diff --git a/src/World.js b/src/World.js
diff --git a/src/controls/Controls.Orbit.js b/src/controls/Controls.Orbit.js
diff --git a/src/controls/index.js b/src/controls/index.js
diff --git a/src/engine/Camera.js b/src/engine/Camera.js
diff --git a/src/engine/DOMRenderer2D.js b/src/engine/DOMRenderer2D.js
diff --git a/src/engine/DOMRenderer3D.js b/src/engine/DOMRenderer3D.js
diff --git a/src/engine/DOMScene2D.js b/src/engine/DOMScene2D.js
diff --git a/src/engine/DOMScene3D.js b/src/engine/DOMScene3D.js
diff --git a/src/engine/EffectComposer.js b/src/engine/EffectComposer.js
diff --git a/src/engine/Engine.js b/src/engine/Engine.js
diff --git a/src/engine/Picking.js b/src/engine/Picking.js
diff --git a/src/engine/PickingMaterial.js b/src/engine/PickingMaterial.js
diff --git a/src/engine/PickingScene.js b/src/engine/PickingScene.js
diff --git a/src/engine/PickingShader.js b/src/engine/PickingShader.js
diff --git a/src/engine/Renderer.js b/src/engine/Renderer.js
diff --git a/src/engine/Scene.js b/src/engine/Scene.js
diff --git a/src/geo/Geo.js b/src/geo/Geo.js
@@ -11,6 +11,20 @@ Geo.MAX_LATITUDE = 85.0511287798;
 Geo.ECC = 0.081819191;
 Geo.ECC2 = 0.081819191 * 0.081819191;
 
+// Multiplier is used to expand or compress the WebGL coordinate space relative
+// to the EPSG:3857 / Pseudo-Mercator coordinate space (metres).
+//
+// This is useful for keeping coordinate calculations to smaller numbers and
+// helps increase accuracy of things like the z-buffer, object intersection,
+// and camera near and far clipping.
+//
+// A multiplier of 1 would mean a 1:1 mapping between WebGL and EPSG:3857
+// coordinates (1 EPSG:3857 metre === 1 WebGL unit)
+//
+// A multiplier of 0.1 would mean a 1:0.1 mapping between WebGL and EPSG:3857
+// coordinates (1 EPSG:3857 metre === 0.1 WebGL units)
+Geo.multiplier = 0.1;
+
 Geo.project = function(latlon) {
   var d = Math.PI / 180;
   var max = Geo.MAX_LATITUDE;
@@ -38,13 +52,20 @@ Geo.latLonToPoint = function(latlon) {
   var projected = Geo.project(latlon);
   projected.y *= -1;
 
+  projected.x *= Geo.multiplier;
+  projected.y *= Geo.multiplier;
+
   return projected;
 };
 
 // Converts pixel / WebGL coords to geo coords
 // This just reverses the Y axis to match WebGL
 Geo.pointToLatLon = function(point) {
   var _point = Point(point.x, point.y * -1);
+
+  _point.x /= Geo.multiplier;
+  _point.y /= Geo.multiplier;
+
   return Geo.unproject(_point);
 };
 
@@ -114,36 +135,21 @@ Geo.metresToWorld = function(metres, pointScale) {
   //
   // Latitude scale is chosen because it fluctuates more than longitude
   var projectedMetres = Geo.metresToProjected(metres, pointScale);
-
-  var scale = Geo.scale();
-
-  // Scale projected metres
-  var scaledMetres = (scale * projectedMetres);
-
-  return scaledMetres;
+  return projectedMetres * Geo.multiplier;
 };
 
 // Convert world (WebGL) units to a value in real metres
 Geo.worldToMetres = function(worldUnits, pointScale) {
-  var scale = Geo.scale();
-
-  var projectedUnits = worldUnits / scale;
+  var projectedUnits = worldUnits;
   var realMetres = Geo.projectedToMetres(projectedUnits, pointScale);
 
-  return realMetres;
+  return realMetres / Geo.multiplier;
 };
 
-// If zoom is provided, returns the map width in pixels for a given zoom
-// Else, provides fixed scale value
+// Returns the world width in pixels for a given zoom, assuming tile dimensions
+// of 256x256 pixels
 Geo.scale = function(zoom) {
-  // If zoom is provided then return scale based on map tile zoom
-  if (zoom >= 0) {
-    return 256 * Math.pow(2, zoom);
-  // Else, return fixed scale value to expand projected coordinates from
-  // their 0 to 1 range into something more practical
-  } else {
-    return 1;
-  }
+  return 256 * Math.pow(2, zoom);
 };
 
 // Returns zoom level for a given scale value
@@ -193,7 +199,7 @@ Geo.distance = function(latlon1, latlon2, accurate) {
 };
 
 Geo.bounds = (function() {
-  var d = Geo.R * Math.PI;
+  var d = Geo.R * Math.PI * Geo.multiplier;
   return [[-d, -d], [d, d]];
 })();
 

diff --git a/src/geo/LatLon.js b/src/geo/LatLon.js
diff --git a/src/geo/Point.js b/src/geo/Point.js
diff --git a/src/layer/GeoJSONLayer.js b/src/layer/GeoJSONLayer.js
diff --git a/src/layer/GeoJSONWorkerLayer.js b/src/layer/GeoJSONWorkerLayer.js
diff --git a/src/layer/Layer.js b/src/layer/Layer.js
diff --git a/src/layer/LayerGroup.js b/src/layer/LayerGroup.js
diff --git a/src/layer/TopoJSONLayer.js b/src/layer/TopoJSONLayer.js
diff --git a/src/layer/TopoJSONWorkerLayer.js b/src/layer/TopoJSONWorkerLayer.js
diff --git a/src/layer/environment/EnvironmentLayer.js b/src/layer/environment/EnvironmentLayer.js
diff --git a/src/layer/environment/Sky.js b/src/layer/environment/Sky.js
diff --git a/src/layer/environment/Skybox.js b/src/layer/environment/Skybox.js
diff --git a/src/layer/geometry/PointLayer.js b/src/layer/geometry/PointLayer.js
diff --git a/src/layer/geometry/PolygonLayer.js b/src/layer/geometry/PolygonLayer.js
diff --git a/src/layer/geometry/PolylineLayer.js b/src/layer/geometry/PolylineLayer.js
diff --git a/src/layer/tile/GeoJSONTile.js b/src/layer/tile/GeoJSONTile.js
diff --git a/src/layer/tile/GeoJSONTileLayer.js b/src/layer/tile/GeoJSONTileLayer.js
diff --git a/src/layer/tile/ImageTile.js b/src/layer/tile/ImageTile.js
diff --git a/src/layer/tile/ImageTileLayer.js b/src/layer/tile/ImageTileLayer.js
diff --git a/src/layer/tile/ImageTileLayerBaseMaterial.js b/src/layer/tile/ImageTileLayerBaseMaterial.js
diff --git a/src/layer/tile/Tile.js b/src/layer/tile/Tile.js
diff --git a/src/layer/tile/TileCache.js b/src/layer/tile/TileCache.js
diff --git a/src/layer/tile/TileLayer.js b/src/layer/tile/TileLayer.js
diff --git a/src/layer/tile/TopoJSONTileLayer.js b/src/layer/tile/TopoJSONTileLayer.js
diff --git a/src/util/Buffer.js b/src/util/Buffer.js
diff --git a/src/util/GeoJSON.js b/src/util/GeoJSON.js
diff --git a/src/util/Stringify.js b/src/util/Stringify.js
diff --git a/src/util/Worker.js b/src/util/Worker.js
diff --git a/src/util/WorkerPool.js b/src/util/WorkerPool.js
diff --git a/src/util/WorkerPoolWorker.js b/src/util/WorkerPoolWorker.js
diff --git a/src/util/extrudePolygon.js b/src/util/extrudePolygon.js
diff --git a/src/util/index.js b/src/util/index.js
diff --git a/src/util/wrapNum.js b/src/util/wrapNum.js
diff --git a/src/vendor/BoxHelper.js b/src/vendor/BoxHelper.js
diff --git a/src/vendor/CSS2DRenderer.js b/src/vendor/CSS2DRenderer.js
diff --git a/src/vendor/CSS3DRenderer.js b/src/vendor/CSS3DRenderer.js
diff --git a/src/vendor/CopyShader.js b/src/vendor/CopyShader.js
diff --git a/src/vendor/EffectComposer.js b/src/vendor/EffectComposer.js
diff --git a/src/vendor/FXAAShader.js b/src/vendor/FXAAShader.js
diff --git a/src/vendor/HorizontalTiltShiftShader.js b/src/vendor/HorizontalTiltShiftShader.js
diff --git a/src/vendor/MaskPass.js b/src/vendor/MaskPass.js
diff --git a/src/vendor/OrbitControls.js b/src/vendor/OrbitControls.js
diff --git a/src/vendor/RenderPass.js b/src/vendor/RenderPass.js
diff --git a/src/vendor/ShaderPass.js b/src/vendor/ShaderPass.js
diff --git a/src/vendor/VerticalTiltShiftShader.js b/src/vendor/VerticalTiltShiftShader.js
diff --git a/src/vizicities-worker.js b/src/vizicities-worker.js
diff --git a/src/vizicities.css b/src/vizicities.css
diff --git a/src/vizicities.js b/src/vizicities.js
diff --git a/test/.eslintrc b/test/.eslintrc
diff --git a/test/runner.html b/test/runner.html
diff --git a/test/setup/browser.js b/test/setup/browser.js
diff --git a/test/setup/node.js b/test/setup/node.js
diff --git a/test/setup/setup.js b/test/setup/setup.js
diff --git a/test/unit/Geo.js b/test/unit/Geo.js
@@ -108,14 +108,12 @@ describe('Geo', () => {
   });
 
   describe('#scale', () => {
-    it('defaults to 1', () => {
-      var scale = Geo.scale();
-      expect(scale).to.equal(1);
-    });
-
-    it('uses the zoom level if provided', () => {
+    it('returns scale for given zoom level', () => {
       var scale = Geo.scale(1);
       expect(scale).to.equal(512);
+
+      scale = Geo.scale(2);
+      expect(scale).to.equal(1024);
     });
   });
 

diff --git a/test/unit/vizicities.js b/test/unit/vizicities.js