refactoring code, creating 'includes' directory

Author: techlord001

area.php

@@ -1,87 +1,6 @@
 <?php
-  function convertToSqMeters($value, $fromUnit)
-  {
-    switch ($fromUnit) {
-      case 'sqInches':
-        return $value * pow(0.0254, 2);
-        break;
-      case 'sqFeet':
-        return $value * pow(0.3048, 2);
-        break;
-      case 'sqYards':
-        return $value * pow(0.9144, 2);
-        break;
-      case 'sqMiles':
-        return $value * pow(1609.344, 2);
-        break;
-      case 'sqMillimeters':
-        return $value * pow(0.001, 2);
-        break;
-      case 'sqCentimeters':
-        return $value * pow(0.01, 2);
-        break;
-      case 'sqMeters':
-        return $value;
-        break;
-      case 'sqKilometers':
-        return $value * pow(1000, 2);
-        break;
-      case 'acres':
-        return $value * 4046.8564224;
-        break;
-      case 'hectares':
-        return $value * 10000;
-        break;
-      default:
-        return "Unsupported unit";
-    }
-  }
-
-  function convertFromSqMeters($value, $toUnit)
-  {
-    switch ($toUnit) {
-      case 'sqInches':
-        return $value / pow(0.0254, 2);
-        break;
-      case 'sqFeet':
-        return $value / pow(0.3048, 2);
-        break;
-      case 'sqYards':
-        return $value / pow(0.9144, 2);
-        break;
-      case 'sqMiles':
-        return $value / pow(1609.344, 2);
-        break;
-      case 'sqMillimeters':
-        return $value / pow(0.001, 2);
-        break;
-      case 'sqCentimeters':
-        return $value / pow(0.01, 2);
-        break;
-      case 'sqMeters':
-        return $value;
-        break;
-      case 'sqKilometers':
-        return $value / pow(1000, 2);
-        break;
-      case 'acres':
-        return $value / 4046.8564224;
-        break;
-      case 'hectares':
-        return $value / 10000;
-        break;
-      default:
-        return "Unsupported unit";
-    }
-  }
 
-  function convertSqLength($value, $fromUnit, $toUnit)
-  {
-    $meterValue = convertToSqMeters($value, $fromUnit);
-    $newValue = convertFromSqMeters($meterValue, $toUnit);
-
-    return $newValue;
-  }
+  require_once('includes/area.php');
 
   // Default empty variables
   $fromValue = '';

includes/area.php

@@ -0,0 +1,31 @@
+<?php
+	require_once('units.php');
+
+	function convertToSqMeters($value, $fromUnit)
+	{
+		$fromUnit = strtolower(str_replace('sq', '', $fromUnit));
+		if (array_key_exists($fromUnit, LENGTHS)) {
+			return $value * pow(LENGTHS[$fromUnit], 2);
+		} else {
+			return "Unsupported unit";
+		}
+	}
+
+	function convertFromSqMeters($value, $toUnit)
+	{
+		$toUnit = strtolower(str_replace('sq', '', $toUnit));
+		if (array_key_exists($toUnit, LENGTHS)) {
+			return $value / pow(LENGTHS[$toUnit], 2);			
+		} else {
+			return "Unsupported unit";
+		}
+	}
+
+	function convertSqLength($value, $fromUnit, $toUnit)
+	{
+		$meterValue = convertToSqMeters($value, $fromUnit);
+		$newValue = convertFromSqMeters($meterValue, $toUnit);
+
+		return $newValue;
+	}
+?>

includes/length.php

@@ -0,0 +1,29 @@
+<?php
+	require_once('units.php');
+
+	function convertToMeters($value, $fromUnit)
+	{
+		if (array_key_exists($fromUnit, LENGTHS)) {
+			return $value * LENGTHS[$fromUnit];
+		} else {
+			return "Unsupported unit";
+		}
+	}
+
+	function convertFromMeters($value, $toUnit)
+	{
+		if (array_key_exists($toUnit, LENGTHS)) {
+			return $value / LENGTHS[$toUnit];			
+		} else {
+			return "Unsupported unit";
+		}
+	}
+
+	function convertLength($value, $fromUnit, $toUnit)
+	{
+		$meterValue = convertToMeters($value, $fromUnit);
+		$newValue = convertFromMeters($meterValue, $toUnit);
+
+		return $newValue;
+	}
+?>

includes/units.php

@@ -0,0 +1,14 @@
+<?php
+	const LENGTHS = array(
+		"inches" => 0.0254,
+		"feet" => 0.3048,
+		"yards" => 0.9144,
+		"miles" => 1609.344,
+		"millimeters" => 0.001,
+		"centimeters" => 0.01,
+		"meters" => 1,
+		"kilometers" => 1000,
+		"acres" => 1000,
+		"hectares" => 1000,
+	);
+?>

length.php

@@ -1,75 +1,5 @@
 <?php
-  function convertToMeters($value, $fromUnit)
-  {
-    switch ($fromUnit) {
-      case 'inches':
-        return $value * 0.0254;
-        break;
-      case 'feet':
-        return $value * 0.3048;
-        break;
-      case 'yards':
-        return $value * 0.9144;
-        break;
-      case 'miles':
-        return $value * 1609.344;
-        break;
-      case 'millimeters':
-        return $value * 0.001;
-        break;
-      case 'centimeters':
-        return $value * 0.01;
-        break;
-      case 'meters':
-        return $value;
-        break;
-      case 'kilometers':
-        return $value * 1000;
-        break;
-      default:
-        return "Unsupported unit";
-    }
-  }
-
-  function convertFromMeters($value, $toUnit)
-  {
-    switch ($toUnit) {
-      case 'inches':
-        return $value / 0.0254;
-        break;
-      case 'feet':
-        return $value / 0.3048;
-        break;
-      case 'yards':
-        return $value / 0.9144;
-        break;
-      case 'miles':
-        return $value / 1609.344;
-        break;
-      case 'millimeters':
-        return $value / 0.001;
-        break;
-      case 'centimeters':
-        return $value / 0.01;
-        break;
-      case 'meters':
-        return $value;
-        break;
-      case 'kilometers':
-        return $value / 1000;
-        break;
-      default:
-        return "Unsupported unit";
-    }
-  }
-
-  function convertLength($value, $fromUnit, $toUnit)
-  {
-    $meterValue = convertToMeters($value, $fromUnit);
-    $newValue = convertFromMeters($meterValue, $toUnit);
-
-    return $newValue;
-  }
+  require_once('includes/length.php');
 
   // Default empty variables
   $fromValue = '';