From 122dac857f02a4b8df1953a01327147bd7f8bba9 Mon Sep 17 00:00:00 2001
From: tsauerwein <tobias.sauerwein@camptocamp.com>
Date: Tue, 25 Feb 2014 16:35:53 +0100
Subject: [PATCH] PointerEventHandler test

---
 src/ol/pointer/touchsource.js                    | 5 ++---
 test/spec/ol/pointer/pointereventhandler.test.js | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/ol/pointer/touchsource.js b/src/ol/pointer/touchsource.js
index 6bb05206f1..e2aa0c7b79 100644
--- a/src/ol/pointer/touchsource.js
+++ b/src/ol/pointer/touchsource.js
@@ -280,7 +280,7 @@ ol.pointer.TouchSource.prototype.findTouch_ = function(touchList, searchId) {
  */
 ol.pointer.TouchSource.prototype.vacuumTouches_ = function(inEvent) {
   var touchList = inEvent.getBrowserEvent().touches;
-  // pointermap.pointers() should be < touchList.length here,
+  // pointerMap.getCount() should be < touchList.length here,
   // as the touchstart has not been processed yet.
   if (this.pointerMap.getCount() >= touchList.length) {
     var d = [];
@@ -289,8 +289,7 @@ ol.pointer.TouchSource.prototype.vacuumTouches_ = function(inEvent) {
       // Touch identifiers are 2 smaller than their pointerId, which is the
       // index in pointermap.
       if (key !== 1 && !this.findTouch_(touchList, key - 2)) {
-        var p = value.out;
-        d.push(this.touchToPointer_(p));
+        d.push(value.out);
       }
     }, this);
     goog.array.forEach(d, goog.partial(this.cancelOut_, inEvent), this);
diff --git a/test/spec/ol/pointer/pointereventhandler.test.js b/test/spec/ol/pointer/pointereventhandler.test.js
index 794dd74970..788d320413 100644
--- a/test/spec/ol/pointer/pointereventhandler.test.js
+++ b/test/spec/ol/pointer/pointereventhandler.test.js
@@ -1,6 +1,6 @@
 goog.provide('ol.test.pointer.PointerEventHandler');
 
-describe('ol.test.pointer.PointerEventHandler', function() {
+describe('ol.pointer.PointerEventHandler', function() {
   var handler;
   var target;
   var eventSpy;
@@ -47,6 +47,8 @@ describe('ol.test.pointer.PointerEventHandler', function() {
       var pointerEvent = eventSpy.firstCall.args[0];
       expect(pointerEvent).to.be.a(ol.pointer.PointerEvent);
       expect(pointerEvent.type).to.be('pointerdown');
+      expect(pointerEvent.pointerId).to.be(1);
+      expect(pointerEvent.pointerType).to.be('mouse');
     });
   });