Merge pull request #32 from corquaid/dev

feat: update for undocking of Soyuz MS-24 and start of ISS Expedition 71
corquaid · Apr 6, 2024 · ce74726 · ce74726
2 parents 7aa3ab5 + 6b52125
commit ce74726
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 95 deletions.
diff --git a/JSON/iss-docked-spacecraft.json b/JSON/iss-docked-spacecraft.json
@@ -1,31 +1,8 @@
 {
-  "number": 7,
+  "number": 6,
   "spacecraft": [
     {
       "id": 1,
-      "name": "Soyuz MS-24",
-      "country": "Russia",
-      "flag_code": "ru",
-      "operator": "Roscosmos",
-      "manufacturer": "Energia",
-      "spacecraft_name": null,
-      "launched": 1694785440,
-      "launch_site": "Site 31/6, Baikonur",
-      "iss": true,
-      "docked": 1694796780,
-      "docking_port": "Rassvet nadir",
-      "launch_mass": null,
-      "payload_mass": null,
-      "launch_vehicle": "Soyuz 2.1a",
-      "launch_vehicle_name": null,
-      "mission_type": "Crew",
-      "crew": ["Oleg Kononenko", "Nikolai Chub", "Loral O'Hara"],
-      "mission_patch": "https://i.ibb.co/SB63sQB/soyuz-ms24-patch01-lg.jpg",
-      "url": "https://en.wikipedia.org/wiki/Soyuz_MS-24",
-      "image": "https://blogs.nasa.gov/spacestation/wp-content/uploads/sites/240/2023/09/blog_soyuzms24_approach.jpg"
-    },
-    {
-      "id": 2,
       "name": "Progress MS-25",
       "country": "Russia",
       "flag_code": "ru",
@@ -48,7 +25,7 @@
       "image": "https://i.ibb.co/PG8J4G0/Progress-86-Cargo-Craft-Approaches-Space-Station-1536x1024.jpg"
     },
     {
-      "id": 3,
+      "id": 2,
       "name": "Cygnus NG-20",
       "country": "United States",
       "flag_code": "us",
@@ -71,7 +48,7 @@
       "image": "https://blogs.nasa.gov/spacestation/wp-content/uploads/sites/240/2024/01/ng20capture.png"
     },
     {
-      "id": 4,
+      "id": 3,
       "name": "Progress MS-26",
       "country": "Russia",
       "flag_code": "ru",
@@ -94,7 +71,7 @@
       "image": "https://i.ibb.co/rwd7VjK/Tb7c2ah5-Vx4-Jn-ZZJpmdyw-E-1200-80-jpg.webp"
     },
     {
-      "id": 5,
+      "id": 4,
       "name": "Crew-8 Dragon",
       "country": "United States",
       "flag_code": "us",
@@ -122,7 +99,7 @@
       "image": "https://upload.wikimedia.org/wikipedia/commons/f/fd/Jsc2023e070781.jpg"
     },
     {
-      "id": 6,
+      "id": 5,
       "name": "CRS-30 Dragon",
       "country": "United States",
       "flag_code": "us",
@@ -145,7 +122,7 @@
       "image": "https://blogs.nasa.gov/spacestation/wp-content/uploads/sites/240/2024/03/dragon-docked.png"
     },
     {
-      "id": 7,
+      "id": 6,
       "name": "Soyuz MS-25",
       "country": "Russia",
       "flag_code": "ru",
@@ -162,7 +139,7 @@
       "launch_vehicle": "Soyuz 2.1a",
       "launch_vehicle_name": null,
       "mission_type": "Crew",
-      "crew": ["Oleg Novitsky", "Marina Vasilevskaya", "Tracy Caldwell-Dyson"],
+      "crew": ["Oleg Kononenko", "Nikolai Chub", "Tracy Caldwell-Dyson"],
       "mission_patch": "https://i.ibb.co/5czhYB9/soyuz-ms25-patch01-lg.jpg",
       "url": "https://en.wikipedia.org/wiki/Soyuz_MS-25",
       "image": "https://upload.wikimedia.org/wikipedia/commons/1/16/Expedition_71_Press_Conference_%28NHQ202403200036%29.jpg"

diff --git a/JSON/people-in-space.json b/JSON/people-in-space.json
@@ -1,11 +1,11 @@
 {
-  "number": 13,
-  "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",
-  "expedition_image": "https://upload.wikimedia.org/wikipedia/commons/6/6c/Iss070-s-002.jpg",
-  "expedition_start_date": 1695772800,
-  "expedition_end_date": 1711411199,
+  "number": 10,
+  "iss_expedition": 71,
+  "expedition_patch": "https://upload.wikimedia.org/wikipedia/commons/b/b4/ISS_Expedition_71_Patch.png",
+  "expedition_url": "https://en.wikipedia.org/wiki/Expedition_71",
+  "expedition_image": "https://upload.wikimedia.org/wikipedia/commons/8/81/The_official_Expedition_71_crew_portrait.jpg",
+  "expedition_start_date": 1712354400,
+  "expedition_end_date": 1727128800,
   "people": [
     {
       "id": 1,
@@ -43,23 +43,6 @@
     },
     {
       "id": 3,
-      "name": "Loral O'Hara",
-      "country": "United States",
-      "flag_code": "us",
-      "agency": "NASA",
-      "position": "Flight Engineer",
-      "spacecraft": "Soyuz MS-24",
-      "launched": 1694785440,
-      "iss": true,
-      "days_in_space": 0,
-      "url": "https://en.wikipedia.org/wiki/Loral_O%27Hara",
-      "image": "https://upload.wikimedia.org/wikipedia/commons/7/7f/Loral_O%27Hara_portrait_%28cropped%29.jpg",
-      "instagram": "",
-      "twitter": "https://twitter.com/lunarloral",
-      "facebook": ""
-    },
-    {
-      "id": 4,
       "name": "Tang Hongbo",
       "country": "China",
       "flag_code": "cn",
@@ -76,7 +59,7 @@
       "facebook": ""
     },
     {
-      "id": 5,
+      "id": 4,
       "name": "Tang Shengjie",
       "country": "China",
       "flag_code": "cn",
@@ -93,7 +76,7 @@
       "facebook": ""
     },
     {
-      "id": 6,
+      "id": 5,
       "name": "Jiang Xinlin",
       "country": "China",
       "flag_code": "cn",
@@ -110,7 +93,7 @@
       "facebook": ""
     },
     {
-      "id": 7,
+      "id": 6,
       "name": "Matthew Dominick",
       "country": "United States",
       "flag_code": "us",
@@ -127,7 +110,7 @@
       "facebook": "https://www.facebook.com/astro.matthew.dominick"
     },
     {
-      "id": 8,
+      "id": 7,
       "name": "Michael Barratt",
       "country": "United States",
       "flag_code": "us",
@@ -144,7 +127,7 @@
       "facebook": ""
     },
     {
-      "id": 9,
+      "id": 8,
       "name": "Jeanette Epps",
       "country": "United States",
       "flag_code": "us",
@@ -161,7 +144,7 @@
       "facebook": "https://www.facebook.com/people/Jeanette-Epps/pfbid02qGv6poB5B37XjuzkrTaH9a8UjsPF9MrxRYnJVPe2hFYodgqq5VEoCuEG9CznMJjEl/"
     },
     {
-      "id": 10,
+      "id": 9,
       "name": "Alexander Grebenkin",
       "country": "Russia",
       "flag_code": "ru",
@@ -178,41 +161,7 @@
       "facebook": ""
     },
     {
-      "id": 11,
-      "name": "Oleg Novitsky",
-      "country": "Russia",
-      "flag_code": "ru",
-      "agency": "Roscosmos",
-      "position": "Visitor",
-      "spacecraft": "Soyuz MS-25",
-      "launched": 1711193760,
-      "iss": true,
-      "days_in_space": 531,
-      "url": "https://en.wikipedia.org/wiki/Oleg_Novitsky",
-      "image": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Oleg_Novitskiy_2016.jpg",
-      "instagram": "https://www.instagram.com/novitskiy_iss/",
-      "twitter": "https://twitter.com/novitskiy_iss",
-      "facebook": ""
-    },
-    {
-      "id": 12,
-      "name": "Marina Vasilevskay",
-      "country": "Belarus",
-      "flag_code": "by",
-      "agency": "Belavia",
-      "position": "Visitor",
-      "spacecraft": "Soyuz MS-25",
-      "launched": 1711193760,
-      "iss": true,
-      "days_in_space": 0,
-      "url": "https://en.wikipedia.org/wiki/Marina_Vasilevskaya",
-      "image": "https://upload.wikimedia.org/wikipedia/commons/5/53/Marina_Vasilevskaya_%28NHQ202403200036%29_%28cropped%29.jpg",
-      "instagram": "",
-      "twitter": "",
-      "facebook": ""
-    },
-    {
-      "id": 13,
+      "id": 10,
       "name": "Tracy Caldwell-Dyson",
       "country": "United States",
       "flag_code": "us",