Merge pull request #675 from OpenGeoscience/touch-interactions

Handle basic touch interactions
OpenGeoscience · Mar 20, 2017 · 8501fb8 · 8501fb8
2 parents 27814ce + e317bf9
commit 8501fb8
Show file tree

Hide file tree

Showing 8 changed files with 419 additions and 28 deletions.
diff --git a/external.config.js b/external.config.js
@@ -14,7 +14,8 @@ module.exports = {
   },
   resolve: {
     alias: {
-      d3: 'd3/d3.js'
+      d3: 'd3/d3.js',
+      hammerjs: 'hammerjs/hammer.js'
     }
   },
   plugins: [
@@ -27,6 +28,8 @@ module.exports = {
   module: {
     loaders: [{
       test: require.resolve('d3'), loader: 'expose?d3'
+    }, {
+      test: require.resolve('hammerjs'), loader: 'expose?hammerjs'
     }]
   }
 };
diff --git a/package.json b/package.json
@@ -12,7 +12,8 @@
     "url": "https://github.com/OpenGeoscience/geojs"
   },
   "optionalDependencies": {
-    "d3": "^3.5.16"
+    "d3": "^3.5.16",
+    "hammerjs": "^2.0.8"
   },
   "devDependencies": {
     "body-parser": "^1.15.0",
@@ -70,6 +71,7 @@
     "style-loader": "^0.13.1",
     "stylus": "^0.54.5",
     "stylus-loader": "^2.4.0",
+    "touch-emulator": "^1.0.0",
     "url-loader": "^0.5.7",
     "vgl": "0.3.10",
     "webpack": "^1.12.14",

diff --git a/src/action.js b/src/action.js
@@ -11,6 +11,7 @@ var geo_action = {
   select: 'geo_action_select',
   unzoomselect: 'geo_action_unzoomselect',
   zoom: 'geo_action_zoom',
+  zoomrotate: 'geo_action_zoom_rotate',
   zoomselect: 'geo_action_zoomselect',
 
   // annotation actions

diff --git a/src/main.styl b/src/main.styl
@@ -2,6 +2,7 @@
 
 .geojs-map
   position relative
+  user-select none
 
   .geo-attribution
     position absolute