Merge lp:~georg-zotti/stellarium/gz_fix-ObjectInfoMap into lp:stellarium

[gzotti]

Allow extended per-type object info maps, most useful for scripting.

[Alexander Wolf (alexwolf)]

Please make names of keys are more consistent - for example:
------------
map.insert("range_km", range);
map.insert("RangeRate_km/s", rangeRate);
------------
Plus keys, like "speed_km/s" is very strange.

Compare it to original format of key: azimuth-geometric.

The list of possible keys is necessary also in description of methods (the doxygen format).

I see inconsistency in filing of types - please compare:
-------------
map.insert("type", q_("meteor shower"));
-------------
and
-------------
map.insert("type", "artificial satellite");
-------------

And obvious that all translatable values should be given to users in two format - English and localized (see keys "name" and "localized-name" in original code).

review: Needs Fixing

[lp:~georg-zotti/stellarium/gz_fix-ObjectInfoMap]

9164. By gzotti on 2017-03-08

Added more doxygen, changed a few key names.

[gzotti (georg-zotti)]

Key name format is rather arbitrary as long as there is no reference documentation/guideline. I removed "km/s" types, which makes the tags harder to understand without docs IMHO.

Is it possible to dump such a map completely to script output, so that keys can be found more easily? (This should be added to the scripting API docs!)

name and localized-name are the only entries where un-/+translated makes sense. The map is mostly useful for scripting extensions.

I have added a basic implementation of the added tags into your various object catalog plugins.
I don't know exact details of object types for some plugins. Please add them. Some entries may have to be harmonized (RA/ra, ...) or even removed (position is already there)?

[Alexander Wolf (alexwolf)]

Please read the comments in the code.

review: Needs Fixing

[lp:~georg-zotti/stellarium/gz_fix-ObjectInfoMap]

9165. By gzotti on 2017-03-09

Removed duplicate fields in AW's plugin object infomaps. Removed translations in InfoMap values. Remove Exoplanet detail lists in InfoMap.

[gzotti (georg-zotti)]

Done. More details can (and should) be adjusted anytime after merge when the principal function is seen OK.

review: Needs Resubmitting

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'cmake/stellarium.rc.cmake'
--- cmake/stellarium.rc.cmake	2016-05-31 16:54:06 +0000
+++ cmake/stellarium.rc.cmake	2017-03-09 14:02:12 +0000
@@ -11,7 +11,7 @@
         BLOCK "040904B0" // Lang=English (United States, 0x0409, decimal 1033), CharSet=Unicode (0x04B0, decimal 1200).
         BEGIN
             VALUE "CompanyName",      "Stellarium team\0"
-            VALUE "FileDescription",  "Stellarium is a free open source planetarium\0"
+            VALUE "FileDescription",  "Stellarium, the free open source planetarium\0"
             VALUE "FileVersion",      "@PACKAGE_VERSION@\0"
             VALUE "LegalCopyright",   "Copyright (C) @COPYRIGHT_YEARS@ Stellarium team\0"
             VALUE "Info",             "http://www.stellarium.org/\0"
 
=== modified file 'plugins/Exoplanets/src/Exoplanet.cpp'
--- plugins/Exoplanets/src/Exoplanet.cpp	2016-11-28 16:01:23 +0000
+++ plugins/Exoplanets/src/Exoplanet.cpp	2017-03-09 14:02:12 +0000
@@ -166,7 +166,7 @@
 	//
 }
 
-QVariantMap Exoplanet::getMap(void)
+QVariantMap Exoplanet::getMap(void) const
 {
 	QVariantMap map;
 	map["designation"] = designation;
@@ -467,6 +467,25 @@
 	return str;
 }
 
+QVariantMap Exoplanet::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	// Tentatively add a few more strings. Details are left to the plugin author.
+	if (!starProperName.isEmpty()) map["starProperName"] = starProperName;
+	map["distance"] = distance;
+	map["stype"] = stype;
+	map["smass"] = smass;
+	map["smetal"] = smetal;
+	// map["Vmag"] = Vmag; // maybe same as getVmagnitude?
+	map["sradius"] = sradius;
+	map["effectiveTemp"] = effectiveTemp;
+	map["hasHabitablePlanets"] = hasHabitableExoplanets;
+	map["type"] = "ExoplanetSystem"; // Replace default but confusing "Exoplanet" from class name.
+	// TODO: Maybe add number of habitables? Add details?
+	return map;
+}
+
 QString Exoplanet::getPlanetaryClassI18n(QString ptype) const
 {
 	QString result = "";
 
=== modified file 'plugins/Exoplanets/src/Exoplanet.hpp'
--- plugins/Exoplanets/src/Exoplanet.hpp	2016-10-03 16:08:03 +0000
+++ plugins/Exoplanets/src/Exoplanet.hpp	2017-03-09 14:02:12 +0000
@@ -66,7 +66,7 @@
 
 	//! Get a QVariantMap which describes the exoplanet. Could be used to
 	//! create a duplicate.
-	QVariantMap getMap(void);
+	QVariantMap getMap(void) const;
 
 	//! Get the type of object
 	virtual QString getType(void) const
@@ -80,6 +80,15 @@
 	//! @param core A pointer to the core
 	//! @flags a set of flags with information types to include.
 	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
+	//! Return a map like StelObject, but with a few extra tags also available in getMap().
+	//! - distance = distance in pc
+	//! - stype = Spectral type of star
+	//! - smass = Mass of star in Msun
+	//! - smetal = [Fe/H] of star
+	//! - sradius = Radius of star in Rsun
+	//! - effectiveTemp = Effective temperature of star in K
+	//! - hasHabitablePlanets (true/false)
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual Vec3f getInfoColor(void) const;
 	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const
 	{
 
=== modified file 'plugins/MeteorShowers/src/MeteorShower.cpp'
--- plugins/MeteorShowers/src/MeteorShower.cpp	2017-01-08 16:39:11 +0000
+++ plugins/MeteorShowers/src/MeteorShower.cpp	2017-03-09 14:02:12 +0000
@@ -476,7 +476,7 @@
 	return qRound(gaussian);
 }
 
-QString MeteorShower::getSolarLongitude(QDate date) const
+QString MeteorShower::getSolarLongitude(QDate date)
 {
 	//The number of days (positive or negative) since Greenwich noon,
 	//Terrestrial Time, on 1 January 2000 (J2000.0)
@@ -632,3 +632,58 @@
 
 	return str;
 }
+
+QVariantMap MeteorShower::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	if (enabled())
+	{
+		QString mstdata;
+		if (m_status == ACTIVE_GENERIC)
+		{
+			mstdata = "generic-data";
+		}
+		else if (m_status == ACTIVE_CONFIRMED)
+		{
+			mstdata = "confirmed-data";
+		}
+		else if (m_status == INACTIVE)
+		{
+			mstdata = "inactive";
+		}
+		map.insert("status", mstdata);
+
+		if (!m_showerID.toInt())
+		{
+			map.insert("id", m_showerID);
+		}
+		else
+		{
+			map.insert("id", "?");
+		}
+
+		map.insert("velocity", m_speed);
+		map.insert("population-index", m_pidx);
+		map.insert("parent", m_parentObj);
+
+		if(m_activity.zhr > 0)
+		{
+			map.insert("zhr-max", m_activity.zhr);
+		}
+		else
+		{
+			QString varStr="variable";
+			if(m_activity.variable.size() == 2)
+			{
+				 varStr=QString("%1; %2-%3")
+					.arg("variable")
+					.arg(m_activity.variable.at(0))
+					.arg(m_activity.variable.at(1));
+			}
+			map.insert("zhr-max", varStr);
+		}
+	}
+
+	return map;
+}
 
