Merge pull request #11 from waterskier2007/master

use numeric values for lat/lng in launchpads

Author: jakewmeyer

app.rb

@@ -53,8 +53,7 @@ def hash_merge(*hashes)
 
 get '/vehicles' do
   content_type :json
-  merge = hash_merge($falcon9, $falcon_heavy, $dragon)
-  JSON.pretty_generate(merge)
+  JSON.pretty_generate([$falcon9, $falcon_heavy, $dragon])
 end
 
 get '/vehicles/falcon9' do

data/launchpads.rb

@@ -18,13 +18,13 @@
   launchpads: [
       {
         id: 'kwajalein_atoll',
-        full_name: 'unknown',
+        full_name: 'Kwajalein Atoll',
         status: 'retired',
         location: {
             name: 'Omelek Island',
             region: 'Marshall Islands',
-            latitude: '9.0477206',
-            longitude: '167.7431292'
+            latitude: 9.0477206,
+            longitude: 167.7431292
         },
         vehicles_launched: 'falcon 1',
         details: 'SpaceX original launch site, where all of the Falcon 1 launches occured. Abandoned as SpaceX decided against upgrading the pad to support Falcon 9.'
@@ -36,8 +36,8 @@
       location: {
         name: 'Cape Canaveral',
         region: 'Florida',
-        latitude: '28.5618571',
-        longitude: '-80.577366'
+        latitude: 28.5618571,
+        longitude: -80.577366
       },
       vehicles_launched: 'falcon 9',
       details: 'SpaceX primary Falcon 9 launch pad, where all east coast Falcon 9s launched prior to the AMOS-6 anomaly. Initially used to launch Titan rockets for Lockheed Martin. Heavily damaged by the AMOS-6 anomaly with repairs expected to be complete by late summer 2017.'
@@ -49,8 +49,8 @@
       location: {
         name: 'Cape Canaveral',
         region: 'Florida',
-        latitude: '28.4857244',
-        longitude: '-80.5449222'
+        latitude: 28.4857244,
+        longitude: -80.5449222
       },
       vehicles_launched: 'falcon 9',
       details: 'SpaceX east coast landing pad, where the historic first landing occurred. Originally used for early Atlas missiles and rockets from Lockheed Martin. Currently being expanded to add two smaller pads for Falcon Heavy RTLS missions.'
@@ -62,8 +62,8 @@
       location: {
         name: 'Cape Canaveral',
         region: 'Florida',
-        latitude: '28.6080585',
-        longitude: '-80.6039558'
+        latitude: 28.6080585,
+        longitude: -80.6039558
       },
       vehicles_launched: 'falcon 9',
       details: 'NASA historic launch pad that launched most of the Saturn V and Space Shuttle missions. Initially for Falcon Heavy launches, it is now launching all of SpaceX east coast missions due to the damage from the AMOS-6 anomaly. After SLC-40 repairs are complete, it will be upgraded to support Falcon Heavy, a process which will take about two months. In the future it will launch commercial crew missions and the Interplanetary Transport System.'
@@ -75,8 +75,8 @@
       location: {
         name: 'Vandenberg Air Force Base',
         region: 'California',
-        latitude: '34.6440904',
-        longitude: '120.5931438'
+        latitude: 34.6440904,
+        longitude: -120.5931438
       },
       vehicles_launched: 'falcon 9',
       details: 'SpaceX original west coast launch pad for Falcon 1. Performed a static fire but was never used for a launch and abandoned due to scheduling conflicts.'
@@ -88,8 +88,8 @@
       location: {
         name: 'Vandenberg Air Force Base',
         region: 'California',
-        latitude: '34.6440904',
-        longitude: '120.5931438'
+        latitude: 34.6440904,
+        longitude: -120.5931438
       },
       vehicles_launched: 'falcon 9',
       details: 'SpaceX primary west coast launch pad for polar orbits and sun synchronous orbits, primarily used for Iridium. Also intended to be capable of launching Falcon Heavy.'
@@ -101,8 +101,8 @@
       location: {
         name: 'Vandenberg Air Force Base',
         region: 'California',
-        latitude: '34.6332043',
-        longitude: '-120.6156234'
+        latitude: 34.6332043,
+        longitude: -120.6156234
       },
       vehicles_launched: 'falcon 9',
       details: 'SpaceX west coast landing pad, has not yet been used. Expected to first be used during the Formosat-5 launch.'
@@ -114,8 +114,8 @@
       location: {
         name: 'Boca Chica Village',
         region: 'Texas',
-        latitude: '25.9972641',
-        longitude: '-97.1560845'
+        latitude: 25.9972641,
+        longitude: -97.1560845
       },
       vehicles_launched: 'falcon 9',
       details: 'SpaceX new launch site currently under construction to help keep up with the Falcon 9 and Heavy manifests. Expected to be completed in late 2018. Initially will be limited to 12 flights per year, and only GTO launches.'