From bf298e5a8fa61e060c1bc18ad2db20a08f57b6b2 Mon Sep 17 00:00:00 2001
From: wuww <252740454@qq.com>
Date: 星期五, 18 四月 2025 15:04:02 +0800
Subject: [PATCH] 调整水面计算方法

---
 src/main/java/com/se/nsl/service/TestService.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/se/nsl/service/TestService.java b/src/main/java/com/se/nsl/service/TestService.java
index 2389cb6..9a46acd 100644
--- a/src/main/java/com/se/nsl/service/TestService.java
+++ b/src/main/java/com/se/nsl/service/TestService.java
@@ -89,8 +89,8 @@
             if (null == ds || 0 == ds.getRasterCount()) return;
 
             setTerrainInfo(ds, layer);
-            createTerrainPng(dto, ds, layer);
             setWaterInfo(dto, layer);
+            createTerrainPng(dto, ds, layer);
         } finally {
             if (null != ds) ds.delete();
         }
@@ -254,7 +254,7 @@
             }
         }
 
-        layer.getExtension().setMaxHeight(layer.getExtension().getMaxHeight() + layer.getWaters().getMaxHeight());
+        layer.getExtension().setMaxHeight(layer.getExtension().getMaxHeight() + layer.getWaters().getMaxHeight() + 1);
         layer.getExtension().setMaxHeight(ComHelper.getMaxVal(layer.getExtension().getMaxHeight(), 1000000));
         layer.getExtension().setMinHeight(ComHelper.getMaxVal(layer.getExtension().getMinHeight(), 1000000));
         layer.getExtension().setDiffer();
@@ -270,7 +270,7 @@
 
                 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));
+                ///createVectors(dto, ds, layer, layer.getWaters().getData().get(i));
             } finally {
                 if (null != ds) ds.delete();
             }
@@ -323,7 +323,8 @@
                     if (buffer[offset] + ts[offset] > maxHeight) {
                         g = b = 255;
                     } else {
-                        int val = (int) ((buffer[offset] + ts[offset] - minHeight) / differ * 65535);
+                        //int val = (int) ((buffer[offset] + ts[offset] - minHeight) / differ * 65535);
+                        int val = (int) (buffer[offset] / differ * 65535);
                         g = val / 256;
                         b = val % 256;
                     }

--
Gitblit v1.9.3