update

潘钊
1 parent af02e4e1
Showing 59 changed files with 1632 additions and 1380 deletions
src/main/java/com/bsth/data/BasicData.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/data/gpsdata/analyse/GpsAnalyse.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsArrival.java
src/main/java/com/bsth/data/gpsdata/analyse/components/GpsStateCorrective.java
src/main/java/com/bsth/data/gpsdata/analyse/GeoCacheData.java → src/main/java/com/bsth/data/gpsdata/arrival/GeoCacheData.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/arrival/SignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/entity/RouteReverse.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRoute.java → src/main/java/com/bsth/data/gpsdata/arrival/entity/StationRoute.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/CorrectSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/OfflineSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/ReverseSignalHandle.java
src/main/java/com/bsth/data/gpsdata/arrival/handlers/StationInsideHandle.java
src/main/java/com/bsth/data/gpsdata/analyse/CircleQueue.java → src/main/java/com/bsth/data/gpsdata/arrival/utils/CircleQueue.java
src/main/java/com/bsth/data/gpsdata/analyse/util/GeoUtils.java → src/main/java/com/bsth/data/gpsdata/arrival/utils/GeoUtils.java
src/main/java/com/bsth/data/gpsdata/analyse/StationRouteComp.java → src/main/java/com/bsth/data/gpsdata/arrival/utils/StationRouteComp.java
src/main/java/com/bsth/data/gpsdata/recovery/GpsDataRecovery.java
 package com.bsth.data;
  
 import com.bsth.Application;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
 import com.bsth.entity.*;
 import com.bsth.entity.schedule.CarConfigInfo;
 import com.bsth.repository.*;
 package com.bsth.data.gpsdata;
  
-import com.bsth.data.gpsdata.analyse.StationRoute;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
 import com.fasterxml.jackson.annotation.JsonIgnore;
  
 /**
@@ -78,15 +78,15 @@ public class GpsEntity {
 	private boolean sEPoint;
 	 */
  
-	/** 站内 */
-	private boolean instation;
+	/** 0： 站外 1：站内 2：场内 */
+	private int instation;
  
 	/** 站点信息，站内时有值 */
 	@JsonIgnore
 	private StationRoute station;
  
 	/** 状态 */
-	private String state2;
+	private String signalState;
  
 	public Integer getCompanyCode() {
 		return companyCode;
@@ -233,14 +233,6 @@ public class GpsEntity {
 		this.version = version;
 	}
  
-	public boolean isInstation() {
-		return instation;
-	}
-
-	public void setInstation(boolean instation) {
-		this.instation = instation;
-	}
-
 	public StationRoute getStation() {
 		return station;
 	}
@@ -257,11 +249,19 @@ public class GpsEntity {
 		this.abnormal = abnormal;
 	}
  
-	public String getState2() {
-		return state2;
+	public String getSignalState() {
+		return signalState;
 	}
  
-	public void setState2(String state2) {
-		this.state2 = state2;
+	public void setSignalState(String signalState) {
+		this.signalState = signalState;
+	}
+
+	public int getInstation() {
+		return instation;
+	}
+
+	public void setInstation(int instation) {
+		this.instation = instation;
 	}
 }
@@ -5,8 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
-import com.bsth.data.gpsdata.analyse.GpsAnalyse;
+import com.bsth.data.gpsdata.arrival.GpsRealAnalyse;
 import com.bsth.data.gpsdata.recovery.GpsDataRecovery;
 import com.bsth.data.schedule.DayOfSchedule;
 import com.bsth.entity.realcontrol.ScheduleRealInfo;
@@ -30,259 +29,187 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
  
 /**
- *
+ * @author PanZhao
  * @ClassName: GpsRealData
  * @Description: TODO(实时GPS数据集合)
- * @author PanZhao
  * @date 2016年8月12日 下午2:04:41
- *
  */
 @Component
-public class GpsRealData implements CommandLineRunner{
-
-	static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
-
-	private static Map<String, GpsEntity> gpsMap;
-
-	//按线路分组设备号
-	private static TreeMultimap<String, String> lineCode2Devices;
-
-	// 网关数据接口地址
-	private static String url;
-
-	@Autowired
-	GpsDataLoader gpsDataLoader;
-
-	@Autowired
-	DayOfSchedule dayOfSchedule;
-
-	@Autowired
-	ForecastRealServer forecastRealServer;
-
-	/**
-	 * 构造函数
-	 */
-	public GpsRealData(){
-		gpsMap = new HashMap<>();
-		lineCode2Devices = TreeMultimap.create();
-		url = ConfigUtil.get("http.gps.real.url");
-	}
-
-	@Override
-	public void run(String... arg0) throws Exception {
-		logger.info("gpsDataLoader,20,6");
-		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 6, TimeUnit.SECONDS);
-	}
-
-	static final long CLEAR_DIFF = 1000 * 60 * 60 * 2;
-	public GpsEntity add(GpsEntity gps) {
-		String device = gps.getDeviceId();
-		GpsEntity old = gpsMap.get(device);
-
-		//断线2个小时，清除缓存数据
-		if(gps.getTimestamp() - old.getTimestamp() > CLEAR_DIFF && gps.getNbbm() != null)
-			GeoCacheData.clear(gps.getNbbm());
-
-		//分析gps
-		if(isAvailable(gps) && (old == null || old.getTimestamp() != gps.getTimestamp()))
-			GpsAnalyse.start(gps);
-
-		if(!StringUtils.isEmpty(gps.getStopNo())){
-			//定时定距数据附带站点编码改变
-			if(null == old || !gps.getStopNo().equals(old.getStopNo())){
-				gps.setArrTime(gps.getTimestamp());
-				//预测到达终点时间
-				forecastRealServer.forecast(gps.getNbbm(), gps);
-			}
-			else{
-				gps.setArrTime(old.getArrTime());
-				//不预测， 重新计算终点时间
-				gps.setExpectStopTime(forecastRealServer.expectStopTime(gps.getNbbm()));
-			}
-		}
-
-		gpsMap.put(device, gps);
-		if(StringUtils.isNotBlank(gps.getLineId()))
-			lineCode2Devices.put(gps.getLineId(), device);
-		return gps;
-	}
-
-	public boolean isAvailable(GpsEntity gps){
-		return StringUtils.isNotEmpty(gps.getLineId()) &&
-				dayOfSchedule.getCurrSchDate().containsKey(gps.getLineId());
-	}
-
-	/**
-	 *
-	 * @Title: get @Description: TODO(设备号获取GPS)
-	 */
-	public GpsEntity get(String deviceId) {
-		return gpsMap.get(deviceId);
-	}
-
-	/**
-	 *
-	 * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
-	 */
-	public List<GpsEntity> getByLine(String lineCode) {
-		NavigableSet<String> set = lineCode2Devices.get(lineCode);
-
-		List<GpsEntity> rs = new ArrayList<>();
-		GpsEntity gps;
-		ScheduleRealInfo sch;
-		for(String device : set){
-			gps = gpsMap.get(device);
-			//过滤异常GPS数据
-			if(gps.isAbnormal())
-				continue;
-
-			sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
-			if(null != sch)
-				gps.setSchId(sch.getId());
-			rs.add(gps);
-		}
-
-		return rs;
-	}
-
-	public List<GpsEntity> get(List<String> pArray){
-		List<GpsEntity> list = new ArrayList<>();
-
-		for(String code : pArray)
-			list.addAll(getByLine(code));
-		return list;
-	}
-
-	public Set<String> allDevices(){
-		return gpsMap.keySet();
-	}
-
-	public GpsEntity findByDeviceId(String deviceId) {
-		return gpsMap.get(deviceId);
-	}
-
-	public Collection<GpsEntity> all(){
-		return gpsMap.values();
-	}
-
-	public void remove(String device){
-		gpsMap.remove(device);
-	}
-	@Component
-	public static class GpsDataLoader extends Thread{
-
-		Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
-
-		@Autowired
-		GpsRealData gpsRealData;
-
-		@Override
-		public void run() {
-			try{
-				//如果正在恢复数据
-				if(GpsDataRecovery.run){
-					return;
-				}
-
-				load();
-			}catch(Exception e){
-				logger.error("", e);
-			}
-		}
-
-		public void load() throws Exception {
-			List<GpsEntity> list = new ArrayList<>();
-			CloseableHttpClient httpClient = null;
-			CloseableHttpResponse response = null;
-			try {
-				httpClient = HttpClients.createDefault();
-				HttpGet get = new HttpGet(url);
-
-				response = httpClient.execute(get);
-
-				HttpEntity entity = response.getEntity();
-				if (null != entity) {
-					// 返回数据量比较大，建议以流的形式读取
-					BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
-					StringBuffer stringBuffer = new StringBuffer();
-					String str = "";
-					while ((str = br.readLine()) != null)
-						stringBuffer.append(str);
-
-					JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
-
-					if (jsonObj != null)
-						list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
-
-					String nbbm;
-					for(GpsEntity gps : list){
-						//没有设备号
-						if(StringUtils.isBlank(gps.getDeviceId()))
-							continue;
-
-						nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
-						if(StringUtils.isBlank(nbbm))
-							gps.setAbnormal(true);//标记为异常数据
-						else
-							gps.setNbbm(nbbm);
-
-						gps.setStationName(BasicData.stationCode2NameMap.get(gps.getStopNo()));
-						gpsRealData.add(gps);
-
-						//纠正走向
-						//correctUpdown(gps);
-					}
-				} else
-					logger.error("result is null");
-			} catch(Exception e){
-				logger.error("", e);
-			}
-			finally {
-				if (null != httpClient)
-					httpClient.close();
-				if(null != response)
-					response.close();
-			}
-		}
-
-		/**
-		 * 是否是起终点
-		 * @param gps
-		 * @return
-
-		public boolean isSEPoint(GpsEntity gps){
-			String key = gps.getLineId()+"_"+gps.getUpDown()+"_"
-					,stationCode;
-
-			if(BasicData.lineSEPointMap.containsKey(key+"B")){
-				stationCode = BasicData.lineSEPointMap.get(key+"B");
-				if(gps.getStopNo().equals(stationCode)){
-					gps.setsEPoint(true);
-					return true;
-				}
-			}
-
-			if(BasicData.lineSEPointMap.containsKey(key+"E")){
-				stationCode = BasicData.lineSEPointMap.get(key+"E");
-				if(gps.getStopNo().equals(stationCode)){
-					gps.setsEPoint(true);
-					return true;
-				}
-			}
-			return false;
-		}*/
-
-		/**
-		 * 纠正上下行
-		 * @param gps
-
-		public void correctUpdown(GpsEntity gps){
-			Integer updown=BasicData.lineStationUpDownMap.get(gps.getLineId()+"_"+gps.getStopNo());
-			if(updown != null && !updown.equals(gps.getUpDown()))
-				gps.setUpDown(updown);
-
-			if(isSEPoint(gps))
-				return;
-		}*/
-	}
+public class GpsRealData implements CommandLineRunner {
+
+    static Logger logger = LoggerFactory.getLogger(GpsRealData.class);
+
+    private static Map<String, GpsEntity> gpsMap;
+
+    //按线路分组设备号
+    private static TreeMultimap<String, String> lineCode2Devices;
+
+    // 网关数据接口地址
+    private static String url;
+
+    @Autowired
+    GpsDataLoader gpsDataLoader;
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    ForecastRealServer forecastRealServer;
+
+    /**
+     * 构造函数
+     */
+    public GpsRealData() {
+        gpsMap = new HashMap<>();
+        lineCode2Devices = TreeMultimap.create();
+        url = ConfigUtil.get("http.gps.real.url");
+    }
+
+    @Override
+    public void run(String... arg0) throws Exception {
+        logger.info("gpsDataLoader,40,6");
+        Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 40, 6, TimeUnit.SECONDS);
+    }
+
+    public void put(GpsEntity gps) {
+        gpsMap.put(gps.getDeviceId(), gps);
+    }
+
+    /**
+     * @Title: get @Description: TODO(设备号获取GPS)
+     */
+    public GpsEntity get(String deviceId) {
+        return gpsMap.get(deviceId);
+    }
+
+    /**
+     * @Title: get @Description: TODO(线路编码获取GPS集合) @throws
+     */
+    public List<GpsEntity> getByLine(String lineCode) {
+        NavigableSet<String> set = lineCode2Devices.get(lineCode);
+
+        List<GpsEntity> rs = new ArrayList<>();
+        GpsEntity gps;
+        ScheduleRealInfo sch;
+        for (String device : set) {
+            gps = gpsMap.get(device);
+            //过滤异常GPS数据
+            if (gps.isAbnormal())
+                continue;
+
+            sch = dayOfSchedule.execPlanMap().get(gps.getNbbm());
+            if (null != sch)
+                gps.setSchId(sch.getId());
+            rs.add(gps);
+        }
+
+        return rs;
+    }
+
+    public List<GpsEntity> get(List<String> pArray) {
+        List<GpsEntity> list = new ArrayList<>();
+
+        for (String code : pArray)
+            list.addAll(getByLine(code));
+        return list;
+    }
+
+    public Set<String> allDevices() {
+        return gpsMap.keySet();
+    }
+
+    public GpsEntity findByDeviceId(String deviceId) {
+        return gpsMap.get(deviceId);
+    }
+
+    public Collection<GpsEntity> all() {
+        return gpsMap.values();
+    }
+
+    public void remove(String device) {
+        gpsMap.remove(device);
+    }
+
+    @Component
+    public static class GpsDataLoader extends Thread {
+
+        Logger logger = LoggerFactory.getLogger(GpsDataLoader.class);
+
+        @Autowired
+        GpsRealData gpsRealData;
+
+        @Autowired
+        GpsRealAnalyse gpsRealAnalyse;
+
+        @Override
+        public void run() {
+            try {
+                //如果正在恢复数据
+                if (GpsDataRecovery.run)
+                    return;
+
+                load();
+            } catch (Exception e) {
+                logger.error("", e);
+            }
+        }
+
+        public void load() throws Exception {
+            List<GpsEntity> list = null;
+            List<GpsEntity> updateList = new ArrayList<>();
+            CloseableHttpClient httpClient = null;
+            CloseableHttpResponse response = null;
+            try {
+                httpClient = HttpClients.createDefault();
+                HttpGet get = new HttpGet(url);
+
+                response = httpClient.execute(get);
+
+                HttpEntity entity = response.getEntity();
+                if (null != entity) {
+                    BufferedReader br = new BufferedReader(new InputStreamReader(entity.getContent()));
+                    StringBuffer stringBuffer = new StringBuffer();
+                    String str = "";
+                    while ((str = br.readLine()) != null)
+                        stringBuffer.append(str);
+
+                    JSONObject jsonObj = JSON.parseObject(stringBuffer.toString());
+
+                    if (jsonObj != null)
+                        list = JSON.parseArray(jsonObj.getString("data"), GpsEntity.class);
+
+                    String nbbm;
+                    GpsEntity old;
+                    for (GpsEntity gps : list) {
+                        //没有设备号
+                        if (StringUtils.isBlank(gps.getDeviceId()))
+                            continue;
+
+                        old = gpsMap.get(gps.getDeviceId());
+                        if (old != null &&
+                                old.getTimestamp() == gps.getTimestamp())
+                            continue;
+
+                        nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
+                        if (StringUtils.isBlank(nbbm))
+                            gps.setAbnormal(true);//标记为异常数据
+                        else
+                            gps.setNbbm(nbbm);
+                        //有更新的点位
+                        updateList.add(gps);
+                    }
+                    //分析数据
+                    gpsRealAnalyse.analyse(updateList);
+                } else
+                    logger.error("real gps result is null");
+            } catch (Exception e) {
+                logger.error("", e);
+            } finally {
+                if (null != httpClient)
+                    httpClient.close();
+                if (null != response)
+                    response.close();
+            }
+        }
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.analyse;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.components.GpsArrival;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-/**
- * 分析gps状态信息
- * Created by panzhao on 2016/12/23.
- */
-public class GpsAnalyse {
-
-    static Logger logger = LoggerFactory.getLogger(GpsAnalyse.class);
-
-    //线程池
-    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
-
-    public static void start(GpsEntity gps) {
-        threadPool.execute(new ArrivalMatchThread(gps));
-    }
-
-    public static class ArrivalMatchThread implements Runnable {
-
-        private GpsEntity gps;
-
-        public ArrivalMatchThread(GpsEntity gps) {
-            this.gps = gps;
-        }
-
-        @Override
-        public void run() {
-            GpsArrival.arrival(gps);
-        }
-    }
-}
 \ No newline at end of file
-package com.bsth.data.gpsdata.analyse.components;
-
-import com.bsth.data.LineConfigData;
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.CircleQueue;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
-import com.bsth.data.gpsdata.analyse.StationRoute;
-import com.bsth.data.gpsdata.analyse.util.GeoUtils;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.LineConfig;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.bsth.service.directive.DirectiveService;
-import com.bsth.websocket.handler.SendUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * gps 到离站判断
- * Created by panzhao on 2016/12/24.
- */
-@Component
-public class GpsArrival implements ApplicationContextAware {
-
-    static Logger logger = LoggerFactory.getLogger(GpsArrival.class);
-
-    static DayOfSchedule dayOfSchedule;
-    static LineConfigData lineConfigData;
-    static SendUtils sendUtils;
-    static DirectiveService directiveService;
-
-    public static void arrival(GpsEntity gps) {
-
-        if (gps.getLat() == 0 || gps.getLon() == 0) {
-            //logger.error("无效的gps");
-            return;
-        }
-
-        Object task = DayOfSchedule.executeCurr(gps.getNbbm());
-        if (task == null)
-            return;
-        if (task.getClass().isAssignableFrom(ScheduleRealInfo.class)) {
-            ScheduleRealInfo sch = (ScheduleRealInfo) task;
-            //和班次同步走向
-            gps.setUpDown(Integer.parseInt(sch.getXlDir()));
-
-            //出场
-            if (sch.getBcType().equals("out")) {
-                outCarpark(gps, sch);
-            } else if (sch.getBcType().equals("normal"))
-                normalInOut(gps, sch);
-            else if (sch.getBcType().equals("in")) {
-                inCarpark(gps, sch);
-            }
-        }
-
-        GeoCacheData.putGps(gps);
-    }
-
-    /**
-     * 正常班次
-     *
-     * @param gps
-     * @param sch
-     */
-    private static void normalInOut(GpsEntity gps, ScheduleRealInfo sch) {
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        GpsEntity prev = null;
-        if (queue != null)
-            prev = queue.getTail();
-
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-
-        if (station != null) {
-            //站内
-            gps.setStopNo(station.getCode());
-            gps.setInstation(true);
-            stationInside(gps, prev, sch);
-        } else {
-            //站外
-            stationOutside(gps, prev, sch);
-        }
-    }
-
-    /**
-     * GPS在站点内
-     *
-     * @param gps
-     * @param prev
-     * @param sch
-     */
-    private static void stationInside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
-        if (prev == null)
-            return;
-
-        if (gps.getStopNo().equals(sch.getZdzCode()) && sch.getZdsjActual() == null) {
-            //到终点站
-            arriveEnd(sch, gps);
-            return;
-        }
-
-        //上一个点在站外
-        if (!prev.isInstation())
-            return;
-        //超过 （待发时间 + 90%的单程运送时间） 并且超过下一个班次的待发时间，还在起点站。默认烂一圈
-        if (prev.getStopNo().equals(gps.getStopNo())) {
-            if (gps.getStopNo().equals(sch.getQdzCode())
-                    && gps.getTimestamp() > sch.getDfsjT() + (sch.getBcsj() * 60 * 1000 * 0.9)) {
-
-                ScheduleRealInfo next = dayOfSchedule.next(sch);
-                if(gps.getTimestamp() > next.getDfsjT())
-                    dayOfSchedule.addExecPlan(dayOfSchedule.next(next));
-            }
-            return;
-        }
-
-        //发车
-        if (prev.getStopNo().equals(sch.getQdzCode())) {
-            busWillDepart(sch, gps);
-            return;
-        }
-
-        if (gps.getUpDown() != prev.getUpDown())
-            return;
-
-        //中途站
-        StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), prev.getUpDown(), prev.getStopNo());
-        StationRoute currStation = GeoCacheData.getStation(gps.getLineId(), gps.getUpDown(), gps.getStopNo());
-        if (currStation.getRouteSort() < prevStation.getRouteSort()) {
-            //开始下一个班次
-            finishPlan(sch);
-
-            logger.info("路由反向。。。。。。:" + gps.getTimestamp());
-            //为班次补上实际时间
-        }
-    }
-
-    /**
-     * GPS在站点外
-     *
-     * @param gps
-     * @param prev
-     * @param sch
-     */
-    private static void stationOutside(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch) {
-        if (prev == null)
-            return;
-
-        gps.setStopNo(prev.getStopNo());
-        if (prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
-            //发车
-            busWillDepart(sch, gps);
-            return;
-        }
-    }
-
-    /**
-     * 公交车起点发出
-     */
-    final static long DRIFT_VAL_TIME = 1000 * 60 * 10;
-    //班次最大差值2小时
-    final static long MAX_DIFF = 1000 * 60 * 60 * 2;
-
-    private static void busWillDepart(ScheduleRealInfo sch, GpsEntity gps) {
-        //实发时间不覆盖
-        if (sch.getFcsjActual() == null && Math.abs(gps.getTimestamp() - sch.getDfsjT()) < MAX_DIFF) {
-
-            //提前10分钟以上发出，判断一下是否是漂移
-            /*if (sch.getDfsjT() - gps.getTimestamp() > DRIFT_VAL_TIME) {
-                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-                if (schPrev != null && schPrev.getZdsjActual() != null) {
-                    //计划停站时间
-                    long stopTimeJH = sch.getDfsjT() - schPrev.getZdsjT();
-                    //实际停站时间
-                    long actualStopTime = gps.getTimestamp() - schPrev.getZdsjActualTime();
-                    *//*
-                        没停够计划百分之30的，算漂移
-                        （这里出现的误判，由程序在车辆到中途站的时候进行补偿）
-                    *//*
-                    if (stopTimeJH * 0.3 > actualStopTime) {
-                        logger.info("漂移.... 车辆：" + gps.getNbbm() + " ts: " + gps.getTimestamp());
-                        return;
-                    }
-                }
-            }*/
-
-            LineConfig config = lineConfigData.get(sch.getXlBm());
-            if (config != null && config.getOutConfig() == 2) {
-                //出站既出场
-                ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
-                if (schPrev.getBcType().equals("out")) {
-                    schPrev.setFcsjActualAll(gps.getTimestamp());
-                    schPrev.setZdsjActualAll(gps.getTimestamp());
-                }
-            }
-
-            sch.setFcsjActualAll(gps.getTimestamp());
-            //通知客户端
-            sendUtils.sendFcsj(sch);
-            //持久化
-            dayOfSchedule.save(sch);
-            logger.info("（站外）班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
-        }
-    }
-
-    /**
-     * 公交车到达终点
-     *
-     * @param sch
-     * @param gps
-     */
-    private static void arriveEnd(ScheduleRealInfo sch, GpsEntity gps) {
-        if(Math.abs(gps.getTimestamp() - sch.getZdsjT()) >= MAX_DIFF)
-            return;
-
-        sch.setZdsjActualAll(gps.getTimestamp());
-        ScheduleRealInfo next = finishPlan(sch);
-        //已完成班次数
-        int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
-        //通知客户端
-        sendUtils.sendZdsj(sch, next, doneSum);
-        //持久化
-        dayOfSchedule.save(sch);
-        logger.info("班次：" + sch.getDfsj() + "到达终点， 时间：" + sch.getZdsjActual());
-
-        if (next == null)
-            return;
-
-        LineConfig config = lineConfigData.get(sch.getXlBm());
-        //进站既进场
-        if (next.getBcType().equals("in") &&
-                config != null && config.getOutConfig() == 2) {
-            next.setFcsjActualAll(gps.getTimestamp());
-            next.setZdsjActualAll(gps.getTimestamp());
-
-            finishPlan(next);
-        } else {
-            //下发调度指令
-            directiveService.send60Dispatch(next, doneSum, "到站@系统");
-
-            //套跑  -下发线路切换指令
-           /* if (!next.getXlBm().equals(sch.getXlBm()))
-                directiveService.lineChange(sch.getClZbh(), next.getXlBm(), "套跑@系统");*/
-        }
-
-        //将gps转换为下一个班次走向的站内信号
-        int updown = Integer.parseInt(next.getXlDir());
-        List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        if (station != null) {
-            gps.setUpDown(updown);
-            gps.setStopNo(station.getCode());
-        }
-    }
-
-    /**
-     * 出场班次
-     *
-     * @param gps
-     * @param sch
-     */
-    private static void outCarpark(GpsEntity gps, ScheduleRealInfo sch) {
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        GpsEntity prev = null;
-        if (queue != null)
-            prev = queue.getTail();
-
-        //是否在停车场内
-        String carpark = GeoUtils.gpsInCarpark(gps);
-        if (carpark != null && carpark.equals(sch.getQdzCode())) {
-            gps.setInstation(true);
-            gps.setStopNo(carpark);
-            return; // 还在场内
-        }
-
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), gps.getUpDown());
-        StationRoute station = GeoUtils.gpsInStation(gps, srs);
-        //线路上 站点内
-        if (station != null) {
-            gps.setInstation(true);
-            gps.setStopNo(station.getCode());
-
-            //上一个点附带的站点站标记
-            if (prev != null && prev.getStopNo() != null
-                    && prev.getStopNo().equals(sch.getZdzCode()))
-                return;
-
-            //到达终点
-            if (station.getCode().equals(sch.getZdzCode()))
-                arriveEnd(sch, gps);
-        }
-
-        //上一个点在场内
-        if (prev != null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
-            //当前点在场外
-            if (carpark == null) {
-                gps.setStopNo(prev.getStopNo());
-                //停车场发出
-                busWillDepart(sch, gps);
-                return;
-            }
-        }
-    }
-
-
-    /**
-     * 进场班次
-     *
-     * @param gps
-     * @param sch
-     */
-    private static void inCarpark(GpsEntity gps, ScheduleRealInfo sch) {
-        String carpark = GeoUtils.gpsInCarpark(gps);
-        if (carpark != null && carpark.equals(sch.getZdzCode())) {
-            //进场班次取第一个实际进场时间
-            if (sch.getZdsjActual() != null)
-                return;
-
-            //进场
-            arriveEnd(sch, gps);
-            return;
-        }
-
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        if (queue == null)
-            return;
-        //上一个gps
-        GpsEntity prev = queue.getTail();
-
-        if (carpark == null && prev.isInstation() && prev.getStopNo().equals(sch.getQdzCode())) {
-            gps.setStopNo(prev.getStopNo());
-            //进场班次发出
-            busWillDepart(sch, gps);
-            return;
-        }
-    }
-
-    /**
-     * 完成班次 -返回下一个班次
-     *
-     * @param sch
-     */
-    private static ScheduleRealInfo finishPlan(ScheduleRealInfo sch) {
-        ScheduleRealInfo next = dayOfSchedule.next(sch);
-        if (next != null) {
-            next.setQdzArrDatesj(sch.getZdsjActual());
-            dayOfSchedule.addExecPlan(next);
-        }
-        return next;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
-        lineConfigData = applicationContext.getBean(LineConfigData.class);
-        sendUtils = applicationContext.getBean(SendUtils.class);
-        directiveService = applicationContext.getBean(DirectiveService.class);
-    }
-}
-package com.bsth.data.gpsdata.analyse.components;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.schedule.DayOfSchedule;
-import com.bsth.entity.realcontrol.ScheduleRealInfo;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-/**
- * GPS状态纠正
- * Created by panzhao on 2016/12/23.
- */
-@Component
-public class GpsStateCorrective implements ApplicationContextAware {
-
-    static Logger logger = LoggerFactory.getLogger(GpsStateCorrective.class);
-
-    static DayOfSchedule dayOfSchedule;
-
-    private static GeometryFactory geometryFactory = new GeometryFactory();
-
-    public static void correct(GpsEntity gps, ScheduleRealInfo sch){
-/*        int upDown = Integer.parseInt(sch.getXlDir());
-        gps.setUpDown(upDown);
-        List<StationRoute> srs = GeoCacheData.getStationRoute(sch.getXlBm(), upDown);
-
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-
-        //之前的点位
-        CircleQueue<GpsEntity> queue = GeoCacheData.getGps(gps.getNbbm());
-        GpsEntity prev = null;
-        if(queue != null)
-            prev = queue.getTail();
-
-        //线路上，站点间
-        StationRoute station = GeoUtils.pointInStation(point, srs);
-        //在站内
-        if(station != null){
-            gps.setStopNo(station.getCode());
-            gps.setInstation(true);
-            gps.setStation(station);
-
-            if(prev != null && prev.getUpDown() == upDown){
-                StationRoute prevStation = GeoCacheData.getStation(prev.getLineId(), upDown, prev.getStopNo());
-
-                //倒着开？？
-                if(prevStation.getRouteSort() > station.getRouteSort()){
-                    reversalHandle(gps, prev, sch);
-                }
-            }
-        }
-        else{
-            if(prev != null)
-                gps.setStopNo(prev.getStopNo());
-        }
-
-        //是否在停车场内
-        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
-        Set<String> codes = carparkMap.keySet();
-        Polygon p;
-        for(String code : codes){
-            p = carparkMap.get(code);
-            //场内
-            if(p.contains(point)){
-                gps.setCarparkNo(code);
-                if(sch.getBcType().equals("out")){
-                    gps.setInstation(true);
-                    gps.setStopNo(code);
-                }
-            }
-        }*/
-    }
-
-    private static DateTimeFormatter fmt = DateTimeFormat.forPattern("HH:mm");
-
-    private static void reversalHandle(GpsEntity gps, GpsEntity prev, ScheduleRealInfo sch){
-        /*if(sch.getBcType().equals("out") && gps.getTimestamp() < sch.getZdsjT())
-            return;
-
-        //先假设没到终点，直接开始了下一个班次
-        ScheduleRealInfo next = dayOfSchedule.next(sch);
-        String log = "倒着开？？？ nbbm: " + gps.getNbbm() + " 当前：" + gps.getStopNo() + " 上一站：" + prev.getStopNo() + " 当前班次：" + sch.getDfsj();
-        if(next != null){
-            dayOfSchedule.addExecPlan(next);
-
-            log += (" 下一个班次：" + next.getDfsj());
-        }
-
-        log += (" GPS时间：" + fmt.print(gps.getTimestamp()));
-
-        logger.info(log);*/
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        dayOfSchedule = applicationContext.getBean(DayOfSchedule.class);
-    }
-}
-package com.bsth.data.gpsdata.analyse;
+package com.bsth.data.gpsdata.arrival;
  
 import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.StationRouteComp;
 import com.google.common.collect.ArrayListMultimap;
 import com.vividsolutions.jts.geom.Coordinate;
 import com.vividsolutions.jts.geom.GeometryFactory;
