Skip to content

Commit d03db9a

Browse files
authored
Merge pull request #31 from corquaid/dev
feat: update for docking of Soyuz MS-25 spacecraft
2 parents e9945bd + 01f6f0e commit d03db9a

File tree

2 files changed

+76
-2
lines changed

2 files changed

+76
-2
lines changed

JSON/iss-docked-spacecraft.json

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"number": 6,
2+
"number": 7,
33
"spacecraft": [
44
{
55
"id": 1,
@@ -143,6 +143,29 @@
143143
"mission_patch": "https://upload.wikimedia.org/wikipedia/commons/f/f3/SpaceX_CRS-30_Patch.png",
144144
"url": "https://en.wikipedia.org/wiki/SpaceX_CRS-30",
145145
"image": "https://blogs.nasa.gov/spacestation/wp-content/uploads/sites/240/2024/03/dragon-docked.png"
146+
},
147+
{
148+
"id": 7,
149+
"name": "Soyuz MS-25",
150+
"country": "Russia",
151+
"flag_code": "ru",
152+
"operator": "Roscosmos",
153+
"manufacturer": "Energia",
154+
"spacecraft_name": null,
155+
"launched": 1711193760,
156+
"launch_site": "Site 31/6, Baikonur",
157+
"iss": true,
158+
"docked": 1711375380,
159+
"docking_port": "Prichal nadir",
160+
"launch_mass": null,
161+
"payload_mass": null,
162+
"launch_vehicle": "Soyuz 2.1a",
163+
"launch_vehicle_name": null,
164+
"mission_type": "Crew",
165+
"crew": ["Oleg Novitsky", "Marina Vasilevskaya", "Tracy Caldwell-Dyson"],
166+
"mission_patch": "https://i.ibb.co/5czhYB9/soyuz-ms25-patch01-lg.jpg",
167+
"url": "https://en.wikipedia.org/wiki/Soyuz_MS-25",
168+
"image": "https://upload.wikimedia.org/wikipedia/commons/1/16/Expedition_71_Press_Conference_%28NHQ202403200036%29.jpg"
146169
}
147170
]
148171
}

JSON/people-in-space.json

+52-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"number": 10,
2+
"number": 13,
33
"iss_expedition": 70,
44
"expedition_patch": "https://upload.wikimedia.org/wikipedia/commons/6/65/ISS_Expedition_70_Patch.png",
55
"expedition_url": "https://en.wikipedia.org/wiki/Expedition_70",
@@ -176,6 +176,57 @@
176176
"instagram": "",
177177
"twitter": "",
178178
"facebook": ""
179+
},
180+
{
181+
"id": 11,
182+
"name": "Oleg Novitsky",
183+
"country": "Russia",
184+
"flag_code": "ru",
185+
"agency": "Roscosmos",
186+
"position": "Visitor",
187+
"spacecraft": "Soyuz MS-25",
188+
"launched": 1711193760,
189+
"iss": true,
190+
"days_in_space": 531,
191+
"url": "https://en.wikipedia.org/wiki/Oleg_Novitsky",
192+
"image": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Oleg_Novitskiy_2016.jpg",
193+
"instagram": "https://www.instagram.com/novitskiy_iss/",
194+
"twitter": "https://twitter.com/novitskiy_iss",
195+
"facebook": ""
196+
},
197+
{
198+
"id": 12,
199+
"name": "Marina Vasilevskay",
200+
"country": "Belarus",
201+
"flag_code": "by",
202+
"agency": "Belavia",
203+
"position": "Visitor",
204+
"spacecraft": "Soyuz MS-25",
205+
"launched": 1711193760,
206+
"iss": true,
207+
"days_in_space": 0,
208+
"url": "https://en.wikipedia.org/wiki/Marina_Vasilevskaya",
209+
"image": "https://upload.wikimedia.org/wikipedia/commons/5/53/Marina_Vasilevskaya_%28NHQ202403200036%29_%28cropped%29.jpg",
210+
"instagram": "",
211+
"twitter": "",
212+
"facebook": ""
213+
},
214+
{
215+
"id": 13,
216+
"name": "Tracy Caldwell-Dyson",
217+
"country": "United States",
218+
"flag_code": "us",
219+
"agency": "NASA",
220+
"position": "Flight Engineer",
221+
"spacecraft": "Soyuz MS-25",
222+
"launched": 1711193760,
223+
"iss": true,
224+
"days_in_space": 189,
225+
"url": "https://en.wikipedia.org/wiki/Tracy_Caldwell_Dyson",
226+
"image": "https://i.ibb.co/rZxWP3b/47742281421-395f06c22c-k.webp",
227+
"instagram": "https://www.instagram.com/astro_tdyson/",
228+
"twitter": "https://twitter.com/Astro_tracycald",
229+
"facebook": ""
179230
}
180231
]
181232
}

0 commit comments

Comments
 (0)