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:
parent
254d7f67be
commit
2be0b852db
|
@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- [Only require a name to build map popups #515](https://github.com/farmOS/farmOS/pull/515)
|
||||||
|
|
||||||
### Security
|
### Security
|
||||||
|
|
||||||
- Update Drupal core to 9.3.8 for [SA-CORE-2022-005](https://www.drupal.org/sa-core-2022-005).
|
- Update Drupal core to 9.3.8 for [SA-CORE-2022-005](https://www.drupal.org/sa-core-2022-005).
|
||||||
|
|
|
@ -37,12 +37,16 @@
|
||||||
feature.set('name', names.length + ' item(s):');
|
feature.set('name', names.length + ' item(s):');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A popup name is required.
|
||||||
var name = featureName(feature) || '';
|
var name = featureName(feature) || '';
|
||||||
var description = feature.get('description') || '';
|
if (name !== '') {
|
||||||
var measurement = instance.measureGeometry(feature.getGeometry(), instance.units);
|
|
||||||
|
|
||||||
// A popup name is required, along with a measurement and/or description.
|
// Get the description and measurement.
|
||||||
if (name !== '' && (measurement !== '' || description !== '')) {
|
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>';
|
content = '<h4 class="ol-popup-name">' + name + '</h4><div class="ol-popup-measurement"><small>' + measurement + '</small></div><div class="ol-popup-description">' + description + '</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue