Planetarium client additionnal code.

clients/planetarium/Readme.txt

@@ -1,28 +1,40 @@
-Le projet planetarium laser style.
+Multi Laser planetarium in python3 for LJ.
+v0.01
+Sam Neurohack
 
-Il y a plusieurs idees liees entre elles. En etant tres conservateur disons 150 etoiles par laser, on peut avec 4 lasers affiché 600 etoiles :) zoomer dans une constellation, etc..
+User can define :
 
-On veut, sans connexion internet (donc stocker les infos en local), choisir/afficher les etoiles dans une direction du ciel avec pour origine un lieu sur terre (Paris ?) a telle date/heure. 
+- Observer position using GPS coordinates or built in cities catalog on earth.
+- Observer time. If you choose Now, the sky is updated live, so you can virtual sky photography :)
+- Each laser starchart has a center direction like Azimuth : 63.86° & Altitude: 61.83° and a Field of view like 90°. For the all sky with 4 lasers, give 90° FOV per laser.
+- What is displayed : Solar system objects, Stars, Compass letters.
+- 
 
-Les ressources trouvées pour l'instant qui machent le travail skyfield, jplephem (du meme auteur) 
+Some future features : 
-et le catalogue hipparcos : 
+
+- Constellations display
+- 3D with anaglyph
+- Time Speed setting
+- What do you want ?
+
+User must understand Right Ascension/Declinaison and Azimuth/Altitude coordinates system. Some needed astronomy concepts online :
 https://rhodesmill.org/skyfield/stars.html
 https://in-the-sky.org//staratlas.php?ra=15.358411414&dec=73.47660962&limitmag=2
 http://www.physics.csbsju.edu/astro/SF/SF.06.html
 
-En sortie on a besoin d'une liste de coordonnées, ca serait le luxe avec la couleur, la position 3D et la constellation le cas echeant. Pas besoin d'interface graphique on a deja.
 
-N'importe quelle contribution sera grandement utile : recherche, code,... Evidement toutes les personnes qui participent sont creditées dans les auteurs.
+This project is on "OK" precision grade and definately not coding skills show off, I'm learning python coding it. To check accuracy, one can compare to :
+https://www.calsky.com/cs.cgi?cha=7&sec=3&sub=2
 
-Les etoiles ont des positions dans plusieurs reperes, quel est le nom de celui qui nous importe : un endroit sur terre a une date qui peut changer cf skyfield ? Quelle base de données utiliser ? Si c'est bien hipparcos, comment avoir la liste des x etoiles les plus brillantes, comment avoir une liste des constellations classique ? comment les dessiner ? Ursa minor a plein d'etoiles, la liste exhaustive est tres interessante aussi, tout ce qui vous interessera,...
 
-La position 3D est interessante parce qu'on a deja l'algo pour faire de l'anaglyph, vert pour un oeil et rouge pour l'autre et les gens ont souvent une impression de proximité dans une constellation ce qui est tres faux et donc je me vois bien faire une rotation autour d'une constellation pour montrer les distances colossales en Z.
+The author barely understand astronomy so please report if you find newbie errors sam (at) neurohack cc
 
-Pour l'instant en python, j'affiche la position des planetes (des points) dans le systeme solaire grace a jplephem tel jour a telle heure.
+This project uses the awesome Skyfield by Brandon Rhodes and Astropy. 
 
-Il y a donc besoin de jplephem et d'une base pour cet exemple texte :
+Kernels for Sky objects positions references :
+Acton, C.H.; "Ancillary Data Services of NASA's Navigation and Ancillary Information Facility;" Planetary and Space Science, Vol. 44, No. 1, pp. 65-70, 1996.
 
-pip install jplephem
+Charles Acton, Nathaniel Bachman, Boris Semenov, Edward Wright; A look toward the future in the handling of space science mission geometry; Planetary and Space Science (2017);
-wget http://naif.jpl.nasa.gov/pub/naif/generic_kernels/spk/planets/de430.bsp
+DOI 10.1016/j.pss.2017.02.013
+https://doi.org/10.1016/j.pss.2017.02.013 
 