=== modified file 'plugins/MeteorShowers/src/MeteorShower.hpp'
--- plugins/MeteorShowers/src/MeteorShower.hpp	2015-08-29 02:37:17 +0000
+++ plugins/MeteorShowers/src/MeteorShower.hpp	2017-03-09 14:02:12 +0000
@@ -105,6 +105,16 @@
 	// Methods defined in StelObject class
 	//
 	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
+	//! Return a map like StelObject, but with a few extra tags:
+	// TODO: Describe the fields!
+	//! - status
+	//! - id
+	//! - type (translated string "meteor shower")
+	//! - speed (km/s)
+	//! - pop-idx (population index)
+	//! - parent
+	//! - zhr-max (information string)
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual QString getType(void) const { return "MeteorShower"; }
 	virtual QString getEnglishName(void) const { return m_designation.trimmed(); }
 	virtual QString getNameI18n(void) const	{ return q_(m_designation.trimmed()); }
@@ -151,7 +161,7 @@
 	//! Gets the solar longitude for a specified date
 	//! @param date QDate
 	//! @return solar longitude in degree
-	QString getSolarLongitude(QDate date) const;
+	static QString getSolarLongitude(QDate date);
 };
 
 #endif /*_METEORSHOWER_HPP_*/
 
=== modified file 'plugins/Novae/src/Nova.cpp'
--- plugins/Novae/src/Nova.cpp	2016-07-30 18:20:22 +0000
+++ plugins/Novae/src/Nova.cpp	2017-03-09 14:02:12 +0000
@@ -80,7 +80,7 @@
 	//
 }
 
-QVariantMap Nova::getMap(void)
+QVariantMap Nova::getMap(void) const
 {
 	QVariantMap map;
 	map["designation"] = designation;
@@ -161,6 +161,26 @@
 	return str;
 }
 
