ascii-side-of-the-moon 1.0.8 → 1.0.10

package/README.md

@@ -71,7 +71,23 @@ Inside of repository for `ascii-side-of-the-moon`.
 
 Render a single date:
 ```sh
+# Show moon for current date
+pnpm run render:demo
+
+# Show moon for a specific date
 pnpm run render:demo 2025-01-01
+
+# Include a specific UTC time
+pnpm run render:demo 2025-01-01 21:30
+
+# Include observer location (enables parallactic rotation and horizon display)
+pnpm run render:demo 2025-01-01 21:30 --lat 40.7128 --lon -74.0060
+
+# With elevation (meters)
+pnpm run render:demo 2025-01-01 21:30 --lat 37.7749 --lon -122.4194 --elevation 25
+
+# Just observer location (uses current date/time)
+pnpm run render:demo --lat 40.7128 --lon -74.0060
 ```
 
 Render an animation:

package/dist/cli.cjs

@@ -46,6 +46,22 @@ function addDays(d, days) {
 function normalizeDegrees(angle) {
   return (angle % 360 + 360) % 360;
 }
+function calculateBrightLimbAngle(date) {
+  const sunVec = Astronomy.GeoVector(Astronomy.Body.Sun, date, true);
+  const moonVec = Astronomy.GeoVector(Astronomy.Body.Moon, date, true);
+  const sunEq = Astronomy.EquatorFromVector(sunVec);
+  const moonEq = Astronomy.EquatorFromVector(moonVec);
+  const dRA_hours = sunEq.ra - moonEq.ra;
+  const dRA_rad = dRA_hours * 15 * Astronomy.DEG2RAD;
+  const moonDecRad = moonEq.dec * Astronomy.DEG2RAD;
+  const sunDecRad = sunEq.dec * Astronomy.DEG2RAD;
+  const sinDRA = Math.sin(dRA_rad);
+  const cosDRA = Math.cos(dRA_rad);
+  const numerator = sinDRA;
+  const denominator = Math.cos(moonDecRad) * Math.tan(sunDecRad) - Math.sin(moonDecRad) * cosDRA;
+  const positionAngle = Math.atan2(numerator, denominator) * Astronomy.RAD2DEG;
+  return normalizeDegrees(positionAngle);
+}
 function normalizeHourAngle(hours) {
   let h = (hours % 24 + 24) % 24;
   if (h > 12) h -= 24;
@@ -85,7 +101,8 @@ function getMoonState(date, observerLocation) {
     phase: {
       phaseAngleDeg: illum.phase_angle,
       illuminatedFraction: illum.phase_fraction,
-      isWaxing: isWaxingAt(date)
+      isWaxing: isWaxingAt(date),
+      brightLimbAngle: calculateBrightLimbAngle(date)
     },
     size: {
       distanceKm: lib.dist_km,
@@ -444,7 +461,7 @@ var ascii_default = {
 // src/render/renderer.ts
 var FRAME_W = 60;
 var FRAME_H = 29;
-var BASE_ANGLE_OFFSET = 90;
+var TEXTURE_ORIENTATION_OFFSET = -45;
 function asciiMoonDim(asciiArt) {
   const lines = asciiArt.split("\n");
   let minX = Infinity;
@@ -484,15 +501,22 @@ function clamp(v, lo, hi) {
 function rad(d) {
   return d * Math.PI / 180;
 }
-function phaseSunVector(phaseAngleDeg, isWaxing, elatDeg = 0) {
+function phaseSunVector(phaseAngleDeg, brightLimbAngleDeg, isWaxing, elatDeg = 0) {
   const a = rad(phaseAngleDeg);
   const elat = rad(elatDeg);
-  const sign = isWaxing ? 1 : -1;
-  const sx = sign * Math.sin(a);
-  let sy = 0;
+  let sunAngle;
+  if (brightLimbAngleDeg !== void 0) {
+    sunAngle = rad(brightLimbAngleDeg);
+  } else {
+    sunAngle = isWaxing ? rad(270) : rad(90);
+  }
+  const sunDirX = -Math.sin(sunAngle);
+  const sunDirY = -Math.cos(sunAngle);
+  const sx = sunDirX * Math.sin(a);
+  let sy = sunDirY * Math.sin(a);
   let sz = Math.cos(a);
-  const sy1 = -sz * Math.sin(elat);
-  const sz1 = sz * Math.cos(elat);
+  const sy1 = sy * Math.cos(elat) - sz * Math.sin(elat);
+  const sz1 = sy * Math.sin(elat) + sz * Math.cos(elat);
   sy = sy1;
   sz = sz1;
   const mag = Math.sqrt(sx * sx + sy * sy + sz * sz);
@@ -574,10 +598,20 @@ function renderMoon(state, _options = {}) {
   const options = _options ?? {};
   const showHorizon = options.showHorizon !== false;
   const nearestMoon = findNearestMoonState(state);
-  const asciiLines = nearestMoon.ascii.split("\n");
   const dim = asciiMoonDim(nearestMoon.ascii);
+  let textureAscii = nearestMoon.ascii;
+  if (Math.abs(TEXTURE_ORIENTATION_OFFSET) > 0.1) {
+    textureAscii = rotateCharacters(
+      textureAscii,
+      TEXTURE_ORIENTATION_OFFSET,
+      dim.centerX,
+      dim.centerY
+    );
+  }
+  const asciiLines = textureAscii.split("\n");
   const { sx, sy, sz } = phaseSunVector(
     state.phase.phaseAngleDeg,
+    state.phase.brightLimbAngle,
     state.phase.isWaxing,
     state.libration.elat
   );
@@ -643,18 +677,19 @@ function renderMoon(state, _options = {}) {
     }
     out.push(row);
   }
-  const composed = out.join("\n");
-  let finalArt = composed;
+  let composed = out.join("\n");
   if (state.position?.parallacticAngle !== void 0) {
-    const rotationCenter = dim;
-    finalArt = rotateCharacters(
-      composed,
-      state.position.parallacticAngle + BASE_ANGLE_OFFSET,
-      rotationCenter.centerX,
-      rotationCenter.centerY
-    );
+    const rotation = -state.position.parallacticAngle;
+    if (Math.abs(rotation) > 0.1) {
+      composed = rotateCharacters(
+        composed,
+        rotation,
+        dim.centerX,
+        dim.centerY
+      );
+    }
   }
-  return showHorizon ? overlayHorizon(finalArt, state, dim) : finalArt;
+  return showHorizon ? overlayHorizon(composed, state, dim) : composed;
 }
 function overlayHorizon(art, state, moonDim) {
   const pos = state.position;

package/dist/index.cjs

@@ -1,4 +1,4 @@
-'use strict';var T=require('astronomy-engine');function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var T__namespace=/*#__PURE__*/_interopNamespace(T);var W=T__namespace.default??T__namespace;function P($,g){let n=new Date($.getTime());return n.setDate(n.getDate()+g),n}function p($){return ($%360+360)%360}function X($){let g=($%24+24)%24;return g>12&&(g-=24),g}function N($){let g=W.Illumination(W.Body.Moon,$).phase_fraction;return W.Illumination(W.Body.Moon,P($,1)).phase_fraction>g}function D($,g,n){let _=W.SiderealTime($),t=g.longitude/15,B=X(t+_-n.ra)*15*W.DEG2RAD,a=g.latitude*W.DEG2RAD,R=n.dec*W.DEG2RAD,M=Math.sin(B),o=Math.tan(a)*Math.cos(R)-Math.sin(R)*Math.cos(B);return Math.atan2(M,o)*W.RAD2DEG}function Y($,g){let n=new W.Observer(g.latitude,g.longitude,g.elevationMeters??0),_=W.Equator(W.Body.Moon,$,n,true,true),t=W.Horizon($,n,_.ra,_.dec,"normal");return {azimuth:p(t.azimuth),altitude:t.altitude,parallacticAngle:D($,g,_)}}function H($,g){let n=W.Illumination(W.Body.Moon,$),_=W.Libration($);return {date:$,phase:{phaseAngleDeg:n.phase_angle,illuminatedFraction:n.phase_fraction,isWaxing:N($)},size:{distanceKm:_.dist_km,angularDiameterDeg:_.diam_deg},libration:{elon:_.elon,elat:_.elat},position:g?Y($,g):void 0}}function v($){let{phaseAngleDeg:g,illuminatedFraction:n}=$.phase,_=$.phase.isWaxing??g>90,t=(g%360+360)%360,i=t>180?360-t:t,B=10,a=10,R=8,M=.98,o=.02,r=.02;return i<=B||n>=M?"Full Moon":i>=180-a||n<=o?"New Moon":Math.abs(i-90)<=R||Math.abs(n-.5)<=r?_?"First Quarter":"Last Quarter":i<90?_?"Waxing Gibbous":"Waning Gibbous":_?"Waxing Crescent":"Waning Crescent"}var K={moons:[{index:0,distance_km:405493.5,libration_elat:-0.888,libration_elon:-0.412,ascii:`                                                            
+'use strict';var h=require('astronomy-engine');function _interopNamespace(e){if(e&&e.__esModule)return e;var n=Object.create(null);if(e){Object.keys(e).forEach(function(k){if(k!=='default'){var d=Object.getOwnPropertyDescriptor(e,k);Object.defineProperty(n,k,d.get?d:{enumerable:true,get:function(){return e[k]}});}})}n.default=e;return Object.freeze(n)}var h__namespace=/*#__PURE__*/_interopNamespace(h);var s=h__namespace.default??h__namespace;function X($,g){let n=new Date($.getTime());return n.setDate(n.getDate()+g),n}function k($){return ($%360+360)%360}function N($){let g=s.GeoVector(s.Body.Sun,$,true),n=s.GeoVector(s.Body.Moon,$,true),B=s.EquatorFromVector(g),t=s.EquatorFromVector(n),R=(B.ra-t.ra)*15*s.DEG2RAD,r=t.dec*s.DEG2RAD,a=B.dec*s.DEG2RAD,o=Math.sin(R),i=Math.cos(R),e=o,l=Math.cos(r)*Math.tan(a)-Math.sin(r)*i,A=Math.atan2(e,l)*s.RAD2DEG;return k(A)}function Y($){let g=($%24+24)%24;return g>12&&(g-=24),g}function G($){let g=s.Illumination(s.Body.Moon,$).phase_fraction;return s.Illumination(s.Body.Moon,X($,1)).phase_fraction>g}function H($,g,n){let B=s.SiderealTime($),t=g.longitude/15,R=Y(t+B-n.ra)*15*s.DEG2RAD,r=g.latitude*s.DEG2RAD,a=n.dec*s.DEG2RAD,o=Math.sin(R),i=Math.tan(r)*Math.cos(a)-Math.sin(a)*Math.cos(R);return Math.atan2(o,i)*s.RAD2DEG}function v($,g){let n=new s.Observer(g.latitude,g.longitude,g.elevationMeters??0),B=s.Equator(s.Body.Moon,$,n,true,true),t=s.Horizon($,n,B.ra,B.dec,"normal");return {azimuth:k(t.azimuth),altitude:t.altitude,parallacticAngle:H($,g,B)}}function J($,g){let n=s.Illumination(s.Body.Moon,$),B=s.Libration($);return {date:$,phase:{phaseAngleDeg:n.phase_angle,illuminatedFraction:n.phase_fraction,isWaxing:G($),brightLimbAngle:N($)},size:{distanceKm:B.dist_km,angularDiameterDeg:B.diam_deg},libration:{elon:B.elon,elat:B.elat},position:g?v($,g):void 0}}function V($){let{phaseAngleDeg:g,illuminatedFraction:n}=$.phase,B=$.phase.isWaxing??g>90,t=(g%360+360)%360,_=t>180?360-t:t,R=10,r=10,a=8,o=.98,i=.02,e=.02;return _<=R||n>=o?"Full Moon":_>=180-r||n<=i?"New Moon":Math.abs(_-90)<=a||Math.abs(n-.5)<=e?B?"First Quarter":"Last Quarter":_<90?B?"Waxing Gibbous":"Waning Gibbous":B?"Waxing Crescent":"Waning Crescent"}var T={moons:[{index:0,distance_km:405493.5,libration_elat:-0.888,libration_elon:-0.412,ascii:`                                                            
                                                             
                         ._     . -   .                      
                        ,_++> a, +.    \`-.                   
@@ -894,12 +894,12 @@
                       'FFF'"Z"@MGR^^'\`                      
                                                             
                                                             
-`}]};var E=60,w=29,J=90;function V($){let g=$.split(`
-`),n=1/0,_=-1/0,t=1/0,i=-1/0;if(g.forEach((R,M)=>{let o=R.search(/\S/);if(o!==-1){let r=R.search(/\s+$/);n=Math.min(n,o),_=Math.max(_,r===-1?R.length-1:r-1),t===1/0&&(t=M),i=M;}}),n===1/0)return {width:E,height:w,centerX:Math.floor(E/2),centerY:Math.floor(w/2)};let B=_-n+1,a=i-t+1;return {width:B,height:a,centerX:n+Math.floor(B/2),centerY:t+Math.floor(a/2)}}function j($,g,n){return Math.min(n,Math.max(g,$))}function z($){return $*Math.PI/180}function Q($,g,n=0){let _=z($),t=z(n),B=(g?1:-1)*Math.sin(_),a=0,R=Math.cos(_),M=-R*Math.sin(t),o=R*Math.cos(t);a=M,R=o;let r=Math.sqrt(B*B+a*a+R*R);return {sx:B/r,sy:a/r,sz:R/r}}function I($,g,n,_,t){let i=1/E,B=1/w,a=[-0.5,-0.25,0,.25,.5],R=0,M=0;for(let o of a)for(let r of a){let A=$+o*i,u=g+r*B,c=A*A+u*u;if(c>1)continue;let d=Math.sqrt(Math.max(0,1-c)),b=A*n+u*_+d*t;R+=Math.max(0,b),M++;}return M===0?0:R/M}function S($){let _=0,t=1/0;for(let i=0;i<K.moons.length;i++){let B=K.moons[i],a=Math.abs(B.distance_km-$.size.distanceKm)*1,R=Math.abs(B.libration_elat-$.libration.elat)*1e4,M=Math.abs(B.libration_elon-$.libration.elon)*1e4,o=a+R+M;o<t&&(t=o,_=i);}return K.moons[_]}var k=22/10;function C($,g,n,_){let t=(g%360+360)%360;if(Math.abs(t)<.1)return $;let i=$.split(`
-`),B=i.length,a=i[0]?.length??0,R=n??(a-1)/2,M=_??(B-1)/2,o=t*Math.PI/180,r=Math.cos(o),A=Math.sin(o),u=Array.from({length:B},()=>Array(a).fill(" "));for(let c=0;c<B;c++)for(let d=0;d<a;d++){let b=d-R,f=(c-M)*k,x=b*r-f*A,e=b*A+f*r,s=Math.round(x+R),m=Math.round(e/k+M);if(s>=0&&s<a&&m>=0&&m<B){let y=i[m]?.[s]??" ";u[c][d]=y;}}return u.map(c=>c.join("")).join(`
-`)}function q($,g={}){let _=(g??{}).showHorizon!==false,t=S($),i=t.ascii.split(`
-`),B=V(t.ascii),{sx:a,sy:R,sz:M}=Q($.phase.phaseAngleDeg,$.phase.isWaxing,$.libration.elat),o=Array.from({length:w},()=>Array(E).fill(0)),r=Array.from({length:w},()=>Array(E).fill(-1)),A=Array.from({length:w},()=>Array(E).fill(false)),u=0,c=0;for(let e=0;e<w;e++)for(let s=0;s<E;s++){let m=s-B.centerX,y=e-B.centerY,l=m/(B.width/2),F=y/(B.height/2),Z=l*l+F*F;if(Z>1){o[e][s]=0,r[e][s]=-1;continue}A[e][s]=true,u++;let h=I(l,F,a,R,M);o[e][s]=h,h>0&&c++;let L=Math.sqrt(Math.max(0,1-Z));r[e][s]=l*a+F*R+L*M;}let d=Array.from({length:w},()=>Array(E).fill(false));if(c>0)for(let e=0;e<w;e++)for(let s=0;s<E;s++)d[e][s]=o[e][s]>0;else {let e=j($.phase.illuminatedFraction??0,0,1),s=Math.max(1,Math.round(e*u)),m=[];for(let y=0;y<w;y++)for(let l=0;l<E;l++)A[y][l]&&m.push({ix:l,iy:y,v:r[y][l]});m.sort((y,l)=>l.v-y.v);for(let y=0;y<Math.min(s,m.length);y++){let{ix:l,iy:F}=m[y];d[F][l]=true;}}let b=[];for(let e=0;e<w;e++){let s="",m=i[e]??"";for(let y=0;y<E;y++)d[e][y]?s+=m[y]??" ":s+=" ";b.push(s);}let f=b.join(`
-`),x=f;if($.position?.parallacticAngle!==void 0){let e=B;x=C(f,$.position.parallacticAngle+J,e.centerX,e.centerY);}return _?U(x,$,B):x}function U($,g,n){let _=g.position;if(!_||g.size.angularDiameterDeg<=0)return $;let t=_.altitude??0,i=g.size.angularDiameterDeg/2,B=t+i;if(t-i>=0)return $;let R=$.split(`
-`),M=g.size.angularDiameterDeg/Math.max(1,n.height),o=n.centerY+t/M;o=Math.round(j(o,0,w-1));let r;return B<=0?r=`${Math.abs(t).toFixed(1).replace(/\.0$/,"")}-deg-below-horizon`:r="horizon",R[o]=O(r),R.join(`
-`)}function O($){let n=`--${$.trim().replace(/\s+/g,"-")}--`;if(n.length>E&&(n=n.slice(0,E)),n.length===E)return n;let _=E-n.length,t=Math.floor(_/2),i=_-t;return "-".repeat(t)+n+"-".repeat(i)}exports.getMoonPhase=v;exports.getMoonState=H;exports.renderMoon=q;//# sourceMappingURL=index.cjs.map
+`}]};var c=60,d=29,L=-45;function I($){let g=$.split(`
+`),n=1/0,B=-1/0,t=1/0,_=-1/0;if(g.forEach((a,o)=>{let i=a.search(/\S/);if(i!==-1){let e=a.search(/\s+$/);n=Math.min(n,i),B=Math.max(B,e===-1?a.length-1:e-1),t===1/0&&(t=o),_=o;}}),n===1/0)return {width:c,height:d,centerX:Math.floor(c/2),centerY:Math.floor(d/2)};let R=B-n+1,r=_-t+1;return {width:R,height:r,centerX:n+Math.floor(R/2),centerY:t+Math.floor(r/2)}}function P($,g,n){return Math.min(n,Math.max(g,$))}function K($){return $*Math.PI/180}function S($,g,n,B=0){let t=K($),_=K(B),R;g!==void 0?R=K(g):R=K(n?270:90);let r=-Math.sin(R),a=-Math.cos(R),o=r*Math.sin(t),i=a*Math.sin(t),e=Math.cos(t),l=i*Math.cos(_)-e*Math.sin(_),A=i*Math.sin(_)+e*Math.cos(_);i=l,e=A;let W=Math.sqrt(o*o+i*i+e*e);return {sx:o/W,sy:i/W,sz:e/W}}function q($,g,n,B,t){let _=1/c,R=1/d,r=[-0.5,-0.25,0,.25,.5],a=0,o=0;for(let i of r)for(let e of r){let l=$+i*_,A=g+e*R,W=l*l+A*A;if(W>1)continue;let w=Math.sqrt(Math.max(0,1-W)),b=l*n+A*B+w*t;a+=Math.max(0,b),o++;}return o===0?0:a/o}function C($){let B=0,t=1/0;for(let _=0;_<T.moons.length;_++){let R=T.moons[_],r=Math.abs(R.distance_km-$.size.distanceKm)*1,a=Math.abs(R.libration_elat-$.libration.elat)*1e4,o=Math.abs(R.libration_elon-$.libration.elon)*1e4,i=r+a+o;i<t&&(t=i,B=_);}return T.moons[B]}var j=22/10;function p($,g,n,B){let t=(g%360+360)%360;if(Math.abs(t)<.1)return $;let _=$.split(`
+`),R=_.length,r=_[0]?.length??0,a=n??(r-1)/2,o=B??(R-1)/2,i=t*Math.PI/180,e=Math.cos(i),l=Math.sin(i),A=Array.from({length:R},()=>Array(r).fill(" "));for(let W=0;W<R;W++)for(let w=0;w<r;w++){let b=w-a,x=(W-o)*j,f=b*e-x*l,M=b*l+x*e,y=Math.round(f+a),u=Math.round(M/j+o);if(y>=0&&y<r&&u>=0&&u<R){let E=_[u]?.[y]??" ";A[W][w]=E;}}return A.map(W=>W.join("")).join(`
+`)}function U($,g={}){let B=(g??{}).showHorizon!==false,t=C($),_=I(t.ascii),R=t.ascii;Math.abs(L)>.1&&(R=p(R,L,_.centerX,_.centerY));let r=R.split(`
+`),{sx:a,sy:o,sz:i}=S($.phase.phaseAngleDeg,$.phase.brightLimbAngle,$.phase.isWaxing,$.libration.elat),e=Array.from({length:d},()=>Array(c).fill(0)),l=Array.from({length:d},()=>Array(c).fill(-1)),A=Array.from({length:d},()=>Array(c).fill(false)),W=0,w=0;for(let M=0;M<d;M++)for(let y=0;y<c;y++){let u=y-_.centerX,E=M-_.centerY,m=u/(_.width/2),F=E/(_.height/2),Z=m*m+F*F;if(Z>1){e[M][y]=0,l[M][y]=-1;continue}A[M][y]=true,W++;let z=q(m,F,a,o,i);e[M][y]=z,z>0&&w++;let D=Math.sqrt(Math.max(0,1-Z));l[M][y]=m*a+F*o+D*i;}let b=Array.from({length:d},()=>Array(c).fill(false));if(w>0)for(let M=0;M<d;M++)for(let y=0;y<c;y++)b[M][y]=e[M][y]>0;else {let M=P($.phase.illuminatedFraction??0,0,1),y=Math.max(1,Math.round(M*W)),u=[];for(let E=0;E<d;E++)for(let m=0;m<c;m++)A[E][m]&&u.push({ix:m,iy:E,v:l[E][m]});u.sort((E,m)=>m.v-E.v);for(let E=0;E<Math.min(y,u.length);E++){let{ix:m,iy:F}=u[E];b[F][m]=true;}}let x=[];for(let M=0;M<d;M++){let y="",u=r[M]??"";for(let E=0;E<c;E++)b[M][E]?y+=u[E]??" ":y+=" ";x.push(y);}let f=x.join(`
+`);if($.position?.parallacticAngle!==void 0){let M=-$.position.parallacticAngle;Math.abs(M)>.1&&(f=p(f,M,_.centerX,_.centerY));}return B?O(f,$,_):f}function O($,g,n){let B=g.position;if(!B||g.size.angularDiameterDeg<=0)return $;let t=B.altitude??0,_=g.size.angularDiameterDeg/2,R=t+_;if(t-_>=0)return $;let a=$.split(`
+`),o=g.size.angularDiameterDeg/Math.max(1,n.height),i=n.centerY+t/o;i=Math.round(P(i,0,d-1));let e;return R<=0?e=`${Math.abs(t).toFixed(1).replace(/\.0$/,"")}-deg-below-horizon`:e="horizon",a[i]=$$(e),a.join(`
+`)}function $$($){let n=`--${$.trim().replace(/\s+/g,"-")}--`;if(n.length>c&&(n=n.slice(0,c)),n.length===c)return n;let B=c-n.length,t=Math.floor(B/2),_=B-t;return "-".repeat(t)+n+"-".repeat(_)}exports.getMoonPhase=V;exports.getMoonState=J;exports.renderMoon=U;//# sourceMappingURL=index.cjs.map
 //# sourceMappingURL=index.cjs.map