Merge pull request #388 from OpenGeoscience/visibility-off

Toggling visibility binds/unbinds mouse handlers

Author: aashish24

src/core/feature.js

@@ -378,6 +378,14 @@ geo.feature = function (arg) {
     } else {
       m_visible = val;
       m_this.modified();
+
+      // bind or unbind mouse handlers on visibility change
+      if (m_visible) {
+        m_this._bindMouseHandlers();
+      } else {
+        m_this._unbindMouseHandlers();
+      }
+
       return m_this;
     }
   };

testing/test-cases/selenium-tests/featureVisible/include.css

@@ -0,0 +1,3 @@
+body {
+    overflow: hidden;
+}

testing/test-cases/selenium-tests/featureVisible/include.html

@@ -0,0 +1 @@
+<div id='map'></div>

testing/test-cases/selenium-tests/featureVisible/include.js

@@ -0,0 +1,21 @@
+
+window.startTest = function (done) {
+  'use strict';
+
+  window.geo_mouse_moves = 0;
+  $('#map').attr('geo-moves', window.geo_mouse_moves);
+  var map = window.geoTests.createOsmMap({}, {}, true);
+  var feature = map.createLayer('feature').createFeature('point', {selectionAPI: true});
+
+  feature.data([0])
+      .position(function () { return {x: 0, y: 0}; })
+      .style({radius: 1000})
+      .geoOn(geo.event.feature.mousemove, function () {
+        // keep track of the number of mouse moves triggered
+        window.geo_mouse_moves += 1;
+        $('#map').attr('geo-moves', window.geo_mouse_moves);
+      });
+  window.geo_feature = feature;
+  map.draw();
+  done();
+};

testing/test-cases/selenium-tests/featureVisible/testFeatureVisibility.py

@@ -0,0 +1,55 @@
+#!/usr/bin/env python
+
+from selenium_test import FirefoxTest, ChromeTest,\
+    setUpModule, tearDownModule
+
+
+class Visibility(object):
+    testCase = ('osmLayer',)
+    testRevision = 1
+
+    def getCount(self):
+        return self.runScript('return window.geo_mouse_moves')
+
+    def loadPage(self):
+        self.resizeWindow(640, 480)
+        self.loadURL('featureVisible/index.html')
+        self.wait()
+
+    def test_visibility_toggle(self):
+        self.loadPage()
+
+        self.hover('#map', offset=(25, 25))
+        initial = self.getCount()
+
+        self.hover('#map', offset=(50, 50))
+        count = self.getCount()
+
+        self.assertTrue(count > initial, 'Initial mouse movements')
+
+        self.runScript('window.geo_feature.visible(false)')
+        initial = self.getCount()
+        self.hover('#map', offset=(75, 75))
+        count = self.getCount()
+
+        self.assertTrue(count == initial, 'Visibility off')
+
+        self.runScript('window.geo_feature.visible(true)')
+        initial = self.getCount()
+        self.hover('#map', offset=(100, 100))
+        count = self.getCount()
+
+        self.assertTrue(count > initial, 'Visibility on')
+
+
+class FirefoxVis(Visibility, FirefoxTest):
+    testCase = Visibility.testCase + ('firefox',)
+
+
+class ChromeVis(Visibility, ChromeTest):
+    testCase = Visibility.testCase + ('chrome',)
+
+
+if __name__ == '__main__':
+    import unittest
+    unittest.main()