+
+QVariantMap Nova::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	map["designation"] = designation;
+	map["name"] = novaName;
+	map["nova-type"] = novaType;
+	map["max-magnitude"] = maxMagnitude;
+	map["min-magnitude"] = minMagnitude;
+	map["peakJD"] = peakJD;
+	map["m2"] = m2;
+	map["m3"] = m3;
+	map["m6"] = m6;
+	map["m9"] = m9;
+	map["distance"] = distance;
+
+	return map;
+}
+
 Vec3f Nova::getInfoColor(void) const
 {
 	return Vec3f(1.0, 1.0, 1.0);
 
=== modified file 'plugins/Novae/src/Nova.hpp'
--- plugins/Novae/src/Nova.hpp	2015-12-22 15:15:35 +0000
+++ plugins/Novae/src/Nova.hpp	2017-03-09 14:02:12 +0000
@@ -46,19 +46,29 @@
 	Nova(const QVariantMap& map);
 	~Nova();
 
-	//! Get a QVariantMap which describes the nova.  Could be used to
-	//! create a duplicate.
-	QVariantMap getMap(void);
+	//! Get a QVariantMap which describes the nova.  Could be used to create a duplicate.
+	QVariantMap getMap(void) const;
 
-	virtual QString getType(void) const
-	{
-		return "Nova";
-	}
+	virtual QString getType(void) const {return "Nova";}
 
 	//! Get an HTML string to describe the object
 	//! @param core A pointer to the core
 	//! @flags a set of flags with information types to include.
 	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
+	//! Return a map like StelObject::getInfoMap(), but with a few extra tags also available in getMap().
+	// TODO: Describe the entries!
+	//! - designation
+	//! - name
+	//! - nova-type
+	//! - max-magnitude
+	//! - min-magnitude
+	//! - peakJD
+	//! - m2
+	//! - m3
+	//! - m6
+	//! - m9
+	//! - distance
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual Vec3f getInfoColor(void) const;
 	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const
 	{
 
=== modified file 'plugins/Pulsars/src/Pulsar.cpp'
--- plugins/Pulsars/src/Pulsar.cpp	2016-11-28 14:24:21 +0000
+++ plugins/Pulsars/src/Pulsar.cpp	2017-03-09 14:02:12 +0000
@@ -111,7 +111,7 @@
 	//
 }
 
-QVariantMap Pulsar::getMap(void)
+QVariantMap Pulsar::getMap(void) const
 {
 	QVariantMap map;
 	map["designation"] = designation;
@@ -268,6 +268,28 @@
 	return str;
 }
 
+QVariantMap Pulsar::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	map["parallax"] = parallax;
+	map["bperiod"] = bperiod;
+	map["frequency"] = frequency;
+	map["pfrequency"] = pfrequency;
+	map["pderivative"] = pderivative;
+	map["dmeasure"] = dmeasure;
+	map["eccentricity"] = eccentricity;
+	map["period"] = period;
+	map["w50"] = w50;
+	map["s400"] = s400;
+	map["s600"] = s600;
+	map["s1400"] = s1400;
+	map["distance"] = distance;
+	map["glitch"] = glitch;
+	map["notes"] = notes;
+	return map;
+}
+
 Vec3f Pulsar::getInfoColor(void) const
 {
 	return Vec3f(1.0, 1.0, 1.0);
 
=== modified file 'plugins/Pulsars/src/Pulsar.hpp'
--- plugins/Pulsars/src/Pulsar.hpp	2015-05-30 19:56:47 +0000
+++ plugins/Pulsars/src/Pulsar.hpp	2017-03-09 14:02:12 +0000
@@ -46,9 +46,27 @@
 	Pulsar(const QVariantMap& map);
 	~Pulsar();
 
-	//! Get a QVariantMap which describes the pulsar. Could be used to
-	//! create a duplicate.
-	QVariantMap getMap(void);
+	//! Get a QVariantMap which describes the pulsar. Could be used to create a duplicate.
+	// TODO: Add proper documentation of these fields!
+	//! - designation
+	//! - parallax
+	//! - bperiod
+	//! - frequency
+	//! - pfrequency
+	//! - pderivative
+	//! - dmeasure
+	//! - eccentricity
+	//! - RA
+	//! - DE
+	//! - period
+	//! - w50
+	//! - s400
+	//! - s600
+	//! - s1400
+	//! - distance
+	//! - glitch
+	//! - notes
+	QVariantMap getMap(void) const;
 
 	//! Get the type of object
 	virtual QString getType(void) const
@@ -62,6 +80,8 @@
 	//! @param core A pointer to the core
 	//! @flags a set of flags with information types to include.
 	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
+	//! Return a map like StelObject::getInfoMap(), but with a few extra tags also available in getMap(), except for designation, RA and DE fields.
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual Vec3f getInfoColor(void) const;
 	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const
 	{
 
=== modified file 'plugins/Quasars/src/Quasar.cpp'
--- plugins/Quasars/src/Quasar.cpp	2016-11-28 14:24:21 +0000
+++ plugins/Quasars/src/Quasar.cpp	2017-03-09 14:02:12 +0000
@@ -73,7 +73,7 @@
 	//
 }
 
-QVariantMap Quasar::getMap(void)
+QVariantMap Quasar::getMap(void) const
 {
 	QVariantMap map;
 	map["designation"] = designation;
@@ -137,6 +137,17 @@
 	return str;
 }
 
+QVariantMap Quasar::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	map["amag"] = AMagnitude;
+	map["bV"] = bV;
+	map["redshift"] = redshift;
+
+	return map;
+}
+
 Vec3f Quasar::getInfoColor(void) const
 {
 	return Vec3f(1.0, 1.0, 1.0);
 
=== modified file 'plugins/Quasars/src/Quasar.hpp'
--- plugins/Quasars/src/Quasar.hpp	2016-07-30 18:20:22 +0000
+++ plugins/Quasars/src/Quasar.hpp	2017-03-09 14:02:12 +0000
@@ -46,9 +46,15 @@
 	Quasar(const QVariantMap& map);
 	~Quasar();
 
-	//! Get a QVariantMap which describes the Quasar.  Could be used to
-	//! create a duplicate.
-	QVariantMap getMap(void);
+	//! Get a QVariantMap which describes the Quasar.  Could be used to create a duplicate.
+	//! - designation
+	//! - Vmag
+	//! - Amag
+	//! - bV
+	//! - RA
+	//! - DE
+	//! - z
+	QVariantMap getMap(void) const;
 
 	virtual QString getType(void) const
 	{
@@ -61,6 +67,12 @@
 	//! @param core A pointer to the core
 	//! @flags a set of flags with information types to include.
 	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
+	//! Return a map like StelObject::getInfoMap(), but with a few extra tags also available in getMap().
+	// TODO: Describe the fields.
+	//! - amag
+	//! - bV
+	//! - redshift
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual Vec3f getInfoColor(void) const;
 	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const
 	{
 
=== modified file 'plugins/RemoteControl/src/ObjectService.cpp'
--- plugins/RemoteControl/src/ObjectService.cpp	2017-02-04 14:15:20 +0000
+++ plugins/RemoteControl/src/ObjectService.cpp	2017-03-09 14:02:12 +0000
@@ -25,7 +25,6 @@
 #include "StelObjectMgr.hpp"
 #include "StelTranslator.hpp"
 #include "StelModuleMgr.hpp"
-#include "StelMainScriptAPI.hpp"
 #include "StelObjectMgr.hpp"
 #include "LandscapeMgr.hpp"
 
@@ -163,7 +162,7 @@
 			QJsonObject infoObj;
 			StelObjectMgr* omgr = GETSTELMODULE(StelObjectMgr);
 			StelObjectP obj = omgr->searchByName(name);
-			QVariantMap infoMap=StelMainScriptAPI::getObjectInfo(obj);
+			QVariantMap infoMap=StelObjectMgr::getObjectInfo(obj);
 			QVariantMap::const_iterator i;
 			for (i=infoMap.constBegin(); i!=infoMap.constEnd(); ++i)
 				infoObj.insert(i.key(), i.value().toString());
 
=== modified file 'plugins/Satellites/src/Satellite.cpp'
--- plugins/Satellites/src/Satellite.cpp	2017-01-08 16:39:11 +0000
+++ plugins/Satellites/src/Satellite.cpp	2017-03-09 14:02:12 +0000
@@ -395,6 +395,90 @@
 	return str;
 }
 
+QVariantMap Satellite::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	map.insert("description", QString(description).replace("\n", " - "));
+	map.insert("catalog", id);
+	if (!internationalDesignator.isEmpty())
+		map.insert("international-designator", internationalDesignator);
+
+	if (stdMag==99.f) // replace whatever has been computed
+	{
+		map.insert("vmag", "?");
+		map.insert("vmage", "?");
+	}
+
+	map.insert("range", range);
+	map.insert("rangerate", rangeRate);
+	map.insert("height", height);
+	map.insert("subpoint-lat", latLongSubPointPosition[0]);
+	map.insert("subpoint-long", latLongSubPointPosition[1]);
+	map.insert("TEME-km-X", position[0]);
+	map.insert("TEME-km-Y", position[1]);
+	map.insert("TEME-km-Z", position[2]);
+	map.insert("TEME-speed-X", velocity[0]);
+	map.insert("TEME-speed-Y", velocity[1]);
+	map.insert("TEME-speed-Z", velocity[2]);
+	if (sunReflAngle>0)
+	{  // Iridium
+		map.insert("sun-reflection-angle", sunReflAngle);
+	}
+	map.insert("operational-status", getOperationalStatus());
+
+	//TODO: Move to a more prominent place.
+	QString visibilityState;
+	switch (visibility)
+	{
+		case RADAR_SUN:
+			visibilityState = "The satellite and the observer are in sunlight.";
+			break;
+		case VISIBLE:
+			visibilityState =  "The satellite is visible.";
+			break;
+		case RADAR_NIGHT:
+			visibilityState =  "The satellite is eclipsed.";
+			break;
+		case NOT_VISIBLE:
+			visibilityState =  "The satellite is not visible";
+			break;
+		default:
+			break;
+	}
+	map.insert("visibility", visibilityState);
+	if (comms.size() > 0)
+	{
+		foreach(const CommLink &c, comms)
+		{
+			double dop = getDoppler(c.frequency);
+			double ddop = dop;
+			char sign;
+			if (dop<0.)
+			{
+				sign='-';
+				ddop*=-1;
+			}
+			else
+				sign='+';
+
+			QString commModDesc;
+			if (!c.modulation.isEmpty() && c.modulation != "") commModDesc=c.modulation;
+			if ((!c.modulation.isEmpty() && c.modulation != "") || (!c.description.isEmpty() && c.description != "")) commModDesc.append(" ");
+			if (!c.description.isEmpty() && c.description != "") commModDesc.append(c.description);
+			if ((!c.modulation.isEmpty() && c.modulation != "") || (!c.description.isEmpty() && c.description != "")) commModDesc.append(": ");
+			map.insertMulti("comm", QString("%1%2 MHz (%3%4 kHz)")
+				.arg(commModDesc)
+				.arg(c.frequency, 8, 'f', 5)
+				.arg(sign)
+				.arg(ddop, 6, 'f', 3));
+		}
+	}
+
+	return map;
+}
+
+
 Vec3d Satellite::getJ2000EquatorialPos(const StelCore* core) const
 {
 	// Bugfix LP:1654331. I assume the elAzPosition has been computed without refraction! We must say this definitely.
 
=== modified file 'plugins/Satellites/src/Satellite.hpp'
--- plugins/Satellites/src/Satellite.hpp	2016-11-21 20:20:20 +0000
+++ plugins/Satellites/src/Satellite.hpp	2017-03-09 14:02:12 +0000
@@ -131,8 +131,29 @@
 	//! Supported types for Satellite objects:
 	//! - Name: designation in large type with the description underneath
 	//! - RaDecJ2000, RaDecOfDate, HourAngle, AltAzi
-	//! - Extra: range, rage rate and altitude of satellite above the Earth, comms frequencies, modulation types and so on.
+	//! - Extra: range, range rate and altitude of satellite above the Earth, comms frequencies, modulation types and so on.
 	virtual QString getInfoString(const StelCore *core, const InfoStringGroup& flags) const;
+	//! Return a map like StelObject::getInfoMap(), but with a few extra tags also available in getInfoString().
+	//! - description
+	//! - catalog
+	//! - international-designator
+	//! - type
+	//! - range (distance in km)
+	//! - rangerate (distance change in km/s)
+	//! - height (height in km)
+	//! - subpoint-lat (latitude of subpoint, decimal degrees)
+	//! - subpoint-long (longitude of subpoint, decimal degrees)
+	//! - TEME-km-X
+	//! - TEME-km-Y
+	//! - TEME-km-Z
+	//! - TEME-speed-X
+	//! - TEME-speed-Y
+	//! - TEME-speed-Z
+	//! - sun-reflection-angle (if available)
+	//! - operational-status
+	//! - visibility (descriptive string)
+	//! - comm (Radio information, optional, if available. There may be several comm entries!)
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual Vec3f getInfoColor(void) const;
 	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const;
 	virtual float getVMagnitude(const StelCore* core) const;
 
=== modified file 'plugins/Supernovae/src/Supernova.cpp'
--- plugins/Supernovae/src/Supernova.cpp	2016-12-10 15:11:36 +0000
+++ plugins/Supernovae/src/Supernova.cpp	2017-03-09 14:02:12 +0000
@@ -71,7 +71,7 @@
 	//
 }
 
-QVariantMap Supernova::getMap(void)
+QVariantMap Supernova::getMap(void) const
 {
 	QVariantMap map;
 	map["designation"] = designation;
@@ -155,6 +155,20 @@
 	return str;
 }
 
+
+QVariantMap Supernova::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	map["sntype"] = sntype;
+	map["max-magnitude"] = maxMagnitude;
+	map["peakJD"] = peakJD;
+	map["note"] = note;
+	map["distance"] = distance;
+
+	return map;
+}
+
 Vec3f Supernova::getInfoColor(void) const
 {
 	return Vec3f(1.0, 1.0, 1.0);
 
=== modified file 'plugins/Supernovae/src/Supernova.hpp'
--- plugins/Supernovae/src/Supernova.hpp	2015-05-30 19:56:47 +0000
+++ plugins/Supernovae/src/Supernova.hpp	2017-03-09 14:02:12 +0000
@@ -46,9 +46,16 @@
 	Supernova(const QVariantMap& map);
 	~Supernova();
 
-	//! Get a QVariantMap which describes the supernova.  Could be used to
-	//! create a duplicate.
-	QVariantMap getMap(void);
+	//! Get a QVariantMap which describes the supernova.  Could be used to create a duplicate.
+	//! - designation
+	//! - sntype
+	//! - maxMagnitude
+	//! - peakJD
+	//! - snra
+	//! - snde
+	//! - note
+	//! - distance
+	QVariantMap getMap(void) const;
 
 	virtual QString getType(void) const
 	{
@@ -59,6 +66,13 @@
 	//! @param core A pointer to the core
 	//! @flags a set of flags with information types to include.
 	virtual QString getInfoString(const StelCore* core, const InfoStringGroup& flags) const;
+	//! Return a map like StelObject::getInfoMap(), but with a few extra tags also available in getMap().
+	//! - sntype
+	//! - max-magnitude
+	//! - peakJD
+	//! - note
+	//! - distance
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual Vec3f getInfoColor(void) const;
 	virtual Vec3d getJ2000EquatorialPos(const StelCore*) const
 	{
 
=== modified file 'src/core/StelObject.cpp'
--- src/core/StelObject.cpp	2016-12-29 15:37:01 +0000
+++ src/core/StelObject.cpp	2017-03-09 14:02:12 +0000
@@ -318,3 +318,104 @@
 	}
 }
 
+QVariantMap StelObject::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map;
+
+	Vec3d pos;
+	double ra, dec, alt, az, glong, glat;
+	bool useOldAzimuth = StelApp::getInstance().getFlagSouthAzimuthUsage();
+
+	map.insert("type", getType());
+	// ra/dec
+	pos = getEquinoxEquatorialPos(core);
+	StelUtils::rectToSphe(&ra, &dec, pos);
+	map.insert("ra", ra*180./M_PI);
+	map.insert("dec", dec*180./M_PI);
+
+	// ra/dec in J2000
+	pos = getJ2000EquatorialPos(core);
+	StelUtils::rectToSphe(&ra, &dec, pos);
+	map.insert("raJ2000", ra*180./M_PI);
+	map.insert("decJ2000", dec*180./M_PI);
+
+	// apparent altitude/azimuth
+	pos = getAltAzPosApparent(core);
+	StelUtils::rectToSphe(&az, &alt, pos);
+	float direction = 3.; // N is zero, E is 90 degrees
+	if (useOldAzimuth)
+		direction = 2.;
+	az = direction*M_PI - az;
+	if (az > M_PI*2)
+		az -= M_PI*2;
+
+	map.insert("altitude", alt*180./M_PI);
+	map.insert("azimuth", az*180./M_PI);
+
+	// geometric altitude/azimuth
+	pos = getAltAzPosGeometric(core);
+	StelUtils::rectToSphe(&az, &alt, pos);
+	az = direction*M_PI - az;
+	if (az > M_PI*2)
+		az -= M_PI*2;
+
+	map.insert("altitude-geometric", alt*180./M_PI);
+	map.insert("azimuth-geometric", az*180./M_PI);
+
+	// galactic long/lat
+	pos = getGalacticPos(core);
+	StelUtils::rectToSphe(&glong, &glat, pos);
+	map.insert("glong", glong*180./M_PI);
+	map.insert("glat", glat*180./M_PI);
+
+	// supergalactic long/lat
+	pos = getSupergalacticPos(core);
+	StelUtils::rectToSphe(&glong, &glat, pos);
+	map.insert("sglong", glong*180./M_PI);
+	map.insert("sglat", glat*180./M_PI);
+
+	SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
+	double ra_equ, dec_equ, lambda, beta;
+	// J2000
+	double eclJ2000 = ssmgr->getEarth()->getRotObliquity(2451545.0);
+	double ecl = ssmgr->getEarth()->getRotObliquity(core->getJDE());
+
+	// ecliptic longitude/latitude (J2000 frame)
+	StelUtils::rectToSphe(&ra_equ,&dec_equ, getJ2000EquatorialPos(core));
+	StelUtils::equToEcl(ra_equ, dec_equ, eclJ2000, &lambda, &beta);
+	if (lambda<0) lambda+=2.0*M_PI;
+	map.insert("elongJ2000", lambda*180./M_PI);
+	map.insert("elatJ2000", beta*180./M_PI);
+
+	if (QString("Earth Sun").contains(core->getCurrentLocation().planetName))
+	{
+		// ecliptic longitude/latitude
+		StelUtils::rectToSphe(&ra_equ,&dec_equ, getEquinoxEquatorialPos(core));
+		StelUtils::equToEcl(ra_equ, dec_equ, ecl, &lambda, &beta);
+		if (lambda<0) lambda+=2.0*M_PI;
+		map.insert("elong", lambda*180./M_PI);
+		map.insert("elat", beta*180./M_PI);
+	}
+
+	// magnitude
+	map.insert("vmag", getVMagnitude(core));
+	map.insert("vmage", getVMagnitudeWithExtinction(core));
+
+	// angular size
+	double angularSize = 2.*getAngularSize(core)*M_PI/180.;
+	bool sign;
+	double deg;
+	StelUtils::radToDecDeg(angularSize, sign, deg);
+	if (!sign)
+		deg *= -1;
+	map.insert("size", angularSize);
+	map.insert("size-dd", deg);
+	map.insert("size-deg", StelUtils::radToDecDegStr(angularSize, 5));
+	map.insert("size-dms", StelUtils::radToDmsStr(angularSize, true));
+
+	// english name or designation & localized name
+	map.insert("name", getEnglishName());
+	map.insert("localized-name", getNameI18n());
+
+	return map;
+}
 
