sweph 2.10.2-4 → 2.10.3-2

package/README.md

@@ -1,7 +1,7 @@
 # Sweph
 
 The definitive Swiss Ephemeris bindings for Node.js  
-Everything you need to create Astrology and Astronomy applications with javascript and node
+Everything you need to create Astrology and Astronomy applications with JavaScript and node
 
 * 100% API coverage
 * Built-in Typescript declarations and ESM exports
@@ -9,9 +9,9 @@ Everything you need to create Astrology and Astronomy applications with javascri
 * Version matched
 * Made with the N-API
 
-[Official programmers documentation for the Swiss Ephemeris by Astrodienst AG](https://www.astro.com/swisseph/swephprg.htm)  
+[Official programmer's documentation for the Swiss Ephemeris by Astrodienst AG](https://www.astro.com/swisseph/swephprg.htm)  
 [Official guide for the Swiss Ephemeris by Astrodienst AG](https://www.astro.com/ftp/swisseph/doc/swisseph.htm)  
-[Sweph on Github](https://github.com/timotejroiko/sweph)  
+[Sweph on GitHub](https://github.com/timotejroiko/sweph)  
 [Sweph on NPM](https://npmjs.com/package/sweph)
 
 ## Installation and Licensing
@@ -36,7 +36,7 @@ If you own a professional license for the Swiss Ephemeris, you may use any versi
 
 This library is version locked to the Swiss Ephemeris in addition to its own revisions. For example, version `2.10.1-1` corresponds to the Swiss Ephemeris version `2.10.1` and this library's revision `1`.
 
-Updates to this library will be released under new revisions, while updates to Swiss Ephemeris will be released under matching semver versions.
+Updates to this library will be released under new revisions, while updates to Swiss Ephemeris will be released under matching SemVer versions.
 
 ## Documentation
 
@@ -61,20 +61,21 @@ For advanced usage, the following files can also be found:
 
 * astxxx folders - files for individual asteroids (600 years)
 * longfiles folder - files for individual asteroids (6000 years)
-* jplfiles folder - files for nasa's jpl ephemerides
+* jplfiles folder - files for NASA's JPL ephemerides
 * sat folder - files for planetary moons
 
-More information can be found in the [Swiss Ephemeris files documentation](https://www.astro.com/ftp/swisseph/doc/swisseph.htm#_Toc58931065).
+More information can be found in the [Swiss Ephemeris files documentation](https://www.astro.com/ftp/swisseph/doc/swisseph.htm).
 
 ## Contributing
 
-If you find any innacuracy or bug in this library, or if you find an update that is not yet included in this library, feel free to open an issue or a pull request.
+If you find any inaccuracy or bug in this library, or if you find an upstream update that is not yet included in this library, feel free to open an issue or a pull request.
 
-## Known Issues and Caveats
+## Limitations
 
-* Due to how the underlying C library operates, you may find that the `error` field returned by some functions will contain random data even if there is no actual error. This can happen when existing memory buffers are recycled therefore the user must always check the returned flag values as per the Swiss Ephemeris documentation.
-* While worker_threads are supported, the underlying C library is single threaded and its settings are global. Functions such as `set_ephe_path()` will affect the entire process, including worker_threads. While you can still use worker_threads as long as you dont change settings from other threads in the middle of calculations, true thread-safe multithreading can be achieved using child_process instead.
+* While worker_threads are supported, the underlying C library is single threaded and contains process-wide settings. Functions such as `set_ephe_path()` or `set_sid_mode()` will affect the entire process, including all worker_threads. While you can still use worker_threads as long as you don't change settings from other threads in the middle of calculations, true thread-safe multithreading can only be achieved using child_process.
+
+* This library is a C/C++ add-on designed for Node.JS only, it will not work in browsers, other JS engines or in any other environment that does not support native C/C++ add-ons. In order to install this library, the target system must have the necessary build tools installed, such as `python`, `make` and `gcc` on Linux, `xcode` on Mac, `visual c++` on Windows, and/or other equivalent solutions.
 
 ## Author
 
-Copyright © 2021, Timotej Valentin Rojko
+Copyright © 2021-2022, Timotej Valentin Rojko

package/deps/swisseph/swecl.c

@@ -3072,7 +3072,7 @@ double CALL_CONV swe_refrac_extended(double inalt, double geoalt, double atpress
       y = N;
     }
     refr = D;
-    if( (inalt + refr < dip) ) {
+    if (inalt + refr < dip) {
       if (dret != NULL) {
 	dret[0]=inalt;
 	dret[1]=inalt;
@@ -3161,10 +3161,10 @@ static double calc_dip(double geoalt, double atpress, double attemp, double laps
 {
   /* below formula is based on A. Thom, Megalithic lunar observations, 1973 (page 32).
   * conversion to metric has been done by
-  * V. Reijs, 2000, http://www.iol.ie/~geniet/eng/refract.htm
+  * V. Reijs, 2000, http://www.archaeocosmology.org/eng/refract.htm#Sea
   */
   double krefr = (0.0342 + lapse_rate) / (0.154 * 0.0238);
-  double d = 1-1.8480*krefr*atpress/(273.16+attemp)/(273.16+attemp);
+  double d = 1-1.8480*krefr*atpress/(273.15+attemp)/(273.15+attemp);
   /* return -0.03203*sqrt(geoalt)*sqrt(d); */
   /* double a = acos(1/(1+geoalt/EARTH_RADIUS));*/
   return -180.0/PI * acos(1 / (1 + geoalt / EARTH_RADIUS)) * sqrt(d);
@@ -3484,7 +3484,7 @@ next_try:
    * the function lun_eclipse_how().
    */
   dtstart = 0.1;
-  if (tjd < 2000000 || tjd > 2500000)
+  if (tjd < 2100000 || tjd > 2500000)	// was tjd < 2000000 until 26-aug-22
     dtstart = 5;
   dtdiv = 4;
   for (j = 0, dt = dtstart;
@@ -3748,8 +3748,8 @@ next_lun_ecl:
  */
 #define EULER 2.718281828459
 #define NMAG_ELEM  (SE_VESTA + 1)
-#define MAG_HILTON_2005   0
 #define MAG_MALLAMA_2018  1
+#define MAG_MOON_VREIJS   1
 /* Magnitudes according to:
  * - "Explanatory Supplement to the Astronomical Almanac" 1986.
  * Magnitudes for Mercury and Venus:
@@ -3897,42 +3897,27 @@ int32 CALL_CONV swe_pheno(double tjd, int32 ipl, int32 iflag, double *attr, char
       fac *= fac;
       attr[4] = mag_elem[ipl][0] - 2.5 * log10(fac);
     } else if (ipl == SE_MOON) {
+#if MAG_MOON_VREIJS
+     // double a=fabs(attr[0]);
+     double a = attr[0];
+     if (a<=147.1385465) {
+       /* formula according to Allen, C.W., 1976, Astrophysical Quantities */
+       attr[4] = -21.62 + 0.026 * fabs(a) + 0.000000004 * pow(a, 4);
+       attr[4]+=5 * log10(lbr[2] * lbr2[2] * AUNIT / EARTH_RADIUS);
+     } else {
+       /* using the cube phase angle proposed by Samaha (Samaha, A.E.; Asaad,
+	A. S. and Mikhail, J. S. (1969).
+	Visibility of the New Moon, Bulletin of Observatory Helwan, 84), and VR
+	adjusted the stitch phase (align Allen's and Samaha's magnitude) 
+	of 147.14degrees.
+       */
+       attr[4] = -4.5444 - (2.5 * log10(pow(180 - a, 3)));
+       attr[4]+=5 * log10(lbr[2] * lbr2[2] * AUNIT / EARTH_RADIUS);
+     } 
+#else
       /* formula according to Allen, C.W., 1976, Astrophysical Quantities */
-      /*attr[4] = -21.62 + 5 * log10(384410497.8 / EARTH_RADIUS) / log10(10) + 0.026 * fabs(attr[0]) + 0.000000004 * pow(attr[0], 4);*/
-      //attr[4] = -21.62 + 5 * log10(lbr[2] * AUNIT / EARTH_RADIUS) / log10(10) + 0.026 * fabs(attr[0]) + 0.000000004 * pow(attr[0], 4);
-      attr[4] = -21.62 + 5 * log10(lbr[2] * AUNIT / EARTH_RADIUS) + 0.026 * fabs(attr[0]) + 0.000000004 * pow(attr[0], 4);
-#if 0
-      /* ratio apparent diameter : average diameter */
-      fac = attr[3] / (asin(pla_diam[SE_MOON] / 2.0 / 384400000.0) * 2 * RADTODEG);
-      /* distance sun - moon */
-      for (i = 0; i < 3; i++)
-        xxs[i] -= xx[i];
-      dsm = sqrt(square_sum(xxs));
-      /* account for phase and distance of moon: */
-      fac *= fac * attr[1];
-      /* account for distance of sun from moon: */
-      fac *= dsm * dsm;
-      attr[4] = mag_elem[ipl][0] - 2.5 * log10(fac);
-#endif
-      /*printf("1 = %f, 2 = %f\n", mag, mag2);*/
-#if MAG_HILTON_2005
-    } else if (ipl == SE_MERCURY) {
-      /* valid range is actually 2.1° < i < 169.5° */
-      double i100 = attr[0] / 100.0;
-      attr[4] = -0.60 + 4.98 * i100 - 4.88 * i100 * i100 + 3.02 * i100 * i100 * i100;
-      attr[4] += 5 * log10(lbr2[2] * lbr[2]);
-      if (attr[0] < 2.1 || attr[0] > 169.5) 
-        sprintf(serr2, "magnitude value for Mercury at phase angle i=%.1f is bad; formula is valid only for 2.1 < i < 169.5", attr[0]);
-    } else if (ipl == SE_VENUS) {
-      double i100 = attr[0] / 100.0;
-      if (attr[0] < 163.6) /* actual valid range is 2.2° < i < 163.6° */
-	attr[4] = -4.47 + 1.03 * i100 + 0.57 * i100 * i100 + 0.13 * i100 * i100 * i100;
-      else /* actual valid range is 163.6° < i < 170.2° */
-	attr[4] = 0.98 - 1.02 * i100;
-      attr[4] += 5 * log10(lbr2[2] * lbr[2]);
-      if (attr[0] < 2.2 || attr[0] > 170.2)
-        sprintf(serr2, "magnitude value for Venus at phase angle i=%.1f is bad; formula is valid only for 2.2 < i < 170.2", attr[0]);
-#endif
+      attr[4] = -21.62 + 5 * log10(lbr[2] * lbr2[2] * AUNIT / EARTH_RADIUS) + 0.026 * fabs(attr[0]) + 0.000000004 * pow(attr[0], 4);
+#endif      
 #if MAG_MALLAMA_2018
     // see: A. Mallama, J.Hilton,
     // "ComputingApparentPlanetaryMagnitudesforTheAstronomicalAlmanac" (2018)
@@ -4426,6 +4411,11 @@ int ncalc = 0;
       sprintf(serr, "location for swe_rise_trans() must be between %.0f and %.0f m above sea", SEI_ECL_GEOALT_MIN, SEI_ECL_GEOALT_MAX);
     return ERR;
   }
+  // if horhgt == -100, set horhgt = dip of horizon, i.e. refracted height
+  // of ocean if visible at horizon.
+  if (horhgt == -100) {
+    horhgt = 0.0001 + calc_dip(geopos[2], atpress, attemp, const_lapse_rate);
+  }
   /*swi_set_tid_acc(tjd_ut, epheflag, 0, serr);*/
   /* function calls for Pluto with asteroid number 134340
    * are treated as calls for Pluto as main body SE_PLUTO */
@@ -4669,9 +4659,9 @@ nazalt++;
 	aha = ah[1];
       } else {
 	swe_azalt_rev(t, SE_HOR2EQU, geopos, ah, xc);
-nazalt++;
+	nazalt++;
 	swe_azalt(t, SE_EQU2HOR, geopos, atpress, attemp, xc, ah);
-nazalt++;
+	nazalt++;
 	ah[1] -= horhgt;
 	ah[2] -= horhgt;
 	aha = ah[2];

package/deps/swisseph/swehouse.c

@@ -653,6 +653,10 @@ int CALL_CONV swe_houses_armc_ex2(
       h.sundec = ascmc[9];
       saved_sundec = h.sundec;
     }
+    if (h.sundec < -24 || h.sundec > 24) {
+      sprintf(serr, "House system I (Sunshine) needs valid Sun declination in ascmc[9]");
+      return ERR;
+    }
   }
   retc = CalcH(armc, geolat, eps, (char)hsys, &h);
   cusp[0] = 0;
@@ -820,7 +824,7 @@ static double apc_sector(int n, double ph, double e, double az)
    return dret;
 }
 
-char *CALL_CONV swe_house_name(int hsys)
+const char *CALL_CONV swe_house_name(int hsys)
 {
   int h = hsys;
   if (h != 'i') h = toupper(h);