-Je peux evidement donner tout le projet avec simulateur de laser si besoin.

clients/planetarium/main.py

@@ -1,9 +1,15 @@
 # coding=UTF-8
 
 '''
-Multi Laser planetarium in python3
+Multi Laser planetarium in python3 for LJ.
+v0.01
+Sam Neurohack
+
+Accuracy tested against apparent data and starchart at https://www.calsky.com/cs.cgi?cha=7&sec=3&sub=2
+Remember to set the same observer position and time. 
+
+See Readme for more information
 
-Remember : LJ will automatically warp geometry according to alignement data. See webUI.  
 
 Todo:
 
@@ -11,14 +17,15 @@ Todo:
 - Findout how to use OSC in python 3.
 - Code WebUI page.
 - UpdateStars() in each laser sky. Get magnitude. See UpdateSolar for example.
-- Draw operations should also check visibility in the given laser altitude range.
+- All Draw operations should also check visibility in the given laser altitude range.
 - Rewrite CityPosition() with proper search in a python dictionnary.
 - Better python code. Better varuable to understand easily Update() methods. 
 
 LICENCE : CC
+Remember : LJ will automatically warp geometry according to alignement data. See webUI.  
 '''
 
-#import redis
+import redis
 import lj3
 import numpy as np
 import math,time
@@ -52,6 +59,7 @@ argsparser = argparse.ArgumentParser(description="Planetarium for LJ")
 argsparser.add_argument("-r","--redisIP",help="IP of the Redis server used by LJ (127.0.0.1 by default) ",type=str)
 argsparser.add_argument("-c","--client",help="LJ client number (0 by default)",type=int)
 argsparser.add_argument("-l","--laser",help="Laser number to be displayed (0 by default)",type=int)
+argsparser.add_argument("-d","--debug",help="Verbosity level (0 by default)",type=int)
 #argsparser.add_argument("-n","--name",help="City Name of the observer",type=str)
 #argsparser.add_argument("-r","--redisIP",help="Country code of the observer ",type=str)
 
@@ -68,6 +76,11 @@ if args.laser:
 else:
 	lasernumber = 0
 
+if args.debug:
+	debug = args.laser
+else:
+	debug = 0
+
 # Redis Computer IP
 if args.redisIP  != None:
 	redisIP  = args.redisIP
@@ -142,14 +155,14 @@ def Proj(x,y,z,angleX,angleY,angleZ):
 '''
  To minize number of sky objects coordinates conversion : Change planetarium FOV in Ra Dec to select objects 
  (planets, hipparcos,..). Then get those objects in AltAz coordinates.
- aa2radec compute Equatorial Right Ascension and Declinaison coordinates from given observator Altitude and Azimuth.
+ aa2radec use Astropy to compute Equatorial Right Ascension and Declinaison coordinates from given observator Altitude and Azimuth.
  Example ra,dec = aa2radec( azimuth =  0, altitude = 90, lati = 48.85341, longi = 2.3488, elevation = 100, t =AstroPyNow )
  with AstroPyNow = Time.now()
 '''
-def aa2radec(azimuth,altitude,lati,longi,elevation,t):
+def aa2radec(azimuth, altitude, t):
-    #print ("az",azimuth,"alt",altitude,"lati",lati,"long",longi,"elev",elevation,"time",t)
+
-    Observer = EarthLocation(lat=lati * u.deg, lon=longi *u.deg, height= elevation*u.m,)
+    #AstrObserver = EarthLocation(lat=lati * u.deg, lon=longi *u.deg, height= elevation*u.m,)
-    ObjectCoord = SkyCoord(alt = altitude * u.deg, az = azimuth *u.deg, obstime = t, frame = 'altaz', location = Observer)
+    ObjectCoord = SkyCoord(alt = altitude * u.deg, az = azimuth *u.deg, obstime = t, frame = 'altaz', location = AstrObserver)
     #print("icrs",ObjectCoord.icrs)
     #print("ICRS Right Ascension", ObjectCoord.icrs.ra)
     #print("ICRS Declination", ObjectCoord.icrs.dec)
