From 60a37e1ffbe700b5700c6c3880db64f3abf57afa Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 22 Mar 2015 16:12:42 +0800 Subject: [PATCH] Planets: Add Moon data, Update triggers --- lib/DDG/Goodie/SolarSystem.pm | 2 +- share/goodie/solar_system/objects.yml | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/DDG/Goodie/SolarSystem.pm b/lib/DDG/Goodie/SolarSystem.pm index e55f809e5..3e68ddaa4 100644 --- a/lib/DDG/Goodie/SolarSystem.pm +++ b/lib/DDG/Goodie/SolarSystem.pm @@ -19,7 +19,7 @@ topics 'special_interest'; attribution github => ["MrChrisW", "Chris Wilson"], web => ["http://chrisjwilson.com", "Chris Wilson"]; -my @triggers = ( 'earth', 'jupiter', 'mars', 'mercury', 'neptune', 'saturn', 'uranus', 'venus', 'pluto', 'sun'); +my @triggers = ( 'earth', 'jupiter', 'mars', 'mercury', 'neptune', 'saturn', 'uranus', 'venus', 'pluto', 'sun', 'moon'); my @attributesArray = ( 'size', 'radius', 'volume', 'mass', 'surface area', 'area'); diff --git a/share/goodie/solar_system/objects.yml b/share/goodie/solar_system/objects.yml index 213797a5d..2365590f7 100644 --- a/share/goodie/solar_system/objects.yml +++ b/share/goodie/solar_system/objects.yml @@ -168,4 +168,21 @@ pluto: effective_temperature: -233/-223 (min/max) °C effective_temperature_imperial: -387/-369 (min/max) °F effective_temperature_scientific: 40/50 K - density: 2.050 g/cm3 \ No newline at end of file + density: 2.050 g/cm3 +moon: + radius: 1737.5 km + radius_imperial: 1079.6 mi + radius_scientific: 1.738 x 103 km + surface_area: 37,936,694.79 km2 + surface_area_imperial: 14,647,439.75 m2 + surface_area_scientific: 3.793669 x 107 km2 + volume: 21,971,669,064 km3 + volume_imperial: 5,271,283,735.8 mi3 + volume_scientific: 2.197 x 1010 km3 + mass: 73,476,730,924,573,500,000,000 kg + mass_imperial: 161,988,463,175,900,000,000,000 lbs + mass_scientific: 7.3477 x 1022 kg + effective_temperature: -233/123 (min/max) °C + effective_temperature_imperial: -387/253 (min/max) °F + effective_temperature_scientific: 40/396 K + density: 3.344 g/cm3 \ No newline at end of file