Skip to content

Commit 7aaa740

Browse files
authored
Merge pull request #96 from corquaid/dev
feat: docking of CRS-34 and launch of Shenzhou-23
2 parents 3bbaf2f + b8e9055 commit 7aaa740

2 files changed

Lines changed: 80 additions & 4 deletions

File tree

JSON/iss-docked-spacecraft.json

Lines changed: 28 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"number": 5,
2+
"number": 6,
33
"spacecraft": [
44
{
55
"id": 1,
@@ -81,7 +81,7 @@
8181
"url": "https://en.wikipedia.org/wiki/Progress_MS-33",
8282
"image": "https://upload.wikimedia.org/wikipedia/commons/4/4d/Progress_MS-33_approaches_ISS.webp"
8383
},
84-
{
84+
{
8585
"id": 4,
8686
"name": "Cygnus NG-24",
8787
"country": "United States",
@@ -106,7 +106,7 @@
106106
"url": "https://en.wikipedia.org/wiki/Cygnus_NG-24",
107107
"image": "https://images-assets.nasa.gov/image/iss074e0458270/iss074e0458270~large.jpg?w=1920&h=1078&fit=clip&crop=faces%2Cfocalpoint"
108108
},
109-
{
109+
{
110110
"id": 5,
111111
"name": "Progress MS-34",
112112
"country": "Russia",
@@ -130,6 +130,31 @@
130130
"mission_patch_3": null,
131131
"url": "https://en.wikipedia.org/wiki/Progress_MS-34",
132132
"image": "https://images-assets.nasa.gov/image/iss073e0698630/iss073e0698630~large.jpg?w=1920&h=1280&fit=clip&crop=faces%2Cfocalpoint"
133+
},
134+
{
135+
"id": 6,
136+
"name": "CRS-34 Dragon",
137+
"country": "United States",
138+
"flag_code": "us",
139+
"operator": "SpaceX",
140+
"manufacturer": "SpaceX",
141+
"spacecraft_name": "C209",
142+
"launched": 1778875541,
143+
"launch_site": "Cape Canaveral, SLC-40",
144+
"iss": true,
145+
"docked": 1779007020,
146+
"docking_port": "Harmony forward",
147+
"launch_mass": null,
148+
"payload_mass": 2948,
149+
"launch_vehicle": "Falcon 9",
150+
"launch_vehicle_name": "B1096.6",
151+
"mission_type": "Cargo",
152+
"crew": null,
153+
"mission_patch": "https://upload.wikimedia.org/wikipedia/commons/1/1e/SpaceX_CRS-34_Patch.png",
154+
"mission_patch_2": null,
155+
"mission_patch_3": null,
156+
"url": "https://en.wikipedia.org/wiki/SpaceX_CRS-34",
157+
"image": "https://upload.wikimedia.org/wikipedia/commons/a/ad/A_SpaceX_Dragon_cargo_spacecraft_approaches_the_International_Space_Station_%28iss074e0603650%29.jpg"
133158
}
134159
]
135160
}

JSON/people-in-space.json

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"number": 10,
2+
"number": 13,
33
"iss_expedition": 74,
44
"expedition_patch": "https://images-assets.nasa.gov/image/iss074-s-001/iss074-s-001~large.jpg",
55
"expedition_url": "https://en.wikipedia.org/wiki/Expedition_74",
@@ -175,6 +175,57 @@
175175
"instagram": "https://www.instagram.com/andrey_fedyaev_0",
176176
"twitter": "",
177177
"facebook": ""
178+
},
179+
{
180+
"id": 11,
181+
"name": "Zhu Yangzhu",
182+
"country": "China",
183+
"flag_code": "cn",
184+
"agency": "CMSA",
185+
"position": "Commander",
186+
"spacecraft": "Shenzhou 23",
187+
"launched": 1779628116,
188+
"iss": false,
189+
"days_in_space": 150,
190+
"url": "https://en.wikipedia.org/wiki/Zhu_Yangzhu",
191+
"image": "https://upload.wikimedia.org/wikipedia/commons/9/97/Zhu_Yangzhu_%2820260523%29.jpg",
192+
"instagram": "",
193+
"twitter": "",
194+
"facebook": ""
195+
},
196+
{
197+
"id": 12,
198+
"name": "Zhang Zhiyuan",
199+
"country": "China",
200+
"flag_code": "cn",
201+
"agency": "CMSA",
202+
"position": "Pilot",
203+
"spacecraft": "Shenzhou 23",
204+
"launched": 1779628116,
205+
"iss": false,
206+
"days_in_space": 0,
207+
"url": "https://en.wikipedia.org/wiki/Zhang_Zhiyuan_(astronaut)",
208+
"image": "https://upload.wikimedia.org/wikipedia/commons/6/68/Zhang_Zhiyuan_%2820260523%29.jpg",
209+
"instagram": "",
210+
"twitter": "",
211+
"facebook": ""
212+
},
213+
{
214+
"id": 13,
215+
"name": "Lai Ka-ying",
216+
"country": "China",
217+
"flag_code": "cn",
218+
"agency": "CMSA",
219+
"position": "Payload Specialist",
220+
"spacecraft": "Shenzhou 23",
221+
"launched": 1779628116,
222+
"iss": false,
223+
"days_in_space": 0,
224+
"url": "https://en.wikipedia.org/wiki/Lai_Ka-ying",
225+
"image": "https://upload.wikimedia.org/wikipedia/commons/7/77/Lai_Ka-ying_%2820260523%29.jpg",
226+
"instagram": "",
227+
"twitter": "",
228+
"facebook": ""
178229
}
179230
]
180231
}

0 commit comments

Comments
 (0)