From c0bdfd481aaa7f5f88187992244954adf96ae0eb Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 25 四月 2023 09:35:50 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/InquiryService.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/InquiryService.java b/src/main/java/com/lf/server/service/show/InquiryService.java
index 207e3ba..27fc318 100644
--- a/src/main/java/com/lf/server/service/show/InquiryService.java
+++ b/src/main/java/com/lf/server/service/show/InquiryService.java
@@ -91,7 +91,7 @@
* 鐡︾墖璺緞鏄惁瀛樺湪
*/
private boolean isTilePathExist(PublishEntity pub) {
- String tilePath = pathHelper.getConfig().getTilePath().replace("2d\\tiles", "") + File.separator + pub.getPath();
+ String tilePath = pathHelper.getConfig().getTilePath().replace("2d\\tiles", "") + pub.getPath();
File f = new File(tilePath);
if (!f.exists() || !f.isDirectory()) {
@@ -109,7 +109,10 @@
private List<File> findTiles(DownloadTileEntity dt, PublishEntity pub) {
List<File> list = new ArrayList<>();
for (int i = 0; i < StaticData.I23; i++) {
- findTilesByZoom(dt, pub, i, list);
+ List<File> files = findTilesByZoom(dt, pub, i);
+ if (files.size() > 0) {
+ list.addAll(files);
+ }
}
return list;
@@ -118,10 +121,11 @@
/**
* 鏍规嵁灞傛鏌ユ壘鐡︾墖
*/
- private void findTilesByZoom(DownloadTileEntity dt, PublishEntity pub, int zoom, List<File> list) {
+ private List<File> findTilesByZoom(DownloadTileEntity dt, PublishEntity pub, int zoom) {
+ List<File> list = new ArrayList<>();
File f = new File(pub.getPath() + File.separator + zoom);
if (!f.exists() || !f.isDirectory()) {
- return;
+ return list;
}
int[] leftTop = deg2num(zoom, dt.getXmin(), dt.getYmax());
@@ -129,7 +133,7 @@
for (int x = leftTop[0]; x <= rightBottom[0]; x++) {
for (int y = leftTop[1]; y <= rightBottom[1]; y++) {
- String pngPath = String.format("%s\\%d\\%d.png", pub.getPath(), x, y);
+ String pngPath = String.format("%s\\%d\\%d\\%d.png", pub.getPath(), zoom, x, y);
File pngFile = new File(pngPath);
if (pngFile.exists()) {
@@ -137,6 +141,8 @@
}
}
}
+
+ return list;
}
/**
--
Gitblit v1.9.3