Tidy up, rm superflous logging, v0.0.8

danwild · Jun 5, 2018 · 417d60b · 417d60b
1 parent ed43b08
commit 417d60b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 31 deletions.
diff --git a/dist/leaflet-network.js b/dist/leaflet-network.js
@@ -1,4 +1,4 @@
-'use strict';
+"use strict";
 
 L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 
@@ -7,11 +7,8 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 	options: {
 		data: null,
 		displayMode: 'SOURCE',
-
-		// TODO fix merge options.., document, implement
 		scaleDomain: null,
-		scaleRange: [1, 100],
-
+		scaleRange: [1, 5],
 		onMouseEnterNode: null,
 		onMouseLeaveNode: null,
 		onMouseEnterLine: null,
@@ -33,9 +30,6 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 
 		var self = this;
 
-		console.log('this.options');
-		console.log(this.options);
-
 		// delete self-connections
 		var data = this.options.data.map(function (d) {
 			delete d.connections[d.properties.id];
@@ -48,7 +42,6 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 		// calc domain range if not provided in options
 		var scaleDomain;
 		if (this.options.scaleDomain) {
-			console.log('use provided domain option');
 			scaleDomain = this.options.scaleDomain;
 		} else {
 			// get an array of all connections
@@ -58,8 +51,6 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 			});
 			var min = d3.min(connections);
 			var max = d3.max(connections);
-
-			console.log('auto calc domain: ' + min + ' - ' + max);
 			scaleDomain = [min, max];
 		}
 
@@ -86,9 +77,7 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 		this._svgGroup1.selectAll("circle").data(data.map(function (d) {
 			return d;
 		})).attr("class", "site").enter().append("circle").style("opacity", .5).style("cursor", "pointer").style("fill", "red").attr("r", 5).on('click', function (d) {
-
 			console.log(d);
-
 			// set circles all inactive style, set this active
 			self._svgGroup1.selectAll("circle").style("opacity", 0.5).attr("r", 5);
 			d3.select(this).style('opacity', '0.8').attr("r", 10);
@@ -111,7 +100,6 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 	/*------------------------------------ PUBLIC METHODS ------------------------------------------*/
 
 	update: function update() {
-		console.log('update');
 		var self = this;
 		self._drawConnections(this._targetId);
 		this._svgGroup1.selectAll("circle").attr("transform", function (d) {

diff --git a/dist/leaflet-network.min.js b/dist/leaflet-network.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "leaflet-network",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Leaflet plugin to visualise arbitrary network connectivity between spatial data points",
   "main": "dist/leaflet-network.js",
   "scripts": {

diff --git a/src/js/L.NetworkLayer.js b/src/js/L.NetworkLayer.js
@@ -5,11 +5,8 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 	options: {
 		data: null,
 		displayMode: 'SOURCE',
-
-		// TODO fix merge options.., document, implement
 		scaleDomain: null,
-		scaleRange: [1, 100],
-
+		scaleRange: [1, 5],
 		onMouseEnterNode: null,
 		onMouseLeaveNode: null,
 		onMouseEnterLine: null,
@@ -31,10 +28,6 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 
 		var self = this;
 
-		console.log('this.options');
-		console.log(this.options);
-
-
 		// delete self-connections
 		var data = this.options.data.map(function(d){
 			delete d.connections[d.properties.id];
@@ -47,16 +40,13 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 		// calc domain range if not provided in options
 		var scaleDomain;
 		if(this.options.scaleDomain){
-			console.log('use provided domain option');
 			scaleDomain = this.options.scaleDomain;
 		} else {
 			// get an array of all connections
 			var connections = [];
 			data.forEach(function(d){ connections = connections.concat(Object.values(d.connections)); });
 			var min = d3.min(connections);
 			var max = d3.max(connections);
-
-			console.log('auto calc domain: '+min + ' - '+max);
 			scaleDomain = [min, max];
 		}
 
@@ -89,9 +79,7 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 			.style("fill", "red")
 			.attr("r", 5)
 			.on('click', function(d){
-
 				console.log(d);
-
 				// set circles all inactive style, set this active
 				self._svgGroup1.selectAll("circle").style("opacity", 0.5).attr("r", 5);
 				d3.select(this).style('opacity','0.8').attr("r", 10);
@@ -116,7 +104,6 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 	/*------------------------------------ PUBLIC METHODS ------------------------------------------*/
 
 	update: function() {
-		console.log('update');
 		var self = this;
 		self._drawConnections(this._targetId);
 		this._svgGroup1.selectAll("circle").attr("transform",
@@ -224,7 +211,6 @@ L.NetworkLayer = (L.Layer ? L.Layer : L.Class).extend({
 					.attr("stroke-width", val)
 					.attr("stroke-opacity", opacity)
 					.attr("stroke", color);
-
 			});
 		});
 	}