@@ -157,12 +170,12 @@ def aa2radec(azimuth,altitude,lati,longi,elevation,t):
 
 
 
-# Compute given object apparent positions (ra,dec,alt,az) and distance from given gps earth position (in decimal degrees) at UTC time (in skyfield format)
+# Use Skyfield to compute given object apparent positions (ra,dec,alt,az) and distance from given gps earth position (in decimal degrees) at UTC time (in skyfield format)
-def EarthObjPosition(gpslat,gpslong,object,t):
+def EarthObjPosition(object, t):
 
 
     #print (object, 'at', t.utc_iso())
-    Observer = earth + Topos(gpslat, gpslong)
+    #SkyObserver = earth + Topos(gpslat, gpslong)
     astrometric = earth.at(t).observe(object)
     ra, dec, distance = astrometric.radec()
     '''
@@ -172,8 +185,9 @@ def EarthObjPosition(gpslat,gpslong,object,t):
     print("declinaison",dec)
     print (distance)
     '''
-    ApparentPosition = Observer.at(t).observe(object).apparent()
+    ApparentPosition = SkyObserver.at(t).observe(object).apparent()
-    alt, az, distance = ApparentPosition.altaz('standard')
+    #alt, az, distance = ApparentPosition.altaz('standard')
+    alt, az, distance = ApparentPosition.altaz()
     '''
     print("UTC",t.utc_iso())
     print ("Altitude",alt)
@@ -184,22 +198,24 @@ def EarthObjPosition(gpslat,gpslong,object,t):
     print("Azimuth", az.dstr())
     print ("Distance from position", distance)
     '''
-    #return ra._degrees, dec, alt.degrees, az, distance
+    # If you want degree hours min : print (object,alt,az)
-    return alt.degrees, az.degrees
+    # or you can do return ra._degrees, dec, alt.degrees, az, distance
+    return alt.degrees, az.degrees, distance
 
 
 # Add Radec coordinates for all lasers from user defined Altaz coordinates in LaserSkies variable at given earth position and time.
 # LaserSkies : [LeftAzi, RightAzi, TopAlt, BotAlt, LeftRa, RightRa, TopDec, BottomDec]
 #                 0          1       2       3       4        5       6        7
-def RadecSkies(LaserSkies,Skylat,Skylong,Skyelevation,AstroSkyTime):
+def RadecSkies(LaserSkies, AstroSkyTime):
 
 	print()
 	print("Converting", lasernumber, "LaserSkies limits in Right Ascension & Declination (radec) coordinates ")
 	for laser in range(lasernumber):
 		# Left top point
-		LaserSkies[laser][4],LaserSkies[laser][6] = aa2radec(azimuth = LaserSkies[laser][0], altitude =LaserSkies[laser][2], lati = Skylat, longi = Skylong, elevation = Skyelevation, t =AstroSkyTime)
+		LaserSkies[laser][4],LaserSkies[laser][6] = aa2radec(azimuth = LaserSkies[laser][0], altitude =LaserSkies[laser][2], t =AstroSkyTime)
 		# Right Bottom point
-		LaserSkies[laser][5],LaserSkies[laser][7] = aa2radec(azimuth = LaserSkies[laser][1], altitude =LaserSkies[laser][3], lati = Skylat, longi = Skylong, elevation = Skyelevation, t =AstroSkyTime)
+		LaserSkies[laser][5],LaserSkies[laser][7] = aa2radec(azimuth = LaserSkies[laser][1], altitude =LaserSkies[laser][3], t =AstroSkyTime)
+	if debug > 0:
 		print(LaserSkies)
 	print ("Done.")
 
