Success! #50 is done.

Author: rcreasey

app/js/maps/system_map.js

@@ -368,13 +368,19 @@ var SystemMap = {
       jump = {type: gate.type};
       if (gate.type == 'wormhole') {
         // exclude nodes that are outside this region from being anchored
-        if (from.system.regionID == Data.state.vicinity.regionId && to.system.regionID != Data.state.vicinity.regionId) {
+        if (from.system.regionID == system.regionID && to.system.regionID != system.regionID) {
           exclude.push(to.system.id);
+          delete to.x;
+          delete to.y;
+          delete to.system.x;
+          delete to.system.y;
         } 
-        else if (to.system.regionID == Data.state.vicinity.regionId && from.system.regionID != Data.state.vicinity.regionId) {
+        else if (to.system.regionID == system.regionID && from.system.regionID != system.regionID) {
           exclude.push(from.system.id);
-          console.log(to)
-
+          delete from.x;
+          delete from.y;
+          delete from.system.x;
+          delete from.system.y;
         }
 
         // pin the wormhole close to the connecting node
@@ -423,14 +429,14 @@ var SystemMap = {
       .chargeDistance(200 * SCALING_FACTOR)
       .linkDistance(function(l) {
         if (l.type == 'jumpbridge') return 0;
-        if (l.type == 'wormhole') return 0;
+        if (l.type == 'wormhole') return 20;
         if (l.source.fixed || l.target.fixed) return 0;
         var dx = l.source.x - l.target.x, dy = l.source.y - l.target.y;
         return Math.min(50 * SCALING_FACTOR, Math.sqrt(dx * dx + dy * dy));
       })
       .linkStrength(function(l) {
         if (l.type == 'jumpbridge') return 0;
-        if (l.type == 'wormhole') return 0;
+        if (l.type == 'wormhole') return 0.2;
         if (l.source.fixed || l.target.fixed) return 0.1;
         return 0.25;
       });

app/js/maps/wormhole_map.js

@@ -218,6 +218,7 @@ var WormholeMap = {
     WormholeMap.links = [];
 
     var nodes = {};
+    var exclude = [];
 
     WormholeMap.systems = $.map(Data.systems, function(s) {
       // var node = { system: s, x: s.x, y: s.y };
@@ -231,6 +232,16 @@ var WormholeMap = {
       var from = Data.systems[gate.fromSystem];
       var to = Data.systems[gate.toSystem];
       jump = {source: nodes[from.id], target: nodes[to.id], type: gate.type};
+      if (from.regionID == system.regionID && to.regionID != system.regionID) {
+        exclude.push(to.id);
+        delete to.x;
+        delete to.y;
+      } 
+      else if (to.regionID == system.regionID && from.regionID != system.regionID) {
+        exclude.push(from.id);
+        delete from.x;
+        delete from.y;
+      }
 
       if (gate.type == 'wormhole') {
         if (to.y === undefined && to.x === undefined) {
@@ -254,7 +265,7 @@ var WormholeMap = {
       system.x *= SCALING_FACTOR;
       system.y *= SCALING_FACTOR;
       WormholeMap.nodes.push(system);
-      if (!Util.is_wormhole(system.system)) {
+      if (!Util.is_wormhole(system.system) || $.grep(exclude, function(id) { return id == system.id; })) {
         WormholeMap.nodes.push(anchor = { x: system.x, y: system.y, fixed: true });
         WormholeMap.links.push({ source: system, target: anchor });
       }