Change directions to include new directory structure for all problems and add distance between two points solution

Author: dansackett

README.md

@@ -40,7 +40,7 @@ Numbers
 
 **Alarm Clock** – A simple clock where it plays a sound after X number of minutes/seconds or at a particular time.
 
-**Distance Between Two Cities** – Calculates the distance between two cities and allows the user to specify a unit of distance. This program may require finding coordinates for the cities like latitude and longitude.
+[**Distance Between Two Cities**](https://github.com/dansackett/Projects/blob/master/_numbers/distance.py) – Calculates the distance between two cities and allows the user to specify a unit of distance. This program may require finding coordinates for the cities like latitude and longitude.
 
 [**Credit Card Validator**](https://github.com/dansackett/Projects/blob/master/_numbers/cc_validator.py) – Takes in a credit card number from a common credit card vendor (Visa, MasterCard, American Express, Discoverer) and validates it to make sure that it is a valid number (look into how credit cards use a checksum).
 

_numbers/bin_dec.py

@@ -5,7 +5,7 @@
 
 Call By
 - python
-- from numbers.bin_dec import converter
+- from _numbers.bin_dec import converter
 - converter()
 
 """

_numbers/calc.py

@@ -5,7 +5,7 @@
 
 Call By
 - python
-- from numbers.calc import calc
+- from _numbers.calc import calc
 - calc()
 
 """

_numbers/cc_validator.py

@@ -13,7 +13,7 @@
 
 Call By
 - python
-- from numbers.cc_validator import validate
+- from _numbers.cc_validator import validate
 - validate()
 
 """

_numbers/change.py

@@ -12,7 +12,7 @@
 
 Call By
 - python
-- from numbers.change import change
+- from _numbers.change import change
 - change()
 
 """

_numbers/distance.py

@@ -0,0 +1,64 @@
+"""
+Distance Between Two Cities
+- Calculates the distance between two cities and allows the user to specify
+a unit of distance. This program may require finding coordinates for the
+cities like latitude and longitude.
+
+This will require you to download the geopy module located here:
+- https://code.google.com/p/geopy/
+- pip install geopy
+
+It uses the Haversine formula to find an approximate distance between the points.
+- http://en.wikipedia.org/wiki/Haversine_formula
+
+Call By
+- python
+- from _numbers.distance import distance
+- distance()
+
+"""
+from geopy import geocoders
+import math
+
+
+def distance():
+    point1 = raw_input('Enter a city and state ex: \'Tampa, FL\': ')
+    point2 = raw_input('Enter another city and state ex: \'Tampa, FL\': ')
+
+    # Convert the typed locations to coordinates
+    try:
+        g = geocoders.GoogleV3()
+        place1, (lat1, lng1) = g.geocode(point1)
+        place2, (lat2, lng2) = g.geocode(point2)
+
+        # Radians measurements for angles
+        lat1 = math.radians(lat1)
+        lat2 = math.radians(lat2)
+        lng1 = math.radians(lng1)
+        lng2 = math.radians(lng2)
+
+        # Haversine Formula
+        a = (1 - math.cos((2 * (lat2 - lat1)) / 2.0)) / 2.0
+        b = math.cos(lat1) * math.cos(lat2)
+        c = (1 - math.cos((2 * (lng2 - lng1)) / 2.0)) / 2.0
+        d = math.sqrt(abs(a + (b * c)))
+        e = 2 * 6371 * math.asin(d)
+
+        while True:
+            output = raw_input('What units would you like the distance in? (Miles = M, Kilometers = KM): ').lower()
+
+            if output not in ['m', 'km']:
+                print 'Choose between K and M, please.'
+            else:
+                break
+
+        if output == 'km':
+            print '\nThe distance between {} and {} is:'.format(place1, place2)
+            print '{0:.2f} km'.format(e)
+        else:
+            miles = e * 0.621371192
+            print '\nThe distance between {} and {} is:'.format(place1, place2)
+            print '{0:.2f} miles'.format(miles)
+
+    except (ValueError, geocoders.base.GeocoderError):
+        print 'We couldn\'t find one of those locations!'

_numbers/factorial.py

@@ -6,7 +6,7 @@
 
 Call By
 - python
-- from numbers.factorial import factorial
+- from _numbers.factorial import factorial
 - factorial()
 
 """

_numbers/fib.py

@@ -5,7 +5,7 @@
 
 Call By
 - python
-- from numbers.fib import fib
+- from _numbers.fib import fib
 - fib()
 
 """

_numbers/find_pi.py

@@ -7,7 +7,7 @@
 
 Call By
 - python
-- from numbers.find_pi import find_pi
+- from _numbers.find_pi import find_pi
 - find_pi()
 
 """

_numbers/happy_numbers.py

@@ -10,7 +10,7 @@
 
 Call By
 - python
-- from numbers.happy_numbers import happy
+- from _numbers.happy_numbers import happy
 - happy()
 
 """