@@ -213,7 +229,7 @@ def azimuth2scrX(leftAzi,rightAzi,s):
 
 def altitude2scrY(topAlti,botAlti,s):
     a1, a2 = botAlti, topAlti  
-    b1, b2 = -heigth/2, heigth/2
+    b1, b2 = -height/2, height/2
     return  b1 + ((s - a1) * (b2 - b1) / (a2 - a1))
 
 
@@ -223,6 +239,7 @@ def altitude2scrY(topAlti,botAlti,s):
 # Solar System 
 #
 
+SolarObjectShape = [(-50,30), (-30,-30), (30,-30), (10,30), (-50,30)]
 
 def LoadSolar():
 	global planets, SolarObjects, earth
@@ -240,34 +257,41 @@ def LoadSolar():
 def UpdateSolar():
 	global SolarObjects
 
-	print()
+
-	print("Updating solar system (de421) objects position for observer at", Skylat, Skylong, "time", SkyfieldTime.utc_iso())
+	# Compute Alt Az coordinates for all solar objects for obsehttps://www.startpage.com/do/searchrver.
-	# Compute Alt Az coordinates for all solar objects for observer.
 	for number,object in enumerate(SolarObjects):
 		
 		#print(object[0],number)
-		SolarObjects[number][1],SolarObjects[number][2] = EarthObjPosition(Skylat,Skylong,planets[object[0]],SkyfieldTime)
+		SolarObjects[number][1], SolarObjects[number][2], distance = EarthObjPosition(planets[object[0]],SkyfieldTime)
-	print (SolarObjects)
+	if debug > 0:
-	print ("Done.")
+		PrintSolar()
+	
+
+def PrintSolar():
+
+	for number,object in enumerate(SolarObjects):
+		print (SolarObjects[number][0],"is at (alt,az)",SolarObjects[number][1],SolarObjects[number][2])
+
 
 # Draw the SolarShapeObject for any Solar object is in the laser Sky
-def DrawSolar(LaserSkies, laser):
+def DrawSolar(laser):
 
 	for number,object in enumerate(SolarObjects):
 
-		# Solar object is in given laser sky aeimuth range ?
+		# Solar object is in given laser sky azimuth and altitude range ?
-		# Need to add an altitude check.
+		if LaserSkies[laser][0] < SolarObjects[number][2] <  LaserSkies[laser][1] and LaserSkies[laser][3] < SolarObjects[number][1] <  LaserSkies[laser][2]:
-
+			#print ("drawing",SolarObjects[number][0],SolarObjects[number][1],SolarObjects[number][2],"on laser",laser)
-		if LaserSkies[laser][0] < SolarObjects[number][2] <  LaserSkies[laser][1]:
+			lj3.rPolyLineOneColor(SolarObjectShape, c = white, PL = laser, closed = False, xpos = azimuth2scrX(LaserSkies[laser][0],LaserSkies[laser][1],SolarObjects[number][2]), ypos = altitude2scrY(LaserSkies[laser][2],LaserSkies[laser][3],SolarObjects[number][1]), resize = 2, rotx =0, roty =0 , rotz=0)
-			lj3.rPolyLineOneColor(SolarObjectShape, c = white, PL = laser, closed = False, xpos = azimuth2scrX(LaserSkies[laser][0],LaserSkies[laser][1],SolarObjects[number][2]), ypos = azimuth2scrY(LaserSkies[laser][2],LaserSkies[laser][3],SolarObjects[number][0]), resize = 2.5, rotx =0, roty =0 , rotz=0)
 
 
 
 
 # 
-# Stars Objects
+# Stars 
 #
 
+StarsObjectShape = [(-50,30), (-30,-30), (30,-30), (10,30), (-50,30)]
+
 def LoadHipparcos(ts):
 	global hipdata
 
@@ -316,44 +340,66 @@ def StarSelect():
 	print ("AP",AP.apparent())
 
 
