From 3417cf014a65765e02696c1d121ce58b2b4a8aed Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 08 四月 2025 15:55:36 +0800
Subject: [PATCH] 修改pom.xml
---
src/main/java/com/se/simu/service/ResultService.java | 77 ++++++++++----------------------------
1 files changed, 21 insertions(+), 56 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..a63cfc6 100644
--- a/src/main/java/com/se/simu/service/ResultService.java
+++ b/src/main/java/com/se/simu/service/ResultService.java
@@ -51,6 +51,7 @@
basePath + config.getBuildingFile(),
basePath + config.getWaterPath(),
basePath + config.getFlowPath(),
+ config.getInPath(),
config.getOutPath(),
data.getEpsg());
LayerDto layer = new LayerDto(config.getVer(), data.getEpsg(), config.getSizes());
@@ -111,38 +112,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) {
@@ -300,7 +275,7 @@
if (null == ds.GetSpatialRef()) ds.SetSpatialRef(dto.getSpatialReference());
createWaterPng(dto, ds, layer, layer.getWaters().getData().get(i));
- copyWaterTif(dto, ds, 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));
} finally {
if (null != ds) ds.delete();
@@ -316,7 +291,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 +317,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 +326,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;
}
@@ -484,17 +458,20 @@
List<PondingPo> list = new ArrayList<>();
for (Geometry geometry : geometries) {
- List<PointDto> points = getValues(ds, geometry, transform, xSize, ySize);
- if (CollectionUtils.isEmpty(points)) continue;
+ //List<PointDto> points = getValues(ds, geometry, transform, xSize, ySize);
+ //if (CollectionUtils.isEmpty(points)) continue;
- PointDto point = Collections.max(points);
+ //PointDto point = Collections.max(points);
+ PointDto point = getValues(ds, geometry, transform, xSize, ySize);
+ if (null == point) continue;
+
list.add(new PondingPo(geometry, point));
}
return list;
}
- private List<PointDto> getValues(Dataset ds, Geometry g, double[] transform, int xSize, int ySize) {
+ private PointDto getValues(Dataset ds, Geometry g, double[] transform, int xSize, int ySize) {
double[] env = new double[4];
g.GetEnvelope(env);
@@ -508,26 +485,14 @@
if (endY > ds.getRasterYSize()) endY = ds.getRasterYSize();
if (endX - startX < 1 || endY - startY < 1) return null;
- List<XYDto> xyList = new ArrayList<>();
- for (int x = startX; x <= endX; x++) {
- for (int y = startY; y <= endY; y++) {
- xyList.add(new XYDto(x, y));
- }
- }
+ int width = endX - startX;
+ int height = endY - startY;
+ double[] pixelValues = new double[width * height];
+ ds.GetRasterBand(1).ReadRaster(startX, startY, width, height, pixelValues);
- List<PointDto> points = new CopyOnWriteArrayList<>();
- xyList.stream().forEach(xy -> {
- double X = transform[0] + xy.getX() * transform[1] + xy.getY() * transform[2];
- double Y = transform[3] + xy.getX() * transform[4] + xy.getY() * transform[5];
+ Double val = Arrays.stream(pixelValues).max().getAsDouble();
- float[] values = new float[1];
- ds.GetRasterBand(1).ReadRaster(xy.getX(), xy.getY(), 1, 1, values);
- if (Float.isNaN(values[0]) || values[0] < -999 || !ComHelper.isContains(g, X, Y)) return;
-
- points.add(new PointDto(X, Y, values[0]));
- });
-
- return points;
+ return new PointDto(g.Centroid().GetX(), g.Centroid().GetY(), ComHelper.isValid(val) ? val : 0.0);
}
private void copeFlow(ResultDto dto, LayerDto layer) {
@@ -556,7 +521,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