Add speed base + units. (#4282)

duckduckgo · Jun 12, 2017 · 9b7556f · 9b7556f
1 parent e71b083
commit 9b7556f
Show file tree

Hide file tree

Showing 3 changed files with 112 additions and 5 deletions.
diff --git a/share/goodie/conversions/conversions.js b/share/goodie/conversions/conversions.js
@@ -139,7 +139,10 @@ DDH.conversions = DDH.conversions || {};
             {name: 'dbar',      factor:'0.1 bar'},
             {name: 'kbar',      factor:'1000 bar'},
             {name: 'Mbar',      factor:'100000 bar'},
-            {name: 'Gbar',      factor:'100000000 bar'}
+            {name: 'Gbar',      factor:'100000000 bar'},
+
+            // CUSTOM SPEED UNITS
+            {name: 'knot',     factor: '1.15078 mi/h'}
         ],
 
         // custom units that are not supported by math.js
@@ -508,6 +511,17 @@ DDH.conversions = DDH.conversions || {};
             ],
             defaults: ['Pa', 'psi']
         },
+        speed: {
+            name: "Speed",
+            units: [
+                { symbol: 'mi/h',   name: 'Miles per hour' },
+                { symbol: 'ft/s',   name: 'Foot per second' },
+                { symbol: 'm/s',    name: 'Metre per second' },
+                { symbol: 'km/h',   name: 'Kilometre per hour'},
+                { symbol: 'knot',   name: 'Knot'},
+            ],
+            defaults: ['mi/h', 'km/h']
+        },
         temperature: {
             name: "Temperature",
             units: [

diff --git a/share/goodie/conversions/triggers.yml b/share/goodie/conversions/triggers.yml
@@ -1949,3 +1949,73 @@ aliases:
   - exa hz
 type: frequency
 unit: exahertz
+---
+aliases:
+  - foot per second
+  - feet per second
+  - foot per sec
+  - feet per sec
+  - foot per s
+  - feet per s
+  - foot second
+  - feet second
+  - ft/s
+  - ft/ps
+  - feet/ps
+  - foot/ps
+type: speed
+unit: ft/s
+---
+aliases:
+  - meter per second
+  - meters per second
+  - metre per second
+  - metres per second
+  - meter per sec
+  - meters per sec
+  - metre per sec
+  - metres per sec
+  - meter per s
+  - meters per s
+  - metre per s
+  - metres per s
+  - meter second
+  - meters second
+  - metre second
+  - metres second
+  - m/ps
+  - mps
+  - meter/ps
+  - meters/ps
+  - metre/ps
+  - metres/ps
+type: speed
+unit: m/s
+---
+aliases:
+  - miles per hour
+  - miles an hour
+  - miles ph 
+  - mile ph
+  - mph
+type: speed
+unit: mi/h
+---
+aliases:
+  - kilometers per hour
+  - kilometers an hour
+  - kilometers ph 
+  - kilometers ph
+  - kmh
+  - kmph
+  - kph
+type: speed
+unit: km/h
+---
+aliases:
+  - knot
+  - knots
+  - kn
+  - kt
+type: speed
+unit: knot
diff --git a/t/Conversions.t b/t/Conversions.t
@@ -2053,10 +2053,33 @@ ddg_goodie_test(
 			physical_quantity => 'mass'
      	})
 	),
+	# speed trigger testing
+	'10 mph to Feet per s' => test_zci(
+		'', structured_answer => make_answer({
+			raw_input => '10',
+			from_unit => 'mi/h',
+			to_unit => 'ft/s',
+			physical_quantity => 'speed'
+		})
+	),
+	'88.8 kmh to kn' => test_zci(
+		'', structured_answer => make_answer({
+			raw_input => '88.8',
+			from_unit => 'km/h',
+			to_unit => 'knot',
+			physical_quantity => 'speed'
+		})
+	),
+	'88.8 kmh to mps' => test_zci(
+		'', structured_answer => make_answer({
+			raw_input => '88.8',
+			from_unit => 'km/h',
+			to_unit => 'm/s',
+			physical_quantity => 'speed'
+		})
+	),
 
-
-
-	 # natural language queries
+	# natural language queries
 	'unit converter' => test_zci(
 		'',
 		 structured_answer => make_answer_lang()
@@ -2110,8 +2133,8 @@ ddg_goodie_test(
 			physical_quantity => 'angle'
 		})
 	 ),
-	# Intentionally untriggered
 
+	# Intentionally untriggered
 	'BTU to KwH'                      => undef,
 	'5 inches in 5 meters'            => undef,
 	'convert 1 cm to 2 mm'            => undef,