break circular dependency, final minor fixes

mapbox · Jan 24, 2023 · 0979259 · 0979259
1 parent ff45cae
commit 0979259
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/debug/satellites-custom-layer.js b/debug/satellites-custom-layer.js
@@ -145,6 +145,7 @@ const satellitesLayer = {
         if (this.satData) {
             this.updateBuffers();
 
+            const primitiveCount = this.posEcef.length / 3;
             gl.enable(gl.DEPTH_TEST);
             if (projection && projection.name === 'globe') { // globe projection and globe to mercator transition
                 gl.useProgram(this.globeProgram);
@@ -156,13 +157,12 @@ const satellitesLayer = {
                 gl.uniformMatrix4fv(gl.getUniformLocation(this.globeProgram, "u_globeToMercMatrix"), false, globeToMercMatrix);
                 gl.uniform1f(gl.getUniformLocation(this.globeProgram, "u_globeToMercatorTransition"), transition);
 
-                const count = this.posEcef.length / 3;
-                gl.drawArrays(gl.POINTS, 0, count);
+                gl.drawArrays(gl.POINTS, 0, primitiveCount);
             } else { // mercator projection
                 gl.useProgram(this.mercProgram);
                 updateVboAndActivateAttrib(gl, this.mercProgram, this.posMercVbo, this.posMerc, "a_pos_merc");
                 gl.uniformMatrix4fv(gl.getUniformLocation(this.mercProgram, "u_projection"), false, projectionMatrix);
-                gl.drawArrays(gl.POINTS, 0, this.posEcef.length / 3);
+                gl.drawArrays(gl.POINTS, 0, primitiveCount);
             }
         }
     }

diff --git a/src/geo/lng_lat.js b/src/geo/lng_lat.js
@@ -11,6 +11,11 @@ import {GLOBE_RADIUS, globeMetersToEcef, latLngToECEF} from '../geo/projection/g
 */
 export const earthRadius = 6371008.8;
 
+/*
+ * The average circumference of the earth in meters.
+ */
+export const earthCircumference = 2 * Math.PI * earthRadius;
+
 /**
  * A `LngLat` object represents a given longitude and latitude coordinate, measured in degrees.
  * These coordinates use longitude, latitude coordinate order (as opposed to latitude, longitude)

diff --git a/src/geo/mercator_coordinate.js b/src/geo/mercator_coordinate.js
@@ -1,13 +1,8 @@
 // @flow
 
-import LngLat, {earthRadius} from '../geo/lng_lat.js';
+import LngLat, {earthCircumference} from '../geo/lng_lat.js';
 import type {LngLatLike} from '../geo/lng_lat.js';
 
-/*
- * The average circumference of the world in meters.
- */
-const earthCircumference = 2 * Math.PI * earthRadius; // meters
-
 /*
  * The circumference at a line of latitude in meters.
  */