x_ite 4.7.12 → 5.0.0

package/src/standard/Geospatial/Geodetic.js

@@ -48,220 +48,220 @@
 
 
 define ([
-	"standard/Math/Numbers/Vector3",
-	"standard/Math/Algorithm",
+   "standard/Math/Numbers/Vector3",
+   "standard/Math/Algorithm",
 ],
 function (Vector3,
           Algorithm)
 {
 "use strict";
 
-	const
-		EPS_H = 1e-3,
-		EPS_P = 1e-10,
-		IMAX  = 30;
+   const
+      EPS_H = 1e-3,
+      EPS_P = 1e-10,
+      IMAX  = 30;
 
-	function Geodetic (spheroid, latitudeFirst, radians)
-	{
-		this .longitudeFirst = ! latitudeFirst;
+   function Geodetic (spheroid, latitudeFirst, radians)
+   {
+      this .longitudeFirst = ! latitudeFirst;
       this .degrees        = ! radians;
       this .a              = spheroid .getSemiMajorAxis ();
       this .c              = spheroid .getSemiMinorAxis ();
       this .c2a2           = Math .pow (spheroid .getSemiMinorAxis () / this .a, 2);
       this .ecc2           = 1 - this .c2a2;
-	}
-
-	Geodetic .prototype =
-	{
-		constructor: Geodetic,
-		convert: function (geodetic, result)
-		{
-			const elevation = geodetic .z;
-
-			if (this .longitudeFirst)
-			{
-				var
-					latitude  = geodetic .y,
-					longitude = geodetic .x;
-			}
-			else
-			{
-				var
-					latitude  = geodetic .x,
-					longitude = geodetic .y;
-			}
-
-			if (this .degrees)
-			{
-				latitude  *= Math .PI / 180;
-				longitude *= Math .PI / 180;
-			}
-
-			return this .convertRadians (latitude, longitude, elevation, result);
-		},
-		convertRadians: function (latitude, longitude, elevation, result)
-		{
-			const
-				slat  = Math .sin (latitude),
-				slat2 = Math .pow (slat, 2),
-				clat  = Math .cos (latitude),
-				N     = this .a / Math .sqrt (1 - this .ecc2 * slat2),
-				Nhl   = (N + elevation) * clat;
-
-			return result .set (Nhl * Math .cos (longitude),
-			                    Nhl * Math .sin (longitude),
-			                    (N * this .c2a2 + elevation) * slat);
-		},
-		apply: function (geocentric, result)
-		{
-			this .applyRadians (geocentric, result);
-
-			if (this .degrees)
-			{
-				result .x *= 180 / Math .PI; // latitude
-				result .y *= 180 / Math .PI; // longitude
-			}
-
-			if (this .longitudeFirst)
-			{
-				const tmp = result .x;
-
-				result .x = result .y; // latitude
-				result .y = tmp;       // longitude
-			}
-
-			return result;
-		},
-		applyRadians: function (geocentric, result)
-		{
-			const
-				x = geocentric .x,
-				y = geocentric .y,
-				z = geocentric .z;
-
-			const P = Math .sqrt (x * x + y * y);
-
-			// Handle pole case.
-			if (P == 0)
-				return result .set (Math .PI, 0, z - this .c);
-
-			let
-				latitude  = 0,
-				longitude = Math .atan2 (y, x),
-				elevation = 0;
-
-			let
-				a    = this .a,
-				N    = a,
-				ecc2 = this .ecc2;
-
-			for (let i = 0; i < IMAX; ++ i)
-			{
-				const
-					h0 = elevation,
-					b0 = latitude;
-
-				latitude = Math .atan (z / P / (1 - ecc2 * N / (N + elevation)));
-
-				const sin_p = Math .sin (latitude);
-
-				N         = a / Math .sqrt (1 - ecc2 * sin_p * sin_p);
-				elevation = P / Math .cos (latitude) - N;
-
-				if (Math .abs (elevation - h0) < EPS_H && Math .abs (latitude - b0) < EPS_P)
-					break;
-			}
-
-			return result .set (latitude, longitude, elevation);
-		},
-		normal: function (geocentric, result)
-		{
-			const geodetic = this .applyRadians (geocentric, result);
-
-			const
-				latitude  = geodetic .x,
-				longitude = geodetic .y;
-
-			const clat = Math .cos (latitude);
-
-			const
-				nx = Math .cos (longitude) * clat,
-				ny = Math .sin (longitude) * clat,
-				nz = Math .sin (latitude);
-
-			return result .set (nx, ny, nz);
-		},
-		/*
-		lerp: function (s, d, t)
-		{
-			var
-				source     =  this .source      .assign (s),
-				destination = this .destination .assign (d);
-
-			var
-				RANGE    = this .degrees ? 180 : M_PI,
-				RANGE1_2 = RANGE / 2,
-				RANGE2   = RANGE * 2;
-
-			var range = 0;
-
-			if (this .longitudeFirst)
-			{
-				source .x = Algorithm .interval (source .x, -RANGE,    RANGE);
-				source .y = Algorithm .interval (source .y, -RANGE1_2, RANGE1_2);
-
-				destination .x = Algorithm .interval (destination .x, -RANGE,    RANGE);
-				destination .y = Algorithm .interval (destination .y, -RANGE1_2, RANGE1_2);
-
-				range = Math .abs (destination .x - source .x);
-			}
-			else
-			{
-				source .x = Algorithm .interval (source .x, -RANGE1_2, RANGE1_2);
-				source .y = Algorithm .interval (source .y, -RANGE,    RANGE);
-
-				destination .x = Algorithm .interval (destination .x, -RANGE1_2, RANGE1_2);
-				destination .y = Algorithm .interval (destination .y, -RANGE,    RANGE);
-
-				range = Math .abs (destination .y - source .y);
-			}
+   }
+
+   Geodetic .prototype =
+   {
+      constructor: Geodetic,
+      convert: function (geodetic, result)
+      {
+         const elevation = geodetic .z;
+
+         if (this .longitudeFirst)
+         {
+            var
+               latitude  = geodetic .y,
+               longitude = geodetic .x;
+         }
+         else
+         {
+            var
+               latitude  = geodetic .x,
+               longitude = geodetic .y;
+         }
+
+         if (this .degrees)
+         {
+            latitude  *= Math .PI / 180;
+            longitude *= Math .PI / 180;
+         }
+
+         return this .convertRadians (latitude, longitude, elevation, result);
+      },
+      convertRadians: function (latitude, longitude, elevation, result)
+      {
+         const
+            slat  = Math .sin (latitude),
+            slat2 = Math .pow (slat, 2),
+            clat  = Math .cos (latitude),
+            N     = this .a / Math .sqrt (1 - this .ecc2 * slat2),
+            Nhl   = (N + elevation) * clat;
+
+         return result .set (Nhl * Math .cos (longitude),
+                             Nhl * Math .sin (longitude),
+                             (N * this .c2a2 + elevation) * slat);
+      },
+      apply: function (geocentric, result)
+      {
+         this .applyRadians (geocentric, result);
+
+         if (this .degrees)
+         {
+            result .x *= 180 / Math .PI; // latitude
+            result .y *= 180 / Math .PI; // longitude
+         }
+
+         if (this .longitudeFirst)
+         {
+            const tmp = result .x;
+
+            result .x = result .y; // latitude
+            result .y = tmp;       // longitude
+         }
+
+         return result;
+      },
+      applyRadians: function (geocentric, result)
+      {
+         const
+            x = geocentric .x,
+            y = geocentric .y,
+            z = geocentric .z;
+
+         const P = Math .sqrt (x * x + y * y);
+
+         // Handle pole case.
+         if (P == 0)
+            return result .set (Math .PI, 0, z - this .c);
+
+         let
+            latitude  = 0,
+            longitude = Math .atan2 (y, x),
+            elevation = 0;
+
+         let
+            a    = this .a,
+            N    = a,
+            ecc2 = this .ecc2;
+
+         for (let i = 0; i < IMAX; ++ i)
+         {
+            const
+               h0 = elevation,
+               b0 = latitude;
+
+            latitude = Math .atan (z / P / (1 - ecc2 * N / (N + elevation)));
+
+            const sin_p = Math .sin (latitude);
+
+            N         = a / Math .sqrt (1 - ecc2 * sin_p * sin_p);
+            elevation = P / Math .cos (latitude) - N;
+
+            if (Math .abs (elevation - h0) < EPS_H && Math .abs (latitude - b0) < EPS_P)
+               break;
+         }
+
+         return result .set (latitude, longitude, elevation);
+      },
+      normal: function (geocentric, result)
+      {
+         const geodetic = this .applyRadians (geocentric, result);
+
+         const
+            latitude  = geodetic .x,
+            longitude = geodetic .y;
+
+         const clat = Math .cos (latitude);
+
+         const
+            nx = Math .cos (longitude) * clat,
+            ny = Math .sin (longitude) * clat,
+            nz = Math .sin (latitude);
+
+         return result .set (nx, ny, nz);
+      },
+      /*
+      lerp: function (s, d, t)
+      {
+         var
+            source     =  this .source      .assign (s),
+            destination = this .destination .assign (d);
+
+         var
+            RANGE    = this .degrees ? 180 : M_PI,
+            RANGE1_2 = RANGE / 2,
+            RANGE2   = RANGE * 2;
+
+         var range = 0;
+
+         if (this .longitudeFirst)
+         {
+            source .x = Algorithm .interval (source .x, -RANGE,    RANGE);
+            source .y = Algorithm .interval (source .y, -RANGE1_2, RANGE1_2);
+
+            destination .x = Algorithm .interval (destination .x, -RANGE,    RANGE);
+            destination .y = Algorithm .interval (destination .y, -RANGE1_2, RANGE1_2);
+
+            range = Math .abs (destination .x - source .x);
+         }
+         else
+         {
+            source .x = Algorithm .interval (source .x, -RANGE1_2, RANGE1_2);
+            source .y = Algorithm .interval (source .y, -RANGE,    RANGE);
+
+            destination .x = Algorithm .interval (destination .x, -RANGE1_2, RANGE1_2);
+            destination .y = Algorithm .interval (destination .y, -RANGE,    RANGE);
+
+            range = Math .abs (destination .y - source .y);
+         }
 
-			if (range <= RANGE)
-				return source .lerp (destination, t);
-
-			var step = (RANGE2 - range) * t;
-
-			if (this .longitudeFirst)
-			{
-				var longitude = source .x < destination .x ? source .x - step : source .x + step;
+         if (range <= RANGE)
+            return source .lerp (destination, t);
+
+         var step = (RANGE2 - range) * t;
+
+         if (this .longitudeFirst)
+         {
+            var longitude = source .x < destination .x ? source .x - step : source .x + step;
 
-				if (longitude < -RANGE)
-					longitude += RANGE2;
+            if (longitude < -RANGE)
+               longitude += RANGE2;
 
-				else if (longitude > RANGE)
-					longitude -= RANGE2;
+            else if (longitude > RANGE)
+               longitude -= RANGE2;
 
-				return source .set (longitude,
-				                    source .y + t * (destination .y - source .y),
-				                    source .z + t * (destination .z - source .z));
-			}
+            return source .set (longitude,
+                                source .y + t * (destination .y - source .y),
+                                source .z + t * (destination .z - source .z));
+         }
 
-			var longitude = source .y < destination .y ? source .y - step : source .y + step;
+         var longitude = source .y < destination .y ? source .y - step : source .y + step;
 
-			if (longitude < -RANGE)
-				longitude += RANGE2;
+         if (longitude < -RANGE)
+            longitude += RANGE2;
 
-			else if (longitude > RANGE)
-				longitude -= RANGE2;
+         else if (longitude > RANGE)
+            longitude -= RANGE2;
 
-			return source .set (source .x + t * (destination .x - source .x),
-			                    longitude,
-			                    source .z + t * (destination .z - source .z));
-		},
-		source: new Vector3 (0, 0, 0),
-		destination: new Vector3 (0, 0, 0),
-		*/
-	};
+         return source .set (source .x + t * (destination .x - source .x),
+                             longitude,
+                             source .z + t * (destination .z - source .z));
+      },
+      source: new Vector3 (0, 0, 0),
+      destination: new Vector3 (0, 0, 0),
+      */
+   };
 
-	return Geodetic;
+   return Geodetic;
 });