=== modified file 'src/core/StelObject.hpp'
--- src/core/StelObject.hpp	2016-12-29 15:37:01 +0000
+++ src/core/StelObject.hpp	2017-03-09 14:02:12 +0000
@@ -99,6 +99,36 @@
 	//! @return an HTML string containing information about the StelObject.
 	virtual QString getInfoString(const StelCore *core, const InfoStringGroup& flags=StelObject::AllInfo) const = 0;
 
+	//! Return a key/value map with data about an object's position, magnitude and so on. Useful in a context like scripting.
+	//! Derived objects can add their own special information tags.
+	//! @param core the current StelCore
+	//! @return a map of object data.  Keys:
+	//! - altitude : apparent altitude angle in decimal degrees
+	//! - azimuth : apparent azimuth angle in decimal degrees
+	//! - altitude-geometric : geometric altitude angle in decimal degrees
+	//! - azimuth-geometric : geometric azimuth angle in decimal degrees
+	//! - ra : right ascension angle (current date frame) in decimal degrees
+	//! - dec : declination angle (current date frame) in decimal degrees
+	//! - raJ2000 : right ascension angle (J2000 frame) in decimal degrees
+	//! - decJ2000 : declination angle (J2000 frame) in decimal degrees
+	//! - glong : galactic longitude in decimal degrees
+	//! - glat : galactic latitude in decimal degrees
+	//! - sglong : supergalactic longitude in decimal degrees
+	//! - sglat : supergalactic latitude in decimal degrees
+	//! - elong : ecliptic longitude in decimal degrees (on Earth only!)
+	//! - elat : ecliptic latitude in decimal degrees (on Earth only!)
+	//! - elongJ2000 : ecliptic longitude (Earth's J2000 frame) in decimal degrees
+	//! - elatJ2000 : ecliptic latitude (Earth's J2000 frame) in decimal degrees
+	//! - vmag : visual magnitude
+	//! - vmage : visual magnitude (after atmospheric extinction)
+	//! - size: angular size in radians
+	//! - size-dd : angular size in decimal degrees
+	//! - size-deg : angular size in decimal degrees (formatted string)
+	//! - size-dms : angular size in DMS format
+	//! - name : english name of the object
+	//! - localized-name : localized name
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
+
 	//! Return object's type. It should be the name of the class.
 	virtual QString getType() const = 0;
 
 