+def UpdateStars():
+	global StarsObjects
+
+	# Compute Alt Az coordinates for all solar objects for obsehttps://www.startpage.com/do/searchrver.
+	for number,object in enumerate(StarsObjects):
+		
+		#print(object[0],number)
+		StarsObjects[number][1], StarsObjects[number][2], distance = EarthObjPosition(planets[object[0]],SkyfieldTime)
+	if debug > 0:
+		PrintSolar()
+
+def PrintStars():
+
+	for number,object in enumerate(StarsObjects):
+		print (StarsObjects[number][0],"is at (alt,az)",StarsObjects[number][1],StarsObjects[number][2])
+
+def DrawStars(laser):
+
+	for number,object in enumerate(StarsObjects):
+
+		# Solar object is in given laser sky azimuth and altitude range ?
+		if LaserSkies[laser][0] < StarsObjects[number][2] <  LaserSkies[laser][1] and LaserSkies[laser][3] < StarsObjects[number][1] <  LaserSkies[laser][2]:
+			#print ("drawing",StarsObjects[number][0],StarsObjects[number][1],StarsObjects[number][2],"on laser",laser)
+			lj3.rPolyLineOneColor(StarsObjectshape, c = white, PL = laser, closed = False, xpos = azimuth2scrX(LaserSkies[laser][0],LaserSkies[laser][1],StarsObjects[number][2]), ypos = altitude2scrY(LaserSkies[laser][2],LaserSkies[laser][3],StarsObjects[number][1]), resize = 2, rotx =0, roty =0 , rotz=0)
 
 
-# WORK IN PROGRESS
+
+
+# 
 # On Earth Gps positions 
-# https://github.com/lutangar/cities.json.git
+# from https://github.com/lutangar/cities.json
 # 
 def LoadCities():
-	global cities
+	global world
 
 	print("Loading World Cities GPS position...")
 	f=open("data/cities.json","r")
 	s = f.read()
-	cities = json.loads(s)
+	world = json.loads(s)
 	print("Loaded.")
 
 
-# search a city to get longitude and latitude. Need to understand python dictionnaries. 
+# Get longitude and latitude of given City in given country. Need to better understand python dictionnaries. 
 def CityPositiion(cityname, countrycode):
 
-	for city in range(len(cities['cities'])):
+	for city in range(len(world['cities'])):
-		if cities['cities'][city]['name']==cityname and cities['cities'][city]['country']==countrycode:
+		if world['cities'][city]['name']==cityname and world['cities'][city]['country']==countrycode:
 			'''
-			print (cities['cities'][city]['country'])
+			print (world['cities'][city]['country'])
-			print (cities['cities'][city]['name'])
+			print (world['cities'][city]['name'])
-			print (cities['cities'][city]['lat'])
+			print (world['cities'][city]['lat'])
-			print (cities['cities'][city]['lng'])
+			print (world['cities'][city]['lng'])
 			'''
-			return float(cities['cities'][city]['lat']), float(cities['cities'][city]['lng'])
+			return float(world['cities'][city]['lat']), float(world['cities'][city]['lng'])
-
-
-
-	
 
 
 
 
 # Add Kompass letter to given laser point list if it is in laser sky at Y axis 300
-def DrawOrientation(LaserSkies, laser):
+def DrawOrientation(laser):
 
 	# North direction is in given laser sky azimuth range?
 	if LaserSkies[laser][0] < 0 <  LaserSkies[laser][1]:
@@ -374,9 +420,9 @@ def DrawOrientation(LaserSkies, laser):
 
 
 
-# Compute LaserSkies Coordinates
+# Compute LaserSkies Coordinates for observer
-def UpdateObserver(SkyCity, SkyCountryCode, time,ts):
+def InitObserver(SkyCity, SkyCountryCode, time,ts):
-	global LaserSkies, Skylat, Skylong, SkyfieldTime
+	global LaserSkies, Skylat, Skylong, SkyfieldTime, AstrObserver, SkyObserver
 	
 	# Observer position i.e : Paris FR
 	#Skylat = 48.85341  		# decimal degree
