Merge pull request #10 from waterskier2007/master

tweak to launchpads syntax

Author: jakewmeyer

data/dragon.rb

@@ -1,5 +1,5 @@
 $dragon = {
-dragon: {
+    id: 'dragon',
   name: 'Dragon 1',
   active: true,
   sidewall_angle_deg: 15,
@@ -72,5 +72,4 @@
     meters: 3.7,
     feet: 12
   }
- }
 }

data/falcon9.rb

@@ -1,5 +1,5 @@
 $falcon9 = {
-falcon9: {
+    id: 'falcon9',
   name: 'Falcon 9',
   active: true,
   stages: 2,
@@ -97,5 +97,4 @@
     material: 'carbon fiber'
   },
   description: 'Falcon 9 is a two-stage rocket designed and manufactured by SpaceX for the reliable and safe transport of satellites and the Dragon spacecraft into orbit.'
- }
 }

data/falcon_heavy.rb

@@ -1,5 +1,5 @@
 $falcon_heavy = {
-falcon_heavy: {
+    id: 'falcon_heavy',
   name: 'Falcon Heavy',
   active: false,
   stages: 2,
@@ -101,5 +101,4 @@
     material: 'carbon fiber'
   },
   description: 'With the ability to lift into orbit over 54 metric tons (119,000 lb)--a mass equivalent to a 737 jetliner loaded with passengers, crew, luggage and fuel--Falcon Heavy can lift more than twice the payload of the next closest operational vehicle, the Delta IV Heavy, at one-third the cost.'
- }
 }

data/launchpads.rb

@@ -1,33 +1,36 @@
 $launchpads = {
   test_locations: [
-    RDF: {
-    name: 'Rocket Development Facility',
-    city: 'McGregor',
-    state: 'Texas',
-    size_acres: 4000,
-    year_built: 2003,
-    engines_tested: {
-      engine_1: 'Merlin',
-      engine_2: 'Draco'
-    },
-    yearly_tests: 400,
-    daily_tests: 2
+    {
+        id: 'RDF',
+        name: 'Rocket Development Facility',
+        city: 'McGregor',
+        state: 'Texas',
+        size_acres: 4000,
+        year_built: 2003,
+        engines_tested: {
+          engine_1: 'Merlin',
+          engine_2: 'Draco'
+        },
+        yearly_tests: 400,
+        daily_tests: 2
     }
   ],
   launchpads: [
-    kwajalein_atoll: {
-      full_name: 'unknown',
-      status: 'retired',
-      location: {
-        name: 'Omelek Island',
-        region: 'Marshall Islands',
-        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.'
+      {
+        id: 'kwajalein_atoll',
+        full_name: 'unknown',
+        status: 'retired',
+        location: {
+            name: 'Omelek Island',
+            region: 'Marshall Islands',
+            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.'
     },
-    ccafs_slc_40: {
+      {
+        id: 'ccafs_slc_40',
       full_name: 'Cape Canaveral Air Force Station Space Launch Complex 40',
       status: 'under construction',
       location: {
@@ -39,7 +42,8 @@
       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.'
     },
-    ccafs_lc_13: {
+    {
+        id: 'ccafs_lc_13',
       full_name: 'Cape Canaveral Air Force Station Space Launch Complex 13',
       status: 'active',
       location: {
@@ -51,7 +55,8 @@
       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.'
     },
-    ksc_lc_39a: {
+    {
+        id: 'ksc_lc_39a',
       full_name: 'Kennedy Space Center Launch Complex 39A',
       status: 'active',
       location: {
@@ -63,7 +68,8 @@
       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.'
     },
-    vafb_slc_3w: {
+    {
+        id: 'vafb_slc_3w',
       full_name: 'Vandenberg Air Force Base Space Launch Complex 3W',
       status: 'retired',
       location: {
@@ -75,7 +81,8 @@
       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.'
     },
-     vafb_slc_4e: {
+     {
+         id: 'vafb_slc_4e',
       full_name: 'Vandenberg Air Force Base Space Launch Complex 4E',
       status: 'active',
       location: {
@@ -87,7 +94,8 @@
       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.'
     },
-    vafb_slc_4w: {
+    {
+        id: 'vafb_slc_4w',
       full_name: 'Vandenberg Air Force Base Space Launch Complex 4W',
       status: 'active',
       location: {
@@ -99,7 +107,8 @@
       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.'
     },
-    stls: {
+    {
+        id: 'stls',
       full_name: 'SpaceX South Texas Launch Site',
       status: 'under construction',
       location: {