From 0d623fdd58bb900c8faf3144840acddafd921435 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期五, 10 一月 2025 15:37:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java |   97 +++++++++
 src/main/resources/map_4.json                                 |    2 
 src/main/resources/map_1.json                                 |    2 
 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java    |   96 +++++---
 src/main/java/com/zy/common/utils/ShuttleOperaUtils.java      |   14 +
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java   |    4 
 src/main/resources/mapper/LocMastMapper.xml                   |    1 
 src/main/webapp/views/console.html                            |   12 
 src/main/resources/mapper/WrkMastMapper.xml                   |    2 
 src/main/resources/map_2.json                                 |    2 
 src/main/java/com/zy/asrs/controller/ShuttleController.java   |  239 +++++++++++------------
 src/main/webapp/views/shuttle.html                            |   84 ++++---
 src/main/java/com/zy/asrs/entity/LocMast.java                 |    3 
 src/main/java/com/zy/common/service/CommonService.java        |    4 
 src/main/resources/map_3.json                                 |    2 
 src/main/java/com/zy/common/utils/NavigateSolution.java       |    2 
 16 files changed, 340 insertions(+), 226 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ShuttleController.java b/src/main/java/com/zy/asrs/controller/ShuttleController.java
index 30d15d4..f24d1cf 100644
--- a/src/main/java/com/zy/asrs/controller/ShuttleController.java
+++ b/src/main/java/com/zy/asrs/controller/ShuttleController.java
@@ -3,7 +3,11 @@
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
 import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.domain.param.ShuttleOperatorParam;
 import com.zy.asrs.domain.vo.*;
 import com.zy.asrs.entity.BasShuttle;
 import com.zy.asrs.entity.WrkMast;
@@ -11,8 +15,13 @@
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.utils.Utils;
+import com.zy.common.model.enums.NavigationMapType;
 import com.zy.common.service.CommonService;
+import com.zy.common.utils.NavigateMapUtils;
 import com.zy.common.utils.RedisUtil;
+import com.zy.common.utils.ShuttleOperaUtils;
+import com.zy.core.News;
+import com.zy.core.action.ShuttleAction;
 import com.zy.core.cache.OutputQueue;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.dispatcher.ShuttleDispatchUtils;
@@ -54,6 +63,12 @@
     private RedisUtil redisUtil;
     @Autowired
     private ShuttleDispatchUtils shuttleDispatchUtils;
+    @Autowired
+    private ShuttleOperaUtils shuttleOperaUtils;
+    @Autowired
+    private ShuttleAction shuttleAction;
+    @Autowired
+    private NavigateMapUtils navigateMapUtils;
 
     @PostMapping("/table/shuttle/state")
     @ManagerAuth(memo = "鍥涘悜绌挎杞︿俊鎭〃")
@@ -242,133 +257,103 @@
     /************************** 鎵嬪姩鎿嶄綔 ******************************/
     /****************************************************************/
 