@@ -386,7 +432,7 @@ def UpdateObserver(SkyCity, SkyCountryCode, time,ts):
 	Skylat, Skylong = CityPositiion(SkyCity,SkyCountryCode)
 	print ("GPS Position of",SkyCity, "in", SkyCountryCode, ":",Skylat,Skylong)
 	# City GPS altitude not in Cities database... Let's say it's :
-	Skyelevation = 100			# meters
+	Skyelevation = 0			# meters
 
 	# Observer Time : Now
 	# Other time in Astropy style 
@@ -394,10 +440,12 @@ def UpdateObserver(SkyCity, SkyCountryCode, time,ts):
 	# t = Time(times, format='isot', scale='utc')
 	print()
 	AstroSkyTime = time
-	print ("AstroPyNow", AstroSkyTime)
+	print ("AstroPy time", AstroSkyTime)
 	SkyfieldTime = ts.from_astropy(AstroSkyTime)
-	print("Time from AstropyUTC",SkyfieldTime.utc_iso())
+	print("SkyfieldTime from AstropyUTC",SkyfieldTime.utc_iso())
-	print("Skyfield UTC",SkyfieldTime.utc_iso())
+
+	AstrObserver = EarthLocation(lat = Skylat * u.deg, lon = Skylong * u.deg, height = Skyelevation * u.m,)
+	SkyObserver = earth + Topos(Skylat, Skylong)
 
 
 	# Computer for all Laser "skies" their Right Ascension/Declinaison coordinates from their Altitude/azimuth Coordinates.
@@ -405,9 +453,15 @@ def UpdateObserver(SkyCity, SkyCountryCode, time,ts):
 	# LaserSky definition for one laser (in decimal degrees) : [LeftAzi, RightAzi, TopAlt, BotAlt, LeftRa, RightRa, TopDec, BottomDec]
 	# With 4 lasers with each one a quarter of the 360 ° real sky, there is 4 LaserSky :
 	LaserSkies = [[0.0,90.0,90.0,0.0,0.0,0.0,0.0,0.0],[90,180,90,0,0,0,0,0],[180,270,90,0,0,0,0,0],[270,360,90,0,0,0,0,0]]
-	RadecSkies(LaserSkies, Skylat, Skylong, Skyelevation, AstroSkyTime)
+	RadecSkies(LaserSkies, AstroSkyTime)
 
 
+def NewTime(timeshift):
+
+	 SkyfieldTime += timeshift
+	 UpdateSolar()
+	 UpdateStars()
+
 
 #
 # Main functions
@@ -416,6 +470,7 @@ def UpdateObserver(SkyCity, SkyCountryCode, time,ts):
 
 def Planetarium():
 
+
 	ts = load.timescale()
 	LoadHipparcos(ts)
 	LoadSolar()
@@ -423,12 +478,19 @@ def Planetarium():
 
 	SkyCity = 'Paris'
 	SkyCountryCode = 'FR'
-	UpdateObserver(SkyCity, SkyCountryCode, Time.now(),ts)
+	InitObserver(SkyCity, SkyCountryCode, Time.now(),ts)
 
 	print()
 	print ("Updating Sky Objects for current observer...")
-
+	print()
+	print("Updating solar system (de421) objects position for observer at", Skylat, Skylong, "time", SkyfieldTime.utc_iso())
 	UpdateSolar()
+	print ("Done.")
+	print()
+	print("Updating stars for observer at", Skylat, Skylong, "time", SkyfieldTime.utc_iso())
+	#UpdateStars()
+	print ("Done.")
+
 	# UpdateStars()    Todo
 
 	DisplayStars = False
@@ -441,9 +503,9 @@ def Planetarium():
 		for laser in range(lasernumber):
 
 			if DisplayOrientation:
-				DrawOrientation(LaserSkies, laser)
+				DrawOrientation(laser)
 			if DisplaySolar:
-				DrawSolar()
+				DrawSolar(laser)
 			if DisplayStars:
 				pass