update

潘钊
1 parent 41b11750
Showing 22 changed files with 882 additions and 114 deletions
src/main/java/com/bsth/controller/realcontrol/LineConfigController.java
src/main/java/com/bsth/controller/realcontrol/RealMapController.java
src/main/java/com/bsth/data/gpsdata/GpsRealData.java
src/main/java/com/bsth/service/realcontrol/LineConfigService.java
src/main/java/com/bsth/service/realcontrol/RealMapService.java
src/main/java/com/bsth/service/realcontrol/impl/LineConfigServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/RealMapServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/assets/js/GeoUtils_min.js
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/css/north.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/multi_dftz.html
src/main/resources/static/real_control_v2/mapmonitor/css/real.css
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_config.html
src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html
src/main/resources/static/real_control_v2/mapmonitor/js/config.js
src/main/resources/static/real_control_v2/mapmonitor/js/gps_tree.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/iMap.js
src/main/resources/static/real_control_v2/mapmonitor/js/map/platform/baidu.js
src/main/resources/static/real_control_v2/mapmonitor/js/map_overlay_manager.js
 package com.bsth.controller.realcontrol;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.bsth.controller.BaseController;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.service.realcontrol.LineConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
 @RestController
 @RequestMapping("/lineConfig")
@@ -39,4 +34,9 @@ public class LineConfigController extends BaseController&lt;LineConfig, Integer&gt;{
 	public Map<String, Object> editOutTimeType(@RequestParam String lineCode, @RequestParam int type){
 		return lineConfigService.editOutTimeType(lineCode, type);
 	}
+
+	@RequestMapping(value = "/getByLineCode")
+	public LineConfig getByLineCode(@RequestParam String lineCode){
+		return lineConfigService.getByLineCode(lineCode);
+	}
 }
@@ -26,4 +26,13 @@ public class RealMapController {
     public Map<String, Object> stationSpatialData(@RequestParam String idx){
         return realMapService.stationSpatialData(idx);
     }
+
+    /**
+     * 停车场
+     * @return
+     */
+    @RequestMapping(value = "/carParkSpatialData")
+    public Map<String, Object> carParkSpatialData(){
+        return realMapService.carParkSpatialData();
+    }
 }
@@ -2,6 +2,7 @@ package com.bsth.data.gpsdata;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.bsth.Application;
 import com.bsth.data.BasicData;
 import com.bsth.data.forecast.ForecastRealServer;
 import com.bsth.data.schedule.DayOfSchedule;
@@ -23,6 +24,7 @@ import org.springframework.stereotype.Component;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 /**
  *
@@ -65,7 +67,7 @@ public class GpsRealData implements CommandLineRunner{
 	@Override
 	public void run(String... arg0) throws Exception {
 		logger.info("gpsDataLoader,20,6");
-		//Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
+		Application.mainServices.scheduleWithFixedDelay(gpsDataLoader, 20, 5, TimeUnit.SECONDS);
 	}
 	public GpsEntity add(GpsEntity gps) {
 package com.bsth.service.realcontrol;
-import java.util.Map;
-
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.service.BaseService;
+import java.util.Map;
+
 public interface LineConfigService extends BaseService<LineConfig, Integer>{
 	Map<String, Object> check(String[] codeArray);
@@ -15,4 +15,5 @@ public interface LineConfigService extends BaseService&lt;LineConfig, Integer&gt;{
 	Map<String, Object> editOutTimeType(String lineCode, int type);
+    LineConfig getByLineCode(String lineCode);
 }
@@ -7,4 +7,6 @@ import java.util.Map;
  */
 public interface RealMapService {
     Map<String, Object> stationSpatialData(String idx);
+
+    Map<String,Object> carParkSpatialData();
 }
 package com.bsth.service.realcontrol.impl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.bsth.common.ResponseCode;
 import com.bsth.data.LineConfigData;
 import com.bsth.entity.realcontrol.LineConfig;
 import com.bsth.repository.realcontrol.LineConfigRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.realcontrol.LineConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 @Service
 public class LineConfigServiceImpl extends BaseServiceImpl<LineConfig, Integer> implements LineConfigService{
@@ -78,4 +77,9 @@ public class LineConfigServiceImpl extends BaseServiceImpl&lt;LineConfig, Integer&gt; 
 		rs.put("type", type);
 		return rs;
 	}
+
+	@Override
+	public LineConfig getByLineCode(String lineCode) {
+		return lineConfigData.get(lineCode);
+	}
 }
@@ -2,6 +2,7 @@ package com.bsth.service.realcontrol.impl;
 import com.bsth.common.ResponseCode;
 import com.bsth.controller.realcontrol.dto.StationSpatialData;
+import com.bsth.entity.CarPark;
 import com.bsth.service.realcontrol.RealMapService;
 import com.google.common.base.Splitter;
 import org.slf4j.Logger;
@@ -52,4 +53,22 @@ public class RealMapServiceImpl implements RealMapService {
         return rs;
     }
+
+    @Override
+    public Map<String, Object> carParkSpatialData() {
+        Map<String, Object> rs = new HashMap();
+
+        try {
+            String sql = "select ID, AREA,PARK_CODE,PARK_NAME,ST_AsText(G_PARK_POINT) as G_PARK_POINT,G_CENTER_POINT,RADIUS,SHAPES_TYPE from bsth_c_car_park WHERE destroy=0";
+
+            List<CarPark> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper(CarPark.class));
+            rs.put("status", ResponseCode.SUCCESS);
+            rs.put("list", list);
+        } catch (Exception e) {
+            logger.error("", e);
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "查询停车场空间数据出现异常！");
+        }
+        return rs;
+    }
 }
@@ -276,8 +276,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				return rs;
 			}
 			//截取工号
