From feab502c1d83d6552ff00ca427ca4b4711854ef1 Mon Sep 17 00:00:00 2001 From: Arno Kaimbacher Date: Wed, 8 Sep 2021 14:40:57 +0200 Subject: [PATCH] - add npm packages: "@fortawesome/angular-fontawesome, @fortawesome/fontawesome-svg-core, @fortawesome/free-solid-svg-icons - add locate.service.ts, map-cache.service.ts - add mapCache Service to map component - notes --- angular.json | 2 +- notes.txt | 9 +- package-lock.json | 77 ++++++++++++++++++ package.json | 5 +- src/app/app.component.html | 2 +- src/app/app.module.ts | 9 +- src/app/map/base-map.component.ts | 6 +- src/app/map/map.component.html | 1 + src/app/map/map.component.ts | 7 +- src/assets/Tethys-icon.png | Bin 9009 -> 0 bytes src/assets/geomon_logo.png | Bin 0 -> 9064 bytes src/assets/img/marker-icon-2x.png | Bin 0 -> 2464 bytes src/assets/img/marker-icon.png | Bin 0 -> 1466 bytes src/assets/img/marker-shadow.png | Bin 0 -> 618 bytes src/common/components/components.module.ts | 16 +++- .../locate-button.component.html | 9 +- .../locate-button.component.scss | 17 ++++ .../locate-button/locate-button.component.ts | 37 ++++++--- .../components/services/locate.service.ts | 49 +++++++++++ .../components/services/map-cache.service.ts | 25 ++++++ src/index.html | 4 +- 21 files changed, 239 insertions(+), 36 deletions(-) delete mode 100644 src/assets/Tethys-icon.png create mode 100644 src/assets/geomon_logo.png create mode 100644 src/assets/img/marker-icon-2x.png create mode 100644 src/assets/img/marker-icon.png create mode 100644 src/assets/img/marker-shadow.png create mode 100644 src/common/components/services/locate.service.ts create mode 100644 src/common/components/services/map-cache.service.ts diff --git a/angular.json b/angular.json index 08efe16..f43bb99 100644 --- a/angular.json +++ b/angular.json @@ -38,7 +38,7 @@ "build": { "builder": "@angular-devkit/build-angular:browser", "options": { - "outputPath": "dist/geomon.viewer", + "outputPath": "dist", "index": "src/index.html", "main": "src/main.ts", "polyfills": "src/polyfills.ts", diff --git a/notes.txt b/notes.txt index d2097cc..6f7ed34 100644 --- a/notes.txt +++ b/notes.txt @@ -183,4 +183,11 @@ npm install --save bulma // "ng": "ng", // "start": "ng serve", // "build": "ng build", - // "watch": "ng build --watch --configuration development", \ No newline at end of file + // "watch": "ng build --watch --configuration development", + +font awesome with angular: +https://www.npmjs.com/package/@fortawesome/angular-fontawesome + +npm install @fortawesome/fontawesome-svg-core +npm install @fortawesome/free-solid-svg-icons +npm install @fortawesome/angular-fontawesome@latest diff --git a/package-lock.json b/package-lock.json index 8816c10..fc0fcae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,9 @@ "@angular/platform-browser": "^12.1.4", "@angular/platform-browser-dynamic": "^12.1.4", "@angular/router": "^12.2.3", + "@fortawesome/angular-fontawesome": "^0.9.0", + "@fortawesome/fontawesome-svg-core": "^1.2.36", + "@fortawesome/free-solid-svg-icons": "^5.15.4", "@helgoland/core": "^12.0.0-beta.1", "@helgoland/depiction": "^12.0.0-beta.1", "@helgoland/map": "^12.0.0-beta.1", @@ -3108,6 +3111,51 @@ "node": ">=10.0.0" } }, + "node_modules/@fortawesome/angular-fontawesome": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.9.0.tgz", + "integrity": "sha512-pJNJqxRTJChkUtywbqRuJRpmK/WNwqFqeN/GMmJmy3gHeCnWQ4SG0BwPJqaWqhi4gqII5dADijGts6wqeusxeQ==", + "dependencies": { + "tslib": "^2.2.0" + }, + "peerDependencies": { + "@angular/core": "^12.0.0", + "@fortawesome/fontawesome-svg-core": "^1.2.27" + } + }, + "node_modules/@fortawesome/fontawesome-common-types": { + "version": "0.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz", + "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==", + "hasInstallScript": true, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/fontawesome-svg-core": { + "version": "1.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz", + "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/@fortawesome/free-solid-svg-icons": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz", + "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==", + "hasInstallScript": true, + "dependencies": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", @@ -21713,6 +21761,35 @@ "integrity": "sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==", "dev": true }, + "@fortawesome/angular-fontawesome": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@fortawesome/angular-fontawesome/-/angular-fontawesome-0.9.0.tgz", + "integrity": "sha512-pJNJqxRTJChkUtywbqRuJRpmK/WNwqFqeN/GMmJmy3gHeCnWQ4SG0BwPJqaWqhi4gqII5dADijGts6wqeusxeQ==", + "requires": { + "tslib": "^2.2.0" + } + }, + "@fortawesome/fontawesome-common-types": { + "version": "0.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.36.tgz", + "integrity": "sha512-a/7BiSgobHAgBWeN7N0w+lAhInrGxksn13uK7231n2m8EDPE3BMCl9NZLTGrj9ZXfCmC6LM0QLqXidIizVQ6yg==" + }, + "@fortawesome/fontawesome-svg-core": { + "version": "1.2.36", + "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.36.tgz", + "integrity": "sha512-YUcsLQKYb6DmaJjIHdDWpBIGCcyE/W+p/LMGvjQem55Mm2XWVAP5kWTMKWLv9lwpCVjpLxPyOMOyUocP1GxrtA==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + } + }, + "@fortawesome/free-solid-svg-icons": { + "version": "5.15.4", + "resolved": "https://registry.npmjs.org/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.4.tgz", + "integrity": "sha512-JLmQfz6tdtwxoihXLg6lT78BorrFyCf59SAwBM6qV/0zXyVeDygJVb3fk+j5Qat+Yvcxp1buLTY5iDh1ZSAQ8w==", + "requires": { + "@fortawesome/fontawesome-common-types": "^0.2.36" + } + }, "@gar/promisify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.2.tgz", diff --git a/package.json b/package.json index 0d178ee..2b940af 100644 --- a/package.json +++ b/package.json @@ -7,8 +7,6 @@ "test": "echo \"Error: no test specified\" && exit 1", "prod": "rm -rf dist && webpack --progress --config webpack.production.js", "dev": "webpack serve --config webpack.development.js --content-base=./ --hot --progress --port 4200" - - }, "keywords": [ "geomonitoring", @@ -52,6 +50,9 @@ "@angular/platform-browser": "^12.1.4", "@angular/platform-browser-dynamic": "^12.1.4", "@angular/router": "^12.2.3", + "@fortawesome/angular-fontawesome": "^0.9.0", + "@fortawesome/fontawesome-svg-core": "^1.2.36", + "@fortawesome/free-solid-svg-icons": "^5.15.4", "@helgoland/core": "^12.0.0-beta.1", "@helgoland/depiction": "^12.0.0-beta.1", "@helgoland/map": "^12.0.0-beta.1", diff --git a/src/app/app.component.html b/src/app/app.component.html index 714ad13..dbe397e 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -8,7 +8,7 @@