=== modified file 'src/core/StelObjectMgr.cpp'
--- src/core/StelObjectMgr.cpp	2017-01-06 09:53:37 +0000
+++ src/core/StelObjectMgr.cpp	2017-03-09 14:02:12 +0000
@@ -374,3 +374,19 @@
 	}
 	return result;
 }
+
+QVariantMap StelObjectMgr::getObjectInfo(const StelObjectP obj)
+{
+	QVariantMap map;
+	if (!obj)
+	{
+		qDebug() << "getObjectInfo WARNING - object not found";
+		map.insert("found", false);
+	}
+	else
+	{
+		map=obj->getInfoMap(StelApp::getInstance().getCore());
+		map.insert("found", true);
+	}
+	return map;
+}
 
=== modified file 'src/core/StelObjectMgr.hpp'
--- src/core/StelObjectMgr.hpp	2016-07-03 21:58:54 +0000
+++ src/core/StelObjectMgr.hpp	2017-03-09 14:02:12 +0000
@@ -132,6 +132,11 @@
 	//! Default to 1.
 	void setDistanceWeight(float newDistanceWeight) {distanceWeight=newDistanceWeight;}
 
+	//! Return a QMap of data about the object (calls obj->getInfoMap()).
+	//! If obj is valid, add an element ["found", true].
+	//! If obj is NULL, returns a 1-element map [["found", false]]
+	static QVariantMap getObjectInfo(const StelObjectP obj);
+
 signals:
 	//! Indicate that the selected StelObjects has changed.
 	//! @param action define if the user requested that the objects are added to the selection or just replace it
 
=== modified file 'src/core/modules/Atmosphere.cpp'
--- src/core/modules/Atmosphere.cpp	2016-11-28 14:24:21 +0000
+++ src/core/modules/Atmosphere.cpp	2017-03-09 14:02:12 +0000
@@ -381,7 +381,7 @@
 
 	// And draw everything at once
 	indicesBuffer.bind();
