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 | 38 +++++++++++++++-----------------------
1 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/se/simu/service/ResultService.java b/src/main/java/com/se/simu/service/ResultService.java
index 739dae5..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());
@@ -274,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();
@@ -457,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);
@@ -481,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) {
--
Gitblit v1.9.3