Merge branch 'minhang' of http://222.66.0.204:8090//panzhaov5/bsth_control into minhang

徐烜
2 parents 97da1203 dec696fb
Showing 13 changed files with 237 additions and 65 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/data/directive/DirectivesPstThread.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/utils/SignalSchPlanMatcher.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
src/main/java/com/bsth/data/schedule/DayOfSchedule.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
@@ -86,11 +86,14 @@ public class XDApplication implements CommandLineRunner {
         }
     }
+    //@Autowired
+    //DayOfSchedule dayOfSchedule;
     public void devInit(){
         log.info("devInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //抓取GPS数据
         gpsDataLoader.setFlag(-1);
+        //dayOfSchedule.dataRecovery();
         //sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
         //实际排班更新线程
         //sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
@@ -98,7 +101,8 @@ public class XDApplication implements CommandLineRunner {
         //sexec.scheduleWithFixedDelay(schedulePstThread, 60, 15, TimeUnit.SECONDS);
         //班次修正日志延迟入库
         //sexec.scheduleWithFixedDelay(seiPstThread, 60, 30, TimeUnit.SECONDS);
-
+        //调度指令延迟入库
+        //sexec.scheduleWithFixedDelay(directivesPstThread, 180, 180, TimeUnit.SECONDS);
         //线程监听（防止重要的线程阻塞、异常结束。以及部分主备切换工作）
         //sexec.scheduleWithFixedDelay(threadMonotor, 240, 60, TimeUnit.SECONDS);
     }
@@ -116,7 +120,7 @@ public class XDApplication implements CommandLineRunner {
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //班次延迟入库线程
         sexec.scheduleWithFixedDelay(schedulePstThread, 60, 10, TimeUnit.SECONDS);
-        //班次修正日志延迟入库
+        //班次修正日志入库
         sexec.scheduleWithFixedDelay(seiPstThread, 60, 60, TimeUnit.SECONDS);
         //检查班次误点
         sexec.scheduleWithFixedDelay(scheduleLateThread, 60, 30, TimeUnit.SECONDS);
@@ -34,6 +34,7 @@ public class DirectivesPstThread extends Thread {
     @Override
     public void run() {
+
         LinkedList<Directive> list = DayOfDirectives.pstDirectives;
         Directive directive;
@@ -46,8 +47,10 @@ public class DirectivesPstThread extends Thread {
                     if(d60.isDispatch()){
                         ScheduleRealInfo sch = d60.getSch();
                         //如果关联的班次已经不存在了，放弃入库
-                        if(dayOfSchedule.get(sch.getId()) == null)
+                        if(dayOfSchedule.get(sch.getId()) == null){
+                            logger.warn("班次：" + sch.getId() + "不存在了，调度指令放弃入库。");
                             continue;
+                        }
                     }
                     d60Repository.save(d60);
                 }
@@ -117,29 +117,31 @@ public class GpsRealAnalyse {
             try {
                 Collections.sort(list, comp);
                 for (GpsEntity gps : list) {
-                    //是否有任务
-                    boolean task;
-                    CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
-                    //掉线处理
-                    offlineSignalHandle.handle(gps, prevs);
-                    //状态处理
-                    task = correctSignalHandle.handle(gps, prevs);
-                    //场，站内外判断
-                    stationInsideHandle.handle(gps, prevs);
-                    //异常判定（越界/超速）
-                    abnormalStateHandle.handle(gps, prevs);
-
-                    if (!task)
-                        continue; //无任务的，到这里就结束
-
-                    //反向处理
-                    reverseSignalHandle.handle(gps, prevs);
-                    //进出站动作处理
-                    inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
+                    try {
+                        //是否有任务
+                        boolean task;
+                        CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
+                        //掉线处理
+                        offlineSignalHandle.handle(gps, prevs);
+                        //状态处理
+                        task = correctSignalHandle.handle(gps, prevs);
+                        //场，站内外判断
+                        stationInsideHandle.handle(gps, prevs);
+                        //异常判定（越界/超速）
+                        abnormalStateHandle.handle(gps, prevs);
+
+                        if (!task)
+                            continue; //无任务的，到这里就结束
+
+                        //反向处理
+                        reverseSignalHandle.handle(gps, prevs);
+                        //进出站动作处理
+                        inOutStationSignalHandle.handle(gps, prevs);
+                        GeoCacheData.putGps(gps);
+                    }catch (Exception e){
+                        logger.error("", e);
+                    }
                 }
-            } catch (Exception e) {
-                logger.error("", e);
             } finally {
                 if (count != null)
                     count.countDown();
@@ -46,7 +46,7 @@ public class InOutStationSignalHandle extends SignalHandle{
     @Autowired
     SignalSchPlanMatcher signalSchPlanMatcher;
-    private final static int MAX_BEFORE_TIME = 1000 * 60 * 72;
+    private final static int MAX_BEFORE_TIME = 1000 * 60 * 120;
     //最大的班次时间差，防止异常的GPS时间打乱数据
     private final static int MAX_NORMAL_DIFF = 1000 * 60 * 60 * 12;
@@ -113,8 +113,8 @@ public class InOutStationSignalHandle extends SignalHandle{
         int diff = (int) (sch.getDfsjT() - gps.getTimestamp());
-        //首班出场最多提前1.2小时
-        if(dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME)
+        //首班出场最多提前2小时
+        if((dayOfSchedule.isFirstOut(sch) && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME / 2)
             return;
         //正常班次最大时间差
@@ -129,9 +129,11 @@ public class InOutStationSignalHandle extends SignalHandle{
             signalSchPlanMatcher.outMatch(gps, sch);
             sch = dayOfSchedule.executeCurr(gps.getNbbm());
-            //实发时间不覆盖
-            if(StringUtils.isNotEmpty(sch.getFcsjActual()))
+            //班次已经实发
+            if(StringUtils.isNotEmpty(sch.getFcsjActual())
+                    && !outManyFit(gps, sch)){
                 return;
+            }
             //应用到离站缓冲区设置参数
             long rsT = lineConfigData.applyOut(sch, gps.getTimestamp());
@@ -185,6 +187,26 @@ public class InOutStationSignalHandle extends SignalHandle{
         }
     }
+    /**
+     * 是否是一个更合适的发车信号
+     * @param gps
+     * @param sch
+     * @return
+     */
+    private boolean outManyFit(GpsEntity gps, ScheduleRealInfo sch) {
+        if(StringUtils.isNotEmpty(sch.getZdsjActual()))
+            return false;
+
+        long t1 = sch.getFcsjActualTime();
+        long t2 = gps.getTimestamp();
+        long c = sch.getDfsjT();
+
+        if(c - t1 > 1000 * 60 * 15 && Math.abs(t2 - c) < 1000 * 60 * 5){
+            return true;
+        }
+        return false;
+    }
+
     private void outStationAndOutPark(ScheduleRealInfo sch){
         LineConfig config = lineConfigData.get(sch.getXlBm());
@@ -230,7 +252,7 @@ public class InOutStationSignalHandle extends SignalHandle{
                 logger.info("NullPointerException " + sch.getXlName() + " 有班次无班次历时，，，检查一下是否需要出站既出场。");
             }
             //进场最多提前1.2小时
-            if(sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME)
+            if((sch.getBcType().equals("in") && diff > MAX_BEFORE_TIME) || diff > MAX_BEFORE_TIME/2)
                 return;
             //正常班次最大时间差
@@ -3,6 +3,8 @@ package com.bsth.data.gpsdata.arrival.utils;
 import com.bsth.data.gpsdata.GpsEntity;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -16,6 +18,8 @@ public class SignalSchPlanMatcher {
     @Autowired
     DayOfSchedule dayOfSchedule;
+    Logger log = LoggerFactory.getLogger(this.getClass());
+
     /**
      * 发车信号匹配
      * @param outSigal
@@ -27,6 +31,25 @@ public class SignalSchPlanMatcher {
         if(t < sch.getDfsjT())
             return;
+        try{
+            //会不会是分班没有完成
+            if(sch.getBcType().equals("in")){
+                ScheduleRealInfo fbFirst = dayOfSchedule.nextByBcType(sch, "normal");
+
+                if(fbFirst == null)
+                    return;
+
+                long dt = fbFirst.getDfsjT();
+                //前5后10  -执行分班的首个营运
+                if(dt - t < 1000 * 60 * 5 || t - dt < 1000 * 60 * 10){
+                    dayOfSchedule.addExecPlan(fbFirst);
+                    return;
+                }
+            }
+        }catch (Exception e){
+            log.error("", e);
+        }
+
         //下一个相同走向的班次
         ScheduleRealInfo next = dayOfSchedule.nextSame(sch);
         if(next == null || !next.getQdzCode().equals(sch.getQdzCode()))
@@ -60,8 +60,10 @@ public class GpsDataRecovery implements ApplicationContextAware {
         for (String lineId : keys) {
             Collections.sort(listMap.get(lineId), comp);
             threadPool.execute(new RecoveryThread(listMap.get(lineId), count));
-            /*if(nbbm.equals("W7C-001"))
+            /*if(nbbm.equals("W7E-016"))
                 new RecoveryThread(listMap.get(nbbm), count).run();*/
+            /*if(lineId.equals("60028"))
+                new RecoveryThread(listMap.get(lineId), count).run();*/
         }
         try {
@@ -82,7 +84,7 @@ public class GpsDataRecovery implements ApplicationContextAware {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
-        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=" + dayOfYear;
+        String sql = "select DEVICE_ID,LAT,LON,TS,SPEED_GPS,LINE_ID,SERVICE_STATE from bsth_c_gps_info where days_year=143";// + dayOfYear;
         JdbcTemplate jdbcTemplate = new JdbcTemplate(DBUtils_MS.getDataSource());
         List<GpsEntity> list =
@@ -150,30 +152,34 @@ public class GpsDataRecovery implements ApplicationContextAware {
                 CircleQueue<GpsEntity> prevs;
                 boolean task;
                 for (GpsEntity gps : list) {
-
-                    //是否有任务
-
-                    prevs = GeoCacheData.getGps(gps.getNbbm());
-                    //掉线处理
-                    offlineSignalHandle.handle(gps, prevs);
-                    //状态处理
-                    task = correctSignalHandle.handle(gps, prevs);
-                    //场，站内外判断
-                    stationInsideHandle.handle(gps, prevs);
-                    //异常判定（越界/超速）
-                    //abnormalStateHandle.handle(gps, prevs);
-
-                    if(!task)
-                        continue; //无任务的，到这里就结束
-
-                    //反向处理
-                    reverseSignalHandle.handle(gps, prevs);
-                    //进出站动作处理
-                    inOutStationSignalHandle.handle(gps, prevs);
-                    GeoCacheData.putGps(gps);
+                    try {
+                        /*if(gps.getTimestamp() >= 1495512240000L){
+                            System.out.println("debugger...");
+                        }*/
+                        //是否有任务
+
+                        prevs = GeoCacheData.getGps(gps.getNbbm());
+                        //掉线处理
+                        offlineSignalHandle.handle(gps, prevs);
+                        //状态处理
+                        task = correctSignalHandle.handle(gps, prevs);
+                        //场，站内外判断
+                        stationInsideHandle.handle(gps, prevs);
+                        //异常判定（越界/超速）
+                        //abnormalStateHandle.handle(gps, prevs);
+
+                        if (!task)
+                            continue; //无任务的，到这里就结束
+
+                        //反向处理
+                        reverseSignalHandle.handle(gps, prevs);
+                        //进出站动作处理
+                        inOutStationSignalHandle.handle(gps, prevs);
+                        GeoCacheData.putGps(gps);
+                    } catch (Exception e) {
+                        logger.error("", e);
+                    }
                 }
-            } catch (Exception e) {
-                logger.error("", e);
             } finally {
                 count.countDown();
             }
@@ -649,7 +649,12 @@ public class DayOfSchedule {
         nbbmScheduleMap.remove(sch.getClZbh(), sch);
         id2SchedulMap.remove(sch.getId());
         lpScheduleMap.remove(sch.getXlBm() + "_" + sch.getLpName(), sch);
-        //return sch;
+
+        //如果正在执行该班次
+        if(carExecutePlanMap.get(sch.getClZbh()) == sch){
+            //重新计算车辆当前执行班次
+            reCalcExecPlan(sch.getClZbh());
+        }
     }
@@ -776,6 +781,26 @@ public class DayOfSchedule {
     }
     /**
+     * @Title: nextByBcType
+     * @Description: TODO(获取下一个指定班次类型的班次)
+     */
+    public ScheduleRealInfo nextByBcType(ScheduleRealInfo sch, String bcType) {
+        List<ScheduleRealInfo> list = nbbmScheduleMap.get(sch.getClZbh());
+        Collections.sort(list, schFCSJComparator);
+
+        boolean flag = false;
+        for(ScheduleRealInfo temp : list){
+            if(temp == sch){
+                flag = true;
+            }
+
+            if(flag && temp.getBcType().equals(bcType))
+                return temp;
+        }
+        return null;
+    }
+
+    /**
      * 搜索离当前时间最近的一个指定类型的班次
      * @param nbbm
      * @param bcType
@@ -113,6 +113,12 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setSpId(rs.getLong("sp_id"));
 					schedule.setSflj(rs.getBoolean("sflj"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					String[] split1 = schedule.getFcsj().split(":");
 					String[] split3 = schedule.getZdsj().split(":");
 					long fcsj = Long.valueOf(split1[0]) * 60 + Long.valueOf(split1[1]);
@@ -669,6 +675,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setStatus(rs.getInt("status"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getDfsj() != null){
 						String[] split0 = schedule.getDfsj().split(":");
 						long dfsj = Long.valueOf(split0[0]) * 60 + Long.valueOf(split0[1]);
@@ -1840,6 +1853,13 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					schedule.setjName(rs.getString("j_name"));
 					schedule.setUpdateDate(rs.getDate("update_date"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
+					
 					return schedule;
 				}
 			});
@@ -81,6 +81,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setsName(rs.getString("s_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
 						String[] split1 = schedule.getFcsj().split(":");
 						String[] split2 = schedule.getZdsj().split(":");
@@ -548,6 +554,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
 						String[] split1 = schedule.getFcsj().split(":");
 						String[] split2 = schedule.getZdsj().split(":");
@@ -831,6 +843,12 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setQdzName(rs.getString("qdz_name"));
 					schedule.setSpId(rs.getLong("sp_id"));
+					if(schedule.getFcsjActual() != null && schedule.getFcsjActual().trim().length() == 0){
+						schedule.setFcsjActual(null);
+					}
+					if(schedule.getZdsjActual() != null && schedule.getZdsjActual().trim().length() == 0){
+						schedule.setZdsjActual(null);
+					}
 					if(schedule.getFcsj() != null && schedule.getZdsj() != null){
 						String[] split1 = schedule.getFcsj().split(":");
 						String[] split2 = schedule.getZdsj().split(":");
@@ -354,6 +354,7 @@
 		 					_w_table_rowspan("#works", 4);
 		 				}
 		 			});
+					$("html,body").animate({scrollTop:$("#works").offset().top},700);
 				});
 			});		
 		}
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button{
+    display: none;
+}
+
+input::-webkit-calendar-picker-indicator {
+    display: none;
+}
+
+input::-webkit-datetime-edit { padding: 1px; }
 .ps-container > .ps-scrollbar-y-rail{
     z-index: 1 !important;
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-23',
-        text: '<h5>现在可以在 数据&统计 里面看到部分班次修正日志。05-23之后的数据开始展现</h5>'
+        date: '2017-05-24',
+        text: '<h5>修复了一个问题，这个问题曾导致 在临加班次处于 “准备执行” 或 “正在执行” 状态时。即使删除了临加班次，当车辆发出或到终点后，有一定几率路单里会复现这个班次。</h5>'
     };
     var storage = window.localStorage
@@ -32,14 +32,14 @@
                             <div class="uk-form-row">
                                 <label class="uk-form-label">开始时间</label>
                                 <div class="uk-form-controls">
-                                    <input name="sDate" type="date" required/>
+                                    <input name="sDate" type="date" style="width: 100%;" required/>
                                 </div>
                             </div>
                         </div>
                         <div class="uk-width-1-3" style="padding-left: 15px;">
                             <div class="uk-form-row">
                                 <div class="uk-form-controls" style="margin-left: 0;">
-                                    <input name="sTime" type="time" required/>
+                                    <input name="sTime" type="time" style="width: calc(100% - 28px);" required/>
                                 </div>
                             </div>
                         </div>
@@ -49,14 +49,14 @@
                             <div class="uk-form-row">
                                 <label class="uk-form-label">结束时间</label>
                                 <div class="uk-form-controls">
-                                    <input name="eDate" type="date" required/>
+                                    <input name="eDate" type="date"  style="width: 100%;" required/>
                                 </div>
                             </div>
                         </div>
                         <div class="uk-width-1-3" style="padding-left: 15px;">
                             <div class="uk-form-row">
                                 <div class="uk-form-controls" style="margin-left: 0;">
-                                    <input name="eTime" type="time" required/>
+                                    <input name="eTime" type="time" style="width: calc(100% - 28px);" required/>
                                 </div>
                             </div>
                         </div>
@@ -183,6 +183,16 @@
                         <span class="ct_btn text-panel">
                             <span>共约 <span class="sum_mileage"></span> 公里，<span class="count_point"></span> 个GPS点</span><br>
                             <a class="export-excel"><i class="uk-icon-file-excel-o"></i> 导出轨迹</a>
+
+                            <label>
+                                <div class="uk-button-dropdown" data-uk-dropdown>
+                                    <a style="color: grey;margin-left: 12px;font-size: 12px;">线路底图 <i class="uk-icon-angle-down"></i></a>
+                                    <div class="uk-dropdown uk-dropdown-scrollable" style="max-height: 300px;">
+                                        <ul class="uk-nav uk-nav-dropdown line_route_list">
+                                        </ul>
+                                    </div>
+                                </div>
+                            </label>
                         </span>
                     </div>
                     <div class="ct-progress-bar" >
@@ -294,6 +304,20 @@
                 $.get('/basic/cars', function (rs) {
                     gb_common.carAutocomplete($('.autocomplete-nbbm', modal), rs);
                 });
+
+                //初始化线路底图下拉
+                var opts='';
+                $.each(gb_data_basic.activeLines, function () {
+                    opts+='<li data-code="'+this.lineCode+'" data-dir="0"><a>'+this.name+'上行</a></li><li data-code="'+this.lineCode+'" data-dir="1"><a>'+this.name+'下行</a></li>';
+                });
+                $('.line_route_list', modal).html(opts);
+            });
+
+            //切换线路底图
+            $(modal).on('click', '.line_route_list li', function () {
+                var code = $(this).data('code');
+                var updown = $(this).data('dir');
+                mapObj.changeLine(code, updown);
             });
             /**
@@ -730,7 +754,7 @@
                     //中心点和缩放级别
                     map.centerAndZoom(new BMap.Point(gb_map_consts.center_point.lng, gb_map_consts.center_point.lat), 16);
                     map.enableScrollWheelZoom();
-                }
+                };
                 var storage = window.localStorage;
                 var routes;//路段
@@ -985,6 +1009,19 @@
                     if(!markerIsVisible)
                         map.panTo(gpsMarker.getPosition());
                 };
+
+                /**
+                 * 切换线路底图
+                 */
+                var changeLine = function (lineCode, updown) {
+                    //reset();
+                    //从地图模块获取站点数据
+                    stations = gb_map_spatial_data.getStationArray(lineCode);
+                    //从localStorage 获取路段
+                    routes = JSON.parse(storage.getItem(lineCode + '_route'));
+                    routes = [routes.up_bd, routes.down_bd];
+                    switchPolyline(lineCode, updown);
+                };
                 return {
                     initData: initData,
                     updateCar: updateCar,
@@ -992,7 +1029,8 @@
                     updateTrailLine: updateTrailLine,
                     refreshOverlay: switchPolyline,
                     toCenterByBounds: toCenterByBounds,
-                    reset: reset
+                    reset: reset,
+                    changeLine: changeLine
                 }
             })();