港口测试底图栅格json

src/main/java/com/ecnu/platform/test/TestPortGrid.groovy

@@ -59,22 +59,22 @@ class TestPortGrid {
         double heightJobLane = 4 * multiple
         double gapJobLane = 0 * multiple
         int sizeJobLane = 8
+        int numJob = (int) Math.ceil(widthJobLane/gridInterval)
 
         for (int i = 0; i < sizeJobLane; i++){
             double yNext = yJobLane + i * (heightJobLane + gapJobLane)
             String coordinateJobGrid = new String()
-            int num = Math.floor(widthJobLane/gridInterval)
 
             int k = 0
             while (true){
                 AlgBaseMapArea algBaseMapArea = new AlgBaseMapArea()
                 algBaseMapArea.setMapId("testPort")
-                String jobGridId = "JOB_GRID" + (i*num + k)
+                String jobGridId = "JOB_GRID" + (i*numJob + k)
                 algBaseMapArea.setId(jobGridId)
                 algBaseMapArea.setType("lane")
 
                 double xNext = xJobLane + k * gridInterval
-                if ((k+1) * gridInterval < widthJobLane){
+                if (k < numJob-1){
                     for (int j = 0;j < 5; j++){
                         coordinateJobGrid += xNext + xUnitList.get(j) * gridInterval + ","
                         coordinateJobGrid += yNext + yUnitList.get(j) * heightJobLane
@@ -109,22 +109,22 @@ class TestPortGrid {
         double heightTrafficLane = 4 * multiple
         double gapTrafficLane = 0 * multiple
         int sizeTrafficLane = 7
+        int numTraffic = (int) Math.ceil(widthTrafficLane/gridInterval)
 
         for (int i = 0; i < sizeTrafficLane; i++){
             double yNext = yTrafficLane + i * (heightTrafficLane + gapTrafficLane)
             String coordinateTrafficGrid = new String()
-            int num = Math.floor(widthTrafficLane/gridInterval)
 
             int k = 0
             while (true){
                 AlgBaseMapArea algBaseMapArea = new AlgBaseMapArea()
                 algBaseMapArea.setMapId("testPort")
-                String trafficGridId = "T_GRID" + (i*num + k)
+                String trafficGridId = "T_GRID" + (i*numTraffic + k)
                 algBaseMapArea.setId(trafficGridId)
                 algBaseMapArea.setType("lane")
 
                 double xNext = xTrafficLane + k * gridInterval
-                if ((k+1) * gridInterval < widthTrafficLane){
+                if (k < numTraffic-1){
                     for (int j = 0;j < 5; j++){
                         coordinateTrafficGrid += xNext + xUnitList.get(j) * gridInterval + ","
                         coordinateTrafficGrid += yNext + yUnitList.get(j) * heightTrafficLane