Merge pull request duckduckgo#3369 from 122131/test

Geometry Formula Cheat Sheet: Added perimeter and aliases
urkonn · Jul 12, 2016 · cf92467 · cf92467
2 parents 045e528 + 0b06489
commit cf92467
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 5 deletions.
diff --git a/share/goodie/cheat_sheets/json/geometry-formula.json b/share/goodie/cheat_sheets/json/geometry-formula.json
@@ -9,13 +9,13 @@
     },
 
     "aliases": [
-        "volume formulas", "area formulas", "surface area formulas"
+        "volume", "area", "surface area", "geometry", "perimeter"
     ],
 
     "template_type": "reference",
-
     "section_order": [
         "Area Formulas",
+        "Perimeter/Circumference Formulas",
         "Surface Area Formulas",
         "Volume Formulas"
     ],
@@ -36,7 +36,15 @@
             },
             {
                 "key": "Circle",
-                "val": "π × r²"
+                "val": "π × radius²"
+            },
+            {
+                "key": "Ellipse",
+                "val": "π × semimajor axis × semiminor axis"
+            },
+            {
+                "key": "Parallelogram",
+                "val": "base × height"
             },
             {
                 "key": "Trapezoid",
@@ -87,6 +95,28 @@
                 "val": "(1/3) × π × radius² × height"
             }
 
+        ],
+        "Perimeter/Circumference Formulas": [
+            {
+                "key": "Square",
+                "val": "side × 4"
+            },
+            {
+                "key": "Rectangle",
+                "val": "2 × (length + width)"
+            },
+            {
+                "key": "Triangle",
+                "val": "side1 + side2 + side3"
+            },
+            {
+                "key": "Circle",
+                "val": "2 × π × radius"
+            },
+            {
+                "key": "Parallelogram",
+                "val": "2 × (base + height)"
+            }
         ]
     }
-}
+}
diff --git a/share/goodie/cheat_sheets/triggers.yaml b/share/goodie/cheat_sheets/triggers.yaml
@@ -198,4 +198,7 @@ template_map:
 #
 # NOTE: IDs should be in alphabetical order (and the categories and triggers) as
 # much as possible to ensure it is as easy as possible to locate triggers.
-# custom_triggers:
+custom_triggers:
+  geometry_formula_cheat_sheet:
+    additional_categories:
+      - "math"