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/service/TestService.java | 166 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 91 insertions(+), 75 deletions(-)
diff --git a/src/main/java/com/se/nsl/service/TestService.java b/src/main/java/com/se/nsl/service/TestService.java
index 6408b5f..a007a9e 100644
--- a/src/main/java/com/se/nsl/service/TestService.java
+++ b/src/main/java/com/se/nsl/service/TestService.java
@@ -7,13 +7,12 @@
import com.se.nsl.domain.po.SimuData;
import com.se.nsl.domain.vo.BuildingDepthVo;
import com.se.nsl.helper.ComHelper;
-import com.se.nsl.helper.GdalHelper;
+import com.se.nsl.utils.TimeFormatUtil;
import lombok.extern.slf4j.Slf4j;
import org.gdal.gdal.Band;
import org.gdal.gdal.Dataset;
import org.gdal.gdal.gdal;
import org.gdal.gdalconst.gdalconstConstants;
-import org.gdal.ogr.*;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -22,10 +21,6 @@
import java.io.File;
import java.io.IOException;
import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.List;
@@ -36,13 +31,13 @@
@Resource
PropertiesConfig config;
- public final static double MIN_VAL = 0.00001;
+ public static final double MIN_VAL = 0.00001;
- public final static double MAX_X_OFFSET = 0;
+ public static final double MAX_X_OFFSET = 0;
- public final static SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ public static final SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm");
- public void test(SimuData data) throws Exception {
+ public void test(SimuData data) throws IOException {
String basePath = config.getInPath() + File.separator + data.getInPath() + File.separator;
ResultDto dto = new ResultDto(
data.getInPath(),
@@ -57,9 +52,23 @@
process(dto, layer);
}
- private void process(ResultDto dto, LayerDto layer) throws Exception {
+ private void process(ResultDto dto, LayerDto layer) throws IOException {
try {
copeTerrain(dto, layer);
+ copeWater(dto, layer);
+ copeFlow(dto, layer);
+ copeLayerJson(dto, layer);
+ } finally {
+ File dir = new File(dto.getTemp());
+ if (dir.exists()) {
+ FileUtil.del(dir);
+ }
+ }
+ }
+
+ public void processRealTime(ResultDto dto, LayerDto layer) throws IOException {
+ try {
+ copeTerrainRealTime(dto, layer);
copeWater(dto, layer);
copeFlow(dto, layer);
copeLayerJson(dto, layer);
@@ -86,8 +95,24 @@
}
}
+ private void copeTerrainRealTime(ResultDto dto, LayerDto layer) {
+ Dataset ds = null;
+ try {
+ ds = gdal.Open(dto.getTerrainFile(), gdalconstConstants.GA_ReadOnly); // gdalconst
+ if (null == ds || 0 == ds.getRasterCount()) return;
+
+ setSizes(ds, layer);
+ setTerrainInfo(ds, layer);
+ setWaterInfo(dto, layer);
+ createTerrainPng(dto, ds, layer);
+ } finally {
+ if (null != ds) ds.delete();
+ }
+ }
+
private void setSizes(Dataset ds, LayerDto layer) {
- int xSize = ds.getRasterXSize(), ySize = ds.getRasterYSize();
+ int xSize = ds.getRasterXSize();
+ int ySize = ds.getRasterYSize();
double rate = xSize < ySize ? xSize * 1.0 / ySize : ySize * 1.0 / xSize;
List<int[]> list = layer.getTerrain().getSize();
@@ -101,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]));
}
@@ -131,11 +148,11 @@
if (!new File(tif).exists()) continue;
String png = terrainPath + File.separator + sizes[0] + "_" + sizes[1] + ".png";
- Terrain2Png(layer, tif, png, sizes[0], sizes[1]);
+ terrain2Png(layer, tif, png, sizes[0], sizes[1]);
}
}
- public void Terrain2Png(LayerDto layer, String tif, String png, int width, int height) {
+ public void terrain2Png(LayerDto layer, String tif, String png, int width, int height) {
Dataset ds = null;
try {
ds = gdal.Open(tif, gdalconstConstants.GA_ReadOnly);
@@ -148,13 +165,16 @@
layer.getTerrain().getVals().put(width + "_" + height, buffer);
BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
- double differ = layer.getExtension().getMaxHeight() - layer.getExtension().getMinHeight(), minHeight = layer.getExtension().getMinHeight();
+ double differ = layer.getExtension().getMaxHeight() - layer.getExtension().getMinHeight();
+ double minHeight = layer.getExtension().getMinHeight();
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
int offset = x + y * width;
if (Float.isNaN(buffer[offset]) || buffer[offset] < -999 || buffer[offset] < minHeight) continue;
- int r = 0, g, b;
+ int r = 0;
+ int g;
+ int b;
if (buffer[offset] - layer.getExtension().getMaxHeight() > 0) {
g = b = 255;
} else {
@@ -177,7 +197,7 @@
public void setWaterInfo(ResultDto dto, LayerDto layer) {
List<String> files = getFiles(dto.getWaterPath(), ".tif");
layer.getWaters().setFiles(files);
- if (null == files || files.size() == 0) return;
+ if (null == files || files.isEmpty()) return;
setWaterData(layer, files);
setWaterHeight(layer, files);
@@ -185,11 +205,11 @@
public List<BuildingDepthVo> copeWater(ResultDto dto, LayerDto layer) {
List<String> files = layer.getWaters().getFiles();
- if (files.size() == 0 || files.size() != layer.getWaters().getData().size()) return null;
+ if (files.isEmpty() || files.size() != layer.getWaters().getData().size()) return Collections.emptyList();
processWaters(dto, files, layer);
- return null;
+ return Collections.emptyList();
}
public List<String> getFiles(String path, String suffix) {
@@ -201,47 +221,18 @@
}
public void setWaterData(LayerDto layer, List<String> files) {
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");
for (String file : files) {
String fileName = ComHelper.getNameWithExt(file);
- LocalDateTime dateTime = LocalDateTime.parse(fileName, formatter);
- Instant instant = dateTime.atZone(ZoneId.systemDefault()).toInstant();
- long timestamp = instant.toEpochMilli();
+ long timestamp = TimeFormatUtil.toMillis(fileName, "yyyyMMddHHmmss");
layer.getWaters().getData().add(timestamp);
}
layer.getDuration().setStart(layer.getWaters().getData().get(0));
layer.getDuration().setEnd(layer.getWaters().getData().get(layer.getWaters().getData().size() - 1));
}
- /*public void setWaterData(LayerDto layer, List<String> files) {
- Calendar calendar = Calendar.getInstance();
- calendar.setTime(new Date());
- calendar.set(Calendar.MILLISECOND, 0);
-
- for (String file : files) {
- String fileName = ComHelper.getNameWithExt(file);
- int year = Integer.parseInt(fileName.substring(0, 4));
- int month = Integer.parseInt(fileName.substring(4, 6));
- int day = Integer.parseInt(fileName.substring(6, 8));
- int hour = Integer.parseInt(fileName.substring(8, 10));
- int minute = Integer.parseInt(fileName.substring(10, 12));
- int second = Integer.parseInt(fileName.substring(12, 14));
-
- calendar.set(Calendar.YEAR, year);
- calendar.set(Calendar.MONTH, month);
- calendar.set(Calendar.DAY_OF_MONTH, day);
- calendar.set(Calendar.HOUR_OF_DAY, hour);
- calendar.set(Calendar.MINUTE, minute);
- calendar.set(Calendar.SECOND, second);
-
- layer.getWaters().getData().add(calendar.getTime().getTime());
- }
- layer.getDuration().setStart(layer.getWaters().getData().get(0));
- layer.getDuration().setEnd(layer.getWaters().getData().get(layer.getWaters().getData().size() - 1));
- }*/
-
public void setWaterHeight(LayerDto layer, List<String> files) {
- int c = files.size(), step = files.size() / 10;
+ int c = files.size();
+ int step = files.size() / 10;
if (step < 1) step = 1;
for (int i = 0; i < c; i += step) {
Dataset ds = null;
@@ -264,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));
@@ -278,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) {
@@ -310,24 +306,25 @@
BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB);
//double differ = layer.getWaters().getMaxHeight() - layer.getWaters().getMinHeight(), minHeight = layer.getWaters().getMinHeight();
- double differ = layer.getExtension().getDiffer(), maxHeight = layer.getExtension().getMaxHeight(), minHeight = layer.getExtension().getMinHeight();
+ double differ = layer.getExtension().getDiffer();
+ 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;
for (int x = 0; x < width; x++) {
for (int y = 0; y < height; y++) {
int offset = x + y * width;
- //if (Float.isNaN(buffer[offset]) || buffer[offset] < -999 || buffer[offset] < minHeight) continue;
- if (Float.isNaN(buffer[offset]) || buffer[offset] < MIN_VAL || Float.isNaN(ts[offset])) continue;
+ float depth = buffer[offset];
+ if (Float.isNaN(depth) || depth < MIN_VAL || 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];
- //BuildingDto building = intersects(dto, X, Y);
- //if (null != building) continue;
-
- int r = 0, g, b;
- if (buffer[offset] + ts[offset] > maxHeight) {
+ int r = 0;
+ int g;
+ int b;
+ if (depth + ts[offset] > maxHeight) {
g = b = 255;
} else {
- int val = (int) ((buffer[offset] + ts[offset] - minHeight) / differ * 65535);
+ int val = (int) ((depth + ts[offset] - minHeight) / differ * 65535);
//int val = (int) (buffer[offset] / differ * 65535);
g = val / 256;
b = val % 256;
@@ -336,8 +333,27 @@
b = ComHelper.getSafeValue(b);
Color color = new Color(r, g, b, 127);
image.setRGB(x, y, color.getRGB());
+
+// maxDepth = Math.max(maxDepth, depth);
+// minDepth = Math.min(minDepth, depth);
}
}
+// 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();
@@ -432,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);
@@ -520,8 +536,8 @@
layer.setFlowUrl("/hls/f" + path + ".m3u8");
String json = JSON.toJSONString(layer);
- // String json = JSONUtil.toJsonPrettyStr(layer);
- String filePath = dto.getOutPath() + File.separator + "layer.json";
+// String filePath = dto.getOutPath() + File.separator + "layer.json";
+ String filePath = dto.getOutPath() + File.separator + layer.getName();
ComHelper.writeJson(filePath, json);
}
--
Gitblit v1.9.3