adding speed conversion page and functions, including additional unit of knots

techlord001 · techlord001 · commit 098dac25657a · 2021-05-05T14:18:44.000+01:00
diff --git a/includes/floatToString.php b/includes/floatToString.php
@@ -3,7 +3,7 @@
 *
 * Function to convert scientic notation of a very large or
 * very small number into a readable float */
-	function floatToString($float, $precision = 20)
+	function floatToString($float, $precision = 10)
 		{
 			$float = (float) $float; // Confirm variable is float
 			$string = number_format($float, $precision, '.', ''); // Format number
diff --git a/includes/speed.php b/includes/speed.php
@@ -0,0 +1,31 @@
+<?php
+	require_once('length.php');
+	require_once('units.php');
+	require_once('floatToString.php');
+
+	function convertSpeed($value, $fromUnit, $toUnit)
+	{
+		if ($fromUnit == 'knots') {
+			$fromUnit = 'nauticalMilesPerHour';
+		}
+
+		if ($toUnit == 'knots') {
+			$toUnit = 'nauticalMilesPerHour';
+		}
+
+		list($fromDist, $fromTime) = explode('Per', $fromUnit);
+		list($toDist, $toTime) = explode('Per', $toUnit);
+
+		if ($fromTime == 'Hour') {
+			$value /= 3600;
+		}
+
+		$value = convertLength($value, $fromDist, $toDist);
+
+		if ($toTime == 'Hour') {
+			$value *= 3600;
+		}
+
+		return floatToString($value);
+	}
+?>
diff --git a/includes/units.php b/includes/units.php
@@ -10,6 +10,7 @@
 		"kilometers" => 1000,
 		"acres" => 1000,
 		"hectares" => 1000,
+		"nauticalMiles" => 1852
 	);
 
 	const VOLUME_UNITS = array(
diff --git a/mass.php b/mass.php
@@ -52,7 +52,7 @@
 					<?php
 						foreach ($massUnits as $unit) {
 							echo "<option value=\"" . camelCase($unit) . "\"";
-							if ($fromUnit == $unit) {
+							if ($fromUnit == camelCase($unit)) {
 								{
 									echo " selected";
 								}
@@ -70,7 +70,7 @@
 					<?php
 						foreach ($massUnits as $unit) {
 							echo "<option value=\"" . camelCase($unit) . "\"";
-							if ($toUnit == $unit) {
+							if ($toUnit == camelCase($unit)) {
 								{
 									echo " selected";
 								}
diff --git a/speed.php b/speed.php
@@ -0,0 +1,89 @@
+<?php
+
+  require_once('includes/speed.php');
+	require_once('includes/camelCase.php');
+
+  // Default empty variables
+  $fromValue = '';
+  $fromUnit = '';
+  $toUnit = '';
+  $toValue = '';
+
+  /* Check conversion request on submit */
+  if ($_POST['submit']) {
+    $fromValue = $_POST['fromValue'];
+    $fromUnit = $_POST['fromUnit'];
+    $toUnit = $_POST['toUnit'];
+
+    $toValue = convertSpeed($fromValue, $fromUnit, $toUnit);
+  }
+
+	$speedUnits = array(
+		"feet per second",
+		"miles per hour",
+		"meters per second",
+		"kilometers per hour",
+		"knots"
+	);
+?>
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="UTF-8">
+    <title>Convert Speed</title>
+    <link href="styles.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+
+  <div id="main-content">
+
+    <h1>Convert Speed</h1>
+
+    <form action="" method="post">
+
+      <div class="entry">
+        <label>From:</label>&nbsp;
+        <input type="text" name="fromValue" value="<?php { echo $fromValue;} ?>" />&nbsp;
+        <select name="fromUnit">
+					<?php
+						foreach ($speedUnits as $unit) {
+							echo "<option value=\"" . camelCase($unit) . "\"";
+							if ($fromUnit == camelCase($unit)) {
+								{
+									echo " selected";
+								}
+							}
+							echo ">" . ucwords($unit) . "</option>";
+						}
+					?>
+        </select>
+      </div>
+
+      <div class="entry">
+        <label>To:</label>&nbsp;
+        <input type="text" name="toValue" value="<?php { echo $toValue;} ?>" />&nbsp;
+        <select name="toUnit">
+					<?php
+						foreach ($speedUnits as $unit) {
+							echo "<option value=\"" . camelCase($unit) . "\"";
+							if ($toUnit == camelCase($unit)) {
+								{
+									echo " selected";
+								}
+							}
+							echo ">" . ucwords($unit) . "</option>";
+						}
+					?>
+        </select>
+
+      </div>
+
+      <input type="submit" name="submit" value="Submit" />
+    </form>
+
+    <br/>
+    <a href="index.php">Return to menu</a>
+
+  </div>
+</body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Function to convert scientic notation of a very large or`
`5`	`5`	`* very small number into a readable float */`
`6`		`- function floatToString($float, $precision = 20)`
	`6`	`+ function floatToString($float, $precision = 10)`
`7`	`7`	`{`
`8`	`8`	`$float = (float) $float; // Confirm variable is float`
`9`	`9`	`$string = number_format($float, $precision, '.', ''); // Format number`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@`
`52`	`52`	`<?php`
`53`	`53`	`foreach ($massUnits as $unit) {`
`54`	`54`	`echo "<option value=\"" . camelCase($unit) . "\"";`
`55`		`- if ($fromUnit == $unit) {`
	`55`	`+ if ($fromUnit == camelCase($unit)) {`
`56`	`56`	`{`
`57`	`57`	`echo " selected";`
`58`	`58`	`}`
`@@ -70,7 +70,7 @@`
`70`	`70`	`<?php`
`71`	`71`	`foreach ($massUnits as $unit) {`
`72`	`72`	`echo "<option value=\"" . camelCase($unit) . "\"";`
`73`		`- if ($toUnit == $unit) {`
	`73`	`+ if ($toUnit == camelCase($unit)) {`
`74`	`74`	`{`
`75`	`75`	`echo " selected";`
`76`	`76`	`}`