-	int shift=0;
+	std::size_t shift=0;
 	for (int y=0;y<skyResolutionY;++y)
 	{
 		sPainter.glFuncs()->glDrawElements(GL_TRIANGLE_STRIP, (skyResolutionX+1)*2, GL_UNSIGNED_SHORT, reinterpret_cast<void*>(shift));
 
=== modified file 'src/core/modules/Comet.cpp'
--- src/core/modules/Comet.cpp	2017-01-08 16:39:11 +0000
+++ src/core/modules/Comet.cpp	2017-03-09 14:02:12 +0000
@@ -272,6 +272,14 @@
 	return str;
 }
 
+QVariantMap Comet::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+	map.insert("tail-length-km", tailFactors[1]*AU);
+	map.insert("coma-diameter-km", tailFactors[0]*AU);
+
+	return map;
+}
 void Comet::setSemiMajorAxis(const double value)
 {
 	semiMajorAxis = value;
 
=== modified file 'src/core/modules/Comet.hpp'
--- src/core/modules/Comet.hpp	2015-09-13 21:33:23 +0000
+++ src/core/modules/Comet.hpp	2017-03-09 14:02:12 +0000
@@ -33,6 +33,7 @@
 	2014-01: GZ: Parabolic tails appropriately scaled/rotated. Much is currently empirical, leaving room for physics-based improvements.
 	2014-08: GZ: speedup in case hundreds of comets are loaded.
 	2014-11: GZ: tail extinction, better brightness balance.
+	2017-03: GZ: added fields to infoMap
   */
 class Comet : public Planet
 {
@@ -72,6 +73,11 @@
 	//! \param flags a set of InfoStringGroup items to include in the return value.
 	//! \return a QString containing an HMTL encoded description of the Comet.
 	virtual QString getInfoString(const StelCore *core, const InfoStringGroup &flags) const;
+	//! In addition to Planet::getInfoMap(), Comets provides estimates for
+	//! - tail-length-km
+	//! - coma-diameter-km
+	//! using the formula from Guide found by the GSoC2012 initiative at http://www.projectpluto.com/update7b.htm#comet_tail_formula
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	//The Comet class inherits the "Planet" type because the SolarSystem class
 	//was not designed to handle different types of objects.
 	//virtual QString getType() const {return "Comet";}
 
=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2017-01-26 17:39:02 +0000
+++ src/core/modules/Planet.cpp	2017-03-09 14:02:12 +0000
@@ -442,6 +442,33 @@
 	return str;
 }
 
+QVariantMap Planet::getInfoMap(const StelCore *core) const
+{
+	QVariantMap map = StelObject::getInfoMap(core);
+
+	if (getEnglishName()!="Sun")
+	{
+		const Vec3d& observerHelioPos = core->getObserverHeliocentricEclipticPos();
+		map.insert("distance", getJ2000EquatorialPos(core).length());
+		double phase=getPhase(observerHelioPos);
+		map.insert("phase", phase);
+		map.insert("illumination", 100.*phase);
+		double phaseAngle = getPhaseAngle(observerHelioPos);
+		map.insert("phase-angle", phaseAngle);
+		map.insert("phase-angle-dms", StelUtils::radToDmsStr(phaseAngle));
+		map.insert("phase-angle-deg", StelUtils::radToDecDegStr(phaseAngle));
+		double elongation = getElongation(observerHelioPos);
+		map.insert("elongation", elongation);
+		map.insert("elongation-dms", StelUtils::radToDmsStr(elongation));
+		map.insert("elongation-deg", StelUtils::radToDecDegStr(elongation));
+		map.insert("type", getPlanetTypeString()); // replace existing "type=Planet" by something more detailed.
+		// TBD: Is there ANY reason to keep "type"="Planet" and add a "ptype"=getPlanetTypeString() field?
+	}
+
+	return map;
+}
+
+
 //! Get sky label (sky translation)
 QString Planet::getSkyLabel(const StelCore*) const
 {
 
=== modified file 'src/core/modules/Planet.hpp'
--- src/core/modules/Planet.hpp	2017-01-06 16:52:05 +0000
+++ src/core/modules/Planet.hpp	2017-03-09 14:02:12 +0000
@@ -153,6 +153,18 @@
 	//! @param flags a set of InfoStringGroup items to include in the return value.
 	//! @return a QString containing an HMTL encoded description of the Planet.
 	virtual QString getInfoString(const StelCore *core, const InfoStringGroup& flags) const;
+	//! In addition to the entries from StelObject::getInfoMap(), Planet objects provide
+	//! - distance
+	//! - phase (result of getPhase)
+	//! - illumination (=100*phase)
+	//! - phase-angle
+	//! - phase-angle-dms (formatted string)
+	//! - phase-angle-deg (formatted string)
+	//! - elongation
+	//! - elongation-dms (formatted string)
+	//! - elongation-deg (formatted string)
+	//! - type (object type description)
+	virtual QVariantMap getInfoMap(const StelCore *core) const;
 	virtual double getCloseViewFov(const StelCore* core) const;
 	virtual double getSatellitesFov(const StelCore* core) const;
 	virtual double getParentSatellitesFov(const StelCore* core) const;
@@ -213,21 +225,21 @@
 
 	const RotationElements &getRotationElements(void) const {return re;}
 
-	// Compute the position in the parent Planet coordinate system
+	//! Compute the position in the parent Planet coordinate system
 	void computePositionWithoutOrbits(const double dateJDE);
 	void computePosition(const double dateJDE);
 
-	// Compute the transformation matrix from the local Planet coordinate to the parent Planet coordinate.
-	// This requires both flavours of JD in cases involving Earth.
+	//! Compute the transformation matrix from the local Planet coordinate to the parent Planet coordinate.
+	//! This requires both flavours of JD in cases involving Earth.
 	void computeTransMatrix(double JD, double JDE);
 
-	// Get the phase angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
+	//! Get the phase angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
 	double getPhaseAngle(const Vec3d& obsPos) const;
-	// Get the elongation angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
+	//! Get the elongation angle (rad) for an observer at pos obsPos in heliocentric coordinates (in AU)
 	double getElongation(const Vec3d& obsPos) const;
-	// Get the angular size of the spheroid of the planet (i.e. without the rings)
+	//! Get the angular size of the spheroid of the planet (i.e. without the rings)
 	double getSpheroidAngularSize(const StelCore* core) const;
-	// Get the planet phase for an observer at pos obsPos in heliocentric coordinates (in AU)
+	//! Get the planet phase for an observer at pos obsPos in heliocentric coordinates (in AU)
 	float getPhase(const Vec3d& obsPos) const;
 
 	// Set the orbital elements
 
=== modified file 'src/scripting/StelMainScriptAPI.cpp'
--- src/scripting/StelMainScriptAPI.cpp	2017-02-04 14:15:20 +0000
+++ src/scripting/StelMainScriptAPI.cpp	2017-03-09 14:02:12 +0000
@@ -711,6 +711,39 @@
 	StelApp::getInstance().getScriptMgr().output(s);
 }
 
+//! print contents of a QVariantMap
+//! @param map QVariantMap e.g. from getObjectInfo() or getLocationInfo()
+QString StelMainScriptAPI::mapToString(const QVariantMap& map) const
+{
+	QString res = QString("[\n");
+	QList<QVariant::Type> simpleTypeList;
+	simpleTypeList.push_back(QVariant::Bool);
+	simpleTypeList.push_back(QVariant::Int);
+	simpleTypeList.push_back(QVariant::UInt);
+	simpleTypeList.push_back(QVariant::Double);
+
+	QVariantMap::const_iterator i=map.constBegin();
+	while (i != map.constEnd()){
+
+		if (i.value().type()==QMetaType::QString)
+		{
+			res.append(QString("[ \"%1\" = \"%2\" ]\n").arg(i.key()).arg(i.value().toString()));
+		}
+		else if (simpleTypeList.contains(i.value().type()))
+		{
+			res.append(QString("[ \"%1\" = %2 ]\n").arg(i.key()).arg(i.value().toString()));
+		}
+		else
+		{
+			res.append(QString("[ \"%1\" = \"<%2>:%3\" ]\n").arg(i.key()).arg(i.value().typeName()).arg(i.value().toString()));
+		}
+
+		++i;
+	}
+	res.append( QString("]\n"));
+	return res;
+}
+
 void StelMainScriptAPI::resetOutput(void) const
 {
 	StelApp::getInstance().getScriptMgr().resetOutput();
@@ -841,7 +874,7 @@
 	StelObjectMgr* omgr = GETSTELMODULE(StelObjectMgr);
 	StelObjectP obj = omgr->searchByName(name);
 
-	return StelMainScriptAPI::getObjectInfo(obj);
+	return StelObjectMgr::getObjectInfo(obj);
 }
 
 QVariantMap StelMainScriptAPI::getSelectedObjectInfo()
@@ -857,140 +890,8 @@
 
 	StelObjectP obj = omgr->getSelectedObject()[0];
 
-	return StelMainScriptAPI::getObjectInfo(obj);
-}
-
-QVariantMap StelMainScriptAPI::getObjectInfo(const StelObjectP obj)
-{
-	QVariantMap map;
-	if (!obj)
-	{
-		debug("getObjectData WARNING - object not found");
-		map.insert("found", false);
-		return map;
-	}
-	else
-	{
-		map.insert("found", true);
-	}
-
-	// OK, object found. Let's go.
-	Vec3d pos;
-	double ra, dec, alt, az, glong, glat;
-	StelCore* core = StelApp::getInstance().getCore();
-	bool useOldAzimuth = StelApp::getInstance().getFlagSouthAzimuthUsage();
-
-	// ra/dec
-	pos = obj->getEquinoxEquatorialPos(core);
-	StelUtils::rectToSphe(&ra, &dec, pos);
-	map.insert("ra", ra*180./M_PI);
-	map.insert("dec", dec*180./M_PI);	
-
-	// ra/dec in J2000
-	pos = obj->getJ2000EquatorialPos(core);
-	StelUtils::rectToSphe(&ra, &dec, pos);
-	map.insert("raJ2000", ra*180./M_PI);
-	map.insert("decJ2000", dec*180./M_PI);	
-
-	// apparent altitude/azimuth
-	pos = obj->getAltAzPosApparent(core);
-	StelUtils::rectToSphe(&az, &alt, pos);
-	float direction = 3.; // N is zero, E is 90 degrees
-	if (useOldAzimuth)
-		direction = 2.;
-	az = direction*M_PI - az;
-	if (az > M_PI*2)
-		az -= M_PI*2;
-
-	map.insert("altitude", alt*180./M_PI);
-	map.insert("azimuth", az*180./M_PI);	
-
-	// geometric altitude/azimuth
-	pos = obj->getAltAzPosGeometric(core);
-	StelUtils::rectToSphe(&az, &alt, pos);
-	az = direction*M_PI - az;
-	if (az > M_PI*2)
-		az -= M_PI*2;
-
-	map.insert("altitude-geometric", alt*180./M_PI);
-	map.insert("azimuth-geometric", az*180./M_PI);	
-
-	// galactic long/lat
-	pos = obj->getGalacticPos(core);
-	StelUtils::rectToSphe(&glong, &glat, pos);
-	map.insert("glong", glong*180./M_PI);
-	map.insert("glat", glat*180./M_PI);
-
-	// supergalactic long/lat
-	pos = obj->getSupergalacticPos(core);
-	StelUtils::rectToSphe(&glong, &glat, pos);
-	map.insert("sglong", glong*180./M_PI);
-	map.insert("sglat", glat*180./M_PI);
-
-	SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
-	double ra_equ, dec_equ, lambda, beta;
-	// J2000
-	double eclJ2000 = ssmgr->getEarth()->getRotObliquity(2451545.0);
-	double ecl = ssmgr->getEarth()->getRotObliquity(core->getJDE());
-
-	// ecliptic longitude/latitude (J2000 frame)
-	StelUtils::rectToSphe(&ra_equ,&dec_equ, obj->getJ2000EquatorialPos(core));
-	StelUtils::equToEcl(ra_equ, dec_equ, eclJ2000, &lambda, &beta);
-	if (lambda<0) lambda+=2.0*M_PI;
-	map.insert("elongJ2000", lambda*180./M_PI);
-	map.insert("elatJ2000", beta*180./M_PI);
-
-	if (QString("Earth Sun").contains(core->getCurrentLocation().planetName))
-	{
-		// ecliptic longitude/latitude
-		StelUtils::rectToSphe(&ra_equ,&dec_equ, obj->getEquinoxEquatorialPos(core));
-		StelUtils::equToEcl(ra_equ, dec_equ, ecl, &lambda, &beta);
-		if (lambda<0) lambda+=2.0*M_PI;
-		map.insert("elong", lambda*180./M_PI);
-		map.insert("elat", beta*180./M_PI);
-	}
-
-	// magnitude
-	map.insert("vmag", obj->getVMagnitude(core));
-	map.insert("vmage", obj->getVMagnitudeWithExtinction(core));
-
-	// angular size
-	double angularSize = 2.*obj->getAngularSize(core)*M_PI/180.;
-	bool sign;
-	double deg;
-	StelUtils::radToDecDeg(angularSize, sign, deg);
-	if (!sign)
-		deg *= -1;
-	map.insert("size", angularSize);
-	map.insert("size-dd", deg);
-	map.insert("size-deg", StelUtils::radToDecDegStr(angularSize, 5));
-	map.insert("size-dms", StelUtils::radToDmsStr(angularSize, true));
-
-	if (obj->getType().toLower()=="planet" && obj->getEnglishName()!="Sun")
-	{
-		SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
-		map.insert("distance", obj->getJ2000EquatorialPos(core).length());
-		double phase = ssmgr->getPhaseForPlanet(obj->getEnglishName());
-		map.insert("phase", phase);
-		map.insert("illumination", 100.*phase);
-		double phaseAngle = ssmgr->getPhaseAngleForPlanet(obj->getEnglishName());
-		map.insert("phase-angle", phaseAngle);
-		map.insert("phase-angle-dms", StelUtils::radToDmsStr(phaseAngle));
-		map.insert("phase-angle-deg", StelUtils::radToDecDegStr(phaseAngle));
-		double elongation = ssmgr->getElongationForPlanet(obj->getEnglishName());
-		map.insert("elongation", elongation);
-		map.insert("elongation-dms", StelUtils::radToDmsStr(elongation));
-		map.insert("elongation-deg", StelUtils::radToDecDegStr(elongation));
-		map.insert("ptype", ssmgr->getPlanetType(obj->getEnglishName()));
-	}
-
-	// english name or designation & localized name
-	map.insert("name", obj->getEnglishName());
-	map.insert("localized-name", obj->getNameI18n());
-
-	return map;
-}
-
+	return StelObjectMgr::getObjectInfo(obj);
+}
 
 void StelMainScriptAPI::clear(const QString& state)
 {
 
=== modified file 'src/scripting/StelMainScriptAPI.hpp'
--- src/scripting/StelMainScriptAPI.hpp	2017-02-04 14:15:20 +0000
+++ src/scripting/StelMainScriptAPI.hpp	2017-03-09 14:02:12 +0000
@@ -173,62 +173,29 @@
 	//! - size-deg : angular size in decimal degrees (formatted string)
 	//! - size-dms : angular size in DMS format
 	//! - localized-name : localized name
+	//! The returned map can contain other information. For example, Solar System objects add:
 	//! - distance : distance to object in AU (for Solar system objects only!)
-	//! - phase : phase of object (for Solar system objects only!)
-	//! - illumination : phase of object in percentages (for Solar system objects only!)
+	//! - phase : phase (illuminated fraction, 0..1) of object (for Solar system objects only!)
+	//! - illumination : phase of object in percent (0..100) (for Solar system objects only!)
 	//! - phase-angle : phase angle of object in radians (for Solar system objects only!)
 	//! - phase-angle-dms : phase angle of object in DMS (for Solar system objects only!)
 	//! - phase-angle-deg : phase angle of object in decimal degrees (for Solar system objects only!)
 	//! - elongation : elongation of object in radians (for Solar system objects only!)
 	//! - elongation-dms : elongation of object in DMS (for Solar system objects only!)
 	//! - elongation-deg : elongation of object in decimal degrees (for Solar system objects only!)
-	//! - ptype : object type (for Solar system objects only!)
+	//! Other StelObject derivates, also those defined in plugins, may add more,
+	//! these fields are documented in the respective classes, or simply try what you get:
+	//! You can print a complete set of entries into output with the following commands:
+	//! @code
+	//! map=core.getSelectedObjectInfo();
+	//! core.output(core.mapToString(map));
+	//! @endcode
 	QVariantMap getObjectInfo(const QString& name);
 
-	//! Fetch a map with data about an latest selected object's position, magnitude and so on
-	//! @return a map of object data.  Keys:
-	//! - altitude : apparent altitude angle in decimal degrees
-	//! - azimuth : apparent azimuth angle in decimal degrees	
-	//! - altitude-geometric : geometric altitude angle in decimal degrees
-	//! - azimuth-geometric : geometric azimuth angle in decimal degrees	
-	//! - ra : right ascension angle (current date frame) in decimal degrees
-	//! - dec : declination angle in (current date frame) decimal degrees	
-	//! - raJ2000 : right ascension angle (J2000 frame) in decimal degrees
-	//! - decJ2000 : declination angle in (J2000 frame) decimal degrees	
-	//! - glong : galactic longitude in decimal degrees
-	//! - glat : galactic latitude in decimal degrees
-	//! - sglong : supergalactic longitude in decimal degrees
-	//! - sglat : supergalactic latitude in decimal degrees
-	//! - elong : ecliptic longitude in decimal degrees (on Earth only!)
-	//! - elat : ecliptic latitude in decimal degrees (on Earth only!)
-	//! - elongJ2000 : ecliptic longitude (Earth's J2000 frame) in decimal degrees
-	//! - elatJ2000 : ecliptic latitude (Earth's J2000 frame) in decimal degrees
-	//! - vmag : visual magnitude
-	//! - vmage : visual magnitude (extincted)	
-	//! - size: angular size in radians
-	//! - size-dd : angular size in decimal degrees
-	//! - size-deg : angular size in decimal degrees (formatted string)
-	//! - size-dms : angular size in DMS format
-	//! - name : english name
-	//! - localized-name : localized name
-	//! - distance : distance to object in AU (for Solar system objects only!)
-	//! - phase : phase of object (for Solar system objects only!)
-	//! - illumination : phase of object in percentages (for Solar system objects only!)
-	//! - phase-angle : phase angle of object in radians (for Solar system objects only!)
-	//! - phase-angle-dms : phase angle of object in DMS (for Solar system objects only!)
-	//! - phase-angle-deg : phase angle of object in decimal degrees (for Solar system objects only!)
-	//! - elongation : elongation of object in radians (for Solar system objects only!)
-	//! - elongation-dms : elongation of object in DMS (for Solar system objects only!)
-	//! - elongation-deg : elongation of object in decimal degrees (for Solar system objects only!)
-	//! - ptype : object type (for Solar system objects only!)
+	//! Fetch a map with data about the latest selected object's position, magnitude and so on
+	//! @return a map of object data.  See description for getObjectInfo(const QString& name);
 	QVariantMap getSelectedObjectInfo();
 
-public:
-	//! Called by getSelectedObjectInfo() and getObjectInfo(name). Not useful to be scriptable, not a slot!
-	//! The static method can be called more easily by other components.
-	static QVariantMap getObjectInfo(const StelObjectP obj);
-
-public slots:
 	//! Clear the display options, setting a "standard" view.
 	//! Preset states:
 	//! - natural : azimuthal mount, atmosphere, landscape,
@@ -735,6 +702,12 @@
 	//! @param s the message to be displayed on the output file.
 	void output(const QString& s) const;
 
+	//! print contents of a QVariantMap as []-delimited list of [ "key" = <value>] lists.
+	//! @param map QVariantMap e.g. from getObjectInfo() or getLocationInfo()
+	//! @note string values are surrounded with ", simple numeric types are printed as themselves.
+	//! @note More complicated value types like lists are only indicated by their type name. You must extract those (and their contents) yourself.
+	QString mapToString(const QVariantMap &map) const;
+
 	//! Reset (clear) output file
 	void resetOutput(void) const;