-//    @ManagerAuth(memo = "鎵嬪姩鎿嶄綔")
-//    @PostMapping("/operator/shuttle")
-//    public R shuttleOperator(ShuttleOperatorParam param){
-//        if (Cools.isEmpty(param.getShuttleNo(), param.getShuttleTaskMode())) {
-//            return R.parse(BaseRes.PARAM);
-//        }
-//
-//        ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
-//
-//        if (param.getShuttleTaskMode() == 1 || param.getShuttleTaskMode() == 2 || param.getShuttleTaskMode() == 14) {
-//            if (Cools.isEmpty(param.getSourceLocNo(), param.getDistLocNo())) {
-//                return R.parse(BaseRes.PARAM);
-//            }
-//            assignCommand.setSourceLocNo(param.getSourceLocNo());
-//            assignCommand.setLocNo(param.getDistLocNo());
-//        }
-//
-//        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
-//            if (param.getShuttleNo().equals(shuttleSlave.getId())) {
-//                ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
-//                if (shuttleThread == null) {
-//                    throw new CoolException("鍥涘悜绌挎杞︿笉鍦ㄧ嚎");
-//                }
-//                ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
-//                if (shuttleProtocol == null) {
-//                    throw new CoolException("鍥涘悜绌挎杞︿笉鍦ㄧ嚎");
-//                }
-//
-//                ShuttleTaskModeType shuttleTaskModeType = ShuttleTaskModeType.get(param.getShuttleTaskMode().intValue());
-//                assignCommand.setShuttleNo(shuttleSlave.getId()); // 鍥涘悜绌挎杞︾紪鍙�
-//                assignCommand.setTaskMode(shuttleTaskModeType.id);
-//                assignCommand.setTaskNo(commonService.getWorkNo(3));//鑾峰彇浠诲姟鍙�
-//                assignCommand.setAuto(false);//鎵嬪姩妯″紡
-//
-//                if (shuttleTaskModeType == ShuttleTaskModeType.TRANSPORT) {
-//                    //鎼繍璐х墿浠诲姟
-//                    NyShuttleOperaResult result = NyShuttleOperaUtils.getShuttleTransportCommands(shuttleSlave.getId(), assignCommand.getTaskNo(), shuttleProtocol.getCurrentLocNo(), param.getSourceLocNo(), param.getDistLocNo());
-//                    if (result == null) {
-//                        throw new CoolException("璺緞璁＄畻澶辫触");
-//                    }
-//
-//                    assignCommand.setCommands(result.getCommands());
-//                    assignCommand.setNodes(result.getNodes());
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO) {
-//                    //绉诲姩鍒扮洰鏍囧簱浣�
-//                    Integer mapType = NavigationMapType.NORMAL.id;
-//                    if (shuttleProtocol.getLiftPosition() == 2) {
-//                        mapType = NavigationMapType.DFX.id;
-//                    }
-//                    NyShuttleOperaResult result = NyShuttleOperaUtils.getStartToTargetCommands(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), shuttleProtocol.getCurrentLocNo(), param.getDistLocNo(), mapType);
-//                    if (result == null) {
-//                        throw new CoolException("璺緞璁＄畻澶辫触");
-//                    }
-//
-//                    assignCommand.setCommands(result.getCommands());
-//                    assignCommand.setNodes(result.getNodes());
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.PALLET_LIFT) {
-//                    //鎵樼洏椤跺崌
-//                    NyShuttleHttpCommand command = NyHttpUtils.getPalletLiftCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
-//                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
-//                    commands.add(command);
-//                    assignCommand.setCommands(commands);
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.PALLET_DOWN) {
-//                    //鎵樼洏涓嬮檷
-//                    NyShuttleHttpCommand command = NyHttpUtils.getPalletLiftCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), false);
-//                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
-//                    commands.add(command);
-//                    assignCommand.setCommands(commands);
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE) {
-//                    //鍏呯數寮�鍏�
-//                    boolean charge = false;
-//                    if (shuttleProtocol.getChargState() == 1) {
-//                        //宸插厖鐢碉紝鍏抽棴鍏呯數
-//                        charge = false;
-//                    }else {
-//                        //寮�鍚厖鐢�
-//                        charge = true;
-//                    }
-//                    NyShuttleHttpCommand command = NyHttpUtils.getChargeCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), charge);
-//                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
-//                    commands.add(command);
-//                    assignCommand.setCommands(commands);
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
-//                    //澶嶄綅
-//                    shuttleProtocol.setTaskNo(0);//宸ヤ綔鍙锋竻绌�
-//                    shuttleProtocol.setToken(0);//浠ょ墝娓呯┖
-//                    shuttleProtocol.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
-//                    shuttleProtocol.setPakMk(false);//浣滀笟鏍囪澶嶄綅
-//
-//                    shuttleProtocol.setMoveLoc(false);
-//                    shuttleProtocol.setMoveType(0);
-//                    shuttleProtocol.setXStart(0);
-//                    shuttleProtocol.setXTarget(0);
-//                    shuttleProtocol.setXCurrent(0);
-//                    shuttleProtocol.setYStart(0);
-//                    shuttleProtocol.setYTarget(0);
-//                    shuttleProtocol.setYCurrent(0);
-//                    return R.ok();
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CONTROL) {
-//                    //灏忚溅绠″埗
-//                    NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), true);
-//                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
-//                    commands.add(suspendCommand);
-//                    assignCommand.setCommands(commands);
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.SHUTTLE_CANCEL_CONTROL) {
-//                    //灏忚溅鍙栨秷绠″埗
-//                    NyShuttleHttpCommand suspendCommand = NyHttpUtils.getSuspendCommand(shuttleSlave.getId(), assignCommand.getTaskNo().intValue(), false);
-//                    ArrayList<NyShuttleHttpCommand> commands = new ArrayList<>();
-//                    commands.add(suspendCommand);
-//                    assignCommand.setCommands(commands);
-//                } else if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO_WRK_MAST) {
-//                    //绉诲姩鍒扮洰鏍囧簱浣�(鐢熸垚绉诲姩浠诲姟)
-//                    shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(3), param.getDistLocNo(), param.getShuttleNo());
-//                    return R.ok();
-//                } else {
-//                    throw new CoolException("鏈煡鍛戒护");
-//                }
-//
-//                if (MessageQueue.offer(SlaveType.Shuttle, shuttleSlave.getId(), new Task(3, assignCommand))) {
-//                    return R.ok();
-//                } else {
-//                    throw new CoolException("鍛戒护涓嬪彂澶辫触");
-//                }
-//            }
-//        }
-//        return R.error();
-//    }
+    @ManagerAuth(memo = "鎵嬪姩鎿嶄綔")
+    @PostMapping("/operator/shuttle")
+    public R shuttleOperator(ShuttleOperatorParam param){
+        if (Cools.isEmpty(param.getShuttleNo(), param.getShuttleTaskMode())) {
+            return R.parse(BaseRes.PARAM);
+        }
+
+        ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
+
+        if (param.getShuttleTaskMode().intValue() == ShuttleTaskModeType.MOVE_LOC_NO.id
+                || param.getShuttleTaskMode().intValue() == ShuttleTaskModeType.MOVE_LOC_NO_TASK.id
+                || param.getShuttleTaskMode().intValue() == ShuttleTaskModeType.TRANSPORT.id) {
+            if (Cools.isEmpty(param.getSourceLocNo(), param.getDistLocNo())) {
+                return R.parse(BaseRes.PARAM);
+            }
+            assignCommand.setSourceLocNo(param.getSourceLocNo());
+            assignCommand.setLocNo(param.getDistLocNo());
+        }
+
+        for (ShuttleSlave shuttleSlave : slaveProperties.getShuttle()) {
+            if (param.getShuttleNo().equals(shuttleSlave.getId())) {
+                ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, shuttleSlave.getId());
+                if (shuttleThread == null) {
+                    throw new CoolException("鍥涘悜绌挎杞︿笉鍦ㄧ嚎");
+                }
+                ShuttleProtocol shuttleProtocol = shuttleThread.getStatus();
+                if (shuttleProtocol == null) {
+                    throw new CoolException("鍥涘悜绌挎杞︿笉鍦ㄧ嚎");
+                }
+
+                ShuttleTaskModeType shuttleTaskModeType = ShuttleTaskModeType.get(param.getShuttleTaskMode().intValue());
+                assignCommand.setShuttleNo(shuttleSlave.getId()); // 鍥涘悜绌挎杞︾紪鍙�
+                assignCommand.setTaskMode(shuttleTaskModeType.id);
+                assignCommand.setTaskNo(commonService.getWorkNo(99));//鑾峰彇浠诲姟鍙�
+                assignCommand.setAuto(false);//鎵嬪姩妯″紡
+
+                if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO) {
+                    //绉诲姩鍒扮洰鏍囧簱浣�
+                    Integer mapType = NavigationMapType.NORMAL.id;
+                    if (shuttleProtocol.getHasLift()) {
+                        mapType = NavigationMapType.DFX.id;
+                    }
+                    List<ShuttleCommand> commands = shuttleOperaUtils.getStartToTargetCommands(shuttleProtocol.getCurrentLocNo(), param.getDistLocNo(), mapType, assignCommand, shuttleThread);
+                    if (commands == null) {
+                        throw new CoolException("璺緞璁＄畻澶辫触");
+                    }
+
+                    assignCommand.setCommands(commands);
+
+                    //灏濊瘯閿佸畾鐩爣绔欒矾寰�
+                    boolean result2 = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(param.getDistLocNo()), shuttleProtocol.getShuttleNo(), assignCommand.getNodesDeepCopy(), true);//鎵�浣跨敤鐨勮矾寰勮繘琛岄攣瀹氱鐢�
+                    if (!result2) {
+                        News.info("{}浠诲姟锛寋}灏忚溅锛岃矾寰勯攣瀹氬け璐ワ紝绂佹娲惧彂", param.getDistLocNo(), shuttleProtocol.getShuttleNo());
+                        throw new CoolException("璺緞閿佸畾澶辫触");
+                    }
+
+                } else if (shuttleTaskModeType == ShuttleTaskModeType.PALLET_LIFT) {
+                    //鎵樼洏椤跺崌
+                    List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleLiftCommand(assignCommand, shuttleThread, true);
+                    assignCommand.setCommands(commands);
+                } else if (shuttleTaskModeType == ShuttleTaskModeType.PALLET_DOWN) {
+                    //鎵樼洏涓嬮檷
+                    List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleLiftCommand(assignCommand, shuttleThread, false);
+                    assignCommand.setCommands(commands);
+                } else if (shuttleTaskModeType == ShuttleTaskModeType.CHARGE) {
+                    //鍏呯數寮�鍏�
+                    boolean charge = false;
+                    if (shuttleProtocol.getHasCharge()) {
+                        //宸插厖鐢碉紝鍏抽棴鍏呯數
+                        charge = false;
+                    }else {
+                        //寮�鍚厖鐢�
+                        charge = true;
+                    }
+                    List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, charge);
+                    assignCommand.setCommands(commands);
+                } else if (shuttleTaskModeType == ShuttleTaskModeType.RESET) {
+                    //澶嶄綅
+                    shuttleThread.setSyncTaskNo(0);//宸ヤ綔鍙锋竻绌�
+                    shuttleThread.setProtocolStatus(ShuttleProtocolStatusType.IDLE);//浠诲姟鐘舵��-绌洪棽
+                    shuttleThread.setPakMk(true);//浣滀笟鏍囪澶嶄綅
+
+                    shuttleThread.enableMoveLoc(null, false);
+                    return R.ok();
+                } else if (shuttleTaskModeType == ShuttleTaskModeType.MOVE_LOC_NO_TASK) {
+                    //绉诲姩鍒扮洰鏍囧簱浣�(鐢熸垚绉诲姩浠诲姟)
+                    shuttleDispatchUtils.dispatchShuttle(commonService.getWorkNo(3), param.getDistLocNo(), param.getShuttleNo());
+                    return R.ok();
+                } else {
+                    throw new CoolException("鏈煡鍛戒护");
+                }
+
+                shuttleAction.assignWork(shuttleProtocol.getShuttleNo(), assignCommand);
+            }
+        }
+        return R.error();
+    }
 
     @PostMapping("/detl/update")
     @ManagerAuth(memo = "淇敼鏁版嵁")
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index c302885..fa8ef82 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -107,9 +107,6 @@
     @TableField("error_memo")
     private String errorMemo;
 