@@ -26,8 +29,8 @@ public class GeoCacheData {
  
     static Logger logger = LoggerFactory.getLogger(GeoCacheData.class);
  
-    //每辆车缓存最后200条gps
-    private static final int CACHE_SIZE = 200;
+    //每辆车缓存最后500条gps
+    private static final int CACHE_SIZE = 500;
     private static Map<String, CircleQueue<GpsEntity>> gpsCacheMap = new HashMap<>();
  
     //线路路段走向
@@ -36,6 +39,9 @@ public class GeoCacheData {
     //线路站点路由
     private static ArrayListMultimap<String, StationRoute> stationCacheMap;
  
+    //线路_上下行_站点编码 ——> 站点
+    private static Map<String, StationRoute> routeCodeMap;
+
     //停车场
     public static Map<String, Polygon> tccMap;
  
@@ -49,9 +55,9 @@ public class GeoCacheData {
     public static void putGps(GpsEntity gps) {
         CircleQueue<GpsEntity> queue = gpsCacheMap.get(gps.getNbbm());
         if (queue == null) {
-            //第一个点从站内开始
-            if (!gps.isInstation())
-                return;
+            /*//第一个点从站内开始
+            if (gps.getInstation() == 0)
+                return;*/
  
             queue = new CircleQueue<>(CACHE_SIZE);
             gpsCacheMap.put(gps.getNbbm(), queue);
@@ -69,6 +75,10 @@ public class GeoCacheData {
         }
     }
  
+    public static StationRoute getRouteCode(GpsEntity gps){
+        return routeCodeMap.get(gps.getLineId() + "_" + gps.getUpDown() + "_" + gps.getStopNo());
+    }
+
     public static List<StationRoute> getStationRoute(String lineCode, int directions) {
         return stationCacheMap.get(lineCode + "_" + directions);
     }
@@ -91,7 +101,7 @@ public class GeoCacheData {
     public void loadData() {
         final GeometryFactory geometryFactory = new GeometryFactory();
         //加载站点路由
-        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
+        String sql = "select r.LINE_CODE,r.DIRECTIONS,r.STATION_CODE,r.STATION_MARK,s.SHAPES_TYPE,s.G_LONX,s.G_LATY,ST_AsText(s.G_POLYGON_GRID) as G_POLYGON_GRID,s.RADIUS, r.STATION_ROUTE_CODE,s.STATION_NAME from bsth_c_stationroute r left join bsth_c_station s on r.station=s.id where r.destroy=0 order by r.station_route_code";
         List<StationRoute> routeList = jdbcTemplate.query(sql, new RowMapper<StationRoute>() {
             @Override
             public StationRoute mapRow(ResultSet rs, int rowNum) throws SQLException {
@@ -103,6 +113,7 @@ public class GeoCacheData {
                 sRoute.setRadius(rs.getFloat("RADIUS"));
                 sRoute.setRouteSort(rs.getInt("STATION_ROUTE_CODE"));
                 sRoute.setMark(rs.getString("STATION_MARK"));
+                sRoute.setName(rs.getString("STATION_NAME"));
  
                 String shapesType = rs.getString("SHAPES_TYPE");
                 //多边形电子围栏
@@ -115,8 +126,11 @@ public class GeoCacheData {
         //按线路和走向分组
         if (routeList.size() > 0) {
             ArrayListMultimap<String, StationRoute> tempMap = ArrayListMultimap.create();
+            Map<String, StationRoute> codeMap = new HashMap<>(routeList.size());
             for (StationRoute sr : routeList) {
                 tempMap.put(sr.getLineCode() + "_" + sr.getDirections(), sr);
+                //站点编码 ——> 和路由顺序对照
+                codeMap.put(sr.getLineCode() + "_" + sr.getDirections() + "_" + sr.getCode(), sr);
             }
  
             StationRouteComp srCom = new StationRouteComp();
@@ -128,6 +142,7 @@ public class GeoCacheData {
             }
  
             stationCacheMap = tempMap;
+            routeCodeMap = codeMap;
         }
  
         //加载停车场数据
+package com.bsth.data.gpsdata.arrival;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.handlers.*;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * gps 实时数据分析
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class GpsRealAnalyse {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    OfflineSignalHandle offlineSignalHandle;
+    @Autowired
+    CorrectSignalHandle correctSignalHandle;
+    @Autowired
+    StationInsideHandle stationInsideHandle;
+    @Autowired
+    InOutStationSignalHandle inOutStationSignalHandle;
+    @Autowired
+    ReverseSignalHandle reverseSignalHandle;
+
+    //50个线程
+    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+
+    public void analyse(List<GpsEntity> list) {
+        CountDownLatch count = new CountDownLatch(list.size());
+
+        for(GpsEntity gps : list)
+            threadPool.execute(new SignalHandleThread(gps, count));
+
+        try {
+            //等待子线程结束
+            count.await();
+        } catch (InterruptedException e) {
+            logger.error("", e);
+        }
+    }
+
+    public class SignalHandleThread implements Runnable {
+
+        GpsEntity gps;
+        CountDownLatch count;
+
+        SignalHandleThread(GpsEntity gps, CountDownLatch count) {
+            this.gps = gps;
+            this.count = count;
+        }
+
+        @Override
+        public void run() {
+
+            try {
+                CircleQueue<GpsEntity> prevs = GeoCacheData.getGps(gps.getNbbm());
+                //掉线处理
+                offlineSignalHandle.handle(gps, prevs);
+                //状态处理
+                if(!correctSignalHandle.handle(gps, prevs))
+                    return;
+                //场，站内外判断
+                stationInsideHandle.handle(gps, prevs);
+                //反向处理
+                reverseSignalHandle.handle(gps, prevs);
+                //进出站动作处理
+                inOutStationSignalHandle.handle(gps, prevs);
+                GeoCacheData.putGps(gps);
+
+            } catch (Exception e) {
+                logger.error("", e);
+            } finally {
+                count.countDown();
+            }
+        }
+    }
+}
+package com.bsth.data.gpsdata.arrival;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+
+/**
+ * Created by panzhao on 2016/12/27.
+ */
+public abstract class SignalHandle {
+
+    public abstract boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs);
+
+    protected boolean isNotEmpty(CircleQueue<GpsEntity> prevs) {
+        return prevs != null && prevs.size() > 0 && prevs.getTail() != null;
+    }
+
+    /**
+     * 是不是异常信号
+     *
+     * @param gps
+     * @return
+     */
+    protected boolean isAbnormal(GpsEntity gps) {
+        return gps.getLat() == 0 || gps.getLon() == 0;
+    }
+
+    /**
+     * 连续异常信号个数统计
+     *
+     * @param prevs
+     * @return
+     */
+    protected int abnormalCount(CircleQueue<GpsEntity> prevs) {
+        int count = 0;
+
+        if (!isNotEmpty(prevs))
+            return count;
+
+        GpsEntity[] array = (GpsEntity[]) prevs.getQueue();
+        GpsEntity gps;
+        for (int i = array.length - 1; i > 0; i--) {
+            gps = array[i];
+
+            if (isAbnormal(gps))
+                count++;
+            else
+                break;
+        }
+
+        return count;
+    }
+
+    /**
+     * 车辆运行轨迹（最近20分钟）
+     * 0：上行 1：下行 -1：未知
+     *
+     * @param gps
+     * @return
+     */
+    protected int runTrack(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        int rs = -1, count = 0;
+
+        long et = gps.getTimestamp() - (1000 * 60 * 20);
+        Object[] array = prevs.getQueue();
+        GpsEntity prev;
+        for(Object obj : array){
+            prev = (GpsEntity) obj;
+            if(prev.getTimestamp() < et)
+                break;
+
+
+        }
+        //for()
+        return 0;
+    }
+
+}
+package com.bsth.data.gpsdata.arrival.entity;
+
+/** 路由反转
+ * Created by panzhao on 2016/12/28.
+ */
+public class RouteReverse {
+
+    //反转个数
+    private int count;
+
+    //详细 1,2,3,2,1
+    private String detail;
+
+    //掉头站点
+    private String turned;
+
+    //开始时间
+    private long st;
+
+    //掉头时间
+    private long zt;
+
+    //结束时间
+    private long et;
+
+    //是否闭合
+    private boolean close;
+
+    public int getCount() {
+        return count;
+    }
+
+    public void setCount(int count) {
+        this.count = count;
+    }
+
+    public String getDetail() {
+        return detail;
+    }
+
+    public void setDetail(String detail) {
+        this.detail = detail;
+    }
+
+    public String getTurned() {
+        return turned;
+    }
+
+    public void setTurned(String turned) {
+        this.turned = turned;
+    }
+
+    public long getSt() {
+        return st;
+    }
+
+    public void setSt(long st) {
+        this.st = st;
+    }
+
+    public long getEt() {
+        return et;
+    }
+
+    public void setEt(long et) {
+        this.et = et;
+    }
+
+    public boolean isClose() {
+        return close;
+    }
+
+    public void setClose(boolean close) {
+        this.close = close;
+    }
+
+    public long getZt() {
+        return zt;
+    }
+
+    public void setZt(long zt) {
+        this.zt = zt;
+    }
+}
-package com.bsth.data.gpsdata.analyse;
-
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-
-/**
- * Created by panzhao on 2016/12/23.
- */
-public class StationRoute {
-
-    /**
-     * 线路编码
-     */
-    private String lineCode;
-
-    /**
-     * 上下行
-     */
-    private int directions;
-
-    /**
-     * 站点编码
-     */
-    private String code;
-
-    /**
-     * 路由顺序
-     */
-    private int routeSort;
-
-    /**
-     * 站点位置
-     */
-    private Point point;
-
-    /**
-     * 圆形半径
-     */
-    private Float radius;
-
-    /**
-     * 多边形电子围栏
-     */
-    private Polygon polygon;
-
-    /**
-     * 站点标记
-     */
-    private String mark;
-
-    /**
-     * 下一站
-     */
-    private StationRoute next;
-
-    /**
-     * 上一站
-     */
-    private StationRoute prve;
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public int getRouteSort() {
-        return routeSort;
-    }
-
-    public void setRouteSort(int routeSort) {
-        this.routeSort = routeSort;
-    }
-
-    public Point getPoint() {
-        return point;
-    }
-
-    public void setPoint(Point point) {
-        this.point = point;
-    }
-
-    public Float getRadius() {
-        return radius;
-    }
-
-    public void setRadius(Float radius) {
-        this.radius = radius;
-    }
-
-    public Polygon getPolygon() {
-        return polygon;
-    }
-
-    public void setPolygon(Polygon polygon) {
-        this.polygon = polygon;
-    }
-
-    public String getLineCode() {
-        return lineCode;
-    }
-
-    public void setLineCode(String lineCode) {
-        this.lineCode = lineCode;
-    }
-
-    public int getDirections() {
-        return directions;
-    }
-
-    public void setDirections(int directions) {
-        this.directions = directions;
-    }
-
-    public StationRoute getNext() {
-        return next;
-    }
-
-    public void setNext(StationRoute next) {
-        this.next = next;
-    }
-
-    public StationRoute getPrve() {
-        return prve;
-    }
-
-    public void setPrve(StationRoute prve) {
-        this.prve = prve;
-    }
-
-    public String getMark() {
-        return mark;
-    }
-
-    public void setMark(String mark) {
-        this.mark = mark;
-    }
-}
-
+package com.bsth.data.gpsdata.arrival.entity;
+
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class StationRoute {
+
+    /**
+     * 线路编码
+     */
+    private String lineCode;
+
+    /**
+     * 上下行
+     */
+    private int directions;
+
+    /**
+     * 站点编码
+     */
+    private String code;
+
+    /**
+     * 路由顺序
+     */
+    private int routeSort;
+
+    /**
+     * 站点位置
+     */
+    private Point point;
+
+    /**
+     * 圆形半径
+     */
+    private Float radius;
+
+    /**
+     * 多边形电子围栏
+     */
+    private Polygon polygon;
+
+    /**
+     * 站点标记
+     */
+    private String mark;
+
+    /**
+     * 下一站
+     */
+    private StationRoute next;
+
+    /**
+     * 上一站
+     */
+    private StationRoute prve;
+
+    private String name;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public int getRouteSort() {
+        return routeSort;
+    }
+
+    public void setRouteSort(int routeSort) {
+        this.routeSort = routeSort;
+    }
+
+    public Point getPoint() {
+        return point;
+    }
+
+    public void setPoint(Point point) {
+        this.point = point;
+    }
+
+    public Float getRadius() {
+        return radius;
+    }
+
+    public void setRadius(Float radius) {
+        this.radius = radius;
+    }
+
+    public Polygon getPolygon() {
+        return polygon;
+    }
+
+    public void setPolygon(Polygon polygon) {
+        this.polygon = polygon;
+    }
+
+    public String getLineCode() {
+        return lineCode;
+    }
+
+    public void setLineCode(String lineCode) {
+        this.lineCode = lineCode;
+    }
+
+    public int getDirections() {
+        return directions;
+    }
+
+    public void setDirections(int directions) {
+        this.directions = directions;
+    }
+
+    public StationRoute getNext() {
+        return next;
+    }
+
+    public void setNext(StationRoute next) {
+        this.next = next;
+    }
+
+    public StationRoute getPrve() {
+        return prve;
+    }
+
+    public void setPrve(StationRoute prve) {
+        this.prve = prve;
+    }
+
+    public String getMark() {
+        return mark;
+    }
+
+    public void setMark(String mark) {
+        this.mark = mark;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}
+
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.ChildTaskPlan;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 信号状态纠正
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class CorrectSignalHandle extends SignalHandle {
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        Object task = dayOfSchedule.executeCurr(gps.getNbbm());
+        if(task == null)
+            return false;
+        ScheduleRealInfo sch;
+
+        //子任务
+        if(task.getClass().isAssignableFrom(ChildTaskPlan.class)){
+            ChildTaskPlan childTask = (ChildTaskPlan) task;
+            sch = childTask.getSchedule();
+        }
+        else
+            sch = (ScheduleRealInfo) task;
+
+        int updown = Integer.parseInt(sch.getXlDir());
+        //走向
+        if(gps.getUpDown() != updown){
+            gps.setUpDown(updown);
+            gps.setState(0);
+        }
+
+
+        return true;
+    }
+}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.LineConfigData;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import com.bsth.data.schedule.DayOfSchedule;
+import com.bsth.entity.realcontrol.LineConfig;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
+import com.bsth.service.directive.DirectiveService;
+import com.bsth.websocket.handler.SendUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 进出站动作处理
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class InOutStationSignalHandle extends SignalHandle{
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Autowired
+    LineConfigData lineConfigData;
+
+    @Autowired
+    SendUtils sendUtils;
+
+    @Autowired
+    DirectiveService directiveService;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+
+        if(isNotEmpty(prevs)){
+            GpsEntity prev = prevs.getTail();
+            if(isOutStation(gps, prev))
+                outStation(gps, prev);
+
+
+            if(isInStation(gps, prev))
+                inStation(gps, prev);
+        }
+
+        return true;
+    }
+
+    private boolean isOutStation(GpsEntity gps, GpsEntity prev){
+        //从站内到站外
+        if(prev.getInstation() > 0 && gps.getInstation() == 0)
+            return true;
+
+        //从站内到另一个站内
+        if(prev.getInstation() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            return true;
+        return false;
+    }
+
+    private boolean isInStation(GpsEntity gps, GpsEntity prev){
+        //从站外到站内
+        if(prev.getInstation() == 0 && gps.getInstation() > 0
+                /*&& !prev.getStopNo().equals(gps.getStopNo())*/){
+            return true;
+        }
+
+        //从站内到另一个站内
+        if(prev.getInstation() > 0 && gps.getInstation() > 0
+                && !prev.getStopNo().equals(gps.getStopNo()))
+            return true;
+        return false;
+    }
+
+    /**
+     * 出站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void outStation(GpsEntity gps, GpsEntity prev) {
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        String qdzCode = sch.getQdzCode();
+
+
+        //if(sch.getFcsjActual() != )
+
+        //起点发车
+        if(qdzCode != null && prev.getStopNo().equals(qdzCode)
+                && !willDepart(gps, prev, sch)){
+
+            sch.setFcsjActualAll(gps.getTimestamp());
+            //通知客户端
+            sendUtils.sendFcsj(sch);
+            //持久化
+            dayOfSchedule.save(sch);
+
+            //出站既出场
+            outStationAndOutPark(sch);
+            logger.info("班次：" + sch.getDfsj() + "发车， 时间：" + sch.getFcsjActual());
+        }
+    }
+
+    private void outStationAndOutPark(ScheduleRealInfo sch){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (config != null && config.getOutConfig() == 2) {
+            //出站既出场
+            ScheduleRealInfo schPrev = dayOfSchedule.prev(sch);
+            if (schPrev != null && schPrev.getBcType().equals("out")) {
+                schPrev.setFcsjActualAll(sch.getFcsjActual());
+                schPrev.setZdsjActualAll(sch.getFcsjActual());
+            }
+        }
+    }
+
+    /**
+     * 进站
+     * @param gps 当前点
+     * @param prev 上一个点
+     */
+    private void inStation(GpsEntity gps, GpsEntity prev){
+        ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+        String zdzCode = sch.getZdzCode();
+
+        if(zdzCode != null && gps.getStopNo().equals(zdzCode)){
+
+            sch.setZdsjActualAll(gps.getTimestamp());
+            //已完成班次数
+            int doneSum = dayOfSchedule.doneSum(sch.getClZbh());
+            ScheduleRealInfo next = dayOfSchedule.next(sch);
+            //通知客户端
+            sendUtils.sendZdsj(sch, next, doneSum);
+            //持久化
+            dayOfSchedule.save(sch);
+            //下发调度指令
+            //directiveService.send60Dispatch(next, doneSum, "到站@系统");
+
+            //准备执行下一个班次
+            if (next != null) {
+                next.setQdzArrDatesj(sch.getZdsjActual());
+                dayOfSchedule.addExecPlan(next);
+
+                //进站既进场
+                inStationAndInPark(sch, next);
+
+                //将gps转换为下一个班次走向的站内信号
+                int updown = Integer.parseInt(next.getXlDir());
+                List<StationRoute> srs = GeoCacheData.getStationRoute(next.getXlBm(), updown);
+                StationRoute station = GeoUtils.gpsInStation(gps, srs);
+                if (station != null) {
+                    gps.setUpDown(updown);
+                    gps.setStopNo(station.getCode());
+                }
+            }
+        }
+       /* //如果出场班次计划终点时间5分钟后还未完成，检查一下车辆轨迹，是否已经在执行线路上班次
+        else if(sch.getBcType().equals("out")
+                && sch.getZdsj() != null
+                && gps.getTimestamp() - sch.getZdsjT() >= 1000 * 60 * 5){
+            logger.info("出场班次计划终点时间5分钟后还未完成");
+
+        }*/
+    }
+
+    /**
+     * 进站既进场
+     * @param sch
+     */
+    private void inStationAndInPark(ScheduleRealInfo sch, ScheduleRealInfo next){
+        LineConfig config = lineConfigData.get(sch.getXlBm());
+        if (next.getBcType().equals("in") &&
+                config != null && config.getOutConfig() == 2) {
+            next.setFcsjActualAll(sch.getZdsjActual());
+            next.setZdsjActualAll(sch.getZdsjActual());
+        }
+    }
+
+    /**
+     * 发车漂移判定（这里出现的误判，由车辆到达中途站的时候补偿）
+     * @param gps
+     * @param prev
+     * @param task
+     * @return
+     */
+    private boolean willDepart(GpsEntity gps, GpsEntity prev, Object task){
+
+/*        ScheduleRealInfo sch = (ScheduleRealInfo) task;
+        ScheduleRealInfo prevTask = dayOfSchedule.prev(sch);
+        if(prevTask == null || prevTask.getBcType().equals("out"))
+            return false;
+
+        //计划停站时间
+        int stopTimePlan = (int) (sch.getDfsjT() - prevTask.getZdsjT());
+
+        if(stopTimePlan < 1000 * 60 * 10)
+            return false;
+
+        //实际停站时间
+        if(prevTask.getZdsjActual() != null){
+            int actualTime = (int) (gps.getTimestamp() - prevTask.getZdsjActualTime());
+
+            if(actualTime < stopTimePlan * 0.8){
+                logger.info("漂移判定");
+
+                return true;
+            }
+        }*/
+        return false;
+    }
+}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import org.springframework.stereotype.Component;
+
+/**
+ * 信号断线重连处理
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class OfflineSignalHandle extends SignalHandle{
+
+    //断开3分钟，标记为重连信号
+    private final static int OFFLINE_TIME = 1000 * 60 * 3;
+
+    //断开70分钟，之前的信号不再有参考价值
+    private final static int CLEAR_TIME = 1000 * 60 * 70;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //异常信号不管
+        if(isAbnormal(gps)){
+            return true;
+        }
+
+        if(isNotEmpty(prevs)){
+            GpsEntity prev = prevs.getTail();
+            int space = (int) (gps.getTimestamp() - prev.getTimestamp());
+            if(space > OFFLINE_TIME)
+                gps.setSignalState("reconnection");
+
+            if(space > CLEAR_TIME){
+                //清理缓存的信号
+                GeoCacheData.clear(gps.getNbbm());
+            }
+        }
+        return true;
+    }
+}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.alibaba.fastjson.JSON;
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.RouteReverse;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+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;
+
+/**
+ * 路由反向信号处理
+ * Created by panzhao on 2016/12/28.
+ */
+@Component
+public class ReverseSignalHandle extends SignalHandle {
+
+    Logger logger = LoggerFactory.getLogger(this.getClass());
+
+    @Autowired
+    DayOfSchedule dayOfSchedule;
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        if (!isNotEmpty(prevs))
+            return false;
+
+        GpsEntity prev = prevs.getTail();
+
+        if (isReverse(gps, prev)) {
+            RouteReverse reverse = reverseSearch(prevs, gps);
+
+            if (reverse.getCount() >= 2) {
+                //切换到下一个班次
+                ScheduleRealInfo sch = dayOfSchedule.executeCurr(gps.getNbbm());
+                if (sch.getBcType().equals("out") && sch.getZdsjT() != null && sch.getZdsjT() > gps.getTimestamp()) {
+                    return false;
+                }
+                dayOfSchedule.addExecPlan(dayOfSchedule.next(sch));
+
+                if (reverse.isClose()) {
+                    logger.info("区间掉头，车辆：" + gps.getNbbm() + " -" + JSON.toJSONString(reverse));
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 搜索路由反向详细
+     *
+     * @param prevs
+     * @param gps
+     * @return
+     */
+    public RouteReverse reverseSearch(CircleQueue<GpsEntity> prevs, GpsEntity gps) {
+        RouteReverse routeReverse = new RouteReverse();
+        int count = 0;
+        String path = "";
+        String turned = null;
+
+        //当前站点
+        StationRoute curr = GeoCacheData.getRouteCode(gps), sr;
+        GpsEntity prev;
+        Object[] array = prevs.getQueue();
+        for (int i = array.length - 1; i > 0; i--) {
+            prev = (GpsEntity) array[i];
+
+            if(!prev.getUpDown().equals(gps.getUpDown()))
+                break;
+
+            if (prev.getInstation() == 1) {
+                sr = GeoCacheData.getRouteCode(prev);
+
+                if (sr.getRouteSort() > curr.getRouteSort()) {
+                    path += (curr.getCode() + ",");
+                    count++;
+                } else if (sr.getRouteSort() < curr.getRouteSort()) {
+                    path += (curr.getCode() + ",");
+                    //掉头点
+                    if (turned == null)
+                        turned = prev.getStopNo();
+
+                    //路径闭合
+                    if (sr.getCode().equals(gps.getStopNo())) {
+                        routeReverse.setClose(true);
+                        path += sr.getCode();
+                        break;
+                    }
+                }
+
+                curr = sr;
+            }
+        }
+
+        routeReverse.setCount(count);
+        routeReverse.setDetail(path);
+        routeReverse.setTurned(turned);
+        return routeReverse;
+    }
+
+    /**
+     * 是否反向
+     *
+     * @param gps
+     * @param prev
+     * @return
+     */
+    public boolean isReverse(GpsEntity gps, GpsEntity prev) {
+        if (gps.getInstation() == 1
+                &&
+                gps.getUpDown().equals(prev.getUpDown())
+                && !gps.getStopNo().equals(prev.getStopNo())) {
+
+            StationRoute currStation = GeoCacheData.getRouteCode(gps);
+            StationRoute prevStation = GeoCacheData.getRouteCode(prev);
+
+            if (currStation == null || prevStation == null)
+                return false;
+
+            if (currStation.getRouteSort() < prevStation.getRouteSort())
+                return true;
+        }
+        return false;
+    }
+}
+package com.bsth.data.gpsdata.arrival.handlers;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.SignalHandle;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
+import com.bsth.data.gpsdata.arrival.utils.GeoUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * 站内站外判定
+ * Created by panzhao on 2016/12/27.
+ */
+@Component
+public class StationInsideHandle extends SignalHandle {
+
+
+    @Override
+    public boolean handle(GpsEntity gps, CircleQueue<GpsEntity> prevs) {
+        //是否在场内
+        String parkCode = GeoUtils.gpsInCarpark(gps);
+        if (parkCode != null) {
+            gps.setInstation(2);
+            gps.setStopNo(parkCode);
+        }
+
+        //是否在站内
+        List<StationRoute> srs = GeoCacheData.getStationRoute(gps.getLineId(), gps.getUpDown());
+        StationRoute station = GeoUtils.gpsInStation(gps, srs);
+        if (station != null) {
+            gps.setInstation(1);
+            gps.setStopNo(station.getCode());
+            gps.setStation(station);
+        }
+
+        //在场，站外
+        if(gps.getInstation() == 0 && isNotEmpty(prevs)){
+            //继承上一个点的站点编码
+            GpsEntity prev = prevs.getTail();
+            gps.setStopNo(prev.getStopNo());
+        }
+
+        return true;
+    }
+}
-package com.bsth.data.gpsdata.analyse;
-
-import java.util.Arrays;
-
-/**
- * 循环队列
- * Created by panzhao on 2016/12/23.
- */
-public class CircleQueue<T> {
-
-    /**
-     * (循环队列)数组的容量
-     */
-    public int capacity;
-
-    /**
-     * 数组：保存循环队列的元素
-     */
-    public Object[] elementData;
-
-    /**
-     * 队头(先进先出)
-     */
-    public int head = 0;
-
-    /**
-     * 队尾
-     */
-    public int tail = 0;
-
-    /**
-     * 以指定长度的数组来创建循环队列
-     *
-     * @param initSize
-     */
-    public CircleQueue(final int initSize) {
-        capacity = initSize;
-        elementData = new Object[capacity];
-    }
-
-    /**
-     * 获取循环队列的大小(包含元素的个数)
-     */
-    public int size() {
-        if (isEmpty()) {
-            return 0;
-        } else if (isFull()) {
-            return capacity;
-        } else {
-            return tail + 1;
-        }
-    }
-
-    /**
-     * 插入队尾一个元素
-     */
-    public void add(final T element) {
-        if (isEmpty()) {
-            elementData[0] = element;
-        } else if (isFull()) {
-            elementData[head] = element;
-            head++;
-            tail++;
-            head = head == capacity ? 0 : head;
-            tail = tail == capacity ? 0 : tail;
-        } else {
-            elementData[tail + 1] = element;
-            tail++;
-        }
-    }
-
-    public boolean isEmpty() {
-        return tail == head && tail == 0 && elementData[tail] == null;
-    }
-
-    public boolean isFull() {
-        return head != 0 && head - tail == 1 || head == 0 && tail == capacity - 1;
-    }
-
-    public void clear() {
-        Arrays.fill(elementData, null);
-        head = 0;
-        tail = 0;
-    }
-
-    /**
-     * @return 取 循环队列里的值（先进的index=0）
-     */
-    public Object[] getQueue() {
-        final Object[] elementDataSort = new Object[capacity];
-        final Object[] elementDataCopy = elementData.clone();
-        if (isEmpty()) {
-        } else if (isFull()) {
-            int indexMax = capacity;
-            int indexSort = 0;
-            for (int i = head; i < indexMax;) {
-                elementDataSort[indexSort] = elementDataCopy[i];
-                indexSort++;
-                i++;
-                if (i == capacity) {
-                    i = 0;
-                    indexMax = head;
-                }
-            }
-        } else {
-            for (int i = 0; i < tail; i++) {
-                elementDataSort[i] = elementDataCopy[i];
-            }
-        }
-        return elementDataSort;
-    }
-
-    public T getTail(){
-        return elementData[tail] == null?null:(T)elementData[tail];
-    }
+package com.bsth.data.gpsdata.arrival.utils;
+
+import java.util.Arrays;
+
+/**
+ * 循环队列
+ * Created by panzhao on 2016/12/23.
+ */
+public class CircleQueue<T> {
+
+    /**
+     * (循环队列)数组的容量
+     */
+    public int capacity;
+
+    /**
+     * 数组：保存循环队列的元素
+     */
+    public Object[] elementData;
+
+    /**
+     * 头
+     */
+    public int head = 0;
+
+    /**
+     * 尾
+     */
+    public int tail = 0;
+
+    /**
+     * 以指定长度的数组来创建循环队列
+     *
+     * @param initSize
+     */
+    public CircleQueue(final int initSize) {
+        capacity = initSize;
+        elementData = new Object[capacity];
+    }
+
+    /**
+     * 获取循环队列的大小
+     */
+    public int size() {
+        if (isEmpty()) {
+            return 0;
+        } else if (isFull()) {
+            return capacity;
+        } else {
+            return tail + 1;
+        }
+    }
+
+    /**
+     * 插入队尾一个元素
+     */
+    public void add(final T element) {
+        if (isEmpty()) {
+            elementData[0] = element;
+        } else if (isFull()) {
+            elementData[head] = element;
+            head++;
+            tail++;
+            head = head == capacity ? 0 : head;
+            tail = tail == capacity ? 0 : tail;
+        } else {
+            elementData[tail + 1] = element;
+            tail++;
+        }
+    }
+
+    public boolean isEmpty() {
+        return tail == head && tail == 0 && elementData[tail] == null;
+    }
+
+    public boolean isFull() {
+        return head != 0 && head - tail == 1 || head == 0 && tail == capacity - 1;
+    }
+
+    public void clear() {
+        Arrays.fill(elementData, null);
+        head = 0;
+        tail = 0;
+    }
+
+    /**
+     * @return 取 循环队列里的值（先进的index=0）
+     */
+    public Object[] getQueue() {
+        final Object[] elementDataSort;
+        final Object[] elementDataCopy = elementData.clone();
+        if (isEmpty()) {
+            elementDataSort = new Object[0];
+        } else if (isFull()) {
+            elementDataSort = new Object[capacity];
+            int indexMax = capacity;
+            int indexSort = 0;
+            for (int i = head; i < indexMax;) {
+                elementDataSort[indexSort] = elementDataCopy[i];
+                indexSort++;
+                i++;
+                if (i == capacity) {
+                    i = 0;
+                    indexMax = head;
+                }
+            }
+        } else {
+            elementDataSort = new Object[tail];
+            for (int i = 0; i < tail; i++) {
+                elementDataSort[i] = elementDataCopy[i];
+            }
+        }
+        return elementDataSort;
+    }
+
+    /**
+     * 取最后一个值
+     * @return
+     */
+    public T getTail(){
+        return elementData[tail] == null?null:(T)elementData[tail];
+    }
 }
 \ No newline at end of file
-package com.bsth.data.gpsdata.analyse.util;
-
-import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.GeoCacheData;
-import com.bsth.data.gpsdata.analyse.StationRoute;
-import com.vividsolutions.jts.geom.Coordinate;
-import com.vividsolutions.jts.geom.GeometryFactory;
-import com.vividsolutions.jts.geom.Point;
-import com.vividsolutions.jts.geom.Polygon;
-
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Created by panzhao on 2016/12/23.
- */
-public class GeoUtils {
-
-    private final static double EARTHRADIUS = 6378137;
-
-    private static GeometryFactory geometryFactory = new GeometryFactory();
-    /**
-     * gps是否在路由上的某个站内
-     *
-     * @param gps
-     * @param srs
-     * @return
-     */
-    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-        double min = -1, distance, distance2;
-        StationRoute stationRoute = null;
-
-        for (StationRoute sr : srs) {
-            if (sr.getPolygon() == null) {
-                //圆形
-                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
-
-                if (distance > sr.getRadius())
-                    continue;
-
-                if (min > distance || min == -1) {
-                    min = distance;
-                    stationRoute = sr;
-                }
-            } else {
-                //多边形
-                if (sr.getPolygon().contains(point)) {
-                    stationRoute = sr;
-                    break;
-                }
-            }
-        }
-        return stationRoute;
-    }
-
-    public static double getDistance(Point p1, Point p2) {
-        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
-                p1.getX(), -74, 74);
-        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
-                p2.getX(), -74, 74);
-
-        double x1, x2, y1, y2;
-        x1 = degreeToRad(lng1);
-        y1 = degreeToRad(lat1);
-        x2 = degreeToRad(lng2);
-        y2 = degreeToRad(lat2);
-        return EARTHRADIUS
-                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
-                * Math.cos(y2) * Math.cos(x2 - x1)));
-    }
-
-    private static double getLoop(double v, double a, double b) {
-        while (v > b) {
-            v -= b - a;
-        }
-        while (v < a) {
-            v += b - a;
-        }
-        return v;
-    }
-
-    private static double getRange(double v, double a, double b) {
-        v = Math.min(Math.max(v, a), b);
-        return v;
-    }
-
-    private static double degreeToRad(double degree) {
-        return Math.PI * degree / 180;
-    }
-
-
-    /**
-     * gps 是否在某个停车场内
-     * @param gps
-     * @return
-     */
-    public static String gpsInCarpark(GpsEntity gps){
-        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
-
-        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
-        Set<String> codes = carparkMap.keySet();
-        Polygon polygon;
-        for(String code : codes){
-            polygon = carparkMap.get(code);
-            if(point.within(polygon)){
-                return code;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * 是否是有效的连续点
-     * @param prevGps
-     * @param gps
-     * @return
-     */
-    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
-        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
-    }
-}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.GpsEntity;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+import com.vividsolutions.jts.geom.Coordinate;
+import com.vividsolutions.jts.geom.GeometryFactory;
+import com.vividsolutions.jts.geom.Point;
+import com.vividsolutions.jts.geom.Polygon;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * Created by panzhao on 2016/12/23.
+ */
+public class GeoUtils {
+
+    private final static double EARTHRADIUS = 6378137;
+
+    private static GeometryFactory geometryFactory = new GeometryFactory();
+    /**
+     * gps是否在路由上的某个站内
+     *
+     * @param gps
+     * @param srs
+     * @return
+     */
+    public static StationRoute gpsInStation(GpsEntity gps, List<StationRoute> srs) {
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+        double min = -1, distance, distance2;
+        StationRoute stationRoute = null;
+
+        for (StationRoute sr : srs) {
+            if (sr.getPolygon() == null) {
+                //圆形
+                distance = getDistance(sr.getPoint(), point);//sr.getPoint().distance(point);
+
+                if (distance > sr.getRadius())
+                    continue;
+
+                if (min > distance || min == -1) {
+                    min = distance;
+                    stationRoute = sr;
+                }
+            } else {
+                //多边形
+                if (sr.getPolygon().contains(point)) {
+                    stationRoute = sr;
+                    break;
+                }
+            }
+        }
+        return stationRoute;
+    }
+
+    public static double getDistance(Point p1, Point p2) {
+        double lng1 = getLoop(p1.getY(), -180, 180), lat1 = getRange(
+                p1.getX(), -74, 74);
+        double lng2 = getLoop(p2.getY(), -180, 180), lat2 = getRange(
+                p2.getX(), -74, 74);
+
+        double x1, x2, y1, y2;
+        x1 = degreeToRad(lng1);
+        y1 = degreeToRad(lat1);
+        x2 = degreeToRad(lng2);
+        y2 = degreeToRad(lat2);
+        return EARTHRADIUS
+                * Math.acos((Math.sin(y1) * Math.sin(y2) + Math.cos(y1)
+                * Math.cos(y2) * Math.cos(x2 - x1)));
+    }
+
+    private static double getLoop(double v, double a, double b) {
+        while (v > b) {
+            v -= b - a;
+        }
+        while (v < a) {
+            v += b - a;
+        }
+        return v;
+    }
+
+    private static double getRange(double v, double a, double b) {
+        v = Math.min(Math.max(v, a), b);
+        return v;
+    }
+
+    private static double degreeToRad(double degree) {
+        return Math.PI * degree / 180;
+    }
+
+
+    /**
+     * gps 是否在某个停车场内
+     * @param gps
+     * @return
+     */
+    public static String gpsInCarpark(GpsEntity gps){
+        Point point = geometryFactory.createPoint(new Coordinate(gps.getLat(), gps.getLon()));
+
+        Map<String, Polygon> carparkMap = GeoCacheData.tccMap;
+        Set<String> codes = carparkMap.keySet();
+        Polygon polygon;
+        for(String code : codes){
+            polygon = carparkMap.get(code);
+            if(point.within(polygon)){
+                return code;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 是否是有效的连续点
+     * @param prevGps
+     * @param gps
+     * @return
+     */
+    public static boolean overdue(GpsEntity prevGps, GpsEntity gps) {
+        return gps.getTimestamp() - prevGps.getTimestamp() < 120000;
+    }
+}
-package com.bsth.data.gpsdata.analyse;
-
-import java.util.Comparator;
-
-/**
- * Created by panzhao on 2016/12/24.
- */
-public class StationRouteComp implements Comparator<StationRoute>{
-    @Override
-    public int compare(StationRoute s1, StationRoute s2) {
-        return s1.getRouteSort() - s2.getRouteSort();
-    }
-}
+package com.bsth.data.gpsdata.arrival.utils;
+
+import com.bsth.data.gpsdata.arrival.entity.StationRoute;
+
+import java.util.Comparator;
+
+/**
+ * Created by panzhao on 2016/12/24.
+ */
+public class StationRouteComp implements Comparator<StationRoute>{
+    @Override
+    public int compare(StationRoute s1, StationRoute s2) {
+        return s1.getRouteSort() - s2.getRouteSort();
+    }
+}
@@ -2,13 +2,19 @@ package com.bsth.data.gpsdata.recovery;
  
 import com.bsth.data.BasicData;
 import com.bsth.data.gpsdata.GpsEntity;
-import com.bsth.data.gpsdata.analyse.components.GpsArrival;
+import com.bsth.data.gpsdata.arrival.GeoCacheData;
+import com.bsth.data.gpsdata.arrival.handlers.*;
+import com.bsth.data.gpsdata.arrival.utils.CircleQueue;
 import com.bsth.util.db.DBUtils_MS;
 import com.google.common.collect.ArrayListMultimap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
+import org.springframework.stereotype.Component;
  
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -18,20 +24,25 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
  
 /**
- * 数据恢复
+ * gps数据恢复
  * Created by panzhao on 2016/12/24.
  */
-public class GpsDataRecovery {
+@Component
+public class GpsDataRecovery implements ApplicationContextAware{
  
     static Logger logger = LoggerFactory.getLogger(GpsDataRecovery.class);
  
     public static boolean run;
  
-    static ExecutorService threadPool = Executors.newFixedThreadPool(50);
+    static ExecutorService threadPool = Executors.newFixedThreadPool(10);
  
-    private static CountDownLatch count;
+    static OfflineSignalHandle offlineSignalHandle;
+    static CorrectSignalHandle correctSignalHandle;
+    static StationInsideHandle stationInsideHandle;
+    static InOutStationSignalHandle inOutStationSignalHandle;
+    static ReverseSignalHandle reverseSignalHandle;
  
-    public static void recovery() {
+    public void recovery() {
         List<GpsEntity> list = loadData();
  
         //按车辆分组数据
@@ -41,19 +52,20 @@ public class GpsDataRecovery {
                 listMap.put(gps.getNbbm(), gps);
         }
  
-        count = new CountDownLatch(listMap.keySet().size());
  
         Set<String> keys = listMap.keySet();
+
+        CountDownLatch count = new CountDownLatch(keys.size());
+        GpsComp comp = new GpsComp();
         for (String nbbm : keys) {
-            threadPool.execute(new RecoveryDataThread(listMap.get(nbbm), count));
-            /*if(nbbm.equals("W9H-003"))
-                new RecoveryDataThread(listMap.get(nbbm), count).run();*/
+            Collections.sort(listMap.get(nbbm), comp);
+            threadPool.execute(new RecoveryThread(listMap.get(nbbm), count));
         }
+
         try {
-            //等待子线程结束
             count.await();
-            logger.info("GPS 数据恢复完成....");
             run = false;
+            logger.info("数据恢复完成....");
         } catch (InterruptedException e) {
             logger.error("", e);
         }
@@ -64,7 +76,7 @@ public class GpsDataRecovery {
      *
      * @return
      */
-    public static List<GpsEntity> loadData() {
+    public List<GpsEntity> loadData() {
         Calendar calendar = Calendar.getInstance();
         int dayOfYear = calendar.get(Calendar.DAY_OF_YEAR);
  
@@ -103,46 +115,58 @@ public class GpsDataRecovery {
         return (((serviceState & 0x10000000) == 0x10000000) ? 1 : 0);
     }
  
-    public static class RecoveryDataThread implements Runnable {
+    @Override
+    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+        offlineSignalHandle = applicationContext.getBean(OfflineSignalHandle.class);
+        correctSignalHandle = applicationContext.getBean(CorrectSignalHandle.class);
+        stationInsideHandle = applicationContext.getBean(StationInsideHandle.class);
+        inOutStationSignalHandle = applicationContext.getBean(InOutStationSignalHandle.class);
+        reverseSignalHandle = applicationContext.getBean(ReverseSignalHandle.class);
+    }
+
+    public static class GpsComp implements Comparator<GpsEntity>{
  
+        @Override
+        public int compare(GpsEntity g1, GpsEntity g2) {
+            return g1.getTimestamp().compareTo(g2.getTimestamp());
+        }
+    }
+
+    public static class RecoveryThread implements Runnable{
         List<GpsEntity> list;
         CountDownLatch count;
  
-        public RecoveryDataThread(List<GpsEntity> list, CountDownLatch count) {
+        RecoveryThread(List<GpsEntity> list, CountDownLatch count){
             this.list = list;
             this.count = count;
         }
-
         @Override
         public void run() {
             try {
-                //排序
-                Collections.sort(list, new GpsComp());
-                //依次跑完gps
-                //int i = 0;
-                for(GpsEntity gps : list){
-                  /* i++;
-                    if(i == 4527){
-                        System.out.println("aaa");
-                    }
+                //循环gps恢复数据
+                CircleQueue<GpsEntity> prevs;
  
-                    if(gps.getTimestamp() == 1482726071000L)
-                        System.out.println("bbb");*/
-                    GpsArrival.arrival(gps);
+                for(GpsEntity gps : list){
+                    prevs = GeoCacheData.getGps(gps.getNbbm());
+                    //掉线处理
+                    offlineSignalHandle.handle(gps, prevs);
+                    //状态处理
+                    if(!correctSignalHandle.handle(gps, prevs))
+                        continue;
+                    //场，站内外判断
+                    stationInsideHandle.handle(gps, prevs);
+                    //反向处理
+                    reverseSignalHandle.handle(gps, prevs);
+                    //进出站动作处理
+                    inOutStationSignalHandle.handle(gps, prevs);
+                    GeoCacheData.putGps(gps);
                 }
-            } catch (Exception e) {
+            }catch (Exception e){
                 logger.error("", e);
-            } finally {
+            }
+            finally {
                 count.countDown();
             }
         }
     }
-
-    public static class GpsComp implements Comparator<GpsEntity>{
-
-        @Override
-        public int compare(GpsEntity g1, GpsEntity g2) {
-            return (int) (g1.getTimestamp() - g2.getTimestamp());
-        }
-    }
 }
 \ No newline at end of file
@@ -119,6 +119,9 @@ public class DayOfSchedule implements CommandLineRunner {
     @Autowired
     BasicData.BasicDataLoader dataLoader;
  
+    @Autowired
+    GpsDataRecovery gpsDataRecovery;
+
     private static DateTimeFormatter fmtyyyyMMdd = DateTimeFormat.forPattern("yyyy-MM-dd"), fmtHHmm = DateTimeFormat.forPattern("HH:mm");
  
     @Override
@@ -126,12 +129,12 @@ public class DayOfSchedule implements CommandLineRunner {
         //加载基础数据
         dataLoader.loadAllData();
         //从数据库恢复排班
-        //dataRecovery();
+        dataRecovery();
  
         //翻班线程
-        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
         //入库
-        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
+//        Application.mainServices.scheduleWithFixedDelay(schedulePstThread, 60, 60, TimeUnit.SECONDS);
         //首班出场指令补发器
 //		Application.mainServices.scheduleWithFixedDelay(firstScheduleCheckThread, 30, 240, TimeUnit.SECONDS);
         //班次误点扫描
@@ -160,7 +163,7 @@ public class DayOfSchedule implements CommandLineRunner {
         }
  
         //恢复gps数据
-        GpsDataRecovery.recovery();
+        gpsDataRecovery.recovery();
     }
  
     public Map<String, String> getCurrSchDate() {
@@ -706,7 +709,8 @@ public class DayOfSchedule implements CommandLineRunner {
     }
  
     public void addExecPlan(ScheduleRealInfo sch) {
-        carExecutePlanMap.put(sch.getClZbh(), sch);
+        if(sch != null)
+            carExecutePlanMap.put(sch.getClZbh(), sch);
     }
  
     public void removeExecPlan(String clzbh) {
@@ -723,7 +727,7 @@ public class DayOfSchedule implements CommandLineRunner {
      * @param nbbm
      * @return
      */
-    public static ScheduleRealInfo executeCurr(String nbbm) {
+    public ScheduleRealInfo executeCurr(String nbbm) {
         return carExecutePlanMap.get(nbbm);
     }
  
@@ -763,6 +767,41 @@ public class DayOfSchedule implements CommandLineRunner {
     }
  
     /**
+     * 是否在执行首班出场
+     * @param nbbm
+     * @return
+     */
+    public boolean isExecFirstOut(String nbbm, long time){
+        try {
+            List<ScheduleRealInfo> list = nbbmScheduleMap.get(nbbm);
+            ScheduleRealInfo second = list.get(2),
+                    first = executeCurr(nbbm);
+
+            if(first.getBcType().equals("out")
+                && first.getDfsjT() < second.getDfsjT()
+                && doneSum(nbbm) == 0 && second.getDfsjT() > time)
+                return true;
+        } catch (Exception e) {
+            logger.error("", e);
+        }
+
+        return false;
+    }
+
+    /**
+     * 获取班次的计划停站时间
+     * @param sch
+     * @return
+
+    public int stopTimePlan(Object task) {
+
+        ScheduleRealInfo sch = prev((ScheduleRealInfo) task);
+
+        sch.getzdsj
+        return -1;
+    }*/
+
+    /**
      *
      * @Title: linkToSchPlan
      * @Description: TODO(车辆关联到班次)
@@ -23,7 +23,7 @@ import java.util.Date;
  
 @Entity
 @Table(name = "bsth_c_cars")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class Cars extends BEntity implements Serializable {
  
 	/** 主键Id */
@@ -24,7 +24,7 @@ import java.util.Date;
  
 @Entity
 @Table(name = "bsth_c_line")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class Line implements Serializable {
  
 	@Id
@@ -21,7 +21,7 @@ import javax.persistence.*;
  
 @Entity
 @Table(name = "bsth_c_personnel")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class Personnel extends BEntity {
  
     /** 主键Id */
@@ -19,7 +19,7 @@ import java.util.Date;
                 @NamedAttributeNode("cl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class CarConfigInfo extends BEntity implements Serializable {
  
     /** 主健Id */
@@ -22,7 +22,7 @@ import java.io.Serializable;
             @NamedAttributeNode("xl")
     })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class EmployeeConfigInfo extends BEntity implements Serializable {
  
     /** 主键Id */
@@ -15,7 +15,7 @@ import javax.persistence.*;
                 @NamedAttributeNode("xl")
         })
 })
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class GuideboardInfo extends BEntity {
  
     /** 主键Id */
@@ -9,7 +9,7 @@ import java.util.Set;
  
 @Entity
 @Table(name = "bsth_c_sys_user")
-@JsonIgnoreProperties(value={"hibernateLazyInitializer","handler","fieldHandler"})
+@JsonIgnoreProperties(value={"hibernateLazyInitializer","handlers","fieldHandler"})
 public class SysUser {
  
 	@Id
@@ -20,7 +20,7 @@
 //import com.bsth.repository.realcontrol.ScheduleRealInfoRepository;
 //import com.bsth.repository.schedule.SchedulePlanInfoRepository;
 //import com.bsth.util.BatchSaveUtils;
-//import com.bsth.websocket.handler.RealControlSocketHandler;
+//import com.bsth.websocket.handlers.RealControlSocketHandler;
 //
 ///**
 // * 
@@ -2625,7 +2625,7 @@ angular.module(&#39;ui.bootstrap.dropdown&#39;, [&#39;ui.bootstrap.position&#39;])
  
   var closeDropdown = function(evt) {
     // This method may still be called during the same mouse event that
-    // unbound this event handler. So check openScope before proceeding.
+    // unbound this event handlers. So check openScope before proceeding.
     if (!openScope) { return; }
  
     if (evt && openScope.getAutoClose() === 'disabled')  { return ; }
@@ -6982,7 +6982,7 @@ angular.module(&#39;ui.bootstrap.typeahead&#39;, [&#39;ui.bootstrap.position&#39;])
           selected = false;
         });
  
-        // Keep reference to click handler to unbind it.
+        // Keep reference to click handlers to unbind it.
         var dismissClickHandler = function(evt) {
           // Issue #3973
           // Firefox treats right click as a click on document
@@ -7490,7 +7490,7 @@ angular.module(&#39;ui.bootstrap.typeahead&#39;)
           selected = false;
         });
  
-        // Keep reference to click handler to unbind it.
+        // Keep reference to click handlers to unbind it.
         var dismissClickHandler = function(evt) {
           // Issue #3973
           // Firefox treats right click as a click on document
@@ -2624,7 +2624,7 @@ angular.module(&#39;ui.bootstrap.dropdown&#39;, [&#39;ui.bootstrap.position&#39;])
  
   var closeDropdown = function(evt) {
     // This method may still be called during the same mouse event that
-    // unbound this event handler. So check openScope before proceeding.
+    // unbound this event handlers. So check openScope before proceeding.
     if (!openScope) { return; }
  
     if (evt && openScope.getAutoClose() === 'disabled')  { return ; }
@@ -6981,7 +6981,7 @@ angular.module(&#39;ui.bootstrap.typeahead&#39;, [&#39;ui.bootstrap.position&#39;])
           selected = false;
         });
  
-        // Keep reference to click handler to unbind it.
+        // Keep reference to click handlers to unbind it.
         var dismissClickHandler = function(evt) {
           // Issue #3973
           // Firefox treats right click as a click on document
@@ -7489,7 +7489,7 @@ angular.module(&#39;ui.bootstrap.typeahead&#39;)
           selected = false;
         });
  
-        // Keep reference to click handler to unbind it.
+        // Keep reference to click handlers to unbind it.
         var dismissClickHandler = function(evt) {
           // Issue #3973
           // Firefox treats right click as a click on document
@@ -47,7 +47,7 @@ export default (FileDirective) =&gt; {
         getFilters() {
         }
         /**
-         * Event handler
+         * Event handlers
          */
         onDrop(event) {
             var transfer = this._getTransfer(event);
@@ -59,7 +59,7 @@ export default (FileDirective) =&gt; {
             this.uploader.addToQueue(transfer.files, options, filters);
         }
         /**
-         * Event handler
+         * Event handlers
          */
         onDragOver(event) {
             var transfer = this._getTransfer(event);
@@ -69,7 +69,7 @@ export default (FileDirective) =&gt; {
             forEach(this.uploader._directives.over, this._addOverClass, this);
         }
         /**
-         * Event handler
+         * Event handlers
          */
         onDragLeave(event) {
             if(event.currentTarget === this.element[0]) return;
@@ -56,7 +56,7 @@ export default (FileDirective) =&gt; {
             return !!this.element.attr('multiple');
         }
         /**
-         * Event handler
+         * Event handlers
          */
         onChange() {
             var files = this.uploader.isHTML5 ? this.element[0].files : this.element[0];
@@ -526,7 +526,7 @@ export default (fileUploaderOptions, $rootScope, $http, $window, FileLikeObject,
                     // Note that if non standard 4xx or 5xx error code returned
                     // from WS then response content can be accessed without error
                     // but 'XHR' status becomes 200. In order to avoid confusion
-                    // returning response via same 'success' event handler.
+                    // returning response via same 'success' event handlers.
  
                     // fixed angular.contents() for iframes
                     html = iframe[0].contentDocument.body.innerHTML;
@@ -229,7 +229,7 @@ angular.mock.$ExceptionHandlerProvider = function() {
    *            mode stores an array of errors in `$exceptionHandler.errors`, to allow later
    *            assertion of them. See {@link ngMock.$log#assertEmpty assertEmpty()} and
    *            {@link ngMock.$log#reset reset()}
-   *   - `rethrow`: If any errors are passed to the handler in tests, it typically means that there
+   *   - `rethrow`: If any errors are passed to the handlers in tests, it typically means that there
    *                is a bug in the application or test, so this mock will make these tests fail.
    *                For any implementations that expect exceptions to be thrown, the `rethrow` mode
    *                will also maintain a log of thrown errors.
@@ -277,10 +277,10 @@ ngTouch.directive(&#39;ngClick&#39;, [&#39;$parse&#39;, &#39;$timeout&#39;, &#39;$rootElement&#39;,
   // - element's touchstart: Starts a touch
   // (- touchcancel ends the touch, no click follows)
   // - element's touchend: Determines if the tap is valid (didn't move too far away, didn't hold
-  //   too long) and fires the user's tap handler. The touchend also calls preventGhostClick().
+  //   too long) and fires the user's tap handlers. The touchend also calls preventGhostClick().
   // - preventGhostClick() removes the allowable region the global touchstart created.
   // - The browser generates a click event.
-  // - The global click handler catches the click, and checks whether it was in an allowable region.
+  // - The global click handlers catches the click, and checks whether it was in an allowable region.
   //     - If preventGhostClick was called, the region will have been removed, the click is busted.
   //     - If the region is still there, the click proceeds normally. Therefore clicks on links and
   //       other elements without ngTap on them work normally.
@@ -313,7 +313,7 @@ ngTouch.directive(&#39;ngClick&#39;, [&#39;$parse&#39;, &#39;$timeout&#39;, &#39;$rootElement&#39;,
     return false; // No allowable region; bust it.
   }
  
-  // Global click handler that prevents the click if it's in a bustable zone and preventGhostClick
+  // Global click handlers that prevents the click if it's in a bustable zone and preventGhostClick
   // was called recently.
   function onClick(event) {
     if (Date.now() - lastPreventedTime > PREVENT_DURATION) {
@@ -359,7 +359,7 @@ ngTouch.directive(&#39;ngClick&#39;, [&#39;$parse&#39;, &#39;$timeout&#39;, &#39;$rootElement&#39;,
   }
  
  
-  // Global touchstart handler that creates an allowable region for a click event.
+  // Global touchstart handlers that creates an allowable region for a click event.
   // This allowable region can be removed by preventGhostClick if we want to bust it.
   function onTouchStart(event) {
     var touches = event.touches && event.touches.length ? event.touches : [event];
@@ -466,11 +466,11 @@ ngTouch.directive(&#39;ngClick&#39;, [&#39;$parse&#39;, &#39;$timeout&#39;, &#39;$rootElement&#39;,
     // something else nearby.
     element.onclick = function(event) { };
  
-    // Actual click handler.
+    // Actual click handlers.
     // There are three different kinds of clicks, only two of which reach this point.
     // - On desktop browsers without touch events, their clicks will always come here.
     // - On mobile browsers, the simulated "fast" click will call this.
-    // - But the browser's follow-up slow click will be "busted" before it reaches this handler.
+    // - But the browser's follow-up slow click will be "busted" before it reaches this handlers.
     // Therefore it's safe to use this directive on both mobile and desktop.
     element.on('click', function(event, touchend) {
       scope.$apply(function() {
@@ -81,7 +81,7 @@ The majority of UI-Router&#39;s power is in its ability to nest states &amp; views.
     <div ui-view></div>
     <!-- We'll also add some navigation: -->
     <a ui-sref="state1">State 1</a>
-    <a ui-sref="state2">State 2</a>
+    <a ui-sref="signalState">State 2</a>
 </body>
 ```
  
@@ -96,10 +96,10 @@ The majority of UI-Router&#39;s power is in its ability to nest states &amp; views.
 <div ui-view></div>
 ```
 ```html
-<!-- partials/state2.html -->
+<!-- partials/signalState.html -->
 <h1>State 2</h1>
 <hr/>
-<a ui-sref="state2.list">Show List</a>
+<a ui-sref="signalState.list">Show List</a>
 <div ui-view></div>
 ```
  
@@ -116,7 +116,7 @@ The majority of UI-Router&#39;s power is in its ability to nest states &amp; views.
  
 >
 ```html
-<!-- partials/state2.list.html -->
+<!-- partials/signalState.list.html -->
 <h3>List of State 2 Things</h3>
 <ul>
   <li ng-repeat="thing in things">{{ thing }}</li>
@@ -146,13 +146,13 @@ myApp.config(function($stateProvider, $urlRouterProvider) {
         $scope.items = ["A", "List", "Of", "Items"];
       }
     })
-    .state('state2', {
-      url: "/state2",
-      templateUrl: "partials/state2.html"
+    .state('signalState', {
+      url: "/signalState",
+      templateUrl: "partials/signalState.html"
     })
-    .state('state2.list', {
+    .state('signalState.list', {
       url: "/list",
-      templateUrl: "partials/state2.list.html",
+      templateUrl: "partials/signalState.list.html",
       controller: function($scope) {
         $scope.things = ["A", "Set", "Of", "Things"];
       }
@@ -1843,14 +1843,14 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
    * @methodOf ui.router.router.$urlRouterProvider
    *
    * @description
-   * Registers a handler for a given url matching. if handle is a string, it is
+   * Registers a handlers for a given url matching. if handle is a string, it is
    * treated as a redirect, and is interpolated according to the syntax of match
    * (i.e. like `String.replace()` for `RegExp`, or like a `UrlMatcher` pattern otherwise).
    *
-   * If the handler is a function, it is injectable. It gets invoked if `$location`
+   * If the handlers is a function, it is injectable. It gets invoked if `$location`
    * matches. You have the option of inject the match object as `$match`.
    *
-   * The handler can return
+   * The handlers can return
    *
    * - **falsy** to indicate that the rule didn't match after all, then `$urlRouter`
    *   will continue trying to find another one that matches.
@@ -1879,7 +1879,7 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
     if (isString(what)) what = $urlMatcherFactory.compile(what);
  
     if (!handlerIsString && !isFunction(handler) && !isArray(handler))
-      throw new Error("invalid 'handler' in when()");
+      throw new Error("invalid 'handlers' in when()");
  
     var strategies = {
       matcher: function (what, handler) {
@@ -1928,7 +1928,7 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
    * If you wish to customize the behavior of syncing the URL (for example, if you wish to
    * defer a transition but maintain the current URL), call this method at configuration time.
    * Then, at run time, call `$urlRouter.listen()` after you have configured your own
-   * `$locationChangeSuccess` event handler.
+   * `$locationChangeSuccess` event handlers.
    *
    * @example
    * <pre>
@@ -1947,7 +1947,7 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
    *     // UserService is an example service for managing user state
    *     if (UserService.isLoggedIn()) return;
    *
-   *     // Prevent $urlRouter's default handler from firing
+   *     // Prevent $urlRouter's default handlers from firing
    *     e.preventDefault();
    *
    *     UserService.handleLogin().then(function() {
@@ -2914,7 +2914,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
         return null;
       }
  
-      // Allow the handler to return a promise to defer state lookup retry
+      // Allow the handlers to return a promise to defer state lookup retry
       if (options.$retry) {
         $urlRouter.update();
         return TransitionFailed;
@@ -4,4 +4,4 @@
  * @link http://angular-ui.github.com/
  * @license MIT License, http://www.opensource.org/licenses/MIT
  */
-"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return N(new(N(function(){},{prototype:a})),b)}function e(a){return M(arguments,function(b){b!==a&&M(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a){if(Object.keys)return Object.keys(a);var b=[];return M(a,function(a,c){b.push(c)}),b}function h(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=0>d?Math.ceil(d):Math.floor(d),0>d&&(d+=c);c>d;d++)if(d in a&&a[d]===b)return d;return-1}function i(a,b,c,d){var e,i=f(c,d),j={},k=[];for(var l in i)if(i[l].params&&(e=g(i[l].params),e.length))for(var m in e)h(k,e[m])>=0||(k.push(e[m]),j[e[m]]=a[e[m]]);return N({},j,b)}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return M(a,function(a){c[a]=b[a]}),c}function l(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));return M(c,function(c){c in a&&(b[c]=a[c])}),b}function m(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));for(var d in a)-1==h(c,d)&&(b[d]=a[d]);return b}function n(a,b){var c=L(a),d=c?[]:{};return M(a,function(a,e){b(a,e)&&(d[c?d.length:e]=a)}),d}function o(a,b){var c=L(a)?[]:{};return M(a,function(a,d){c[d]=b(a,d)}),c}function p(a,b){var d=1,f=2,i={},j=[],k=i,l=N(a.when(i),{$$promises:i,$$values:i});this.study=function(i){function n(a,c){if(s[c]!==f){if(r.push(c),s[c]===d)throw r.splice(0,h(r,c)),new Error("Cyclic dependency: "+r.join(" -> "));if(s[c]=d,J(a))q.push(c,[function(){return b.get(a)}],j);else{var e=b.annotate(a);M(e,function(a){a!==c&&i.hasOwnProperty(a)&&n(i[a],a)}),q.push(c,a,e)}r.pop(),s[c]=f}}function o(a){return K(a)&&a.then&&a.$$promises}if(!K(i))throw new Error("'invocables' must be an object");var p=g(i||{}),q=[],r=[],s={};return M(i,n),i=r=s=null,function(d,f,g){function h(){--u||(v||e(t,f.$$values),r.$$values=t,r.$$promises=r.$$promises||!0,delete r.$$inheritedValues,n.resolve(t))}function i(a){r.$$failure=a,n.reject(a)}function j(c,e,f){function j(a){l.reject(a),i(a)}function k(){if(!H(r.$$failure))try{l.resolve(b.invoke(e,g,t)),l.promise.then(function(a){t[c]=a,h()},j)}catch(a){j(a)}}var l=a.defer(),m=0;M(f,function(a){s.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,s[a].then(function(b){t[a]=b,--m||k()},j))}),m||k(),s[c]=l.promise}if(o(d)&&g===c&&(g=f,f=d,d=null),d){if(!K(d))throw new Error("'locals' must be an object")}else d=k;if(f){if(!o(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=l;var n=a.defer(),r=n.promise,s=r.$$promises={},t=N({},d),u=1+q.length/3,v=!1;if(H(f.$$failure))return i(f.$$failure),r;f.$$inheritedValues&&e(t,m(f.$$inheritedValues,p)),N(s,f.$$promises),f.$$values?(v=e(t,m(f.$$values,p)),r.$$inheritedValues=m(f.$$values,p),h()):(f.$$inheritedValues&&(r.$$inheritedValues=m(f.$$inheritedValues,p)),f.then(h,i));for(var w=0,x=q.length;x>w;w+=3)d.hasOwnProperty(q[w])?h():j(q[w],q[w+1],q[w+2]);return r}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function q(a,b,c){this.fromConfig=function(a,b,c){return H(a.template)?this.fromString(a.template,b):H(a.templateUrl)?this.fromUrl(a.templateUrl,b):H(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return I(a)?a(b):a},this.fromUrl=function(c,d){return I(c)&&(c=c(d)),null==c?null:a.get(c,{cache:b,headers:{Accept:"text/html"}}).then(function(a){return a.data})},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function r(a,b,e){function f(b,c,d,e){if(q.push(b),o[b])return o[b];if(!/^\w+(-+\w+)*(?:\[\])?$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(p[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");return p[b]=new P.Param(b,c,d,e),p[b]}function g(a,b,c,d){var e=["",""],f=a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&");if(!b)return f;switch(c){case!1:e=["(",")"+(d?"?":"")];break;case!0:e=["?(",")?"];break;default:e=["("+c+"|",")?"]}return f+e[0]+b+e[1]}function h(e,f){var g,h,i,j,k;return g=e[2]||e[3],k=b.params[g],i=a.substring(m,e.index),h=f?e[4]:e[4]||("*"==e[1]?".*":null),j=P.type(h||"string")||d(P.type("string"),{pattern:new RegExp(h,b.caseInsensitive?"i":c)}),{id:g,regexp:h,segment:i,type:j,cfg:k}}b=N({params:{}},K(b)?b:{});var i,j=/([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,k=/([:]?)([\w\[\]-]+)|\{([\w\[\]-]+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,l="^",m=0,n=this.segments=[],o=e?e.params:{},p=this.params=e?e.params.$$new():new P.ParamSet,q=[];this.source=a;for(var r,s,t;(i=j.exec(a))&&(r=h(i,!1),!(r.segment.indexOf("?")>=0));)s=f(r.id,r.type,r.cfg,"path"),l+=g(r.segment,s.type.pattern.source,s.squash,s.isOptional),n.push(r.segment),m=j.lastIndex;t=a.substring(m);var u=t.indexOf("?");if(u>=0){var v=this.sourceSearch=t.substring(u);if(t=t.substring(0,u),this.sourcePath=a.substring(0,m+u),v.length>0)for(m=0;i=k.exec(v);)r=h(i,!0),s=f(r.id,r.type,r.cfg,"search"),m=j.lastIndex}else this.sourcePath=a,this.sourceSearch="";l+=g(t)+(b.strict===!1?"/?":"")+"$",n.push(t),this.regexp=new RegExp(l,b.caseInsensitive?"i":c),this.prefix=n[0],this.$$paramNames=q}function s(a){N(this,a)}function t(){function a(a){return null!=a?a.toString().replace(/\//g,"%2F"):a}function e(a){return null!=a?a.toString().replace(/%2F/g,"/"):a}function f(){return{strict:p,caseInsensitive:m}}function i(a){return I(a)||L(a)&&I(a[a.length-1])}function j(){for(;w.length;){var a=w.shift();if(a.pattern)throw new Error("You cannot override a type's .pattern at runtime.");b.extend(u[a.name],l.invoke(a.def))}}function k(a){N(this,a||{})}P=this;var l,m=!1,p=!0,q=!1,u={},v=!0,w=[],x={string:{encode:a,decode:e,is:function(a){return null==a||!H(a)||"string"==typeof a},pattern:/[^/]*/},"int":{encode:a,decode:function(a){return parseInt(a,10)},is:function(a){return H(a)&&this.decode(a.toString())===a},pattern:/\d+/},bool:{encode:function(a){return a?1:0},decode:function(a){return 0!==parseInt(a,10)},is:function(a){return a===!0||a===!1},pattern:/0|1/},date:{encode:function(a){return this.is(a)?[a.getFullYear(),("0"+(a.getMonth()+1)).slice(-2),("0"+a.getDate()).slice(-2)].join("-"):c},decode:function(a){if(this.is(a))return a;var b=this.capture.exec(a);return b?new Date(b[1],b[2]-1,b[3]):c},is:function(a){return a instanceof Date&&!isNaN(a.valueOf())},equals:function(a,b){return this.is(a)&&this.is(b)&&a.toISOString()===b.toISOString()},pattern:/[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,capture:/([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/},json:{encode:b.toJson,decode:b.fromJson,is:b.isObject,equals:b.equals,pattern:/[^/]*/},any:{encode:b.identity,decode:b.identity,equals:b.equals,pattern:/.*/}};t.$$getDefaultValue=function(a){if(!i(a.value))return a.value;if(!l)throw new Error("Injectable functions cannot be called at configuration time");return l.invoke(a.value)},this.caseInsensitive=function(a){return H(a)&&(m=a),m},this.strictMode=function(a){return H(a)&&(p=a),p},this.defaultSquashPolicy=function(a){if(!H(a))return q;if(a!==!0&&a!==!1&&!J(a))throw new Error("Invalid squash policy: "+a+". Valid policies: false, true, arbitrary-string");return q=a,a},this.compile=function(a,b){return new r(a,N(f(),b))},this.isMatcher=function(a){if(!K(a))return!1;var b=!0;return M(r.prototype,function(c,d){I(c)&&(b=b&&H(a[d])&&I(a[d]))}),b},this.type=function(a,b,c){if(!H(b))return u[a];if(u.hasOwnProperty(a))throw new Error("A type named '"+a+"' has already been defined.");return u[a]=new s(N({name:a},b)),c&&(w.push({name:a,def:c}),v||j()),this},M(x,function(a,b){u[b]=new s(N({name:b},a))}),u=d(u,{}),this.$get=["$injector",function(a){return l=a,v=!1,j(),M(x,function(a,b){u[b]||(u[b]=new s(a))}),this}],this.Param=function(a,b,d,e){function f(a){var b=K(a)?g(a):[],c=-1===h(b,"value")&&-1===h(b,"type")&&-1===h(b,"squash")&&-1===h(b,"array");return c&&(a={value:a}),a.$$fn=i(a.value)?a.value:function(){return a.value},a}function j(b,c,d){if(b.type&&c)throw new Error("Param '"+a+"' has two type configurations.");return c?c:b.type?b.type instanceof s?b.type:new s(b.type):"config"===d?u.any:u.string}function k(){var b={array:"search"===e?"auto":!1},c=a.match(/\[\]$/)?{array:!0}:{};return N(b,c,d).array}function m(a,b){var c=a.squash;if(!b||c===!1)return!1;if(!H(c)||null==c)return q;if(c===!0||J(c))return c;throw new Error("Invalid squash policy: '"+c+"'. Valid policies: false, true, or arbitrary string")}function p(a,b,d,e){var f,g,i=[{from:"",to:d||b?c:""},{from:null,to:d||b?c:""}];return f=L(a.replace)?a.replace:[],J(e)&&f.push({from:e,to:c}),g=o(f,function(a){return a.from}),n(i,function(a){return-1===h(g,a.from)}).concat(f)}function r(){if(!l)throw new Error("Injectable functions cannot be called at configuration time");var a=l.invoke(d.$$fn);if(null!==a&&a!==c&&!w.type.is(a))throw new Error("Default value ("+a+") for parameter '"+w.id+"' is not an instance of Type ("+w.type.name+")");return a}function t(a){function b(a){return function(b){return b.from===a}}function c(a){var c=o(n(w.replace,b(a)),function(a){return a.to});return c.length?c[0]:a}return a=c(a),H(a)?w.type.$normalize(a):r()}function v(){return"{Param:"+a+" "+b+" squash: '"+z+"' optional: "+y+"}"}var w=this;d=f(d),b=j(d,b,e);var x=k();b=x?b.$asArray(x,"search"===e):b,"string"!==b.name||x||"path"!==e||d.value!==c||(d.value="");var y=d.value!==c,z=m(d,y),A=p(d,x,y,z);N(this,{id:a,type:b,location:e,array:x,squash:z,replace:A,isOptional:y,value:t,dynamic:c,config:d,toString:v})},k.prototype={$$new:function(){return d(this,N(new k,{$$parent:this}))},$$keys:function(){for(var a=[],b=[],c=this,d=g(k.prototype);c;)b.push(c),c=c.$$parent;return b.reverse(),M(b,function(b){M(g(b),function(b){-1===h(a,b)&&-1===h(d,b)&&a.push(b)})}),a},$$values:function(a){var b={},c=this;return M(c.$$keys(),function(d){b[d]=c[d].value(a&&a[d])}),b},$$equals:function(a,b){var c=!0,d=this;return M(d.$$keys(),function(e){var f=a&&a[e],g=b&&b[e];d[e].type.equals(f,g)||(c=!1)}),c},$$validates:function(a){var d,e,f,g,h,i=this.$$keys();for(d=0;d<i.length&&(e=this[i[d]],f=a[i[d]],f!==c&&null!==f||!e.isOptional);d++){if(g=e.type.$normalize(f),!e.type.is(g))return!1;if(h=e.type.encode(g),b.isString(h)&&!e.type.pattern.exec(h))return!1}return!0},$$parent:c},this.ParamSet=k}function u(a,d){function e(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function f(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function g(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return H(d)?d:!0}function h(d,e,f,g){function h(a,b,c){return"/"===p?a:b?p.slice(0,-1)+a:c?p.slice(1)+a:a}function m(a){function b(a){var b=a(f,d);return b?(J(b)&&d.replace().url(b),!0):!1}if(!a||!a.defaultPrevented){o&&d.url()===o;o=c;var e,g=j.length;for(e=0;g>e;e++)if(b(j[e]))return;k&&b(k)}}function n(){return i=i||e.$on("$locationChangeSuccess",m)}var o,p=g.baseHref(),q=d.url();return l||n(),{sync:function(){m()},listen:function(){return n()},update:function(a){return a?void(q=d.url()):void(d.url()!==q&&(d.url(q),d.replace()))},push:function(a,b,e){var f=a.format(b||{});null!==f&&b&&b["#"]&&(f+="#"+b["#"]),d.url(f),o=e&&e.$$avoidResync?d.url():c,e&&e.replace&&d.replace()},href:function(c,e,f){if(!c.validates(e))return null;var g=a.html5Mode();b.isObject(g)&&(g=g.enabled);var i=c.format(e);if(f=f||{},g||null===i||(i="#"+a.hashPrefix()+i),null!==i&&e&&e["#"]&&(i+="#"+e["#"]),i=h(i,g,f.absolute),!f.absolute||!i)return i;var j=!g&&i?"/":"",k=d.port();return k=80===k||443===k?"":":"+k,[d.protocol(),"://",d.host(),k,j,i].join("")}}}var i,j=[],k=null,l=!1;this.rule=function(a){if(!I(a))throw new Error("'rule' must be a function");return j.push(a),this},this.otherwise=function(a){if(J(a)){var b=a;a=function(){return b}}else if(!I(a))throw new Error("'rule' must be a function");return k=a,this},this.when=function(a,b){var c,h=J(b);if(J(a)&&(a=d.compile(a)),!h&&!I(b)&&!L(b))throw new Error("invalid 'handler' in when()");var i={matcher:function(a,b){return h&&(c=d.compile(b),b=["$match",function(a){return c.format(a)}]),N(function(c,d){return g(c,b,a.exec(d.path(),d.search()))},{prefix:J(a.prefix)?a.prefix:""})},regex:function(a,b){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(c=b,b=["$match",function(a){return f(c,a)}]),N(function(c,d){return g(c,b,a.exec(d.path()))},{prefix:e(a)})}},j={matcher:d.isMatcher(a),regex:a instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](a,b));throw new Error("invalid 'what' in when()")},this.deferIntercept=function(a){a===c&&(a=!0),l=a},this.$get=h,h.$inject=["$location","$rootScope","$injector","$browser"]}function v(a,e){function f(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function m(a,b){if(!a)return c;var d=J(a),e=d?a:a.name,g=f(e);if(g){if(!b)throw new Error("No reference point given for path '"+e+"'");b=m(b);for(var h=e.split("."),i=0,j=h.length,k=b;j>i;i++)if(""!==h[i]||0!==i){if("^"!==h[i])break;if(!k.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");k=k.parent}else k=b;h=h.slice(i).join("."),e=k.name+(k.name&&h?".":"")+h}var l=z[e];return!l||!d&&(d||l!==a&&l.self!==a)?c:l}function n(a,b){A[a]||(A[a]=[]),A[a].push(b)}function p(a){for(var b=A[a]||[];b.length;)q(b.shift())}function q(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!J(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(z.hasOwnProperty(c))throw new Error("State '"+c+"'' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):J(b.parent)?b.parent:K(b.parent)&&J(b.parent.name)?b.parent.name:"";if(e&&!z[e])return n(e,b.self);for(var f in C)I(C[f])&&(b[f]=C[f](b,C.$delegates[f]));return z[c]=b,!b[B]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){y.$current.navigable==b&&j(a,c)||y.transitionTo(b,a,{inherit:!0,location:!1})}]),p(c),b}function r(a){return a.indexOf("*")>-1}function s(a){for(var b=a.split("."),c=y.$current.name.split("."),d=0,e=b.length;e>d;d++)"*"===b[d]&&(c[d]="*");return"**"===b[0]&&(c=c.slice(h(c,b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(h(c,b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length!=c.length?!1:c.join("")===b.join("")}function t(a,b){return J(a)&&!H(b)?C[a]:I(b)&&J(a)?(C[a]&&!C.$delegates[a]&&(C.$delegates[a]=C[a]),C[a]=b,this):this}function u(a,b){return K(a)?b=a:b.name=a,q(b),this}function v(a,e,f,h,l,n,p,q,t){function u(b,c,d,f){var g=a.$broadcast("$stateNotFound",b,c,d);if(g.defaultPrevented)return p.update(),D;if(!g.retry)return null;if(f.$retry)return p.update(),E;var h=y.transition=e.when(g.retry);return h.then(function(){return h!==y.transition?A:(b.options.$retry=!0,y.transitionTo(b.to,b.toParams,b.options))},function(){return D}),p.update(),h}function v(a,c,d,g,i,j){function m(){var c=[];return M(a.views,function(d,e){var g=d.resolve&&d.resolve!==a.resolve?d.resolve:{};g.$template=[function(){return f.load(e,{view:d,locals:i.globals,params:n,notify:j.notify})||""}],c.push(l.resolve(g,i.globals,i.resolve,a).then(function(c){if(I(d.controllerProvider)||L(d.controllerProvider)){var f=b.extend({},g,i.globals);c.$$controller=h.invoke(d.controllerProvider,null,f)}else c.$$controller=d.controller;c.$$state=a,c.$$controllerAs=d.controllerAs,i[e]=c}))}),e.all(c).then(function(){return i.globals})}var n=d?c:k(a.params.$$keys(),c),o={$stateParams:n};i.resolve=l.resolve(a.resolve,o,i.resolve,a);var p=[i.resolve.then(function(a){i.globals=a})];return g&&p.push(g),e.all(p).then(m).then(function(a){return i})}var A=e.reject(new Error("transition superseded")),C=e.reject(new Error("transition prevented")),D=e.reject(new Error("transition aborted")),E=e.reject(new Error("transition failed"));return x.locals={resolve:null,globals:{$stateParams:{}}},y={params:{},current:x.self,$current:x,transition:null},y.reload=function(a){return y.transitionTo(y.current,n,{reload:a||!0,inherit:!1,notify:!0})},y.go=function(a,b,c){return y.transitionTo(a,b,N({inherit:!0,relative:y.$current},c))},y.transitionTo=function(b,c,f){c=c||{},f=N({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,j=y.$current,l=y.params,o=j.path,q=m(b,f.relative),r=c["#"];if(!H(q)){var s={to:b,toParams:c,options:f},t=u(s,j.self,l,f);if(t)return t;if(b=s.to,c=s.toParams,f=s.options,q=m(b,f.relative),!H(q)){if(!f.relative)throw new Error("No such state '"+b+"'");throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'")}}if(q[B])throw new Error("Cannot transition to abstract state '"+b+"'");if(f.inherit&&(c=i(n,c||{},y.$current,q)),!q.params.$$validates(c))return E;c=q.params.$$values(c),b=q;var z=b.path,D=0,F=z[D],G=x.locals,I=[];if(f.reload){if(J(f.reload)||K(f.reload)){if(K(f.reload)&&!f.reload.name)throw new Error("Invalid reload state object");var L=f.reload===!0?o[0]:m(f.reload);if(f.reload&&!L)throw new Error("No such reload state '"+(J(f.reload)?f.reload:f.reload.name)+"'");for(;F&&F===o[D]&&F!==L;)G=I[D]=F.locals,D++,F=z[D]}}else for(;F&&F===o[D]&&F.ownParams.$$equals(c,l);)G=I[D]=F.locals,D++,F=z[D];if(w(b,c,j,l,G,f))return r&&(c["#"]=r),y.params=c,O(y.params,n),f.location&&b.navigable&&b.navigable.url&&(p.push(b.navigable.url,c,{$$avoidResync:!0,replace:"replace"===f.location}),p.update(!0)),y.transition=null,e.when(y.current);if(c=k(b.params.$$keys(),c||{}),f.notify&&a.$broadcast("$stateChangeStart",b.self,c,j.self,l).defaultPrevented)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,l),p.update(),C;for(var M=e.when(G),P=D;P<z.length;P++,F=z[P])G=I[P]=d(G),M=v(F,c,F===b,M,G,f);var Q=y.transition=M.then(function(){var d,e,g;if(y.transition!==Q)return A;for(d=o.length-1;d>=D;d--)g=o[d],g.self.onExit&&h.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=D;d<z.length;d++)e=z[d],e.locals=I[d],e.self.onEnter&&h.invoke(e.self.onEnter,e.self,e.locals.globals);return r&&(c["#"]=r),y.transition!==Q?A:(y.$current=b,y.current=b.self,y.params=c,O(y.params,n),y.transition=null,f.location&&b.navigable&&p.push(b.navigable.url,b.navigable.locals.globals.$stateParams,{$$avoidResync:!0,replace:"replace"===f.location}),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,j.self,l),p.update(!0),y.current)},function(d){return y.transition!==Q?A:(y.transition=null,g=a.$broadcast("$stateChangeError",b.self,c,j.self,l,d),g.defaultPrevented||p.update(),e.reject(d))});return Q},y.is=function(a,b,d){d=N({relative:y.$current},d||{});var e=m(a,d.relative);return H(e)?y.$current!==e?!1:b?j(e.params.$$values(b),n):!0:c},y.includes=function(a,b,d){if(d=N({relative:y.$current},d||{}),J(a)&&r(a)){if(!s(a))return!1;a=y.$current.name}var e=m(a,d.relative);return H(e)?H(y.$current.includes[e.name])?b?j(e.params.$$values(b),n,g(b)):!0:!1:c},y.href=function(a,b,d){d=N({lossy:!0,inherit:!0,absolute:!1,relative:y.$current},d||{});var e=m(a,d.relative);if(!H(e))return null;d.inherit&&(b=i(n,b||{},y.$current,e));var f=e&&d.lossy?e.navigable:e;return f&&f.url!==c&&null!==f.url?p.href(f.url,k(e.params.$$keys().concat("#"),b||{}),{absolute:d.absolute}):null},y.get=function(a,b){if(0===arguments.length)return o(g(z),function(a){return z[a].self});var c=m(a,b||y.$current);return c&&c.self?c.self:null},y}function w(a,b,c,d,e,f){function g(a,b,c){function d(b){return"search"!=a.params[b].location}var e=a.params.$$keys().filter(d),f=l.apply({},[a.params].concat(e)),g=new P.ParamSet(f);return g.$$equals(b,c)}return!f.reload&&a===c&&(e===c.locals||a.self.reloadOnSearch===!1&&g(c,d,b))?!0:void 0}var x,y,z={},A={},B="abstract",C={parent:function(a){if(H(a.parent)&&a.parent)return m(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?m(b[1]):x},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=N({},a.parent.data,a.data)),a.data},url:function(a){var b=a.url,c={params:a.params||{}};if(J(b))return"^"==b.charAt(0)?e.compile(b.substring(1),c):(a.parent.navigable||x).url.concat(b,c);if(!b||e.isMatcher(b))return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},ownParams:function(a){var b=a.url&&a.url.params||new P.ParamSet;return M(a.params||{},function(a,c){b[c]||(b[c]=new P.Param(c,null,a,"config"))}),b},params:function(a){return a.parent&&a.parent.params?N(a.parent.params.$$new(),a.ownParams):new P.ParamSet},views:function(a){var b={};return M(H(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),b[d]=c}),b},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?N({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};x=q({name:"",url:"^",views:null,"abstract":!0}),x.navigable=null,this.decorator=t,this.state=u,this.$get=v,v.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$urlRouter","$location","$urlMatcherFactory"]}function w(){function a(a,b){return{load:function(c,d){var e,f={template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}};return d=N(f,d),d.view&&(e=b.fromConfig(d.view,d.params,d.locals)),e&&d.notify&&a.$broadcast("$viewContentLoading",d),e}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function x(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){return c(function(){a[0].scrollIntoView()},0,!1)}}]}function y(a,c,d,e){function f(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(b){return null}}}function g(a,b){var c=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(j)return{enter:function(a,b,c){var d=j.enter(a,null,b,c);d&&d.then&&d.then(c)},leave:function(a,b){var c=j.leave(a,b);c&&c.then&&c.then(b)}};if(i){var d=i&&i(b,a);return{enter:function(a,b,c){d.enter(a,null,b),c()},leave:function(a,b){d.leave(a),b()}}}return c()}var h=f(),i=h("$animator"),j=h("$animate"),k={restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,f,h){return function(c,f,i){function j(){l&&(l.remove(),l=null),n&&(n.$destroy(),n=null),m&&(r.leave(m,function(){l=null}),l=m,m=null)}function k(g){var k,l=A(c,i,f,e),s=l&&a.$current&&a.$current.locals[l];if(g||s!==o){k=c.$new(),o=a.$current.locals[l];var t=h(k,function(a){r.enter(a,f,function(){n&&n.$emit("$viewContentAnimationEnded"),(b.isDefined(q)&&!q||c.$eval(q))&&d(a)}),j()});m=t,n=k,n.$emit("$viewContentLoaded"),n.$eval(p)}}var l,m,n,o,p=i.onload||"",q=i.autoscroll,r=g(i,c);c.$on("$stateChangeSuccess",function(){k(!1)}),c.$on("$viewContentLoading",function(){k(!1)}),k(!0)}}};return k}function z(a,b,c,d){return{restrict:"ECA",priority:-400,compile:function(e){var f=e.html();return function(e,g,h){var i=c.$current,j=A(e,h,g,d),k=i&&i.locals[j];if(k){g.data("$uiView",{name:j,state:k.$$state}),g.html(k.$template?k.$template:f);var l=a(g.contents());if(k.$$controller){k.$scope=e,k.$element=g;var m=b(k.$$controller,k);k.$$controllerAs&&(e[k.$$controllerAs]=m),g.data("$ngControllerController",m),g.children().data("$ngControllerController",m)}l(e)}}}}}function A(a,b,c,d){var e=d(b.uiView||b.name||"")(a),f=c.inheritedData("$uiView");return e.indexOf("@")>=0?e:e+"@"+(f?f.state.name:"")}function B(a,b){var c,d=a.match(/^\s*({[^}]*})\s*$/);if(d&&(a=b+"("+d[1]+")"),c=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/),!c||4!==c.length)throw new Error("Invalid state ref '"+a+"'");return{state:c[1],paramExpr:c[3]||null}}function C(a){var b=a.parent().inheritedData("$uiView");return b&&b.state&&b.state.name?b.state:void 0}function D(a,c){var d=["location","inherit","reload","absolute"];return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(e,f,g,h){var i=B(g.uiSref,a.current.name),j=null,k=C(f)||a.$current,l="[object SVGAnimatedString]"===Object.prototype.toString.call(f.prop("href"))?"xlink:href":"href",m=null,n="A"===f.prop("tagName").toUpperCase(),o="FORM"===f[0].nodeName,p=o?"action":l,q=!0,r={relative:k,inherit:!0},s=e.$eval(g.uiSrefOpts)||{};b.forEach(d,function(a){a in s&&(r[a]=s[a])});var t=function(c){if(c&&(j=b.copy(c)),q){m=a.href(i.state,j,r);var d=h[1]||h[0];return d&&d.$$addStateInfo(i.state,j),null===m?(q=!1,!1):void g.$set(p,m)}};i.paramExpr&&(e.$watch(i.paramExpr,function(a,b){a!==j&&t(a)},!0),j=b.copy(e.$eval(i.paramExpr))),t(),o||f.bind("click",function(b){var d=b.which||b.button;if(!(d>1||b.ctrlKey||b.metaKey||b.shiftKey||f.attr("target"))){var e=c(function(){a.go(i.state,j,r)});b.preventDefault();var g=n&&!m?1:0;b.preventDefault=function(){g--<=0&&c.cancel(e)}}})}}}function E(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs",function(b,d,e){function f(){g()?d.addClass(i):d.removeClass(i)}function g(){for(var a=0;a<j.length;a++)if(h(j[a].state,j[a].params))return!0;return!1}function h(b,c){return"undefined"!=typeof e.uiSrefActiveEq?a.is(b.name,c):a.includes(b.name,c)}var i,j=[];i=c(e.uiSrefActiveEq||e.uiSrefActive||"",!1)(b),this.$$addStateInfo=function(b,c){var e=a.get(b,C(d));j.push({state:e||{name:b},params:c}),f()},b.$on("$stateChangeSuccess",f)}]}}function F(a){var b=function(b){return a.is(b)};return b.$stateful=!0,b}function G(a){var b=function(b){return a.includes(b)};return b.$stateful=!0,b}var H=b.isDefined,I=b.isFunction,J=b.isString,K=b.isObject,L=b.isArray,M=b.forEach,N=b.extend,O=b.copy;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),p.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",p),q.$inject=["$http","$templateCache","$injector"],b.module("ui.router.util").service("$templateFactory",q);var P;r.prototype.concat=function(a,b){var c={caseInsensitive:P.caseInsensitive(),strict:P.strictMode(),squash:P.defaultSquashPolicy()};return new r(this.sourcePath+a+this.sourceSearch,N(c,b),this)},r.prototype.toString=function(){return this.source},r.prototype.exec=function(a,b){function c(a){function b(a){return a.split("").reverse().join("")}function c(a){return a.replace(/\\-/g,"-")}var d=b(a).split(/-(?!\\)/),e=o(d,b);return o(e,c).reverse()}var d=this.regexp.exec(a);if(!d)return null;b=b||{};var e,f,g,h=this.parameters(),i=h.length,j=this.segments.length-1,k={};if(j!==d.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");for(e=0;j>e;e++){g=h[e];var l=this.params[g],m=d[e+1];for(f=0;f<l.replace;f++)l.replace[f].from===m&&(m=l.replace[f].to);m&&l.array===!0&&(m=c(m)),k[g]=l.value(m)}for(;i>e;e++)g=h[e],k[g]=this.params[g].value(b[g]);return k},r.prototype.parameters=function(a){return H(a)?this.params[a]||null:this.$$paramNames},r.prototype.validates=function(a){return this.params.$$validates(a)},r.prototype.format=function(a){function b(a){return encodeURIComponent(a).replace(/-/g,function(a){return"%5C%"+a.charCodeAt(0).toString(16).toUpperCase()})}a=a||{};var c=this.segments,d=this.parameters(),e=this.params;if(!this.validates(a))return null;var f,g=!1,h=c.length-1,i=d.length,j=c[0];for(f=0;i>f;f++){var k=h>f,l=d[f],m=e[l],n=m.value(a[l]),p=m.isOptional&&m.type.equals(m.value(),n),q=p?m.squash:!1,r=m.type.encode(n);if(k){var s=c[f+1];if(q===!1)null!=r&&(j+=L(r)?o(r,b).join("-"):encodeURIComponent(r)),j+=s;else if(q===!0){var t=j.match(/\/$/)?/\/?(.*)/:/(.*)/;j+=s.match(t)[1]}else J(q)&&(j+=q+s)}else{if(null==r||p&&q!==!1)continue;L(r)||(r=[r]),r=o(r,encodeURIComponent).join("&"+l+"="),j+=(g?"&":"?")+(l+"="+r),g=!0}}return j},s.prototype.is=function(a,b){return!0},s.prototype.encode=function(a,b){return a},s.prototype.decode=function(a,b){return a},s.prototype.equals=function(a,b){return a==b},s.prototype.$subPattern=function(){var a=this.pattern.toString();return a.substr(1,a.length-2)},s.prototype.pattern=/.*/,s.prototype.toString=function(){return"{Type:"+this.name+"}"},s.prototype.$normalize=function(a){return this.is(a)?a:this.decode(a)},s.prototype.$asArray=function(a,b){function d(a,b){function d(a,b){return function(){return a[b].apply(a,arguments)}}function e(a){return L(a)?a:H(a)?[a]:[]}function f(a){switch(a.length){case 0:return c;case 1:return"auto"===b?a[0]:a;default:return a}}function g(a){return!a}function h(a,b){return function(c){c=e(c);var d=o(c,a);return b===!0?0===n(d,g).length:f(d)}}function i(a){return function(b,c){var d=e(b),f=e(c);if(d.length!==f.length)return!1;for(var g=0;g<d.length;g++)if(!a(d[g],f[g]))return!1;return!0}}this.encode=h(d(a,"encode")),this.decode=h(d(a,"decode")),this.is=h(d(a,"is"),!0),this.equals=i(d(a,"equals")),this.pattern=a.pattern,this.$normalize=h(d(a,"$normalize")),this.name=a.name,this.$arrayMode=b}if(!a)return this;if("auto"===a&&!b)throw new Error("'auto' array mode is for query parameters only");return new d(this,a)},b.module("ui.router.util").provider("$urlMatcherFactory",t),b.module("ui.router.util").run(["$urlMatcherFactory",function(a){}]),u.$inject=["$locationProvider","$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",u),v.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider"],b.module("ui.router.state").value("$stateParams",{}).provider("$state",v),w.$inject=[],b.module("ui.router.state").provider("$view",w),b.module("ui.router.state").provider("$uiViewScroll",x),y.$inject=["$state","$injector","$uiViewScroll","$interpolate"],z.$inject=["$compile","$controller","$state","$interpolate"],b.module("ui.router.state").directive("uiView",y),b.module("ui.router.state").directive("uiView",z),D.$inject=["$state","$timeout"],E.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",D).directive("uiSrefActive",E).directive("uiSrefActiveEq",E),F.$inject=["$state"],G.$inject=["$state"],b.module("ui.router.state").filter("isState",F).filter("includedByState",G)}(window,window.angular);
 \ No newline at end of file
+"undefined"!=typeof module&&"undefined"!=typeof exports&&module.exports===exports&&(module.exports="ui.router"),function(a,b,c){"use strict";function d(a,b){return N(new(N(function(){},{prototype:a})),b)}function e(a){return M(arguments,function(b){b!==a&&M(b,function(b,c){a.hasOwnProperty(c)||(a[c]=b)})}),a}function f(a,b){var c=[];for(var d in a.path){if(a.path[d]!==b.path[d])break;c.push(a.path[d])}return c}function g(a){if(Object.keys)return Object.keys(a);var b=[];return M(a,function(a,c){b.push(c)}),b}function h(a,b){if(Array.prototype.indexOf)return a.indexOf(b,Number(arguments[2])||0);var c=a.length>>>0,d=Number(arguments[2])||0;for(d=0>d?Math.ceil(d):Math.floor(d),0>d&&(d+=c);c>d;d++)if(d in a&&a[d]===b)return d;return-1}function i(a,b,c,d){var e,i=f(c,d),j={},k=[];for(var l in i)if(i[l].params&&(e=g(i[l].params),e.length))for(var m in e)h(k,e[m])>=0||(k.push(e[m]),j[e[m]]=a[e[m]]);return N({},j,b)}function j(a,b,c){if(!c){c=[];for(var d in a)c.push(d)}for(var e=0;e<c.length;e++){var f=c[e];if(a[f]!=b[f])return!1}return!0}function k(a,b){var c={};return M(a,function(a){c[a]=b[a]}),c}function l(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));return M(c,function(c){c in a&&(b[c]=a[c])}),b}function m(a){var b={},c=Array.prototype.concat.apply(Array.prototype,Array.prototype.slice.call(arguments,1));for(var d in a)-1==h(c,d)&&(b[d]=a[d]);return b}function n(a,b){var c=L(a),d=c?[]:{};return M(a,function(a,e){b(a,e)&&(d[c?d.length:e]=a)}),d}function o(a,b){var c=L(a)?[]:{};return M(a,function(a,d){c[d]=b(a,d)}),c}function p(a,b){var d=1,f=2,i={},j=[],k=i,l=N(a.when(i),{$$promises:i,$$values:i});this.study=function(i){function n(a,c){if(s[c]!==f){if(r.push(c),s[c]===d)throw r.splice(0,h(r,c)),new Error("Cyclic dependency: "+r.join(" -> "));if(s[c]=d,J(a))q.push(c,[function(){return b.get(a)}],j);else{var e=b.annotate(a);M(e,function(a){a!==c&&i.hasOwnProperty(a)&&n(i[a],a)}),q.push(c,a,e)}r.pop(),s[c]=f}}function o(a){return K(a)&&a.then&&a.$$promises}if(!K(i))throw new Error("'invocables' must be an object");var p=g(i||{}),q=[],r=[],s={};return M(i,n),i=r=s=null,function(d,f,g){function h(){--u||(v||e(t,f.$$values),r.$$values=t,r.$$promises=r.$$promises||!0,delete r.$$inheritedValues,n.resolve(t))}function i(a){r.$$failure=a,n.reject(a)}function j(c,e,f){function j(a){l.reject(a),i(a)}function k(){if(!H(r.$$failure))try{l.resolve(b.invoke(e,g,t)),l.promise.then(function(a){t[c]=a,h()},j)}catch(a){j(a)}}var l=a.defer(),m=0;M(f,function(a){s.hasOwnProperty(a)&&!d.hasOwnProperty(a)&&(m++,s[a].then(function(b){t[a]=b,--m||k()},j))}),m||k(),s[c]=l.promise}if(o(d)&&g===c&&(g=f,f=d,d=null),d){if(!K(d))throw new Error("'locals' must be an object")}else d=k;if(f){if(!o(f))throw new Error("'parent' must be a promise returned by $resolve.resolve()")}else f=l;var n=a.defer(),r=n.promise,s=r.$$promises={},t=N({},d),u=1+q.length/3,v=!1;if(H(f.$$failure))return i(f.$$failure),r;f.$$inheritedValues&&e(t,m(f.$$inheritedValues,p)),N(s,f.$$promises),f.$$values?(v=e(t,m(f.$$values,p)),r.$$inheritedValues=m(f.$$values,p),h()):(f.$$inheritedValues&&(r.$$inheritedValues=m(f.$$inheritedValues,p)),f.then(h,i));for(var w=0,x=q.length;x>w;w+=3)d.hasOwnProperty(q[w])?h():j(q[w],q[w+1],q[w+2]);return r}},this.resolve=function(a,b,c,d){return this.study(a)(b,c,d)}}function q(a,b,c){this.fromConfig=function(a,b,c){return H(a.template)?this.fromString(a.template,b):H(a.templateUrl)?this.fromUrl(a.templateUrl,b):H(a.templateProvider)?this.fromProvider(a.templateProvider,b,c):null},this.fromString=function(a,b){return I(a)?a(b):a},this.fromUrl=function(c,d){return I(c)&&(c=c(d)),null==c?null:a.get(c,{cache:b,headers:{Accept:"text/html"}}).then(function(a){return a.data})},this.fromProvider=function(a,b,d){return c.invoke(a,null,d||{params:b})}}function r(a,b,e){function f(b,c,d,e){if(q.push(b),o[b])return o[b];if(!/^\w+(-+\w+)*(?:\[\])?$/.test(b))throw new Error("Invalid parameter name '"+b+"' in pattern '"+a+"'");if(p[b])throw new Error("Duplicate parameter name '"+b+"' in pattern '"+a+"'");return p[b]=new P.Param(b,c,d,e),p[b]}function g(a,b,c,d){var e=["",""],f=a.replace(/[\\\[\]\^$*+?.()|{}]/g,"\\$&");if(!b)return f;switch(c){case!1:e=["(",")"+(d?"?":"")];break;case!0:e=["?(",")?"];break;default:e=["("+c+"|",")?"]}return f+e[0]+b+e[1]}function h(e,f){var g,h,i,j,k;return g=e[2]||e[3],k=b.params[g],i=a.substring(m,e.index),h=f?e[4]:e[4]||("*"==e[1]?".*":null),j=P.type(h||"string")||d(P.type("string"),{pattern:new RegExp(h,b.caseInsensitive?"i":c)}),{id:g,regexp:h,segment:i,type:j,cfg:k}}b=N({params:{}},K(b)?b:{});var i,j=/([:*])([\w\[\]]+)|\{([\w\[\]]+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,k=/([:]?)([\w\[\]-]+)|\{([\w\[\]-]+)(?:\:((?:[^{}\\]+|\\.|\{(?:[^{}\\]+|\\.)*\})+))?\}/g,l="^",m=0,n=this.segments=[],o=e?e.params:{},p=this.params=e?e.params.$$new():new P.ParamSet,q=[];this.source=a;for(var r,s,t;(i=j.exec(a))&&(r=h(i,!1),!(r.segment.indexOf("?")>=0));)s=f(r.id,r.type,r.cfg,"path"),l+=g(r.segment,s.type.pattern.source,s.squash,s.isOptional),n.push(r.segment),m=j.lastIndex;t=a.substring(m);var u=t.indexOf("?");if(u>=0){var v=this.sourceSearch=t.substring(u);if(t=t.substring(0,u),this.sourcePath=a.substring(0,m+u),v.length>0)for(m=0;i=k.exec(v);)r=h(i,!0),s=f(r.id,r.type,r.cfg,"search"),m=j.lastIndex}else this.sourcePath=a,this.sourceSearch="";l+=g(t)+(b.strict===!1?"/?":"")+"$",n.push(t),this.regexp=new RegExp(l,b.caseInsensitive?"i":c),this.prefix=n[0],this.$$paramNames=q}function s(a){N(this,a)}function t(){function a(a){return null!=a?a.toString().replace(/\//g,"%2F"):a}function e(a){return null!=a?a.toString().replace(/%2F/g,"/"):a}function f(){return{strict:p,caseInsensitive:m}}function i(a){return I(a)||L(a)&&I(a[a.length-1])}function j(){for(;w.length;){var a=w.shift();if(a.pattern)throw new Error("You cannot override a type's .pattern at runtime.");b.extend(u[a.name],l.invoke(a.def))}}function k(a){N(this,a||{})}P=this;var l,m=!1,p=!0,q=!1,u={},v=!0,w=[],x={string:{encode:a,decode:e,is:function(a){return null==a||!H(a)||"string"==typeof a},pattern:/[^/]*/},"int":{encode:a,decode:function(a){return parseInt(a,10)},is:function(a){return H(a)&&this.decode(a.toString())===a},pattern:/\d+/},bool:{encode:function(a){return a?1:0},decode:function(a){return 0!==parseInt(a,10)},is:function(a){return a===!0||a===!1},pattern:/0|1/},date:{encode:function(a){return this.is(a)?[a.getFullYear(),("0"+(a.getMonth()+1)).slice(-2),("0"+a.getDate()).slice(-2)].join("-"):c},decode:function(a){if(this.is(a))return a;var b=this.capture.exec(a);return b?new Date(b[1],b[2]-1,b[3]):c},is:function(a){return a instanceof Date&&!isNaN(a.valueOf())},equals:function(a,b){return this.is(a)&&this.is(b)&&a.toISOString()===b.toISOString()},pattern:/[0-9]{4}-(?:0[1-9]|1[0-2])-(?:0[1-9]|[1-2][0-9]|3[0-1])/,capture:/([0-9]{4})-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])/},json:{encode:b.toJson,decode:b.fromJson,is:b.isObject,equals:b.equals,pattern:/[^/]*/},any:{encode:b.identity,decode:b.identity,equals:b.equals,pattern:/.*/}};t.$$getDefaultValue=function(a){if(!i(a.value))return a.value;if(!l)throw new Error("Injectable functions cannot be called at configuration time");return l.invoke(a.value)},this.caseInsensitive=function(a){return H(a)&&(m=a),m},this.strictMode=function(a){return H(a)&&(p=a),p},this.defaultSquashPolicy=function(a){if(!H(a))return q;if(a!==!0&&a!==!1&&!J(a))throw new Error("Invalid squash policy: "+a+". Valid policies: false, true, arbitrary-string");return q=a,a},this.compile=function(a,b){return new r(a,N(f(),b))},this.isMatcher=function(a){if(!K(a))return!1;var b=!0;return M(r.prototype,function(c,d){I(c)&&(b=b&&H(a[d])&&I(a[d]))}),b},this.type=function(a,b,c){if(!H(b))return u[a];if(u.hasOwnProperty(a))throw new Error("A type named '"+a+"' has already been defined.");return u[a]=new s(N({name:a},b)),c&&(w.push({name:a,def:c}),v||j()),this},M(x,function(a,b){u[b]=new s(N({name:b},a))}),u=d(u,{}),this.$get=["$injector",function(a){return l=a,v=!1,j(),M(x,function(a,b){u[b]||(u[b]=new s(a))}),this}],this.Param=function(a,b,d,e){function f(a){var b=K(a)?g(a):[],c=-1===h(b,"value")&&-1===h(b,"type")&&-1===h(b,"squash")&&-1===h(b,"array");return c&&(a={value:a}),a.$$fn=i(a.value)?a.value:function(){return a.value},a}function j(b,c,d){if(b.type&&c)throw new Error("Param '"+a+"' has two type configurations.");return c?c:b.type?b.type instanceof s?b.type:new s(b.type):"config"===d?u.any:u.string}function k(){var b={array:"search"===e?"auto":!1},c=a.match(/\[\]$/)?{array:!0}:{};return N(b,c,d).array}function m(a,b){var c=a.squash;if(!b||c===!1)return!1;if(!H(c)||null==c)return q;if(c===!0||J(c))return c;throw new Error("Invalid squash policy: '"+c+"'. Valid policies: false, true, or arbitrary string")}function p(a,b,d,e){var f,g,i=[{from:"",to:d||b?c:""},{from:null,to:d||b?c:""}];return f=L(a.replace)?a.replace:[],J(e)&&f.push({from:e,to:c}),g=o(f,function(a){return a.from}),n(i,function(a){return-1===h(g,a.from)}).concat(f)}function r(){if(!l)throw new Error("Injectable functions cannot be called at configuration time");var a=l.invoke(d.$$fn);if(null!==a&&a!==c&&!w.type.is(a))throw new Error("Default value ("+a+") for parameter '"+w.id+"' is not an instance of Type ("+w.type.name+")");return a}function t(a){function b(a){return function(b){return b.from===a}}function c(a){var c=o(n(w.replace,b(a)),function(a){return a.to});return c.length?c[0]:a}return a=c(a),H(a)?w.type.$normalize(a):r()}function v(){return"{Param:"+a+" "+b+" squash: '"+z+"' optional: "+y+"}"}var w=this;d=f(d),b=j(d,b,e);var x=k();b=x?b.$asArray(x,"search"===e):b,"string"!==b.name||x||"path"!==e||d.value!==c||(d.value="");var y=d.value!==c,z=m(d,y),A=p(d,x,y,z);N(this,{id:a,type:b,location:e,array:x,squash:z,replace:A,isOptional:y,value:t,dynamic:c,config:d,toString:v})},k.prototype={$$new:function(){return d(this,N(new k,{$$parent:this}))},$$keys:function(){for(var a=[],b=[],c=this,d=g(k.prototype);c;)b.push(c),c=c.$$parent;return b.reverse(),M(b,function(b){M(g(b),function(b){-1===h(a,b)&&-1===h(d,b)&&a.push(b)})}),a},$$values:function(a){var b={},c=this;return M(c.$$keys(),function(d){b[d]=c[d].value(a&&a[d])}),b},$$equals:function(a,b){var c=!0,d=this;return M(d.$$keys(),function(e){var f=a&&a[e],g=b&&b[e];d[e].type.equals(f,g)||(c=!1)}),c},$$validates:function(a){var d,e,f,g,h,i=this.$$keys();for(d=0;d<i.length&&(e=this[i[d]],f=a[i[d]],f!==c&&null!==f||!e.isOptional);d++){if(g=e.type.$normalize(f),!e.type.is(g))return!1;if(h=e.type.encode(g),b.isString(h)&&!e.type.pattern.exec(h))return!1}return!0},$$parent:c},this.ParamSet=k}function u(a,d){function e(a){var b=/^\^((?:\\[^a-zA-Z0-9]|[^\\\[\]\^$*+?.()|{}]+)*)/.exec(a.source);return null!=b?b[1].replace(/\\(.)/g,"$1"):""}function f(a,b){return a.replace(/\$(\$|\d{1,2})/,function(a,c){return b["$"===c?0:Number(c)]})}function g(a,b,c){if(!c)return!1;var d=a.invoke(b,b,{$match:c});return H(d)?d:!0}function h(d,e,f,g){function h(a,b,c){return"/"===p?a:b?p.slice(0,-1)+a:c?p.slice(1)+a:a}function m(a){function b(a){var b=a(f,d);return b?(J(b)&&d.replace().url(b),!0):!1}if(!a||!a.defaultPrevented){o&&d.url()===o;o=c;var e,g=j.length;for(e=0;g>e;e++)if(b(j[e]))return;k&&b(k)}}function n(){return i=i||e.$on("$locationChangeSuccess",m)}var o,p=g.baseHref(),q=d.url();return l||n(),{sync:function(){m()},listen:function(){return n()},update:function(a){return a?void(q=d.url()):void(d.url()!==q&&(d.url(q),d.replace()))},push:function(a,b,e){var f=a.format(b||{});null!==f&&b&&b["#"]&&(f+="#"+b["#"]),d.url(f),o=e&&e.$$avoidResync?d.url():c,e&&e.replace&&d.replace()},href:function(c,e,f){if(!c.validates(e))return null;var g=a.html5Mode();b.isObject(g)&&(g=g.enabled);var i=c.format(e);if(f=f||{},g||null===i||(i="#"+a.hashPrefix()+i),null!==i&&e&&e["#"]&&(i+="#"+e["#"]),i=h(i,g,f.absolute),!f.absolute||!i)return i;var j=!g&&i?"/":"",k=d.port();return k=80===k||443===k?"":":"+k,[d.protocol(),"://",d.host(),k,j,i].join("")}}}var i,j=[],k=null,l=!1;this.rule=function(a){if(!I(a))throw new Error("'rule' must be a function");return j.push(a),this},this.otherwise=function(a){if(J(a)){var b=a;a=function(){return b}}else if(!I(a))throw new Error("'rule' must be a function");return k=a,this},this.when=function(a,b){var c,h=J(b);if(J(a)&&(a=d.compile(a)),!h&&!I(b)&&!L(b))throw new Error("invalid 'handlers' in when()");var i={matcher:function(a,b){return h&&(c=d.compile(b),b=["$match",function(a){return c.format(a)}]),N(function(c,d){return g(c,b,a.exec(d.path(),d.search()))},{prefix:J(a.prefix)?a.prefix:""})},regex:function(a,b){if(a.global||a.sticky)throw new Error("when() RegExp must not be global or sticky");return h&&(c=b,b=["$match",function(a){return f(c,a)}]),N(function(c,d){return g(c,b,a.exec(d.path()))},{prefix:e(a)})}},j={matcher:d.isMatcher(a),regex:a instanceof RegExp};for(var k in j)if(j[k])return this.rule(i[k](a,b));throw new Error("invalid 'what' in when()")},this.deferIntercept=function(a){a===c&&(a=!0),l=a},this.$get=h,h.$inject=["$location","$rootScope","$injector","$browser"]}function v(a,e){function f(a){return 0===a.indexOf(".")||0===a.indexOf("^")}function m(a,b){if(!a)return c;var d=J(a),e=d?a:a.name,g=f(e);if(g){if(!b)throw new Error("No reference point given for path '"+e+"'");b=m(b);for(var h=e.split("."),i=0,j=h.length,k=b;j>i;i++)if(""!==h[i]||0!==i){if("^"!==h[i])break;if(!k.parent)throw new Error("Path '"+e+"' not valid for state '"+b.name+"'");k=k.parent}else k=b;h=h.slice(i).join("."),e=k.name+(k.name&&h?".":"")+h}var l=z[e];return!l||!d&&(d||l!==a&&l.self!==a)?c:l}function n(a,b){A[a]||(A[a]=[]),A[a].push(b)}function p(a){for(var b=A[a]||[];b.length;)q(b.shift())}function q(b){b=d(b,{self:b,resolve:b.resolve||{},toString:function(){return this.name}});var c=b.name;if(!J(c)||c.indexOf("@")>=0)throw new Error("State must have a valid name");if(z.hasOwnProperty(c))throw new Error("State '"+c+"'' is already defined");var e=-1!==c.indexOf(".")?c.substring(0,c.lastIndexOf(".")):J(b.parent)?b.parent:K(b.parent)&&J(b.parent.name)?b.parent.name:"";if(e&&!z[e])return n(e,b.self);for(var f in C)I(C[f])&&(b[f]=C[f](b,C.$delegates[f]));return z[c]=b,!b[B]&&b.url&&a.when(b.url,["$match","$stateParams",function(a,c){y.$current.navigable==b&&j(a,c)||y.transitionTo(b,a,{inherit:!0,location:!1})}]),p(c),b}function r(a){return a.indexOf("*")>-1}function s(a){for(var b=a.split("."),c=y.$current.name.split("."),d=0,e=b.length;e>d;d++)"*"===b[d]&&(c[d]="*");return"**"===b[0]&&(c=c.slice(h(c,b[1])),c.unshift("**")),"**"===b[b.length-1]&&(c.splice(h(c,b[b.length-2])+1,Number.MAX_VALUE),c.push("**")),b.length!=c.length?!1:c.join("")===b.join("")}function t(a,b){return J(a)&&!H(b)?C[a]:I(b)&&J(a)?(C[a]&&!C.$delegates[a]&&(C.$delegates[a]=C[a]),C[a]=b,this):this}function u(a,b){return K(a)?b=a:b.name=a,q(b),this}function v(a,e,f,h,l,n,p,q,t){function u(b,c,d,f){var g=a.$broadcast("$stateNotFound",b,c,d);if(g.defaultPrevented)return p.update(),D;if(!g.retry)return null;if(f.$retry)return p.update(),E;var h=y.transition=e.when(g.retry);return h.then(function(){return h!==y.transition?A:(b.options.$retry=!0,y.transitionTo(b.to,b.toParams,b.options))},function(){return D}),p.update(),h}function v(a,c,d,g,i,j){function m(){var c=[];return M(a.views,function(d,e){var g=d.resolve&&d.resolve!==a.resolve?d.resolve:{};g.$template=[function(){return f.load(e,{view:d,locals:i.globals,params:n,notify:j.notify})||""}],c.push(l.resolve(g,i.globals,i.resolve,a).then(function(c){if(I(d.controllerProvider)||L(d.controllerProvider)){var f=b.extend({},g,i.globals);c.$$controller=h.invoke(d.controllerProvider,null,f)}else c.$$controller=d.controller;c.$$state=a,c.$$controllerAs=d.controllerAs,i[e]=c}))}),e.all(c).then(function(){return i.globals})}var n=d?c:k(a.params.$$keys(),c),o={$stateParams:n};i.resolve=l.resolve(a.resolve,o,i.resolve,a);var p=[i.resolve.then(function(a){i.globals=a})];return g&&p.push(g),e.all(p).then(m).then(function(a){return i})}var A=e.reject(new Error("transition superseded")),C=e.reject(new Error("transition prevented")),D=e.reject(new Error("transition aborted")),E=e.reject(new Error("transition failed"));return x.locals={resolve:null,globals:{$stateParams:{}}},y={params:{},current:x.self,$current:x,transition:null},y.reload=function(a){return y.transitionTo(y.current,n,{reload:a||!0,inherit:!1,notify:!0})},y.go=function(a,b,c){return y.transitionTo(a,b,N({inherit:!0,relative:y.$current},c))},y.transitionTo=function(b,c,f){c=c||{},f=N({location:!0,inherit:!1,relative:null,notify:!0,reload:!1,$retry:!1},f||{});var g,j=y.$current,l=y.params,o=j.path,q=m(b,f.relative),r=c["#"];if(!H(q)){var s={to:b,toParams:c,options:f},t=u(s,j.self,l,f);if(t)return t;if(b=s.to,c=s.toParams,f=s.options,q=m(b,f.relative),!H(q)){if(!f.relative)throw new Error("No such state '"+b+"'");throw new Error("Could not resolve '"+b+"' from state '"+f.relative+"'")}}if(q[B])throw new Error("Cannot transition to abstract state '"+b+"'");if(f.inherit&&(c=i(n,c||{},y.$current,q)),!q.params.$$validates(c))return E;c=q.params.$$values(c),b=q;var z=b.path,D=0,F=z[D],G=x.locals,I=[];if(f.reload){if(J(f.reload)||K(f.reload)){if(K(f.reload)&&!f.reload.name)throw new Error("Invalid reload state object");var L=f.reload===!0?o[0]:m(f.reload);if(f.reload&&!L)throw new Error("No such reload state '"+(J(f.reload)?f.reload:f.reload.name)+"'");for(;F&&F===o[D]&&F!==L;)G=I[D]=F.locals,D++,F=z[D]}}else for(;F&&F===o[D]&&F.ownParams.$$equals(c,l);)G=I[D]=F.locals,D++,F=z[D];if(w(b,c,j,l,G,f))return r&&(c["#"]=r),y.params=c,O(y.params,n),f.location&&b.navigable&&b.navigable.url&&(p.push(b.navigable.url,c,{$$avoidResync:!0,replace:"replace"===f.location}),p.update(!0)),y.transition=null,e.when(y.current);if(c=k(b.params.$$keys(),c||{}),f.notify&&a.$broadcast("$stateChangeStart",b.self,c,j.self,l).defaultPrevented)return a.$broadcast("$stateChangeCancel",b.self,c,j.self,l),p.update(),C;for(var M=e.when(G),P=D;P<z.length;P++,F=z[P])G=I[P]=d(G),M=v(F,c,F===b,M,G,f);var Q=y.transition=M.then(function(){var d,e,g;if(y.transition!==Q)return A;for(d=o.length-1;d>=D;d--)g=o[d],g.self.onExit&&h.invoke(g.self.onExit,g.self,g.locals.globals),g.locals=null;for(d=D;d<z.length;d++)e=z[d],e.locals=I[d],e.self.onEnter&&h.invoke(e.self.onEnter,e.self,e.locals.globals);return r&&(c["#"]=r),y.transition!==Q?A:(y.$current=b,y.current=b.self,y.params=c,O(y.params,n),y.transition=null,f.location&&b.navigable&&p.push(b.navigable.url,b.navigable.locals.globals.$stateParams,{$$avoidResync:!0,replace:"replace"===f.location}),f.notify&&a.$broadcast("$stateChangeSuccess",b.self,c,j.self,l),p.update(!0),y.current)},function(d){return y.transition!==Q?A:(y.transition=null,g=a.$broadcast("$stateChangeError",b.self,c,j.self,l,d),g.defaultPrevented||p.update(),e.reject(d))});return Q},y.is=function(a,b,d){d=N({relative:y.$current},d||{});var e=m(a,d.relative);return H(e)?y.$current!==e?!1:b?j(e.params.$$values(b),n):!0:c},y.includes=function(a,b,d){if(d=N({relative:y.$current},d||{}),J(a)&&r(a)){if(!s(a))return!1;a=y.$current.name}var e=m(a,d.relative);return H(e)?H(y.$current.includes[e.name])?b?j(e.params.$$values(b),n,g(b)):!0:!1:c},y.href=function(a,b,d){d=N({lossy:!0,inherit:!0,absolute:!1,relative:y.$current},d||{});var e=m(a,d.relative);if(!H(e))return null;d.inherit&&(b=i(n,b||{},y.$current,e));var f=e&&d.lossy?e.navigable:e;return f&&f.url!==c&&null!==f.url?p.href(f.url,k(e.params.$$keys().concat("#"),b||{}),{absolute:d.absolute}):null},y.get=function(a,b){if(0===arguments.length)return o(g(z),function(a){return z[a].self});var c=m(a,b||y.$current);return c&&c.self?c.self:null},y}function w(a,b,c,d,e,f){function g(a,b,c){function d(b){return"search"!=a.params[b].location}var e=a.params.$$keys().filter(d),f=l.apply({},[a.params].concat(e)),g=new P.ParamSet(f);return g.$$equals(b,c)}return!f.reload&&a===c&&(e===c.locals||a.self.reloadOnSearch===!1&&g(c,d,b))?!0:void 0}var x,y,z={},A={},B="abstract",C={parent:function(a){if(H(a.parent)&&a.parent)return m(a.parent);var b=/^(.+)\.[^.]+$/.exec(a.name);return b?m(b[1]):x},data:function(a){return a.parent&&a.parent.data&&(a.data=a.self.data=N({},a.parent.data,a.data)),a.data},url:function(a){var b=a.url,c={params:a.params||{}};if(J(b))return"^"==b.charAt(0)?e.compile(b.substring(1),c):(a.parent.navigable||x).url.concat(b,c);if(!b||e.isMatcher(b))return b;throw new Error("Invalid url '"+b+"' in state '"+a+"'")},navigable:function(a){return a.url?a:a.parent?a.parent.navigable:null},ownParams:function(a){var b=a.url&&a.url.params||new P.ParamSet;return M(a.params||{},function(a,c){b[c]||(b[c]=new P.Param(c,null,a,"config"))}),b},params:function(a){return a.parent&&a.parent.params?N(a.parent.params.$$new(),a.ownParams):new P.ParamSet},views:function(a){var b={};return M(H(a.views)?a.views:{"":a},function(c,d){d.indexOf("@")<0&&(d+="@"+a.parent.name),b[d]=c}),b},path:function(a){return a.parent?a.parent.path.concat(a):[]},includes:function(a){var b=a.parent?N({},a.parent.includes):{};return b[a.name]=!0,b},$delegates:{}};x=q({name:"",url:"^",views:null,"abstract":!0}),x.navigable=null,this.decorator=t,this.state=u,this.$get=v,v.$inject=["$rootScope","$q","$view","$injector","$resolve","$stateParams","$urlRouter","$location","$urlMatcherFactory"]}function w(){function a(a,b){return{load:function(c,d){var e,f={template:null,controller:null,view:null,locals:null,notify:!0,async:!0,params:{}};return d=N(f,d),d.view&&(e=b.fromConfig(d.view,d.params,d.locals)),e&&d.notify&&a.$broadcast("$viewContentLoading",d),e}}}this.$get=a,a.$inject=["$rootScope","$templateFactory"]}function x(){var a=!1;this.useAnchorScroll=function(){a=!0},this.$get=["$anchorScroll","$timeout",function(b,c){return a?b:function(a){return c(function(){a[0].scrollIntoView()},0,!1)}}]}function y(a,c,d,e){function f(){return c.has?function(a){return c.has(a)?c.get(a):null}:function(a){try{return c.get(a)}catch(b){return null}}}function g(a,b){var c=function(){return{enter:function(a,b,c){b.after(a),c()},leave:function(a,b){a.remove(),b()}}};if(j)return{enter:function(a,b,c){var d=j.enter(a,null,b,c);d&&d.then&&d.then(c)},leave:function(a,b){var c=j.leave(a,b);c&&c.then&&c.then(b)}};if(i){var d=i&&i(b,a);return{enter:function(a,b,c){d.enter(a,null,b),c()},leave:function(a,b){d.leave(a),b()}}}return c()}var h=f(),i=h("$animator"),j=h("$animate"),k={restrict:"ECA",terminal:!0,priority:400,transclude:"element",compile:function(c,f,h){return function(c,f,i){function j(){l&&(l.remove(),l=null),n&&(n.$destroy(),n=null),m&&(r.leave(m,function(){l=null}),l=m,m=null)}function k(g){var k,l=A(c,i,f,e),s=l&&a.$current&&a.$current.locals[l];if(g||s!==o){k=c.$new(),o=a.$current.locals[l];var t=h(k,function(a){r.enter(a,f,function(){n&&n.$emit("$viewContentAnimationEnded"),(b.isDefined(q)&&!q||c.$eval(q))&&d(a)}),j()});m=t,n=k,n.$emit("$viewContentLoaded"),n.$eval(p)}}var l,m,n,o,p=i.onload||"",q=i.autoscroll,r=g(i,c);c.$on("$stateChangeSuccess",function(){k(!1)}),c.$on("$viewContentLoading",function(){k(!1)}),k(!0)}}};return k}function z(a,b,c,d){return{restrict:"ECA",priority:-400,compile:function(e){var f=e.html();return function(e,g,h){var i=c.$current,j=A(e,h,g,d),k=i&&i.locals[j];if(k){g.data("$uiView",{name:j,state:k.$$state}),g.html(k.$template?k.$template:f);var l=a(g.contents());if(k.$$controller){k.$scope=e,k.$element=g;var m=b(k.$$controller,k);k.$$controllerAs&&(e[k.$$controllerAs]=m),g.data("$ngControllerController",m),g.children().data("$ngControllerController",m)}l(e)}}}}}function A(a,b,c,d){var e=d(b.uiView||b.name||"")(a),f=c.inheritedData("$uiView");return e.indexOf("@")>=0?e:e+"@"+(f?f.state.name:"")}function B(a,b){var c,d=a.match(/^\s*({[^}]*})\s*$/);if(d&&(a=b+"("+d[1]+")"),c=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/),!c||4!==c.length)throw new Error("Invalid state ref '"+a+"'");return{state:c[1],paramExpr:c[3]||null}}function C(a){var b=a.parent().inheritedData("$uiView");return b&&b.state&&b.state.name?b.state:void 0}function D(a,c){var d=["location","inherit","reload","absolute"];return{restrict:"A",require:["?^uiSrefActive","?^uiSrefActiveEq"],link:function(e,f,g,h){var i=B(g.uiSref,a.current.name),j=null,k=C(f)||a.$current,l="[object SVGAnimatedString]"===Object.prototype.toString.call(f.prop("href"))?"xlink:href":"href",m=null,n="A"===f.prop("tagName").toUpperCase(),o="FORM"===f[0].nodeName,p=o?"action":l,q=!0,r={relative:k,inherit:!0},s=e.$eval(g.uiSrefOpts)||{};b.forEach(d,function(a){a in s&&(r[a]=s[a])});var t=function(c){if(c&&(j=b.copy(c)),q){m=a.href(i.state,j,r);var d=h[1]||h[0];return d&&d.$$addStateInfo(i.state,j),null===m?(q=!1,!1):void g.$set(p,m)}};i.paramExpr&&(e.$watch(i.paramExpr,function(a,b){a!==j&&t(a)},!0),j=b.copy(e.$eval(i.paramExpr))),t(),o||f.bind("click",function(b){var d=b.which||b.button;if(!(d>1||b.ctrlKey||b.metaKey||b.shiftKey||f.attr("target"))){var e=c(function(){a.go(i.state,j,r)});b.preventDefault();var g=n&&!m?1:0;b.preventDefault=function(){g--<=0&&c.cancel(e)}}})}}}function E(a,b,c){return{restrict:"A",controller:["$scope","$element","$attrs",function(b,d,e){function f(){g()?d.addClass(i):d.removeClass(i)}function g(){for(var a=0;a<j.length;a++)if(h(j[a].state,j[a].params))return!0;return!1}function h(b,c){return"undefined"!=typeof e.uiSrefActiveEq?a.is(b.name,c):a.includes(b.name,c)}var i,j=[];i=c(e.uiSrefActiveEq||e.uiSrefActive||"",!1)(b),this.$$addStateInfo=function(b,c){var e=a.get(b,C(d));j.push({state:e||{name:b},params:c}),f()},b.$on("$stateChangeSuccess",f)}]}}function F(a){var b=function(b){return a.is(b)};return b.$stateful=!0,b}function G(a){var b=function(b){return a.includes(b)};return b.$stateful=!0,b}var H=b.isDefined,I=b.isFunction,J=b.isString,K=b.isObject,L=b.isArray,M=b.forEach,N=b.extend,O=b.copy;b.module("ui.router.util",["ng"]),b.module("ui.router.router",["ui.router.util"]),b.module("ui.router.state",["ui.router.router","ui.router.util"]),b.module("ui.router",["ui.router.state"]),b.module("ui.router.compat",["ui.router"]),p.$inject=["$q","$injector"],b.module("ui.router.util").service("$resolve",p),q.$inject=["$http","$templateCache","$injector"],b.module("ui.router.util").service("$templateFactory",q);var P;r.prototype.concat=function(a,b){var c={caseInsensitive:P.caseInsensitive(),strict:P.strictMode(),squash:P.defaultSquashPolicy()};return new r(this.sourcePath+a+this.sourceSearch,N(c,b),this)},r.prototype.toString=function(){return this.source},r.prototype.exec=function(a,b){function c(a){function b(a){return a.split("").reverse().join("")}function c(a){return a.replace(/\\-/g,"-")}var d=b(a).split(/-(?!\\)/),e=o(d,b);return o(e,c).reverse()}var d=this.regexp.exec(a);if(!d)return null;b=b||{};var e,f,g,h=this.parameters(),i=h.length,j=this.segments.length-1,k={};if(j!==d.length-1)throw new Error("Unbalanced capture group in route '"+this.source+"'");for(e=0;j>e;e++){g=h[e];var l=this.params[g],m=d[e+1];for(f=0;f<l.replace;f++)l.replace[f].from===m&&(m=l.replace[f].to);m&&l.array===!0&&(m=c(m)),k[g]=l.value(m)}for(;i>e;e++)g=h[e],k[g]=this.params[g].value(b[g]);return k},r.prototype.parameters=function(a){return H(a)?this.params[a]||null:this.$$paramNames},r.prototype.validates=function(a){return this.params.$$validates(a)},r.prototype.format=function(a){function b(a){return encodeURIComponent(a).replace(/-/g,function(a){return"%5C%"+a.charCodeAt(0).toString(16).toUpperCase()})}a=a||{};var c=this.segments,d=this.parameters(),e=this.params;if(!this.validates(a))return null;var f,g=!1,h=c.length-1,i=d.length,j=c[0];for(f=0;i>f;f++){var k=h>f,l=d[f],m=e[l],n=m.value(a[l]),p=m.isOptional&&m.type.equals(m.value(),n),q=p?m.squash:!1,r=m.type.encode(n);if(k){var s=c[f+1];if(q===!1)null!=r&&(j+=L(r)?o(r,b).join("-"):encodeURIComponent(r)),j+=s;else if(q===!0){var t=j.match(/\/$/)?/\/?(.*)/:/(.*)/;j+=s.match(t)[1]}else J(q)&&(j+=q+s)}else{if(null==r||p&&q!==!1)continue;L(r)||(r=[r]),r=o(r,encodeURIComponent).join("&"+l+"="),j+=(g?"&":"?")+(l+"="+r),g=!0}}return j},s.prototype.is=function(a,b){return!0},s.prototype.encode=function(a,b){return a},s.prototype.decode=function(a,b){return a},s.prototype.equals=function(a,b){return a==b},s.prototype.$subPattern=function(){var a=this.pattern.toString();return a.substr(1,a.length-2)},s.prototype.pattern=/.*/,s.prototype.toString=function(){return"{Type:"+this.name+"}"},s.prototype.$normalize=function(a){return this.is(a)?a:this.decode(a)},s.prototype.$asArray=function(a,b){function d(a,b){function d(a,b){return function(){return a[b].apply(a,arguments)}}function e(a){return L(a)?a:H(a)?[a]:[]}function f(a){switch(a.length){case 0:return c;case 1:return"auto"===b?a[0]:a;default:return a}}function g(a){return!a}function h(a,b){return function(c){c=e(c);var d=o(c,a);return b===!0?0===n(d,g).length:f(d)}}function i(a){return function(b,c){var d=e(b),f=e(c);if(d.length!==f.length)return!1;for(var g=0;g<d.length;g++)if(!a(d[g],f[g]))return!1;return!0}}this.encode=h(d(a,"encode")),this.decode=h(d(a,"decode")),this.is=h(d(a,"is"),!0),this.equals=i(d(a,"equals")),this.pattern=a.pattern,this.$normalize=h(d(a,"$normalize")),this.name=a.name,this.$arrayMode=b}if(!a)return this;if("auto"===a&&!b)throw new Error("'auto' array mode is for query parameters only");return new d(this,a)},b.module("ui.router.util").provider("$urlMatcherFactory",t),b.module("ui.router.util").run(["$urlMatcherFactory",function(a){}]),u.$inject=["$locationProvider","$urlMatcherFactoryProvider"],b.module("ui.router.router").provider("$urlRouter",u),v.$inject=["$urlRouterProvider","$urlMatcherFactoryProvider"],b.module("ui.router.state").value("$stateParams",{}).provider("$state",v),w.$inject=[],b.module("ui.router.state").provider("$view",w),b.module("ui.router.state").provider("$uiViewScroll",x),y.$inject=["$state","$injector","$uiViewScroll","$interpolate"],z.$inject=["$compile","$controller","$state","$interpolate"],b.module("ui.router.state").directive("uiView",y),b.module("ui.router.state").directive("uiView",z),D.$inject=["$state","$timeout"],E.$inject=["$state","$stateParams","$interpolate"],b.module("ui.router.state").directive("uiSref",D).directive("uiSrefActive",E).directive("uiSrefActiveEq",E),F.$inject=["$state"],G.$inject=["$state"],b.module("ui.router.state").filter("isState",F).filter("includedByState",G)}(window,window.angular);
 \ No newline at end of file
@@ -765,7 +765,7 @@ function $StateProvider(   $urlRouterProvider,   $urlMatcherFactory) {
         return null;
       }
  
-      // Allow the handler to return a promise to defer state lookup retry
+      // Allow the handlers to return a promise to defer state lookup retry
       if (options.$retry) {
         $urlRouter.update();
         return TransitionFailed;
@@ -122,14 +122,14 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
    * @methodOf ui.router.router.$urlRouterProvider
    *
    * @description
-   * Registers a handler for a given url matching. if handle is a string, it is
+   * Registers a handlers for a given url matching. if handle is a string, it is
    * treated as a redirect, and is interpolated according to the syntax of match
    * (i.e. like `String.replace()` for `RegExp`, or like a `UrlMatcher` pattern otherwise).
    *
-   * If the handler is a function, it is injectable. It gets invoked if `$location`
+   * If the handlers is a function, it is injectable. It gets invoked if `$location`
    * matches. You have the option of inject the match object as `$match`.
    *
-   * The handler can return
+   * The handlers can return
    *
    * - **falsy** to indicate that the rule didn't match after all, then `$urlRouter`
    *   will continue trying to find another one that matches.
@@ -158,7 +158,7 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
     if (isString(what)) what = $urlMatcherFactory.compile(what);
  
     if (!handlerIsString && !isFunction(handler) && !isArray(handler))
-      throw new Error("invalid 'handler' in when()");
+      throw new Error("invalid 'handlers' in when()");
  
     var strategies = {
       matcher: function (what, handler) {
@@ -207,7 +207,7 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
    * If you wish to customize the behavior of syncing the URL (for example, if you wish to
    * defer a transition but maintain the current URL), call this method at configuration time.
    * Then, at run time, call `$urlRouter.listen()` after you have configured your own
-   * `$locationChangeSuccess` event handler.
+   * `$locationChangeSuccess` event handlers.
    *
    * @example
    * <pre>
@@ -226,7 +226,7 @@ function $UrlRouterProvider(   $locationProvider,   $urlMatcherFactory) {
    *     // UserService is an example service for managing user state
    *     if (UserService.isLoggedIn()) return;
    *
-   *     // Prevent $urlRouter's default handler from firing
+   *     // Prevent $urlRouter's default handlers from firing
    *     e.preventDefault();
    *
    *     UserService.handleLogin().then(function() {
@@ -3067,7 +3067,7 @@ function jqLiteDocumentLoaded(action, win) {
     // i.e. it will definitely not be in a $apply
     win.setTimeout(action);
   } else {
-    // No need to unbind this handler as load is only ever called once
+    // No need to unbind this handlers as load is only ever called once
     jqLite(win).on('load', action);
   }
 }
@@ -3349,7 +3349,7 @@ function createEventHandler(element, events) {
       return event.immediatePropagationStopped === true;
     };
  
-    // Some events have special handlers that wrap the real handler
+    // Some events have special handlers that wrap the real handlers
     var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper;
  
     // Copy event handlers in case event handlers array is modified during execution.
@@ -3379,7 +3379,7 @@ function specialMouseHandlerWrapper(target, event, handler) {
   // Read about mouseenter and mouseleave:
   // http://www.quirksmode.org/js/events_mouse.html#link8
   var related = event.relatedTarget;
-  // For mousenter/leave call the handler if related is outside the target.
+  // For mousenter/leave call the handlers if related is outside the target.
   // NB: No relatedTarget if the mouse left/entered the browser window
   if (!related || (related !== target && !jqLiteContains.call(target, related))) {
     handler.call(target, event);
@@ -5992,7 +5992,7 @@ function Browser(window, document, $log, $sniffer) {
  
   /**
    * @private
-   * Remove popstate and hashchange handler from window.
+   * Remove popstate and hashchange handlers from window.
    *
    * NOTE: this api is intended for use only by $rootScope.
    */
@@ -12581,7 +12581,7 @@ function $LocationProvider() {
         defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
             newState, oldState).defaultPrevented;
  
-        // if the location was changed by a `$locationChangeStart` handler then stop
+        // if the location was changed by a `$locationChangeStart` handlers then stop
         // processing this location change
         if ($location.absUrl() !== newUrl) return;
  
@@ -12615,7 +12615,7 @@ function $LocationProvider() {
           var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
               $location.$$state, oldState).defaultPrevented;
  
-          // if the location was changed by a `$locationChangeStart` handler then stop
+          // if the location was changed by a `$locationChangeStart` handlers then stop
           // processing this location change
           if ($location.absUrl() !== newUrl) return;
  
@@ -16308,7 +16308,7 @@ function $RootScopeProvider() {
        * unrolling of the loop.
        *
        * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
-       * Application code can register a `$destroy` event handler that will give it a chance to
+       * Application code can register a `$destroy` event handlers that will give it a chance to
        * perform any necessary cleanup.
        *
        * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
@@ -20994,7 +20994,7 @@ var formDirectiveFactory = function(isNgForm) {
               // action is not prevented. see #1238
               //
               // IE 9 is not affected because it doesn't fire a submit event and try to do a full
-              // page reload if the form was destroyed by submission of the form via a click handler
+              // page reload if the form was destroyed by submission of the form via a click handlers
               // on a button in the form. Looks like an IE9 specific bug.
               var handleFormSubmission = function(event) {
                 scope.$apply(function() {
@@ -24084,7 +24084,7 @@ forEach(
         compile: function($element, attr) {
           // We expose the powerful $event object on the scope that provides access to the Window,
           // etc. that isn't protected by the fast paths in $parse.  We explicitly request better
-          // checks at the cost of speed since event handler expressions are not executed as
+          // checks at the cost of speed since event handlers expressions are not executed as
           // frequently as regular change detection.
           var fn = $parse(attr[directiveName], /* interceptorFn */ null, /* expensiveChecks */ true);
           return function ngEventHandler(scope, element) {
@@ -25893,7 +25893,7 @@ var NgModelController = [&#39;$scope&#39;, &#39;$exceptionHandler&#39;, &#39;$attrs&#39;, &#39;$element&#39;, &#39;$
    * Update the view value.
    *
    * This method should be called when a control wants to change the view value; typically,
-   * this is done from within a DOM event handler. For example, the {@link ng.directive:input input}
+   * this is done from within a DOM event handlers. For example, the {@link ng.directive:input input}
    * directive calls it when the value of the input changes and {@link ng.directive:select select}
    * calls it when an option is selected.
    *
@@ -26909,7 +26909,7 @@ var ngOptionsDirective = [&#39;$compile&#39;, &#39;$parse&#39;, function($compile, $parse) {
       getWatchables: $parse(valuesFn, function(optionValues) {
         // Create a collection of things that we would like to watch (watchedArray)
         // so that they can all be watched using a single $watchCollection
-        // that only runs the handler once if anything changes
+        // that only runs the handlers once if anything changes
         var watchedArray = [];
         optionValues = optionValues || [];
  
@@ -30159,7 +30159,7 @@ if (typeof exports !== &quot;undefined&quot;) {
     return typeof elements.length !== "number" ? [ elements ] : elements;
   };
   /**
- * Add a `mouseover` handler function for a clipped element.
+ * Add a `mouseover` handlers function for a clipped element.
  *
  * @returns `undefined`
  * @private
@@ -30199,7 +30199,7 @@ if (typeof exports !== &quot;undefined&quot;) {
     };
   };
   /**
- * Remove a `mouseover` handler function for a clipped element.
+ * Remove a `mouseover` handlers function for a clipped element.
  *
  * @returns `undefined`
  * @private
@@ -30240,7 +30240,7 @@ if (typeof exports !== &quot;undefined&quot;) {
     return _clientOn.apply(this, _args(arguments));
   };
   /**
- * Unregister an event handler from the client.
+ * Unregister an event handlers from the client.
  * If no `listener` function/object is provided, it will unregister all handlers for the provided `eventType`.
  * If no `eventType` is provided, it will unregister all handlers for every event type.
  *
@@ -2353,7 +2353,7 @@
     return typeof elements.length !== "number" ? [ elements ] : elements;
   };
   /**
- * Add a `mouseover` handler function for a clipped element.
+ * Add a `mouseover` handlers function for a clipped element.
  *
  * @returns `undefined`
  * @private
@@ -2393,7 +2393,7 @@
     };
   };
   /**
- * Remove a `mouseover` handler function for a clipped element.
+ * Remove a `mouseover` handlers function for a clipped element.
  *
  * @returns `undefined`
  * @private
@@ -2434,7 +2434,7 @@
     return _clientOn.apply(this, _args(arguments));
   };
   /**
- * Unregister an event handler from the client.
+ * Unregister an event handlers from the client.
  * If no `listener` function/object is provided, it will unregister all handlers for the provided `eventType`.
  * If no `eventType` is provided, it will unregister all handlers for every event type.
  *
@@ -2488,7 +2488,7 @@
     return typeof elements.length !== "number" ? [ elements ] : elements;
   };
   /**
- * Add a `mouseover` handler function for a clipped element.
+ * Add a `mouseover` handlers function for a clipped element.
  *
  * @returns `undefined`
  * @private
@@ -2528,7 +2528,7 @@
     };
   };
   /**
- * Remove a `mouseover` handler function for a clipped element.
+ * Remove a `mouseover` handlers function for a clipped element.
  *
  * @returns `undefined`
  * @private
@@ -2569,7 +2569,7 @@
     return _clientOn.apply(this, _args(arguments));
   };
   /**
- * Unregister an event handler from the client.
+ * Unregister an event handlers from the client.
  * If no `listener` function/object is provided, it will unregister all handlers for the provided `eventType`.
  * If no `eventType` is provided, it will unregister all handlers for every event type.
  *
@@ -3067,7 +3067,7 @@ function jqLiteDocumentLoaded(action, win) {
     // i.e. it will definitely not be in a $apply
     win.setTimeout(action);
   } else {
-    // No need to unbind this handler as load is only ever called once
+    // No need to unbind this handlers as load is only ever called once
     jqLite(win).on('load', action);
   }
 }
@@ -3349,7 +3349,7 @@ function createEventHandler(element, events) {
       return event.immediatePropagationStopped === true;
     };
  
-    // Some events have special handlers that wrap the real handler
+    // Some events have special handlers that wrap the real handlers
     var handlerWrapper = eventFns.specialHandlerWrapper || defaultHandlerWrapper;
  
     // Copy event handlers in case event handlers array is modified during execution.
@@ -3379,7 +3379,7 @@ function specialMouseHandlerWrapper(target, event, handler) {
   // Read about mouseenter and mouseleave:
   // http://www.quirksmode.org/js/events_mouse.html#link8
   var related = event.relatedTarget;
-  // For mousenter/leave call the handler if related is outside the target.
+  // For mousenter/leave call the handlers if related is outside the target.
   // NB: No relatedTarget if the mouse left/entered the browser window
   if (!related || (related !== target && !jqLiteContains.call(target, related))) {
     handler.call(target, event);
@@ -5992,7 +5992,7 @@ function Browser(window, document, $log, $sniffer) {
  
   /**
    * @private
-   * Remove popstate and hashchange handler from window.
+   * Remove popstate and hashchange handlers from window.
    *
    * NOTE: this api is intended for use only by $rootScope.
    */
@@ -12581,7 +12581,7 @@ function $LocationProvider() {
         defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
             newState, oldState).defaultPrevented;
  
-        // if the location was changed by a `$locationChangeStart` handler then stop
+        // if the location was changed by a `$locationChangeStart` handlers then stop
         // processing this location change
         if ($location.absUrl() !== newUrl) return;
  
@@ -12615,7 +12615,7 @@ function $LocationProvider() {
           var defaultPrevented = $rootScope.$broadcast('$locationChangeStart', newUrl, oldUrl,
               $location.$$state, oldState).defaultPrevented;
  
-          // if the location was changed by a `$locationChangeStart` handler then stop
+          // if the location was changed by a `$locationChangeStart` handlers then stop
           // processing this location change
           if ($location.absUrl() !== newUrl) return;
  
@@ -16308,7 +16308,7 @@ function $RootScopeProvider() {
        * unrolling of the loop.
        *
        * Just before a scope is destroyed, a `$destroy` event is broadcasted on this scope.
-       * Application code can register a `$destroy` event handler that will give it a chance to
+       * Application code can register a `$destroy` event handlers that will give it a chance to
        * perform any necessary cleanup.
        *
        * Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
@@ -20994,7 +20994,7 @@ var formDirectiveFactory = function(isNgForm) {
               // action is not prevented. see #1238
               //
               // IE 9 is not affected because it doesn't fire a submit event and try to do a full
-              // page reload if the form was destroyed by submission of the form via a click handler
+              // page reload if the form was destroyed by submission of the form via a click handlers
               // on a button in the form. Looks like an IE9 specific bug.
               var handleFormSubmission = function(event) {
                 scope.$apply(function() {
@@ -24084,7 +24084,7 @@ forEach(
         compile: function($element, attr) {
           // We expose the powerful $event object on the scope that provides access to the Window,
           // etc. that isn't protected by the fast paths in $parse.  We explicitly request better
-          // checks at the cost of speed since event handler expressions are not executed as
+          // checks at the cost of speed since event handlers expressions are not executed as
           // frequently as regular change detection.
           var fn = $parse(attr[directiveName], /* interceptorFn */ null, /* expensiveChecks */ true);
           return function ngEventHandler(scope, element) {
@@ -25893,7 +25893,7 @@ var NgModelController = [&#39;$scope&#39;, &#39;$exceptionHandler&#39;, &#39;$attrs&#39;, &#39;$element&#39;, &#39;$
    * Update the view value.
    *
    * This method should be called when a control wants to change the view value; typically,
-   * this is done from within a DOM event handler. For example, the {@link ng.directive:input input}
+   * this is done from within a DOM event handlers. For example, the {@link ng.directive:input input}
    * directive calls it when the value of the input changes and {@link ng.directive:select select}
    * calls it when an option is selected.
    *
@@ -26909,7 +26909,7 @@ var ngOptionsDirective = [&#39;$compile&#39;, &#39;$parse&#39;, function($compile, $parse) {
       getWatchables: $parse(valuesFn, function(optionValues) {
         // Create a collection of things that we would like to watch (watchedArray)
         // so that they can all be watched using a single $watchCollection
-        // that only runs the handler once if anything changes
+        // that only runs the handlers once if anything changes
         var watchedArray = [];
         optionValues = optionValues || [];
  
@@ -15,11 +15,11 @@ var BMapLib = window.BMapLib = BMapLib || {};
  
 (function () { 
  
-    /**
-     * 声明baidu包
-     */
+    /**
+     * 声明baidu包
+     */
     var T,
-    baidu = T = baidu || {version: "1.3.8"}; 
+    baidu = T = baidu || {version: "1.3.8"}; 
  
     (function (){
         //提出guid，防止在与老版本Tangram混用时
@@ -34,8 +34,8 @@ var BMapLib = window.BMapLib = BMapLib || {};
         * @ignore
         * @namespace baidu.dom 操作dom的方法。
         */
-        baidu.dom = baidu.dom || {};
-    
+        baidu.dom = baidu.dom || {};
+    
  
         /**
          * 从文档中获取指定的DOM元素
@@ -581,7 +581,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
  
         /**
          * 注册对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.addEventListener(type, handler[, key])
+         * @grammar obj.addEventListener(type, handlers[, key])
          * @param 	{string}   type         自定义事件的名称
          * @param 	{Function} handler      自定义事件被触发时应该调用的回调函数
          * @param 	{string}   [key]		为事件监听函数指定的名称，可在移除时使用。如果不提供，方法会默认为它生成一个全局唯一的key。
@@ -613,7 +613,7 @@ var BMapLib = window.BMapLib = BMapLib || {};
  
         /**
          * 移除对象的事件监听器。引入baidu.lang.Event后，Class的子类实例才会获得该方法。
-         * @grammar obj.removeEventListener(type, handler)
+         * @grammar obj.removeEventListener(type, handlers)
          * @param {string}   type     事件类型
          * @param {Function|string} handler  要移除的事件监听函数或者监听函数的key
          * @remark 	如果第二个参数handler没有被绑定到对应的自定义事件中，什么也不做。
@@ -704,23 +704,23 @@ var BMapLib = window.BMapLib = BMapLib || {};
         baidu.inherits = baidu.lang.inherits;
     })();
  
-
-    /**
+
+    /**
  
-     * 图片的路径
+     * 图片的路径
  
      * @private
-     * @type {String}
+     * @type {String}
  
      */
     var _IMAGE_PATH = 'http://api.map.baidu.com/library/TextIconOverlay/1.2/src/images/m';
  
-    /**
+    /**
  
-     * 图片的后缀名
+     * 图片的后缀名
  
       * @private
-     * @type {String}
+     * @type {String}
  
      */
     var _IMAGE_EXTENSION  = 'png';
@@ -930,72 +930,72 @@ var BMapLib = window.BMapLib = BMapLib || {};
     };
  
  
-    /**
+    /**
  
-     * 当鼠标点击该覆盖物时会触发该事件
+     * 当鼠标点击该覆盖物时会触发该事件
  
-     * @name TextIconOverlay#click
+     * @name TextIconOverlay#click
  
-     * @event
+     * @event
  
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
  
-     * <br />"<b>type</b> : {String} 事件类型
+     * <br />"<b>type</b> : {String} 事件类型
  
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
  
-     *
+     *
  
      */
  
-    /**
+    /**
  
-     * 当鼠标进入该覆盖物区域时会触发该事件
+     * 当鼠标进入该覆盖物区域时会触发该事件
  
-     * @name TextIconOverlay#mouseover
+     * @name TextIconOverlay#mouseover
  
      * @event
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
  
-     * <br />"<b>type</b> : {String} 事件类型
+     * <br />"<b>type</b> : {String} 事件类型
  
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
  
-     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
  
-     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
  
-     *
+     *
  
-     * @example <b>参考示例：</b><br />
+     * @example <b>参考示例：</b><br />
  
-     * myTextIconOverlay.addEventListener("mouseover", function(e) {  alert(e.point);  });
+     * myTextIconOverlay.addEventListener("mouseover", function(e) {  alert(e.point);  });
  
      */
  
-    /**
+    /**
  
-     * 当鼠标离开该覆盖物区域时会触发该事件
+     * 当鼠标离开该覆盖物区域时会触发该事件
  
-     * @name TextIconOverlay#mouseout
+     * @name TextIconOverlay#mouseout
  
-     * @event
+     * @event
  
-     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
+     * @param {Event Object} e 回调函数会返回event参数，包括以下返回值：
  
-     * <br />"<b>type</b> : {String} 事件类型
+     * <br />"<b>type</b> : {String} 事件类型
  
-     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
+     * <br />"<b>target</b>：{BMapLib.TextIconOverlay} 事件目标
  
-     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
+     * <br />"<b>point</b> : {BMap.Point} 最新添加上的节点BMap.Point对象
  
-     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
+     * <br />"<b>pixel</b>：{BMap.pixel} 最新添加上的节点BMap.Pixel对象
  
-     *
+     *
  
-     * @example <b>参考示例：</b><br />
+     * @example <b>参考示例：</b><br />
  
-     * myTextIconOverlay.addEventListener("mouseout", function(e) {  alert(e.point);  });
+     * myTextIconOverlay.addEventListener("mouseout", function(e) {  alert(e.point);  });
  
      */
  
@@ -326,7 +326,7 @@
   EventProxy.prototype.assign = EventProxy.prototype.all;
  
   /**
-   * Assign the only one 'error' event handler.
+   * Assign the only one 'error' event handlers.
    * @param {Function(err)} callback
    */
   EventProxy.prototype.fail = function (callback) {
@@ -334,7 +334,7 @@
  
     that.once('error', function () {
       that.unbind();
-      // put all arguments to the error handler
+      // put all arguments to the error handlers
       // fail(function(err, args1, args2, ...){})
       callback.apply(null, arguments);
     });
@@ -444,7 +444,7 @@
     that._after[group].index++;
     return function (err, data) {
       if (err) {
-        // put all arguments to the error handler
+        // put all arguments to the error handlers
         return that.emit.apply(that, ['error'].concat(SLICE.call(arguments)));
       }
       that.emit(group, {
@@ -499,7 +499,7 @@
   };
  
   /**
-   * Success callback wrapper, will handler err for you.
+   * Success callback wrapper, will handlers err for you.
    *
    * ```js
    * fs.readFile('foo.txt', ep.done('content'));
@@ -535,7 +535,7 @@
     var that = this;
     return function (err, data) {
       if (err) {
-        // put all arguments to the error handler
+        // put all arguments to the error handlers
         return that.emit.apply(that, ['error'].concat(SLICE.call(arguments)));
       }
  
@@ -552,7 +552,7 @@
           // only replace the args when it really return a result
           return that.emit(handler, callback.apply(null, args));
         } else {
-          // put all arguments to the done handler
+          // put all arguments to the done handlers
           //ep.done('some');
           //ep.on('some', function(args1, args2, ...){});
           return that.emit.apply(that, [handler].concat(args));
@@ -39,7 +39,7 @@ function fnPjax(selector, container, options) {
   })
 }
  
-// Public: pjax on click handler
+// Public: pjax on click handlers
 //
 // Exported as $.pjax.click.
 //
@@ -100,7 +100,7 @@ function handleClick(event, container, options) {
   }
 }
  
-// Public: pjax on form submit handler
+// Public: pjax on form submit handlers
 //
 // Exported as $.pjax.submit
 //
@@ -422,7 +422,7 @@ if (&#39;state&#39; in window.history) {
   initialPop = false
 }
  
-// popstate handler takes care of the back and forward buttons
+// popstate handlers takes care of the back and forward buttons
 //
 // You probably shouldn't use pjax on pages with other pushState
 // stuff yet.
@@ -89,7 +89,7 @@ var Demo = function () {
             }
  
             if (lastSelectedLayout != layoutOption) {
-                //layout changed, run responsive handler: 
+                //layout changed, run responsive handlers:
                 App.runResizeHandlers();
             }
             lastSelectedLayout = layoutOption;
@@ -94,7 +94,7 @@ Editableform is linked with one of input types, e.g. &#39;text&#39;, &#39;select&#39; etc.
                     this.input.autosubmit(); 
                 }
  
-                //attach 'cancel' handler
+                //attach 'cancel' handlers
                 this.$form.find('.editable-cancel').click($.proxy(this.cancel, this));
  
                 if(this.input.error) {
@@ -109,7 +109,7 @@ Editableform is linked with one of input types, e.g. &#39;text&#39;, &#39;select&#39; etc.
                     this.$form.find('.editable-submit').removeAttr('disabled');
                     var value = (this.value === null || this.value === undefined || this.value === '') ? this.options.defaultValue : this.value;
                     this.input.value2input(value);
-                    //attach submit handler
+                    //attach submit handlers
                     this.$form.submit($.proxy(this.submit, this));
                 }
  
@@ -917,7 +917,7 @@ Applied as jQuery method.
                 this.destroy();
             }, this)); 
  
-            //attach document handler to close containers on click / escape
+            //attach document handlers to close containers on click / escape
             if(!$(document).data('editable-handlers-attached')) {
                 //close all on escape
                 $(document).on('keyup.editable', function (e) {
@@ -1509,7 +1509,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
                 this.$element.addClass('editable-pre-wrapped');
             }
  
-            //attach handler activating editable. In disabled mode it just prevent default action (useful for links)
+            //attach handlers activating editable. In disabled mode it just prevent default action (useful for links)
             if(this.options.toggle !== 'manual') {
                 this.$element.addClass('editable-click');
                 this.$element.on(this.options.toggle + '.editable', $.proxy(function(e){
@@ -1518,7 +1518,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
                         e.preventDefault();
                     }
  
-                    //stop propagation not required because in document click handler it checks event target
+                    //stop propagation not required because in document click handlers it checks event target
                     //e.stopPropagation();
  
                     if(this.options.toggle === 'mouseenter') {
@@ -2103,7 +2103,7 @@ Makes editable any HTML element on the page. Applied as jQuery method.
         /**
         How to toggle editable. Can be <code>click|dblclick|mouseenter|manual</code>.   
         When set to <code>manual</code> you should manually call <code>show/hide</code> methods of editable.    
-        **Note**: if you call <code>show</code> or <code>toggle</code> inside **click** handler of some DOM element, 
+        **Note**: if you call <code>show</code> or <code>toggle</code> inside **click** handlers of some DOM element,
         you need to apply <code>e.stopPropagation()</code> because containers are being closed on any click on document.
  
         @example
@@ -2402,7 +2402,7 @@ To create your own input you can inherit from this class.
        },
  
        /**
-        attach handler to automatically submit form when value changed (useful when buttons not shown)
+        attach handlers to automatically submit form when value changed (useful when buttons not shown)
        **/
        autosubmit: function() {
  
@@ -144,7 +144,7 @@ $(function(){
        },  
  
        /**
-        Attaches handler to submit form in case of 'showbuttons=false' mode
+        Attaches handlers to submit form in case of 'showbuttons=false' mode
  
         @method autosubmit() 
        **/       
@@ -8056,7 +8056,7 @@ wysihtml5.views.View = Base.extend(
       this.element.innerHTML  = this.textarea.getValue(true);
       this.enable();
  
-      // Make sure our selection handler is ready
+      // Make sure our selection handlers is ready
       this.selection = new wysihtml5.Selection(this.parent);
  
       // Make sure commands dispatcher is ready
@@ -8469,7 +8469,7 @@ wysihtml5.views.View = Base.extend(
     dom.observe(focusBlurElement, "focus", function() {
       that.parent.fire("focus").fire("focus:composer");
  
-      // Delay storing of state until all focus handler are fired
+      // Delay storing of state until all focus handlers are fired
       // especially the one which resets the placeholder
       setTimeout(function() { state = that.getValue(); }, 0);
     });
@@ -536,7 +536,7 @@ $.extend( $.validator, {
 					$( this.findLastActive() || this.errorList.length && this.errorList[ 0 ].element || [])
 					.filter( ":visible" )
 					.focus()
-					// manually trigger focusin event; without it, focusin handler isn't called, findLastActive won't have anything to find
+					// manually trigger focusin event; without it, focusin handlers isn't called, findLastActive won't have anything to find
 					.trigger( "focusin" );
 				} catch ( e ) {
 					// ignore IE throwing errors when focusing hidden elements
@@ -4945,7 +4945,7 @@
 			if(this.settings.checkbox.cascade.indexOf('up') !== -1) {
 				this.element
 					.on('delete_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
+							// apply up (whole handlers)
 							var p = this.get_node(data.parent),
 								m = this._model.data,
 								i, j, c, tmp, t = this.settings.checkbox.tie_selection;
@@ -4969,7 +4969,7 @@
 							}
 						}, this))
 					.on('move_node.jstree', $.proxy(function (e, data) {
-							// apply up (whole handler)
+							// apply up (whole handlers)
 							var is_multi = data.is_multi,
 								old_par = data.old_parent,
 								new_par = this.get_node(data.parent),
@@ -392,7 +392,7 @@ var requirejs, require, define;
         //Support require(['a'])
         callback = callback || function () {};
  
-        //If relName is a function, it is an errback handler,
+        //If relName is a function, it is an errback handlers,
         //so remove it.
         if (typeof relName === 'function') {
             relName = forceSync;
@@ -392,7 +392,7 @@ var requirejs, require, define;
         //Support require(['a'])
         callback = callback || function () {};
  
-        //If relName is a function, it is an errback handler,
+        //If relName is a function, it is an errback handlers,
         //so remove it.
         if (typeof relName === 'function') {
             relName = forceSync;
@@ -976,19 +976,19 @@ dd.fcsjActualCell.tl-yzx div.last-sch-sunken span._badge {
 }
  
 dd.fcsjActualCell div.last-sch-sunken span._badge{
-    font-size: 12px;
-    border-radius: 0 7px 7px 0;
+    font-size: 13px;
+    border-radius: 0 9px 9px 0;
     padding-left: 0;
-    width: 79px;
+    width: 81px;
     display: inline-block;
-    height: 22px;
-    line-height: 22px;
+    height: 23px;
+    line-height: 23px;
     box-shadow: 2px 0px 2px 0 rgba(0,0,0,0.16), 2px 0px 4px 0 rgba(0,0,0,0.12);
     vertical-align: top;
     margin-right: 3px;
     margin-top: 1px;
     margin-left: -7px;
-    /*text-indent: 2px;*/
+    /* text-indent: 2px; */
     border-left: 0;
     /* transform: scale(.9); */
     color: grey;