-			if(t.getsGh().indexOf("-") != -1){
-				t.setsGh(t.getsGh().split("-")[1]);
+			if(t.getjGh().indexOf("-") != -1){
+				t.setjGh(t.getjGh().split("-")[1]);
 			}
 			t.setScheduleDateStr(schDate);
@@ -1631,7 +1631,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 	 */
 	@Override
 	public Map<String, Object> multi_dftz(List<DfsjChange> dfsjcs) {
-		Map<String, Object> rs = new HashMap<>();
+		Map<String, Object> rs = new HashMap<>()
+				,tempMap = new HashMap<>();
 		List<ScheduleRealInfo> list = new ArrayList<>();
 		ScheduleRealInfo sch,next;
@@ -1639,20 +1640,24 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 			if(StringUtils.isEmpty(dc.getOld_dfsj()) || StringUtils.isEmpty(dc.getNew_dfsj()))
 				continue;
-			sch = dayOfSchedule.get(dc.getSchId());
+			/*sch = dayOfSchedule.get(dc.getSchId());
 			if(sch==null)
 				continue;
 			sch.setDfsjAll(dc.getNew_dfsj());
 			//重新计算终点时间
 			sch.calcEndTime();
-			list.add(sch);
+			list.add(sch);*/
+			tempMap = outgoAdjust(dc.getSchId(),"", dc.getNew_dfsj());
-			next=dayOfSchedule.next(sch);
-			if(next.getQdzName().equals(sch.getZdzName())){
+			if(tempMap.get("status").equals(ResponseCode.SUCCESS)){
+				list.addAll((Collection<? extends ScheduleRealInfo>) tempMap.get("ts"));
+			}
+			//next=dayOfSchedule.next(sch);
+			/*if(next.getQdzName().equals(sch.getZdzName())){
 				next.setQdzArrDateJH(sch.getZdsj());
 				list.add(next);
-			}
+			}*/
 		}
 		rs.put("status", ResponseCode.SUCCESS);
+var BMapLib=window.BMapLib=BMapLib||{};(function(){var a=6370996.81;var b=BMapLib.GeoUtils=function(){};b.isPointInRect=function(f,g){if(!(f instanceof BMap.Point)||!(g instanceof BMap.Bounds)){return false}var e=g.getSouthWest();var h=g.getNorthEast();return(f.lng>=e.lng&&f.lng<=h.lng&&f.lat>=e.lat&&f.lat<=h.lat)};b.isPointInCircle=function(e,h){if(!(e instanceof BMap.Point)||!(h instanceof BMap.Circle)){return false}var i=h.getCenter();var g=h.getRadius();var f=b.getDistance(e,i);if(f<=g){return true}else{return false}};b.isPointOnPolyline=function(f,h){if(!(f instanceof BMap.Point)||!(h instanceof BMap.Polyline)){return false}var e=h.getBounds();if(!this.isPointInRect(f,e)){return false}var m=h.getPath();for(var k=0;k<m.length-1;k++){var l=m[k];var j=m[k+1];if(f.lng>=Math.min(l.lng,j.lng)&&f.lng<=Math.max(l.lng,j.lng)&&f.lat>=Math.min(l.lat,j.lat)&&f.lat<=Math.max(l.lat,j.lat)){var g=(l.lng-f.lng)*(j.lat-f.lat)-(j.lng-f.lng)*(l.lat-f.lat);if(g<2e-10&&g>-2e-10){return true}}}return false};b.isPointInPolygon=function(o,l){if(!(o instanceof BMap.Point)||!(l instanceof BMap.Polygon)){return false}var k=l.getBounds();if(!this.isPointInRect(o,k)){return false}var t=l.getPath();var h=t.length;var n=true;var j=0;var g=2e-10;var s,q;var e=o;s=t[0];for(var f=1;f<=h;++f){if(e.equals(s)){return n}q=t[f%h];if(e.lat<Math.min(s.lat,q.lat)||e.lat>Math.max(s.lat,q.lat)){s=q;continue}if(e.lat>Math.min(s.lat,q.lat)&&e.lat<Math.max(s.lat,q.lat)){if(e.lng<=Math.max(s.lng,q.lng)){if(s.lat==q.lat&&e.lng>=Math.min(s.lng,q.lng)){return n}if(s.lng==q.lng){if(s.lng==e.lng){return n}else{++j}}else{var r=(e.lat-s.lat)*(q.lng-s.lng)/(q.lat-s.lat)+s.lng;if(Math.abs(e.lng-r)<g){return n}if(e.lng<r){++j}}}}else{if(e.lat==q.lat&&e.lng<=q.lng){var m=t[(f+1)%h];if(e.lat>=Math.min(s.lat,m.lat)&&e.lat<=Math.max(s.lat,m.lat)){++j}else{j+=2}}}s=q}if(j%2==0){return false}else{return true}};b.degreeToRad=function(e){return Math.PI*e/180};b.radToDegree=function(e){return(180*e)/Math.PI};function d(g,f,e){if(f!=null){g=Math.max(g,f)}if(e!=null){g=Math.min(g,e)}return g}function c(g,f,e){while(g>e){g-=e-f}while(g<f){g+=e-f}return g}b.getDistance=function(j,h){if(!(j instanceof BMap.Point)||!(h instanceof BMap.Point)){return 0}j.lng=c(j.lng,-180,180);j.lat=d(j.lat,-74,74);h.lng=c(h.lng,-180,180);h.lat=d(h.lat,-74,74);var f,e,i,g;f=b.degreeToRad(j.lng);i=b.degreeToRad(j.lat);e=b.degreeToRad(h.lng);g=b.degreeToRad(h.lat);return a*Math.acos((Math.sin(i)*Math.sin(g)+Math.cos(i)*Math.cos(g)*Math.cos(e-f)))};b.getPolylineDistance=function(f){if(f instanceof BMap.Polyline||f instanceof Array){var l;if(f instanceof BMap.Polyline){l=f.getPath()}else{l=f}if(l.length<2){return 0}var j=0;for(var h=0;h<l.length-1;h++){var k=l[h];var g=l[h+1];var e=b.getDistance(k,g);j+=e}return j}else{return 0}};b.getPolygonArea=function(t){if(!(t instanceof BMap.Polygon)&&!(t instanceof Array)){return 0}var R;if(t instanceof BMap.Polygon){R=t.getPath()}else{R=t}if(R.length<3){return 0}var w=0;var D=0;var C=0;var L=0;var J=0;var F=0;var E=0;var S=0;var H=0;var p=0;var T=0;var I=0;var q=0;var e=0;var M=0;var v=0;var K=0;var N=0;var s=0;var O=0;var l=0;var g=0;var z=0;var Q=0;var G=0;var j=0;var A=0;var o=0;var m=0;var y=0;var x=0;var h=0;var k=0;var f=0;var n=a;var B=R.length;for(var P=0;P<B;P++){if(P==0){D=R[B-1].lng*Math.PI/180;C=R[B-1].lat*Math.PI/180;L=R[0].lng*Math.PI/180;J=R[0].lat*Math.PI/180;F=R[1].lng*Math.PI/180;E=R[1].lat*Math.PI/180}else{if(P==B-1){D=R[B-2].lng*Math.PI/180;C=R[B-2].lat*Math.PI/180;L=R[B-1].lng*Math.PI/180;J=R[B-1].lat*Math.PI/180;F=R[0].lng*Math.PI/180;E=R[0].lat*Math.PI/180}else{D=R[P-1].lng*Math.PI/180;C=R[P-1].lat*Math.PI/180;L=R[P].lng*Math.PI/180;J=R[P].lat*Math.PI/180;F=R[P+1].lng*Math.PI/180;E=R[P+1].lat*Math.PI/180}}S=Math.cos(J)*Math.cos(L);H=Math.cos(J)*Math.sin(L);p=Math.sin(J);T=Math.cos(C)*Math.cos(D);I=Math.cos(C)*Math.sin(D);q=Math.sin(C);e=Math.cos(E)*Math.cos(F);M=Math.cos(E)*Math.sin(F);v=Math.sin(E);K=(S*S+H*H+p*p)/(S*T+H*I+p*q);N=(S*S+H*H+p*p)/(S*e+H*M+p*v);s=K*T-S;O=K*I-H;l=K*q-p;g=N*e-S;z=N*M-H;Q=N*v-p;m=(g*s+z*O+Q*l)/(Math.sqrt(g*g+z*z+Q*Q)*Math.sqrt(s*s+O*O+l*l));m=Math.acos(m);G=z*l-Q*O;j=0-(g*l-Q*s);A=g*O-z*s;if(S!=0){o=G/S}else{if(H!=0){o=j/H}else{o=A/p}}if(o>0){y+=m;k++}else{x+=m;h++}}var u,r;u=y+(2*Math.PI*h-x);r=(2*Math.PI*k-y)+x;if(y>x){if((u-(B-2)*Math.PI)<1){f=u}else{f=r}}else{if((r-(B-2)*Math.PI)<1){f=r}else{f=u}}w=(f-(B-2)*Math.PI)*n*n;return w}})();
 \ No newline at end of file
@@ -11,6 +11,7 @@ audio, canvas, img, svg, video {
 html, body {
     width: 100%;
     height: 100%;
+    overflow: hidden;
 }
 .main-container {
@@ -38,7 +38,7 @@
 }
 .north-toolbar {
-    width: 590px;
+    width: 595px;
     position: absolute;
     right: 10px;
 }
@@ -48,7 +48,17 @@
     <script>
         (function() {
             var modal = '#schedule-multi-dftz-modal';
+            var lineConfig;
+            var dateStr = moment().format('YYYY-MM-DD');
+
             $(modal).on('init', function(e, data) {
+                var firstSch = data.list[0];
+                //获取线路配置信息
+                $.get('/lineConfig/getByLineCode', {lineCode: firstSch.xlBm}, function (config) {
+                    //console.log('线路配置', config);
+                    lineConfig=config;
+                });
+
                 var bodyHtml = template('schedule-multi-dftz-table-temp', data);
                 $('.multi-dftz-table .ct_table_body', modal).html(bodyHtml);
@@ -93,8 +103,8 @@
             });
             var valChange = function() {
-                var old = moment($(this).data('old'), "HH:mm"),
-                    now = moment($(this).val(), "HH:mm"),
+                var old = correctDate(moment(dateStr+$(this).data('old'), "YYYY-MM-DDHH:mm")),
+                    now = correctDate(moment(dateStr+$(this).val(), "YYYY-MM-DDHH:mm")),
                     diff = now.diff(old) / 1000 / 60,
                     span = $(this).next('.modify-num');
@@ -104,6 +114,17 @@
                     span.text('');
                 } else
                     span.addClass('negative').text('-' + Math.abs(diff));
+            };
+
+
+            function correctDate(d){
+                //小于线路运营开始时间，加一天
+                if(lineConfig){
+                    var time = d.format('HH:mm');
+                    if(time < lineConfig.startOpt)
+                        d.add(1, 'days');
+                }
+                return d;
             }
             //drag....
@@ -320,10 +320,56 @@
     background: rgba(255, 255, 255, 0.98);
     box-shadow: 0 8px 17px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
     display: none;
+
+    padding-top: 10px;
 }
 .station-route-tree{
+    height: 100%;
+    overflow: auto;
+    padding: 0 0 0 9px;
+}
+
+.top-right-toggle{
+    position: absolute;
+    right: 2px;
+    top: 2px;
+}
+
+.top-right-toggle ul.uk-subnav{
+    display: none;
+}
+
+.top-right-toggle ul.uk-subnav>li{
+    padding-left: 0;
+}
+
+.top-right-toggle ul.uk-subnav>li>a{
+    padding: 0 3px;
+    font-size: 13px;
+}
+
+.real_spatial_body{
     width: 100%;
     height: 100%;
+    transition: all .3s ease;
+}
+
+.real_spatial_body.show-tab{
+    height: calc(100% - 28px);
+    margin-top: 28px;
+}
+
+.real_spatial_body #spatial-tree-content{
+    height: 100%;
+}
+
+.real_spatial_body #spatial-tree-content li.car-park-item,
+.real_spatial_body #spatial-tree-content li.station-route-item{
+    height: 100%;
     overflow: auto;
+}
+
+#spatial-tree-content .jstree-default .jstree-anchor{
+    font-size: 13px;
 }
 \ No newline at end of file
