Initial base for bullseye feature

This commit is contained in:
Zachary Tong
2013-04-09 14:29:12 -04:00
parent 37161ba37a
commit 9edfb210bf
3 changed files with 66 additions and 7 deletions
+19 -7
View File
@@ -36,7 +36,12 @@ angular.module('kibana.map2', [])
enabled: false
},
bullseye: {
enabled: false
enabled: false,
coord: {
lat: 0,
lon: 0
},
}
},
displayTabs: ["Geopoints", "Binning", "Choropleth", "Bullseye", "Data"],
@@ -206,7 +211,8 @@ angular.module('kibana.map2', [])
.script("panels/map2/lib/d3.hexbin.v0.min.js")
.script("panels/map2/lib/queue.v1.min.js")
.script("panels/map2/display/binning.js")
.script("panels/map2/display/geopoints.js");
.script("panels/map2/display/geopoints.js")
.script("panels/map2/display/bullseye.js");
// Populate element. Note that jvectormap appends, does not replace.
scripts.wait(function () {
@@ -243,15 +249,16 @@ angular.module('kibana.map2', [])
var width = $(elem[0]).width(),
height = $(elem[0]).height();
//scale to whichever dimension is smaller, helps to ensure the whole map is displayed
var scale = (width > height) ? (height / 2 / Math.PI) : (width / 2 / Math.PI);
var scale = (width > height) ? (height/5) : (width/5);
/**
* D3 and general config section
*/
var projection = d3.geo.mercator()
.translate([0,0])
.translate([width/2, height/2])
.scale(scale);
var zoom = d3.behavior.zoom()
@@ -310,10 +317,9 @@ angular.module('kibana.map2', [])
//where countries are
scope.svg.append("rect")
.attr("class", "overlay")
.attr("x", -width / 2)
.attr("y", -height / 2)
.attr("width", width)
.attr("height", height);
.attr("height", height)
.attr("transform", "translate(" + width / 2 + "," + height / 2 + ")");
//Draw the countries, if this is a choropleth, draw with fancy colors
scope.g.selectAll("path")
@@ -342,6 +348,7 @@ angular.module('kibana.map2', [])
//Hexagonal Binning
if (scope.panel.display.binning.enabled) {
//@todo fix this
var dimensions = [width, height];
displayBinning(scope, dimensions, projection);
}
@@ -351,6 +358,10 @@ angular.module('kibana.map2', [])
displayGeopoints(scope);
}
if (scope.panel.display.bullseye.enabled) {
displayBullseye(scope, projection, path);
}
/**
* Zoom Functionality
@@ -373,6 +384,7 @@ angular.module('kibana.map2', [])
scope.g.style("stroke-width", 1 / s).attr("transform", "translate(" + t + ")scale(" + s + ")");
}
}
}
};