diff --git a/assets/src/components/Digitizing.js b/assets/src/components/Digitizing.js index 5ddc96b816..0ab37b05cd 100644 --- a/assets/src/components/Digitizing.js +++ b/assets/src/components/Digitizing.js @@ -283,7 +283,25 @@ export default class Digitizing extends HTMLElement { render(mainTemplate(), this); } }, - ['digitizing.featureDrawn', 'digitizing.visibility', 'digitizing.toolSelected', 'digitizing.editionBegins', 'digitizing.editionEnds', 'digitizing.erasingBegins', 'digitizing.erasingEnds', 'digitizing.erase','digitizing.rotate', 'digitizing.erase.all', 'digitizing.drawColor', 'digitizing.save', 'digitizing.measure', 'digitizing.editedFeatureText', 'digitizing.editedFeatureRotation', 'digitizing.editedFeatureScale', 'digitizing.split'] + [ + 'digitizing.drawColor', + 'digitizing.editedFeatureRotation', + 'digitizing.editedFeatureScale', + 'digitizing.editedFeatureText', + 'digitizing.editionBegins', + 'digitizing.editionEnds', + 'digitizing.erase', + 'digitizing.erase.all', + 'digitizing.erasingBegins', + 'digitizing.erasingEnds', + 'digitizing.featureDrawn', + 'digitizing.measure', + 'digitizing.rotate', + 'digitizing.save', + 'digitizing.split', + 'digitizing.toolSelected', + 'digitizing.visibility', + ] ); } diff --git a/assets/src/components/Geolocation.js b/assets/src/components/Geolocation.js index 23d9dcc162..6068531000 100644 --- a/assets/src/components/Geolocation.js +++ b/assets/src/components/Geolocation.js @@ -24,8 +24,14 @@ export default class Geolocation extends HTMLElement { const mainTemplate = () => html`
- - + +
mainLizmap.geolocation.bindIntervalInSecond = parseInt(event.target.value)}> diff --git a/assets/src/components/MousePosition.js b/assets/src/components/MousePosition.js index 6829962877..ee4b96f974 100644 --- a/assets/src/components/MousePosition.js +++ b/assets/src/components/MousePosition.js @@ -43,10 +43,12 @@ export default class MousePosition extends HTMLElement { // Don't add line break between s or it adds a space in UI mainTemplate(lon, lat){ + const inputLongitude = ` this._lonInput = parseFloat(event.target.value)} @keydown=${(event) => { if (event.key === 'Enter') { this._centerToCoords(); } }} .value=${isNaN(lon) ? 0 : lon}>`; + const inputLatitude = ` this._latInput = parseFloat(event.target.value)} @keydown=${(event) => { if (event.key === 'Enter') { this._centerToCoords(); } }} .value=${isNaN(lat) ? 0 : lat}>`; return html`
- this._lonInput = parseFloat(event.target.value)} @keydown=${(event) => { if (event.key === 'Enter') { this._centerToCoords(); } }} .value=${isNaN(lon) ? 0 : lon}> this._latInput = parseFloat(event.target.value)} @keydown=${(event) => { if (event.key === 'Enter') { this._centerToCoords(); } }} .value=${isNaN(lat) ? 0 : lat}> + ${inputLongitude}${inputLatitude}
${lon} diff --git a/assets/src/components/SelectionInvert.js b/assets/src/components/SelectionInvert.js index 79b64599f3..17103cf03e 100644 --- a/assets/src/components/SelectionInvert.js +++ b/assets/src/components/SelectionInvert.js @@ -24,8 +24,10 @@ export default class SelectionInvert extends HTMLElement { connectedCallback() { + const isHidden = this.getAttribute('feature-type') && mainLizmap.config.layers[mainLizmap.getLayerNameByCleanName(this.getAttribute('feature-type'))]['selectedFeatures'].length === 0 ? 'hide' : ''; + const isDisabled = this.getAttribute('feature-type') ? mainLizmap.config.layers[mainLizmap.getLayerNameByCleanName(this.getAttribute('feature-type'))]['selectedFeatures'].length === 0 : (mainLizmap.selectionTool.selectedFeaturesCount === 0 || mainLizmap.selectionTool.allFeatureTypeSelected.length > 1); const mainTemplate = () => html` - - diff --git a/assets/src/components/Snapping.js b/assets/src/components/Snapping.js index f2538cedc8..d4a99e90cc 100644 --- a/assets/src/components/Snapping.js +++ b/assets/src/components/Snapping.js @@ -42,7 +42,10 @@ export default class Snapping extends HTMLElement {
${mainLizmap.snapping?.config?.snap_layers.map((snapLayer) => html`
- mainLizmap.snapping.snapToggled = snapLayer} .disabled=${!mainLizmap.snapping?.config?.snap_enabled[snapLayer]} .checked=${mainLizmap.snapping?.config?.snap_on_layers[snapLayer]} type="checkbox"/> + mainLizmap.snapping.snapToggled = snapLayer} .disabled=${!mainLizmap.snapping?.config?.snap_enabled[snapLayer]} .checked=${mainLizmap.snapping?.config?.snap_on_layers[snapLayer]} type="checkbox"/> +
` )} diff --git a/assets/src/dependencies/mgrs.js b/assets/src/dependencies/mgrs.js index a4db7c312a..3972c26cd7 100644 --- a/assets/src/dependencies/mgrs.js +++ b/assets/src/dependencies/mgrs.js @@ -214,6 +214,7 @@ function LLtoUTM(ll) { const C = eccPrimeSquared * Math.cos(LatRad) * Math.cos(LatRad); const A = Math.cos(LatRad) * (LongRad - LongOriginRad); + // eslint-disable-next-line @stylistic/js/max-len const M = a * ((1 - ECC_SQUARED / 4 - 3 * ECC_SQUARED * ECC_SQUARED / 64 - 5 * ECC_SQUARED * ECC_SQUARED * ECC_SQUARED / 256) * LatRad - (3 * ECC_SQUARED / 8 + 3 * ECC_SQUARED * ECC_SQUARED / 32 + 45 * ECC_SQUARED * ECC_SQUARED * ECC_SQUARED / 1024) * Math.sin(2 * LatRad) + (15 * ECC_SQUARED * ECC_SQUARED / 256 + 45 * ECC_SQUARED * ECC_SQUARED * ECC_SQUARED / 1024) * Math.sin(4 * LatRad) - (35 * ECC_SQUARED * ECC_SQUARED * ECC_SQUARED / 3072) * Math.sin(6 * LatRad)); const UTMEasting = (SCALE_FACTOR * N * (A + (1 - T + C) * A * A * A / 6 + (5 - 18 * T + T * T + 72 * C - 58 * eccPrimeSquared) * A * A * A * A * A / 120) + EASTING_OFFSET); diff --git a/assets/src/modules/state/ExternalMapLayer.js b/assets/src/modules/state/ExternalMapLayer.js index 25fdfe2cf3..449881653c 100644 --- a/assets/src/modules/state/ExternalMapLayer.js +++ b/assets/src/modules/state/ExternalMapLayer.js @@ -1,7 +1,7 @@ import EventDispatcher from './../../utils/EventDispatcher.js'; import { convertBoolean, convertNumber } from './../utils/Converters.js'; -import { base64svg, base64svgOlLayer, base64png } from './Symbology.js'; +import { base64svg, base64svgOlLayer, base64png } from './SymbologyIcons.js'; /** * Class representing an external map item state @@ -463,7 +463,7 @@ export class OlMapLayerState extends ExternalMapItemState { set icon(base64icon) { if (!base64icon.startsWith(base64png) && !base64icon.startsWith(base64svg)) { - throw new TypeError('base64icon value does not start with `'+ base64png +'` or `'+base64svg+'`! The value is `'+base64icon+'`!'); + throw new TypeError(`base64icon value does not start with '${base64png}' or '${base64svg}'! The value is '${base64icon}'!`); } const oldIcon = this._icon; this._icon = base64icon; diff --git a/assets/src/modules/state/Symbology.js b/assets/src/modules/state/Symbology.js index d9f6a1effc..8a04c4adb5 100644 --- a/assets/src/modules/state/Symbology.js +++ b/assets/src/modules/state/Symbology.js @@ -11,49 +11,16 @@ import { convertBoolean } from './../utils/Converters.js'; import EventDispatcher from './../../utils/EventDispatcher.js'; import { applyConfig } from './../config/BaseObject.js'; import { LayerConfig } from './../config/Layer.js'; +import { + base64png, + base64pngNullData, + base64svg, + base64svgPointLayer, + base64svgLineLayer, + base64svgPolygonLayer, + base64svgRasterLayer, +} from './SymbologyIcons.js'; -/** - * The started base 64 string for PNG image - * @type {string} - */ -export const base64png = 'data:image/png;base64, '; -/** - * The base 64 string for transparent PNG image - * @type {string} - */ -export const base64pngNullData = 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpUUrDu0g4pChdrIgKuKoVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE1cVJ0UVK/F9SaBHjwXE/3t173L0D/M0qU82ecUDVLCOTSgq5/KoQfEUQEYTQj7jETH1OFNPwHF/38PH1LsGzvM/9OQaUgskAn0A8y3TDIt4gnt60dM77xFFWlhTic+Ixgy5I/Mh12eU3ziWH/TwzamQz88RRYqHUxXIXs7KhEk8RxxRVo3x/zmWF8xZntVpn7XvyF4YL2soy12mOIIVFLEGEABl1VFCFhQStGikmMrSf9PAPO36RXDK5KmDkWEANKiTHD/4Hv7s1i5MTblI4CfS+2PbHKBDcBVoN2/4+tu3WCRB4Bq60jr/WBGY+SW90tNgRMLgNXFx3NHkPuNwBhp50yZAcKUDTXywC72f0TXkgcgv0rbm9tfdx+gBkqav0DXBwCMRLlL3u8e5Qd2//nmn39wNBG3KTQZt3dAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+cHEwgMJzC1DiQAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAEklEQVQ4y2NgGAWjYBSMAggAAAQQAAGFP6pyAAAAAElFTkSuQmCC'; - -/** - * The started base 64 string for SVG image - * @type {string} - */ -export const base64svg = 'data:image/svg+xml;base64,'; - -/** - * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconPointLayer.svg SVG image - * @type {string} - */ -export const base64svgPointLayer = 'PHN2ZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI2VlZWVlYyIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiM4ODhhODUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtMTYpIj48cGF0aCBkPSJtNC41IDEyLjVjMCAuNTUyMjg1LS40NDc3MTUzIDEtMSAxcy0xLS40NDc3MTUtMS0xIC40NDc3MTUzLTEgMS0xIDEgLjQ0NzcxNSAxIDF6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIDE2KSIvPjxwYXRoIGQ9Im00LjUgMTIuNWMwIC41NTIyODUtLjQ0NzcxNTMgMS0xIDFzLTEtLjQ0NzcxNS0xLTEgLjQ0NzcxNTMtMSAxLTEgMSAuNDQ3NzE1IDEgMXoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDIgOSkiLz48cGF0aCBkPSJtNC41IDEyLjVjMCAuNTUyMjg1LS40NDc3MTUzIDEtMSAxcy0xLS40NDc3MTUtMS0xIC40NDc3MTUzLTEgMS0xIDEgLjQ0NzcxNSAxIDF6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg5IDYpIi8+PC9nPjwvc3ZnPg==' -/** - * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconLineLayer.svg SVG image - * @type {string} - */ -export const base64svgLineLayer = 'PHN2ZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgc3Ryb2tlPSIjODg4YTg1IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTE2KSI+PHBhdGggZD0ibTEuNSA0LjUgNCA5IDUtMTFoNCIgZmlsbD0ibm9uZSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAxNikiLz48ZyBmaWxsPSIjZWVlZWVjIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Im00LjUgMTIuNWMwIC41NTIyODUtLjQ0NzcxNTMgMS0xIDFzLTEtLjQ0NzcxNS0xLTEgLjQ0NzcxNTMtMSAxLTEgMSAuNDQ3NzE1IDEgMXoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDIgMTcpIi8+PHBhdGggZD0ibTQuNSAxMi41YzAgLjU1MjI4NS0uNDQ3NzE1MyAxLTEgMXMtMS0uNDQ3NzE1LTEtMSAuNDQ3NzE1My0xIDEtMSAxIC40NDc3MTUgMSAxeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTEgNikiLz48cGF0aCBkPSJtNC41IDEyLjVjMCAuNTUyMjg1LS40NDc3MTUzIDEtMSAxcy0xLS40NDc3MTUtMS0xIC40NDc3MTUzLTEgMS0xIDEgLjQ0NzcxNSAxIDF6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg3IDYpIi8+PHBhdGggZD0ibTQuNSAxMi41YzAgLjU1MjI4NS0uNDQ3NzE1MyAxLTEgMXMtMS0uNDQ3NzE1LTEtMSAuNDQ3NzE1My0xIDEtMSAxIC40NDc3MTUgMSAxeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTIgOCkiLz48L2c+PC9nPjwvc3ZnPg==' -/** - * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconPolygonLayer.svg SVG image - * @type {string} - */ -export const base64svgPolygonLayer = 'PHN2ZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSI0LjUiIHgyPSI2LjUiIHkxPSIzLjUiIHkyPSIxMC41Ij48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiNlZWUiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiNjZmNmY2YiLz48L2xpbmVhckdyYWRpZW50PjxwYXRoIGQ9Im0uNSA2LjVjMCAxMiA2IDIgOSAyIDIgMCA2IDQgNi0xIDAtOC00LjM5ODI2Mi0zLjE5MDUwNTUtNy00LTEuOTQyMzQwMi0uNjA0MzMyLTgtNC04IDN6IiBmaWxsPSJ1cmwoI2EpIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzg4OGE4NSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+PC9zdmc+' -/** - * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconRasterLayer.svg SVG image - * @type {string} - */ -export const base64svgRasterLayer = 'PHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNiAxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTIwLjUgLTMuNSkiPjxwYXRoIGQ9Im0yMC41IDE0LjE2N2g1LjMzM3Y1LjMzM2gtNS4zMzN6IiBmaWxsPSIjOTY5Njk2Ii8+PHBhdGggZD0ibTIwLjUgOC44MzNoNS4zMzN2NS4zMzNoLTUuMzMzeiIgZmlsbD0iI2M5YzljOSIvPjxwYXRoIGQ9Im0yMC41IDMuNWg1LjMzM3Y1LjMzM2gtNS4zMzN6IiBmaWxsPSIjOTY5Njk2Ii8+PHBhdGggZD0ibTI1LjgzMyAzLjVoNS4zMzN2NS4zMzNoLTUuMzMzeiIgZmlsbD0iI2M5YzljOSIvPjxnIGZpbGw9IiM5Njk2OTYiPjxwYXRoIGQ9Im0yNS44MzMgOC44MzNoNS4zMzN2NS4zMzNoLTUuMzMzeiIvPjxwYXRoIGQ9Im0zMS4xNjcgMy41aDUuMzMzdjUuMzMzaC01LjMzM3oiLz48cGF0aCBkPSJtMjUuODMzIDE0LjE2N2g1LjMzM3Y1LjMzM2gtNS4zMzN6Ii8+PC9nPjxwYXRoIGQ9Im0zMS4xNjcgOC44MzNoNS4zMzN2NS4zMzNoLTUuMzMzeiIgZmlsbD0iI2M5YzljOSIvPjwvZz48L3N2Zz4=' -/** - * The base 64 string for https://openlayers.org/theme/img/logo-dark.svg SVG image - * @type {string} - */ -export const base64svgOlLayer = 'PCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxMDAgMTAwIgogIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgPGRlZnM+CiAgICA8ZyBpZD0ibGF5ZXIiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDUwIDUwKSI+CiAgICAgIDxnIHRyYW5zZm9ybT0ic2NhbGUoMC43MDcxIDAuNSkiPgogICAgICAgIDxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC01MCAtNTApIj4KICAgICAgICAgIDxyZWN0IHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIiByeD0iMTUiIHRyYW5zZm9ybT0icm90YXRlKDQ1IDUwIDUwKSIgLz4KICAgICAgICA8L2c+CiAgICAgIDwvZz4KICAgIDwvZz4KICA8L2RlZnM+CiAgPGcgZmlsbD0iI0ZGRkZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAxMCkiPgogICAgPHVzZSB4bGluazpocmVmPSIjbGF5ZXIiLz4KICA8L2c+CiAgPGcgZmlsbD0iIzMzMzMzMyI+CiAgICA8dXNlIHhsaW5rOmhyZWY9IiNsYXllciIvPgogIDwvZz4KICA8ZyBmaWxsPSIjMDBBQUZGIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIC0xMCkiPgogICAgPHVzZSB4bGluazpocmVmPSIjbGF5ZXIiLz4KICA8L2c+Cjwvc3ZnPg==' /** * Get the default icon for a layer config diff --git a/assets/src/modules/state/SymbologyIcons.js b/assets/src/modules/state/SymbologyIcons.js new file mode 100644 index 0000000000..68c0df9463 --- /dev/null +++ b/assets/src/modules/state/SymbologyIcons.js @@ -0,0 +1,57 @@ +/** + * @copyright 2025 3Liz + * @author DHONT René-Luc + * @license MPL-2.0 + */ + +/* eslint-disable @stylistic/js/max-len -- + * Base64 strings are obviously too long +**/ + +/** + * The started base 64 string for PNG image + * @type {string} + */ +export const base64png = 'data:image/png;base64, '; + +/** + * The base 64 string for transparent PNG image + * @type {string} + */ +export const base64pngNullData = 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABhGlDQ1BJQ0MgcHJvZmlsZQAAKJF9kT1Iw0AcxV9bpUUrDu0g4pChdrIgKuKoVShChVArtOpgcukXNGlIUlwcBdeCgx+LVQcXZ10dXAVB8APE1cVJ0UVK/F9SaBHjwXE/3t173L0D/M0qU82ecUDVLCOTSgq5/KoQfEUQEYTQj7jETH1OFNPwHF/38PH1LsGzvM/9OQaUgskAn0A8y3TDIt4gnt60dM77xFFWlhTic+Ixgy5I/Mh12eU3ziWH/TwzamQz88RRYqHUxXIXs7KhEk8RxxRVo3x/zmWF8xZntVpn7XvyF4YL2soy12mOIIVFLEGEABl1VFCFhQStGikmMrSf9PAPO36RXDK5KmDkWEANKiTHD/4Hv7s1i5MTblI4CfS+2PbHKBDcBVoN2/4+tu3WCRB4Bq60jr/WBGY+SW90tNgRMLgNXFx3NHkPuNwBhp50yZAcKUDTXywC72f0TXkgcgv0rbm9tfdx+gBkqav0DXBwCMRLlL3u8e5Qd2//nmn39wNBG3KTQZt3dAAAAAZiS0dEAAAAAAAA+UO7fwAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAAd0SU1FB+cHEwgMJzC1DiQAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAEklEQVQ4y2NgGAWjYBSMAggAAAQQAAGFP6pyAAAAAElFTkSuQmCC'; + +/** + * The started base 64 string for SVG image + * @type {string} + */ +export const base64svg = 'data:image/svg+xml;base64,'; + +/** + * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconPointLayer.svg SVG image + * @type {string} + */ +export const base64svgPointLayer = 'PHN2ZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgZmlsbD0iI2VlZWVlYyIgZmlsbC1ydWxlPSJldmVub2RkIiBzdHJva2U9IiM4ODhhODUiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAtMTYpIj48cGF0aCBkPSJtNC41IDEyLjVjMCAuNTUyMjg1LS40NDc3MTUzIDEtMSAxcy0xLS40NDc3MTUtMS0xIC40NDc3MTUzLTEgMS0xIDEgLjQ0NzcxNSAxIDF6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIDE2KSIvPjxwYXRoIGQ9Im00LjUgMTIuNWMwIC41NTIyODUtLjQ0NzcxNTMgMS0xIDFzLTEtLjQ0NzcxNS0xLTEgLjQ0NzcxNTMtMSAxLTEgMSAuNDQ3NzE1IDEgMXoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDIgOSkiLz48cGF0aCBkPSJtNC41IDEyLjVjMCAuNTUyMjg1LS40NDc3MTUzIDEtMSAxcy0xLS40NDc3MTUtMS0xIC40NDc3MTUzLTEgMS0xIDEgLjQ0NzcxNSAxIDF6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg5IDYpIi8+PC9nPjwvc3ZnPg==' + +/** + * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconLineLayer.svg SVG image + * @type {string} + */ +export const base64svgLineLayer = 'PHN2ZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgc3Ryb2tlPSIjODg4YTg1IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTE2KSI+PHBhdGggZD0ibTEuNSA0LjUgNCA5IDUtMTFoNCIgZmlsbD0ibm9uZSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAxNikiLz48ZyBmaWxsPSIjZWVlZWVjIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Im00LjUgMTIuNWMwIC41NTIyODUtLjQ0NzcxNTMgMS0xIDFzLTEtLjQ0NzcxNS0xLTEgLjQ0NzcxNTMtMSAxLTEgMSAuNDQ3NzE1IDEgMXoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDIgMTcpIi8+PHBhdGggZD0ibTQuNSAxMi41YzAgLjU1MjI4NS0uNDQ3NzE1MyAxLTEgMXMtMS0uNDQ3NzE1LTEtMSAuNDQ3NzE1My0xIDEtMSAxIC40NDc3MTUgMSAxeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTEgNikiLz48cGF0aCBkPSJtNC41IDEyLjVjMCAuNTUyMjg1LS40NDc3MTUzIDEtMSAxcy0xLS40NDc3MTUtMS0xIC40NDc3MTUzLTEgMS0xIDEgLjQ0NzcxNSAxIDF6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg3IDYpIi8+PHBhdGggZD0ibTQuNSAxMi41YzAgLjU1MjI4NS0uNDQ3NzE1MyAxLTEgMXMtMS0uNDQ3NzE1LTEtMSAuNDQ3NzE1My0xIDEtMSAxIC40NDc3MTUgMSAxeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTIgOCkiLz48L2c+PC9nPjwvc3ZnPg==' + +/** + * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconPolygonLayer.svg SVG image + * @type {string} + */ +export const base64svgPolygonLayer = 'PHN2ZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxsaW5lYXJHcmFkaWVudCBpZD0iYSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSI0LjUiIHgyPSI2LjUiIHkxPSIzLjUiIHkyPSIxMC41Ij48c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiNlZWUiLz48c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiNjZmNmY2YiLz48L2xpbmVhckdyYWRpZW50PjxwYXRoIGQ9Im0uNSA2LjVjMCAxMiA2IDIgOSAyIDIgMCA2IDQgNi0xIDAtOC00LjM5ODI2Mi0zLjE5MDUwNTUtNy00LTEuOTQyMzQwMi0uNjA0MzMyLTgtNC04IDN6IiBmaWxsPSJ1cmwoI2EpIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIHN0cm9rZT0iIzg4OGE4NSIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIi8+PC9zdmc+' + +/** + * The base 64 string for https://raw.githubusercontent.com/qgis/QGIS/master/images/themes/default/mIconRasterLayer.svg SVG image + * @type {string} + */ +export const base64svgRasterLayer = 'PHN2ZyBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCAxNiAxNiIgaGVpZ2h0PSIxNiIgdmlld0JveD0iMCAwIDE2IDE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTIwLjUgLTMuNSkiPjxwYXRoIGQ9Im0yMC41IDE0LjE2N2g1LjMzM3Y1LjMzM2gtNS4zMzN6IiBmaWxsPSIjOTY5Njk2Ii8+PHBhdGggZD0ibTIwLjUgOC44MzNoNS4zMzN2NS4zMzNoLTUuMzMzeiIgZmlsbD0iI2M5YzljOSIvPjxwYXRoIGQ9Im0yMC41IDMuNWg1LjMzM3Y1LjMzM2gtNS4zMzN6IiBmaWxsPSIjOTY5Njk2Ii8+PHBhdGggZD0ibTI1LjgzMyAzLjVoNS4zMzN2NS4zMzNoLTUuMzMzeiIgZmlsbD0iI2M5YzljOSIvPjxnIGZpbGw9IiM5Njk2OTYiPjxwYXRoIGQ9Im0yNS44MzMgOC44MzNoNS4zMzN2NS4zMzNoLTUuMzMzeiIvPjxwYXRoIGQ9Im0zMS4xNjcgMy41aDUuMzMzdjUuMzMzaC01LjMzM3oiLz48cGF0aCBkPSJtMjUuODMzIDE0LjE2N2g1LjMzM3Y1LjMzM2gtNS4zMzN6Ii8+PC9nPjxwYXRoIGQ9Im0zMS4xNjcgOC44MzNoNS4zMzN2NS4zMzNoLTUuMzMzeiIgZmlsbD0iI2M5YzljOSIvPjwvZz48L3N2Zz4=' + +/** + * The base 64 string for https://openlayers.org/theme/img/logo-dark.svg SVG image + * @type {string} + */ +export const base64svgOlLayer = 'PCFET0NUWVBFIHN2ZyBQVUJMSUMgIi0vL1czQy8vRFREIFNWRyAxLjEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvR3JhcGhpY3MvU1ZHLzEuMS9EVEQvc3ZnMTEuZHRkIj4KPHN2ZyB3aWR0aD0iMTYiIGhlaWdodD0iMTYiIHZpZXdCb3g9IjAgMCAxMDAgMTAwIgogIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayI+CiAgPGRlZnM+CiAgICA8ZyBpZD0ibGF5ZXIiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDUwIDUwKSI+CiAgICAgIDxnIHRyYW5zZm9ybT0ic2NhbGUoMC43MDcxIDAuNSkiPgogICAgICAgIDxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC01MCAtNTApIj4KICAgICAgICAgIDxyZWN0IHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIiByeD0iMTUiIHRyYW5zZm9ybT0icm90YXRlKDQ1IDUwIDUwKSIgLz4KICAgICAgICA8L2c+CiAgICAgIDwvZz4KICAgIDwvZz4KICA8L2RlZnM+CiAgPGcgZmlsbD0iI0ZGRkZGRiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAxMCkiPgogICAgPHVzZSB4bGluazpocmVmPSIjbGF5ZXIiLz4KICA8L2c+CiAgPGcgZmlsbD0iIzMzMzMzMyI+CiAgICA8dXNlIHhsaW5rOmhyZWY9IiNsYXllciIvPgogIDwvZz4KICA8ZyBmaWxsPSIjMDBBQUZGIiB0cmFuc2Zvcm09InRyYW5zbGF0ZSgwIC0xMCkiPgogICAgPHVzZSB4bGluazpocmVmPSIjbGF5ZXIiLz4KICA8L2c+Cjwvc3ZnPg==' diff --git a/eslint.config.mjs b/eslint.config.mjs index dc831fddcc..97b058ae2f 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,5 +1,6 @@ import js from "@eslint/js"; import jsdoc from "eslint-plugin-jsdoc"; +import stylisticJs from '@stylistic/eslint-plugin-js' export default [ js.configs.recommended, @@ -21,6 +22,10 @@ export default [ "tests/units/vendor/", ], }, { + plugins: { + jsdoc, + '@stylistic/js': stylisticJs + }, languageOptions: { ecmaVersion: 2022, sourceType: "module", @@ -63,10 +68,14 @@ export default [ }, }, rules: { - "indent": ["error", 4, { - "SwitchCase": 1, - "ignoredNodes": ["TemplateLiteral *"], - }], + "@stylistic/js/indent": [ + 'error', 4, { + "SwitchCase": 1, + "ignoredNodes": ["TemplateLiteral *"], + } + ], + "@stylistic/js/max-len": [ + "error", 400, 4], // It's a temporary value, until we fix some. "no-prototype-builtins": "off", "no-undef": "off", 'jsdoc/require-description': 'warn', diff --git a/package-lock.json b/package-lock.json index e38904c751..ae4da3a914 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,6 +16,7 @@ "devDependencies": { "@eslint/js": "^9.19.0", "@playwright/test": "^1.50.1", + "@stylistic/eslint-plugin-js": "^3.0.1", "@turf/line-split": "^7.2.0", "chai": "^5.1.2", "cypress": "^9.7.0", @@ -529,6 +530,22 @@ "integrity": "sha512-Javneu5lsuhwNCryN+pXH93VPQ8g0dBX7wItHFgYiwQmzE1sVdg5tWHiOgHywzL2W21XQopa7IwIEnNbmeUJYA==", "dev": true }, + "node_modules/@stylistic/eslint-plugin-js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-3.0.1.tgz", + "integrity": "sha512-hjp6BKXSUdlY4l20pDb0EjIB5PtQDGihk2EUKCjJ5gaRVfcmMMkaIyVd/yK3oH7OLxWWBxJ8qSSo+zEdkmpnYA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^4.2.0", + "espree": "^10.3.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "peerDependencies": { + "eslint": ">=8.40.0" + } + }, "node_modules/@trysound/sax": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz", diff --git a/package.json b/package.json index 4decff5aa8..8b2bcd801a 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "devDependencies": { "@eslint/js": "^9.19.0", "@playwright/test": "^1.50.1", + "@stylistic/eslint-plugin-js": "^3.0.1", "@turf/line-split": "^7.2.0", "chai": "^5.1.2", "cypress": "^9.7.0", diff --git a/tests/end2end/playwright/filter-layer-by-user.spec.js b/tests/end2end/playwright/filter-layer-by-user.spec.js index ae5710525a..7d89893e3c 100644 --- a/tests/end2end/playwright/filter-layer-by-user.spec.js +++ b/tests/end2end/playwright/filter-layer-by-user.spec.js @@ -201,8 +201,19 @@ test.describe('Filter layer data by user - user in group a', () => { test('WMS GetFeatureInfo JSON', async ({ page }) => { const getFeatureInfo = await page.evaluate(async () => { - return await fetch("/index.php/lizmap/service?repository=testsrepository&project=filter_layer_by_user&SERVICE=WMS&REQUEST=GetFeatureInfo&VERSION=1.3.0&CRS=EPSG%3A2154&INFO_FORMAT=application%2Fjson&QUERY_LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&STYLE=default%2Cdefault%2Cdefault&FEATURE_COUNT=10&FILTER=green_filter_layer_by_user_edition_only:\"gid\" > 0") - .then(r => r.ok ? r.json() : Promise.reject(r)) + return await fetch( + "/index.php/lizmap/service?repository=testsrepository&project=filter_layer_by_user&" + + "SERVICE=WMS&" + + "REQUEST=GetFeatureInfo&" + + "VERSION=1.3.0&" + + "CRS=EPSG%3A2154&" + + "INFO_FORMAT=application%2Fjson&" + + "QUERY_LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&" + + "LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&" + + "STYLE=default%2Cdefault%2Cdefault&" + + "FEATURE_COUNT=10&" + + "FILTER=green_filter_layer_by_user_edition_only:\"gid\" > 0" + ).then(r => r.ok ? r.json() : Promise.reject(r)) }) // check features @@ -386,8 +397,19 @@ test.describe('Filter layer data by user - admin', () => { test('WMS GetFeatureInfo JSON', async ({ page }) => { const getFeatureInfo = await page.evaluate(async () => { - return await fetch("/index.php/lizmap/service?repository=testsrepository&project=filter_layer_by_user&SERVICE=WMS&REQUEST=GetFeatureInfo&VERSION=1.3.0&CRS=EPSG%3A2154&INFO_FORMAT=application%2Fjson&QUERY_LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&STYLE=default%2Cdefault%2Cdefault&FEATURE_COUNT=10&FILTER=green_filter_layer_by_user_edition_only:\"gid\" > 0") - .then(r => r.ok ? r.json() : Promise.reject(r)) + return await fetch( + "/index.php/lizmap/service?repository=testsrepository&project=filter_layer_by_user&" + + "SERVICE=WMS&" + + "REQUEST=GetFeatureInfo&" + + "VERSION=1.3.0&" + + "CRS=EPSG%3A2154&" + + "INFO_FORMAT=application%2Fjson&" + + "QUERY_LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&" + + "LAYERS=green_filter_layer_by_user_edition_only%2Cblue_filter_layer_by_user%2Cred_layer_with_no_filter&" + + "STYLE=default%2Cdefault%2Cdefault&" + + "FEATURE_COUNT=10&" + + "FILTER=green_filter_layer_by_user_edition_only:\"gid\" > 0" + ).then(r => r.ok ? r.json() : Promise.reject(r)) }) // check features diff --git a/tests/end2end/playwright/legend.spec.js b/tests/end2end/playwright/legend.spec.js index a28eaa9da8..1430a59283 100644 --- a/tests/end2end/playwright/legend.spec.js +++ b/tests/end2end/playwright/legend.spec.js @@ -1,6 +1,7 @@ // @ts-check import { test, expect } from '@playwright/test'; import { gotoMap } from './globals'; +import {base64svgLineLayer} from "assets/src/modules/state/SymbologyIcons"; test.describe('Legend tests', () => { @@ -45,7 +46,7 @@ test.describe('Legend tests', () => { await page.locator('#sub-dock select.styleLayer').selectOption('categorized'); // Assert legend has changed - await expect(page.getByTestId('tramway_lines').locator('div.layer .legend')).toHaveAttribute('src', 'data:image/svg+xml;base64,PHN2ZyBoZWlnaHQ9IjE2IiB3aWR0aD0iMTYiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGcgc3Ryb2tlPSIjODg4YTg1IiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTE2KSI+PHBhdGggZD0ibTEuNSA0LjUgNCA5IDUtMTFoNCIgZmlsbD0ibm9uZSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMCAxNikiLz48ZyBmaWxsPSIjZWVlZWVjIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxwYXRoIGQ9Im00LjUgMTIuNWMwIC41NTIyODUtLjQ0NzcxNTMgMS0xIDFzLTEtLjQ0NzcxNS0xLTEgLjQ0NzcxNTMtMSAxLTEgMSAuNDQ3NzE1IDEgMXoiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDIgMTcpIi8+PHBhdGggZD0ibTQuNSAxMi41YzAgLjU1MjI4NS0uNDQ3NzE1MyAxLTEgMXMtMS0uNDQ3NzE1LTEtMSAuNDQ3NzE1My0xIDEtMSAxIC40NDc3MTUgMSAxeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMTEgNikiLz48cGF0aCBkPSJtNC41IDEyLjVjMCAuNTUyMjg1LS40NDc3MTUzIDEtMSAxcy0xLS40NDc3MTUtMS0xIC40NDc3MTUzLTEgMS0xIDEgLjQ0NzcxNSAxIDF6IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg3IDYpIi8+PHBhdGggZD0ibTQuNSAxMi41YzAgLjU1MjI4NS0uNDQ3NzE1MyAxLTEgMXMtMS0uNDQ3NzE1LTEtMSAuNDQ3NzE1My0xIDEtMSAxIC40NDc3MTUgMSAxeiIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoLTIgOCkiLz48L2c+PC9nPjwvc3ZnPg=='); + await expect(page.getByTestId('tramway_lines').locator('div.layer .legend')).toHaveAttribute('src', base64svgLineLayer); expect(await page.getByTestId('tramway_lines').locator('.expandable').count()).toEqual(1); await page.getByTestId('tramway_lines').locator('.expandable').click(); diff --git a/tests/js-units/node/state/externallayertree.test.js b/tests/js-units/node/state/externallayertree.test.js index 4b25c9f002..405ff45aba 100644 --- a/tests/js-units/node/state/externallayertree.test.js +++ b/tests/js-units/node/state/externallayertree.test.js @@ -7,7 +7,7 @@ import { LayerTreeGroupConfig, buildLayerTreeConfig } from 'assets/src/modules/c import { buildLayersOrder } from 'assets/src/modules/config/LayersOrder.js'; import { LayersAndGroupsCollection } from 'assets/src/modules/state/Layer.js'; import { MapGroupState, MapRootState } from 'assets/src/modules/state/MapLayer.js'; -import { base64svg, base64svgOlLayer, base64svgRasterLayer } from 'assets/src/modules/state/Symbology.js'; +import { base64svg, base64svgOlLayer, base64svgRasterLayer } from 'assets/src/modules/state/SymbologyIcons.js'; import { LayerTreeGroupState, TreeRootState } from 'assets/src/modules/state/LayerTree.js'; import { ExternalLayerTreeGroupState, OlTreeLayerState } from 'assets/src/modules/state/ExternalLayerTree.js'; @@ -432,7 +432,7 @@ describe('OlTreeLayerState', function () { olTreeLayer.icon = '' } catch (error) { expect(error.name).to.be.eq('TypeError') - expect(error.message).to.be.eq('base64icon value does not start with `data:image/png;base64, ` or `data:image/svg+xml;base64,`! The value is ``!') + expect(error.message).to.be.eq("base64icon value does not start with 'data:image/png;base64' or 'data:image/svg+xml;base64'! The value is ''!") expect(error).to.be.instanceOf(TypeError) } }) diff --git a/tests/js-units/node/state/externalmaplayer.test.js b/tests/js-units/node/state/externalmaplayer.test.js index b111ef4b1e..e07b03488e 100644 --- a/tests/js-units/node/state/externalmaplayer.test.js +++ b/tests/js-units/node/state/externalmaplayer.test.js @@ -6,7 +6,7 @@ import { LayersConfig } from 'assets/src/modules/config/Layer.js'; import { LayerTreeGroupConfig, buildLayerTreeConfig } from 'assets/src/modules/config/LayerTree.js'; import { buildLayersOrder } from 'assets/src/modules/config/LayersOrder.js'; import { LayersAndGroupsCollection } from 'assets/src/modules/state/Layer.js'; -import { base64svg, base64svgOlLayer, base64svgRasterLayer } from 'assets/src/modules/state/Symbology.js'; +import { base64svg, base64svgOlLayer, base64svgRasterLayer } from 'assets/src/modules/state/SymbologyIcons.js'; import { MapGroupState, MapRootState } from 'assets/src/modules/state/MapLayer.js'; import { ExternalMapGroupState, OlMapLayerState } from 'assets/src/modules/state/ExternalMapLayer.js'; @@ -413,7 +413,7 @@ describe('OlMapLayerState', function () { olLayerState.icon = '' } catch (error) { expect(error.name).to.be.eq('TypeError') - expect(error.message).to.be.eq('base64icon value does not start with `data:image/png;base64, ` or `data:image/svg+xml;base64,`! The value is ``!') + expect(error.message).to.be.eq("base64icon value does not start with 'data:image/png;base64' or 'data:image/svg+xml;base64'! The value is ''!") expect(error).to.be.instanceOf(TypeError) } }) diff --git a/tests/js-units/node/state/layerTree.test.js b/tests/js-units/node/state/layerTree.test.js index 46209364e0..129d8f7cda 100644 --- a/tests/js-units/node/state/layerTree.test.js +++ b/tests/js-units/node/state/layerTree.test.js @@ -5,7 +5,8 @@ import { readFileSync } from 'fs'; import { ConversionError } from 'assets/src/modules/Errors.js'; import { LayersConfig } from 'assets/src/modules/config/Layer.js'; import { LayerTreeGroupConfig, buildLayerTreeConfig } from 'assets/src/modules/config/LayerTree.js'; -import { base64png, base64svg, base64svgPointLayer, base64svgLineLayer, base64svgPolygonLayer, base64svgRasterLayer, base64svgOlLayer, BaseIconSymbology, LayerIconSymbology, LayerSymbolsSymbology, SymbolIconSymbology } from 'assets/src/modules/state/Symbology.js'; +import { base64png, base64svg, base64svgPointLayer, base64svgLineLayer, base64svgPolygonLayer, base64svgRasterLayer, base64svgOlLayer } from 'assets/src/modules/state/SymbologyIcons.js'; +import { BaseIconSymbology, LayerIconSymbology, LayerSymbolsSymbology, SymbolIconSymbology } from 'assets/src/modules/state/Symbology.js'; import { buildLayersOrder } from 'assets/src/modules/config/LayersOrder.js'; import { LayersAndGroupsCollection } from 'assets/src/modules/state/Layer.js'; import { MapLayerLoadStatus, MapGroupState, MapRootState } from 'assets/src/modules/state/MapLayer.js'; diff --git a/tests/js-units/node/state/symbology.test.js b/tests/js-units/node/state/symbology.test.js index c8c62dd65f..448ea266f9 100644 --- a/tests/js-units/node/state/symbology.test.js +++ b/tests/js-units/node/state/symbology.test.js @@ -3,7 +3,8 @@ import { expect } from 'chai'; import { readFileSync } from 'fs'; import { ValidationError } from 'assets/src/modules/Errors.js'; -import { base64png, base64pngNullData, BaseIconSymbology, LayerIconSymbology, SymbolIconSymbology, SymbolRuleSymbology, BaseSymbolsSymbology, LayerSymbolsSymbology, LayerGroupSymbology, buildLayerSymbology } from 'assets/src/modules/state/Symbology.js'; +import { base64png, base64pngNullData } from 'assets/src/modules/state/SymbologyIcons.js'; +import { BaseIconSymbology, LayerIconSymbology, SymbolIconSymbology, SymbolRuleSymbology, BaseSymbolsSymbology, LayerSymbolsSymbology, LayerGroupSymbology, buildLayerSymbology } from 'assets/src/modules/state/Symbology.js'; describe('BaseIconSymbology', function () { it('Simple', function () {