@@ -14,8 +14,8 @@
                 <span class="uk-form-label">空间数据</span>
                 <div class="uk-form-controls">
                     <label><input type="checkbox" name="spatial_data_station" {{if spatialData.station}}checked{{/if}}> 站点</label>
-                    <label><input type="checkbox" {{if spatialData.electronicFence}}checked{{/if}}> 电子围栏</label>
-                    <label><input type="checkbox" {{if spatialData.carPark}}checked{{/if}}> 停车场</label>
+                    <label><input type="checkbox" name="spatial_electronicFence" {{if spatialData.electronicFence}}checked{{/if}}> 电子围栏</label>
+                    <label><input type="checkbox" name="spatial_data_carPark" {{if spatialData.carPark}}checked{{/if}}> 停车场</label>
                 </div>
             </div>
 <div>
     <script id="map-win-gps-detail-temp" type="text/html">
-        <div class="gps_info_win" >
+        <div class="gps_info_win">
             <h4>{{nbbm}}</h4>
             <h5>
                 {{lineName}}
@@ -23,5 +23,64 @@
             <a href="javascript:;" style="float: right;">轨迹回放</a>
         </div>
     </script>
-</div>
-<!-- 2222 -->
 \ No newline at end of file
+
+    <script id="map-win-station-detail-temp" type="text/html">
+        <div class="gps_info_win">
+            <h4>{{stationName}}</h4>
+            <p>方向:
+                {{if directions==0}}
+                    上行
+                {{else if directions==1}}
+                    下行
+                {{/if}}
+            </p>
+            <p>站点编码： {{stationCode}}</p>
+            <p>站点类型：
+                {{if stationMark=='B'}}
+                起点站
+                {{else if stationMark=='E'}}
+                终点站
+                {{else if stationMark=='Z'}}
+                中途站
+                {{/if}}
+            </p>
+            <p>
+                经度: {{lon}}
+            </p>
+            <p>纬度: {{lat}}</p>
+            {{if distances > 0}}
+                <p>到站距离: {{distances}} 公里</p>
+            {{/if}}
+            <p>
+                电子围栏类型：
+                {{if shapesType=='r'}}
+                圆形
+                {{else if shapesType=='d'}}
+                多边形
+                {{/if}}
+            </p>
+            <p>
+                {{if shapesType=='r'}}
+                半径：{{radius}}
+                {{else if shapesType=='d'}}
+                面积：{{_polygonArea}} 平方米
+                {{/if}}
+            </p>
+        </div>
+    </script>
+
+    <script id="map-win-carpark-detail-temp" type="text/html">
+        <div class="gps_info_win">
+            <h4>{{parkName}}</h4>
+            <p>停车场编码： {{parkCode}}</p>
+            <p>面积：{{area}}</p>
+            <p>
+                {{if shapesType=='r'}}
+                电子围栏半径：{{radius}}
+                {{else if shapesType=='d'}}
+                电子围栏面积：{{_polygonArea}} 平方米
+                {{/if}}
+            </p>
+        </div>
+    </script>
+</div>
 \ No newline at end of file
