Merge pull request #28 from corquaid/dev

feat: undocking of SpaceX Crew-7 Dragon spacecraft
corquaid · Mar 11, 2024 · acda132 · acda132
2 parents 61cf607 + 46e8785
commit acda132
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 112 deletions.
diff --git a/JSON/iss-docked-spacecraft.json b/JSON/iss-docked-spacecraft.json
@@ -1,36 +1,8 @@
 {
-  "number": 6,
+  "number": 5,
   "spacecraft": [
     {
       "id": 1,
-      "name": "Crew-7 Dragon",
-      "country": "United States",
-      "flag_code": "us",
-      "operator": "SpaceX",
-      "manufacturer": "SpaceX",
-      "spacecraft_name": "Endurance",
-      "launched": 1693027620,
-      "launch_site": "KSC, LC-39A",
-      "iss": true,
-      "docked": 1693134960,
-      "docking_port": "Harmony zenith",
-      "launch_mass": 12519,
-      "payload_mass": null,
-      "launch_vehicle": "Falcon 9",
-      "launch_vehicle_name": "B1081.1",
-      "mission_type": "Crew",
-      "crew": [
-        "Jasmin Moghbeli",
-        "Andreas Mogensen",
-        "Satoshi Furukawa",
-        "Konstantin Borisov"
-      ],
-      "mission_patch": "https://upload.wikimedia.org/wikipedia/commons/b/b3/SpaceX_Crew-7_logo.png",
-      "url": "https://en.wikipedia.org/wiki/SpaceX_Crew-7",
-      "image": "https://pbs.twimg.com/media/F4WMwLEaEAADi9_?format=jpg&name=4096x4096"
-    },
-    {
-      "id": 2,
       "name": "Soyuz MS-24",
       "country": "Russia",
       "flag_code": "ru",
@@ -53,7 +25,7 @@
       "image": "https://blogs.nasa.gov/spacestation/wp-content/uploads/sites/240/2023/09/blog_soyuzms24_approach.jpg"
     },
     {
-      "id": 3,
+      "id": 2,
       "name": "Progress MS-25",
       "country": "Russia",
       "flag_code": "ru",
@@ -76,7 +48,7 @@
       "image": "https://i.ibb.co/PG8J4G0/Progress-86-Cargo-Craft-Approaches-Space-Station-1536x1024.jpg"
     },
     {
-      "id": 4,
+      "id": 3,
       "name": "Cygnus NG-20",
       "country": "United States",
       "flag_code": "us",
@@ -99,7 +71,7 @@
       "image": "https://blogs.nasa.gov/spacestation/wp-content/uploads/sites/240/2024/01/ng20capture.png"
     },
     {
-      "id": 5,
+      "id": 4,
       "name": "Progress MS-26",
       "country": "Russia",
       "flag_code": "ru",
@@ -122,7 +94,7 @@
       "image": "https://i.ibb.co/rwd7VjK/Tb7c2ah5-Vx4-Jn-ZZJpmdyw-E-1200-80-jpg.webp"
     },
     {
-      "id": 6,
+      "id": 5,
       "name": "Crew-8 Dragon",
       "country": "United States",
       "flag_code": "us",

diff --git a/JSON/people-in-space.json b/JSON/people-in-space.json
@@ -1,5 +1,5 @@
 {
-  "number": 14,
+  "number": 10,
   "iss_expedition": 70,
   "expedition_patch": "https://upload.wikimedia.org/wikipedia/commons/6/65/ISS_Expedition_70_Patch.png",
   "expedition_url": "https://en.wikipedia.org/wiki/Expedition_70",
@@ -9,79 +9,11 @@
   "people": [
     {
       "id": 1,
-      "name": "Jasmin Moghbeli",
-      "country": "United States",
-      "flag_code": "us",
-      "agency": "NASA",
-      "position": "Flight Engineer",
-      "spacecraft": "Crew-7 Dragon",
-      "launched": 1693027620,
-      "iss": true,
-      "days_in_space": 0,
-      "url": "https://en.wikipedia.org/wiki/Jasmin_Moghbeli",
-      "image": "https://upload.wikimedia.org/wikipedia/commons/d/dc/Jasmin_Moghbeli_official_portrait.jpg",
-      "instagram": "https://www.instagram.com/astrojaws/",
-      "twitter": "https://twitter.com/AstroJaws",
-      "facebook": "https://www.facebook.com/AstroJaws/"
-    },
-    {
-      "id": 2,
-      "name": "Andreas Mogensen",
-      "country": "Denmark",
-      "flag_code": "dk",
-      "agency": "ESA",
-      "position": "Commander",
-      "spacecraft": "Crew-7 Dragon",
-      "launched": 1693027620,
-      "iss": true,
-      "days_in_space": 10,
-      "url": "https://en.wikipedia.org/wiki/Andreas_Mogensen",
-      "image": "https://upload.wikimedia.org/wikipedia/commons/f/f0/Andreas_Mogensen_official_portrait.jpg",
-      "instagram": "https://www.instagram.com/astro_andreas/",
-      "twitter": "https://twitter.com/Astro_Andreas",
-      "facebook": "https://www.facebook.com/ESAAndreasMogensen/"
-    },
-    {
-      "id": 3,
-      "name": "Satoshi Furukawa",
-      "country": "Japan",
-      "flag_code": "jp",
-      "agency": "JAXA",
-      "position": "Flight Engineer",
-      "spacecraft": "Crew-7 Dragon",
-      "launched": 1693027620,
-      "iss": true,
-      "days_in_space": 167,
-      "url": "https://en.wikipedia.org/wiki/Satoshi_Furukawa",
-      "image": "https://upload.wikimedia.org/wikipedia/commons/3/39/Satoshi_Furukawa_%28cropped%29.jpg",
-      "instagram": "",
-      "twitter": "https://twitter.com/Astro_Satoshi",
-      "facebook": ""
-    },
-    {
-      "id": 4,
-      "name": "Konstantin Borisov",
-      "country": "Russia",
-      "flag_code": "ru",
-      "agency": "Roscosmos",
-      "position": "Flight Engineer",
-      "spacecraft": "Crew-7 Dragon",
-      "launched": 1693027620,
-      "iss": true,
-      "days_in_space": 0,
-      "url": "https://en.wikipedia.org/wiki/Konstantin_Borisov",
-      "image": "https://i.ibb.co/sJmHCKF/This-is-Konstantin-Borisov.jpg",
-      "instagram": "",
-      "twitter": "",
-      "facebook": ""
-    },
-    {
-      "id": 5,
       "name": "Oleg Kononenko",
       "country": "Russia",
       "flag_code": "ru",
       "agency": "Roscosmos",
-      "position": "Flight Engineer",
+      "position": "Commander",
       "spacecraft": "Soyuz MS-24",
       "launched": 1694785440,
       "iss": true,
@@ -93,7 +25,7 @@
       "facebook": ""
     },
     {
-      "id": 6,
+      "id": 2,
       "name": "Nikolai Chub",
       "country": "Russia",
       "flag_code": "ru",
@@ -110,7 +42,7 @@
       "facebook": ""
     },
     {
-      "id": 7,
+      "id": 3,
       "name": "Loral O'Hara",
       "country": "United States",
       "flag_code": "us",
@@ -127,7 +59,7 @@
       "facebook": ""
     },
     {
-      "id": 8,
+      "id": 4,
       "name": "Tang Hongbo",
       "country": "China",
       "flag_code": "cn",
@@ -144,7 +76,7 @@
       "facebook": ""
     },
     {
-      "id": 9,
+      "id": 5,
       "name": "Tang Shengjie",
       "country": "China",
       "flag_code": "cn",
@@ -161,7 +93,7 @@
       "facebook": ""
     },
     {
-      "id": 10,
+      "id": 6,
       "name": "Jiang Xinlin",
       "country": "China",
       "flag_code": "cn",
@@ -178,7 +110,7 @@
       "facebook": ""
     },
     {
-      "id": 11,
+      "id": 7,
       "name": "Matthew Dominick",
       "country": "United States",
       "flag_code": "us",
@@ -195,7 +127,7 @@
       "facebook": "https://www.facebook.com/astro.matthew.dominick"
     },
     {
-      "id": 12,
+      "id": 8,
       "name": "Michael Barratt",
       "country": "United States",
       "flag_code": "us",
@@ -212,7 +144,7 @@
       "facebook": ""
     },
     {
-      "id": 13,
+      "id": 9,
       "name": "Jeanette Epps",
       "country": "United States",
       "flag_code": "us",
@@ -229,7 +161,7 @@
       "facebook": "https://www.facebook.com/people/Jeanette-Epps/pfbid02qGv6poB5B37XjuzkrTaH9a8UjsPF9MrxRYnJVPe2hFYodgqq5VEoCuEG9CznMJjEl/"
     },
     {
-      "id": 14,
+      "id": 10,
       "name": "Alexander Grebenkin",
       "country": "Russia",
       "flag_code": "ru",