OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Only require a name to build map popups #515 

This allows popups to be rendered for multipolygon geometries
that will not have a measurement calculated.
This commit is contained in:
Paul Weidner 2022-03-21 10:39:20 -07:00 committed by Michael Stenta
parent 254d7f67be
commit 2be0b852db
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
### Fixed
- [Only require a name to build map popups #515](https://github.com/farmOS/farmOS/pull/515)
### Security
- Update Drupal core to 9.3.8 for [SA-CORE-2022-005](https://www.drupal.org/sa-core-2022-005).

12
modules/core/map/js/farmOS.map.behaviors.popup.js
View File

@ -37,12 +37,16 @@
feature.set('name', names.length + ' item(s):');
}
// A popup name is required.
var name = featureName(feature) || '';
var description = feature.get('description') || '';
var measurement = instance.measureGeometry(feature.getGeometry(), instance.units);
if (name !== '') {
// A popup name is required, along with a measurement and/or description.
if (name !== '' && (measurement !== '' || description !== '')) {
// Get the description and measurement.
var description = feature.get('description') || '';
var measurement = instance.measureGeometry(feature.getGeometry(), instance.units);
// Build content with all three values, even if empty. The measurement and description divs may be used
// as placeholders for map behaviors to place additional information.
content = '<h4 class="ol-popup-name">' + name + '</h4><div class="ol-popup-measurement"><small>' + measurement + '</small></div><div class="ol-popup-description">' + description + '</div>';
}
}