Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,19 @@ public ResponseEntity<String> extendImage(@RequestBody TileExtenderRequestBody b
isOpaque);

double[] offsets = imageExtenderService.computeXYOffsets(lat, lon, x, y, z, server);

HttpHeaders headers = new HttpHeaders();
headers.add("x_offset", String.valueOf(offsets[0]));
headers.add("y_offset", String.valueOf(offsets[1]));
headers.add("pointer_x", String.valueOf(offsets[2]));
headers.add("pointer_y", String.valueOf(offsets[3]));
if (server.equals("airbus")) {
String lastUpdatedAt =
imageExtenderService.getLastUpdatedAtAirbus() != null
? imageExtenderService.getLastUpdatedAtAirbus()
: "";
headers.add("airbusLastUpdatedAt", lastUpdatedAt);
}

return ResponseEntity.ok().contentType(TEXT_PLAIN).headers(headers).body(base64Encoded);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@
public class AirbusProperties {
private String wmtsUrl;
private String bearer;
private String updatedAt;
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public class ImageExtenderService {
private Workers workers;
private ImageDegraderService imageDegraderService;
private AirbusPNEOService airbusPNEOService;
private AirbusProperties airbusProperties;

public ImageExtenderService(
TilesDownloaderService downloader,
Expand All @@ -53,6 +54,10 @@ public ImageExtenderService(
this.airbusPNEOService = airbusPNEOService;
}

public String getLastUpdatedAtAirbus() {
return this.airbusProperties.getUpdatedAt();
}

public double[] computeXYOffsets(double lat, double lon, int x, int y, int z, String server) {
double[] pixelCoords = convertCoordinatesToPixel(lat, lon, x, y, z);
return server.equals("geoserver_ign") || server.equals("airbus")
Expand Down Expand Up @@ -146,8 +151,8 @@ public byte[] downloadTilesBytes(
BufferedImage[][] results = new BufferedImage[y2 - y1][x2 - x1];
List<Callable<Void>> callables = new ArrayList<>();
final boolean isAirbusServer = AIRBUS_SERVER.equals(server);
final AirbusProperties airbusProperties =
isAirbusServer ? airbusPNEOService.retrieveAirbusWmtsLink(lat, lon) : null;
this.airbusProperties =
isAirbusServer ? airbusPNEOService.retrieveAirbusProperties(lat, lon) : null;

for (int dy = y1; dy < y2; dy++) {
for (int dx = x1; dx < x2; dx++) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public String authenticateAirbus() {
throw new IllegalArgumentException("Unable to retrieve Airbus Access Token");
}

public AirbusProperties retrieveAirbusWmtsLink(double lat, double lon) {
public AirbusProperties retrieveAirbusProperties(double lat, double lon) {
String bearerToken = authenticateAirbus();
Geometry geometry = convertLatLonToGeometry(lat, lon);
AirbusRequestBody requestBody =
Expand All @@ -95,7 +95,11 @@ public AirbusProperties retrieveAirbusWmtsLink(double lat, double lon) {
String wmtsUrl =
String.format(
"%s/tiles/1.0.0/default/rgb/EPSG3857/", feature.getLinks().getWmts().getHref());
return AirbusProperties.builder().wmtsUrl(wmtsUrl).bearer(bearerToken).build();
return AirbusProperties.builder()
.wmtsUrl(wmtsUrl)
.updatedAt(feature.getProperties().getLastUpdateDate())
.bearer(bearerToken)
.build();
}

public Geometry convertLatLonToGeometry(double lat, double lon) {
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/fr/birdia/tile19/ImageExtenderIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class ImageExtenderIT extends FacadeIT {
@Autowired TileExtenderController tileExtenderController;

public TileExtenderRequestBody degraded_body() {
public TileExtenderRequestBody opaque_body() {
return TileExtenderRequestBody.builder()
.x(538969)
.y(367435)
Expand Down Expand Up @@ -168,7 +168,7 @@ public void extend_airbus_images_ok() throws Exception {

@Test
public void extend_not_full_HD_image_ok() throws Exception {
ResponseEntity<String> response = tileExtenderController.extendImage(degraded_body());
ResponseEntity<String> response = tileExtenderController.extendImage(opaque_body());
HttpHeaders headers = response.getHeaders();
double xOffset = Double.parseDouble(headers.getFirst("x_offset"));
double yOffset = Double.parseDouble(headers.getFirst("y_offset"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import java.io.File;
import java.io.IOException;
import javax.imageio.ImageIO;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.web.client.RestTemplate;
Expand Down