diff --git a/config/rollup.config.dev.js b/config/rollup.config.dev.js index 0ff3b2f1c..687c748cb 100644 --- a/config/rollup.config.dev.js +++ b/config/rollup.config.dev.js @@ -22,10 +22,7 @@ export default { plugins: [ progress(), includePaths({ - paths: ['node_modules/d3/node_modules'], // npm2 or windows - include: { - 'martinez-polygon-clipping': 'node_modules/martinez-polygon-clipping/dist/martinez.umd.js' - } + paths: ['node_modules/d3/node_modules'] // npm2 or windows }), nodeResolve({ dedupe: ['object-inspect'] }), commonjs(), diff --git a/config/rollup.config.legacy.js b/config/rollup.config.legacy.js index 3e58c7924..9e60d3232 100644 --- a/config/rollup.config.legacy.js +++ b/config/rollup.config.legacy.js @@ -23,10 +23,7 @@ export default { plugins: [ progress(), includePaths({ - paths: ['node_modules/d3/node_modules'], // npm2 or windows - include: { - 'martinez-polygon-clipping': 'node_modules/martinez-polygon-clipping/dist/martinez.umd.js' - } + paths: ['node_modules/d3/node_modules'] // npm2 or windows }), nodeResolve({ dedupe: ['object-inspect'] }), commonjs(), diff --git a/config/rollup.config.stats.js b/config/rollup.config.stats.js index fc6da6d99..50103e827 100644 --- a/config/rollup.config.stats.js +++ b/config/rollup.config.stats.js @@ -22,10 +22,7 @@ export default { plugins: [ progress(), includePaths({ - paths: ['node_modules/d3/node_modules'], // npm2 or windows - include: { - 'martinez-polygon-clipping': 'node_modules/martinez-polygon-clipping/dist/martinez.umd.js' - } + paths: ['node_modules/d3/node_modules'] // npm2 or windows }), nodeResolve({ dedupe: ['object-inspect'] }), commonjs(), diff --git a/modules/services/vector_tile.js b/modules/services/vector_tile.js index 3563e0628..199eb5004 100644 --- a/modules/services/vector_tile.js +++ b/modules/services/vector_tile.js @@ -65,8 +65,8 @@ function vtToGeoJSON(data, tile, mergeCache) { var merged = mergeCache[propertyhash]; if (merged && merged.length) { var other = merged[0]; - var coords = martinez.union( - feature.geometry.coordinates, other.geometry.coordinates + var coords = martinez( + feature.geometry.coordinates, other.geometry.coordinates, 1 /*UNION*/ ); if (!coords || !coords.length) {