diff --git a/.gitignore b/.gitignore index e8a27ca74c..6bccead26a 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,5 @@ cypress/screenshots cypress/downloads/* cypress/tests/__image_snapshots__ .cursorignore +.cursorrules +.venv/ diff --git a/angular.json b/angular.json index 638b0508ba..d170ab9882 100644 --- a/angular.json +++ b/angular.json @@ -232,7 +232,8 @@ } ], "styles": [ - "projects/hslayers/css/hslayers-ng.scss" + "projects/hslayers/css/hslayers-ng.scss", + "projects/test-app/custom-fa-icons.css" ], "scripts": [], "customWebpackConfig": { diff --git a/cypress/tests/layer-editor.cy.ts b/cypress/tests/layer-editor.cy.ts index 378fd50275..e355ec492f 100644 --- a/cypress/tests/layer-editor.cy.ts +++ b/cypress/tests/layer-editor.cy.ts @@ -7,7 +7,7 @@ describe('Hslayers application', () => { }); it('Should not be possible to change base/thematic type for vector layer', () => { - cy.get('[data-test="Points"] span.icon-settingsthree-gears ').click(); + cy.get('[data-test="Points"] span.fa-gears ').click(); cy.get('hs-layer-editor form').within(() => { cy.get('hs-layer-type-switcher-widget').should('exist'); cy.get('hs-layer-type-switcher-widget div').should('not.exist'); @@ -15,14 +15,14 @@ describe('Hslayers application', () => { }); it('Should be possible to find base/thematic type toggle for WMS layer', () => { - cy.get('[data-test="EVI"] span.icon-settingsthree-gears ').click(); + cy.get('[data-test="EVI"] span.fa-gears ').click(); cy.get('hs-layer-editor form').within(() => { cy.get('hs-layer-type-switcher-widget div').should('exist'); }); }); it.only('Should be possible to change type of WMS layer back and forth', () => { - cy.get('[data-test="EVI"] span.icon-settingsthree-gears ').click(); + cy.get('[data-test="EVI"] span.fa-gears ').click(); //Change to BASE cy.get('hs-layer-editor form hs-layer-type-switcher-widget div') diff --git a/cypress/tests/layermanager.cy.ts b/cypress/tests/layermanager.cy.ts index 4e381aa287..6244d6989f 100644 --- a/cypress/tests/layermanager.cy.ts +++ b/cypress/tests/layermanager.cy.ts @@ -78,7 +78,7 @@ describe('Hslayers application', () => { //Enable EVI layer and zoom to its extent cy.get('[data-test="EVI"] button.hs-lm-item-visibility').click(); cy.wait(2000); - cy.get('[data-test="EVI"] span.icon-settingsthree-gears ').click(); + cy.get('[data-test="EVI"] span.fa-gears ').click(); cy.get('.card-footer button[title="Zoom to layer"]').click(); /** @@ -92,7 +92,7 @@ describe('Hslayers application', () => { //Zoom to different layer cy.get( - '[data-test="Latvian municipalities (1 sub-layer)"] span.icon-settingsthree-gears ', + '[data-test="Latvian municipalities (1 sub-layer)"] span.fa-gears ', ).click(); cy.get('.card-footer button[title="Zoom to layer"]').click(); @@ -102,7 +102,7 @@ describe('Hslayers application', () => { throw new Error('UNexpected getMap request was intercepted.'); } else { //Ignore extent eg. allow requests to be made no matter the extent - cy.get('[data-test="EVI"] span.icon-settingsthree-gears ').click(); + cy.get('[data-test="EVI"] span.fa-gears ').click(); cy.get( 'hs-layer-editor hs-extent-widget #hs-layer-extent-toggle', ).click(); diff --git a/cypress/tests/sidebar.cy.ts b/cypress/tests/sidebar.cy.ts index f30736b442..133e089198 100644 --- a/cypress/tests/sidebar.cy.ts +++ b/cypress/tests/sidebar.cy.ts @@ -46,12 +46,12 @@ describe('Hslayers application', () => { /** * This changes based on current test-app config */ - it('Only 9 sidebar panels should be visible', () => { + it('Only 6 sidebar panels should be visible', () => { cy.viewport(600, 1000); // Wait for the layout to update cy.wait(500); cy.get('hs-sidebar span.hs-sidebar-item:not(.hs-panel-hidden)') .its('length') - .should('equal', 9); + .should('equal', 6); }); }); diff --git a/package-lock.json b/package-lock.json index 8fc924c1ba..9c5f21e9ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -67,6 +67,7 @@ "@compodoc/compodoc": "^1.1.26", "@cypress/schematic": "^3.0.0", "@eslint/compat": "^1.2.6", + "@fortawesome/fontawesome-free": "^6.7.2", "@frsource/cypress-plugin-visual-regression-diff": "^3.2.14", "@types/jasmine": "^5.1.5", "@types/jasminewd2": "~2.0.12", @@ -4139,6 +4140,16 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@fortawesome/fontawesome-free": { + "version": "6.7.2", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz", + "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==", + "dev": true, + "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)", + "engines": { + "node": ">=6" + } + }, "node_modules/@frsource/base64": { "version": "1.0.17", "resolved": "https://registry.npmjs.org/@frsource/base64/-/base64-1.0.17.tgz", @@ -25417,4 +25428,4 @@ "license": "MIT AND BSD-3-Clause" } } -} +} \ No newline at end of file diff --git a/package.json b/package.json index a23094bc14..48acf0898e 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,8 @@ "commit": "git-cz", "deps-graph": "madge --exclude '.*(layer-extensions)\\.ts$' --dot projects/decoupling-test-app/src/hslayers-app/hslayers-app.module.ts > graph.gv", "proxy": "cd ./projects/hslayers-server && node server.js -l", - "prepare-release": "cd ./scripts && bump-version.sh" + "prepare-release": "cd ./scripts && bump-version.sh", + "subset-icons": "python projects/hslayers/css/icons/create-fa-icons.py" }, "private": true, "dependencies": { @@ -104,6 +105,7 @@ "@compodoc/compodoc": "^1.1.26", "@cypress/schematic": "^3.0.0", "@eslint/compat": "^1.2.6", + "@fortawesome/fontawesome-free": "^6.7.2", "@frsource/cypress-plugin-visual-regression-diff": "^3.2.14", "@types/jasmine": "^5.1.5", "@types/jasminewd2": "~2.0.12", @@ -156,4 +158,4 @@ "path": false, "fs": false } -} +} \ No newline at end of file diff --git a/projects/hslayers-cesium/src/toggle-view/toggle-view.component.html b/projects/hslayers-cesium/src/toggle-view/toggle-view.component.html index dde29c99b4..b4b684596d 100644 --- a/projects/hslayers-cesium/src/toggle-view/toggle-view.component.html +++ b/projects/hslayers-cesium/src/toggle-view/toggle-view.component.html @@ -2,6 +2,6 @@ - \ No newline at end of file + diff --git a/projects/hslayers-sensors/src/components/sensors/partials/sensors.component.html b/projects/hslayers-sensors/src/components/sensors/partials/sensors.component.html index e245cdb3b1..0f42a115fe 100644 --- a/projects/hslayers-sensors/src/components/sensors/partials/sensors.component.html +++ b/projects/hslayers-sensors/src/components/sensors/partials/sensors.component.html @@ -31,28 +31,28 @@
- + +
+ - - -@if (hsSensorsService.units.length > 0) { - -} -@else { - } - - -} \ No newline at end of file diff --git a/projects/hslayers-sensors/src/components/sensors/partials/unit-dialog.component.html b/projects/hslayers-sensors/src/components/sensors/partials/unit-dialog.component.html index 94acc15290..49ea86b96c 100644 --- a/projects/hslayers-sensors/src/components/sensors/partials/unit-dialog.component.html +++ b/projects/hslayers-sensors/src/components/sensors/partials/unit-dialog.component.html @@ -70,7 +70,7 @@