From 50155d2d6da56ac59a672755a704ed1503ffe3f6 Mon Sep 17 00:00:00 2001
From: dcb <xgybdcb@163.com>
Date: 星期四, 19 六月 2025 10:07:18 +0800
Subject: [PATCH] 修复返回的模拟结果中最大最小水深问题
---
src/main/java/com/se/nsl/domain/vo/ResultVo.java | 2
src/main/java/com/se/nsl/service/ResolveService.java | 10 +++--
src/main/java/com/se/nsl/service/TestService.java | 49 ++++++++++++++----------
src/main/java/com/se/nsl/helper/ComHelper.java | 3 +
src/main/resources/application-dev.yml | 2
5 files changed, 38 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/se/nsl/domain/vo/ResultVo.java b/src/main/java/com/se/nsl/domain/vo/ResultVo.java
index 43c0f67..aaf18a2 100644
--- a/src/main/java/com/se/nsl/domain/vo/ResultVo.java
+++ b/src/main/java/com/se/nsl/domain/vo/ResultVo.java
@@ -30,7 +30,7 @@
public ResultVo() {
this.save_variables = new ArrayList<>(Arrays.asList("depth", "xmomentum", "ymomentum"));
this.save_start = 0;
- this.save_filter = 0D;
+ this.save_filter = 0.005D;
}
public ResultVo(String saveName, int frames, int saveInterval,
diff --git a/src/main/java/com/se/nsl/helper/ComHelper.java b/src/main/java/com/se/nsl/helper/ComHelper.java
index 29cfbec..fe10817 100644
--- a/src/main/java/com/se/nsl/helper/ComHelper.java
+++ b/src/main/java/com/se/nsl/helper/ComHelper.java
@@ -115,7 +115,8 @@
//vector.add("-te_srs");
//vector.add("EPSG:" + 4326);
vector.add("-r");
- vector.add("average");
+// vector.add("average");
+ vector.add("cubic");
vector.add("-of");
vector.add("GTiff");
WarpOptions warpOptions = new WarpOptions(vector);
diff --git a/src/main/java/com/se/nsl/service/ResolveService.java b/src/main/java/com/se/nsl/service/ResolveService.java
index bccb075..d78c9e9 100644
--- a/src/main/java/com/se/nsl/service/ResolveService.java
+++ b/src/main/java/com/se/nsl/service/ResolveService.java
@@ -210,10 +210,12 @@
ComHelper.Resample(dsLanduse, null, landuseFile, null, wkt, null, null);
dsLanduse.delete();
- String stationFile = inPath + File.separator + "Station.tif";
- Dataset dsStation = gdal.Open(stationTif, gdalconstConstants.GA_ReadOnly);
- ComHelper.Resample(dsStation, null, stationFile, null, wkt, null, null);
- dsStation.delete();
+ if (stationTif != null) {
+ String stationFile = inPath + File.separator + "Station.tif";
+ Dataset dsStation = gdal.Open(stationTif, gdalconstConstants.GA_ReadOnly);
+ ComHelper.Resample(dsStation, null, stationFile, null, wkt, null, null);
+ dsStation.delete();
+ }
}
public void updateTif(Simu simu, SimuData data2) {
diff --git a/src/main/java/com/se/nsl/service/TestService.java b/src/main/java/com/se/nsl/service/TestService.java
index 6364471..a007a9e 100644
--- a/src/main/java/com/se/nsl/service/TestService.java
+++ b/src/main/java/com/se/nsl/service/TestService.java
@@ -126,22 +126,14 @@
}
public void setTerrainInfo(Dataset ds, LayerDto layer) {
-// Geometry minPoint = GdalHelper.getMinPoint(ds);
-// Geometry maxPoint = GdalHelper.getMaxPoint(ds);
-// double minx = ComHelper.getMinVal(minPoint.GetX(0), 10000000);
-// double miny = ComHelper.getMinVal(minPoint.GetY(0), 10000000);
-// double maxx = ComHelper.getMaxVal(maxPoint.GetX(0) + MAX_X_OFFSET, 10000000);
-// double maxy = ComHelper.getMaxVal(maxPoint.GetY(0), 10000000);
double minx = Double.MAX_VALUE;
double miny = Double.MAX_VALUE;
double maxx = Double.MIN_VALUE;
double maxy = Double.MIN_VALUE;
- //layer.setExtension(new ExtensionDto(minx, miny, maxx, maxy, Double.MAX_VALUE, Double.MIN_VALUE));
Band band = ds.GetRasterBand(1);
double[] mm = new double[2];
band.ComputeRasterMinMax(mm, 0);
- //layer.getTerrain().setHeight(getMinVal(mm[0], 1000), getMaxVal(mm[1], 1000));
layer.setExtension(new ExtensionDto(minx, miny, maxx, maxy, mm[0], mm[1]));
}
@@ -263,13 +255,15 @@
}
public void processWaters(ResultDto dto, List<String> files, LayerDto layer) {
+ List<Double> waterDepths = new ArrayList<>();
for (int i = 0, c = files.size(); i < c; i++) {
Dataset ds = null;
try {
ds = gdal.Open(files.get(i), gdalconstConstants.GA_ReadOnly);
if (null == ds || 0 == ds.getRasterCount()) return;
if (null == ds.GetSpatialRef()) ds.SetSpatialRef(dto.getSpatialReference());
-
+ waterDepths.add(layer.getWaters().getMinHeight());
+ waterDepths.add(layer.getWaters().getMaxHeight());
createWaterPng(dto, ds, layer, layer.getWaters().getData().get(i));
//if (config.getCopyTif()) copyWaterTif(dto, ds, layer.getWaters().getData().get(i));
///createVectors(dto, ds, layer, layer.getWaters().getData().get(i));
@@ -277,6 +271,9 @@
if (null != ds) ds.delete();
}
}
+ waterDepths.sort(null);
+ layer.getWaters().setMinHeight(waterDepths.get(0));
+ layer.getWaters().setMaxHeight(waterDepths.get(waterDepths.size() - 1));
}
public void createWaterPng(ResultDto dto, Dataset ds, LayerDto layer, long ticks) {
@@ -313,8 +310,8 @@
double maxHeight = layer.getExtension().getMaxHeight();
double minHeight = layer.getExtension().getMinHeight();
float[] ts = layer.getTerrain().getVals().get(width + "_" + height);
- double minDepth = Double.MAX_VALUE;
- double maxDepth = Double.MIN_VALUE;
+// double minDepth = Double.MAX_VALUE;
+// double maxDepth = Double.MIN_VALUE;
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
int offset = x + y * width;
@@ -337,16 +334,26 @@
Color color = new Color(r, g, b, 127);
image.setRGB(x, y, color.getRGB());
- if (minDepth > depth) {
- minDepth = depth;
- }
- if (maxDepth < depth) {
- maxDepth = depth;
- }
+// maxDepth = Math.max(maxDepth, depth);
+// minDepth = Math.min(minDepth, depth);
}
}
- layer.getWaters().setMinHeight(minDepth);
- layer.getWaters().setMaxHeight(maxDepth);
+// Double srcMinHeight = layer.getWaters().getMinHeight();
+// Double srcMaxHeight = layer.getWaters().getMaxHeight();
+// if (srcMinHeight == null) {
+// srcMinHeight = minDepth;
+// layer.getWaters().setMinHeight(minDepth);
+// }
+// if (srcMaxHeight == null) {
+// srcMaxHeight = maxDepth;
+// layer.getWaters().setMaxHeight(maxDepth);
+// }
+// if (minDepth < srcMinHeight) {
+// layer.getWaters().setMinHeight(minDepth);
+// }
+// if (maxDepth < srcMaxHeight) {
+// layer.getWaters().setMaxHeight(maxDepth);
+// }
ComHelper.savePng(image, png);
} finally {
if (null != ds) ds.delete();
@@ -441,11 +448,11 @@
if (!new File(tif).exists()) continue;
String png = flowPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
- vxyTif2Png(layer, tif, png, sizes[0], sizes[1]);
+ vxyTif2Png(tif, png, sizes[0], sizes[1]);
}
}
- public void vxyTif2Png(LayerDto layer, String tif, String png, int width, int height) {
+ public void vxyTif2Png(String tif, String png, int width, int height) {
Dataset ds = null;
try {
ds = gdal.Open(tif, gdalconstConstants.GA_ReadOnly);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 6cf3fe5..71656bb 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -154,7 +154,7 @@
# 鍦熷湴鍒╃敤锛�1-Cropland,2-Forest,3-Shrub,4-Grassland,5-Water,6-Snow/Ice,7-Barren,8-Impervious,9-Wetland
landuse: 2
#sizes: 64,128,256,512,1024,2048,4096
- sizes: 1024
+ sizes: 1024,2048,4096
# 杈撳嚭鏂囦欢
terrainFile: DEM.tif
buildingFile: buildings_inside.shp
--
Gitblit v1.9.3