transparently load tle source from leosatdata

dernasherbrezon · Nov 24, 2024 · 6324a26 · 6324a26
1 parent e9b56ef
commit 6324a26
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/main/java/ru/r2cloud/cloud/LeoSatDataClient.java b/src/main/java/ru/r2cloud/cloud/LeoSatDataClient.java
@@ -361,7 +361,10 @@ private Tle readTle(JsonValue tle) {
 		Tle result = new Tle(new String[] { line1, line2, line3 });
 		// assume downloaded TLE is always fresh
 		result.setLastUpdateTime(clock.millis());
-		result.setSource(hostname);
+		result.setSource(tleObj.getString("source", null));
+		if (result.getSource() == null) {
+			result.setSource(hostname);
+		}
 		return result;
 	}
 

diff --git a/src/test/java/ru/r2cloud/cloud/LeoSatDataClientTest.java b/src/test/java/ru/r2cloud/cloud/LeoSatDataClientTest.java
@@ -176,6 +176,7 @@ public void testLoadNewLaunch() throws Exception {
 		List<Satellite> result = client.loadNewLaunches(0);
 		assertEquals(2, result.size());
 		assertSatellite("LUCKY-7", true, result.get(0));
+		assertEquals("Satellite team", result.get(0).getTle().getSource());
 		// by default all enabled
 		assertSatellite("PAINANI 1", true, result.get(1));
 	}

diff --git a/src/test/resources/r2cloudclienttest/newlaunch.json b/src/test/resources/r2cloudclienttest/newlaunch.json
@@ -19,7 +19,8 @@
 		"tle": {
 			"line1": "LUCKY-7",
 			"line2": "1 44406U 19038W   20069.88080907  .00000505  00000-0  32890-4 0  9992",
-			"line3": "2 44406  97.5270  32.5584 0026284 107.4758 252.9348 15.12089395 37524"
+			"line3": "2 44406  97.5270  32.5584 0026284 107.4758 252.9348 15.12089395 37524",
+			"source": "Satellite team"
 		},
 		"start": 1639300332000,
 		"end": 1639386732000