Skip to content
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

Jump to bottom

Merge 2.4 into master #4872

Merged
merged 5 commits into from
May 3, 2019
Merged

Merge 2.4 into master #4872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a929b68
Fix image dpi
sbrunner May 2, 2019
a1cbb09
Add back iconOffset support for the API
fredj May 2, 2019
c4064b9
Merge pull request #4869 from camptocamp/GSGMF-938
fredj May 3, 2019
92c3776
Merge pull request #4867 from camptocamp/qgis-image-dpi
sbrunner May 3, 2019
bb4da84
Merge remote-tracking branch 'origin/2.4'
fredj May 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions api/dist/apihelp/data.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id point title description icon
1 553000,216300 Information Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:info@example.com">info@example.com</a><br />Internet: <a href="http://fr.wikipedia.org/wiki/La_Chaux-de-Fonds" target=new>Cliquer ici</a> http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker.png
2 554250,215600 Ma première station Diesel pas cher http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-blue.png
3 552556,215864 Mon parking C'est celui-là le meilleur. http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-gold.png
4 554489,217126 Mon parking Ce parking est<br/>le meillleur. http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-gold.png
5 554089,217326 Ma deuxième station Sans-plomb pas cher. http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-blue.png
id point title description icon iconSize iconOffset
1 553000,216300 Information Office de l'information<br />Tél: 032 000 00 00<br>Email: <a href="mailto:info@example.com">info@example.com</a><br />Internet: <a href="http://fr.wikipedia.org/wiki/La_Chaux-de-Fonds" target=new>Cliquer ici</a> http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker.png 21,25 -10.5,-25
2 554250,215600 Ma première station Diesel pas cher http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-blue.png 21,25 -10.5,-25
3 552556,215864 Mon parking C'est celui-là le meilleur. http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-gold.png 21,25 -10.5,-25
4 554489,217126 Mon parking Ce parking est<br/>le meillleur. http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-gold.png 21,25 -10.5,-25
5 554089,217326 Ma deuxième station Sans-plomb pas cher. http://dev.openlayers.org/releases/OpenLayers-2.13.1/img/marker-blue.png 21,25 -10.5,-25
12 changes: 9 additions & 3 deletions api/src/Map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,10 +299,16 @@ class Map {
});
marker.setProperties(filterByKeys(values, attr));
marker.setId(values.id);
// FIXME: handle values.iconSize
// FIXME: handle values.iconOffset
let anchor;
if (values.iconOffset) {
// flip the sign of the value to be compatible with the old api.
anchor = values.iconOffset.split(',').map(parseFloat).map(val => val * Math.sign(val));
}
const image = new Icon({
src: values.icon
src: values.icon,
anchorXUnits: 'pixels',
anchorYUnits: 'pixels',
anchor: anchor
});
// @ts-ignore: OL issue
marker.setStyle(new Style({
Expand Down
6 changes: 4 additions & 2 deletions contribs/gmf/src/print/component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,6 +1380,7 @@ class Controller {
*/
getMetadataLegendImage_(layerName, dpi = 72) {
const groupNode = findGroupByLayerNodeName(this.currentThemes_, layerName);
let found_dpi = dpi;
let node;
if (groupNode && groupNode.children) {
node = findObjectByName(groupNode.children, layerName);
Expand All @@ -1393,14 +1394,15 @@ class Controller {
let dist = Number.MAX_VALUE;
if (legendImage) {
dist = Math.abs(Math.log(72 / dpi));
found_dpi = 72;
}
if (hiDPILegendImages) {
for (const str_dpi in hiDPILegendImages) {
const new_dpi = parseFloat(str_dpi);
const new_dist = Math.abs(Math.log(new_dpi / dpi));
if (new_dist < dist) {
dist = new_dist;
dpi = new_dpi;
found_dpi = new_dpi;
legendImage = hiDPILegendImages[str_dpi];
}
}
Expand All @@ -1410,7 +1412,7 @@ class Controller {
}
return {
url: legendImage,
dpi: dpi,
dpi: found_dpi,
};
}

Expand Down