@@ -84,7 +84,9 @@ var gb_map_config = (function () {
     var handler = {
         map_type: changeMapType,
         traffic: trafficSwitch,
-        spatial_data_station: spatial_data_station
+        spatial_data_station: spatial_data_station,
+        spatial_data_carPark: spatial_data_carPark,
+        spatial_electronicFence: spatial_electronicFence
     };
     //切换地图类型
@@ -113,7 +115,26 @@ var gb_map_config = (function () {
     //空间数据 站点
     function spatial_data_station(val) {
         defaultConfig.spatialData.station=this.checked;
-        gb_map_spatial_data.refresh();
+        if(!this.checked)
+            gb_map_imap.call('hideAllStationMarker');
+        gb_map_spatial_data.refresh('station', this.checked);
+    }
+    
+    //空间数据 停车场
+    function spatial_data_carPark(val) {
+        defaultConfig.spatialData.carPark=this.checked;
+        if(!this.checked)
+            gb_map_imap.call('hideDrawCarpark');
+        gb_map_spatial_data.refresh('carPark', this.checked);
+    }
+    
+    //空间数据 电子围栏
+    function spatial_electronicFence(val) {
+        defaultConfig.spatialData.electronicFence=this.checked;
+        if(this.checked)
+            gb_map_overlay_mge.drawElectronicFence();
+        else
+            gb_map_imap.call('hideAllCircles');
     }
     function recursion_get_attr(data, attr) {
@@ -24,8 +24,9 @@ var gb_map_gps_tree = (function () {
                 cb && cb();
             })
             .on('activate_node.jstree', function (e, n) {
+                //console.log('activate_node.jstree', e, n);
                 var node = n.node;
-                if(node.a_attr && node.a_attr.type=='device'){
+                if(node.a_attr && node.a_attr.type=='device' && node.state.checked){
                     var device = node.a_attr.device;
                     gb_map_overlay_mge._focus(device);
                 }
@@ -55,6 +56,10 @@ var gb_map_gps_tree = (function () {
                         }
                     }
                 },
+                //local storage里的key
+                'state':{
+                    'key': 'jstree_map_devices'
+                },
                 'plugins': ['checkbox', 'contextmenu', 'state']
             });
     };
@@ -34,6 +34,7 @@ var gb_map_imap = (function () {
                 alertErr('不存在的地图实例' + mapName);
         },
         createCarIcon: createCarIcon,
+        createStationIcon: createStationIcon,
         call: function (f, opts) {
             var instance = maps[currentMap].instance;
             if (instance[f])
@@ -66,11 +67,50 @@ var gb_map_imap = (function () {
         //文字
         ctx.font = "14px arial";
         ctx.fillStyle = "#fff";
-        ctx.fillText(gps.nbbm, 8, 18);
+        ctx.fillText(gps.nbbm, 4, 18);
         return canvas.toDataURL();
     }
+    //绘制站点icon
+    function createStationIcon(station, w) {
+        var canvas = $('<canvas></canvas>')[0];
+        var ctx = canvas.getContext('2d');
+
+/*        var color=station.directions==0?'#125688':'#fb1804'
+            ,bg='rgba(255, 255, 255, 0.87)';*/
+
+        var color='#fff',
+            bg=station.directions==0?'#125688':'#fb1804';
+        //矩形
+        //ctx.roundRect(0, 0, w, 17, 1).stroke();
+        ctx.rect(-1,-1,w,17);
+        ctx.fillStyle = bg;
+        ctx.fill();
+        //ctx.lineWidth = 1;
+        //ctx.strokeStyle=color;
+        //ctx.stroke();
+
+        //文字
+        ctx.font = "12px arial";
+        ctx.fillStyle = color;
+        ctx.fillText(station.stationName, 2, 12);
+
+        //角
+        var c=w/2;
+        ctx.beginPath();
+        ctx.moveTo(c - 7,16);
+        ctx.lineTo(c,24);
+        ctx.lineTo(c + 7,16);
+        ctx.closePath();
+
+        ctx.fillStyle = bg;
+        ctx.fill();
+        ctx.strokeStyle='#fff';
+        ctx.stroke();
+        return canvas.toDataURL();
+    }
+
     function color(g) {
         var colours = {};
         switch (g.state) {
@@ -2,15 +2,20 @@
 var gb_map_baidu = (function(){
 	var map;
-	var realMarkers = {};
 	var topMarker;
 	//实时路况是否打开
-	var traffVisible;
-	//线路 Polyline
-	var linePolyline;
-
+	//var traffVisible;
+	var realMarkers = {};
+	//路段对照
 	var polylines={};
-	var buffAreas = {};
+	//站点merker
+	var stationMarkers = {};
+	//电子围栏对照
+	var electronicFences = {};
+	//停车场对照
+	var carparks = {};
+	//var buffAreas = {};
+
 	var ctrl;
 	var baiduInstance = {
@@ -51,15 +56,17 @@ var gb_map_baidu = (function(){
 			//$('#tcWrap.maplibTc').addClass('animated bounceInLeft');
 			//$('.maplibTcBtn_deskTop.anchorTR').remove();
+/*			//缩放事件
+			map.addEventListener("zoomend", function(type, target){
+				//console.log('zoomend', type, target, map.getZoom());
+				//刷新站点marker
+				refreshStation();
+			});*/
 		},
 		destroy: function(){
 			realMarkers = {};
-			linePolyline = [];
-		}/*,
-		clear: function(){
-			realMarkers = {};
-			map.clearOverlays();
-		}*/,
+			//linePolyline = [];
+		},
 		//画线路图层
 		drawLine: function(opt){
 			if(polylines[opt.id])
@@ -105,15 +112,7 @@ var gb_map_baidu = (function(){
 			var pos=polylines[opt.id].getPath();
 			console.log('定位到中心,,,', pos[parseInt(pos.length / 2)]);
 			map.setCenter(pos[parseInt(pos.length / 2)]);
-		}/*,
-		removeLine: function(opts){
-			var polyline=polylines[opts.key];
-			if(polyline){
-					map.removeOverlay(polyline);
-					polylines[opts.key]=null;
-					delete polylines[opts.key];
-			}
-		}*/,
+		},
 		//绘制GPS信号
 		drawRealGpsMarker: function(opts){
 			var gpsArray = opts.gpsList;
@@ -139,6 +138,65 @@ var gb_map_baidu = (function(){
 				}
 			});
 		},
+		//绘制站点marker
+		drawStationMarker: function (opt) {
+			this.hideAllStationMarker();
+
+			var array=opt.list, marker;
+			$.each(array, function () {
+				if(stationMarkers[this.stationCode]){
+					stationMarkers[this.stationCode].show();
+					return true;
+				}
+
+				transCoord(this);
+				marker=createStationMark(this);
+				map.addOverlay(marker);
+				stationMarkers[this.stationCode]=marker;
+			});
+		},
+		hideAllStationMarker: function () {
+			for(var code in stationMarkers){
+				stationMarkers[code].hide();
+			}
+		},
+		//绘制停车场
+		drawCarpark: function (opt) {
+			var list = opt.list;
+			var config = gb_map_config.getConfig()
+				,color = config.section.color.up;
+
+			this.hideDrawCarpark();
+			$.each(list, function () {
+				if(carparks[this.parkCode]){
+					carparks[this.parkCode].show();
+					return true;
+				}
+
+				transMultiWGSToBd(this);
+				var polygon = new BMap.Polygon(this.bdPoints, {strokeColor: color, strokeWeight: 1});
+				map.addOverlay(polygon);
+				carparks[this.parkCode]=polygon;
+
+				//中心点
+				var ts = this.gCenterPoint.split(' ')
+					,coord = TransGPS.wgsToBD(parseFloat(ts[1]), parseFloat(ts[0]));
+				polygon._centerPoint = new BMap.Point(coord.lng, coord.lat);
+
+				//info window
+				polygon.infoWin = new BMap.InfoWindow(gb_map_overlay_mge.map_carpark_win_temp(this), {});
+				polygon.addEventListener('click', function(){
+					console.log('aaa', this);
+					map.openInfoWindow(this.infoWin, this._centerPoint);
+				});
+			});
+		},
+		//隐藏停车场
+		hideDrawCarpark: function () {
+			for(var code in carparks){
+				carparks[code].hide();
+			}
+		},
 		clearAll: function () {
 			//清除所有覆盖物
 			realMarkers = {};
@@ -165,45 +223,86 @@ var gb_map_baidu = (function(){
 					}
 			});
 		},
-		//定位到marker
+		//定位到车辆 marker
 		goToMarker: function(opts){
 			var deviceId = opts.deviceId
 				,m = realMarkers[deviceId];
 			if(m){
-				map.panTo(m.point);
-				setTop(m);
+				map.panTo(m.point, {noAnimation: true});
+				//setTop(m);
+			}
+		},
+		//定位到站点
+		goToStation: function (stationCode) {
+			var m = stationMarkers[stationCode];
+			if(m){
+				map.panTo(m.point, {noAnimation: true});
+				map.openInfoWindow(m.infoWin, m.point);
+			}
+		},
+		//定位到停车场
+		goToCarpark: function (parkCode) {
+			var polygon = carparks[parkCode];
+			if(polygon){
+				map.panTo(polygon._centerPoint, {noAnimation: true});
+				map.openInfoWindow(polygon.infoWin, polygon._centerPoint);
 			}
 		},
-		//打开信息窗口
+		//打开车辆信息窗口
 		openWindow: function(opts){
 			var deviceId = opts.deviceId
 				,m = realMarkers[deviceId];
 			bdOpenWindow(m);
 		},
+		//打开站点信息窗口
+		openStationWin: function (opt) {
+
+		},
 		//绘制圆形
-		drawCircle: function(opts){
-			var coord = TransGPS.wgsToBD(opts.lat, opts.lon);
-			var circle = new BMap.Circle(new BMap.Point(coord.lng, coord.lat), opts.radius);
-			if(opts.color)
-				circle.setStrokeColor(opts.color);
-			if(opts.weight)
-				circle.setStrokeWeight(opts.weight);
+		drawCircle: function(opt){
+			if(electronicFences[opt.id]){
+				electronicFences[opt.id].show();
+				return;
+			}
+
+			var coord = TransGPS.wgsToBD(opt.lat, opt.lon);
+			var circle = new BMap.Circle(new BMap.Point(coord.lng, coord.lat), opt.radius);
+			circle.setStrokeColor(opt.color);
+			circle.setStrokeWeight(opt.weight);
 			map.addOverlay(circle);
-			buffAreas[opts.id] = circle;
+			electronicFences[opt.id] = circle;
+		},
+		hideAllCircles: function () {
+			for(var code in electronicFences){
+				electronicFences[code].hide();
+			}
 		},
 		//绘制多边形
-		drawPolygon: function(opts){
-			var wgs,coord, points = [];
-			$.each(opts.cds, function(){
-				wgs = this.split(' ');
-				coord = TransGPS.wgsToBD(parseFloat(wgs[1]), parseFloat(wgs[0]));
-				points.push(new BMap.Point(coord.lng, coord.lat));
-			});
+		drawPolygon: function(opt){
+			var station = opt.station
+				,code = station.stationCode;
+			if(electronicFences[code]){
+				electronicFences[code].show();
+				return;
+			}
-			var polygon = new BMap.Polygon(points, {strokeColor: opts.color, strokeWeight: opts.weight, strokeOpacity: 0.7});
+			transMultiWGSToBd(station);
+			var polygon = new BMap.Polygon(station.bdPoints, {strokeColor: opt.color, strokeWeight: opt.weight});
 			map.addOverlay(polygon);
-			buffAreas[opts.id] = polygon;
+			electronicFences[code]=polygon;
+
+/*
+			//计算多边形面积
+			var area=BMapLib.GeoUtils.getPolygonArea(polygon);
+			if(!isNaN(area))
+				polygon._polygonArea=area+'米';
+			else
+				polygon._polygonArea='计算失败';
+
+			polygon.addEventListener('click', function(){
+				map.openInfoWindow(this.infoWin, marker.point);
+			});*/
 		},
 		//删除缓冲区
 		clearBuffArea: function(code){
@@ -214,6 +313,65 @@ var gb_map_baidu = (function(){
 		}
 	};
+	function transMultiWGSToBd(obj) {
+		if(!obj._gPoints)
+			return;
+		var bdPoints = [],coord;
+		$.each(obj._gPoints, function () {
+			coord = TransGPS.wgsToBD(this.lat, this.lng);
+			bdPoints.push(new BMap.Point(coord.lng, coord.lat));
+		});
+
+		obj.bdPoints=bdPoints;
+	}
+	
+/*	function transCoordCarpark(carpark) {
+		var pStr = carpark.gParkPoint.substring(9, carpark.gParkPoint.length - 2);
+		var pArr = filterPolygonCoords(pStr.split(',')), coord, points=[];
+
+		$.each(pArr, function (i, str) {
+			var c = str.split(' ');
+			coord = TransGPS.wgsToBD(parseFloat(c[1]), parseFloat(c[0]));
+			points.push(new BMap.Point(coord.lng, coord.lat));
+		});
+		carpark.bdPoints=points;
+	}
+	
+	function transPolygonStation(opt) {
+		var pStr = opt.polygon.substring(9, opt.polygon.length - 2);
+		var pArr = filterPolygonCoords(pStr.split(',')), coord, points=[];
+
+		$.each(pArr, function (i, str) {
+			var c = str.split(' ');
+			coord = TransGPS.wgsToBD(parseFloat(c[1]), parseFloat(c[0]));
+			points.push(new BMap.Point(coord.lng, coord.lat));
+		});
+		opt.bdPoints=points;
+	}*/
+
+/*	//处理多边形点数组
+	function filterPolygonCoords(pArr) {
+		var newArr=[];
+		//去掉已闭合的尾
+		var end=pArr.length - 1;
+		if(pArr.length > 1 && pArr[0] == pArr[end])
+			pArr = pArr.slice(0, end);
+
+		//去掉连续的重复点
+		var last;
+		$.each(pArr, function (i, str) {
+			if(last){
+				if(last != str)
+					newArr.push(str);
+			}
+			else
+				newArr.push(str);
+			last = str;
+		});
+
+		return newArr;
+	}*/
+
 	function transCoord(gps) {
 		var coord = TransGPS.wgsToBD(gps.lat, gps.lon);
 		gps.bd_lat = coord.lat;
@@ -231,9 +389,10 @@ var gb_map_baidu = (function(){
 		var marker = new BMap.Marker(point);
 		//根据编码长度 计算marker 宽度
-		var w = gpsData.nbbm.length * 10;
+		var w = calcGpsMarkerWidth(gpsData.nbbm);//gpsData.nbbm.length * 10;
 		marker.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gpsData, w), new BMap.Size(w,25)));
+		marker._icon_width=w;
 		marker.infoWindow = new BMap.InfoWindow(bd_gps_info_win_opts);
 		marker.gpsData = gpsData;
 		//click
@@ -241,8 +400,52 @@ var gb_map_baidu = (function(){
 			bdOpenWindow(this);
 		});
 		//mouseover
-		marker.addEventListener('mouseover', function(){
+		/*marker.addEventListener('mouseover', function(){
 			setTop(this);
+		});*/
+		marker.setTop(true);
+		return marker;
+	}
+
+	//为每个数字定义宽度
+/*	var icon_num_width=[
+		7,6,7,7,7,7,7,7,7,7
+	];*/
+	function calcGpsMarkerWidth(nbbm) {
+		var width=0;
+		$.each(nbbm.split(''), function () {
+			if(!isNaN(this))
+				width += 7;//icon_num_width[this];
+			else if(this=='-')
+				width += 10;
+			else
+				width += 16;
+		});
+		return width;
+	}
+	
+	function createStationMark(statio) {
+		var point = new BMap.Point(statio.bd_lon, statio.bd_lat);
+		var marker = new BMap.Marker(point);
+
+		//根据编码长度 计算marker 宽度
+		var w = statio.stationName.length * 12 + 4
+			,iw=w-2;
+		var icon = new BMap.Icon(gb_map_imap.createStationIcon(statio, w), new BMap.Size(iw,24), {anchor: new BMap.Size(iw/2,24)})
+		marker.setIcon(icon);
+
+		//信息窗口
+		marker.infoWin=new BMap.InfoWindow(gb_map_overlay_mge.map_station_win_temp(statio), {});
+		marker.addEventListener('click', function(){
+			map.openInfoWindow(this.infoWin, this.point);
+		});
+
+		//mouseover
+		marker.addEventListener('mouseover', function(){
+			this.setTop(true);
+		});
+		marker.addEventListener('mouseout', function () {
+			this.setTop(false);
 		});
 		return marker;
 	}
@@ -269,12 +472,18 @@ var gb_map_baidu = (function(){
 		});
 	}*/
+/*	function refreshStation() {
+		//console.log('refreshStation', map.getZoom());
+		var zoom=map.getZoom();
+
+	}*/
+
 	function moveMarker(m, gps){
 		m.setPosition(new BMap.Point(gps.bd_lon, gps.bd_lat));
 		m.gpsData = gps;
 		//重新设置icon
 		//根据编码长度 计算marker 宽度
-		var w = gps.nbbm.length * 10;
+		var w = m._icon_width;//calcGpsMarkerWidth(gps.nbbm);//gps.nbbm.length * 10;
 		m.setIcon(new BMap.Icon(gb_map_imap.createCarIcon(gps, w), new BMap.Size(w,25)));
 		//更新 infoWindow
@@ -106,18 +106,105 @@ var gb_map_overlay_mge = (function () {
         //打开信息窗口
         gb_map_imap.call('openWindow',{deviceId: deviceId});
     };
+
+    //站点获得焦点
+    var _focus_station = function (station) {
+        gb_map_imap.call('goToStation', station.stationCode);
+    }
+
+    //停车场获得焦点
+    var _focus_carpark = function (carpark) {
+        //console.log('_focus_carpark', carpark);
+        gb_map_imap.call('goToCarpark', carpark.parkCode);
+    }
     function getCheckedDevice() {
         return gb_map_gps_tree.getChecked().filter(deviceFilter);
     }
+
+    //绘制站点
+    var drawStation = function () {
+        var list = gb_map_spatial_data.getCheckedStation();
+        //绘制站点
+        gb_map_imap.call('drawStationMarker', {list: list});
+        //绘制电子围栏
+        drawElectronicFence(list);
+    }
+
+    //绘制电子围栏
+    var drawElectronicFence = function (list) {
+        var config = gb_map_config.getConfig().spatialData;
+        if(!config.electronicFence)
+            return;
+
+        if(!list){
+            list = gb_map_spatial_data.getCheckedStation();
+        }
+
+
+        gb_map_imap.call('hideAllCircles');
+        $.each(list, function () {
+            fun=this.shapesType=='r'?drawCircle:drawPolygon;
+            fun(this);
+        });
+    }
+
+    //绘制停车场
+    var drawCarpark = function () {
+        var list = gb_map_spatial_data.gteCheckedCarpark();
+        gb_map_imap.call('drawCarpark', {list: list});
+    }
+
+    var drawCircle=function (data) {
+        var config = gb_map_config.getConfig().section.color;
+        var color = data.directions==0?config.up:config.down;
+
+        var opt = {
+            lon: data.lon,
+            lat: data.lat,
+            text: data.stationName,
+            color: color,
+            weight: 2,
+            radius: parseFloat(data.radius),
+            id: data.stationCode
+        };
+
+        gb_map_imap.call('drawCircle', opt);
+    }
+
+    var drawPolygon=function (data) {
+        var config = gb_map_config.getConfig().section.color;
+        var color = data.directions==0?config.up:config.down;
+
+        var opt = {
+            //id:data.stationCode,
+            color: color,
+            weight: 2,
+            station: data
+        };
+
+        gb_map_imap.call('drawPolygon', opt);
+    }
+    
     return {
         init: init,
         refresh: showOverlayByChecks,
         _focus: _focus,
+        _focus_station: _focus_station,
+        _focus_carpark: _focus_carpark,
         map_gps_win_temp: function (data) {
             return temps['map-win-gps-detail-temp'](data);
         },
+        map_station_win_temp: function (data) {
+            return temps['map-win-station-detail-temp'](data);
+        },
+        map_carpark_win_temp: function (data) {
+            return temps['map-win-carpark-detail-temp'](data);
+        },
         reDraw: reDraw,
-        getCheckedDevice: getCheckedDevice
+        getCheckedDevice: getCheckedDevice,
+        drawStation: drawStation,
+        drawElectronicFence: drawElectronicFence,
+        drawCarpark: drawCarpark
     };
 })();
 \ No newline at end of file
@@ -13,13 +13,28 @@ var gb_map_spatial_data = (function () {
         return str.substr(1);
     })();
+    var cont = '#spatial-tree-content';
     //线路站点路由数据
     var lineStationArr;
+    //停车场数据
+    var carparkArr;
     var init = function () {
+        //加载站点路由数据
         gb_common.$get('/realMap/stationSpatialData', {idx: line_idx}, function (rs) {
             var list = rs.list;
+            $.each(list, function () {
+                this.lat = this.gLaty;
+                this.lon = this.gLonx;
+                delete this.gLaty;
+                delete this.gLonx;
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gPolygonGrid);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
             //排序
             list.sort(function (a, b) {
                 return a.stationRouteCode - b.stationRouteCode;
@@ -31,42 +46,232 @@ var gb_map_spatial_data = (function () {
                 lineStationArr[lineCode] = gb_common.groupBy(lineStationArr[lineCode], 'directions');
             }
+            ep.emitLater('station');
+        });
+
+        //加载停车场数据
+        gb_common.$get('/realMap/carParkSpatialData', {}, function (rs) {
+            carparkArr = rs.list;
+            $.each(carparkArr, function () {
+                if(this.shapesType=='d'){
+                    var calcRs = calcPolygonArea(this.gParkPoint);
+                    this._polygonArea = calcRs._polygonArea;
+                    this._gPoints = calcRs._gPoints;
+                }
+            });
+            ep.emitLater('carpark');
+        });
+
+        var ep = EventProxy.create('station', 'carpark', function () {
+            $(".real_spatial_panel").resizable({
+                maxHeight: '100%',
+                minHeight: 18
+            });
+
+            //绘制站点路由树
+            $('.station-route-tree', cont)
+            //state插件 状态恢复完成
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawStation);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_station(node.data);
+                })
+                .jstree({
+                'core': {
+                    'data': get_st_route_tree_data()
+                },
+                'checkbox': {
+                    'keep_selected_style': false,
+                    'whole_node': false,
+                    'tie_selection': false
+                },
+                //local storage里的key
+                'state': {
+                    'key': 'jstree_map_station_route'
+                },
+                'plugins': ['checkbox', 'state']
+            });
+
+
+            //停车场
+            $('.carpark-panel', cont)
+                .on('state_ready.jstree', function () {
+                    //绑定checkbox状态切换事件
+                    $(this).on('check_node.jstree uncheck_node.jstree', gb_map_overlay_mge.drawCarpark);
+                })
+                .on('activate_node.jstree', function (e, n) {
+                    var node = n.node;
+                    if(node.state.checked)
+                        gb_map_overlay_mge._focus_carpark(node.data);
+                })
+                .jstree({
+                'core': {
+                    'data': get_st_carpark_tree_data()
+                },
+                'checkbox': {
+                    'keep_selected_style': false,
+                    'whole_node': false,
+                    'tie_selection': false
+                },
+                //local storage里的key
+                'state': {
+                    'key': 'jstree_map_carpark'
+                },
+                'plugins': ['checkbox', 'state']
+            });
+
             refresh();
         });
     }
-    var refresh = function () {
+    //计算多边形面积
+    function calcPolygonArea(polygonStr) {
+        var pStr = polygonStr.substring(9, polygonStr.length - 2);
+        var array = pStr.split(',');
+        var newArr=[];
+
+        //递归去掉闭合的尾
+        (function () {
+            var f = arguments.callee;
+            var end=array.length - 1;
+            if(array.length > 1 && array[0] == array[end]){
+                array = array.slice(0, end);
+                f();
+            }
+        })();
+
+        //去掉连续的重复点
+        var last;
+        $.each(array, function (i, str) {
+            if(last){
+                if(last != str)
+                    newArr.push(str);
+            }
+            else
+                newArr.push(str);
+            last = str;
+        });
+
+        var gPoints=[],ts;
+        $.each(newArr, function (i, c) {
+            ts=c.split(' ');
+            gPoints.push({
+                lat: parseFloat(ts[1]),
+                lng: parseFloat(ts[0])
+            });
+        });
+
+        //用百度geo工具库计算面积
+        var _polygonArea = BMapLib.GeoUtils.getPolygonArea(gPoints);
+        return {_polygonArea: _polygonArea.toFixed(2), _gPoints: gPoints};
+    }
+
+    var refresh = function (type, checked) {
         if (!triggerElem())
             return;
-        //绘制站点路由树
-        $('.station-route-tree').jstree({
-            'core': {
-                'data': get_st_route_tree_data()
-            },
-            'checkbox': {
-                'keep_selected_style': false,
-                'whole_node': false,
-                'tie_selection': false
-            },
-            'plugins': ['checkbox', 'state']
-        });
+        if ((type == 'carPark' && checked) || (type == 'station' && !checked)) {
+            //显示停车场面板
+            $('.car-park-item', cont).addClass('uk-active');
+            $('li.cp-tab-btn', '.real_spatial_panel').addClass('uk-active');
+            $('.carpark-panel', cont).jstree(true).check_all();
+
+            //绘制停车场
+            gb_map_overlay_mge.drawCarpark();
+        }
+        else {
+            //显示站点路由面板
+            $('.station-route-item', cont).addClass('uk-active');
+            $('li.sr-tab-btn', '.real_spatial_panel').addClass('uk-active');
+
+            //选中相关站点路由树
+            var chs = gb_map_overlay_mge.getCheckedDevice();
+            var idx = {};
+            $.each(chs, function () {
+                idx[this.data.lineId + '_' + this.data.upDown] = 1;
+            });
+
+            var treeObj = $('.station-route-tree', cont).jstree(true);
+            for (var id in idx) {
+                treeObj.check_node(treeObj.get_node(id + '_st'));
+            }
+
+            //drawStation();
+            gb_map_overlay_mge.drawStation();
+        }
     }
     var triggerElem = function () {
-        var config = gb_map_config.getConfig().spatialData
-            , elem = $('.real_spatial_panel');
+        var config = gb_map_config.getConfig().spatialData;
-        for (var att in config) {
-            if (config[att]) {
-                elem.show();
-                return true;
-            }
+        if(config.station || config.carPark){
+            showPanel();
+            return true;
         }
-        elem.hide();
+        hidePanel();
+        gb_map_imap.call('hideAllStationMarker');
+        gb_map_imap.call('hideDrawCarpark');
         return false;
     }
+    var animationend = 'webkitAnimationEnd animationend';
+    var showPanel = function () {
+        var elem = $('.real_spatial_panel');
+        var config = gb_map_config.getConfig().spatialData;
+
+        if (config.station && config.carPark) {
+            anim_show($('.uk-subnav', elem), 'uk-animation-scale-up');
+            $('.real_spatial_body', elem).addClass('show-tab');
+        }
+        else {
+            $('.uk-subnav', elem).hide();
+            $('.real_spatial_body', elem).removeClass('show-tab');
+        }
+
+        $('li.uk-active', elem).removeClass('uk-active');
+
+        if (!elem.is(":hidden"))
+            return;
+
+        anim_show(elem, 'uk-animation-slide-left');
+    }
+
+    var hidePanel = function () {
+        var elem = $('.real_spatial_panel');
+        elem.hide();
+    }
+
+    function anim_show(e, anim) {
+        e.addClass(anim).show().one(animationend, function () {
+            $(this).removeClass(anim);
+        });
+    }
+
+    function getCheckedStation() {
+        var list = [];
+        var chs = $('.station-route-tree', cont).jstree(true).get_checked(true);
+        chs = chs.filter(function (item) {
+            return item.data;
+        });
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+    
+    function gteCheckedCarpark() {
+        var list = [];
+        var chs = $('.carpark-panel', cont).jstree(true).get_checked(true);
+        $.each(chs, function () {
+            list.push(this.data);
+        });
+        return list;
+    }
+
     var get_st_route_tree_data = function () {
         var treeData = [];
@@ -74,14 +279,17 @@ var gb_map_spatial_data = (function () {
             name = gb_data_basic.codeToLine[lineCode].name;
             treeData.push({
                 'text': name,
+                'open': true,
                 'children': [
                     {
                         'text': '上行',
                         'children': grabs(lineStationArr[lineCode][0]),
+                        'id': lineCode + '_0_st'
                     },
                     {
                         'text': '下行',
                         'children': grabs(lineStationArr[lineCode][1]),
+                        'id': lineCode + '_1_st'
                     }
                 ]
             })
@@ -89,6 +297,19 @@ var gb_map_spatial_data = (function () {
         return treeData;
     };
+    var get_st_carpark_tree_data = function () {
+        var treeData = [];
+
+        $.each(carparkArr, function () {
+            treeData.push({
+                'text': this.parkName,
+                'data': this
+            });
+        });
+
+        return treeData;
+    }
+
     var grabs = function (array) {
         if (!array)
             return;
@@ -96,7 +317,7 @@ var gb_map_spatial_data = (function () {
         $.each(array, function () {
             rs.push({
                 'text': this.stationName,
-                'data': {},
+                'data': this,
                 'icon': false
             });
         });
@@ -105,6 +326,8 @@ var gb_map_spatial_data = (function () {
     return {
         refresh: refresh,
-        init: init
+        init: init,
+        getCheckedStation:getCheckedStation,
+        gteCheckedCarpark: gteCheckedCarpark
     };
 })();
 \ No newline at end of file
@@ -25,16 +25,29 @@
     <div class="real_bl_cont">
     </div>
-    <div class="real_br_cont map_config_wrap">
-    </div>
+    <div class="real_br_cont map_config_wrap"></div>
 </div>
-<div class="real_spatial_panel uk-animation-scale">
-    <div class="station-route-tree">
-
+<div class="real_spatial_panel">
+    <div class="top-right-toggle">
+        <ul class="uk-subnav uk-subnav-pill" data-uk-switcher="{connect:'#spatial-tree-content'}">
+            <li class="sr-tab-btn"><a>站点</a></li>
+            <li class="cp-tab-btn"><a>停车场</a></li>
+        </ul>
+    </div>
+    <div class="real_spatial_body">
+        <ul id="spatial-tree-content" class="uk-switcher">
+            <li class="station-route-item">
+                <div class="station-route-tree"></div>
+            </li>
+            <li class="car-park-item">
+                <div class="carpark-panel"></div>
+            </li>
+        </ul>
     </div>
 </div>
+<script src="/real_control_v2/assets/js/GeoUtils_min.js"></script>
 <script src="/real_control_v2/mapmonitor/js/config.js"></script>
 <script src="/real_control_v2/mapmonitor/js/gps_tree.js"></script>
 <script src="/real_control_v2/mapmonitor/js/spatial_data.js"></script>