Merge pull request bluehalo#43 from Asymmetrik/develop

Fixing typings to work with latest leaflet typings and leaflet library

Author: reblace

dist/leaflet-d3.js

@@ -57,7 +57,8 @@ gulp.task('build-js', [ 'rollup-js' ], () => {
 
 	// Uglify
 	return gulp.src(path.join(assets.dist.dir, `${pkg.artifactName}.js`))
-		.pipe(plugins.uglify({ preserveComments: 'license' }))
+		.pipe(plugins.uglify({ output: { comments: 'license' } }))
+		.on('error', (err) => { plugins.util.log(plugins.util.colors.red('[Uglify]'), err.toString()); })
 		.pipe(plugins.rename(pkg.artifactName + '.min.js'))
 		.pipe(gulp.dest(assets.dist.dir));
 
@@ -66,7 +67,7 @@ gulp.task('build-js', [ 'rollup-js' ], () => {
 gulp.task('rollup-js', () => {
 
 	return rollup.rollup({
-		entry: assets.src.entry,
+		input: assets.src.entry,
 		external: [
 			'd3',
 			'd3-hexbin',
@@ -75,10 +76,10 @@ gulp.task('rollup-js', () => {
 	})
 		.then((bundle) => {
 			return bundle.write({
-				dest: path.join(assets.dist.dir, `${pkg.artifactName}.js`),
+				file: path.join(assets.dist.dir, `${pkg.artifactName}.js`),
 				format: 'umd',
-				moduleName: pkg.moduleName,
-				sourceMap: true,
+				name: pkg.moduleName,
+				sourcemap: true,
 				banner: bannerString,
 				globals: {
 					'd3': 'd3',

dist/leaflet-d3.js.map

@@ -1,6 +1,6 @@
-/// <reference types="leaflet" />
+import * as L from 'leaflet';
 
-declare namespace L {
+declare module 'leaflet' {
 
 	namespace internal {
 

dist/leaflet-d3.min.js

@@ -3,7 +3,7 @@
 	"artifactName": "leaflet-d3",
 	"moduleName": "leafletD3",
 	"description": "Custom d3 layers for leaflet",
-	"version": "3.0.2",
+	"version": "3.1.0",
 	"author": "Asymmetrik, Ltd.",
 	"copyright": "Copyright (c) 2007-2017 Asymmetrik Ltd, a Maryland Corporation",
 	"license": "MIT",
@@ -28,22 +28,22 @@
 	},
 
 	"devDependencies": {
-		"d3": "4.9",
-		"@types/d3": "4.9",
+		"d3": "4.10",
+		"@types/d3": "4.10",
 
 		"d3-hexbin": "0.2",
 
-		"leaflet": "1.1",
-		"@types/leaflet": "1.0",
+		"leaflet": "1.2",
+		"@types/leaflet": "1.2",
 
-		"rollup": "0.43",
+		"rollup": "0.49",
 
 		"gulp": "3.9",
-		"gulp-eslint": "3.0",
+		"gulp-eslint": "4.0",
 		"gulp-load-plugins": "1.5",
 		"gulp-rename": "1.2",
 		"gulp-sourcemaps": "2.6",
-		"gulp-uglify": "2.0",
-		"run-sequence": "1.2"
+		"gulp-uglify": "3.0",
+		"run-sequence": "2.1"
 	}
 }

gulpfile.js

@@ -289,12 +289,15 @@ L.HexbinLayer = L.SVG.extend({
 		// Exit
 		var exit = join.exit();
 
-		exit.transition().duration(that.options.duration)
-			.attr('fill-opacity', 0.01)
-			.attr('stroke-opacity', 0.01)
+		exit.select('path.hexbin-hexagon')
+			.transition().duration(that.options.duration)
+			.attr('fill-opacity', 0)
+			.attr('stroke-opacity', 0)
 			.attr('d', function(d) {
 				return that._hexLayout.hexagon(0);
-			})
+			});
+
+		exit.transition().duration(that.options.duration)
 			.remove();
 
 	},