Skip to content

Commit fc68641

Browse files
authored
Merge pull request #49 from corquaid/dev
feat: update for departure of Soyuz MS-25 and transition to ISS Expedition 72
2 parents a4c4b59 + 7382e64 commit fc68641

File tree

2 files changed

+24
-98
lines changed

2 files changed

+24
-98
lines changed

JSON/iss-docked-spacecraft.json

+4-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"number": 6,
2+
"number": 5,
33
"spacecraft": [
44
{
55
"id": 1,
@@ -31,29 +31,6 @@
3131
},
3232
{
3333
"id": 2,
34-
"name": "Soyuz MS-25",
35-
"country": "Russia",
36-
"flag_code": "ru",
37-
"operator": "Roscosmos",
38-
"manufacturer": "Energia",
39-
"spacecraft_name": null,
40-
"launched": 1711193760,
41-
"launch_site": "Site 31/6, Baikonur",
42-
"iss": true,
43-
"docked": 1711375380,
44-
"docking_port": "Prichal nadir",
45-
"launch_mass": null,
46-
"payload_mass": null,
47-
"launch_vehicle": "Soyuz 2.1a",
48-
"launch_vehicle_name": null,
49-
"mission_type": "Crew",
50-
"crew": ["Oleg Kononenko", "Nikolai Chub", "Tracy Caldwell-Dyson"],
51-
"mission_patch": "https://i.ibb.co/5czhYB9/soyuz-ms25-patch01-lg.jpg",
52-
"url": "https://en.wikipedia.org/wiki/Soyuz_MS-25",
53-
"image": "https://upload.wikimedia.org/wikipedia/commons/1/16/Expedition_71_Press_Conference_%28NHQ202403200036%29.jpg"
54-
},
55-
{
56-
"id": 3,
5734
"name": "Progress MS-27",
5835
"country": "Russia",
5936
"flag_code": "ru",
@@ -76,7 +53,7 @@
7653
"image": "https://i.ibb.co/Fz3n84W/SGoi-CLH5-Qer-Ui9xs-ARj5-C3-1200-80-png.webp"
7754
},
7855
{
79-
"id": 4,
56+
"id": 3,
8057
"name": "Cygnus NG-21",
8158
"country": "United States",
8259
"flag_code": "us",
@@ -99,7 +76,7 @@
9976
"image": "https://upload.wikimedia.org/wikipedia/commons/f/fa/CRS_NG-21_Approach.jpg"
10077
},
10178
{
102-
"id": 5,
79+
"id": 4,
10380
"name": "Progress MS-28",
10481
"country": "Russia",
10582
"flag_code": "ru",
@@ -122,7 +99,7 @@
12299
"image": "https://i.ibb.co/Q6LLCbN/progress-ms28-zem-351772-1.jpg"
123100
},
124101
{
125-
"id": 6,
102+
"id": 5,
126103
"name": "Soyuz MS-26",
127104
"country": "Russia",
128105
"flag_code": "ru",

JSON/people-in-space.json

+20-71
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,14 @@
11
{
2-
"number": 15,
3-
"iss_expedition": 71,
4-
"expedition_patch": "https://upload.wikimedia.org/wikipedia/commons/b/b4/ISS_Expedition_71_Patch.png",
5-
"expedition_url": "https://en.wikipedia.org/wiki/Expedition_71",
6-
"expedition_image": "https://upload.wikimedia.org/wikipedia/commons/8/81/The_official_Expedition_71_crew_portrait.jpg",
7-
"expedition_start_date": 1712354400,
8-
"expedition_end_date": 1727128800,
2+
"number": 12,
3+
"iss_expedition": 72,
4+
"expedition_patch": "https://upload.wikimedia.org/wikipedia/commons/c/c4/ISS_Expedition_72_Patch.png",
5+
"expedition_url": "https://en.wikipedia.org/wiki/Expedition_72",
6+
"expedition_image": "https://upload.wikimedia.org/wikipedia/commons/3/3a/Iss072-s-002.jpg",
7+
"expedition_start_date": 1727042400,
8+
"expedition_end_date": 1711148400,
99
"people": [
1010
{
1111
"id": 1,
12-
"name": "Oleg Kononenko",
13-
"country": "Russia",
14-
"flag_code": "ru",
15-
"agency": "Roscosmos",
16-
"position": "Commander",
17-
"spacecraft": "Soyuz MS-24",
18-
"launched": 1694785440,
19-
"iss": true,
20-
"days_in_space": 736,
21-
"url": "https://en.wikipedia.org/wiki/Oleg_Kononenko",
22-
"image": "https://upload.wikimedia.org/wikipedia/commons/c/c3/%27A_Beautiful_Planet%27_World_Premiere_%28NHQ201604160010%29.jpg",
23-
"instagram": "",
24-
"twitter": "",
25-
"facebook": ""
26-
},
27-
{
28-
"id": 2,
29-
"name": "Nikolai Chub",
30-
"country": "Russia",
31-
"flag_code": "ru",
32-
"agency": "Roscosmos",
33-
"position": "Flight Engineer",
34-
"spacecraft": "Soyuz MS-24",
35-
"launched": 1694785440,
36-
"iss": true,
37-
"days_in_space": 0,
38-
"url": "https://en.wikipedia.org/wiki/Nikolai_Chub",
39-
"image": "https://blogs.esa.int/caves/files/2019/09/Chub-official-portrait_GCTC.jpg",
40-
"instagram": "",
41-
"twitter": "",
42-
"facebook": ""
43-
},
44-
{
45-
"id": 3,
4612
"name": "Matthew Dominick",
4713
"country": "United States",
4814
"flag_code": "us",
@@ -59,7 +25,7 @@
5925
"facebook": "https://www.facebook.com/astro.matthew.dominick"
6026
},
6127
{
62-
"id": 4,
28+
"id": 2,
6329
"name": "Michael Barratt",
6430
"country": "United States",
6531
"flag_code": "us",
@@ -76,7 +42,7 @@
7642
"facebook": ""
7743
},
7844
{
79-
"id": 5,
45+
"id": 3,
8046
"name": "Jeanette Epps",
8147
"country": "United States",
8248
"flag_code": "us",
@@ -93,7 +59,7 @@
9359
"facebook": "https://www.facebook.com/people/Jeanette-Epps/pfbid02qGv6poB5B37XjuzkrTaH9a8UjsPF9MrxRYnJVPe2hFYodgqq5VEoCuEG9CznMJjEl/"
9460
},
9561
{
96-
"id": 6,
62+
"id": 4,
9763
"name": "Alexander Grebenkin",
9864
"country": "Russia",
9965
"flag_code": "ru",
@@ -110,24 +76,7 @@
11076
"facebook": ""
11177
},
11278
{
113-
"id": 7,
114-
"name": "Tracy Caldwell-Dyson",
115-
"country": "United States",
116-
"flag_code": "us",
117-
"agency": "NASA",
118-
"position": "Flight Engineer",
119-
"spacecraft": "Soyuz MS-25",
120-
"launched": 1711193760,
121-
"iss": true,
122-
"days_in_space": 189,
123-
"url": "https://en.wikipedia.org/wiki/Tracy_Caldwell_Dyson",
124-
"image": "https://i.ibb.co/rZxWP3b/47742281421-395f06c22c-k.webp",
125-
"instagram": "https://www.instagram.com/astro_tdyson/",
126-
"twitter": "https://twitter.com/Astro_tracycald",
127-
"facebook": ""
128-
},
129-
{
130-
"id": 8,
79+
"id": 5,
13180
"name": "Ye Guangfu",
13281
"country": "China",
13382
"flag_code": "cn",
@@ -144,7 +93,7 @@
14493
"facebook": ""
14594
},
14695
{
147-
"id": 9,
96+
"id": 6,
14897
"name": "Li Cong",
14998
"country": "China",
15099
"flag_code": "cn",
@@ -161,7 +110,7 @@
161110
"facebook": ""
162111
},
163112
{
164-
"id": 10,
113+
"id": 7,
165114
"name": "Li Guangsu",
166115
"country": "China",
167116
"flag_code": "cn",
@@ -178,7 +127,7 @@
178127
"facebook": ""
179128
},
180129
{
181-
"id": 11,
130+
"id": 8,
182131
"name": "Butch Wilmore",
183132
"country": "United States",
184133
"flag_code": "us",
@@ -195,12 +144,12 @@
195144
"facebook": ""
196145
},
197146
{
198-
"id": 12,
147+
"id": 9,
199148
"name": "Suni Williams",
200149
"country": "United States",
201150
"flag_code": "us",
202151
"agency": "NASA",
203-
"position": "Flight Engineer",
152+
"position": "Commander",
204153
"spacecraft": "Crew-9 Dragon",
205154
"launched": 1717591942,
206155
"iss": true,
@@ -212,12 +161,12 @@
212161
"facebook": "https://www.facebook.com/AstronautSunitaWilliams/"
213162
},
214163
{
215-
"id": 13,
164+
"id": 10,
216165
"name": "Aleksey Ovchinin",
217166
"country": "Russia",
218167
"flag_code": "ru",
219168
"agency": "Roscosmos",
220-
"position": "Commander",
169+
"position": "Flight Engineer",
221170
"spacecraft": "Soyuz MS-26",
222171
"launched": 1726150992,
223172
"iss": true,
@@ -229,7 +178,7 @@
229178
"facebook": ""
230179
},
231180
{
232-
"id": 14,
181+
"id": 11,
233182
"name": "Ivan Wagner",
234183
"country": "Russia",
235184
"flag_code": "ru",
@@ -246,7 +195,7 @@
246195
"facebook": ""
247196
},
248197
{
249-
"id": 15,
198+
"id": 12,
250199
"name": "Don Pettit",
251200
"country": "United States",
252201
"flag_code": "us",

0 commit comments

Comments
 (0)