williaster commented on a change in pull request #5721: [SIP-5] Repair and
refactor CountryMap
URL:
https://github.com/apache/incubator-superset/pull/5721#discussion_r213818226
##########
File path: superset/assets/src/visualizations/country_map.js
##########
@@ -114,44 +143,29 @@ function countryMapChart(slice, payload) {
resultText.text('');
};
- div.append('rect')
- .attr('class', 'background')
- .attr('width', slice.width())
- .attr('height', slice.height())
- .on('click', clicked);
-
- g = div.append('g');
- const mapLayer = g.append('g')
- .classed('map-layer', true);
- bigText = g.append('text')
- .classed('big-text', true)
- .attr('x', 20)
- .attr('y', 45);
- resultText = g.append('text')
- .classed('result-text', true)
- .attr('x', 20)
- .attr('y', 60);
-
- const url =
`/static/assets/src/visualizations/countries/${fd.select_country.toLowerCase()}.geojson`;
- d3.json(url, function (error, mapData) {
+ function drawMap(mapData) {
const features = mapData.features;
const center = d3.geo.centroid(mapData);
- let scale = 150;
- let offset = [slice.width() / 2, slice.height() / 2];
- let projection = d3.geo.mercator().scale(scale).center(center)
- .translate(offset);
-
+ const scale = 100;
+ const projection = d3.geo.mercator()
+ .scale(scale)
+ .center(center)
+ .translate([width / 2, height / 2]);
path = path.projection(projection);
+ // Compute scale that fits container.
const bounds = path.bounds(mapData);
- const hscale = scale * slice.width() / (bounds[1][0] - bounds[0][0]);
- const vscale = scale * slice.height() / (bounds[1][1] - bounds[0][1]);
- scale = (hscale < vscale) ? hscale : vscale;
- const offsetWidth = slice.width() - (bounds[0][0] + bounds[1][0]) / 2;
- const offsetHeigth = slice.height() - (bounds[0][1] + bounds[1][1]) / 2;
- offset = [offsetWidth, offsetHeigth];
- projection =
d3.geo.mercator().center(center).scale(scale).translate(offset);
- path = path.projection(projection);
+ const hscale = scale * width / (bounds[1][0] - bounds[0][0]);
+ const vscale = scale * height / (bounds[1][1] - bounds[0][1]);
+ const newScale = (hscale < vscale) ? hscale : vscale;
+
+ // Compute bounds and offset using the updated scale.
Review comment:
nice!
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
