Skip to content

Commit 8839b49

Browse files
committed
refactor : reformat
1 parent 6d361ec commit 8839b49

File tree

9 files changed

+2
-18
lines changed

9 files changed

+2
-18
lines changed

terrainer/src/main/java/com/gaia3d/command/MagoTerrainerMain.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,8 @@ public static void main(String[] args) {
8787

8888
/**
8989
* Executes the terrainer process.
90-
*
91-
* @throws IOException if an I/O error occurs.
92-
* @throws FactoryException if a factory error occurs.
90+
* @throws IOException if an I/O error occurs.
91+
* @throws FactoryException if a factory error occurs.
9392
* @throws TransformException if a transform error occurs.
9493
*/
9594
private static void execute() throws Exception {

terrainer/src/main/java/com/gaia3d/quantized/mesh/QuantizedMesh.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,6 @@ public void saveDataOutputStream(LittleEndianDataOutputStream dataOutputStream,
261261
// save triangleCount
262262
dataOutputStream.writeInt(triangleCount);
263263

264-
265264
int indicesCount = triangleCount * 3;
266265
// if vertexCount > 65536, then save the triangleIndices as int
267266
if (vertexCount > 65536) {

terrainer/src/main/java/com/gaia3d/quantized/mesh/QuantizedMeshManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ public QuantizedMesh getQuantizedMeshFromTile(TileWgs84 tile, boolean calculateN
269269
double latScale = latRange / 32767.0;
270270
double heightScale = 32767.0 / heightRange;
271271

272-
273272
for (int i = 0; i < vertexCount; i++) {
274273
TerrainVertex vertex = vertices.get(i);
275274
double lonDeg = vertex.getPosition().x;

terrainer/src/main/java/com/gaia3d/terrain/structure/TerrainMesh.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,6 @@ public void splitTriangle(TerrainTriangle triangle, TerrainElevationDataManager
624624
halfEdgeB2.setTriangle(triangleB);
625625
halfEdgeB3.setTriangle(triangleB);
626626

627-
628627
// now delete the triangle
629628
disableTriangle(triangle);
630629

@@ -692,7 +691,6 @@ public void splitTriangle(TerrainTriangle triangle, TerrainElevationDataManager
692691
TerrainVertex longEdge_startVertex = longestHEdge.getStartVertex();
693692
TerrainVertex longEdge_endVertex = longestHEdge.getEndVertex();
694693

695-
696694
// A triangle is split by the longest edge
697695
// oppVtx_T
698696
// / \

terrainer/src/main/java/com/gaia3d/terrain/tile/TerrainElevationDataManager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public void makeAllTileWgs84Raster(TileRange tileRange, TileWgs84Manager tileWgs
122122
this.rootTerrainElevationDataQuadTree.deleteCoverageIfNoIntersectsGeoExtension(geoExtensionTotal);
123123
}
124124

125-
126125
for (TileIndices tileIndices : tileIndicesList) {
127126
TileWgs84Raster tileWgs84Raster = mapIndicesTileRaster.get(tileIndices.getString());
128127
if (tileWgs84Raster == null) {
@@ -324,7 +323,6 @@ public Double putAndGetGridAreaMap(String fileName, String path) {
324323
File file = new File(path);
325324
//String fileName = file.getName();
326325

327-
328326
File standardizationTempPath = new File(globalOptions.getStandardizeTempPath());
329327
File tempFile = new File(standardizationTempPath, fileName);
330328

terrainer/src/main/java/com/gaia3d/terrain/tile/TileIndices.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ public TileIndices getDownTileIndices(boolean originIsLeftUp) {
9494
tileIndices.set(X, Y - 1, L);
9595
}
9696

97-
9897
return tileIndices;
9998
}
10099

@@ -117,7 +116,6 @@ public TileIndices getRightTileIndices(boolean originIsLeftUp) {
117116
tileIndices.set(X + 1, Y, L);
118117
}
119118

120-
121119
return tileIndices;
122120
}
123121

terrainer/src/main/java/com/gaia3d/terrain/tile/TileMatrix.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ public void makeMatrixMesh(boolean isFirstGeneration) throws TransformException,
158158
tilesMatrixRowCol.add(tilesListRow);
159159
}
160160

161-
162161
int rowsCount = tilesMatrixRowCol.size();
163162
int colsCount = tilesMatrixRowCol.get(0).size();
164163
log.debug("Making TileMatrix columns : {}, rows : {} ", colsCount, rowsCount);
@@ -423,22 +422,19 @@ public boolean mustRefineTriangle(TerrainTriangle triangle) throws TransformExce
423422

424423
TileWgs84Raster tileRaster = terrainElevationDataManager.getTileWgs84Raster(tileIndices, this.manager);
425424

426-
427425
// if the triangle size is very small, then do not refine**********************
428426
// Calculate the maxLength of the triangle in meters
429427
this.listVertices.clear();
430428
this.listHalfEdges.clear();
431429
double triangleMaxLengthMeters = triangle.getTriangleMaxSizeInMeters(this.listVertices, this.listHalfEdges);
432430
double minTriangleSizeForDepth = this.manager.getMinTriangleSizeForTileDepth(triangle.getOwnerTileIndices().getL());
433431

434-
435432
if (triangleMaxLengthMeters < minTriangleSizeForDepth) {
436433
triangle.setRefineChecked(true);
437434
log.debug("Filtered by Min Triangle Size : L : " + tileIndices.getL() + " # triangleMaxLengthMeters : " + triangleMaxLengthMeters + " # minTriangleSizeForDepth : " + minTriangleSizeForDepth);
438435
return false;
439436
}
440437

441-
442438
double maxTriangleSizeForDepth = this.manager.getMaxTriangleSizeForTileDepth(triangle.getOwnerTileIndices().getL());
443439
if (triangleMaxLengthMeters > maxTriangleSizeForDepth) {
444440
log.debug("Filtered by Max Triangle Size : L : " + tileIndices.getL() + " # triangleMaxLengthMeters : " + triangleMaxLengthMeters + " # maxTriangleSizeForDepth : " + maxTriangleSizeForDepth);

terrainer/src/main/java/com/gaia3d/terrain/tile/TileWgs84Manager.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ public void makeTileMeshes() throws IOException, TransformException, FactoryExce
410410
this.terrainElevationDataManager.deleteTileRaster();
411411
this.terrainElevationDataManager.deleteCoverage();
412412

413-
414413
long endTime = System.currentTimeMillis();
415414
log.info("[Tile][{}/{}] - End making tile meshes : Duration: {}", depth, maxTileDepth, DecimalUtils.millisecondToDisplayTime(endTime - startTime));
416415

@@ -533,7 +532,6 @@ public void makeTileMeshesContinue() throws IOException, TransformException, Fac
533532
this.terrainElevationDataManager.deleteTileRaster();
534533
this.terrainElevationDataManager.deleteCoverage();
535534

536-
537535
long endTime = System.currentTimeMillis();
538536
log.info("[Tile][{}/{}] - End making tile meshes : Duration: {}", depth, maxTileDepth, DecimalUtils.millisecondToDisplayTime(endTime - startTime));
539537

terrainer/src/main/java/com/gaia3d/terrain/tile/geotiff/GaiaGeoTiffManager.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ public GridCoverage2D getResizedCoverage2D(GridCoverage2D originalCoverage, doub
122122
int desiredImageWidth = Math.max((int) desiredPixelsCountX, minXSize);
123123
int desiredImageHeight = Math.max((int) desiredPixelsCountY, minYSize);
124124

125-
126125
double scaleX = (double) desiredImageWidth / (double) gridSpanX;
127126
double scaleY = (double) desiredImageHeight / (double) gridSpanY;
128127

0 commit comments

Comments
 (0)