Skip to content

Allow legend options to be updated #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 1, 2015
Merged

Allow legend options to be updated #87

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f855c21
Fix weird space character
Indigo744 Oct 30, 2015
1911494
Allow to update legend
Indigo744 Oct 30, 2015
ae7904a
Removed unnecessary call to merge()
Indigo744 Nov 1, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions js/jquery.mapael.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,14 @@
Mapael.updateElem(elemOptions, links[id], $tooltip, animDuration);
}

// Update legends
legends = Mapael.createLegends($self, options, "area", areas, 1);
if (options.map.width) {
$.merge(legends, Mapael.createLegends($self, options, "plot", plots, (options.map.width / mapConf.width)));
} else {
$.merge(legends, Mapael.createLegends($self, options, "plot", plots, ($container.width() / mapConf.width)));
}

if(typeof opt != "undefined")
opt.afterUpdate && opt.afterUpdate($self, paper, areas, plots, options);
});
Expand Down Expand Up @@ -586,7 +594,7 @@
bbox = elem.mapElem.getBBox();

if (elemOptions.size || (elemOptions.width && elemOptions.height)) {
if (elemOptions.type == "image" || elemOptions.type == "svg") {
if (elemOptions.type == "image" || elemOptions.type == "svg") {
Copy link
Collaborator Author

@Indigo744 Indigo744 Oct 30, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry for this. I don't really understand what happened...

plotOffsetX = (elemOptions.width - bbox.width) / 2;
plotOffsetY = (elemOptions.height - bbox.height) / 2;
} else {
Expand Down Expand Up @@ -941,7 +949,7 @@
if (title) {
current_yCenter += title.getBBox().height;
}
if(legendType == "plot" && (typeof legendOptions.slices[i].type == "undefined" || legendOptions.slices[i].type == "circle")) {
if(legendType == "plot" && (typeof legendOptions.slices[i].type == "undefined" || legendOptions.slices[i].type == "circle")) {
current_yCenter += scale * sliceAttrs[i].r;
} else {
current_yCenter += scale * sliceAttrs[i].height/2;
Expand Down