@esri/solutions-components 0.4.8 → 0.4.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/calcite-input-message_5.cjs.entry.js +282 -282
- package/dist/cjs/{downloadUtils-75d3d16a.js → downloadUtils-bb998aa8.js} +1096 -1094
- package/dist/cjs/{index.es-639250cc.js → index.es-b1ff1b6a.js} +10682 -10682
- package/dist/cjs/layer-table.cjs.entry.js +22 -22
- package/dist/cjs/public-notification.cjs.entry.js +27 -27
- package/dist/collection/components/public-notification/public-notification.js +3 -3
- package/dist/collection/utils/downloadUtils.js +3 -1
- package/dist/collection/utils/downloadUtils.ts +3 -1
- package/dist/components/downloadUtils.js +1092 -1090
- package/dist/components/public-notification.js +60 -60
- package/dist/esm/calcite-input-message_5.entry.js +274 -274
- package/dist/esm/{downloadUtils-bcf65b52.js → downloadUtils-2ed29d75.js} +1092 -1090
- package/dist/esm/{index.es-4c9f419c.js → index.es-edc28958.js} +10596 -10596
- package/dist/esm/layer-table.entry.js +18 -18
- package/dist/esm/public-notification.entry.js +23 -23
- package/dist/solutions-components/{p-695007c1.entry.js → p-08ecf204.entry.js} +16 -16
- package/dist/solutions-components/{p-71372851.js → p-375face5.js} +437 -437
- package/dist/solutions-components/{p-20c73673.entry.js → p-5205c898.entry.js} +6 -6
- package/dist/solutions-components/{p-186b959c.entry.js → p-53836566.entry.js} +6 -6
- package/dist/solutions-components/{p-bb92a46c.js → p-d9c18211.js} +60 -60
- package/dist/solutions-components/solutions-components.esm.js +6 -6
- package/dist/solutions-components/utils/downloadUtils.ts +3 -1
- package/dist/solutions-components_commit.txt +7 -7
- package/dist/types/components/public-notification/public-notification.d.ts +6 -2
- package/package.json +1 -1
@@ -1,22 +1,22 @@
|
|
1
|
-
/*!
|
2
|
-
* Copyright 2022 Esri
|
3
|
-
* Licensed under the Apache License, Version 2.0
|
4
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
5
|
-
*/
|
6
|
-
'use strict';
|
7
|
-
|
8
|
-
Object.defineProperty(exports, '__esModule', { value: true });
|
9
|
-
|
10
|
-
const index = require('./index-c6979cbb.js');
|
11
|
-
const locale = require('./locale-04da9a8c.js');
|
12
|
-
const mapViewUtils = require('./mapViewUtils-d250b1ed.js');
|
13
|
-
const downloadUtils = require('./downloadUtils-
|
14
|
-
require('./_commonjsHelpers-384729db.js');
|
15
|
-
require('./interfaces-17c631bf.js');
|
16
|
-
require('./loadModules-0806a34f.js');
|
17
|
-
|
18
|
-
const layerTableCss = ":host{display:block}.table{display:table;width:100%}.header{display:table-header-group;background-color:#757575;font-weight:500;font-size:var(--calcite-font-size-0);color:var(--calcite-ui-text-inverse);position:sticky;top:0;z-index:1}.table-header-cell{display:table-cell;text-align:justify;border-right:1px solid var(--calcite-ui-border-2);padding:0.5rem}.table-body{display:table-row-group}.row{display:table-row}.table-cell{display:table-cell;padding:0.5rem}.display-table-header{display:table-header-group}.display-flex{display:flex}.table-border{border:1px solid var(--calcite-ui-border-2)}.justify-center{justify-content:center}.table-container{width:100%}.overflow-auto{overflow:auto}.data-container{overflow:auto;height:calc(100% - 35px)}.row:nth-child(odd){background:var(--calcite-ui-foreground-3)}.padding-3-4{padding:0.75rem}.field-width{white-space:nowrap;min-width:300px;max-width:300px;overflow:hidden}";
|
19
|
-
|
1
|
+
/*!
|
2
|
+
* Copyright 2022 Esri
|
3
|
+
* Licensed under the Apache License, Version 2.0
|
4
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
5
|
+
*/
|
6
|
+
'use strict';
|
7
|
+
|
8
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
9
|
+
|
10
|
+
const index = require('./index-c6979cbb.js');
|
11
|
+
const locale = require('./locale-04da9a8c.js');
|
12
|
+
const mapViewUtils = require('./mapViewUtils-d250b1ed.js');
|
13
|
+
const downloadUtils = require('./downloadUtils-bb998aa8.js');
|
14
|
+
require('./_commonjsHelpers-384729db.js');
|
15
|
+
require('./interfaces-17c631bf.js');
|
16
|
+
require('./loadModules-0806a34f.js');
|
17
|
+
|
18
|
+
const layerTableCss = ":host{display:block}.table{display:table;width:100%}.header{display:table-header-group;background-color:#757575;font-weight:500;font-size:var(--calcite-font-size-0);color:var(--calcite-ui-text-inverse);position:sticky;top:0;z-index:1}.table-header-cell{display:table-cell;text-align:justify;border-right:1px solid var(--calcite-ui-border-2);padding:0.5rem}.table-body{display:table-row-group}.row{display:table-row}.table-cell{display:table-cell;padding:0.5rem}.display-table-header{display:table-header-group}.display-flex{display:flex}.table-border{border:1px solid var(--calcite-ui-border-2)}.justify-center{justify-content:center}.table-container{width:100%}.overflow-auto{overflow:auto}.data-container{overflow:auto;height:calc(100% - 35px)}.row:nth-child(odd){background:var(--calcite-ui-foreground-3)}.padding-3-4{padding:0.75rem}.field-width{white-space:nowrap;min-width:300px;max-width:300px;overflow:hidden}";
|
19
|
+
|
20
20
|
const LayerTable = class {
|
21
21
|
constructor(hostRef) {
|
22
22
|
index.registerInstance(this, hostRef);
|
@@ -312,6 +312,6 @@ const LayerTable = class {
|
|
312
312
|
}
|
313
313
|
get el() { return index.getElement(this); }
|
314
314
|
};
|
315
|
-
LayerTable.style = layerTableCss;
|
316
|
-
|
317
|
-
exports.layer_table = LayerTable;
|
315
|
+
LayerTable.style = layerTableCss;
|
316
|
+
|
317
|
+
exports.layer_table = LayerTable;
|
@@ -1,24 +1,24 @@
|
|
1
|
-
/*!
|
2
|
-
* Copyright 2022 Esri
|
3
|
-
* Licensed under the Apache License, Version 2.0
|
4
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
5
|
-
*/
|
6
|
-
'use strict';
|
7
|
-
|
8
|
-
Object.defineProperty(exports, '__esModule', { value: true });
|
9
|
-
|
10
|
-
const index = require('./index-c6979cbb.js');
|
11
|
-
const interfaces = require('./interfaces-17c631bf.js');
|
12
|
-
const loadModules = require('./loadModules-0806a34f.js');
|
13
|
-
const mapViewUtils = require('./mapViewUtils-d250b1ed.js');
|
14
|
-
const publicNotificationStore = require('./publicNotificationStore-20e924f5.js');
|
15
|
-
const locale = require('./locale-04da9a8c.js');
|
16
|
-
const publicNotificationUtils = require('./publicNotificationUtils-9d585d8d.js');
|
17
|
-
require('./index-763f87ac.js');
|
18
|
-
require('./_commonjsHelpers-384729db.js');
|
19
|
-
|
20
|
-
const publicNotificationCss = ":host{display:block;--calcite-input-message-spacing-value:0}.align-center{align-items:center}.border-bottom-1{border-width:0px;border-bottom-width:1px;border-style:solid;border-color:var(--calcite-ui-border-3)}.action-bar-size{height:3.5rem;width:100%}.w-1-3{width:33.3%}.w-1-4{width:25%}.action-center{-webkit-box-align:center;-webkit-align-items:center;-ms-grid-row-align:center;align-items:center;align-content:center;justify-content:center}.width-full{width:100%}.height-full{height:100%}.padding-1{padding:1rem}.padding-top-sides-1{-webkit-padding-before:1rem;padding-block-start:1rem;-webkit-padding-start:1rem;padding-inline-start:1rem;-webkit-padding-end:1rem;padding-inline-end:1rem}.padding-sides-1{-webkit-padding-start:1rem;padding-inline-start:1rem;-webkit-padding-end:1rem;padding-inline-end:1rem}.padding-end-1-2{-webkit-padding-end:.5rem;padding-inline-end:.5rem}.padding-top-1-2{-webkit-padding-before:.5rem;padding-block-start:.5rem}.padding-top-1{padding-top:1rem}.padding-bottom-1{padding-bottom:1rem}.info-blue{color:#00A0FF}.info-message{justify-content:center;display:grid}.font-bold{font-weight:bold}.display-flex{display:flex}.display-block{display:block}.display-none{display:none}.main-label{float:left}html[dir=\"rtl\"] .main-label{float:right}.back-label:hover{cursor:pointer;color:var(--calcite-ui-brand-hover)}.border-bottom{border-bottom:1px solid var(--calcite-ui-border-2)}.margin-side-1{-webkit-margin-start:1rem;margin-inline-start:1rem;-webkit-margin-end:1rem;margin-inline-end:1rem}.border-top{border-top:1px solid var(--calcite-ui-border-2)}.w-100{width:100%}.w-50{width:50%}.padding-1-2{padding:0.5rem}.list-border{border:1px solid var(--calcite-ui-border-2)}.margin-sides-1{-webkit-margin-start:1rem;margin-inline-start:1rem;-webkit-margin-end:1rem;margin-inline-end:1rem}.margin-start-1-2{-webkit-margin-start:0.5rem;margin-inline-start:0.5rem}.float-right{float:right}.float-right[dir=\"rtl\"]{float:left}.float-left{float:left}.float-left[dir=\"rtl\"]{float:right}.margin-top-0{-webkit-margin-before:0 !important;margin-block-start:0 !important}.height-1-1-2{height:1.5rem}.main-background{background-color:var(--calcite-ui-foreground-2)}.num-selected{align-items:center;display:flex}";
|
21
|
-
|
1
|
+
/*!
|
2
|
+
* Copyright 2022 Esri
|
3
|
+
* Licensed under the Apache License, Version 2.0
|
4
|
+
* http://www.apache.org/licenses/LICENSE-2.0
|
5
|
+
*/
|
6
|
+
'use strict';
|
7
|
+
|
8
|
+
Object.defineProperty(exports, '__esModule', { value: true });
|
9
|
+
|
10
|
+
const index = require('./index-c6979cbb.js');
|
11
|
+
const interfaces = require('./interfaces-17c631bf.js');
|
12
|
+
const loadModules = require('./loadModules-0806a34f.js');
|
13
|
+
const mapViewUtils = require('./mapViewUtils-d250b1ed.js');
|
14
|
+
const publicNotificationStore = require('./publicNotificationStore-20e924f5.js');
|
15
|
+
const locale = require('./locale-04da9a8c.js');
|
16
|
+
const publicNotificationUtils = require('./publicNotificationUtils-9d585d8d.js');
|
17
|
+
require('./index-763f87ac.js');
|
18
|
+
require('./_commonjsHelpers-384729db.js');
|
19
|
+
|
20
|
+
const publicNotificationCss = ":host{display:block;--calcite-input-message-spacing-value:0}.align-center{align-items:center}.border-bottom-1{border-width:0px;border-bottom-width:1px;border-style:solid;border-color:var(--calcite-ui-border-3)}.action-bar-size{height:3.5rem;width:100%}.w-1-3{width:33.3%}.w-1-4{width:25%}.action-center{-webkit-box-align:center;-webkit-align-items:center;-ms-grid-row-align:center;align-items:center;align-content:center;justify-content:center}.width-full{width:100%}.height-full{height:100%}.padding-1{padding:1rem}.padding-top-sides-1{-webkit-padding-before:1rem;padding-block-start:1rem;-webkit-padding-start:1rem;padding-inline-start:1rem;-webkit-padding-end:1rem;padding-inline-end:1rem}.padding-sides-1{-webkit-padding-start:1rem;padding-inline-start:1rem;-webkit-padding-end:1rem;padding-inline-end:1rem}.padding-end-1-2{-webkit-padding-end:.5rem;padding-inline-end:.5rem}.padding-top-1-2{-webkit-padding-before:.5rem;padding-block-start:.5rem}.padding-top-1{padding-top:1rem}.padding-bottom-1{padding-bottom:1rem}.info-blue{color:#00A0FF}.info-message{justify-content:center;display:grid}.font-bold{font-weight:bold}.display-flex{display:flex}.display-block{display:block}.display-none{display:none}.main-label{float:left}html[dir=\"rtl\"] .main-label{float:right}.back-label:hover{cursor:pointer;color:var(--calcite-ui-brand-hover)}.border-bottom{border-bottom:1px solid var(--calcite-ui-border-2)}.margin-side-1{-webkit-margin-start:1rem;margin-inline-start:1rem;-webkit-margin-end:1rem;margin-inline-end:1rem}.border-top{border-top:1px solid var(--calcite-ui-border-2)}.w-100{width:100%}.w-50{width:50%}.padding-1-2{padding:0.5rem}.list-border{border:1px solid var(--calcite-ui-border-2)}.margin-sides-1{-webkit-margin-start:1rem;margin-inline-start:1rem;-webkit-margin-end:1rem;margin-inline-end:1rem}.margin-start-1-2{-webkit-margin-start:0.5rem;margin-inline-start:0.5rem}.float-right{float:right}.float-right[dir=\"rtl\"]{float:left}.float-left{float:left}.float-left[dir=\"rtl\"]{float:right}.margin-top-0{-webkit-margin-before:0 !important;margin-block-start:0 !important}.height-1-1-2{height:1.5rem}.main-background{background-color:var(--calcite-ui-foreground-2)}.num-selected{align-items:center;display:flex}";
|
21
|
+
|
22
22
|
const PublicNotification = class {
|
23
23
|
constructor(hostRef) {
|
24
24
|
index.registerInstance(this, hostRef);
|
@@ -371,7 +371,7 @@ const PublicNotification = class {
|
|
371
371
|
_getDownloadPage(type) {
|
372
372
|
const isPdf = type === interfaces.EExportType.PDF;
|
373
373
|
const hasSelections = this._hasSelections();
|
374
|
-
return (index.h("calcite-panel", null, index.h("div", null, index.h("div", { class: "padding-top-sides-1" }, index.h("calcite-label", { class: "font-bold" }, isPdf ? this._translations.downloadPDF : this._translations.downloadCSV)), hasSelections ? (index.h("div", null, index.h("calcite-label", null, this._translations.notifications), this._getSelectionLists(), index.h("div", { class: "margin-side-1 padding-top-1 border-bottom" }), index.h("div", { class: "padding-top-sides-1" }, index.h("calcite-label", { layout: "inline" }, index.h("calcite-checkbox", { disabled: !this._downloadActive, ref: (el) => { this.
|
374
|
+
return (index.h("calcite-panel", null, index.h("div", null, index.h("div", { class: "padding-top-sides-1" }, index.h("calcite-label", { class: "font-bold" }, isPdf ? this._translations.downloadPDF : this._translations.downloadCSV)), hasSelections ? (index.h("div", null, index.h("calcite-label", null, this._translations.notifications), this._getSelectionLists(), index.h("div", { class: "margin-side-1 padding-top-1 border-bottom" }), index.h("div", { class: "padding-top-sides-1" }, index.h("calcite-label", { class: isPdf ? "display-none" : "", layout: "inline" }, index.h("calcite-checkbox", { disabled: !this._downloadActive, ref: (el) => { this._removeDuplicatesCSV = el; } }), this._translations.removeDuplicate), index.h("calcite-label", { class: isPdf ? "" : "display-none", layout: "inline" }, index.h("calcite-checkbox", { disabled: !this._downloadActive, ref: (el) => { this._removeDuplicatesPDF = el; } }), this._translations.removeDuplicate)), index.h("div", { class: isPdf ? "" : "display-none" }, this._getLabel(this._translations.selectPDFLabelOption, false), index.h("div", { class: "padding-sides-1" }, index.h("pdf-download", { disabled: !this._downloadActive, layerView: this.addresseeLayer, ref: (el) => { this._downloadTools = el; } }))), index.h("div", { class: "padding-1 display-flex" }, index.h("calcite-button", { disabled: !this._downloadActive, onClick: isPdf ? () => this._downloadPDF() : () => this._downloadCSV(), width: "full" }, isPdf ? this._translations.downloadPDF : this._translations.downloadCSV)))) : (this._getNotice(this._translations.downloadNoLists, "padding-sides-1 padding-bottom-1")))));
|
375
375
|
}
|
376
376
|
/**
|
377
377
|
* Create the stacked navigation buttons for a page
|
@@ -455,7 +455,7 @@ const PublicNotification = class {
|
|
455
455
|
_downloadPDF() {
|
456
456
|
const ids = publicNotificationUtils.getSelectionIds(this._getDownloadSelectionSets());
|
457
457
|
const selectionSetNames = this._selectionSets.map(set => set.label);
|
458
|
-
void this._downloadTools.downloadPDF(selectionSetNames, ids, this.
|
458
|
+
void this._downloadTools.downloadPDF(selectionSetNames, ids, this._removeDuplicatesPDF.checked);
|
459
459
|
}
|
460
460
|
/**
|
461
461
|
* Download all selection sets as CSV
|
@@ -465,7 +465,7 @@ const PublicNotification = class {
|
|
465
465
|
_downloadCSV() {
|
466
466
|
const ids = publicNotificationUtils.getSelectionIds(this._getDownloadSelectionSets());
|
467
467
|
const selectionSetNames = this._selectionSets.map(set => set.label);
|
468
|
-
void this._downloadTools.downloadCSV(selectionSetNames, ids, this.
|
468
|
+
void this._downloadTools.downloadCSV(selectionSetNames, ids, this._removeDuplicatesCSV.checked);
|
469
469
|
}
|
470
470
|
/**
|
471
471
|
* Get all enabled selection sets
|
@@ -725,6 +725,6 @@ const PublicNotification = class {
|
|
725
725
|
"_pageType": ["pageTypeWatchHandler"]
|
726
726
|
}; }
|
727
727
|
};
|
728
|
-
PublicNotification.style = publicNotificationCss;
|
729
|
-
|
730
|
-
exports.public_notification = PublicNotification;
|
728
|
+
PublicNotification.style = publicNotificationCss;
|
729
|
+
|
730
|
+
exports.public_notification = PublicNotification;
|
@@ -375,7 +375,7 @@ export class PublicNotification {
|
|
375
375
|
_getDownloadPage(type) {
|
376
376
|
const isPdf = type === EExportType.PDF;
|
377
377
|
const hasSelections = this._hasSelections();
|
378
|
-
return (h("calcite-panel", null, h("div", null, h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "font-bold" }, isPdf ? this._translations.downloadPDF : this._translations.downloadCSV)), hasSelections ? (h("div", null, h("calcite-label", null, this._translations.notifications), this._getSelectionLists(), h("div", { class: "margin-side-1 padding-top-1 border-bottom" }), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { layout: "inline" }, h("calcite-checkbox", { disabled: !this._downloadActive, ref: (el) => { this.
|
378
|
+
return (h("calcite-panel", null, h("div", null, h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: "font-bold" }, isPdf ? this._translations.downloadPDF : this._translations.downloadCSV)), hasSelections ? (h("div", null, h("calcite-label", null, this._translations.notifications), this._getSelectionLists(), h("div", { class: "margin-side-1 padding-top-1 border-bottom" }), h("div", { class: "padding-top-sides-1" }, h("calcite-label", { class: isPdf ? "display-none" : "", layout: "inline" }, h("calcite-checkbox", { disabled: !this._downloadActive, ref: (el) => { this._removeDuplicatesCSV = el; } }), this._translations.removeDuplicate), h("calcite-label", { class: isPdf ? "" : "display-none", layout: "inline" }, h("calcite-checkbox", { disabled: !this._downloadActive, ref: (el) => { this._removeDuplicatesPDF = el; } }), this._translations.removeDuplicate)), h("div", { class: isPdf ? "" : "display-none" }, this._getLabel(this._translations.selectPDFLabelOption, false), h("div", { class: "padding-sides-1" }, h("pdf-download", { disabled: !this._downloadActive, layerView: this.addresseeLayer, ref: (el) => { this._downloadTools = el; } }))), h("div", { class: "padding-1 display-flex" }, h("calcite-button", { disabled: !this._downloadActive, onClick: isPdf ? () => this._downloadPDF() : () => this._downloadCSV(), width: "full" }, isPdf ? this._translations.downloadPDF : this._translations.downloadCSV)))) : (this._getNotice(this._translations.downloadNoLists, "padding-sides-1 padding-bottom-1")))));
|
379
379
|
}
|
380
380
|
/**
|
381
381
|
* Create the stacked navigation buttons for a page
|
@@ -459,7 +459,7 @@ export class PublicNotification {
|
|
459
459
|
_downloadPDF() {
|
460
460
|
const ids = utils.getSelectionIds(this._getDownloadSelectionSets());
|
461
461
|
const selectionSetNames = this._selectionSets.map(set => set.label);
|
462
|
-
void this._downloadTools.downloadPDF(selectionSetNames, ids, this.
|
462
|
+
void this._downloadTools.downloadPDF(selectionSetNames, ids, this._removeDuplicatesPDF.checked);
|
463
463
|
}
|
464
464
|
/**
|
465
465
|
* Download all selection sets as CSV
|
@@ -469,7 +469,7 @@ export class PublicNotification {
|
|
469
469
|
_downloadCSV() {
|
470
470
|
const ids = utils.getSelectionIds(this._getDownloadSelectionSets());
|
471
471
|
const selectionSetNames = this._selectionSets.map(set => set.label);
|
472
|
-
void this._downloadTools.downloadCSV(selectionSetNames, ids, this.
|
472
|
+
void this._downloadTools.downloadCSV(selectionSetNames, ids, this._removeDuplicatesCSV.checked);
|
473
473
|
}
|
474
474
|
/**
|
475
475
|
* Get all enabled selection sets
|
@@ -41,6 +41,7 @@ const lineSeparatorChar = "|";
|
|
41
41
|
*/
|
42
42
|
export async function downloadCSV(selectionSetNames, layer, ids, formatUsingLayerPopup, removeDuplicates = false, addColumnTitle = false) {
|
43
43
|
console.log("downloadCSV using selectionSetNames " + JSON.stringify(selectionSetNames)); //???
|
44
|
+
console.log("downloadCSV removeDuplicates", removeDuplicates); //???
|
44
45
|
const labels = await _prepareLabels(layer, ids, removeDuplicates, formatUsingLayerPopup, addColumnTitle);
|
45
46
|
exportCSV(labels);
|
46
47
|
return Promise.resolve();
|
@@ -57,6 +58,7 @@ export async function downloadCSV(selectionSetNames, layer, ids, formatUsingLaye
|
|
57
58
|
*/
|
58
59
|
export async function downloadPDF(selectionSetNames, layer, ids, removeDuplicates, labelPageDescription) {
|
59
60
|
console.log("downloadPDF using selectionSetNames " + JSON.stringify(selectionSetNames)); //???
|
61
|
+
console.log("downloadPDF removeDuplicates", removeDuplicates); //???
|
60
62
|
let labels = await _prepareLabels(layer, ids, removeDuplicates);
|
61
63
|
labels =
|
62
64
|
// Remove empty lines in labels
|
@@ -98,7 +100,7 @@ function _convertPopupTextToLabelSpec(popupInfo) {
|
|
98
100
|
// Replace <br> variants with the line separator character
|
99
101
|
popupInfo = popupInfo.replace(/<br\s*\/?>/gi, lineSeparatorChar);
|
100
102
|
// Replace <p> variants with the line separator character, except in the first position
|
101
|
-
popupInfo = popupInfo.replace(/<p[^>]*>/gi, lineSeparatorChar).trim().replace(
|
103
|
+
popupInfo = popupInfo.replace(/<p[^>]*>/gi, lineSeparatorChar).trim().replace(/^\|/, "");
|
102
104
|
// Remove </p>
|
103
105
|
popupInfo = popupInfo.replace(/<\/p>/gi, "");
|
104
106
|
// Remove \n
|
@@ -69,6 +69,7 @@ export async function downloadCSV(
|
|
69
69
|
addColumnTitle = false
|
70
70
|
): Promise<void> {
|
71
71
|
console.log("downloadCSV using selectionSetNames " + JSON.stringify(selectionSetNames));//???
|
72
|
+
console.log("downloadCSV removeDuplicates", removeDuplicates);//???
|
72
73
|
const labels = await _prepareLabels(layer, ids, removeDuplicates, formatUsingLayerPopup, addColumnTitle);
|
73
74
|
|
74
75
|
exportCSV(labels);
|
@@ -94,6 +95,7 @@ export async function downloadPDF(
|
|
94
95
|
labelPageDescription: ILabel
|
95
96
|
): Promise<void> {
|
96
97
|
console.log("downloadPDF using selectionSetNames " + JSON.stringify(selectionSetNames));//???
|
98
|
+
console.log("downloadPDF removeDuplicates", removeDuplicates);//???
|
97
99
|
let labels = await _prepareLabels(layer, ids, removeDuplicates);
|
98
100
|
|
99
101
|
labels =
|
@@ -150,7 +152,7 @@ function _convertPopupTextToLabelSpec(
|
|
150
152
|
popupInfo = popupInfo.replace(/<br\s*\/?>/gi, lineSeparatorChar);
|
151
153
|
|
152
154
|
// Replace <p> variants with the line separator character, except in the first position
|
153
|
-
popupInfo = popupInfo.replace(/<p[^>]*>/gi, lineSeparatorChar).trim().replace(
|
155
|
+
popupInfo = popupInfo.replace(/<p[^>]*>/gi, lineSeparatorChar).trim().replace(/^\|/, "");
|
154
156
|
|
155
157
|
// Remove </p>
|
156
158
|
popupInfo = popupInfo.replace(/<\/p>/gi, "");
|