Map "click" event renamed to "singleclick"

As discussed with @tschaub in #1195.

examples/getfeatureinfo.js

@@ -46,7 +46,7 @@ var map = new ol.Map({
   })
 });
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   map.getFeatureInfo({
     pixel: evt.getPixel(),
     success: function(featureInfoByLayer) {

examples/gpx.js

@@ -48,7 +48,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
   displayFeatureInfo(pixel);
 });
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   var pixel = evt.getPixel();
   displayFeatureInfo(pixel);
 });

examples/icon.js

@@ -71,7 +71,7 @@ var popup = new ol.Overlay({
 map.addOverlay(popup);
 
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   map.getFeatures({
     pixel: evt.getPixel(),
     layers: [vector],

examples/kml-earthquakes.js

@@ -87,7 +87,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
   displayFeatureInfo(pixel);
 });
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   var pixel = evt.getPixel();
   displayFeatureInfo(pixel);
 });

examples/kml-timezones.js

@@ -109,7 +109,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
   displayFeatureInfo(pixel);
 });
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   var pixel = evt.getPixel();
   displayFeatureInfo(pixel);
 });

examples/kml.js

@@ -59,7 +59,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
   displayFeatureInfo(pixel);
 });
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   var pixel = evt.getPixel();
   displayFeatureInfo(pixel);
 });

examples/overlay.js

@@ -47,7 +47,7 @@ var popup = new ol.Overlay({
 });
 map.addOverlay(popup);
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   var element = popup.getElement();
   var coordinate = evt.getCoordinate();
   var hdms = ol.coordinate.toStringHDMS(ol.proj.transform(

examples/popup.js

@@ -61,7 +61,7 @@ var map = new ol.Map({
 /**
  * Add a click handler to the map to render the popup.
  */
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   var coordinate = evt.getCoordinate();
   var hdms = ol.coordinate.toStringHDMS(ol.proj.transform(
       coordinate, 'EPSG:3857', 'EPSG:4326'));

examples/vector-layer.js

@@ -82,7 +82,7 @@ $(map.getViewport()).on('mousemove', function(evt) {
   displayFeatureInfo(pixel);
 });
 
-map.on('click', function(evt) {
+map.on('singleclick', function(evt) {
   var pixel = evt.getPixel();
   displayFeatureInfo(pixel);
 });

src/ol/events/condition.js

@@ -54,8 +54,8 @@ ol.events.condition.always = goog.functions.TRUE;
  * @return {boolean} True if the event is a click event.
  * @todo stability experimental
  */
-ol.events.condition.clickOnly = function(mapBrowserEvent) {
-  return mapBrowserEvent.type == ol.MapBrowserEvent.EventType.CLICK;
+ol.events.condition.singleClick = function(mapBrowserEvent) {
+  return mapBrowserEvent.type == ol.MapBrowserEvent.EventType.SINGLECLICK;
 };
 
 

src/ol/interaction/selectinteraction.js

@@ -27,7 +27,7 @@ ol.interaction.Select = function(opt_options) {
    * @type {ol.events.ConditionType}
    */
   this.condition_ = goog.isDef(options.condition) ?
-      options.condition : ol.events.condition.clickOnly;
+      options.condition : ol.events.condition.singleClick;
 
   /**
    * @private

src/ol/mapbrowserevent.js

@@ -195,7 +195,7 @@ ol.MapBrowserEventHandler.prototype.emulateClick_ = function(browserEvent) {
     this.clickTimeoutId_ = goog.global.setTimeout(goog.bind(function() {
       this.clickTimeoutId_ = 0;
       var newEvent = new ol.MapBrowserEvent(
-          ol.MapBrowserEvent.EventType.CLICK, this.map_, browserEvent);
+          ol.MapBrowserEvent.EventType.SINGLECLICK, this.map_, browserEvent);
       this.dispatchEvent(newEvent);
     }, this), 250);
   }
@@ -341,12 +341,12 @@ ol.MapBrowserEventHandler.prototype.disposeInternal = function() {
  * @enum {string}
  */
 ol.MapBrowserEvent.EventType = {
-  CLICK: goog.events.EventType.CLICK,
   DBLCLICK: goog.events.EventType.DBLCLICK,
   DOWN: 'down',
   DRAGSTART: 'dragstart',
   DRAG: 'drag',
   DRAGEND: 'dragend',
+  SINGLECLICK: 'singleclick',
   TOUCHSTART: goog.events.EventType.TOUCHSTART,
   TOUCHMOVE: goog.events.EventType.TOUCHMOVE,
   TOUCHEND: goog.events.EventType.TOUCHEND

test/spec/ol/mapbrowserevent.test.js

@@ -4,15 +4,15 @@ describe('ol.MapBrowserEventHandler', function() {
   describe('#emulateClick_', function() {
     var clock;
     var handler;
-    var clickSpy;
+    var singleclickSpy;
     var dblclickSpy;
 
     beforeEach(function() {
       clock = sinon.useFakeTimers();
       handler = new ol.MapBrowserEventHandler(new ol.Map({}));
 
-      clickSpy = sinon.spy();
-      goog.events.listen(handler, 'click', clickSpy);
+      singleclickSpy = sinon.spy();
+      goog.events.listen(handler, 'singleclick', singleclickSpy);
 
       dblclickSpy = sinon.spy();
       goog.events.listen(handler, 'dblclick', dblclickSpy);
@@ -24,29 +24,29 @@ describe('ol.MapBrowserEventHandler', function() {
 
     it('emulates click', function() {
       handler.emulateClick_();
-      expect(clickSpy.called).to.not.be.ok();
+      expect(singleclickSpy.called).to.not.be.ok();
       expect(dblclickSpy.called).to.not.be.ok();
 
       clock.tick(250);
-      expect(clickSpy.calledOnce).to.be.ok();
+      expect(singleclickSpy.calledOnce).to.be.ok();
       expect(dblclickSpy.called).to.not.be.ok();
 
       handler.emulateClick_();
-      expect(clickSpy.calledOnce).to.be.ok();
+      expect(singleclickSpy.calledOnce).to.be.ok();
       expect(dblclickSpy.called).to.not.be.ok();
     });
 
     it('emulates dblclick', function() {
       handler.emulateClick_();
-      expect(clickSpy.called).to.not.be.ok();
+      expect(singleclickSpy.called).to.not.be.ok();
       expect(dblclickSpy.called).to.not.be.ok();
 
       handler.emulateClick_();
-      expect(clickSpy.called).to.not.be.ok();
+      expect(singleclickSpy.called).to.not.be.ok();
       expect(dblclickSpy.calledOnce).to.be.ok();
 
       clock.tick(250);
-      expect(clickSpy.called).to.not.be.ok();
+      expect(singleclickSpy.called).to.not.be.ok();
       expect(dblclickSpy.calledOnce).to.be.ok();
     });