astropanel 2.5 → 2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba68a8b88ebc1705f759ebf2b93bb0bfc8f13a0fc3ee75b8223e0c0f46f7e0d5
-  data.tar.gz: 7cd712f5bbc7951d13c6b6f1394984950bc732970ce593b21a2d78d1d94f4ad4
+  metadata.gz: 939fa439565527c2c8b9f0ce4e1e13ab008bd3c23f153efd9e2e01d65a50fe45
+  data.tar.gz: 368bbb21a445bfff885cbf6a9b1f526fe11531cdb9be1ad0ad02760ca5818416
 SHA512:
-  metadata.gz: 072c8766c42c619a0999c8aa715bfc35e696f3798c1db3f0124c76b8f3531059369c0826dde7b42745ba7c7dbf925c9edfddc543ad68f1e2301bc6146955b784
-  data.tar.gz: 70cb74c006fc864713f93f67615339fef2cc90f8e4776b355797c79ea80bd0fd66feb02d4357b1f643025fa31cfde99df468337590cf900d287a383fcc62b069
+  metadata.gz: f393f7af8500905358502ef1a78b1e9c3808e883f8febc21bec01f84221b101fd00a305a5e7c6d522baf1fcf1343e9f9c42765fc542e2b673d925739880fa272
+  data.tar.gz: dd1447a1e2c3cc56f4e4d30e5284d0ceef71bc45e2dae203017b054789e4c3bbcb6ef826a682751bb39198a543c26203b03088571765ede52211e1fc1b5c5148

data/bin/astropanel

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-# Version:    2.5: Bug fix
+# Version:    2.6: Bug fix
 
 # LOAD MODULES {{{1
 require 'io/console'
@@ -760,10 +760,7 @@ class AstroPanelApp
     @footer.say(cmds.ljust(cols))
   end
 
-  # Redraw the left‐pane list of weather + visibility blocks,
-  # Redraw the left‐pane list of weather + visibility blocks,
-  # safely handling missing planet data and converting rise/set to integers
-  def update_left
+  def update_left # {{{2
     date_o = ''
     date_n = ''
 
@@ -930,8 +927,8 @@ class AstroPanelApp
     update_main
   end
 
-  # Fetch weather from met.no, but never let network errors crash the app
-  def get_weather
+  def get_weather # {{{2
+    # Fetch weather from met.no, but never let network errors crash the app
     uri = URI("https://api.met.no/weatherapi/locationforecast/2.0/complete?lat=#{@lat}&lon=#{@lon}")
     req = Net::HTTP::Get.new(uri)
     req['User-Agent'] = 'astropanel/1.0 g@isene.com'
@@ -1014,25 +1011,34 @@ class AstroPanelApp
   end
 
   def get_planets # {{{2
+    # Build @planets entries for each unique date in @weather
     @planets.clear
-    12.times do |i|
-      date = (Date.today + i).strftime('%F')
-      ep   = Ephemeris.new(date,@lat,@lon,@tz.to_i)
+
+    # Collect exactly the dates we need (in first-seen order)
+    dates = @weather.map { |w| w[:date] }.uniq
+
+    dates.each do |date|
+      # Compute a fresh Ephemeris for that date
+      ep = Ephemeris.new(date, @lat, @lon, @tz.to_i)
+
+      # Start with the printed table + moon phase info
       entry = {
         table:  ep.print,
-        mphase: ep.mphase,   # e.g. 67.4
-        mph_s:  ep.mph_s     # e.g. "Waxing gibbous"
+        mphase: ep.mphase,
+        mph_s:  ep.mph_s
       }
-      Ephemeris::BODY_ORDER.each do |b|
-        arr = ep.send(b)
-        entry[:"#{b}_rise"] = arr[5]
-        entry[:"#{b}_set"]  = arr[7]
+
+      # Add rise/set times for each body
+      Ephemeris::BODY_ORDER.each do |body|
+        arr = ep.send(body)
+        entry[:"#{body}_rise"] = arr[5]
+        entry[:"#{body}_set"]  = arr[7]
       end
+
       @planets[date] = entry
     end
   end
 
-
   def get_events # {{{2
     @events.clear
     uri = URI(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astropanel
 version: !ruby/object:Gem::Version
-  version: '2.5'
+  version: '2.6'
 platform: ruby
 authors:
 - Geir Isene
@@ -28,7 +28,7 @@ description: 'This program shows essential data in order to plan your observatio
   9 days weather forecast, full ephemeris for the Sun, the Moon and all major planets,
   complete with graphic representation of rise/set times, detailed info for each day
   with important astronomical events, star chart displayed in the terminal and more.
-  New in 2.0: Full rewrite using rcurses (https://github.com/isene/rcurses). 2.5:
+  New in 2.0: Full rewrite using rcurses (https://github.com/isene/rcurses). 2.6:
   Bug fix.'
 email: g@isene.com
 executables: