From bee54e3acbd584ad5ec11874f528ff7d829ff3f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Aug 2023 13:48:00 +0000 Subject: [PATCH 01/12] [desktop]: Bump the angular group in /desktop with 9 updates Bumps the angular group in /desktop with 9 updates: | Package | From | To | | --- | --- | --- | | [@angular/animations](https://github.com/angular/angular/tree/HEAD/packages/animations) | `16.2.0` | `16.2.1` | | [@angular/common](https://github.com/angular/angular/tree/HEAD/packages/common) | `16.2.0` | `16.2.1` | | [@angular/compiler](https://github.com/angular/angular/tree/HEAD/packages/compiler) | `16.2.0` | `16.2.1` | | [@angular/core](https://github.com/angular/angular/tree/HEAD/packages/core) | `16.2.0` | `16.2.1` | | [@angular/forms](https://github.com/angular/angular/tree/HEAD/packages/forms) | `16.2.0` | `16.2.1` | | [@angular/platform-browser](https://github.com/angular/angular/tree/HEAD/packages/platform-browser) | `16.2.0` | `16.2.1` | | [@angular/platform-browser-dynamic](https://github.com/angular/angular/tree/HEAD/packages/platform-browser-dynamic) | `16.2.0` | `16.2.1` | | [@angular/router](https://github.com/angular/angular/tree/HEAD/packages/router) | `16.2.0` | `16.2.1` | | [@angular/compiler-cli](https://github.com/angular/angular/tree/HEAD/packages/compiler-cli) | `16.2.0` | `16.2.1` | Updates `@angular/animations` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/animations) Updates `@angular/common` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/common) Updates `@angular/compiler` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/compiler) Updates `@angular/core` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/core) Updates `@angular/forms` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/forms) Updates `@angular/platform-browser` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/platform-browser) Updates `@angular/platform-browser-dynamic` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/platform-browser-dynamic) Updates `@angular/router` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/router) Updates `@angular/compiler-cli` from 16.2.0 to 16.2.1 - [Release notes](https://github.com/angular/angular/releases) - [Changelog](https://github.com/angular/angular/blob/main/CHANGELOG.md) - [Commits](https://github.com/angular/angular/commits/16.2.1/packages/compiler-cli) --- updated-dependencies: - dependency-name: "@angular/animations" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/common" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/compiler" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/core" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/forms" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/platform-browser" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/platform-browser-dynamic" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/router" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: angular - dependency-name: "@angular/compiler-cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: angular ... Signed-off-by: dependabot[bot] --- desktop/package-lock.json | 112 +++++++++++++++++++------------------- desktop/package.json | 18 +++--- 2 files changed, 65 insertions(+), 65 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 7dad151c0..9bfb40886 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -10,16 +10,16 @@ "hasInstallScript": true, "license": "MIT", "dependencies": { - "@angular/animations": "16.2.0", + "@angular/animations": "16.2.1", "@angular/cdk": "16.2.1", - "@angular/common": "16.2.0", - "@angular/compiler": "16.2.0", - "@angular/core": "16.2.0", - "@angular/forms": "16.2.0", + "@angular/common": "16.2.1", + "@angular/compiler": "16.2.1", + "@angular/core": "16.2.1", + "@angular/forms": "16.2.1", "@angular/language-service": "16.2.1", - "@angular/platform-browser": "16.2.0", - "@angular/platform-browser-dynamic": "16.2.0", - "@angular/router": "16.2.0", + "@angular/platform-browser": "16.2.1", + "@angular/platform-browser-dynamic": "16.2.1", + "@angular/router": "16.2.1", "chart.js": "4.3.3", "cron": "2.4.1", "interactjs": "1.10.18", @@ -38,7 +38,7 @@ "@angular-builders/custom-webpack": "16.0.0", "@angular-devkit/build-angular": "16.2.0", "@angular/cli": "16.2.0", - "@angular/compiler-cli": "16.2.0", + "@angular/compiler-cli": "16.2.1", "@types/leaflet": "1.9.3", "@types/luxon": "3.3.1", "@types/node": "20.5.0", @@ -292,9 +292,9 @@ } }, "node_modules/@angular/animations": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.0.tgz", - "integrity": "sha512-SgOjldgRlU6XL1f6OUmFa+1iiy1OCWXH8i7q7g0yGCeQ4XAlvNRjDj++xxvUwDhE2pLKJLPYDJmCH98mvjKZcA==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.1.tgz", + "integrity": "sha512-XVabK9fRKJaYPhW5wn8ySL4KL45N5Np+xOssWhLPDRDBdZjl62MExfpvMkamdkos6E1n1IGsy9wSemjnR4WKhg==", "dependencies": { "tslib": "^2.3.0" }, @@ -302,7 +302,7 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "16.2.0" + "@angular/core": "16.2.1" } }, "node_modules/@angular/cdk": { @@ -356,9 +356,9 @@ } }, "node_modules/@angular/common": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.0.tgz", - "integrity": "sha512-ByrDLsTBarzqRmq4GS841Ku0lvB4L2wfOCfGEIw2ZuiNbZlDA5O/qohQgJnHR5d9meVJnu9NgdbeyMzk90xZNg==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-16.2.1.tgz", + "integrity": "sha512-druackA5JQpvfS8cD8DFtPRXGRKbhx3mQ778t1n6x3fXpIdGaAX+nSAgAKhIoF7fxWmu0KuHGzb+3BFlZRyTXw==", "dependencies": { "tslib": "^2.3.0" }, @@ -366,14 +366,14 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "16.2.0", + "@angular/core": "16.2.1", "rxjs": "^6.5.3 || ^7.4.0" } }, "node_modules/@angular/compiler": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.0.tgz", - "integrity": "sha512-Ai0CKRUDlMY6iFCeoRsC+soVFTU7eyMDmNzeakdmNvGYMdLdjH8WvgaNukesi6WX7YBIQIKTPJVral8fXBQroQ==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-16.2.1.tgz", + "integrity": "sha512-dPauu+ESn79d66U9nBvnunNuBk/UMqnm7iL9Q31J8OKYN/4vrKbsO57pmULOft/GRAYsE3FdLBH0NkocFZKIMQ==", "dependencies": { "tslib": "^2.3.0" }, @@ -381,7 +381,7 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/core": "16.2.0" + "@angular/core": "16.2.1" }, "peerDependenciesMeta": { "@angular/core": { @@ -390,9 +390,9 @@ } }, "node_modules/@angular/compiler-cli": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.0.tgz", - "integrity": "sha512-IGRpEJwbzOLFsLj2qgTHpZ6nNcRjKDYaaAnVx+B1CfK4DP31PIsZLgsWcEcYt7KbF/FUlrCNwdBxrqE7rDxZaw==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-16.2.1.tgz", + "integrity": "sha512-A5SyNZTZnXSCL5JVXHKbYj9p2dRYoeFnb6hGQFt2AuCcpUjVIIdwHtre3YzkKe5sFwepPctdoRe2fRXlTfTRjA==", "dev": true, "dependencies": { "@babel/core": "7.22.5", @@ -413,7 +413,7 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/compiler": "16.2.0", + "@angular/compiler": "16.2.1", "typescript": ">=4.9.3 <5.2" } }, @@ -457,9 +457,9 @@ } }, "node_modules/@angular/core": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.0.tgz", - "integrity": "sha512-iwUWFw+JmRxw0chcNoqhXVR8XUTE+Rszhy22iSCkK0Jo8IJqEad1d2dQoFu1QfqOVdPMZtpJDmC/ppQ/f5c5aA==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-16.2.1.tgz", + "integrity": "sha512-Y+0jssQnJPovxMv9cDKYlp6BBHeFBLOHd/+FPv5IIGD1c7NwBP/TImJxCaIV78a57xnO8L0SFacDg/kULzvKrg==", "dependencies": { "tslib": "^2.3.0" }, @@ -472,9 +472,9 @@ } }, "node_modules/@angular/forms": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.0.tgz", - "integrity": "sha512-Z/IFw319ZSgGbJFkR5Ba0sRIIqDxQDVH4I+vnVoOYqq2NxuHYfLJDHAB9uHln9GWj86b1SrJBZe8qiS7Sxb7yQ==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-16.2.1.tgz", + "integrity": "sha512-cCygiLfBAsVHdtKmNptlk2IgXu0wjRc8kSiiSnJkfK6U/NiNg8ADMiN7iYgKW2TD1ZRw+7dYZV856lxEy2n0+A==", "dependencies": { "tslib": "^2.3.0" }, @@ -482,9 +482,9 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "16.2.0", - "@angular/core": "16.2.0", - "@angular/platform-browser": "16.2.0", + "@angular/common": "16.2.1", + "@angular/core": "16.2.1", + "@angular/platform-browser": "16.2.1", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -497,9 +497,9 @@ } }, "node_modules/@angular/platform-browser": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.0.tgz", - "integrity": "sha512-6xjZFnSD0C8ylDbzKpsxCJ4pLJDRvippr9Wj9RCeDQvAzMibsqIjpbesyOccw3hO+jheJQRhM/rZeO1ubZU94w==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-16.2.1.tgz", + "integrity": "sha512-SH8zRiRAcw0B5/tVlEc5U/lN5F8g+JizSuu7BQvpCAQEDkM6IjF9LP36Bjav7JuadItbWLfT6peWYa1sJvax2w==", "dependencies": { "tslib": "^2.3.0" }, @@ -507,9 +507,9 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/animations": "16.2.0", - "@angular/common": "16.2.0", - "@angular/core": "16.2.0" + "@angular/animations": "16.2.1", + "@angular/common": "16.2.1", + "@angular/core": "16.2.1" }, "peerDependenciesMeta": { "@angular/animations": { @@ -518,9 +518,9 @@ } }, "node_modules/@angular/platform-browser-dynamic": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.0.tgz", - "integrity": "sha512-kLxgR+ichWb6dNA1JUAh0JB+iSrObkomd10porGQWVxAGmHqg1eiB3bBaSAgcaLftsrmEguIH8O9AEfq+HLfrA==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-16.2.1.tgz", + "integrity": "sha512-dKMCSrbD/joOMXM1mhDOKNDZ1BxwO9r9uu5ZxY0L/fWm/ousgMucNikLr38vBudgWM8CN6BuabzkxWKcqi3k4g==", "dependencies": { "tslib": "^2.3.0" }, @@ -528,16 +528,16 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "16.2.0", - "@angular/compiler": "16.2.0", - "@angular/core": "16.2.0", - "@angular/platform-browser": "16.2.0" + "@angular/common": "16.2.1", + "@angular/compiler": "16.2.1", + "@angular/core": "16.2.1", + "@angular/platform-browser": "16.2.1" } }, "node_modules/@angular/router": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.0.tgz", - "integrity": "sha512-bFOaE7PNF0UHgVhl8BvyHiZHizTRZO7w3V29VqsdXUMMugBR4kr1/FXGzXTaz+9/eK7LokUwN9pjKKENNmhdyg==", + "version": "16.2.1", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-16.2.1.tgz", + "integrity": "sha512-C0WfcktsC25G37unxdH/5I7PbkVBSEB1o+0DJK9/HG97r1yzEkptF6fbRIzDBTS7dX0NfWN/PTAKF0ep7YlHvA==", "dependencies": { "tslib": "^2.3.0" }, @@ -545,9 +545,9 @@ "node": "^16.14.0 || >=18.10.0" }, "peerDependencies": { - "@angular/common": "16.2.0", - "@angular/core": "16.2.0", - "@angular/platform-browser": "16.2.0", + "@angular/common": "16.2.1", + "@angular/core": "16.2.1", + "@angular/platform-browser": "16.2.1", "rxjs": "^6.5.3 || ^7.4.0" } }, @@ -8354,9 +8354,9 @@ } }, "node_modules/fraction.js": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz", - "integrity": "sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.1.tgz", + "integrity": "sha512-/KxoyCnPM0GwYI4NN0Iag38Tqt+od3/mLuguepLgCAKPn0ZhC544nssAW0tG2/00zXEYl9W+7hwAIpLHo6Oc7Q==", "dev": true, "engines": { "node": "*" diff --git a/desktop/package.json b/desktop/package.json index f81c4b441..7b6be0e2e 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -30,16 +30,16 @@ "lint": "ng lint" }, "dependencies": { - "@angular/animations": "16.2.0", + "@angular/animations": "16.2.1", "@angular/cdk": "16.2.1", - "@angular/common": "16.2.0", - "@angular/compiler": "16.2.0", - "@angular/core": "16.2.0", - "@angular/forms": "16.2.0", + "@angular/common": "16.2.1", + "@angular/compiler": "16.2.1", + "@angular/core": "16.2.1", + "@angular/forms": "16.2.1", "@angular/language-service": "16.2.1", - "@angular/platform-browser": "16.2.0", - "@angular/platform-browser-dynamic": "16.2.0", - "@angular/router": "16.2.0", + "@angular/platform-browser": "16.2.1", + "@angular/platform-browser-dynamic": "16.2.1", + "@angular/router": "16.2.1", "chart.js": "4.3.3", "cron": "2.4.1", "interactjs": "1.10.18", @@ -58,7 +58,7 @@ "@angular-builders/custom-webpack": "16.0.0", "@angular-devkit/build-angular": "16.2.0", "@angular/cli": "16.2.0", - "@angular/compiler-cli": "16.2.0", + "@angular/compiler-cli": "16.2.1", "@types/leaflet": "1.9.3", "@types/luxon": "3.3.1", "@types/node": "20.5.0", From e7e1538e3842506002f433982bd8863da4d4feb1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Aug 2023 13:48:43 +0000 Subject: [PATCH 02/12] [desktop]: Bump tslib from 2.6.1 to 2.6.2 in /desktop Bumps [tslib](https://github.com/Microsoft/tslib) from 2.6.1 to 2.6.2. - [Release notes](https://github.com/Microsoft/tslib/releases) - [Commits](https://github.com/Microsoft/tslib/compare/v2.6.1...v2.6.2) --- updated-dependencies: - dependency-name: tslib dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- desktop/package-lock.json | 14 ++++++++++---- desktop/package.json | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 9bfb40886..58c9d8457 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -30,7 +30,7 @@ "primeicons": "6.0.1", "primeng": "16.2.0", "rxjs": "7.8.1", - "tslib": "2.6.1", + "tslib": "2.6.2", "uuid": "9.0.0", "zone.js": "0.13.1" }, @@ -228,6 +228,12 @@ } } }, + "node_modules/@angular-devkit/build-angular/node_modules/tslib": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", + "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "dev": true + }, "node_modules/@angular-devkit/build-webpack": { "version": "0.1602.0", "resolved": "https://registry.npmjs.org/@angular-devkit/build-webpack/-/build-webpack-0.1602.0.tgz", @@ -15103,9 +15109,9 @@ } }, "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==" + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/tty-browserify": { "version": "0.0.1", diff --git a/desktop/package.json b/desktop/package.json index 7b6be0e2e..7d215ceb3 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -50,7 +50,7 @@ "primeicons": "6.0.1", "primeng": "16.2.0", "rxjs": "7.8.1", - "tslib": "2.6.1", + "tslib": "2.6.2", "uuid": "9.0.0", "zone.js": "0.13.1" }, From fe1b722d2cb226e312d7d641f9443d2fc0f7dadd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 20 Aug 2023 13:48:22 +0000 Subject: [PATCH 03/12] [desktop]: Bump @types/node from 20.5.0 to 20.5.1 in /desktop Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.5.0 to 20.5.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- desktop/package-lock.json | 8 ++++---- desktop/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 58c9d8457..556ebab66 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -41,7 +41,7 @@ "@angular/compiler-cli": "16.2.1", "@types/leaflet": "1.9.3", "@types/luxon": "3.3.1", - "@types/node": "20.5.0", + "@types/node": "20.5.1", "@types/uuid": "9.0.2", "electron": "26.0.0", "electron-builder": "24.6.3", @@ -3869,9 +3869,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.5.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.0.tgz", - "integrity": "sha512-Mgq7eCtoTjT89FqNoTzzXg2XvCi5VMhRV6+I2aYanc6kQCBImeNaAYRs/DyoVqk1YEUJK5gN9VO7HRIdz4Wo3Q==", + "version": "20.5.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.1.tgz", + "integrity": "sha512-4tT2UrL5LBqDwoed9wZ6N3umC4Yhz3W3FloMmiiG4JwmUJWpie0c7lcnUNd4gtMKuDEO4wRVS8B6Xa0uMRsMKg==", "dev": true }, "node_modules/@types/plist": { diff --git a/desktop/package.json b/desktop/package.json index 7d215ceb3..dea9c2402 100644 --- a/desktop/package.json +++ b/desktop/package.json @@ -61,7 +61,7 @@ "@angular/compiler-cli": "16.2.1", "@types/leaflet": "1.9.3", "@types/luxon": "3.3.1", - "@types/node": "20.5.0", + "@types/node": "20.5.1", "@types/uuid": "9.0.2", "electron": "26.0.0", "electron-builder": "24.6.3", From 099d2d1c69b91118d75188daed84e57b9f663e65 Mon Sep 17 00:00:00 2001 From: tiagohm Date: Sun, 20 Aug 2023 10:57:35 -0300 Subject: [PATCH 04/12] [desktop]: Update NPM dependencies --- desktop/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/desktop/package-lock.json b/desktop/package-lock.json index 556ebab66..d8e3849d7 100644 --- a/desktop/package-lock.json +++ b/desktop/package-lock.json @@ -5675,9 +5675,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001521", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001521.tgz", - "integrity": "sha512-fnx1grfpEOvDGH+V17eccmNjucGUnCbP6KL+l5KqBIerp26WK/+RQ7CIDE37KGJjaPyqWXXlFUyKiWmvdNNKmQ==", + "version": "1.0.30001522", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001522.tgz", + "integrity": "sha512-TKiyTVZxJGhsTszLuzb+6vUZSjVOAhClszBr2Ta2k9IwtNBT/4dzmL6aywt0HCgEZlmwJzXJd8yNiob6HgwTRg==", "dev": true, "funding": [ { From 42d62d341a9b4a4848b81fa31281bf97a32b816d Mon Sep 17 00:00:00 2001 From: tiagohm Date: Sun, 20 Aug 2023 23:22:06 -0300 Subject: [PATCH 05/12] [api]: Bump Gradle from 8.2 to 8.3 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 82c78478c..17711f598 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip networkTimeout=30000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From ab2575f78bbb22196cd69dd7359661465c086cc3 Mon Sep 17 00:00:00 2001 From: tiagohm Date: Mon, 21 Aug 2023 00:06:53 -0300 Subject: [PATCH 06/12] [api][desktop]: Remove device start/stop listener endpoints --- .../api/controllers/INDIController.kt | 9 +- .../nebulosa/api/services/WebSocketService.kt | 97 ++++--------------- desktop/app/main.ts | 6 -- desktop/src/app/camera/camera.component.ts | 6 +- .../app/filterwheel/filterwheel.component.ts | 6 +- desktop/src/app/focuser/focuser.component.ts | 6 +- desktop/src/app/guider/guider.component.ts | 8 +- desktop/src/app/home/home.component.ts | 14 +-- desktop/src/app/indi/indi.component.ts | 4 +- desktop/src/app/mount/mount.component.ts | 4 - desktop/src/shared/services/api.service.ts | 11 ++- desktop/src/shared/types.ts | 1 - detekt.yml | 17 ---- settings.gradle.kts | 2 +- 14 files changed, 36 insertions(+), 155 deletions(-) delete mode 100644 detekt.yml diff --git a/api/src/main/kotlin/nebulosa/api/controllers/INDIController.kt b/api/src/main/kotlin/nebulosa/api/controllers/INDIController.kt index 68e9e8c8d..fcb39faca 100644 --- a/api/src/main/kotlin/nebulosa/api/controllers/INDIController.kt +++ b/api/src/main/kotlin/nebulosa/api/controllers/INDIController.kt @@ -2,7 +2,6 @@ package nebulosa.api.controllers import jakarta.validation.Valid import jakarta.validation.constraints.NotBlank -import jakarta.validation.constraints.NotEmpty import nebulosa.api.data.requests.INDISendPropertyRequest import nebulosa.api.services.EquipmentService import nebulosa.api.services.INDIService @@ -40,12 +39,12 @@ class INDIController( } @PostMapping("indiStartListening") - fun indiStartListening(@RequestParam("eventName") @Valid @NotEmpty eventNames: List) { - return eventNames.forEach(webSocketService::registerEventName) + fun indiStartListening() { + return webSocketService.indiStartListening() } @PostMapping("indiStopListening") - fun indiStopListening(@RequestParam("eventName") @Valid @NotEmpty eventNames: List) { - return eventNames.forEach(webSocketService::unregisterEventName) + fun indiStopListening() { + return webSocketService.indiStopListening() } } diff --git a/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt b/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt index 968c56b7d..325a2ef97 100644 --- a/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt @@ -21,27 +21,32 @@ import nebulosa.indi.device.guide.GuideOutputDetached import nebulosa.indi.device.mount.Mount import nebulosa.indi.device.mount.MountAttached import nebulosa.indi.device.mount.MountDetached -import nebulosa.log.loggerFor import org.springframework.messaging.simp.SimpMessagingTemplate import org.springframework.stereotype.Service @Service class WebSocketService(private val simpleMessageTemplate: SimpMessagingTemplate) { - private val registeredEventNames = HashSet() - // INDI + @Volatile private var listenIndiEvents = false + fun sendINDIPropertyChanged(event: DevicePropertyEvent) { - sendMessage(DEVICE_PROPERTY_CHANGED, event.property) + if (listenIndiEvents) { + sendMessage(DEVICE_PROPERTY_CHANGED, event.property) + } } fun sendINDIPropertyDeleted(event: DevicePropertyEvent) { - sendMessage(DEVICE_PROPERTY_DELETED, event.property) + if (listenIndiEvents) { + sendMessage(DEVICE_PROPERTY_DELETED, event.property) + } } fun sendINDIMessageReceived(event: DeviceMessageReceived) { - sendMessage(DEVICE_MESSAGE_RECEIVED, event) + if (listenIndiEvents) { + sendMessage(DEVICE_MESSAGE_RECEIVED, event) + } } // CAMERA @@ -141,24 +146,17 @@ class WebSocketService(private val simpleMessageTemplate: SimpMessagingTemplate) if (device is GuideOutput) sendMessage(GUIDE_OUTPUT_UPDATED, device) } - @Synchronized - fun registerEventName(eventName: String) { - registeredEventNames.addAll(eventName.mapEventName()) - LOG.info("registered event. name={}", eventName) + fun indiStartListening() { + listenIndiEvents = true } - @Synchronized - fun unregisterEventName(eventName: String) { - registeredEventNames.removeAll(eventName.mapEventName()) - LOG.info("unregistered event. name={}", eventName) + fun indiStopListening() { + listenIndiEvents = false } - @Synchronized - private fun sendMessage(eventName: String, payload: Any) { - if (eventName in registeredEventNames) { - simpleMessageTemplate.convertAndSend(eventName, payload) - LOG.info("event sent. name={}, payload={}", eventName, payload) - } + @Suppress("NOTHING_TO_INLINE") + private inline fun sendMessage(eventName: String, payload: Any) { + simpleMessageTemplate.convertAndSend(eventName, payload) } companion object { @@ -184,64 +182,5 @@ class WebSocketService(private val simpleMessageTemplate: SimpMessagingTemplate) const val GUIDE_OUTPUT_UPDATED = "GUIDE_OUTPUT_UPDATED" const val GUIDE_OUTPUT_ATTACHED = "GUIDE_OUTPUT_ATTACHED" const val GUIDE_OUTPUT_DETACHED = "GUIDE_OUTPUT_DETACHED" - - @JvmStatic private val LOG = loggerFor() - - @JvmStatic private val DEVICE_EVENT_NAMES = setOf( - DEVICE_PROPERTY_CHANGED, - DEVICE_PROPERTY_DELETED, - DEVICE_MESSAGE_RECEIVED, - ) - - @JvmStatic private val CAMERA_EVENT_NAMES = setOf( - CAMERA_IMAGE_SAVED, - CAMERA_UPDATED, - CAMERA_CAPTURE_PROGRESS_CHANGED, - CAMERA_CAPTURE_FINISHED, - CAMERA_ATTACHED, - CAMERA_DETACHED, - ) - - @JvmStatic private val MOUNT_EVENT_NAMES = setOf( - MOUNT_UPDATED, - MOUNT_ATTACHED, - MOUNT_DETACHED, - ) - - @JvmStatic private val FOCUSER_EVENT_NAMES = setOf( - FOCUSER_UPDATED, - FOCUSER_ATTACHED, - FOCUSER_DETACHED, - ) - - @JvmStatic private val FILTER_WHEEL_EVENT_NAMES = setOf( - FILTER_WHEEL_UPDATED, - FILTER_WHEEL_ATTACHED, - FILTER_WHEEL_DETACHED, - ) - - @JvmStatic private val GUIDE_OUTPUT_EVENT_NAMES = setOf( - GUIDE_OUTPUT_UPDATED, - GUIDE_OUTPUT_ATTACHED, - GUIDE_OUTPUT_DETACHED, - ) - - @JvmStatic private val ALL_EVENT_NAMES = listOf( - DEVICE_EVENT_NAMES, CAMERA_EVENT_NAMES, MOUNT_EVENT_NAMES, - FOCUSER_EVENT_NAMES, FILTER_WHEEL_EVENT_NAMES, - GUIDE_OUTPUT_EVENT_NAMES, - ).flatten().toSet() - - @JvmStatic - private fun String.mapEventName() = when (this) { - "ALL" -> ALL_EVENT_NAMES - "DEVICE" -> DEVICE_EVENT_NAMES - "CAMERA" -> CAMERA_EVENT_NAMES - "MOUNT" -> MOUNT_EVENT_NAMES - "FOCUSER" -> FOCUSER_EVENT_NAMES - "FILTER_WHEEL" -> FILTER_WHEEL_EVENT_NAMES - "GUIDE_OUTPUT" -> GUIDE_OUTPUT_EVENT_NAMES - else -> setOf(this) - } } } diff --git a/desktop/app/main.ts b/desktop/app/main.ts index 1f7d7e582..a379130e6 100644 --- a/desktop/app/main.ts +++ b/desktop/app/main.ts @@ -30,12 +30,6 @@ function createMainWindow() { brokerURL: `ws://localhost:${apiPort}/ws`, onConnect: () => { for (const item of INDI_EVENT_TYPES) { - if (item === 'ALL' || item === 'DEVICE' || item === 'CAMERA' || - item === 'FOCUSER' || item === 'MOUNT' || item === 'FILTER_WHEEL' || - item === 'GUIDE_OUTPUT') { - continue - } - wsClient.subscribe(item, (message) => { const data = JSON.parse(message.body) diff --git a/desktop/src/app/camera/camera.component.ts b/desktop/src/app/camera/camera.component.ts index c83fe331c..581f424da 100644 --- a/desktop/src/app/camera/camera.component.ts +++ b/desktop/src/app/camera/camera.component.ts @@ -174,8 +174,6 @@ export class CameraComponent implements AfterContentInit, OnDestroy { ) { title.setTitle('Camera') - api.indiStartListening('CAMERA') - electron.ipcRenderer.on('CAMERA_UPDATED', (_, camera: Camera) => { if (camera.name === this.camera?.name) { ngZone.run(() => { @@ -214,9 +212,7 @@ export class CameraComponent implements AfterContentInit, OnDestroy { } @HostListener('window:unload') - ngOnDestroy() { - this.api.indiStopListening('CAMERA') - } + ngOnDestroy() { } async cameraChanged() { if (this.camera) { diff --git a/desktop/src/app/filterwheel/filterwheel.component.ts b/desktop/src/app/filterwheel/filterwheel.component.ts index b834564bd..451fbd9b7 100644 --- a/desktop/src/app/filterwheel/filterwheel.component.ts +++ b/desktop/src/app/filterwheel/filterwheel.component.ts @@ -47,8 +47,6 @@ export class FilterWheelComponent implements AfterContentInit, OnDestroy { ) { title.setTitle('Filter Wheel') - this.api.indiStartListening('FILTER_WHEEL') - electron.ipcRenderer.on('FILTER_WHEEL_UPDATED', (_, filterWheel: FilterWheel) => { if (filterWheel.name === this.filterWheel?.name) { ngZone.run(() => { @@ -64,9 +62,7 @@ export class FilterWheelComponent implements AfterContentInit, OnDestroy { } @HostListener('window:unload') - ngOnDestroy() { - this.api.indiStopListening('FILTER_WHEEL') - } + ngOnDestroy() { } async filterWheelChanged() { if (this.filterWheel) { diff --git a/desktop/src/app/focuser/focuser.component.ts b/desktop/src/app/focuser/focuser.component.ts index f6f78342a..3d56ba643 100644 --- a/desktop/src/app/focuser/focuser.component.ts +++ b/desktop/src/app/focuser/focuser.component.ts @@ -43,8 +43,6 @@ export class FocuserComponent implements AfterViewInit, OnDestroy { ) { title.setTitle('Focuser') - this.api.indiStartListening('FOCUSER') - electron.ipcRenderer.on('FOCUSER_UPDATED', (_, focuser: Focuser) => { if (focuser.name === this.focuser?.name) { ngZone.run(() => { @@ -66,9 +64,7 @@ export class FocuserComponent implements AfterViewInit, OnDestroy { } @HostListener('window:unload') - ngOnDestroy() { - this.api.indiStopListening('FOCUSER') - } + ngOnDestroy() { } async focuserChanged() { if (this.focuser) { diff --git a/desktop/src/app/guider/guider.component.ts b/desktop/src/app/guider/guider.component.ts index 20e426939..a899093c6 100644 --- a/desktop/src/app/guider/guider.component.ts +++ b/desktop/src/app/guider/guider.component.ts @@ -38,10 +38,6 @@ export class GuiderComponent implements AfterViewInit, OnDestroy { ) { title.setTitle('Guider') - api.indiStartListening('CAMERA') - api.indiStartListening('MOUNT') - api.indiStartListening('GUIDE_OUTPUT') - electron.on('CAMERA_UPDATED', (_, camera: Camera) => { if (camera.name === this.camera?.name) { ngZone.run(() => { @@ -90,9 +86,7 @@ export class GuiderComponent implements AfterViewInit, OnDestroy { } @HostListener('window:unload') - ngOnDestroy() { - this.api.indiStopListening('GUIDE_OUTPUT') - } + ngOnDestroy() { } async cameraChanged() { if (this.camera) { diff --git a/desktop/src/app/home/home.component.ts b/desktop/src/app/home/home.component.ts index 9d3ad0e87..db15271a7 100644 --- a/desktop/src/app/home/home.component.ts +++ b/desktop/src/app/home/home.component.ts @@ -75,9 +75,6 @@ export class HomeComponent implements AfterContentInit, OnDestroy { onAdd: (device: T) => number, onRemove: (device: T) => number, ) { - this.api.indiStartListening(`${type}_ATTACHED`) - this.api.indiStartListening(`${type}_DETACHED`) - this.electron.ipcRenderer.on(`${type}_ATTACHED`, (_, device: T) => { this.ngZone.run(() => { if (onAdd(device) === 1) { @@ -173,16 +170,7 @@ export class HomeComponent implements AfterContentInit, OnDestroy { } @HostListener('window:unload') - ngOnDestroy() { - this.api.indiStopListening('CAMERA_ATTACHED') - this.api.indiStopListening('CAMERA_DETACHED') - - this.api.indiStopListening('FOCUSER_ATTACHED') - this.api.indiStopListening('FOCUSER_DETACHED') - - this.api.indiStopListening('FILTER_WHEEL_ATTACHED') - this.api.indiStopListening('FILTER_WHEEL_DETACHED') - } + ngOnDestroy() { } async connect() { try { diff --git a/desktop/src/app/indi/indi.component.ts b/desktop/src/app/indi/indi.component.ts index 1d2f0c373..2fa82ee73 100644 --- a/desktop/src/app/indi/indi.component.ts +++ b/desktop/src/app/indi/indi.component.ts @@ -35,7 +35,7 @@ export class INDIComponent implements AfterViewInit, OnDestroy { ) { title.setTitle('INDI') - this.api.indiStartListening('DEVICE') + this.api.indiStartListening() electron.ipcRenderer.on('DEVICE_PROPERTY_CHANGED', (_, data: INDIProperty) => { ngZone.run(() => { @@ -80,7 +80,7 @@ export class INDIComponent implements AfterViewInit, OnDestroy { @HostListener('window:unload') ngOnDestroy() { - this.api.indiStopListening('DEVICE') + this.api.indiStopListening() } async deviceChanged() { diff --git a/desktop/src/app/mount/mount.component.ts b/desktop/src/app/mount/mount.component.ts index d7f527c7c..46ba66682 100644 --- a/desktop/src/app/mount/mount.component.ts +++ b/desktop/src/app/mount/mount.component.ts @@ -148,8 +148,6 @@ export class MountComponent implements AfterContentInit, OnDestroy { ) { title.setTitle('Mount') - api.indiStartListening('MOUNT') - electron.ipcRenderer.on('MOUNT_UPDATED', (_, mount: Mount) => { if (mount.name === this.mount?.name) { ngZone.run(() => { @@ -180,8 +178,6 @@ export class MountComponent implements AfterContentInit, OnDestroy { @HostListener('window:unload') ngOnDestroy() { - this.api.indiStopListening('MOUNT') - this.computeCoordinateSubscriptions .forEach(e => e.unsubscribe()) } diff --git a/desktop/src/shared/services/api.service.ts b/desktop/src/shared/services/api.service.ts index 1364cb5c3..c3ec1371f 100644 --- a/desktop/src/shared/services/api.service.ts +++ b/desktop/src/shared/services/api.service.ts @@ -4,7 +4,8 @@ import moment from 'moment' import { firstValueFrom } from 'rxjs' import { BodyPosition, Calibration, Camera, CameraStartCapture, ComputedCoordinates, Constellation, DeepSkyObject, Device, - FilterWheel, Focuser, GuideOutput, GuidingChart, GuidingStar, HipsSurvey, INDIEventType, INDIProperty, INDISendProperty, ImageAnnotation, ImageChannel, ImageInfo, Location, MinorPlanet, + FilterWheel, Focuser, GuideOutput, GuidingChart, GuidingStar, HipsSurvey, + INDIProperty, INDISendProperty, ImageAnnotation, ImageChannel, ImageInfo, Location, MinorPlanet, Mount, Path, PlateSolverType, SCNRProtectionMethod, SavedCameraImage, SkyObjectType, SlewRate, Star, TrackMode, Twilight } from '../types' @@ -336,12 +337,12 @@ export class ApiService { return this.post(`sendIndiProperty?name=${device.name}`, property) } - indiStartListening(eventName: INDIEventType) { - return this.post(`indiStartListening?eventName=${eventName}`) + indiStartListening() { + return this.post(`indiStartListening`) } - indiStopListening(eventName: INDIEventType) { - return this.post(`indiStopListening?eventName=${eventName}`) + indiStopListening() { + return this.post(`indiStopListening`) } indiLog(device: Device) { diff --git a/desktop/src/shared/types.ts b/desktop/src/shared/types.ts index 426ec4c6a..3ac3de572 100644 --- a/desktop/src/shared/types.ts +++ b/desktop/src/shared/types.ts @@ -627,7 +627,6 @@ export type PlateSolverType = 'ASTROMETRY_NET_LOCAL' | 'WATNEY' export const INDI_EVENT_TYPES = [ - 'ALL', 'DEVICE', 'CAMERA', 'MOUNT', 'FOCUSER', 'FILTER_WHEEL', 'GUIDE_OUTPUT', 'DEVICE_PROPERTY_CHANGED', 'DEVICE_PROPERTY_DELETED', 'DEVICE_MESSAGE_RECEIVED', 'CAMERA_IMAGE_SAVED', 'CAMERA_UPDATED', 'CAMERA_CAPTURE_PROGRESS_CHANGED', 'CAMERA_CAPTURE_FINISHED', diff --git a/detekt.yml b/detekt.yml deleted file mode 100644 index 85dc296cc..000000000 --- a/detekt.yml +++ /dev/null @@ -1,17 +0,0 @@ -style: - MaxLineLength: - active: false - WildcardImport: - active: false - LoopWithTooManyJumpStatements: - active: false - MagicNumber: - active: false - -complexity: - CyclomaticComplexMethod: - active: false - TooManyFunctions: - active: false - LongMethod: - active: false diff --git a/settings.gradle.kts b/settings.gradle.kts index a35e76ae5..22a800a4c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -29,13 +29,13 @@ dependencyResolutionManagement { library("csv", "de.siegmar:fastcsv:2.2.2") library("apache-lang3", "org.apache.commons:commons-lang3:3.13.0") library("apache-codec", "commons-codec:commons-codec:1.16.0") + library("apache-collections", "org.apache.commons:commons-collections4:4.4") library("oshi", "com.github.oshi:oshi-core:6.4.4") library("timeshape", "net.iakovlev:timeshape:2022g.17") library("kotest-assertions-core", "io.kotest:kotest-assertions-core:5.6.2") library("kotest-runner-junit5", "io.kotest:kotest-runner-junit5:5.6.2") bundle("kotest", listOf("kotest-assertions-core", "kotest-runner-junit5")) bundle("netty", listOf("netty-transport", "netty-codec")) - bundle("apache", listOf("apache-lang3", "apache-codec")) } } } From db878ec2898cc3506283428c9de545a2b18439dc Mon Sep 17 00:00:00 2001 From: tiagohm Date: Mon, 21 Aug 2023 00:22:09 -0300 Subject: [PATCH 07/12] [desktop]: Create method closeImage on Image component --- desktop/src/app/image/image.component.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/desktop/src/app/image/image.component.ts b/desktop/src/app/image/image.component.ts index fba85399b..e58387600 100644 --- a/desktop/src/app/image/image.component.ts +++ b/desktop/src/app/image/image.component.ts @@ -283,9 +283,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { electron.ipcRenderer.on('CAMERA_IMAGE_SAVED', async (_, data: SavedCameraImage) => { if (data.camera === this.imageParams.camera?.name) { - if (this.imageParams.path) { - await this.api.closeImage(this.imageParams.path) - } + await this.closeImage() ngZone.run(() => { this.annotations = [] @@ -295,7 +293,9 @@ export class ImageComponent implements AfterViewInit, OnDestroy { } }) - electron.ipcRenderer.on('PARAMS_CHANGED', (_, data: ImageParams) => { + electron.ipcRenderer.on('PARAMS_CHANGED', async (_, data: ImageParams) => { + await this.closeImage() + this.loadImageFromParams(data) }) @@ -313,13 +313,17 @@ export class ImageComponent implements AfterViewInit, OnDestroy { @HostListener('window:unload') ngOnDestroy() { - if (this.imageParams.path) { - this.api.closeImage(this.imageParams.path) - } + this.closeImage() this.roiInteractable?.unset() } + private async closeImage() { + if (this.imageParams.path) { + await this.api.closeImage(this.imageParams.path) + } + } + private roiResizableMove(event: any) { const target = event.target From cad1aedc48f544d7215273e0604916522f2242e5 Mon Sep 17 00:00:00 2001 From: tiagohm Date: Mon, 21 Aug 2023 19:50:28 -0300 Subject: [PATCH 08/12] [api][desktop]: Guiding --- .../api/controllers/ImageController.kt | 11 +-- .../api/data/events/GuideExposureFinished.kt | 4 +- .../nebulosa/api/services/FramingService.kt | 14 ++-- .../api/services/GuideExposureTask.kt | 16 ++-- .../nebulosa/api/services/GuidingService.kt | 20 +++-- .../nebulosa/api/services/ImageService.kt | 61 +++++++++----- .../nebulosa/api/services/ImageToken.kt | 33 ++++++++ .../nebulosa/api/services/WebSocketService.kt | 6 ++ desktop/src/app/guider/guider.component.html | 19 ++--- desktop/src/app/guider/guider.component.ts | 10 +++ desktop/src/app/image/image.component.ts | 26 +++++- desktop/src/shared/types.ts | 6 ++ .../src/main/kotlin/nebulosa/imaging/Image.kt | 18 ++-- .../src/test/kotlin/AlgorithmTest.kt | 4 +- .../src/test/kotlin/ExtendedImageTest.kt | 4 +- .../src/test/kotlin/FitsImageTest.kt | 84 +++++++++---------- nebulosa-imaging/src/test/kotlin/HFDTest.kt | 4 +- 17 files changed, 215 insertions(+), 125 deletions(-) create mode 100644 api/src/main/kotlin/nebulosa/api/services/ImageToken.kt diff --git a/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt b/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt index 51d9d3131..cb768e119 100644 --- a/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt +++ b/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt @@ -10,6 +10,7 @@ import nebulosa.api.data.responses.CalibrationResponse import nebulosa.api.data.responses.ImageAnnotationResponse import nebulosa.api.services.EquipmentService import nebulosa.api.services.ImageService +import nebulosa.api.services.ImageToken import nebulosa.imaging.ImageChannel import nebulosa.imaging.algorithms.ProtectionMethod import nebulosa.math.Angle @@ -43,7 +44,7 @@ class ImageController( output: HttpServletResponse, ) { imageService.openImage( - Path.of(path), + ImageToken.of(path), debayer, autoStretch, shadow, highlight, midtone, mirrorHorizontal, mirrorVertical, invert, scnrEnabled, scnrChannel, scnrAmount, scnrProtectionMode, @@ -53,7 +54,7 @@ class ImageController( @PostMapping("closeImage") fun closeImage(@RequestParam @Valid @NotBlank path: String) { - return imageService.closeImage(Path.of(path)) + return imageService.closeImage(ImageToken.of(path)) } @GetMapping("imagesOfCamera") @@ -81,7 +82,7 @@ class ImageController( @RequestParam(required = false, defaultValue = "true") dsos: Boolean, @RequestParam(required = false, defaultValue = "false") minorPlanets: Boolean, ): List { - return imageService.annotations(Path.of(path), stars, dsos, minorPlanets) + return imageService.annotations(ImageToken.of(path), stars, dsos, minorPlanets) } @PostMapping("solveImage") @@ -97,7 +98,7 @@ class ImageController( @RequestParam(required = false, defaultValue = "") apiKey: String, ): CalibrationResponse { return imageService.solveImage( - Path.of(path), type, blind, + ImageToken.of(path), type, blind, Angle.from(centerRA, true), Angle.from(centerDEC), Angle.from(radius), downsampleFactor, pathOrUrl, apiKey, ) @@ -112,6 +113,6 @@ class ImageController( @RequestParam(required = false, defaultValue = "true") synchronized: Boolean, ) { val mount = requireNotNull(equipmentService.mount(name)) - imageService.pointMountHere(mount, Path.of(path), x, y, synchronized) + imageService.pointMountHere(mount, ImageToken.of(path), x, y, synchronized) } } diff --git a/api/src/main/kotlin/nebulosa/api/data/events/GuideExposureFinished.kt b/api/src/main/kotlin/nebulosa/api/data/events/GuideExposureFinished.kt index 7a033b592..cd0a8124c 100644 --- a/api/src/main/kotlin/nebulosa/api/data/events/GuideExposureFinished.kt +++ b/api/src/main/kotlin/nebulosa/api/data/events/GuideExposureFinished.kt @@ -4,12 +4,14 @@ import com.fasterxml.jackson.core.JsonGenerator import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.ser.std.StdSerializer import nebulosa.api.services.GuideExposureTask +import nebulosa.imaging.Image import nebulosa.indi.device.camera.CameraEvent import org.springframework.beans.factory.annotation.Qualifier import org.springframework.stereotype.Component data class GuideExposureFinished( override val task: GuideExposureTask, + @JvmField internal val image: Image, ) : TaskEvent, CameraEvent { override val device @@ -26,7 +28,7 @@ data class GuideExposureFinished( ) { gen.writeStartObject() gen.writeStringField("camera", event.device.name) - gen.writeStringField("path", "${event.task.savePath}") + gen.writeStringField("path", "${event.task.token.path}") gen.writeEndObject() } } diff --git a/api/src/main/kotlin/nebulosa/api/services/FramingService.kt b/api/src/main/kotlin/nebulosa/api/services/FramingService.kt index 4940130df..542a1af0c 100644 --- a/api/src/main/kotlin/nebulosa/api/services/FramingService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/FramingService.kt @@ -11,9 +11,7 @@ import nebulosa.math.Angle.Companion.deg import nebulosa.math.Angle.Companion.rad import nebulosa.platesolving.Calibration import org.springframework.stereotype.Service -import java.nio.file.Files -import java.nio.file.Path -import kotlin.io.path.writeBytes +import java.io.ByteArrayInputStream import kotlin.math.abs @Service @@ -23,7 +21,7 @@ class FramingService(private val hips2FitsService: Hips2FitsService) { rightAscension: Angle, declination: Angle, width: Int, height: Int, fov: Angle, rotation: Angle = Angle.ZERO, hipsSurveyType: HipsSurveyType = HipsSurveyType.CDS_P_DSS2_COLOR, - ): Triple? { + ): Pair? { val data = hips2FitsService.query( hipsSurveyType.hipsSurvey, rightAscension, declination, @@ -32,11 +30,9 @@ class FramingService(private val hips2FitsService: Hips2FitsService) { format = FormatOutputType.FITS, ).execute().body() ?: return null - val fitsPath = Files.createTempFile("framing", ".fits") - fitsPath.writeBytes(data) - LOG.info("framing file saved. path={}", fitsPath) + LOG.info("framing file loaded") - val image = Image.open(fitsPath.toFile()) + val image = Image.openFITS(ByteArrayInputStream(data)) // val crot = -rotation + Angle.SEMICIRCLE val cdelt1 = image.header.getDoubleValue(FitsKeywords.CDELT1).deg @@ -58,7 +54,7 @@ class FramingService(private val hips2FitsService: Hips2FitsService) { height = abs(cdelt2.value).rad * height, ) - return Triple(image, fitsPath, calibration) + return image to calibration } companion object { diff --git a/api/src/main/kotlin/nebulosa/api/services/GuideExposureTask.kt b/api/src/main/kotlin/nebulosa/api/services/GuideExposureTask.kt index 73f336fc5..fb6ec99a0 100644 --- a/api/src/main/kotlin/nebulosa/api/services/GuideExposureTask.kt +++ b/api/src/main/kotlin/nebulosa/api/services/GuideExposureTask.kt @@ -3,23 +3,21 @@ package nebulosa.api.services import nebulosa.api.data.events.GuideExposureFinished import nebulosa.common.concurrency.CountUpDownLatch import nebulosa.common.concurrency.ThreadedJob +import nebulosa.imaging.Image import nebulosa.indi.device.camera.* -import nebulosa.io.transferAndClose import nebulosa.log.loggerFor import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import java.io.InputStream -import java.nio.file.Path import java.util.concurrent.atomic.AtomicBoolean -import kotlin.io.path.outputStream import kotlin.time.Duration data class GuideExposureTask( val camera: Camera, val exposure: Duration, - val savePath: Path, -) : ThreadedJob() { + val token: ImageToken, +) : ThreadedJob() { val exposureInMicroseconds = exposure.inWholeMicroseconds @@ -35,7 +33,7 @@ data class GuideExposureTask( if (running && event.device === camera) { when (event) { is CameraFrameCaptured -> { - save(event.fits) && add(savePath) + save(event.fits) latch.countDown() } is CameraExposureAborted, @@ -86,11 +84,9 @@ data class GuideExposureTask( } private fun save(inputStream: InputStream): Boolean { - LOG.info("saving FITS at $savePath...") - return try { - inputStream.transferAndClose(savePath.outputStream()) - EventBus.getDefault().post(GuideExposureFinished(this)) + val image = Image.openFITS(inputStream).also(::add) + EventBus.getDefault().post(GuideExposureFinished(this, image)) true } catch (e: Throwable) { LOG.error("failed to save FITS", e) diff --git a/api/src/main/kotlin/nebulosa/api/services/GuidingService.kt b/api/src/main/kotlin/nebulosa/api/services/GuidingService.kt index 975acc1b2..961a746fc 100644 --- a/api/src/main/kotlin/nebulosa/api/services/GuidingService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/GuidingService.kt @@ -4,6 +4,7 @@ import jakarta.annotation.PostConstruct import nebulosa.api.data.entities.GuideCalibrationEntity import nebulosa.api.data.enums.DitherMode import nebulosa.api.data.enums.GuideAlgorithmType +import nebulosa.api.data.events.GuideExposureFinished import nebulosa.api.data.responses.GuidingChartResponse import nebulosa.api.data.responses.GuidingStarResponse import nebulosa.api.repositories.GuideCalibrationRepository @@ -27,13 +28,11 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import org.springframework.stereotype.Service import java.io.ByteArrayOutputStream -import java.nio.file.Path import java.util.* import java.util.concurrent.ExecutorService import java.util.concurrent.atomic.AtomicReference import javax.imageio.ImageIO import kotlin.io.encoding.Base64 -import kotlin.io.path.createParentDirectories import kotlin.math.hypot import kotlin.math.min import kotlin.time.Duration.Companion.milliseconds @@ -45,7 +44,7 @@ class GuidingService( private val cameraExecutorService: ExecutorService, private val guiderExecutorService: ExecutorService, private val guideCalibrationRepository: GuideCalibrationRepository, - private val capturesDirectory: Path, + private val imageService: ImageService, ) : GuideDevice, GuiderListener { private val randomDither = RandomDither() @@ -83,7 +82,7 @@ class GuidingService( } @Subscribe(threadMode = ThreadMode.ASYNC) - fun onMountEvent(event: DeviceEvent<*>) { + fun onGuidingEvent(event: DeviceEvent<*>) { val device = event.device ?: return if (device is GuideOutput && device.canPulseGuide) { @@ -95,6 +94,13 @@ class GuidingService( } } + @Subscribe(threadMode = ThreadMode.ASYNC) + fun onGuideExposureFinished(event: GuideExposureFinished) { + imageService.load(event.task.token, event.image) + guideImage.set(event.image) + webSocketService.sendGuideExposureFinished(event) + } + fun connect(guideOutput: GuideOutput) { guideOutput.connect() } @@ -296,15 +302,13 @@ class GuidingService( override fun capture(duration: Long): Image? { return synchronized(guideExposureTask) { - val savePath = Path.of("$capturesDirectory", camera.name + ".fits").createParentDirectories() - val task = GuideExposureTask(camera, duration.milliseconds, savePath) + val task = GuideExposureTask(camera, duration.milliseconds, ImageToken.Guiding) guideExposureTask.set(task) cameraExecutorService.submit(task).get() guideExposureTask.set(null) - if (task.isNotEmpty()) Image.open(savePath.toFile()).also(guideImage::set) - else null + task.firstOrNull() } } diff --git a/api/src/main/kotlin/nebulosa/api/services/ImageService.kt b/api/src/main/kotlin/nebulosa/api/services/ImageService.kt index 09fd9dad2..ed17e858c 100644 --- a/api/src/main/kotlin/nebulosa/api/services/ImageService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/ImageService.kt @@ -50,20 +50,21 @@ class ImageService( private val framingService: FramingService, ) { - private val cachedImages = HashMap() - private val calibrations = HashMap() + private val cachedImages = HashMap() + private val calibrations = HashMap() @Synchronized fun openImage( - path: Path, debayer: Boolean, + token: ImageToken, debayer: Boolean, autoStretch: Boolean = false, shadow: Float = 0f, highlight: Float = 1f, midtone: Float = 0.5f, mirrorHorizontal: Boolean = false, mirrorVertical: Boolean = false, invert: Boolean = false, scnrEnabled: Boolean = false, scnrChannel: ImageChannel = ImageChannel.GREEN, scnrAmount: Float = 0.5f, scnrProtectionMode: ProtectionMethod = ProtectionMethod.AVERAGE_NEUTRAL, output: HttpServletResponse, ) { - val image = cachedImages[path] ?: Image.open(path.toFile(), debayer) - .also { cachedImages[path] = it } + val image = cachedImages[token] + ?: if (token is ImageToken.Saved) Image.open(token.path.toFile(), debayer).also { load(token, it) } + else throw ResponseStatusException(HttpStatus.NOT_FOUND) val manualStretch = shadow != 0f || highlight != 1f || midtone != 0.5f var stretchParams = ScreenTransformFunction.Parameters(midtone, shadow, highlight) @@ -90,7 +91,8 @@ class ImageService( if (invert) transformedImage = Invert.transform(transformedImage) - val savedImage = savedCameraImageRepository.withPath("$path") + val savedImage = if (token is ImageToken.Saved) savedCameraImageRepository.withPath("${token.path}") + else null val info = ImageInfoResponse( savedImage?.camera ?: "", @@ -104,7 +106,7 @@ class ImageService( stretchParams.midtone, transformedImage.header.ra?.format(AngleFormatter.HMS), transformedImage.header.dec?.format(AngleFormatter.SIGNED_DMS), - path in calibrations, + token in calibrations, transformedImage.header.iterator().asSequence() .filter { it.key.isNotBlank() && !it.value.isNullOrBlank() } .map { FITSHeaderItemResponse(it.key, it.value ?: "") } @@ -118,10 +120,10 @@ class ImageService( } @Synchronized - fun closeImage(path: Path) { - cachedImages.remove(path) - calibrations.remove(path) - LOG.info("image closed. path={}", path) + fun closeImage(token: ImageToken) { + cachedImages.remove(token) + calibrations.remove(token) + LOG.info("image closed. token={}", token) System.gc() } @@ -138,10 +140,10 @@ class ImageService( } fun annotations( - path: Path, + token: ImageToken, stars: Boolean, dsos: Boolean, minorPlanets: Boolean, ): List { - val calibration = calibrations[path] + val calibration = calibrations[token] if (calibration == null || !calibration.hasWCS || calibration.radius.value <= 0.0) { return emptyList() @@ -174,7 +176,7 @@ class ImageService( } fun solveImage( - path: Path, type: PlateSolverType, + token: ImageToken, type: PlateSolverType, blind: Boolean, centerRA: Angle, centerDEC: Angle, radius: Angle, downsampleFactor: Int, @@ -187,13 +189,16 @@ class ImageService( PlateSolverType.ASTAP -> AstapPlateSolver(pathOrUrl) } + // TODO: Implement new solver using Image. + require(token is ImageToken.Saved) + val calibration = solver.solve( - path, blind, + token.path, blind, centerRA, centerDEC, radius, downsampleFactor, Duration.ofMinutes(2L), ) - calibrations[path] = calibration + calibrations[token] = calibration return CalibrationResponse(calibration) } @@ -203,7 +208,11 @@ class ImageService( if (inputPath.extension == outputPath.extension) { inputPath.inputStream().transferAndClose(outputPath.outputStream()) } else { - val image = cachedImages[inputPath]!! + val image = cachedImages + .keys + .firstOrNull { it is ImageToken.Saved && it.path == inputPath } + ?.let { cachedImages[it] } + ?: return when (outputPath.extension.uppercase()) { "PNG" -> outputPath.outputStream().use { ImageIO.write(image, "PNG", it) } @@ -214,8 +223,8 @@ class ImageService( } } - fun pointMountHere(mount: Mount, path: Path, x: Double, y: Double, synchronized: Boolean) { - val calibration = calibrations[path] ?: return + fun pointMountHere(mount: Mount, token: ImageToken, x: Double, y: Double, synchronized: Boolean) { + val calibration = calibrations[token] ?: return val wcs = WCSTransform(calibration) val (rightAscension, declination) = wcs.pixelToWorld(x, y) @@ -236,13 +245,19 @@ class ImageService( width: Int, height: Int, fov: Angle, rotation: Angle = Angle.ZERO, hipsSurveyType: HipsSurveyType = HipsSurveyType.CDS_P_DSS2_COLOR, ): Path { - val (image, path, calibration) = framingService + val (image, calibration) = framingService .frame(rightAscension, declination, width, height, fov, rotation, hipsSurveyType)!! - cachedImages[path] = image - calibrations[path] = calibration + val token = ImageToken.Framing + cachedImages[token] = image + calibrations[token] = calibration + + return Path.of("@framing") + } - return path + internal fun load(token: ImageToken, image: Image) { + cachedImages[token] = image + calibrations.remove(token) } companion object { diff --git a/api/src/main/kotlin/nebulosa/api/services/ImageToken.kt b/api/src/main/kotlin/nebulosa/api/services/ImageToken.kt new file mode 100644 index 000000000..6607bde90 --- /dev/null +++ b/api/src/main/kotlin/nebulosa/api/services/ImageToken.kt @@ -0,0 +1,33 @@ +package nebulosa.api.services + +import java.nio.file.Path + +sealed interface ImageToken { + + val path: Path + + data class Saved(override val path: Path) : ImageToken + + data object Guiding : ImageToken { + + override val path = Path.of(GUIDING_TOKEN) + } + + data object Framing : ImageToken { + + override val path = Path.of(FRAMING_TOKEN) + } + + companion object { + + const val GUIDING_TOKEN = "@guiding" + const val FRAMING_TOKEN = "@framing" + + @JvmStatic + fun of(token: String) = when (token) { + GUIDING_TOKEN -> Guiding + FRAMING_TOKEN -> Framing + else -> Saved(Path.of(token)) + } + } +} diff --git a/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt b/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt index 325a2ef97..bfb2584c0 100644 --- a/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/WebSocketService.kt @@ -3,6 +3,7 @@ package nebulosa.api.services import nebulosa.api.data.entities.SavedCameraImageEntity import nebulosa.api.data.events.CameraCaptureFinished import nebulosa.api.data.events.CameraCaptureProgressChanged +import nebulosa.api.data.events.GuideExposureFinished import nebulosa.indi.device.ConnectionEvent import nebulosa.indi.device.DeviceMessageReceived import nebulosa.indi.device.DevicePropertyEvent @@ -131,6 +132,10 @@ class WebSocketService(private val simpleMessageTemplate: SimpMessagingTemplate) sendMessage(GUIDE_OUTPUT_DETACHED, event.device) } + fun sendGuideExposureFinished(event: GuideExposureFinished) { + sendMessage(GUIDE_EXPOSURE_FINISHED, event) + } + // DEVICE fun sendConnectionEvent(event: ConnectionEvent) { @@ -182,5 +187,6 @@ class WebSocketService(private val simpleMessageTemplate: SimpMessagingTemplate) const val GUIDE_OUTPUT_UPDATED = "GUIDE_OUTPUT_UPDATED" const val GUIDE_OUTPUT_ATTACHED = "GUIDE_OUTPUT_ATTACHED" const val GUIDE_OUTPUT_DETACHED = "GUIDE_OUTPUT_DETACHED" + const val GUIDE_EXPOSURE_FINISHED = "GUIDE_EXPOSURE_FINISHED" } } diff --git a/desktop/src/app/guider/guider.component.html b/desktop/src/app/guider/guider.component.html index 889f24002..93c549a25 100644 --- a/desktop/src/app/guider/guider.component.html +++ b/desktop/src/app/guider/guider.component.html @@ -51,17 +51,16 @@ -
-
- Looping - - +
+
+ + +
-
- Guiding - - +
+ +
\ No newline at end of file diff --git a/desktop/src/app/guider/guider.component.ts b/desktop/src/app/guider/guider.component.ts index a899093c6..a993dc70d 100644 --- a/desktop/src/app/guider/guider.component.ts +++ b/desktop/src/app/guider/guider.component.ts @@ -145,6 +145,16 @@ export class GuiderComponent implements AfterViewInit, OnDestroy { } } + async openCameraImage() { + await this.browserWindow.openCameraImage(this.camera!) + } + + async startLooping() { + await this.openCameraImage() + + this.api.startGuideLooping(this.camera!, this.mount!, this.guideOutput!) + } + private update() { if (this.camera) { this.cameraConnected = this.camera.connected diff --git a/desktop/src/app/image/image.component.ts b/desktop/src/app/image/image.component.ts index e58387600..ca86598af 100644 --- a/desktop/src/app/image/image.component.ts +++ b/desktop/src/app/image/image.component.ts @@ -12,7 +12,7 @@ import { BrowserWindowService } from '../../shared/services/browser-window.servi import { ElectronService } from '../../shared/services/electron.service' import { PreferenceService } from '../../shared/services/preference.service' import { - Calibration, Camera, DeepSkyObject, EquatorialCoordinate, FITSHeaderItem, ImageAnnotation, ImageChannel, ImageInfo, ImageSource, + Calibration, Camera, DeepSkyObject, EquatorialCoordinate, FITSHeaderItem, GuideExposureFinished, ImageAnnotation, ImageChannel, ImageInfo, ImageSource, ImageStarSelected, PlateSolverType, SCNRProtectionMethod, SCNR_PROTECTION_METHODS, SavedCameraImage, Star } from '../../shared/types' @@ -99,6 +99,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy { roiHeight = 128 roiInteractable?: Interactable + guiding = false + private readonly scnrMenuItem: MenuItem = { label: 'SCNR', icon: 'mdi mdi-palette', @@ -286,6 +288,20 @@ export class ImageComponent implements AfterViewInit, OnDestroy { await this.closeImage() ngZone.run(() => { + this.guiding = false + this.annotations = [] + this.imageParams.path = data.path + this.loadImage() + }) + } + }) + + electron.ipcRenderer.on('GUIDE_EXPOSURE_FINISHED', async (_, data: GuideExposureFinished) => { + if (data.camera === this.imageParams.camera?.name) { + await this.closeImage() + + ngZone.run(() => { + this.guiding = true this.annotations = [] this.imageParams.path = data.path this.loadImage() @@ -313,14 +329,16 @@ export class ImageComponent implements AfterViewInit, OnDestroy { @HostListener('window:unload') ngOnDestroy() { - this.closeImage() + this.closeImage(true) this.roiInteractable?.unset() } - private async closeImage() { + private async closeImage(force: boolean = false) { if (this.imageParams.path) { - await this.api.closeImage(this.imageParams.path) + if (force || !this.imageParams.path.startsWith('@')) { + await this.api.closeImage(this.imageParams.path) + } } } diff --git a/desktop/src/shared/types.ts b/desktop/src/shared/types.ts index 3ac3de572..ad5ae2735 100644 --- a/desktop/src/shared/types.ts +++ b/desktop/src/shared/types.ts @@ -191,6 +191,11 @@ export interface SavedCameraImage { savedAt: number } +export interface GuideExposureFinished { + camera: string + path: string +} + export interface ImageInfo extends SavedCameraImage { stretchShadow: number stretchHighlight: number @@ -635,6 +640,7 @@ export const INDI_EVENT_TYPES = [ 'FOCUSER_UPDATED', 'FOCUSER_ATTACHED', 'FOCUSER_DETACHED', 'FILTER_WHEEL_UPDATED', 'FILTER_WHEEL_ATTACHED', 'FILTER_WHEEL_DETACHED', 'GUIDE_OUTPUT_ATTACHED', 'GUIDE_OUTPUT_DETACHED', 'GUIDE_OUTPUT_UPDATED', + 'GUIDE_EXPOSURE_FINISHED', ] as const export type INDIEventType = (typeof INDI_EVENT_TYPES)[number] diff --git a/nebulosa-imaging/src/main/kotlin/nebulosa/imaging/Image.kt b/nebulosa-imaging/src/main/kotlin/nebulosa/imaging/Image.kt index a8b331f5e..69b84792a 100644 --- a/nebulosa-imaging/src/main/kotlin/nebulosa/imaging/Image.kt +++ b/nebulosa-imaging/src/main/kotlin/nebulosa/imaging/Image.kt @@ -322,23 +322,27 @@ class Image( debayer: Boolean = true, onlyHeaders: Boolean = false, ): Image { - return ImageIO.read(file)?.let(::open) - ?: Fits(file).use { open(it, debayer, onlyHeaders) } + return ImageIO.read(file)?.let(::openImage) + ?: Fits(file).use { openFITS(it, debayer, onlyHeaders) } } @JvmStatic - fun open( + fun openFITS( inputStream: InputStream, debayer: Boolean = true, onlyHeaders: Boolean = false, ): Image { - return ImageIO.read(inputStream)?.let(::open) - ?: Fits(inputStream).use { open(it, debayer, onlyHeaders) } + return Fits(inputStream).use { openFITS(it, debayer, onlyHeaders) } + } + + @JvmStatic + fun openImage(inputStream: InputStream): Image? { + return ImageIO.read(inputStream)?.let(this::openImage) } @Suppress("UNCHECKED_CAST") @JvmStatic - fun open( + fun openFITS( fits: Fits, debayer: Boolean = true, onlyHeaders: Boolean = false, @@ -425,7 +429,7 @@ class Image( * @see TwelveMonkeys: Additional plug-ins */ @JvmStatic - fun open(bufferedImage: BufferedImage): Image { + fun openImage(bufferedImage: BufferedImage): Image { val header = Header() val width = bufferedImage.width val height = bufferedImage.height diff --git a/nebulosa-imaging/src/test/kotlin/AlgorithmTest.kt b/nebulosa-imaging/src/test/kotlin/AlgorithmTest.kt index 52fc728fa..af686b419 100644 --- a/nebulosa-imaging/src/test/kotlin/AlgorithmTest.kt +++ b/nebulosa-imaging/src/test/kotlin/AlgorithmTest.kt @@ -13,11 +13,11 @@ class AlgorithmTest : StringSpec() { init { "Median" { val fits = Fits("src/test/resources/CCD Simulator.Gray.fits") - Image.open(fits).compute(Median()) shouldBe (0.0000763f plusOrMinus 1e-8f) + Image.openFITS(fits).compute(Median()) shouldBe (0.0000763f plusOrMinus 1e-8f) } "Statistics" { val fits = Fits("src/test/resources/CCD Simulator.Gray.fits") - val statistics = Image.open(fits).compute(Statistics()) + val statistics = Image.openFITS(fits).compute(Statistics()) statistics.count shouldBeExactly 1310720 statistics.maxCount shouldBeExactly 131696 diff --git a/nebulosa-imaging/src/test/kotlin/ExtendedImageTest.kt b/nebulosa-imaging/src/test/kotlin/ExtendedImageTest.kt index f48604202..d39972408 100644 --- a/nebulosa-imaging/src/test/kotlin/ExtendedImageTest.kt +++ b/nebulosa-imaging/src/test/kotlin/ExtendedImageTest.kt @@ -12,13 +12,13 @@ class ExtendedImageTest : AbstractImageTest() { init { beforeSpec { var fits = Fits("src/test/resources/M51.8.Mono.fits") - var image = Image.open(fits) + var image = Image.openFITS(fits) ImageIO.write(image, "JPEG", File("src/test/resources/M51.8.Mono.Extended.jpg")) ImageIO.write(image, "PNG", File("src/test/resources/M51.8.Mono.Extended.png")) ImageIO.write(image, "BMP", File("src/test/resources/M51.8.Mono.Extended.bmp")) fits = Fits("src/test/resources/M51.8.Color.fits") - image = Image.open(fits) + image = Image.openFITS(fits) ImageIO.write(image, "JPEG", File("src/test/resources/M51.8.Color.Extended.jpg")) ImageIO.write(image, "PNG", File("src/test/resources/M51.8.Color.Extended.png")) ImageIO.write(image, "BMP", File("src/test/resources/M51.8.Color.Extended.bmp")) diff --git a/nebulosa-imaging/src/test/kotlin/FitsImageTest.kt b/nebulosa-imaging/src/test/kotlin/FitsImageTest.kt index 38ceaca2c..e617fdb64 100644 --- a/nebulosa-imaging/src/test/kotlin/FitsImageTest.kt +++ b/nebulosa-imaging/src/test/kotlin/FitsImageTest.kt @@ -13,139 +13,139 @@ class FitsImageTest : AbstractImageTest() { init { "8-bits mono" { val fits = Fits("src/test/resources/M51.8.Mono.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.8.Mono.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "dda8e2886c0d31671953734cb7288cfc" } "16-bits mono" { val fits = Fits("src/test/resources/M51.16.Mono.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.16.Mono.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "876b787d9b86fd5de789f091610be65d" } "32-bits mono" { val fits = Fits("src/test/resources/M51.32.Mono.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.32.Mono.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "79640bc91bde46b473d6cac3f0d76e80" } "32-bits floating point mono" { val fits = Fits("src/test/resources/M51.F32.Mono.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.F32.Mono.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "79640bc91bde46b473d6cac3f0d76e80" } "64-bits floating point mono" { val fits = Fits("src/test/resources/M51.F64.Mono.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.F64.Mono.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "79640bc91bde46b473d6cac3f0d76e80" } "8-bits color" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.8.Color.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "5aa19e4d7aa87d3207f9c5f710698b2f" } "16-bits color" { val fits = Fits("src/test/resources/M51.16.Color.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.16.Color.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "74a31fd345d8af0764d304bab75eb021" } "32-bits color" { val fits = Fits("src/test/resources/M51.32.Color.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.32.Color.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "c4af1fe94f57529ff4aaefa7297f8acd" } "32-bits floating point color" { val fits = Fits("src/test/resources/M51.F32.Color.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.F32.Color.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "c4af1fe94f57529ff4aaefa7297f8acd" } "64-bits floating point color" { val fits = Fits("src/test/resources/M51.F64.Color.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.F64.Color.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "c4af1fe94f57529ff4aaefa7297f8acd" } "8-bits color full (ICC Profile + Properties + Thumbnail)" { val fits = Fits("src/test/resources/M51.8.Color.Full.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/M51.8.Color.Full.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "5aa19e4d7aa87d3207f9c5f710698b2f" } "STF midtone = 0.1, shadow = 0.0, highlight = 1.0" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.1f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.1f)) val outputFile = File("src/test/resources/M51.8.Color.STF0.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "140be07d47a564b6a9fe3cc8a749ca8b" } "STF midtone = 0.9, shadow = 0.0, highlight = 1.0" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.9f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.9f)) val outputFile = File("src/test/resources/M51.8.Color.STF1.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "86e456cbae3b0838c807db759075af22" } "STF midtone = 0.1, shadow = 0.5, highlight = 1.0" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.1f, shadow = 0.5f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.1f, shadow = 0.5f)) val outputFile = File("src/test/resources/M51.8.Color.STF2.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "727cbe2ad73640efb077d6e4e70fa38e" } "STF midtone = 0.9, shadow = 0.5, highlight = 1.0" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.9f, shadow = 0.5f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.9f, shadow = 0.5f)) val outputFile = File("src/test/resources/M51.8.Color.STF3.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "c3575a997ee68e3908b6623cc6f19aeb" } "STF midtone = 0.1, shadow = 0.0, highlight = 0.5" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.1f, highlight = 0.5f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.1f, highlight = 0.5f)) val outputFile = File("src/test/resources/M51.8.Color.STF4.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "a86e45ad67b2c9c7106ca7b52f5e378c" } "STF midtone = 0.9, shadow = 0.0, highlight = 0.5" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.9f, highlight = 0.5f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.9f, highlight = 0.5f)) val outputFile = File("src/test/resources/M51.8.Color.STF5.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "deabe6cf1fd64360c284d44b617e55f9" } "STF midtone = 0.1, shadow = 0.4, highlight = 0.6" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.1f, 0.4f, 0.6f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.1f, 0.4f, 0.6f)) val outputFile = File("src/test/resources/M51.8.Color.STF6.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "a8632186ce0ea9d2ef545391e82e1f6c" } "STF midtone = 0.9, shadow = 0.4, highlight = 0.6" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(0.9f, 0.4f, 0.6f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(0.9f, 0.4f, 0.6f)) val outputFile = File("src/test/resources/M51.8.Color.STF7.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "c0872c612faaa601ec76191eaced7fcc" } "Auto STF" { - val fits = Image.open(Fits("src/test/resources/M51.8.Color.fits")) + val fits = Image.openFITS(Fits("src/test/resources/M51.8.Color.fits")) val image = fits.transform(AutoScreenTransformFunction) val outputFile = File("src/test/resources/M51.8.Color.AutoSTF.png") ImageIO.write(image, "PNG", outputFile) @@ -153,56 +153,56 @@ class FitsImageTest : AbstractImageTest() { } "CCD Simulator - Stretch" { val fits = Fits("src/test/resources/CCD Simulator.Gray.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(5.8e-5f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(5.8e-5f)) val outputFile = File("src/test/resources/CCD Simulator.Gray.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "27e35bc8cf0d946f4e121a87e4e3e751" } "CCD Simulator - JPG" { val fits = Fits("src/test/resources/CCD Simulator.Gray.fits") - val image = Image.open(fits).transform(ScreenTransformFunction(5.8e-5f)) + val image = Image.openFITS(fits).transform(ScreenTransformFunction(5.8e-5f)) val outputFile = File("src/test/resources/CCD Simulator.Gray.jpg") ImageIO.write(image, "JPG", outputFile) outputFile.md5() shouldBe "b8eaf66bb61d11ed1fab7f8273787616" } "Flip Vertical" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(VerticalFlip) + val image = Image.openFITS(fits).transform(VerticalFlip) val outputFile = File("src/test/resources/M51.8.Color.FlipV.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "f28ab67afbe41fb2f07c7cbf76f1d1b1" } "Flip Horizontal" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(HorizontalFlip) + val image = Image.openFITS(fits).transform(HorizontalFlip) val outputFile = File("src/test/resources/M51.8.Color.FlipH.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "01da982b44c8a016ccfbe12c8ff12735" } "Flip Vertical & Horizontal" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(HorizontalFlip, VerticalFlip) + val image = Image.openFITS(fits).transform(HorizontalFlip, VerticalFlip) val outputFile = File("src/test/resources/M51.8.Color.FlipVH.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "9ae0f01a217478a07f3e67f834b353df" } "Invert" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(Invert) + val image = Image.openFITS(fits).transform(Invert) val outputFile = File("src/test/resources/M51.8.Color.Invert.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "376dfbbb2df0d936a1eed56ee36a5a3c" } "Grayscale" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(Grayscale.BT709) + val image = Image.openFITS(fits).transform(Grayscale.BT709) val outputFile = File("src/test/resources/M51.8.Color.Grayscale.BT709.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "a7313408fafa9c1d743ca34a481051b9" } "Debayer - GRBG" { val fits = Fits("src/test/resources/Debayer.GRBG.fits") - val image = Image.open(fits) + val image = Image.openFITS(fits) val outputFile = File("src/test/resources/Debayer.GRBG.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "dad1a430e41e4846f0c6a9c594e5d57d" @@ -210,66 +210,66 @@ class FitsImageTest : AbstractImageTest() { "SCNR" { val fits = Fits("src/test/resources/Debayer.GRBG.fits") val scnr = SubtractiveChromaticNoiseReduction(ImageChannel.GREEN, 0.5f, ProtectionMethod.AVERAGE_NEUTRAL) - val image = Image.open(fits).transform(scnr) + val image = Image.openFITS(fits).transform(scnr) val outputFile = File("src/test/resources/Debayer.SCNR.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "223dd13ec260782e135ff64a5acedb26" } "Salt & Pepper Noise" { val fits = Fits("src/test/resources/Flower.fits") - val image = Image.open(fits).transform(SaltAndPepperNoise(0.1f, Random(0))) + val image = Image.openFITS(fits).transform(SaltAndPepperNoise(0.1f, Random(0))) val outputFile = File("src/test/resources/Flower.SaltPepperNoise.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "7d15259b367ea973be204038f0972159" } "Blur" { val fits = Fits("src/test/resources/Flower.fits") - val image = Image.open(fits).transform(Blur) + val image = Image.openFITS(fits).transform(Blur) val outputFile = File("src/test/resources/Flower.Blur.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "ed3bda2192ea3298e33790715808de91" } "Gaussian Blur" { val fits = Fits("src/test/resources/Flower.fits") - val image = Image.open(fits).transform(GaussianBlur(sigma = 5.0, size = 9)) + val image = Image.openFITS(fits).transform(GaussianBlur(sigma = 5.0, size = 9)) val outputFile = File("src/test/resources/Flower.GaussianBlur.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "bc43543e671a1201f71f5619a2e56463" } "Edges" { val fits = Fits("src/test/resources/Flower.fits") - val image = Image.open(fits).transform(Edges) + val image = Image.openFITS(fits).transform(Edges) val outputFile = File("src/test/resources/Flower.Edges.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "077818d1344d2b453ceed5caecbf657a" } "Sharpen" { val fits = Fits("src/test/resources/Flower.fits") - val image = Image.open(fits).transform(Sharpen) + val image = Image.openFITS(fits).transform(Sharpen) val outputFile = File("src/test/resources/Flower.Sharpen.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "bca1608df7b4bf9bb2d1b80d04c5fad0" } "Mean" { val fits = Fits("src/test/resources/Flower.fits") - val image = Image.open(fits).transform(SaltAndPepperNoise(0.1f, Random(0)), Mean) + val image = Image.openFITS(fits).transform(SaltAndPepperNoise(0.1f, Random(0)), Mean) val outputFile = File("src/test/resources/Flower.Mean.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "8a348a8393125ae35ad5478113c30c1e" } "write Color FITS as FITS" { - val fits1 = Image.open(Fits("src/test/resources/Flower.fits")) + val fits1 = Image.openFITS(Fits("src/test/resources/Flower.fits")) val outputFile1 = File("src/test/resources/Flower.Color.Fits.1.png") ImageIO.write(fits1, "PNG", outputFile1) - val fits2 = Image.open(fits1.fits()) + val fits2 = Image.openFITS(fits1.fits()) val outputFile2 = File("src/test/resources/Flower.Color.Fits.2.png") ImageIO.write(fits2, "PNG", outputFile2) outputFile1.md5() shouldBe outputFile2.md5() } "write Color PNG as FITS" { - val fits1 = Image.open(Fits("src/test/resources/Flower.fits")) + val fits1 = Image.openFITS(Fits("src/test/resources/Flower.fits")) val outputFile1 = File("src/test/resources/Flower.Color.PNG.1.png") ImageIO.write(fits1, "PNG", outputFile1) @@ -280,18 +280,18 @@ class FitsImageTest : AbstractImageTest() { outputFile1.md5() shouldBe outputFile2.md5() } "write Mono FITS as FITS" { - val fits1 = Image.open(Fits("src/test/resources/CCD Simulator.Gray.fits")).transform(ScreenTransformFunction(5.8e-5f)) + val fits1 = Image.openFITS(Fits("src/test/resources/CCD Simulator.Gray.fits")).transform(ScreenTransformFunction(5.8e-5f)) val outputFile1 = File("src/test/resources/CCD Simulator.Gray.Mono.Fits.1.png") ImageIO.write(fits1, "PNG", outputFile1) - val fits2 = Image.open(fits1.fits()) + val fits2 = Image.openFITS(fits1.fits()) val outputFile2 = File("src/test/resources/CCD Simulator.Gray.Mono.Fits.2.png") ImageIO.write(fits2, "PNG", outputFile2) outputFile1.md5() shouldBe outputFile2.md5() } "write Mono PNG as FITS" { - val fits1 = Image.open(Fits("src/test/resources/CCD Simulator.Gray.fits")).transform(ScreenTransformFunction(5.8e-5f)) + val fits1 = Image.openFITS(Fits("src/test/resources/CCD Simulator.Gray.fits")).transform(ScreenTransformFunction(5.8e-5f)) val outputFile1 = File("src/test/resources/CCD Simulator.Gray.Mono.PNG.1.png") ImageIO.write(fits1, "PNG", outputFile1) @@ -303,7 +303,7 @@ class FitsImageTest : AbstractImageTest() { } "SubFrame" { val fits = Fits("src/test/resources/M51.8.Color.fits") - val image = Image.open(fits).transform(SubFrame(436, 387, 100, 100)) + val image = Image.openFITS(fits).transform(SubFrame(436, 387, 100, 100)) val outputFile = File("src/test/resources/M51.8.Color.Subframe.png") ImageIO.write(image, "PNG", outputFile) outputFile.md5() shouldBe "2544479baa64a72c1ca8a384da68cb15" diff --git a/nebulosa-imaging/src/test/kotlin/HFDTest.kt b/nebulosa-imaging/src/test/kotlin/HFDTest.kt index 1fcefd463..9647f3788 100644 --- a/nebulosa-imaging/src/test/kotlin/HFDTest.kt +++ b/nebulosa-imaging/src/test/kotlin/HFDTest.kt @@ -11,8 +11,8 @@ import nom.tam.fits.Fits class HFDTest : StringSpec() { init { - val image1 = Image.open(Fits("src/test/resources/HFD.1.fits")) - val image2 = Image.open(Fits("src/test/resources/HFD.2.fits")) + val image1 = Image.openFITS(Fits("src/test/resources/HFD.1.fits")) + val image2 = Image.openFITS(Fits("src/test/resources/HFD.2.fits")) "ok" { val hfd = HalfFluxDiameter(542.0, 974.0) From 52f0223526c005c7930aa6f7e001fab377024feb Mon Sep 17 00:00:00 2001 From: tiagohm Date: Wed, 23 Aug 2023 11:21:33 -0300 Subject: [PATCH 09/12] [api]: Implement search minor planets around coordinates --- .../kotlin/nebulosa/api/configs/BeanConfig.kt | 4 +- .../data/responses/ImageAnnotationResponse.kt | 11 ++- .../nebulosa/api/services/AtlasService.kt | 6 +- .../nebulosa/api/services/ImageService.kt | 74 +++++++++++++++---- .../src/main/kotlin/nebulosa/math/Angle.kt | 2 +- .../kotlin/nebulosa/math/AngleFormatter.kt | 24 +++++- nebulosa-sbd/build.gradle.kts | 1 + .../kotlin/nebulosa/sbd/SmallBodyDatabase.kt | 25 +++++++ .../nebulosa/sbd/SmallBodyDatabaseLookup.kt | 20 ----- .../sbd/SmallBodyDatabaseLookupService.kt | 29 -------- .../nebulosa/sbd/SmallBodyDatabaseService.kt | 74 +++++++++++++++++++ .../nebulosa/sbd/SmallBodyIdentified.kt | 10 +++ .../SmallBodyDatabaseLookupServiceTest.kt | 4 +- .../SmallBodyIdentificationServiceTest.kt | 26 +++++++ 14 files changed, 235 insertions(+), 75 deletions(-) create mode 100644 nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabase.kt delete mode 100644 nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookup.kt delete mode 100644 nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookupService.kt create mode 100644 nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt create mode 100644 nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt create mode 100644 nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt diff --git a/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt b/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt index ca5f53db6..e70cfc298 100644 --- a/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt +++ b/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt @@ -8,7 +8,7 @@ import nebulosa.api.data.entities.MyObjectBox import nebulosa.common.concurrency.DaemonThreadFactory import nebulosa.hips2fits.Hips2FitsService import nebulosa.horizons.HorizonsService -import nebulosa.sbd.SmallBodyDatabaseLookupService +import nebulosa.sbd.SmallBodyDatabaseService import nebulosa.simbad.SimbadService import okhttp3.Cache import okhttp3.ConnectionPool @@ -83,7 +83,7 @@ class BeanConfig { fun simbadService(okHttpClient: OkHttpClient) = SimbadService(okHttpClient = okHttpClient) @Bean - fun smallBodyDatabaseLookupService(okHttpClient: OkHttpClient) = SmallBodyDatabaseLookupService(okHttpClient = okHttpClient) + fun smallBodyDatabaseService(okHttpClient: OkHttpClient) = SmallBodyDatabaseService(okHttpClient = okHttpClient) @Bean fun hips2FitsService(okHttpClient: OkHttpClient) = Hips2FitsService(okHttpClient = okHttpClient) diff --git a/api/src/main/kotlin/nebulosa/api/data/responses/ImageAnnotationResponse.kt b/api/src/main/kotlin/nebulosa/api/data/responses/ImageAnnotationResponse.kt index 7c5029f86..9f6f8e897 100644 --- a/api/src/main/kotlin/nebulosa/api/data/responses/ImageAnnotationResponse.kt +++ b/api/src/main/kotlin/nebulosa/api/data/responses/ImageAnnotationResponse.kt @@ -8,4 +8,13 @@ data class ImageAnnotationResponse( val y: Double, val star: StarEntity? = null, val dso: DeepSkyObjectEntity? = null, -) + val minorPlanet: MinorPlanet? = null, +) { + + data class MinorPlanet( + val name: String, + val rightAscension: String, + val declination: String, + val magnitude: String, + ) +} diff --git a/api/src/main/kotlin/nebulosa/api/services/AtlasService.kt b/api/src/main/kotlin/nebulosa/api/services/AtlasService.kt index f3fbfea10..f48ec25f0 100644 --- a/api/src/main/kotlin/nebulosa/api/services/AtlasService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/AtlasService.kt @@ -28,7 +28,7 @@ import nebulosa.nova.astrometry.Body import nebulosa.nova.astrometry.Constellation import nebulosa.nova.astrometry.FixedStar import nebulosa.nova.position.GeographicPosition -import nebulosa.sbd.SmallBodyDatabaseLookupService +import nebulosa.sbd.SmallBodyDatabaseService import nebulosa.skycatalog.SkyObject import nebulosa.skycatalog.SkyObjectType import okhttp3.OkHttpClient @@ -53,7 +53,7 @@ import kotlin.math.hypot class AtlasService( private val horizonsEphemerisProvider: HorizonsEphemerisProvider, private val bodyEphemerisProvider: BodyEphemerisProvider, - private val smallBodyDatabaseLookupService: SmallBodyDatabaseLookupService, + private val smallBodyDatabaseService: SmallBodyDatabaseService, private val starRepository: StarRepository, private val deepSkyObjectRepository: DeepSkyObjectRepository, private val appPreferenceRepository: AppPreferenceRepository, @@ -214,7 +214,7 @@ class AtlasService( } fun searchMinorPlanet(text: String): MinorPlanetResponse { - return smallBodyDatabaseLookupService + return smallBodyDatabaseService .search(text).execute().body() ?.let(MinorPlanetResponse::of) ?: MinorPlanetResponse.EMPTY diff --git a/api/src/main/kotlin/nebulosa/api/services/ImageService.kt b/api/src/main/kotlin/nebulosa/api/services/ImageService.kt index ed17e858c..2ab0a074c 100644 --- a/api/src/main/kotlin/nebulosa/api/services/ImageService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/ImageService.kt @@ -13,6 +13,7 @@ import nebulosa.api.repositories.DeepSkyObjectRepository import nebulosa.api.repositories.SavedCameraImageRepository import nebulosa.api.repositories.StarRepository import nebulosa.astrometrynet.nova.NovaAstrometryNetService +import nebulosa.fits.FitsKeywords import nebulosa.fits.dec import nebulosa.fits.ra import nebulosa.imaging.Image @@ -24,18 +25,23 @@ import nebulosa.log.loggerFor import nebulosa.math.Angle import nebulosa.math.Angle.Companion.rad import nebulosa.math.AngleFormatter +import nebulosa.math.Distance import nebulosa.nova.position.ICRF import nebulosa.platesolving.Calibration import nebulosa.platesolving.astap.AstapPlateSolver import nebulosa.platesolving.astrometrynet.LocalAstrometryNetPlateSolver import nebulosa.platesolving.astrometrynet.NovaAstrometryNetPlateSolver import nebulosa.platesolving.watney.WatneyPlateSolver +import nebulosa.sbd.SmallBodyDatabaseService import nebulosa.wcs.WCSTransform import org.springframework.http.HttpStatus import org.springframework.stereotype.Service import org.springframework.web.server.ResponseStatusException import java.nio.file.Path import java.time.Duration +import java.time.LocalDateTime +import java.util.* +import java.util.concurrent.CompletableFuture import javax.imageio.ImageIO import kotlin.io.path.extension import kotlin.io.path.inputStream @@ -48,6 +54,7 @@ class ImageService( private val starRepository: StarRepository, private val deepSkyObjectRepository: DeepSkyObjectRepository, private val framingService: FramingService, + private val smallBodyDatabaseService: SmallBodyDatabaseService, ) { private val cachedImages = HashMap() @@ -139,6 +146,7 @@ class ImageService( return savedCameraImageRepository.withPath("$path")!! } + @Synchronized fun annotations( token: ImageToken, stars: Boolean, dsos: Boolean, minorPlanets: Boolean, @@ -150,28 +158,64 @@ class ImageService( } val wcs = WCSTransform(calibration) - val annotations = arrayListOf() + val annotations = Vector() + val tasks = ArrayList>() + + if (minorPlanets) { + CompletableFuture.runAsync { + val image = cachedImages[token] ?: return@runAsync + val dateTime = image.header.getStringValue(FitsKeywords.DATE_OBS)?.ifBlank { null } ?: return@runAsync + val latitude = Angle.from(image.header.getStringValue(FitsKeywords.SITELAT)).takeIf(Angle::valid) ?: return@runAsync + val longitude = Angle.from(image.header.getStringValue(FitsKeywords.SITELONG)).takeIf(Angle::valid) ?: return@runAsync + + val data = smallBodyDatabaseService.identify( + LocalDateTime.parse(dateTime), latitude, longitude, Distance.ZERO, + calibration.rightAscension, calibration.declination, calibration.radius, + ).execute().body() ?: return@runAsync + + val radiusInSeconds = calibration.radius.arcsec + + data.data.forEach { + val distance = it[5].toDouble() + + if (distance <= radiusInSeconds) { + val rightAscension = Angle.from(it[1], true).takeIf(Angle::valid) ?: return@forEach + val declination = Angle.from(it[2]).takeIf(Angle::valid) ?: return@forEach + val (x, y) = wcs.worldToPixel(rightAscension, declination) + val minorPlanet = ImageAnnotationResponse.MinorPlanet(it[0], it[1], it[2], it[6]) + val annotation = ImageAnnotationResponse(x, y, minorPlanet = minorPlanet) + annotations.add(annotation) + } + } + }.also(tasks::add) + } if (stars) { - starRepository - .search(rightAscension = calibration.rightAscension, declination = calibration.declination, radius = calibration.radius) - .forEach { - val (x, y) = wcs.worldToPixel(it.rightAscension.rad, it.declination.rad) - val annotation = ImageAnnotationResponse(x, y, star = it) - annotations.add(annotation) - } + CompletableFuture.runAsync { + starRepository + .search(rightAscension = calibration.rightAscension, declination = calibration.declination, radius = calibration.radius) + .forEach { + val (x, y) = wcs.worldToPixel(it.rightAscension.rad, it.declination.rad) + val annotation = ImageAnnotationResponse(x, y, star = it) + annotations.add(annotation) + } + }.also(tasks::add) } if (dsos) { - deepSkyObjectRepository - .search(rightAscension = calibration.rightAscension, declination = calibration.declination, radius = calibration.radius) - .forEach { - val (x, y) = wcs.worldToPixel(it.rightAscension.rad, it.declination.rad) - val annotation = ImageAnnotationResponse(x, y, dso = it) - annotations.add(annotation) - } + CompletableFuture.runAsync { + deepSkyObjectRepository + .search(rightAscension = calibration.rightAscension, declination = calibration.declination, radius = calibration.radius) + .forEach { + val (x, y) = wcs.worldToPixel(it.rightAscension.rad, it.declination.rad) + val annotation = ImageAnnotationResponse(x, y, dso = it) + annotations.add(annotation) + } + }.also(tasks::add) } + CompletableFuture.allOf(*tasks.toTypedArray()).join() + return annotations } diff --git a/nebulosa-math/src/main/kotlin/nebulosa/math/Angle.kt b/nebulosa-math/src/main/kotlin/nebulosa/math/Angle.kt index 6e61e2794..1c501b21c 100644 --- a/nebulosa-math/src/main/kotlin/nebulosa/math/Angle.kt +++ b/nebulosa-math/src/main/kotlin/nebulosa/math/Angle.kt @@ -136,7 +136,7 @@ value class Angle(val value: Double) { @JvmStatic val NaN = Angle(Double.NaN) @JvmStatic private val PARSE_COORDINATES_NOT_NUMBER_REGEX = Regex("[^\\-\\d.]+") - @JvmStatic private val UNICODE_SIGN_MINUS_REGEX = Regex("[−]+") + @JvmStatic private val UNICODE_SIGN_MINUS_REGEX = Regex("−+") @JvmStatic fun from( diff --git a/nebulosa-math/src/main/kotlin/nebulosa/math/AngleFormatter.kt b/nebulosa-math/src/main/kotlin/nebulosa/math/AngleFormatter.kt index 1e782caa8..7f71c1668 100644 --- a/nebulosa-math/src/main/kotlin/nebulosa/math/AngleFormatter.kt +++ b/nebulosa-math/src/main/kotlin/nebulosa/math/AngleFormatter.kt @@ -16,6 +16,8 @@ class AngleFormatter private constructor( private val secondsDecimalPlaces: Int = 1, private val separators: List = emptyList(), private val locale: Locale = Locale.ROOT, + private val minusSign: String = "-", + private val plusSign: String = "+", ) { constructor(builder: Builder) : this( @@ -29,11 +31,13 @@ class AngleFormatter private constructor( builder.secondsDecimalPlaces, builder.separators.toList(), builder.locale, + builder.minusSign, + builder.plusSign, ) fun format(angle: Angle): String { val (a, b, c) = if (isHours) angle.hms() else angle.dms() - val sign = if (hasSign) if (a < 0) "-" else "+" else "" + val sign = if (hasSign) if (a < 0) minusSign else plusSign else "" val s0 = if (separators.isNotEmpty()) separators[0] else if (isHours) ":" else "" val s1 = if (separators.size > 1) separators[1] else if (!hasSeconds && s0.trim() == ":") "" else s0 val k = if (secondsDecimalPlaces == 0) 1 else 0 @@ -93,6 +97,8 @@ class AngleFormatter private constructor( internal var secondsDecimalPlaces = formatter?.secondsDecimalPlaces ?: 1 internal val separators = formatter?.separators?.toMutableList() ?: arrayListOf() internal var locale = formatter?.locale ?: Locale.ROOT + internal var minusSign = "-" + internal var plusSign = "+" constructor() : this(null) @@ -120,20 +126,30 @@ class AngleFormatter private constructor( fun locale(locale: Locale) = apply { this.locale = locale } + fun minusSign(sign: String) = apply { minusSign = sign } + + fun plusSign(sign: String) = apply { plusSign = sign } + fun build() = AngleFormatter(this) override fun equals(other: Any?): Boolean { if (this === other) return true - if (other !is Builder) return false + if (javaClass != other?.javaClass) return false + + other as Builder if (isHours != other.isHours) return false if (hoursFormat != other.hoursFormat) return false if (degreesFormat != other.degreesFormat) return false + if (minutesFormat != other.minutesFormat) return false + if (secondsFormat != other.secondsFormat) return false if (hasSign != other.hasSign) return false if (hasSeconds != other.hasSeconds) return false if (secondsDecimalPlaces != other.secondsDecimalPlaces) return false if (separators != other.separators) return false if (locale != other.locale) return false + if (minusSign != other.minusSign) return false + if (plusSign != other.plusSign) return false return true } @@ -142,11 +158,15 @@ class AngleFormatter private constructor( var result = isHours.hashCode() result = 31 * result + hoursFormat.hashCode() result = 31 * result + degreesFormat.hashCode() + result = 31 * result + minutesFormat.hashCode() + result = 31 * result + secondsFormat.hashCode() result = 31 * result + hasSign.hashCode() result = 31 * result + hasSeconds.hashCode() result = 31 * result + secondsDecimalPlaces result = 31 * result + separators.hashCode() result = 31 * result + (locale?.hashCode() ?: 0) + result = 31 * result + minusSign.hashCode() + result = 31 * result + plusSign.hashCode() return result } } diff --git a/nebulosa-sbd/build.gradle.kts b/nebulosa-sbd/build.gradle.kts index e1d0013e7..f481479bf 100644 --- a/nebulosa-sbd/build.gradle.kts +++ b/nebulosa-sbd/build.gradle.kts @@ -4,6 +4,7 @@ plugins { } dependencies { + api(project(":nebulosa-math")) api(project(":nebulosa-retrofit")) testImplementation(project(":nebulosa-test")) } diff --git a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabase.kt b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabase.kt new file mode 100644 index 000000000..cbb80b233 --- /dev/null +++ b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabase.kt @@ -0,0 +1,25 @@ +package nebulosa.sbd + +import retrofit2.Call +import retrofit2.http.GET +import retrofit2.http.Query + +internal interface SmallBodyDatabase { + + @GET( + "sbdb.api?alt-des=1&alt-orbits=1&ca-data=1" + + "&ca-time=both&ca-tunc=both&cd-epoch=1&cd-tp=1&discovery=1" + + "&full-prec=1&nv-fmt=both&orbit-defs=1&phys-par=1&r-notes=1" + + "&r-observer=1&radar-obs=1&sat=1&vi-data=1&www=1" + ) + fun search(@Query("sstr") text: String): Call + + @GET("sb_ident.api?mag-required=true&two-pass=true&suppress-first-pass=true") + fun identify( + @Query("obs-time") dateTime: String, + @Query("lat") lat: Double, @Query("lon") lon: Double, @Query("alt") alt: Double, + @Query("fov-ra-center") fovRA: String, @Query("fov-dec-center") fovDEC: String, + @Query("fov-ra-hwidth") fovRAWidth: Double, @Query("fov-dec-hwidth") fovDECWidth: Double, + @Query("vmag-lim") magLimit: Double, + ): Call +} diff --git a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookup.kt b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookup.kt deleted file mode 100644 index 47249b250..000000000 --- a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookup.kt +++ /dev/null @@ -1,20 +0,0 @@ -package nebulosa.sbd - -import retrofit2.Call -import retrofit2.http.GET -import retrofit2.http.Query - -internal interface SmallBodyDatabaseLookup { - - @GET(API_URL) - fun search(@Query("sstr") text: String): Call - - companion object { - - const val API_URL = - "sbdb.api?alt-des=1&alt-orbits=1&ca-data=1" + - "&ca-time=both&ca-tunc=both&cd-epoch=1&cd-tp=1&discovery=1" + - "&full-prec=1&nv-fmt=both&orbit-defs=1&phys-par=1&r-notes=1" + - "&r-observer=1&radar-obs=1&sat=1&vi-data=1&www=1" - } -} diff --git a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookupService.kt b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookupService.kt deleted file mode 100644 index 3580cd0d0..000000000 --- a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseLookupService.kt +++ /dev/null @@ -1,29 +0,0 @@ -package nebulosa.sbd - -import nebulosa.retrofit.RetrofitService -import okhttp3.OkHttpClient -import retrofit2.create - -class SmallBodyDatabaseLookupService( - url: String = "https://ssd-api.jpl.nasa.gov/", - okHttpClient: OkHttpClient? = null, -) : RetrofitService(url, okHttpClient) { - - private val service by lazy { retrofit.create() } - - override fun handleOkHttpClientBuilder(builder: OkHttpClient.Builder) { - builder.addInterceptor { - val response = it.proceed(it.request()) - - if (response.code == 300) { - response.newBuilder() - .code(200) - .build() - } else { - response - } - } - } - - fun search(text: String) = service.search(text) -} diff --git a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt new file mode 100644 index 000000000..c1c3df947 --- /dev/null +++ b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt @@ -0,0 +1,74 @@ +package nebulosa.sbd + +import nebulosa.math.Angle +import nebulosa.math.Angle.Companion.deg +import nebulosa.math.AngleFormatter +import nebulosa.math.Distance +import nebulosa.math.Distance.Companion.m +import nebulosa.retrofit.RetrofitService +import okhttp3.OkHttpClient +import retrofit2.Call +import retrofit2.create +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter + +class SmallBodyDatabaseService( + url: String = "https://ssd-api.jpl.nasa.gov/", + okHttpClient: OkHttpClient? = null, +) : RetrofitService(url, okHttpClient) { + + private val service by lazy { retrofit.create() } + + override fun handleOkHttpClientBuilder(builder: OkHttpClient.Builder) { + builder.addInterceptor { + val response = it.proceed(it.request()) + + if (response.code == 300) { + response.newBuilder() + .code(200) + .build() + } else { + response + } + } + } + + fun search(text: String) = service.search(text) + + fun identify( + dateTime: LocalDateTime, + latitude: Angle, longitude: Angle, elevation: Distance = 0.m, + centerRA: Angle, centerDEC: Angle, fov: Angle = 1.0.deg, + magLimit: Double = 12.0, + ): Call { + val fovDeg = fov.degrees / 2.0 + + return service.identify( + dateTime.format(DATE_TIME_FORMAT), + latitude.degrees, longitude.degrees, elevation.kilometers, + centerRA.format(RA_FORMAT), centerDEC.format(DEC_FORMAT), fovDeg, fovDeg, + magLimit, + ) + } + + companion object { + + @JvmStatic private val DATE_TIME_FORMAT = DateTimeFormatter.ofPattern("yyyy-MM-dd_HH:mm:ss") + + @JvmStatic private val RA_FORMAT = AngleFormatter.Builder() + .hours() + .separators("-") + .minusSign("M") + .plusSign("") + .secondsDecimalPlaces(2) + .build() + + @JvmStatic private val DEC_FORMAT = AngleFormatter.Builder() + .separators("-") + .degreesFormat("%02d") + .minusSign("M") + .plusSign("") + .secondsDecimalPlaces(2) + .build() + } +} diff --git a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt new file mode 100644 index 000000000..7558e820a --- /dev/null +++ b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt @@ -0,0 +1,10 @@ +package nebulosa.sbd + +import com.fasterxml.jackson.annotation.JsonAlias +import com.fasterxml.jackson.annotation.JsonProperty + +data class SmallBodyIdentified( + @JsonAlias("n_first_pass", "n_second_pass") @JsonProperty("count") val count: Int, + @JsonAlias("fields_first", "fields_second") @JsonProperty("fields") val fields: List, + @JsonAlias("data_first_pass", "data_second_pass") @JsonProperty("data") val data: List>, +) diff --git a/nebulosa-sbd/src/test/kotlin/SmallBodyDatabaseLookupServiceTest.kt b/nebulosa-sbd/src/test/kotlin/SmallBodyDatabaseLookupServiceTest.kt index fe955de0d..a6f583e4f 100644 --- a/nebulosa-sbd/src/test/kotlin/SmallBodyDatabaseLookupServiceTest.kt +++ b/nebulosa-sbd/src/test/kotlin/SmallBodyDatabaseLookupServiceTest.kt @@ -5,12 +5,12 @@ import io.kotest.matchers.ints.shouldBeGreaterThanOrEqual import io.kotest.matchers.nulls.shouldBeNull import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe -import nebulosa.sbd.SmallBodyDatabaseLookupService +import nebulosa.sbd.SmallBodyDatabaseService class SmallBodyDatabaseLookupServiceTest : StringSpec() { init { - val service = SmallBodyDatabaseLookupService() + val service = SmallBodyDatabaseService() "search matches single record" { val body = service.search("C/2017 K2").execute().body().shouldNotBeNull() diff --git a/nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt b/nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt new file mode 100644 index 000000000..f96b0493c --- /dev/null +++ b/nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt @@ -0,0 +1,26 @@ +import io.kotest.core.spec.style.StringSpec +import io.kotest.matchers.booleans.shouldBeTrue +import io.kotest.matchers.nulls.shouldNotBeNull +import nebulosa.math.Angle +import nebulosa.math.Angle.Companion.deg +import nebulosa.math.Distance.Companion.km +import nebulosa.sbd.SmallBodyDatabaseService +import java.time.LocalDateTime + +class SmallBodyIdentificationServiceTest : StringSpec() { + + init { + val service = SmallBodyDatabaseService() + + "search around Ceres" { + val data = service.identify( + LocalDateTime.of(2023, 8, 21, 0, 0, 0, 0), + // Observatorio do Pico dos Dias, Itajuba (observatory) [code: 874] + (-22.5354318).deg, (-45.5827).deg, 1.81754.km, + Angle.from("13 21 16.50", true), Angle.from("-01 57 06.5"), 1.0.deg, + ).execute().body() + + data.shouldNotBeNull().data.any { "Ceres" in it[0] }.shouldBeTrue() + } + } +} From 75a224a77bfc760be84da84c6c0358d3358b1856 Mon Sep 17 00:00:00 2001 From: tiagohm Date: Wed, 23 Aug 2023 21:58:33 -0300 Subject: [PATCH 10/12] [api][desktop]: Fix small body identify; Pass minor planet magnitude limit --- .../kotlin/nebulosa/api/configs/BeanConfig.kt | 8 ++++---- .../api/controllers/ImageController.kt | 3 ++- .../nebulosa/api/services/ImageService.kt | 8 ++++++++ desktop/src/app/image/image.component.html | 13 +++++++++++-- desktop/src/app/image/image.component.ts | 4 +++- desktop/src/shared/services/api.service.ts | 3 ++- .../nebulosa/retrofit/RetrofitService.kt | 13 +++++++++---- .../nebulosa/sbd/SmallBodyDatabaseService.kt | 2 +- .../nebulosa/sbd/SmallBodyIdentified.kt | 6 +++--- .../SmallBodyIdentificationServiceTest.kt | 19 ++++++++++++++++++- 10 files changed, 61 insertions(+), 18 deletions(-) diff --git a/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt b/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt index e70cfc298..c7b2e71fc 100644 --- a/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt +++ b/api/src/main/kotlin/nebulosa/api/configs/BeanConfig.kt @@ -65,10 +65,10 @@ class BeanConfig { .connectionPool(connectionPool) .cache(cache) .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BASIC)) - .readTimeout(30L, TimeUnit.SECONDS) - .writeTimeout(30L, TimeUnit.SECONDS) - .connectTimeout(30L, TimeUnit.SECONDS) - .callTimeout(30L, TimeUnit.SECONDS) + .readTimeout(60L, TimeUnit.SECONDS) + .writeTimeout(60L, TimeUnit.SECONDS) + .connectTimeout(60L, TimeUnit.SECONDS) + .callTimeout(60L, TimeUnit.SECONDS) .build() @Bean diff --git a/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt b/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt index cb768e119..13d108e3f 100644 --- a/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt +++ b/api/src/main/kotlin/nebulosa/api/controllers/ImageController.kt @@ -81,8 +81,9 @@ class ImageController( @RequestParam(required = false, defaultValue = "true") stars: Boolean, @RequestParam(required = false, defaultValue = "true") dsos: Boolean, @RequestParam(required = false, defaultValue = "false") minorPlanets: Boolean, + @RequestParam(required = false, defaultValue = "12.0") minorPlanetMagLimit: Double, ): List { - return imageService.annotations(ImageToken.of(path), stars, dsos, minorPlanets) + return imageService.annotations(ImageToken.of(path), stars, dsos, minorPlanets, minorPlanetMagLimit) } @PostMapping("solveImage") diff --git a/api/src/main/kotlin/nebulosa/api/services/ImageService.kt b/api/src/main/kotlin/nebulosa/api/services/ImageService.kt index 2ab0a074c..a87804e41 100644 --- a/api/src/main/kotlin/nebulosa/api/services/ImageService.kt +++ b/api/src/main/kotlin/nebulosa/api/services/ImageService.kt @@ -150,6 +150,7 @@ class ImageService( fun annotations( token: ImageToken, stars: Boolean, dsos: Boolean, minorPlanets: Boolean, + minorPlanetMagLimit: Double = 12.0, ): List { val calibration = calibrations[token] @@ -171,9 +172,11 @@ class ImageService( val data = smallBodyDatabaseService.identify( LocalDateTime.parse(dateTime), latitude, longitude, Distance.ZERO, calibration.rightAscension, calibration.declination, calibration.radius, + minorPlanetMagLimit, ).execute().body() ?: return@runAsync val radiusInSeconds = calibration.radius.arcsec + var count = 0 data.data.forEach { val distance = it[5].toDouble() @@ -185,8 +188,11 @@ class ImageService( val minorPlanet = ImageAnnotationResponse.MinorPlanet(it[0], it[1], it[2], it[6]) val annotation = ImageAnnotationResponse(x, y, minorPlanet = minorPlanet) annotations.add(annotation) + count++ } } + + LOG.info("Found {} minor planets", count) }.also(tasks::add) } @@ -194,6 +200,7 @@ class ImageService( CompletableFuture.runAsync { starRepository .search(rightAscension = calibration.rightAscension, declination = calibration.declination, radius = calibration.radius) + .also { LOG.info("Found {} stars", it.size) } .forEach { val (x, y) = wcs.worldToPixel(it.rightAscension.rad, it.declination.rad) val annotation = ImageAnnotationResponse(x, y, star = it) @@ -206,6 +213,7 @@ class ImageService( CompletableFuture.runAsync { deepSkyObjectRepository .search(rightAscension = calibration.rightAscension, declination = calibration.declination, radius = calibration.radius) + .also { LOG.info("Found {} DSOs", it.size) } .forEach { val (x, y) = wcs.worldToPixel(it.rightAscension.rad, it.declination.rad) val annotation = ImageAnnotationResponse(x, y, dso = it) diff --git a/desktop/src/app/image/image.component.html b/desktop/src/app/image/image.component.html index 4275b17c5..435cda4ed 100644 --- a/desktop/src/app/image/image.component.html +++ b/desktop/src/app/image/image.component.html @@ -24,12 +24,21 @@ - +
- + +
+ + + + + + +
diff --git a/desktop/src/app/image/image.component.ts b/desktop/src/app/image/image.component.ts index ca86598af..3db6edef6 100644 --- a/desktop/src/app/image/image.component.ts +++ b/desktop/src/app/image/image.component.ts @@ -56,6 +56,7 @@ export class ImageComponent implements AfterViewInit, OnDestroy { annotateWithStars = true annotateWithDSOs = true annotateWithMinorPlanets = false + annotateWithMinorPlanetsMagLimit = 12.0 autoStretch = true showStretchingDialog = false @@ -466,7 +467,8 @@ export class ImageComponent implements AfterViewInit, OnDestroy { async annotateImage() { try { this.annotating = true - this.annotations = await this.api.annotationsOfImage(this.imageParams.path!, this.annotateWithStars, this.annotateWithDSOs, this.annotateWithMinorPlanets) + this.annotations = await this.api.annotationsOfImage(this.imageParams.path!, + this.annotateWithStars, this.annotateWithDSOs, this.annotateWithMinorPlanets, this.annotateWithMinorPlanetsMagLimit) this.showAnnotationDialog = false } finally { this.annotating = false diff --git a/desktop/src/shared/services/api.service.ts b/desktop/src/shared/services/api.service.ts index c3ec1371f..e0e26abbb 100644 --- a/desktop/src/shared/services/api.service.ts +++ b/desktop/src/shared/services/api.service.ts @@ -449,8 +449,9 @@ export class ApiService { annotationsOfImage( path: string, stars: boolean = true, dsos: boolean = true, minorPlanets: boolean = false, + minorPlanetMagLimit: number = 12.0, ) { - return this.get(`annotationsOfImage?path=${path}&stars=${stars}&dsos=${dsos}&minorPlanets=${minorPlanets}`) + return this.get(`annotationsOfImage?path=${path}&stars=${stars}&dsos=${dsos}&minorPlanets=${minorPlanets}&minorPlanetMagLimit=${minorPlanetMagLimit}`) } solveImage( diff --git a/nebulosa-retrofit/src/main/kotlin/nebulosa/retrofit/RetrofitService.kt b/nebulosa-retrofit/src/main/kotlin/nebulosa/retrofit/RetrofitService.kt index 903a4f5ac..01861ef7f 100644 --- a/nebulosa-retrofit/src/main/kotlin/nebulosa/retrofit/RetrofitService.kt +++ b/nebulosa-retrofit/src/main/kotlin/nebulosa/retrofit/RetrofitService.kt @@ -14,24 +14,25 @@ import java.util.concurrent.TimeUnit abstract class RetrofitService( val url: String, private val okHttpClient: OkHttpClient? = null, + private val objectMapper: ObjectMapper? = null, ) { protected open val converterFactory = emptyList() protected open val callAdaptorFactory: CallAdapter.Factory? = null - protected open val mapper = ObjectMapper() - .setSerializationInclusion(JsonInclude.Include.NON_NULL) - .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)!! - protected open fun handleOkHttpClientBuilder(builder: OkHttpClient.Builder) = Unit + protected open fun handleObjectMapper(mapper: ObjectMapper) = Unit + protected open val retrofit by lazy { val builder = Retrofit.Builder() builder.baseUrl(url) builder.addConverterFactory(RawAsStringConverterFactory) builder.addConverterFactory(RawAsByteArrayConverterFactory) converterFactory.forEach { builder.addConverterFactory(it) } + val mapper = objectMapper ?: DEFAULT_MAPPER.copy() + handleObjectMapper(mapper) builder.addConverterFactory(JacksonConverterFactory.create(mapper)) callAdaptorFactory?.also(builder::addCallAdapterFactory) @@ -54,5 +55,9 @@ abstract class RetrofitService( .connectTimeout(60L, TimeUnit.SECONDS) .callTimeout(60L, TimeUnit.SECONDS) .build() + + @JvmStatic private val DEFAULT_MAPPER = ObjectMapper() + .setSerializationInclusion(JsonInclude.Include.NON_NULL) + .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES)!! } } diff --git a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt index c1c3df947..b5b89e2b0 100644 --- a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt +++ b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyDatabaseService.kt @@ -41,7 +41,7 @@ class SmallBodyDatabaseService( centerRA: Angle, centerDEC: Angle, fov: Angle = 1.0.deg, magLimit: Double = 12.0, ): Call { - val fovDeg = fov.degrees / 2.0 + val fovDeg = fov.degrees return service.identify( dateTime.format(DATE_TIME_FORMAT), diff --git a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt index 7558e820a..c540bdb4f 100644 --- a/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt +++ b/nebulosa-sbd/src/main/kotlin/nebulosa/sbd/SmallBodyIdentified.kt @@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonAlias import com.fasterxml.jackson.annotation.JsonProperty data class SmallBodyIdentified( - @JsonAlias("n_first_pass", "n_second_pass") @JsonProperty("count") val count: Int, - @JsonAlias("fields_first", "fields_second") @JsonProperty("fields") val fields: List, - @JsonAlias("data_first_pass", "data_second_pass") @JsonProperty("data") val data: List>, + @field:JsonAlias("n_first_pass", "n_second_pass") @field:JsonProperty("count") val count: Int = 0, + @field:JsonAlias("fields_first", "fields_second") @field:JsonProperty("fields") val fields: List = emptyList(), + @field:JsonAlias("data_first_pass", "data_second_pass") @field:JsonProperty("data") val data: List> = emptyList(), ) diff --git a/nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt b/nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt index f96b0493c..9e137c183 100644 --- a/nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt +++ b/nebulosa-sbd/src/test/kotlin/SmallBodyIdentificationServiceTest.kt @@ -1,5 +1,8 @@ import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.booleans.shouldBeTrue +import io.kotest.matchers.collections.shouldBeEmpty +import io.kotest.matchers.ints.shouldBeExactly +import io.kotest.matchers.ints.shouldBeGreaterThanOrEqual import io.kotest.matchers.nulls.shouldNotBeNull import nebulosa.math.Angle import nebulosa.math.Angle.Companion.deg @@ -20,7 +23,21 @@ class SmallBodyIdentificationServiceTest : StringSpec() { Angle.from("13 21 16.50", true), Angle.from("-01 57 06.5"), 1.0.deg, ).execute().body() - data.shouldNotBeNull().data.any { "Ceres" in it[0] }.shouldBeTrue() + data.shouldNotBeNull() + data.count shouldBeGreaterThanOrEqual 1 + data.data.any { "Ceres" in it[0] }.shouldBeTrue() + } + "no matching records" { + val data = service.identify( + LocalDateTime.of(2023, 1, 15, 1, 38, 15, 0), + // Observatorio do Pico dos Dias, Itajuba (observatory) [code: 874] + (-22.5354318).deg, (-45.5827).deg, 1.81754.km, + Angle.from("10 44 02", true), Angle.from("-59 36 04"), 1.0.deg, + ).execute().body() + + data.shouldNotBeNull() + data.count shouldBeExactly 0 + data.data.shouldBeEmpty() } } } From f99bf4e1cdc2aa50f92f1e3290eabf8f8090a9c0 Mon Sep 17 00:00:00 2001 From: tiagohm Date: Wed, 23 Aug 2023 22:10:15 -0300 Subject: [PATCH 11/12] [api]: Bump Kotlin from 1.9.0 to 1.9.10 --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index b974c75c9..8d8a090f6 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -5,8 +5,8 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile buildscript { dependencies { - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.0") - classpath("org.jetbrains.kotlin:kotlin-allopen:1.9.0") + classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10") + classpath("org.jetbrains.kotlin:kotlin-allopen:1.9.10") classpath("io.objectbox:objectbox-gradle-plugin:3.6.0") classpath("com.adarshr:gradle-test-logger-plugin:3.2.0") } From 189c4355ae0307196f3f4b3da4832e7b7ee53ae5 Mon Sep 17 00:00:00 2001 From: tiagohm Date: Wed, 23 Aug 2023 22:13:32 -0300 Subject: [PATCH 12/12] [api]: Upgrade Gradle wrapper --- gradle/wrapper/gradle-wrapper.jar | Bin 62076 -> 63721 bytes gradle/wrapper/gradle-wrapper.properties | 3 ++- gradlew | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index c1962a79e29d3e0ab67b14947c167a862655af9b..7f93135c49b765f8051ef9d0a6055ff8e46073d8 100644 GIT binary patch delta 37652 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 delta 36122 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 Ac-xW1# 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 Q>rd#Eb%7 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 17711f598..d11cdd907 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip -networkTimeout=30000 +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index aeb74cbb4..0adc8e1a5 100755 --- a/gradlew +++ b/gradlew @@ -83,7 +83,8 @@ done # This is normally unused # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can.