Merge pull request #31 from corquaid/dev

feat: update for docking of Soyuz MS-25 spacecraft
corquaid · Mar 25, 2024 · d03db9a · d03db9a
2 parents e9945bd + 01f6f0e
commit d03db9a
Show file tree

Hide file tree

Showing 2 changed files with 76 additions and 2 deletions.
diff --git a/JSON/iss-docked-spacecraft.json b/JSON/iss-docked-spacecraft.json
@@ -1,5 +1,5 @@
 {
-  "number": 6,
+  "number": 7,
   "spacecraft": [
     {
       "id": 1,
@@ -143,6 +143,29 @@
       "mission_patch": "https://upload.wikimedia.org/wikipedia/commons/f/f3/SpaceX_CRS-30_Patch.png",
       "url": "https://en.wikipedia.org/wiki/SpaceX_CRS-30",
       "image": "https://blogs.nasa.gov/spacestation/wp-content/uploads/sites/240/2024/03/dragon-docked.png"
+    },
+    {
+      "id": 7,
+      "name": "Soyuz MS-25",
+      "country": "Russia",
+      "flag_code": "ru",
+      "operator": "Roscosmos",
+      "manufacturer": "Energia",
+      "spacecraft_name": null,
+      "launched": 1711193760,
+      "launch_site": "Site 31/6, Baikonur",
+      "iss": true,
+      "docked": 1711375380,
+      "docking_port": "Prichal nadir",
+      "launch_mass": null,
+      "payload_mass": null,
+      "launch_vehicle": "Soyuz 2.1a",
+      "launch_vehicle_name": null,
+      "mission_type": "Crew",
+      "crew": ["Oleg Novitsky", "Marina Vasilevskaya", "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,5 +1,5 @@
 {
-  "number": 10,
+  "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",
@@ -176,6 +176,57 @@
       "instagram": "",
       "twitter": "",
       "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,
+      "name": "Tracy Caldwell-Dyson",
+      "country": "United States",
+      "flag_code": "us",
+      "agency": "NASA",
+      "position": "Flight Engineer",
+      "spacecraft": "Soyuz MS-25",
+      "launched": 1711193760,
+      "iss": true,
+      "days_in_space": 189,
+      "url": "https://en.wikipedia.org/wiki/Tracy_Caldwell_Dyson",
+      "image": "https://i.ibb.co/rZxWP3b/47742281421-395f06c22c-k.webp",
+      "instagram": "https://www.instagram.com/astro_tdyson/",
+      "twitter": "https://twitter.com/Astro_tracycald",
+      "facebook": ""
     }
   ]
 }