From e70a8383a5db83c049db3a9764df140d8ea9516b Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期日, 17 十一月 2024 10:13:40 +0800
Subject: [PATCH] 1
---
src/main/java/com/se/simu/service/ResultService.java | 39 ++++++---------------------------------
1 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java
index 9c92150..739dae5 100644
--- a/src/main/java/com/se/simu/service/ResultService.java
+++ b/src/main/java/com/se/simu/service/ResultService.java
@@ -111,38 +111,12 @@
for (int[] sizes : layer.getTerrain().getSize()) {
String tif = dto.getTemp() + File.separator + "terrain_" + sizes[0] + "_" + sizes[1] + ".tif";
- Resample(ds, tif, sizes[0], sizes[1], layer);
+ ComHelper.Resample(ds, tif, sizes[0], sizes[1], layer);
if (!new File(tif).exists()) continue;
String png = terrainPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
Terrain2Png(layer, tif, png, sizes[0], sizes[1]);
}
- }
-
- private void Resample(Dataset ds, String dest, int width, int height, LayerDto layer) {
- Vector<String> vector = new Vector<>();
- //vector.add("-s_srs");
- //vector.add("EPSG:" + 4548);
- //vector.add("-t_srs");
- //vector.add("EPSG:" + 4326);
- vector.add("-ts");
- vector.add("" + width);
- vector.add("" + height);
- //vector.add("-te");
- //vector.add("" + layer.getExtension().getMinx());
- //vector.add("" + layer.getExtension().getMiny());
- //vector.add("" + layer.getExtension().getMaxx());
- //vector.add("" + layer.getExtension().getMaxy());
- //vector.add("-te_srs");
- //vector.add("EPSG:" + 4326);
- vector.add("-r");
- vector.add("bilinear");
- vector.add("-of");
- vector.add("GTiff");
- WarpOptions warpOptions = new WarpOptions(vector);
-
- Dataset destDs = gdal.Warp(dest, new Dataset[]{ds}, warpOptions);
- destDs.delete();
}
private void Terrain2Png(LayerDto layer, String tif, String png, int width, int height) {
@@ -316,7 +290,7 @@
for (int[] sizes : layer.getTerrain().getSize()) {
String fileName = ComHelper.getNameWithExt(ds.GetDescription()) + "_" + sizes[0] + "_" + sizes[1];
String tif = dto.getTemp() + File.separator + fileName + ".tif";
- Resample(ds, tif, sizes[0], sizes[1], layer);
+ ComHelper.Resample(ds, tif, sizes[0], sizes[1], layer);
if (!new File(tif).exists()) continue;
String png = waterPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
@@ -342,9 +316,8 @@
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
int offset = x + y * width;
- float depth = buffer[offset] + ts[offset];
//if (Float.isNaN(buffer[offset]) || buffer[offset] < -999 || buffer[offset] < minHeight) continue;
- if (Float.isNaN(depth) || depth < minHeight) continue;
+ if (Float.isNaN(buffer[offset]) || buffer[offset] <= 0 || Float.isNaN(ts[offset])) continue;
//double X = transform[0] + x * transform[1] + y * transform[2];
//double Y = transform[3] + x * transform[4] + y * transform[5];
@@ -352,10 +325,10 @@
//if (null != building) continue;
int r = 0, g, b;
- if (depth > maxHeight) {
+ if (buffer[offset] + ts[offset] > maxHeight) {
g = b = 255;
} else {
- int val = (int) ((depth - minHeight) / differ * 65535);
+ int val = (int) ((buffer[offset] + ts[offset] - minHeight) / differ * 65535);
g = val / 256;
b = val % 256;
}
@@ -556,7 +529,7 @@
for (int[] sizes : layer.getTerrain().getSize()) {
String name = ComHelper.getNameWithExt(ds.GetDescription()) + "_" + sizes[0] + "_" + sizes[1];
String tif = dto.getTemp() + File.separator + name + ".tif";
- Resample(ds, tif, sizes[0], sizes[1], layer);
+ ComHelper.Resample(ds, tif, sizes[0], sizes[1], layer);
if (!new File(tif).exists()) continue;
String png = flowPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
--
Gitblit v1.9.3