Browse Source

Refactoring

pull/8298/head
kalytka 4 years ago
parent
commit
1d2368e98f
  1. 2
      ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts

2
ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts

@ -95,13 +95,13 @@ interface labelSettings {
} }
export function entitiesParseName(entities: FormattedData[], labelSettings: labelSettings): FormattedData[] { export function entitiesParseName(entities: FormattedData[], labelSettings: labelSettings): FormattedData[] {
const div = document.createElement('div');
for (const entity of entities) { for (const entity of entities) {
if (labelSettings?.showLabel) { if (labelSettings?.showLabel) {
const pattern = labelSettings.useLabelFunction ? safeExecute(labelSettings.parsedLabelFunction, const pattern = labelSettings.useLabelFunction ? safeExecute(labelSettings.parsedLabelFunction,
[entity, entities, entity.dsIndex]) : labelSettings.label; [entity, entities, entity.dsIndex]) : labelSettings.label;
const markerLabelText = parseWithTranslation.prepareProcessPattern(pattern, true); const markerLabelText = parseWithTranslation.prepareProcessPattern(pattern, true);
const replaceInfoLabelMarker = processDataPattern(pattern, entity); const replaceInfoLabelMarker = processDataPattern(pattern, entity);
const div = document.createElement('div');
div.innerHTML = fillDataPattern(markerLabelText, replaceInfoLabelMarker, entity); div.innerHTML = fillDataPattern(markerLabelText, replaceInfoLabelMarker, entity);
entity.entityParseName = div.textContent || div.innerText || ''; entity.entityParseName = div.textContent || div.innerText || '';
} else { } else {

Loading…
Cancel
Save