OpenLayers OpenLayers

Changeset 558

Show
Ignore:
Timestamp:
06/08/06 12:13:42 (3 years ago)
Author:
crschmidt
Message:

Commit changes to include a 'minor' flag on setCenter, that indicates that a map should not call the moveend trigger.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/openlayers/lib/OpenLayers/Control/MouseDefaults.js

    r384 r558  
    7171                                                 size.h / 2 + deltaY); 
    7272                var newCenter = this.map.getLonLatFromScreenPx( newXY );  
    73                 this.map.setCenter(newCenter); 
     73                this.map.setCenter(newCenter, null, true); 
    7474                this.mouseDragStart = evt.xy.copyOf(); 
    7575            } 
     
    9696            this.map.viewPortDiv.removeChild(document.getElementById("zoomBox")); 
    9797            this.zoomBox = null; 
     98        } else { 
     99            this.map.setCenter(this.map.center); 
    98100        } 
    99101        this.mouseDragStart = null; 
  • trunk/openlayers/lib/OpenLayers/Control/MouseToolbar.js

    r556 r558  
    3535        var sz = new OpenLayers.Size(28,28); 
    3636        var centered = this.position; 
    37         this._addButton("zoombox", "drag-rectangle-off.png", "drag-rectangle-on.png", centered, sz); 
     37        this._addButton("zoombox", "drag-rectangle-off.png", "drag-rectangle-on.png", centered, sz, "Shift->Drag to zoom to area"); 
    3838        centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0)); 
    39         this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz); 
     39        this._addButton("pan", "panning-hand-off.png", "panning-hand-on.png", centered, sz, "Drag the map to pan."); 
    4040        centered = centered.add((this.direction == "vertical" ? 0 : sz.w), (this.direction == "vertical" ? sz.h : 0)); 
    41         this._addButton("measure", "measuring-stick-off.png", "measuring-stick-on.png", centered, sz); 
     41        this._addButton("measure", "measuring-stick-off.png", "measuring-stick-on.png", centered, sz, "Hold alt when clicking to show distance between selected points"); 
    4242        this.switchModeTo("pan"); 
    4343        this.map.events.register("zoomend", this, function() { this.switchModeTo("pan"); }); 
     
    4646    }, 
    4747     
    48     _addButton:function(id, img, activeImg, xy, sz) { 
     48    _addButton:function(id, img, activeImg, xy, sz, title) { 
    4949        var imgLocation = OpenLayers.Util.getImagesLocation() + img; 
    5050        var activeImgLocation = OpenLayers.Util.getImagesLocation() + activeImg; 
    5151        // var btn = new ol.AlphaImage("_"+id, imgLocation, xy, sz); 
    5252        var btn = OpenLayers.Util.createAlphaImageDiv( 
    53                                     "OpenLayers_Control_PanZoom_" + id,  
     53                                    "OpenLayers_Control_MouseToolbar_" + id,  
    5454                                    xy, sz, imgLocation, "absolute"); 
    5555 
     
    6363        btn.events.register("mouseup", this, this.stopAction);  
    6464        btn.action = id; 
     65        btn.title = title; 
     66        btn.alt = title; 
    6567        btn.map = this.map; 
    6668 
     
    211213                                                     size.h / 2 + deltaY); 
    212214                    var newCenter = this.map.getLonLatFromScreenPx( newXY );  
    213                     this.map.setCenter(newCenter); 
     215                    this.map.setCenter(newCenter, null, true); 
    214216                    this.mouseDragStart = evt.xy.copyOf(); 
    215217            } 
     
    239241                this.leaveMode(); 
    240242                break; 
     243            case "pan": 
     244                this.map.setCenter(this.map.center); 
     245             
    241246        } 
    242247        this.mouseDragStart = null; 
  • trunk/openlayers/lib/OpenLayers/Map.js

    r545 r558  
    384384    * @param {int} zoom 
    385385    */ 
    386     setCenter: function (lonlat, zoom) { 
     386    setCenter: function (lonlat, zoom, minor) { 
    387387        if (this.center) { // otherwise there's nothing to move yet 
    388388            this.moveLayerContainer(lonlat); 
     
    396396        } 
    397397 
    398         this.events.triggerEvent("movestart"); 
     398        if (!minor) this.events.triggerEvent("movestart"); 
    399399        this.moveToNewExtent(zoomChanged); 
    400         this.events.triggerEvent("moveend"); 
     400        if (!minor) this.events.triggerEvent("moveend"); 
    401401    }, 
    402402