-    @ApiModelProperty(value= "")
-    private String barcode;
-
     @ApiModelProperty(value= "搴撲綅鐪熷疄浜岀淮鐮�")
     @TableField("qr_code_value")
     private String qrCodeValue;
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index b1aafc8..8719b84 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1970,7 +1970,7 @@
             assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id);//鍑哄簱妯″紡
             assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
 
-            List<ShuttleCommand> commands = shuttleOperaUtils.shuttleChargeCommand(assignCommand, shuttleThread, true);
+            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, true);
             assignCommand.setCommands(commands);//杩愯鍛戒护
 
             wrkMast.setWrkSts(WrkStsType.CHARGE_SHUTTLE_WORKING.sts);
@@ -2009,7 +2009,7 @@
             assignCommand.setTaskMode(ShuttleTaskModeType.CHARGE.id);//鍑哄簱妯″紡
             assignCommand.setSourceLocNo(shuttleProtocol.getCurrentLocNo());//婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
 
-            List<ShuttleCommand> commands = shuttleOperaUtils.shuttleChargeCommand(assignCommand, shuttleThread, false);
+            List<ShuttleCommand> commands = shuttleOperaUtils.getShuttleChargeCommand(assignCommand, shuttleThread, false);
             assignCommand.setCommands(commands);//杩愯鍛戒护
 
             wrkMast.setWrkSts(WrkStsType.CHARGE_SHUTTLE_COMPLETE.sts);
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 246a478..b553989 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -32,7 +32,7 @@
         int eNo = wrkLastno.getENo();
         workNo = workNo>=eNo ? sNo : workNo+1;
         while (true) {
-            WrkMast wrkMast = wrkMastService.selectById(workNo);
+            WrkMast wrkMast = wrkMastService.selectByWorkNo(workNo);
             if (null != wrkMast) {
                 workNo = workNo>=eNo ? sNo : workNo+1;
             } else {
@@ -48,7 +48,7 @@
         if (workNo == 0) {
             throw new CoolException("鐢熸垚宸ヤ綔鍙峰け璐ワ紝璇疯仈绯荤鐞嗗憳");
         } else {
-            if (wrkMastService.selectById(workNo)!=null) {
+            if (wrkMastService.selectByWorkNo(workNo)!=null) {
                 throw new CoolException("鐢熸垚宸ヤ綔鍙�" + workNo + "鍦ㄥ伐浣滄。涓凡瀛樺湪");
             }
         }
diff --git a/src/main/java/com/zy/common/utils/NavigateSolution.java b/src/main/java/com/zy/common/utils/NavigateSolution.java
index 0c632b9..13df2e2 100644
--- a/src/main/java/com/zy/common/utils/NavigateSolution.java
+++ b/src/main/java/com/zy/common/utils/NavigateSolution.java
@@ -149,7 +149,7 @@
         ConfigService configService = SpringUtils.getBean(ConfigService.class);
         if (configService != null) {
             Config config = configService.selectOne(new EntityWrapper<Config>()
-                    .eq("config", "direction_map")
+                    .eq("code", "direction_map")
                     .eq("status", 1));
             if (config != null) {
                 mapDirection = config.getValue();
diff --git a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
index cba1a01..76e7459 100644
--- a/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
+++ b/src/main/java/com/zy/common/utils/ShuttleOperaUtils.java
@@ -143,7 +143,7 @@
     /**
      * 鑾峰彇鍏呯數鍛戒护
      */
-    public synchronized List<ShuttleCommand> shuttleChargeCommand(ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, Boolean openCharge) {
+    public synchronized List<ShuttleCommand> getShuttleChargeCommand(ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, Boolean openCharge) {
         List<ShuttleCommand> commands = new ArrayList<>();
 
         //鑾峰彇鍏呯數鍛戒护
@@ -152,6 +152,18 @@
         return commands;
     }
 
+    /**
+     * 鑾峰彇椤跺崌鍛戒护
+     */
+    public synchronized List<ShuttleCommand> getShuttleLiftCommand(ShuttleAssignCommand assignCommand, ShuttleThread shuttleThread, Boolean lift) {
+        List<ShuttleCommand> commands = new ArrayList<>();
+
+        //鑾峰彇椤跺崌鍛戒护
+        ShuttleCommand command = shuttleThread.getLiftCommand(assignCommand.getDeviceTaskNo(), lift);
+        commands.add(command);
+        return commands;
+    }
+
 //    private boolean checkSimilarityPath(Motion motion, ShuttleAssignCommand assignCommand) {
 //        String movePath = motion.getMovePath();
 //        if (Cools.isEmpty(movePath)) {
diff --git a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
index 003af3f..9f7b0bd 100644
--- a/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
+++ b/src/main/java/com/zy/core/model/protocol/ShuttleProtocol.java
@@ -12,6 +12,8 @@
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.HashMap;
+
 /**
  * 鍥涘悜绌挎杞�
  */
@@ -51,7 +53,7 @@
     private String locNo;
 
     /**
-     * 灏忚溅璁惧鐘舵��
+     * 灏忚溅璁惧鐘舵��0:蹇欑 1:绌洪棽
      */
     private Integer deviceStatus;
 
@@ -108,6 +110,11 @@
      * 鐢垫睜鐢靛帇
      */
     private Integer batteryVoltage;
+
+    /**
+     * 杩愯閫熷害
+     */
+    private Integer speed;
 
 
     //**********************绯荤粺鑷韩鎵�闇�灞炴��**********************
@@ -175,6 +182,13 @@
      * 鎵╁睍瀛楁
      */
     private Object extend;
+
+    public String getProtocolStatus$() {
+        if (this.protocolStatusType == null) {
+            return "";
+        }
+        return this.protocolStatusType.desc;
+    }
 
     /**
      * 璁剧疆灏忚溅鐘舵��
@@ -247,4 +261,85 @@
         return basShuttleErr.getErrName();
     }
 
+    public String getMode$() {
+        if (this.mode == null) {
+            return "";
+        }
+        if (this.mode == 0) {
+            return "鎵嬪姩";
+        } else if (this.mode == 1) {
+            return "鑷姩";
+        }
+
+        return "";
+    }
+
+    public String getDeviceStatus$() {
+        if (this.deviceStatus == null) {
+            return "";
+        }
+        if (this.deviceStatus == 0) {
+            return "蹇欑";
+        } else if (this.deviceStatus == 1) {
+            return "绌洪棽";
+        }
+
+        return "";
+    }
+
+    public String getHasLift$() {
+        if (this.hasLift == null) {
+            return "";
+        }
+
+        return this.hasLift ? "Y" : "N";
+    }
+
+    public String getHasCharge$() {
+        if (this.hasCharge == null) {
+            return "";
+        }
+
+        return this.hasCharge ? "Y" : "N";
+    }
+
+    public String getHasPallet$() {
+        if (this.hasPallet == null) {
+            return "";
+        }
+
+        return this.hasPallet ? "Y" : "N";
+    }
+
+    public String getPakMk$() {
+        if (this.pakMk == null) {
+            return "";
+        }
+
+        return this.pakMk ? "Y" : "N";
+    }
+
+    public HashMap<String, Object> getPoint() {
+        HashMap<String, Object> map = new HashMap<>();
+        if (this.currentCode == null) {
+            return map;
+        }
+
+        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+        if (locMastService == null) {
+            return map;
+        }
+
+        //婧愬簱浣�(灏忚溅褰撳墠浣嶇疆)
+        LocMast currentLocMast = locMastService.queryByQrCode(this.currentCode);
+        if (currentLocMast == null) {
+            return map;
+        }
+
+        map.put("x", currentLocMast.getRow1());
+        map.put("y", currentLocMast.getBay1());
+        map.put("z", currentLocMast.getLev1());
+        return map;
+    }
+
 }
diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index dd31655..d761a6e 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -152,6 +152,9 @@
                 //閲囬泦鏃堕棿瓒呰繃5s锛屼繚瀛樹竴娆℃暟鎹褰�
                 //淇濆瓨鏁版嵁璁板綍
                 DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
+                if (deviceDataLogService == null) {
+                    return;
+                }
                 DeviceDataLog deviceDataLog = new DeviceDataLog();
                 deviceDataLog.setOriginData(JSON.toJSONString(this.originDeviceData));
                 deviceDataLog.setWcsData(JSON.toJSONString(shuttleProtocol));
@@ -162,29 +165,8 @@
 
                 //鏇存柊閲囬泦鏃堕棿
                 shuttleProtocol.setDeviceDataLog(System.currentTimeMillis());
+                OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
             }
-        }
-
-        //灏嗗洓鍚戠┛姊溅鐘舵�佷繚瀛樿嚦鏁版嵁搴�
-        BasShuttleService shuttleService = SpringUtils.getBean(BasShuttleService.class);
-        BasShuttle basShuttle = shuttleService.selectOne(new EntityWrapper<BasShuttle>()
-                .eq("shuttle_no", slave.getId()));
-
-        if (basShuttle == null) {
-            basShuttle = new BasShuttle();
-            //鍥涘悜绌挎杞﹀彿
-            basShuttle.setShuttleNo(slave.getId());
-            basShuttle.setStatus(1);
-            shuttleService.insert(basShuttle);
-        }
-        //浠诲姟鍙�
-        basShuttle.setWrkNo(shuttleProtocol.getTaskNo().intValue());
-        //淇敼鏃堕棿
-        basShuttle.setUpdateTime(new Date());
-        //璁惧鐘舵��
-        basShuttle.setDeviceStatus(JSON.toJSONString(shuttleProtocol));
-        if (shuttleService.updateById(basShuttle)) {
-            OutputQueue.SHUTTLE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
         }
     }
 
@@ -315,13 +297,21 @@
                 shuttleProtocol.setRunDirection(data.getString("runDir") == null ? "none" : data.getString("runDir"));
                 //鏄惁涓哄厖鐢电姸鎬�
                 shuttleProtocol.setHasCharge(data.getInteger("chargState") == 1 ? true : false);
+                //杩愯閫熷害
+                shuttleProtocol.setSpeed(data.getInteger("speed"));
 
                 //*********璇诲彇鎵╁睍瀛楁**********
                 InnerSuhttleExtend extend = (InnerSuhttleExtend) shuttleProtocol.getExtend();
                 //绠″埗鐘舵��
                 extend.setSuspendState(data.getInteger("suspendState"));
-                //褰撳墠閫熷害
-                extend.setSpeed(data.getInteger("speed"));
+                //鏈�楂樼數鑺數鍘�(mV)
+                extend.setMaxCellVoltage(data.getInteger("maxCellVoltage"));
+                //鏈�浣庣數鑺數鍘�(mV)
+                extend.setMinCellVoltage(data.getInteger("minCellVoltage"));
+                //鐢垫睜鐢靛帇
+                extend.setVoltage(data.getInteger("voltage"));
+                //鍏呮斁鐢靛惊鐜鏁�
+                extend.setChargeCycleTimes(data.getInteger("chargeCycleTimes"));
                 //鍓╀綑鐢甸噺
                 extend.setSurplusQuantity(data.getInteger("surplusQuantity"));
                 //鎬荤數閲�
@@ -333,7 +323,7 @@
                 ///璇诲彇鍥涘悜绌挎杞︾姸鎬�-end
 
                 //灏忚溅澶勪簬杩愯涓紝灏嗘爣璁扮疆涓簍rue
-                if (shuttleProtocol.getDeviceStatus() == 1) {
+                if (shuttleProtocol.getDeviceStatus() == 0) {
                     shuttleProtocol.setPakMk(true);
                 }
 
@@ -370,6 +360,9 @@
             int removeIdx = -1;
             for (int i = 0; i < socketResults.size(); i++) {
                 JSONObject socketResult = socketResults.get(i);
+                if (socketResult == null) {
+                    continue;
+                }
                 if (!socketResult.get("msgType").equals("requestMsg")) {//涓嶆槸璇锋眰鍐呭
                     continue;
                 }
@@ -399,7 +392,7 @@
                 socketResults.remove(removeIdx);
             }
         } catch (Exception e) {
-            e.printStackTrace();
+//            e.printStackTrace();
         }
     }
 
@@ -842,8 +835,8 @@
             data.put("xp", xp);
             data.put("yp", yp);
             data.put("z", z);
-            data.put("x", mapNode.getYBase());
-            data.put("y", mapNode.getXBase());
+            data.put("x", mapNode.getXBase());
+            data.put("y", mapNode.getYBase());
             path.add(data);
         }
 
@@ -851,7 +844,7 @@
 
         LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
-                .eq("code", distCodeNum));
+                .eq("qr_code_value", distCodeNum));
         if (locMast == null) {
             throw new CoolException("搴撲綅淇℃伅涓嶅瓨鍦�");
         }
@@ -946,8 +939,7 @@
 
         String mapStr = JSON.toJSONString(map);
         LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
-                .eq("code", mapStr)
-                .eq("status", 1));
+                .eq("qr_code_value", mapStr));
         if (locMast == null) {
             throw new CoolException("鍦板潃鐮佷笉瀛樺湪");
         }
@@ -960,8 +952,8 @@
         location.put("xp", row);
         location.put("yp", bay);
         location.put("z", lev);
-        location.put("x", mapNode.getYBase());
-        location.put("y", mapNode.getXBase());
+        location.put("x", mapNode.getXBase());
+        location.put("y", mapNode.getYBase());
 
         HashMap<String, Object> body = new HashMap<>();
         body.put("responseType", "init");//澶嶄綅
@@ -1117,9 +1109,22 @@
 //        int x1 = Math.abs(y - 61) + 11;
 //        //WCS绯荤粺X杞� => 鐗涚溂Y杞磋浆鎹㈠叕寮�
 //        int y1 = x + 10;
-        int x1 = x + 10;
-        int y1 = y + 10;
-        return new int[]{y1, x1, z};
+
+//        int x1 = x + 10;
+//        int y1 = y + 10;
+        LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
+        LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
+                .eq("row1", x)
+                .eq("bay1", y)
+                .eq("lev1", z)
+                .eq("status", 1));
+        if (locMast == null) {
+            return null;
+        }
+
+        String qrCodeValue = locMast.getQrCodeValue();
+        JSONObject data = JSON.parseObject(qrCodeValue);
+        return new int[]{data.getInteger("y"), data.getInteger("x"), z};
     }
 
     @Data
@@ -1132,9 +1137,24 @@
         private Integer suspendState;
 
         /**
-         * 褰撳墠閫熷害锛屽崟浣峬m/s
+         * 鏈�楂樼數鑺數鍘�(mV)
          */
-        private Integer speed;
+        private Integer maxCellVoltage;
+
+        /**
+         * 鏈�浣庣數鑺數鍘�(mV)锛屼綆浜�2900mv闇�瑕佺珛鍗冲厖鐢�
+         */
+        private Integer minCellVoltage;
+
+        /**
+         * 鐢垫睜鐢靛帇锛坢V锛�
+         */
+        private Integer voltage;
+
+        /**
+         * 鍏呮斁鐢靛惊鐜鏁�
+         */
+        private Integer chargeCycleTimes;
 
         /**
          * 鍓╀綑鐢甸噺/10(A)
diff --git a/src/main/resources/map_1.json b/src/main/resources/map_1.json
index c5fae77..d45400e 100644
--- a/src/main/resources/map_1.json
+++ b/src/main/resources/map_1.json
@@ -1 +1 @@
-[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
+[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 10000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11450 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12900 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 14350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15800 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17250 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 18700 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20150 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
diff --git a/src/main/resources/map_2.json b/src/main/resources/map_2.json
index c5fae77..d45400e 100644
--- a/src/main/resources/map_2.json
+++ b/src/main/resources/map_2.json
@@ -1 +1 @@
-[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
+[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 10000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11450 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12900 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 14350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15800 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17250 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 18700 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20150 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
diff --git a/src/main/resources/map_3.json b/src/main/resources/map_3.json
index c5fae77..d45400e 100644
--- a/src/main/resources/map_3.json
+++ b/src/main/resources/map_3.json
@@ -1 +1 @@
-[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
+[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 10000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11450 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12900 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 14350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15800 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17250 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 18700 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20150 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
diff --git a/src/main/resources/map_4.json b/src/main/resources/map_4.json
index c5fae77..d45400e 100644
--- a/src/main/resources/map_4.json
+++ b/src/main/resources/map_4.json
@@ -1 +1 @@
-[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
+[ [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 10000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 10000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11450 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12900 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12900 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 14350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 14350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15800 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15800 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17250 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17250 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 18700 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 18700 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20150 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20150 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21600 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21600 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 23050, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 23050 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 23050 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ], [ { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000 } ] ]
\ No newline at end of file
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 0a4b649..d958c83 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -20,7 +20,6 @@
         <result column="appe_time" property="appeTime" />
         <result column="error_time" property="errorTime" />
         <result column="error_memo" property="errorMemo" />
-        <result column="barcode" property="barcode" />
         <result column="qr_code_value" property="qrCodeValue" />
 
     </resultMap>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index a921fd4..7950d69 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -46,7 +46,7 @@
     </select>
 
     <select id="selectByWorkNo" resultMap="BaseResultMap">
-        select * from dbo.asr_wrk_mast
+        select * from asr_wrk_mast
         where wrk_no=#{workNo}
         limit 0,1
     </select>
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 2bd4961..7f5fb5d 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -60,8 +60,8 @@
 					<!--杈撳嚭灏忚溅-->
 					<div v-for="(car,idx) in currentLevShuttleList"
 						 :style="{
-						 left: getCarPosition(car.wcsPoint.x,car.wcsPoint.y)[1]
-						 ,top: getCarPosition(car.wcsPoint.x,car.wcsPoint.y)[0]
+						 left: getCarPosition(car.point.x,car.point.y)[1]
+						 ,top: getCarPosition(car.point.x,car.point.y)[0]
 						 ,color: shuttleColorList[car.shuttleNo]
 						 }"
 						 class="sxcar" :id="'sxcar-' + car.shuttleNo">
@@ -78,7 +78,7 @@
 					<div>
 <!--						<el-button @click="testMove()">娴嬭瘯绉诲姩杞�</el-button>-->
 						<el-button @click="resetMap()">閲嶇疆鍦板浘</el-button>
-						<el-button @click="initLoc()">鍒濆鍖栧簱浣�</el-button>
+<!--						<el-button @click="initLoc()">鍒濆鍖栧簱浣�</el-button>-->
 					</div>
 				</div>
 			</div>
@@ -334,7 +334,7 @@
 					map: [],//鍦板浘鏁版嵁
 					currentLev: 1,//鍦板浘褰撳墠妤煎眰
 					siteWindow: false, //绔欑偣寮圭獥鏄剧ず榛樿涓嶆樉绀�
-					floorList: [1, 2, 3], //褰撳墠椤圭洰妤煎眰
+					floorList: [1, 2, 3, 4], //褰撳墠椤圭洰妤煎眰
 					shuttleList: [], //鍥涘悜绌挎杞﹂泦鍚�
 					currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
 					shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
@@ -599,8 +599,8 @@
 								let tmp = null
 								tmp = setInterval(() => {
 									if (index < res.length) {
-										that.currentLevShuttleList[0].wcsPoint.y = res[index].y
-										that.currentLevShuttleList[0].wcsPoint.x = res[index].x
+										that.currentLevShuttleList[0].point.y = res[index].y
+										that.currentLevShuttleList[0].point.x = res[index].x
 										index++
 									}else {
 										clearInterval(tmp)
diff --git a/src/main/webapp/views/shuttle.html b/src/main/webapp/views/shuttle.html
index d11d3c5..f5455f1 100644
--- a/src/main/webapp/views/shuttle.html
+++ b/src/main/webapp/views/shuttle.html
@@ -42,10 +42,7 @@
                         <th>褰撳墠閫熷害</th>
                         <th>璐熻浇鐘舵��</th>
                         <th>椤跺崌浣嶇疆</th>
-                        <th>杩愯鏂瑰悜</th>
-                        <th>杩愯鏂瑰悜2</th>
                         <th>鍏呯數鐘舵��</th>
-                        <th>鏁呴殰鐘舵��</th>
                         <th>鏁呴殰鐮�</th>
                         <th>绠″埗鐘舵��</th>
                         <th>浣庣數閲�</th>
@@ -71,10 +68,7 @@
                     <th>鍏呮斁鐢靛惊鐜鏁�</th>
                     <th>鍓╀綑鐢甸噺</th>
                     <th>鎬荤數閲�</th>
-                    <th>鎬婚噷绋嬫暟</th>
                     <th>浣滀笟鏍囪</th>
-                    <th>褰撳墠搴撲綅</th>
-                    <th>浠ょ墝</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -119,9 +113,9 @@
                                     </div>
 
                                     <div style="margin-top: 10px;">
-                                        <button class="item" onclick="shuttleOperator(18)">鎼繍璐х墿</button>
-                                        <button class="item" onclick="shuttleOperator(14)">绉诲姩鍒扮洰鏍囧簱浣�</button>
-                                        <button class="item" onclick="shuttleOperator(23)">绉诲姩鍒扮洰鏍囧簱浣�(浠诲姟)</button>
+                                        <button class="item" onclick="shuttleOperator(9)">鎼繍璐х墿</button>
+                                        <button class="item" onclick="shuttleOperator(4)">绉诲姩鍒扮洰鏍囧簱浣�</button>
+                                        <button class="item" onclick="shuttleOperator(5)">绉诲姩鍒扮洰鏍囧簱浣�(浠诲姟)</button>
                                         <!--                                            <button class="item" onclick="shuttleOperator(16)">绉诲姩鍒版彁鍗囨満</button>-->
                                     </div>
                                 </div>
@@ -133,12 +127,10 @@
                                 <span class="select-title">鐩稿叧鎸囦护</span>
                                 <div class="select-container" style="height: auto;padding: 30px 10px 10px 10px;">
                                     <div class="button-group">
-                                        <button class="item" onclick="shuttleOperator(3)">鎵樼洏椤跺崌</button>
-                                        <button class="item" onclick="shuttleOperator(4)">鎵樼洏涓嬮檷</button>
-                                        <button class="item" onclick="shuttleOperator(15)">鍏呯數寮�鍏�</button>
-                                        <button class="item" onclick="shuttleOperator(9)">澶嶄綅</button>
-                                        <button class="item" onclick="shuttleOperator(21)">绠″埗</button>
-                                        <button class="item" onclick="shuttleOperator(22)">鍙栨秷绠″埗</button>
+                                        <button class="item" onclick="shuttleOperator(1)">鎵樼洏椤跺崌</button>
+                                        <button class="item" onclick="shuttleOperator(2)">鎵樼洏涓嬮檷</button>
+                                        <button class="item" onclick="shuttleOperator(6)">鍏呯數寮�鍏�</button>
+                                        <button class="item" onclick="shuttleOperator(3)">澶嶄綅</button>
                                     </div>
                                 </div>
                             </div>
@@ -333,23 +325,25 @@
             for (let i=1;i<=table.length;i++){
                 // $("#mode-"+table[i-1].shuttleNo).html(table[i-1].statusVal===0?'鑱旀満':'鑴辨満');
                 let tr = tableEl.find("tr").eq(i);
+                let suspendState;
+                if (table[i - 1]['extend'] != undefined) {
+                    suspendState = table[i-1]['extend'].suspendState
+                }
+
                 setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
                 setVal(tr.children("td").eq(1), table[i-1].protocolStatus$);
-                setVal(tr.children("td").eq(2), table[i-1].free$);
-                setVal(tr.children("td").eq(3), table[i-1].workingMode$);
-                setVal(tr.children("td").eq(4), table[i-1].point$);
-                setVal(tr.children("td").eq(5), table[i-1].point$$);
-                setVal(tr.children("td").eq(6), table[i-1].powerPercent$);
+                setVal(tr.children("td").eq(2), table[i-1].deviceStatus$);
+                setVal(tr.children("td").eq(3), table[i-1].mode$);
+                setVal(tr.children("td").eq(4), table[i-1].currentLocNo);
+                setVal(tr.children("td").eq(5), table[i-1].currentCode);
+                setVal(tr.children("td").eq(6), table[i-1].batteryPower);
                 setVal(tr.children("td").eq(7), table[i-1].speed);
-                setVal(tr.children("td").eq(8), table[i-1].loadState$);
-                setVal(tr.children("td").eq(9), table[i-1].liftPosition$);
-                setVal(tr.children("td").eq(10), table[i-1].runDir$);
-                setVal(tr.children("td").eq(11), table[i-1].runDir2$);
-                setVal(tr.children("td").eq(12), table[i-1].chargState$);
-                setVal(tr.children("td").eq(13), table[i-1].errState$);
-                setVal(tr.children("td").eq(14), table[i-1].errCode$);
-                setVal(tr.children("td").eq(15), table[i-1].suspendState$);
-                setVal(tr.children("td").eq(16), table[i-1].lowerPower);
+                setVal(tr.children("td").eq(8), table[i-1].hasPallet$);
+                setVal(tr.children("td").eq(9), table[i-1].hasLift$);
+                setVal(tr.children("td").eq(10), table[i-1].hasCharge$);
+                setVal(tr.children("td").eq(11), table[i-1].statusErrorCode$);
+                setVal(tr.children("td").eq(12), suspendState);
+                setVal(tr.children("td").eq(13), table[i-1].lowerPower);
             }
         } else if (res.code === 403){
             window.location.href = baseUrl+"/login";
@@ -369,20 +363,32 @@
             }
             for (var i=1;i<=table.length;i++){
                 var tr = tableEl.find("tr").eq(i);
+                let maxCellVoltage;
+                let minCellVoltage;
+                let voltage;
+                let chargeCycleTimes;
+                let surplusQuantity;
+                let countQuantity;
+                if (table[i - 1]['extend'] != undefined) {
+                    maxCellVoltage = table[i-1]['extend'].maxCellVoltage
+                    minCellVoltage = table[i-1]['extend'].minCellVoltage
+                    voltage = table[i-1]['extend'].voltage
+                    chargeCycleTimes = table[i-1]['extend'].chargeCycleTimes
+                    surplusQuantity = table[i-1]['extend'].surplusQuantity
+                    countQuantity = table[i-1]['extend'].countQuantity
+                }
+
                 setVal(tr.children("td").eq(0), table[i-1].shuttleNo);
                 setVal(tr.children("td").eq(1), table[i-1].taskNo);
                 setVal(tr.children("td").eq(2), table[i-1].sourceLocNo);
                 setVal(tr.children("td").eq(3), table[i-1].locNo);
-                setVal(tr.children("td").eq(4), table[i-1].maxCellVoltage$);
-                setVal(tr.children("td").eq(5), table[i-1].minCellVoltage$);
-                setVal(tr.children("td").eq(6), table[i-1].voltage$);
-                setVal(tr.children("td").eq(7), table[i-1].chargeCycleTimes);
-                setVal(tr.children("td").eq(8), table[i-1].surplusQuantity);
-                setVal(tr.children("td").eq(9), table[i-1].countQuantity);
-                setVal(tr.children("td").eq(10), table[i-1].statusSum ? table[i - 1].statusSum.mileage : '');
-                setVal(tr.children("td").eq(11), table[i-1].pakMk$);
-                setVal(tr.children("td").eq(12), table[i-1].currentLocNo);
-                setVal(tr.children("td").eq(13), table[i-1].token);
+                setVal(tr.children("td").eq(4), maxCellVoltage);
+                setVal(tr.children("td").eq(5), minCellVoltage);
+                setVal(tr.children("td").eq(6), voltage);
+                setVal(tr.children("td").eq(7), chargeCycleTimes);
+                setVal(tr.children("td").eq(8), surplusQuantity);
+                setVal(tr.children("td").eq(9), countQuantity);
+                setVal(tr.children("td").eq(10), table[i-1].pakMk$);
                 if (table[i-1].shuttleNo == parseInt($('input[name="shuttleSelect"]:checked').val())) {
                     $("#runSpeedText").text(table[i-1].runSpeed)
                     $("#chargeLineText").text(table[i-1].chargeLine + "%")

--
Gitblit v1.9.1