package/src/standard/Geospatial/ReferenceEllipsoids.js

@@ -48,53 +48,53 @@
 
 
 define ([
-	"standard/Math/Geometry/Spheroid3",
+   "standard/Math/Geometry/Spheroid3",
 ],
 function (Spheroid3)
 {
 "use strict";
 
-	const ReferenceEllipsoids =
-	{
-		// Earth
-		// X3D Specification
-		AA: new Spheroid3 (6377563.396, 299.3249646,   true), // Airy 1830
-		AM: new Spheroid3 (6377340.189, 299.3249646,   true), // Modified Airy
-		AN: new Spheroid3 (6378160,     298.25,        true), // Australian National
-		BN: new Spheroid3 (6377483.865, 299.1528128,   true), // Bessel 1841 (Namibia)
-		BR: new Spheroid3 (6377397.155, 299.1528128,   true), // Bessel 1841 (Ethiopia Indonesia...)
-		CC: new Spheroid3 (6378206.4,   294.9786982,   true), // Clarke 1866
-		CD: new Spheroid3 (6378249.145, 293.465,       true), // Clarke 1880
-		EA: new Spheroid3 (6377276.345, 300.8017,      true), // Everest (India 1830)
-		EB: new Spheroid3 (6377298.556, 300.8017,      true), // Everest (Sabah & Sarawak)
-		EC: new Spheroid3 (6377301.243, 300.8017,      true), // Everest (India 1956)
-		ED: new Spheroid3 (6377295.664, 300.8017,      true), // Everest (W. Malaysia 1969)
-		EE: new Spheroid3 (6377304.063, 300.8017,      true), // Everest (W. Malaysia & Singapore 1948)
-		EF: new Spheroid3 (6377309.613, 300.8017,      true), // Everest (Pakistan)
-		FA: new Spheroid3 (6378155,     298.3,         true), // Modified Fischer 1960
-		HE: new Spheroid3 (6378200,     298.3,         true), // Helmert 1906
-		HO: new Spheroid3 (6378270,     297,           true), // Hough 1960
-		ID: new Spheroid3 (6378160,     298.247,       true), // Indonesian 1974
-		IN: new Spheroid3 (6378388,     297,           true), // International 1924
-		KA: new Spheroid3 (6378245,     298.3,         true), // Krassovsky 1940
-		RF: new Spheroid3 (6378137,     298.257222101, true), // Geodetic Reference System 1980 (GRS 80)
-		SA: new Spheroid3 (6378160,     298.25,        true), // South American 1969
-		WD: new Spheroid3 (6378135,     298.26,        true), // WGS 72
-		WE: new Spheroid3 (6378137,     298.257223563, true), // WGS 84
-		// Solar System
-		// http://en.wikipedia.de
-		// Can someone give me more accurate parameters.
-		SUN:     new Spheroid3 (696342000, 1 / 9e-6, true),
-		MERCURY: new Spheroid3 (2439700,  2439700),
-		VENUS:   new Spheroid3 (6051800,  6051800),
-		MOON:    new Spheroid3 (1738140,  1735970),
-		MARS:    new Spheroid3 (3395428,  3377678), // http://adsabs.harvard.edu/abs/2010EM%26P..106....1A
-		JUPITER: new Spheroid3 (71492000, 66854000),
-		SATURN:  new Spheroid3 (60268000, 54364000),
-		URANUS:  new Spheroid3 (2555000,  24973000),
-		NEPTUNE: new Spheroid3 (24764000, 24341000),
-		PLUTO:   new Spheroid3 (1153000,  1153000),
-	};
+   const ReferenceEllipsoids =
+   {
+      // Earth
+      // X3D Specification
+      AA: new Spheroid3 (6377563.396, 299.3249646,   true), // Airy 1830
+      AM: new Spheroid3 (6377340.189, 299.3249646,   true), // Modified Airy
+      AN: new Spheroid3 (6378160,     298.25,        true), // Australian National
+      BN: new Spheroid3 (6377483.865, 299.1528128,   true), // Bessel 1841 (Namibia)
+      BR: new Spheroid3 (6377397.155, 299.1528128,   true), // Bessel 1841 (Ethiopia Indonesia...)
+      CC: new Spheroid3 (6378206.4,   294.9786982,   true), // Clarke 1866
+      CD: new Spheroid3 (6378249.145, 293.465,       true), // Clarke 1880
+      EA: new Spheroid3 (6377276.345, 300.8017,      true), // Everest (India 1830)
+      EB: new Spheroid3 (6377298.556, 300.8017,      true), // Everest (Sabah & Sarawak)
+      EC: new Spheroid3 (6377301.243, 300.8017,      true), // Everest (India 1956)
+      ED: new Spheroid3 (6377295.664, 300.8017,      true), // Everest (W. Malaysia 1969)
+      EE: new Spheroid3 (6377304.063, 300.8017,      true), // Everest (W. Malaysia & Singapore 1948)
+      EF: new Spheroid3 (6377309.613, 300.8017,      true), // Everest (Pakistan)
+      FA: new Spheroid3 (6378155,     298.3,         true), // Modified Fischer 1960
+      HE: new Spheroid3 (6378200,     298.3,         true), // Helmert 1906
+      HO: new Spheroid3 (6378270,     297,           true), // Hough 1960
+      ID: new Spheroid3 (6378160,     298.247,       true), // Indonesian 1974
+      IN: new Spheroid3 (6378388,     297,           true), // International 1924
+      KA: new Spheroid3 (6378245,     298.3,         true), // Krassovsky 1940
+      RF: new Spheroid3 (6378137,     298.257222101, true), // Geodetic Reference System 1980 (GRS 80)
+      SA: new Spheroid3 (6378160,     298.25,        true), // South American 1969
+      WD: new Spheroid3 (6378135,     298.26,        true), // WGS 72
+      WE: new Spheroid3 (6378137,     298.257223563, true), // WGS 84
+      // Solar System
+      // http://en.wikipedia.de
+      // Can someone give me more accurate parameters.
+      SUN:     new Spheroid3 (696342000, 1 / 9e-6, true),
+      MERCURY: new Spheroid3 (2439700,  2439700),
+      VENUS:   new Spheroid3 (6051800,  6051800),
+      MOON:    new Spheroid3 (1738140,  1735970),
+      MARS:    new Spheroid3 (3395428,  3377678), // http://adsabs.harvard.edu/abs/2010EM%26P..106....1A
+      JUPITER: new Spheroid3 (71492000, 66854000),
+      SATURN:  new Spheroid3 (60268000, 54364000),
+      URANUS:  new Spheroid3 (2555000,  24973000),
+      NEPTUNE: new Spheroid3 (24764000, 24341000),
+      PLUTO:   new Spheroid3 (1153000,  1153000),
+   };
 
-	return ReferenceEllipsoids;
+   return ReferenceEllipsoids;
 });