From 8cdd526cc0007e899df1b6d488437cb124666ded Mon Sep 17 00:00:00 2001
From: Alexey Velikiy <gmpota@gmail.com>
Date: Sun, 5 Mar 2017 13:26:52 +0100
Subject: [PATCH] bubbles continue

---
 .../bubbles-nested-routes/bubbles.vue         |  2 +-
 .../bubbles-nested-routes/index.vue           | 12 +++----
 .../{ph2.js => ph2/index.js}                  | 36 +++++++++++++++----
 .../ph2/layout-contry.js                      | 12 +++++++
 .../bubbles-nested-routes/ph2/layout-total.js | 12 +++++++
 5 files changed, 60 insertions(+), 14 deletions(-)
 rename src/d3-components/bubbles-nested-routes/{ph2.js => ph2/index.js} (64%)
 create mode 100644 src/d3-components/bubbles-nested-routes/ph2/layout-contry.js
 create mode 100644 src/d3-components/bubbles-nested-routes/ph2/layout-total.js

diff --git a/src/d3-components/bubbles-nested-routes/bubbles.vue b/src/d3-components/bubbles-nested-routes/bubbles.vue
index 1cac9b9..d55c71e 100644
--- a/src/d3-components/bubbles-nested-routes/bubbles.vue
+++ b/src/d3-components/bubbles-nested-routes/bubbles.vue
@@ -12,7 +12,7 @@ Links:
 
 <script>
 
-import PH2 from './ph2';
+import PH2 from './ph2/index';
 const d3 = require('d3');
 
 export default {
diff --git a/src/d3-components/bubbles-nested-routes/index.vue b/src/d3-components/bubbles-nested-routes/index.vue
index 97b910e..a4ab567 100644
--- a/src/d3-components/bubbles-nested-routes/index.vue
+++ b/src/d3-components/bubbles-nested-routes/index.vue
@@ -33,16 +33,16 @@ const LINKS = [
     path: '',
     layout: 'together'
   },
+  {
+    name: 'By contry',
+    path: '/contry',
+    layout: 'contry'
+  },
   {
     name: 'By year',
     path: '/year',
     layout: 'year'
-  },
-  {
-    name: 'By sex',
-    path: '/sex',
-    layout: 'sex'
-  },
+  }
 ].map(d => {
   d.path = '#/' + MY_URL_PREFIX + d.path;
   return d;
diff --git a/src/d3-components/bubbles-nested-routes/ph2.js b/src/d3-components/bubbles-nested-routes/ph2/index.js
similarity index 64%
rename from src/d3-components/bubbles-nested-routes/ph2.js
rename to src/d3-components/bubbles-nested-routes/ph2/index.js
index 5ef9887..e29e6a8 100644
--- a/src/d3-components/bubbles-nested-routes/ph2.js
+++ b/src/d3-components/bubbles-nested-routes/ph2/index.js
@@ -2,6 +2,11 @@
 
 const d3 = require('d3');
 
+const layoutTotal = require('./layout-total');
+const layoutContry = require('./layout-contry');
+
+const _ = require('lodash');
+
 // TODO: do it d3-way so I can use selection.call()
 
 export default class PH2 {
@@ -9,21 +14,33 @@ export default class PH2 {
     this.svg = elem;
     this.setData(data);
     this._init();
+    this.layout = undefined;
     this.setLayout(layoutName);
   }
 
   setLayout(layoutName) {
-    // TODO: something special
-    this.simulation.alpha(1).restart();
+    if(!this.layouts) {
+      throw new Error('Layouts are not defined');
+    }
+    if(!this.layouts[layoutName]) {
+      throw new Error('Can`t find layout ' + layoutName);
+    }
+    if(this.layout) {
+      this.layout.exit();
+    }
+    this.layout = this.layouts[layoutName];
+    this.layout.enter();
   }
 
   setData(data) {
     var range = data.length;
     this.data = {
       nodes:data.map(d => ({
-        label: "l"+d ,r:+d.Magnitude
+        r: +d.Magnitude
       })),
-      links:d3.range(0, range).map(function(){ return {source:~~d3.randomUniform(range)(), target:~~d3.randomUniform(range)()} })
+      links:d3.range(0, range).map(
+        function(){ return {source:~~d3.randomUniform(range)(), target:~~d3.randomUniform(range)()}
+      })
     };
   }
 
@@ -65,12 +82,17 @@ export default class PH2 {
       .nodes(this.data.nodes)
       .on("tick", ticked);
 
-    this.simulation.force("link")
+    this.simulation
+      .force("link")
       .links(this.data.links);
   }
 
-  _initNodeYearPos() {
-    // TODO: fill
+  _initLayouts() {
+    this.layouts = {
+      'total': layoutTotal,
+      'county': layoutContry,
+    };
+    _.this.layouts
   }
 
 }
diff --git a/src/d3-components/bubbles-nested-routes/ph2/layout-contry.js b/src/d3-components/bubbles-nested-routes/ph2/layout-contry.js
new file mode 100644
index 0000000..c3b27ea
--- /dev/null
+++ b/src/d3-components/bubbles-nested-routes/ph2/layout-contry.js
@@ -0,0 +1,12 @@
+export default class {
+  constructor(elem, simulation) {
+    this.elem = elem;
+    this.simulation = simulation;
+  }
+  enter() {
+
+  }
+  exit() {
+
+  }
+}
diff --git a/src/d3-components/bubbles-nested-routes/ph2/layout-total.js b/src/d3-components/bubbles-nested-routes/ph2/layout-total.js
new file mode 100644
index 0000000..498be0b
--- /dev/null
+++ b/src/d3-components/bubbles-nested-routes/ph2/layout-total.js
@@ -0,0 +1,12 @@
+export default class {
+  constructor(elem, simulation) {
+    this.elem = elem;
+    this.simulation = simulation;
+  }
+  enter() {
+    
+  }
+  exit() {
+
+  }
+}