Merge branch 'master' into three-pane-editor-tutorial

examples/color-legend/example.json

@@ -4,5 +4,5 @@
   "about": {
     "text": "This example shows how to create a discrete or continous color legends."
   },
-  "disabled": true
+  "disabled": false
 }

tests/gl-cases/glPolygons.js

@@ -2446,7 +2446,9 @@ describe('glPolygons', function () {
       layer: layer
     }).read(JSON.stringify(data), function () {
       myMap.draw();
-      imageTest.imageTest('glMultiPolygons', null, 0.0015, done, myMap.onIdle, 0, 2);
+      // maximum error is 0.0030 because of a change in Chrome 65.  When new
+      // versions are released, see if this can be moved back to 0.0015
+      imageTest.imageTest('glMultiPolygons', null, 0.0030, done, myMap.onIdle, 0, 2);
     });
   });
 

tests/headed-cases/lines.js

@@ -15,7 +15,9 @@ describe('lines example', function () {
   it('more lines', function (done) {
     base$ = $('iframe#map')[0].contentWindow.jQuery;
     base$('#lines').val(100000).trigger('change');
-    imageTest.imageTest('exampleLines100k', '#map', 0.0015, done, null, 0, 2, '#map.ready[segments="100000"]');
+    // maximum error is 0.0030 because of a change in Chrome 65.  When new
+    // versions are released, see if this can be moved back to 0.0015
+    imageTest.imageTest('exampleLines100k', '#map', 0.0030, done, null, 0, 2, '#map.ready[segments="100000"]');
   }, 10000);
   it('thin preset', function (done) {
     base$('button.preset').eq(1).trigger('click');

webpack.config.js

@@ -47,7 +47,10 @@ module.exports = {
       root: 'Hammer',
       commonjs: 'hammerjs',
       commonjs2: 'hammerjs',
-      amd: 'hammerjs'
+      amd: 'hammerjs',
+      // Since GeoJS's libraryTarget is "umd", defining this (undocumented) external library type
+      // will allow Webpack to create a better error message if a "hammerjs" import fails
+      umd: 'hammerjs'
     }
   },
   plugins: [