update...

潘钊
1 parent caf50a20
Showing 8 changed files with 267 additions and 58 deletions
src/main/java/com/bsth/entity/geo_data/GeoStation.java
src/main/java/com/bsth/service/geo_data/impl/GeoDataServiceImpl.java
src/main/resources/static/assets/js/baidu/bd_GeoUtils_min.js
src/main/resources/static/pages/base/geo_data_edit/fragments/f_station_route.html
src/main/resources/static/pages/base/geo_data_edit/js/map.js
src/main/resources/static/pages/base/geo_data_edit/js/station_route.js
src/main/resources/static/pages/base/geo_data_edit/js/submit.js
src/main/resources/static/pages/base/geo_data_edit/main.html
 package com.bsth.entity.geo_data;
  
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.List;
+
 /**
  * Created by panzhao on 2017/12/7.
  */
@@ -25,8 +29,11 @@ public class GeoStation {
  
     private Float gLaty;
  
+    @JsonIgnore
     private String gPolygonGrid;
  
+    private List<String> bdCoords;
+
     private Integer radius;
  
     private String shapesType;
@@ -134,4 +141,12 @@ public class GeoStation {
     public void setShapesType(String shapesType) {
         this.shapesType = shapesType;
     }
+
+    public List<String> getBdCoords() {
+        return bdCoords;
+    }
+
+    public void setBdCoords(List<String> bdCoords) {
+        this.bdCoords = bdCoords;
+    }
 }
@@ -39,6 +39,10 @@ public class GeoDataServiceImpl implements GeoDataService {
  
             List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
  
+            for(GeoStation station : list){
+                if(station.getShapesType().equals("d"))
+                    station.setBdCoords(multiWgsToBd(station.getgPolygonGrid(), 9, 3));
+            }
             map.put("status", ResponseCode.SUCCESS);
             map.put("list", list);
         }catch (Exception e){
@@ -59,7 +63,7 @@ public class GeoDataServiceImpl implements GeoDataService {
             List<GeoRoad> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoRoad.class));
  
             for(GeoRoad road : list){
-                road.setBdCoords(multiWgsToBd(road.getGsectionVector()));
+                road.setBdCoords(multiWgsToBd(road.getGsectionVector(), 11, 2));
             }
             map.put("status", ResponseCode.SUCCESS);
             map.put("list", list);
@@ -88,17 +92,32 @@ public class GeoDataServiceImpl implements GeoDataService {
             station.setgLonx(Float.parseFloat(String.valueOf(loc.getLng())));
  
             String sql;
-            if(station.getShapesType().equals("r")){
-                sql = "update bsth_c_station set g_lonx=?, g_laty=?, radius=? where station_cod=?";
-                int rsCount = jdbcTemplate.update(sql, station.getgLonx(), station.getgLaty(), station.getRadius(), station.getStationCode());
+            String shapesType = station.getShapesType();
+            int rsCount = -1;
+            if(shapesType.equals("r")){
+                sql = "update bsth_c_station set g_lonx=?, g_laty=?, radius=?,shapes_type='r' where station_cod=?";
+                rsCount = jdbcTemplate.update(sql, station.getgLonx(), station.getgLaty(), station.getRadius(), station.getStationCode());
+            }
+            else if(shapesType.equals("d")){
+                //多边形坐标转换
+                String bdPolygon = "POLYGON(("  + station.getgPolygonGrid() +"))";
+                String wgsPolygon = "POLYGON(("  + bdPolygon2Wgs(station.getgPolygonGrid()) +"))";
+                sql = "update bsth_c_station set g_lonx=?, g_laty=?,shapes_type='d', radius=null,b_polygon_grid=ST_GeomFromText('"+bdPolygon+"'),g_polygon_grid=ST_GeomFromText('"+wgsPolygon+"') where station_cod=?";
+
+                rsCount = jdbcTemplate.update(sql, station.getgLonx(), station.getgLaty(), station.getStationCode());
+            }
  
-                if(rsCount > 0){
-                    sql = "SELECT t1.*, t2.g_lonx,g_laty,ST_AsText (g_polygon_grid) AS g_polygon_grid,radius,shapes_type FROM (SELECT id,station_name,station_route_code,line_code,station_code,station_mark,versions,directions FROM bsth_c_ls_stationroute WHERE id="+station.getId()+" AND destroy = 0) t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod";
-                    List list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
+            //从数据库里重新查询对象
+            if(rsCount > 0){
+                sql = "SELECT t1.*, t2.g_lonx,g_laty,ST_AsText (g_polygon_grid) AS g_polygon_grid,radius,shapes_type FROM (SELECT id,station_name,station_route_code,line_code,station_code,station_mark,versions,directions FROM bsth_c_ls_stationroute WHERE id="+station.getId()+" AND destroy = 0) t1 LEFT JOIN bsth_c_station t2 ON t1.station_code = t2.station_cod";
+                List<GeoStation> list = jdbcTemplate.query(sql, BeanPropertyRowMapper.newInstance(GeoStation.class));
  
-                    rs.put("station", list.get(0));
-                    rs.put("status", ResponseCode.SUCCESS);
+                for(GeoStation s : list){
+                    if(s.getShapesType().equals("d"))
+                        s.setBdCoords(multiWgsToBd(s.getgPolygonGrid(), 9, 3));
                 }
+                rs.put("station", list.get(0));
+                rs.put("status", ResponseCode.SUCCESS);
             }
  
         }catch (Exception e){
@@ -109,22 +128,40 @@ public class GeoDataServiceImpl implements GeoDataService {
         return rs;
     }
  
+
+    private String bdPolygon2Wgs(String bdPolygon){
+        StringBuilder wgsPolygon = new StringBuilder();
+        List<String> list = Splitter.on(",").splitToList(bdPolygon);
+        String[] array;
+
+        TransGPS.Location location;
+        for(String p : list){
+            array = p.split(" ");
+            location =TransGPS.transformFromGCJToWGS(TransGPS.bd_decrypt(TransGPS.LocationMake(Double.parseDouble(array[0]), Double.parseDouble(array[1]))));
+
+            wgsPolygon.append(location.getLng() + " " + location.getLat() + ",");
+        }
+
+        if(wgsPolygon.length() > 0){
+            wgsPolygon.deleteCharAt(wgsPolygon.length() - 1);
+        }
+        return wgsPolygon.toString();
+    }
+
     /**
      * wgs 坐标数组转 百度
      *
      * @return
      */
-    private List<String> multiWgsToBd(String crdStr) {
+    private List<String> multiWgsToBd(String crdStr, int si, int ei) {
         List<String> bdList = new ArrayList<>();
  
-        List<String> gList = Splitter.on(",").splitToList(crdStr.substring(11, crdStr.length() - 2));
+        List<String> gList = Splitter.on(",").splitToList(crdStr.substring(si, crdStr.length() - ei));
         TransGPS.Location location;
-        //StringBuilder itemStr = new StringBuilder();
         String[] cds;
         for(String gs : gList){
             cds = gs.split(" ");
             location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(TransGPS.LocationMake(Double.parseDouble(cds[0]), Double.parseDouble(cds[1]))));
-            //itemStr.append(location.getLng() + " " + location.getLat() + ",");
  
             bdList.add(location.getLng() + " " + location.getLat());
         }
+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
@@ -75,7 +75,7 @@
                             <option value="r" {{shapesType=='r'?'selected':''}}>圆形</option>
                             <option value="d" {{shapesType=='d'?'selected':''}}>多边形</option>
                         </select>
-                        <span class="draw_polygon_switch" data-type="1"><a>暂停绘制</a></span>
+                        <span class="draw_polygon_switch" data-type="{{shapesType=='d'?'3':'1'}}"><a>{{shapesType=='d'?'重新绘制':'暂停绘制'}}</a></span>
                     </div>
                     <div class="uk-inline">
                         <span class="uk-form-icon uk-form-icon-flip" >半径</span>
@@ -21,6 +21,7 @@ var gb_ct_map = function () {
     var map_status=0;
     var editCircle;
     var editPolygon;
+    var dragMarker;
  
     map = new BMap.Map($(gb_map_consts.mapContainer)[0], {enableMapClick: false});
     //中心点和缩放级别
@@ -65,6 +66,7 @@ var gb_ct_map = function () {
             marker=createStationMark(this);
             marker.stationCode = this.stationCode;
             marker.ct_data = this;
+            marker.ct_source='1';
             map.addOverlay(marker);
  
             array.push(marker);
@@ -93,6 +95,7 @@ var gb_ct_map = function () {
             polyline = new BMap.Polyline(pos, style);
             polyline.ct_data = item;
             polyline.ct_data.oldColor = color;
+            polyline.ct_source='1';
             map.addOverlay(polyline);
  
             polyline.addEventListener('mouseover', function(){
@@ -290,7 +293,7 @@ var gb_ct_map = function () {
  
         var cp = calcCenterPoint(p.ct_data.bdCoords);
         openRoadInfoWin(p, new BMap.Point(cp.longitude, cp.latitude));
-    }
+    };
  
     var calcCenterPoint = function (coords) {
         var array = [], strs;
@@ -300,14 +303,18 @@ var gb_ct_map = function () {
         }
  
         return geolib.getCenter(array);
-    }
+    };
  
     var exitEditBufferStatus = function (s) {
         map_status = 0;
         enabledOtherElem();
         gb_station_route.hideEditPanel();
  
-        map.removeOverlay(editCircle);
+        clearOtherOverlay();
+        reSetDragMarker();//关闭marker 拖拽
+
+        clearEditBuffer();
+        //map.removeOverlay(editCircle);
  
         openStationInfoWin(getStationMarker(s.stationCode, s.directions));
     };
@@ -321,52 +328,98 @@ var gb_ct_map = function () {
         map.closeInfoWindow();//关闭infoWindow
         gb_station_route.clearFocus();
         gb_station_route.focus(s);
-        clearOldOverlay();
         disabledOtherElem();
         gb_station_route.showEditPanel(s);
  
         var marker = getStationMarker(s.stationCode, s.directions);
+        setDragMarker(marker);//站点 点位可拖拽
+
         map.centerAndZoom(marker.point, 18);
         var bElem = openBufferOverlay(marker);
  
         if(s.shapesType=='r'){
             //lineupdate
             bElem.addEventListener('lineupdate', function (e) {
-                //console.log('lineupdatelineupdate', e);
-                //var ec = e.target;
-                //var radius = ec.getRadius().toFixed(2);
-                //console.log('getRadius', ec.getRadius(), radius);
                 gb_station_route.reWriteEditPanel(e.target);
             });
         }
+        else if(s.shapesType=='d'){
+            //调整多边形
+
+        }
     };
-    
-    var clearOldOverlay = function () {
-        map.removeOverlay(editCircle);
-        map.removeOverlay(editPolygon);
-    }
+
+    var setDragMarker = function (marker) {
+        marker.enableDragging();
+        dragMarker = marker;
+        dragMarker._old_point = dragMarker.point;
+        //监听拖拽事件 dragging
+        dragMarker.addEventListener('dragging', dragMarkerDragEvent);
+    };
+
+    var dragMarkerDragEvent = function () {
+        if(editPolygon){
+            if(!BMapLib.GeoUtils.isPointInPolygon(this.point, editPolygon))
+                dragMarker.setPosition(dragMarker._old_point);//还原位置
+
+            gb_station_route.reWriteEditPanel(this, true);
+        }
+        else if(editCircle){
+            editCircle.disableEditing();
+            //缓冲区跟随点位运动
+            editCircle.setCenter(this.point);
+            editCircle.enableEditing();
+        }
+    };
+
+    var reSetDragMarker = function () {
+        if(dragMarker){
+            dragMarker.setPosition(dragMarker._old_point);
+            dragMarker.removeEventListener('dragging', dragMarkerDragEvent);
+            dragMarker.disableDragging();
+            dragMarker = null;
+        }
+    };
+
+
+/*    var removeDragMarkerEvent = function () {
+        dragMarker.removeEventListener('dragging', dragMarkerDragEvent);
+    };*/
  
     /**
      * 禁用其他元素
      */
     var disabledOtherElem = function () {
         $('.main_left_panel_m_layer').show();
-    }
+    };
  
     var enabledOtherElem = function () {
         $('.main_left_panel_m_layer').hide();
-    }
+    };
  
     var openBufferOverlay = function (m) {
         var elem;
         var data = m.ct_data;
         if(data.shapesType=='r'){
-            var circle = new BMap.Circle(m.point,data.radius, {strokeColor: '#E91E63'/*updownColor(data.directions)*/});
-            map.addOverlay(circle);
-            circle.enableEditing();
+            elem = new BMap.Circle(m.point,data.radius, {strokeColor: '#E91E63'/*updownColor(data.directions)*/});
+            editCircle = elem;
         }
-        editCircle = circle;
-        return circle;
+        else if(data.shapesType=='d'){
+            var array = data.bdCoords;
+            var pos = [];
+            var temp = [];
+            for(var i=0,c;c=array[i++];){
+                temp = c.split(' ');
+                pos.push(new BMap.Point(temp[0], temp[1]));
+            }
+
+            elem = new BMap.Polygon(pos);
+            editPolygon = elem;
+        }
+
+        map.addOverlay(elem);
+        elem.enableEditing();
+        return elem;
     };
  
     /**
@@ -379,6 +432,8 @@ var gb_ct_map = function () {
         transCoord(s);
         m.ct_data = s;
         m.setPosition(new BMap.Point(s.bd_lon, s.bd_lat));
+        m._old_point = this.point;
+        m.disableDragging();
     }
  
     var topOverlay;
@@ -395,29 +450,82 @@ var gb_ct_map = function () {
      */
     var _drawingManager;
     var changeShapeType = function (v) {
-        if(v == 'd'){
-            map.removeOverlay(editCircle);
+        clearEditBuffer();
  
+        if(v == 'd'){
             _drawingManager = new BMapLib.DrawingManager(map,{});
             _drawingManager.open();
+            _drawingManager.enableCalculate();
             _drawingManager.setDrawingMode('polygon');
  
             //绘制结束事件
-            _drawingManager.addEventListener('polygoncomplete', function (e) {
-                console.log('end ', e);
+            _drawingManager.addEventListener('overlaycomplete', function (e) {
+                editPolygon = e.overlay;
                 gb_station_route.drawEnd();
             });
         }
+        else if(v == 'r'){
+            updateDragRadius(80);
+            /*map.removeOverlay(editCircle);
+            map.removeOverlay(editPolygon);
+
+            //以站点为中心，生成一个默认的圆
+            var marker = getStationMarker(s.stationCode, s.directions);
+            editCircle = new BMap.Circle(marker.point,s.radius?s.radius:50, {strokeColor: '#E91E63'});
+            editCircle.enableEditing();
+            map.addOverlay(editCircle);*/
+        }
+    };
+
+    var clearEditBuffer = function () {
+        map.removeOverlay(editCircle);
+        map.removeOverlay(editPolygon);
+        editCircle = null;
+        editPolygon = null;
+    };
+
+    var updateDragRadius = function (radius) {
+        if(!editCircle){
+            clearOtherOverlay();
+            var s = gb_station_route.getRealEditStation();
+
+            //以站点为中心，生成一个默认的圆
+            var marker = getStationMarker(s.stationCode, s.directions);
+            var circle = new BMap.Circle(marker.point,s.radius?s.radius:80, {strokeColor: '#E91E63'});
+
+            setTimeout(function () {
+                circle.enableEditing();
+            }, 200);
+            map.addOverlay(circle);
+
+            editCircle = circle;
+        }
+
+        editCircle.setRadius(radius);
     };
  
     var exitDrawStatus = function () {
-        if(_drawingManager)
+        if(_drawingManager){
+            clearOtherOverlay();
             _drawingManager.close();
+        }
     };
  
     var openDrawStatus = function () {
-        if(_drawingManager)
+        if(_drawingManager){
+            clearOtherOverlay();
             _drawingManager.open();
+        }
+    };
+
+    var clearOtherOverlay = function () {
+        var all = map.getOverlays();
+        for(var i=0,obj; obj=all[i++];){
+            if(obj.ct_source && obj.ct_source=='1')
+                continue;
+            map.removeOverlay(obj);
+            //obj = null;
+        }
     };
     res_load_ep.emitLater('load_map');
     return {
@@ -430,6 +538,10 @@ var gb_ct_map = function () {
         exitEditBufferStatus: exitEditBufferStatus,
         changeShapeType: changeShapeType,
         exitDrawStatus: exitDrawStatus,
-        openDrawStatus: openDrawStatus
+        openDrawStatus: openDrawStatus,
+        getDrawPolygon: function () {
+            return editPolygon;
+        },
+        updateDragRadius: updateDragRadius
     };
 }();
 \ No newline at end of file
@@ -77,9 +77,11 @@ var gb_station_route = function () {
         return null;
     };
  
+    var realEditStation;
     var callbackHandler = {
         edit_buffer: function (station) {
             //编辑缓冲区
+            realEditStation = station;
             gb_ct_map.editStationBuffer(station);
         }
     };
@@ -123,7 +125,7 @@ var gb_station_route = function () {
  
     var edPanelRunFlag;
     var ecObj;
-    var reWriteEditPanel = function (ec) {
+    var reWriteEditPanel = function (ec, isPolygon) {
         if(edPanelRunFlag){
             ecObj = ec;
             return;
@@ -132,9 +134,14 @@ var gb_station_route = function () {
         edPanelRunFlag = true;
         setTimeout(function () {
             var panel = $('.buffer_edit_panel');
-            $('[name=radius]', panel).val(parseInt(ecObj.getRadius()));//半径
+            var p;
+            if(!isPolygon){
+                $('[name=radius]', panel).val(parseInt(ecObj.getRadius()));//半径
+                p = ecObj.getCenter();
+            }else{
+                p = ecObj.point;
+            }
  
-            var p = ecObj.getCenter();
             $('[name=gLaty]', panel).val(p.lat);
             $('[name=gLonx]', panel).val(p.lng);
             edPanelRunFlag = false;
@@ -146,16 +153,18 @@ var gb_station_route = function () {
         for(var i=0,item; item=array[i++];){
             if(item.stationCode==s.stationCode){
                 s.index = i;
-                array.splice(i, 1, s);
+                array.splice(i - 1, 1, s);
                 break;
             }
         }
     };
  
+
+    var $editWrap = '.buffer_edit_panel>.buffer_edit_body';
     /**
      * 缓冲区编辑 取消
      */
-    $(document).on('click', '.buffer_edit_panel>.buffer_edit_body button.cancel', function (e) {
+    $(document).on('click', $editWrap + ' button.cancel', function (e) {
         var f = $(this).parents('form');
         var data = f.serializeJSON();
  
@@ -165,26 +174,38 @@ var gb_station_route = function () {
     /**
      * 缓冲区编辑 切换缓冲区类型（圆形，多边形）
      */
-    $(document).on('click', '.buffer_edit_panel>.buffer_edit_body select[name=shapesType]', function (e) {
+    $(document).on('change', $editWrap +' select[name=shapesType]', function (e) {
         var v = $(this).val();
-
-        gb_ct_map.changeShapeType(v);
         if(v=='d'){
             $('.buffer_edit_panel .shapes_type').addClass('st_d');
-
-
-            //
-            //UIkit.notification("使用鼠标在地图上绘制多边形，可点击上发“暂停绘制”链接，退出绘制模式，以拖拽地图", {status: 'primary', pos: 'bottom-center'})
         }
         else{
             $('.buffer_edit_panel .shapes_type').removeClass('st_d');
+            $('input[name=radius]', $editWrap).val(80);
         }
+        gb_ct_map.changeShapeType(v);
+    });
+
+    /**
+     * 半径修改
+     */
+    var update_radius_flag, update_radius;
+    $(document).on('input', $editWrap +' input[name=radius]', function (e) {
+        update_radius = $(this).val();
+        if(update_radius_flag){
+            return;
+        }
+        update_radius_flag = true;
+        setTimeout(function () {
+            gb_ct_map.updateDragRadius(update_radius);
+            update_radius_flag = false;
+        }, 180);
     });
  
     /**
      * 缓冲区编辑 切换绘制模式
      */
-    var drawPolygonSwitch = '.buffer_edit_panel>.buffer_edit_body .draw_polygon_switch';
+    var drawPolygonSwitch = $editWrap +' .draw_polygon_switch';
     $(document).on('click', drawPolygonSwitch, function (e) {
         var type = $(this).data('type');
         if(type==1){
@@ -196,6 +217,10 @@ var gb_station_route = function () {
             gb_ct_map.openDrawStatus();
             $(this).data('type', 1).find('a').text('暂停绘制');
         }
+        else if(type==3){
+            gb_ct_map.changeShapeType('d');
+            $(this).data('type', 1).find('a').text('暂停绘制');
+        }
     });
  
     /**
@@ -221,6 +246,9 @@ var gb_station_route = function () {
         hideEditPanel: hideEditPanel,
         reWriteEditPanel: reWriteEditPanel,
         update: update,
-        drawEnd: drawEnd
+        drawEnd: drawEnd,
+        getRealEditStation: function () {
+            return realEditStation;
+        }
     };
 }();
 \ No newline at end of file
@@ -10,13 +10,27 @@ var gb_data_submit = function () {
         var f = $(this).parents('form');
         var data = f.serializeJSON();
         UIkit.modal.confirm('确定保存【'+data.stationName+'】的缓冲区信息？').then(function() {
+            if(data.shapesType=='d'){
+                var polygon = gb_ct_map.getDrawPolygon();
+                if(null == polygon){
+                    alert('失败，无法获取到 polygon..');
+                    return;
+                }
+                var pos = polygon.getPath();
+                //闭合
+                pos.push(pos[0]);
+                var gPolygonGrid = '';
+                for(var i=0,p;p=pos[i++];){
+                    gPolygonGrid += (p.lng + " " + p.lat + ",");
+                }
+                data.gPolygonGrid = gPolygonGrid.substr(0, gPolygonGrid.length - 1);
+            }
  
-            //console.log('aaa',f, f.serializeJSON());
+            //gb_ct_map.removeDragMarkerEvent();
             show_run_text('正在提交缓冲区信息');
             gb_common.$post('/_geo_data/updateBufferInfo', data, function (rs) {
                 hide_run_text();
                 UIkit.notification("提交成功！", {status: 'success'});
-
                 //更新前端数据
                 gb_station_route.update(rs.station);
                 gb_ct_map.updateStation(rs.station);
@@ -102,6 +102,8 @@
 <script src="/real_control_v2/geolib/geolib.js" ></script>
 <!-- jquery contextMenu -->
 <script src="/real_control_v2/assets/js/jquery.contextMenu.min.js"  ></script>
+<script src="/assets/js/baidu/bd_GeoUtils_min.js"  ></script>
+
 <script>
     var $loadPanel = $('body>.loading');
     //___________________________________
@@ -130,7 +132,7 @@
                 //路段
                 eq.once('init_road', function () {
                     gb_road_route.init(g_emit('init_map'))
-                })
+                });
                 //地图
                 eq.once('init_map', function () {
                     gb_ct_map._render(g_emit('end'));