From 5dba0daf423f5b4e45b3bcdb55c7de51950dc277 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 13 三月 2025 10:21:22 +0800
Subject: [PATCH] #
---
/dev/null | 1
src/main/java/com/zy/asrs/controller/ConsoleController.java | 15 +
src/main/resources/mapper/BasMapMapper.xml | 1
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 25 -
src/main/java/com/zy/asrs/entity/BasMap.java | 7
src/main/webapp/views/admin/basMap/basMap_detail.html | 90 ++++++
src/main/webapp/views/console.html | 32 +
src/main/webapp/views/admin/basMap/basMap.html | 98 ++++++
src/main/java/com/zy/asrs/controller/BasMapController.java | 124 ++++++++
src/main/java/com/zy/common/utils/NavigateMapData.java | 189 +----------
src/main/webapp/static/js/basMap/basMap.js | 261 +++++++++++++++++
src/main/java/com/zy/common/CodeBuilder.java | 12
12 files changed, 656 insertions(+), 199 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
new file mode 100644
index 0000000..2375b49
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -0,0 +1,124 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasMap;
+import com.zy.asrs.service.BasMapService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasMapController extends BaseController {
+
+ @Autowired
+ private BasMapService basMapService;
+
+ @RequestMapping(value = "/basMap/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basMapService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basMap/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasMap> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasMap.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basMapService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basMap/add/auth")
+ @ManagerAuth
+ public R add(BasMap basMap) {
+ basMapService.insert(basMap);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basMap/update/auth")
+ @ManagerAuth
+ public R update(BasMap basMap){
+ if (Cools.isEmpty(basMap) || null==basMap.getId()){
+ return R.error();
+ }
+ basMapService.updateById(basMap);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basMap/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basMapService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basMap/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasMap> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basMap"));
+ convert(map, wrapper);
+ List<BasMap> list = basMapService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basMapQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasMap> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasMap> page = basMapService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasMap basMap : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basMap.getId());
+ map.put("value", basMap.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basMap/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasMap> wrapper = new EntityWrapper<BasMap>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basMapService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasMap.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/controller/ConsoleController.java b/src/main/java/com/zy/asrs/controller/ConsoleController.java
index 4bbb866..a7beef5 100644
--- a/src/main/java/com/zy/asrs/controller/ConsoleController.java
+++ b/src/main/java/com/zy/asrs/controller/ConsoleController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.R;
@@ -68,6 +69,20 @@
}
/**
+ * 鑾峰彇鍦板浘妤煎眰鏁版嵁
+ */
+ @GetMapping("/map/lev/list")
+ @ManagerAuth
+ public R getMapLevList() {
+ List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
+ ArrayList<Integer> levList = new ArrayList<>();
+ for (BasMap basMap : basMaps) {
+ levList.add(basMap.getLev());
+ }
+ return R.ok().add(levList);
+ }
+
+ /**
* 鑾峰彇鍦板浘鏁版嵁
*/
@GetMapping("/map/{lev}/auth")
diff --git a/src/main/java/com/zy/asrs/entity/BasMap.java b/src/main/java/com/zy/asrs/entity/BasMap.java
index d3debed..ace20e6 100644
--- a/src/main/java/com/zy/asrs/entity/BasMap.java
+++ b/src/main/java/com/zy/asrs/entity/BasMap.java
@@ -60,6 +60,13 @@
@TableField("lev")
private Integer lev;
+ /**
+ * 鍘熷鍦板浘
+ */
+ @ApiModelProperty(value= "鍘熷鍦板浘")
+ @TableField("origin_data")
+ private String originData;
+
public BasMap() {}
public BasMap(String data,Date createTime,Date updateTime,String lastData,Integer lev) {
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 cfdff9c..34a1ed2 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -80,36 +80,27 @@
*/
public synchronized void initRealtimeBasMap() {
try {
- for (int i = 1; i <= 4; i++) {//鎬诲叡鍥涘眰妤�
- Object data = redisUtil.get(RedisKeyType.MAP.key + i);
- if (data == null) {//redis鍦板浘鏁版嵁涓虹┖
- BasMap basMap = basMapService.selectLatestMap(i);
- if (basMap == null) {
- basMap = new BasMap();
- basMap.setCreateTime(new Date());
- basMap.setUpdateTime(new Date());
- basMap.setLev(i);
- if (!basMapService.insert(basMap)) {
- log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
- }
- }
+ List<BasMap> basMaps = basMapService.selectList(new EntityWrapper<BasMap>().orderBy("lev", true));
+ for (BasMap basMap : basMaps) {
+ Integer lev = basMap.getLev();
+ Object data = redisUtil.get(RedisKeyType.MAP.key + lev);
+ if (data == null) {//redis鍦板浘鏁版嵁涓虹┖
//杞藉叆鍦板浘
- List<List<MapNode>> lists = navigateMapData.getJsonData(i, -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ List<List<MapNode>> lists = navigateMapData.getJsonData(lev, -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
//瀛樺叆鏁版嵁搴�
basMap.setData(JSON.toJSONString(lists));
basMap.setCreateTime(new Date());
basMap.setUpdateTime(new Date());
- basMap.setLev(i);
-
if (!basMapService.updateById(basMap)) {
log.info("鍦板浘鏁版嵁瀛樺偍澶辫触");
}
//灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
- redisUtil.set(RedisKeyType.MAP.key + i, JSON.toJSONString(basMap));
+ redisUtil.set(RedisKeyType.MAP.key + lev, JSON.toJSONString(basMap));
}
+
}
} catch (Exception e) {
e.printStackTrace();
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index e30392f..4a48676 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -15,7 +15,7 @@
generator.url="localhost:3306/shuttle_rcs";
generator.username="root";
generator.password="root";
- generator.table="sys_http_request_log";
+ generator.table="asr_bas_map";
// sqlserver
// generator.sqlOsType = SqlOsType.SQL_SERVER;
// generator.url="127.0.0.1:1433;databasename=tzskasrs";
@@ -24,11 +24,11 @@
// generator.table="asr_bas_shuttle";
generator.packagePath="com.zy.asrs";
- generator.controller = false;
- generator.html = false;
- generator.js = false;
- generator.htmlDetail = false;
- generator.sql = false;
+ generator.controller = true;
+ generator.html = true;
+ generator.js = true;
+ generator.htmlDetail = true;
+ generator.sql = true;
generator.build();
}
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 2a2351f..d19f34b 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -4,6 +4,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasMap;
import com.zy.asrs.entity.LocMast;
+import com.zy.asrs.service.BasMapService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.MapNode;
@@ -17,7 +18,6 @@
import com.zy.core.properties.SlaveProperties;
import com.zy.core.thread.ForkLiftThread;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Component;
import java.io.*;
@@ -32,76 +32,31 @@
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private BasMapService basMapService;
public int[][] getData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
-// RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
-// Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
-// if (object == null) {
-// return null;
-// }
-//
-// //瑙f瀽json鍦板浘鏁版嵁
-// ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
-// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
-// int[][] map = new int[lists.size()][];
-// int j = 0;
-// for (List<MapNode> list : lists) {
-// int[] tmp = new int[list.size()];
-// int i = 0;
-// for (MapNode mapNode : list) {
-// //灏嗘暟鎹坊鍔犺繘浜岀淮鏁扮粍
-// tmp[i++] = mapNode.getValue();
-// }
-// //鏁版嵁娣诲姞杩涗竴缁存暟缁�
-// map[j++] = tmp;
-// }
-//
-// return map;
+ BasMap basMap = basMapService.selectLatestMap(lev);
+ String originData = basMap.getOriginData();
- String mapFilename = "map_" + lev + ".json";
- ClassPathResource classPathResource = new ClassPathResource(mapFilename);
- InputStream inputStream = classPathResource.getInputStream();
- byte[] buffer = new byte[inputStream.available()];
- inputStream.read(buffer);
- File file = File.createTempFile("prefix", "suffix");
- try (OutputStream outStream = new FileOutputStream(file)) {
- outStream.write(buffer);
+ //瑙f瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(originData, ArrayList.class);
+ List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
+ int[][] map = new int[lists.size()][];
+ int j = 0;
+ for (List<MapNode> list : lists) {
+ int[] tmp = new int[list.size()];
+ int i = 0;
+ for (MapNode mapNode : list) {
+ //灏嗘暟鎹坊鍔犺繘浜岀淮鏁扮粍
+ tmp[i++] = mapNode.getValue();
+ }
+ //鏁版嵁娣诲姞杩涗竴缁存暟缁�
+ map[j++] = tmp;
}
- StringBuffer stringBuffer = new StringBuffer();
- if (file.isFile() && file.exists()) {
- InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
- BufferedReader br = new BufferedReader(isr);
- String lineTxt = null;
- while ((lineTxt = br.readLine()) != null) {
- stringBuffer.append(lineTxt);
- }
- br.close();
-
- //瑙f瀽json鍦板浘鏁版嵁
- ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
- List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
- int[][] map = new int[lists.size()][];
- int j = 0;
- for (List<MapNode> list : lists) {
- int[] tmp = new int[list.size()];
- int i = 0;
- for (MapNode mapNode : list) {
- //灏嗘暟鎹坊鍔犺繘浜岀淮鏁扮粍
- tmp[i++] = mapNode.getValue();
- }
- //鏁版嵁娣诲姞杩涗竴缁存暟缁�
- map[j++] = tmp;
- }
-
- if (!file.delete()) {
- System.out.println("涓存椂鏂囦欢鍒犻櫎澶辫触");
- }
- return map;
- } else {
- System.out.println("鏂囦欢涓嶅瓨鍦�!");
- }
+ return map;
} catch (Exception e) {
e.printStackTrace();
}
@@ -144,106 +99,16 @@
return map;
}
-// //鑾峰彇JSON鏍煎紡鏁版嵁
-// public List<List<MapNode>> getJsonData(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
-// try {
-//// RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
-//// Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
-//// if (object == null) {
-//// return null;
-//// }
-////
-//// //瑙f瀽json鍦板浘鏁版嵁
-//// ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
-//// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
-//// return lists;
-//
-//
-// String mapFilename = "map_" + lev + ".json";
-// ClassPathResource classPathResource = new ClassPathResource(mapFilename);
-// InputStream inputStream = classPathResource.getInputStream();
-// byte[] buffer = new byte[inputStream.available()];
-// inputStream.read(buffer);
-// File file = File.createTempFile("prefix","suffix");
-// try (OutputStream outStream = new FileOutputStream(file)) {
-// outStream.write(buffer);
-// }
-//
-// StringBuffer stringBuffer = new StringBuffer();
-// if (file.isFile() && file.exists()) {
-// InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
-// BufferedReader br = new BufferedReader(isr);
-// String lineTxt = null;
-// while ((lineTxt = br.readLine()) != null) {
-// stringBuffer.append(lineTxt);
-// }
-// br.close();
-//
-// //瑙f瀽json鍦板浘鏁版嵁
-// ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
-// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
-//
-// if (!file.delete()) {
-// System.out.println("涓存椂鏂囦欢鍒犻櫎澶辫触");
-// }
-//
-// return lists;
-// } else {
-// System.out.println("鏂囦欢涓嶅瓨鍦�!");
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return null;
-// }
-
//鑾峰彇JSON鏍煎紡鏁版嵁
public List<List<MapNode>> getJsonData(Integer lev, Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
try {
-// RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
-// Object object = redisUtil.get(RedisKeyType.BASIC_MAP.key + lev);
-// if (object == null) {
-// return null;
-// }
-//
-// //瑙f瀽json鍦板浘鏁版嵁
-// ArrayList arrayList = JSON.parseObject(object.toString(), ArrayList.class);
-// List<List<MapNode>> lists = filterMap(mapType, arrayList, lev, whitePoints, shuttlePoints);//杩囨护鍦板浘鏁版嵁
-// return lists;
-
- String mapFilename = "map_" + lev + ".json";
- ClassPathResource classPathResource = new ClassPathResource(mapFilename);
- InputStream inputStream = classPathResource.getInputStream();
- byte[] buffer = new byte[inputStream.available()];
- inputStream.read(buffer);
- File file = File.createTempFile("prefix","suffix");
- try (OutputStream outStream = new FileOutputStream(file)) {
- outStream.write(buffer);
- }
-
- StringBuffer stringBuffer = new StringBuffer();
- if (file.isFile() && file.exists()) {
- InputStreamReader isr = new InputStreamReader(new FileInputStream(file), "GBK");
- BufferedReader br = new BufferedReader(isr);
- String lineTxt = null;
- while ((lineTxt = br.readLine()) != null) {
- stringBuffer.append(lineTxt);
- }
- br.close();
-
- //瑙f瀽json鍦板浘鏁版嵁
- ArrayList arrayList = JSON.parseObject(stringBuffer.toString(), ArrayList.class);
- //閲嶅缓鏁版嵁鏍煎紡
- List<List<MapNode>> lists = rebuildData(arrayList);
-
- if (!file.delete()) {
- System.out.println("涓存椂鏂囦欢鍒犻櫎澶辫触");
- }
-
- return lists;
- } else {
- System.out.println("鏂囦欢涓嶅瓨鍦�!");
- }
+ BasMap basMap = basMapService.selectLatestMap(lev);
+ String originData = basMap.getOriginData();
+ //瑙f瀽json鍦板浘鏁版嵁
+ ArrayList arrayList = JSON.parseObject(originData, ArrayList.class);
+ //閲嶅缓鏁版嵁鏍煎紡
+ List<List<MapNode>> lists = rebuildData(arrayList);
+ return lists;
} catch (Exception e) {
e.printStackTrace();
}
diff --git a/src/main/resources/map_1.json b/src/main/resources/map_1.json
deleted file mode 100644
index e6c72f6..0000000
--- a/src/main/resources/map_1.json
+++ /dev/null
@@ -1 +0,0 @@
-[ [ { "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": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11275 }, { "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": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12625 }, { "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": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 13900 }, { "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": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15175 }, { "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": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 16450 }, { "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": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17725 }, { "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": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 19075 }, { "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": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20350 }, { "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": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21625 }, { "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
deleted file mode 100644
index e6c72f6..0000000
--- a/src/main/resources/map_2.json
+++ /dev/null
@@ -1 +0,0 @@
-[ [ { "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": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11275 }, { "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": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12625 }, { "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": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 13900 }, { "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": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15175 }, { "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": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 16450 }, { "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": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17725 }, { "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": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 19075 }, { "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": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20350 }, { "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": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21625 }, { "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
deleted file mode 100644
index e6c72f6..0000000
--- a/src/main/resources/map_3.json
+++ /dev/null
@@ -1 +0,0 @@
-[ [ { "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": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11275 }, { "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": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12625 }, { "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": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 13900 }, { "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": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15175 }, { "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": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 16450 }, { "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": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17725 }, { "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": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 19075 }, { "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": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20350 }, { "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": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21625 }, { "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
deleted file mode 100644
index e6c72f6..0000000
--- a/src/main/resources/map_4.json
+++ /dev/null
@@ -1 +0,0 @@
-[ [ { "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": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 11275 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 11275 }, { "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": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 12625 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 12625 }, { "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": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 13900 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 13900 }, { "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": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 15175 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 15175 }, { "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": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 16450 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 16450 }, { "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": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 17725 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 17725 }, { "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": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 19075 }, { "value": 3, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 19075 }, { "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": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 20350 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 20350 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 20350 }, { "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": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 21600, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 20150, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 18700, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 17250, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 15800, "yBase": 21625 }, { "value": 0, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 14350, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 12900, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 11450, "yBase": 21625 }, { "value": -1, "data": "", "top": 1000, "bottom": 1000, "left": 1000, "right": 1000, "xBase": 10000, "yBase": 21625 }, { "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/BasMapMapper.xml b/src/main/resources/mapper/BasMapMapper.xml
index 14d108f..8cd0bb1 100644
--- a/src/main/resources/mapper/BasMapMapper.xml
+++ b/src/main/resources/mapper/BasMapMapper.xml
@@ -10,6 +10,7 @@
<result column="update_time" property="updateTime" />
<result column="last_data" property="lastData" />
<result column="lev" property="lev" />
+ <result column="origin_data" property="originData" />
</resultMap>
diff --git a/src/main/webapp/static/js/basMap/basMap.js b/src/main/webapp/static/js/basMap/basMap.js
new file mode 100644
index 0000000..bcd94be
--- /dev/null
+++ b/src/main/webapp/static/js/basMap/basMap.js
@@ -0,0 +1,261 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basMap',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basMap/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'id', align: 'center',title: '#'}
+ ,{field: 'data', align: 'center',title: '瀹炴椂鏁版嵁'}
+ ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ ,{field: 'updateTime$', align: 'center',title: '鏇存柊鏃堕棿'}
+ ,{field: 'lastData', align: 'center',title: '鏈�杩戞暟鎹�'}
+ ,{field: 'lev', align: 'center',title: '灞傛暟'}
+ ,{field: 'originData', align: 'center',title: '鍘熷鍦板浘'}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basMap)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basMap)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basMap': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basMap/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basMap)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basMap/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basMap/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#createTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['createTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/admin/basMap/basMap.html b/src/main/webapp/views/admin/basMap/basMap.html
new file mode 100644
index 0000000..b8f885f
--- /dev/null
+++ b/src/main/webapp/views/admin/basMap/basMap.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basMap" lay-filter="basMap"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <div class="layui-btn-container">
+ <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../../static/js/basMap/basMap.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">灞傛暟: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="lev" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍘熷鍦板浘: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="originData" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
diff --git a/src/main/webapp/views/admin/basMap/basMap_detail.html b/src/main/webapp/views/admin/basMap/basMap_detail.html
new file mode 100644
index 0000000..509005f
--- /dev/null
+++ b/src/main/webapp/views/admin/basMap/basMap_detail.html
@@ -0,0 +1,90 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../static/css/cool.css" media="all">
+ <link rel="stylesheet" href="../../../static/css/common.css" media="all">
+</head>
+<body>
+
+<!-- 璇︽儏 -->
+<div id="data-detail" class="layer_self_wrap">
+ <form id="detail" class="layui-form">
+ <!--
+ <div class="layui-inline" style="display: none">
+ <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
+ </div>
+ </div>
+ -->
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label"><span class="not-null">*</span>#锛�</label>
+ <div class="layui-input-inline">
+ <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basMap')" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">瀹炴椂鏁版嵁锛�</label>
+ <div class="layui-input-inline">
+ <input id="data" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍒涘缓鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="createTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏇存柊鏃堕棿锛�</label>
+ <div class="layui-input-inline">
+ <input id="updateTime$" class="layui-input" type="text" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鏈�杩戞暟鎹細</label>
+ <div class="layui-input-inline">
+ <input id="lastData" class="layui-input" type="text">
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">灞傛暟锛�</label>
+ <div class="layui-input-inline">
+ <input id="lev" class="layui-input" type="text" lay-verify="number" >
+ </div>
+ </div>
+ <div class="layui-inline" style="width:31%;">
+ <label class="layui-form-label">鍘熷鍦板浘锛�</label>
+ <div class="layui-input-inline">
+ <input id="originData" class="layui-input" type="text">
+ </div>
+ </div>
+
+
+ <hr class="layui-bg-gray">
+
+ <div id="data-detail-btn" class="layui-btn-container layui-form-item">
+ <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">淇濆瓨</div>
+ <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">淇敼</div>
+ <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">鍏抽棴</div>
+ </div>
+
+ <div id="prompt">
+ 娓╅Θ鎻愮ず锛氳浠旂粏濉啓鐩稿叧淇℃伅锛�<span class="extrude"><span class="not-null">*</span> 涓哄繀濉�夐」銆�</span>
+ </div>
+ </form>
+</div>
+</body>da
+<script type="text/javascript" src="../../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../../static/js/basMap/basMap.js" charset="utf-8"></script>
+</html>
+
diff --git a/src/main/webapp/views/console.html b/src/main/webapp/views/console.html
index 7f5fb5d..1da3dbe 100644
--- a/src/main/webapp/views/console.html
+++ b/src/main/webapp/views/console.html
@@ -334,7 +334,7 @@
map: [],//鍦板浘鏁版嵁
currentLev: 1,//鍦板浘褰撳墠妤煎眰
siteWindow: false, //绔欑偣寮圭獥鏄剧ず榛樿涓嶆樉绀�
- floorList: [1, 2, 3, 4], //褰撳墠椤圭洰妤煎眰
+ floorList: [], //褰撳墠椤圭洰妤煎眰
shuttleList: [], //鍥涘悜绌挎杞﹂泦鍚�
currentLevShuttleList: [],//褰撳墠妤煎眰鍥涘悜绌挎杞﹂泦鍚�
shuttleColorList: [],//鍥涘悜绌挎杞﹂鑹查泦鍚�
@@ -361,6 +361,7 @@
this.getMap(this.currentLev)
this.getSystemRunningStatus() //鑾峰彇绯荤粺杩愯鐘舵��
+ this.initLev()//鍒濆鍖栨ゼ灞備俊鎭�
this.consoleInterval = setInterval(() => {
this.getShuttleStateInfo() //鑾峰彇鍥涘悜绌挎杞︿俊鎭�
@@ -663,23 +664,28 @@
}
})
},
- initLoc() {
- //鍒濆鍖栧簱浣�
+ initLev(){
let that = this
$.ajax({
- url:baseUrl+"/locMast/init",
- headers:{
+ url: baseUrl + "/console/map/lev/list",
+ headers: {
'token': localStorage.getItem('token')
},
- data:{},
- method:'post',
- success:function (res) {
- that.$message({
- message: '鍒濆鍖栧畬鎴�',
- type: 'success'
- });
+ data: {},
+ method: 'get',
+ success: function(res) {
+ if (res.code === 200) {
+ that.floorList = res.data;
+ } else if (res.code === 403) {
+ parent.location.href = baseUrl + "/login";
+ } else {
+ that.$message({
+ message: res.msg,
+ type: 'error'
+ });
+ }
}
- })
+ });
},
getCodeData(){
this.sendWs(JSON.stringify({
--
Gitblit v1.9.1