Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
tiagohm committed Aug 10, 2024
2 parents 9914555 + 78a0b08 commit a579e15
Show file tree
Hide file tree
Showing 471 changed files with 30,083 additions and 21,014 deletions.
3 changes: 3 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ updates:
apache:
patterns:
- "org.apache*"
junit:
patterns:
- "org.junit*"

- package-ecosystem: "npm"
directory: "/desktop"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/angular.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Set up Node
uses: actions/setup-node@v4
with:
node-version: 22
node-version: 20

- name: Install Dependencies
run: npm i
Expand Down
6 changes: 3 additions & 3 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar

plugins {
kotlin("jvm")
id("org.springframework.boot") version "3.3.0"
id("io.spring.dependency-management") version "1.1.5"
id("org.springframework.boot") version "3.3.2"
id("io.spring.dependency-management") version "1.1.6"
kotlin("plugin.spring")
kotlin("kapt")
id("io.objectbox")
Expand Down Expand Up @@ -48,7 +48,7 @@ dependencies {
implementation("org.springframework.boot:spring-boot-starter-undertow")
implementation("org.jetbrains.kotlin:kotlin-reflect")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
kapt("org.springframework:spring-context-indexer:6.1.8")
kapt("org.springframework:spring-context-indexer:6.1.11")
testImplementation(project(":nebulosa-astrobin-api"))
testImplementation(project(":nebulosa-skycatalog-stellarium"))
testImplementation(project(":nebulosa-test"))
Expand Down
92 changes: 46 additions & 46 deletions api/schemas/objectbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,210 +4,210 @@
"_note3": "If you have VCS merge conflicts, you must resolve them according to ObjectBox docs.",
"entities": [
{
"id": "1:4508028933515523414",
"lastPropertyId": "13:5569629325911720184",
"id": "1:3544801173480775772",
"lastPropertyId": "13:3755368355153819967",
"name": "CalibrationFrameEntity",
"properties": [
{
"id": "1:279471804400581871",
"id": "1:6440158350156700816",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:9048727858630632737",
"id": "2:7830549305901803879",
"name": "type",
"indexId": "1:3018423918314968566",
"indexId": "1:3705837194399110688",
"type": 5,
"flags": 8
},
{
"id": "3:5712791023807889534",
"name": "name",
"indexId": "2:8432810603549739468",
"id": "3:8490362500884478696",
"name": "group",
"indexId": "2:2460719507268221169",
"type": 9,
"flags": 2048
},
{
"id": "4:3434117744352502900",
"id": "4:169758157435742191",
"name": "filter",
"type": 9
},
{
"id": "5:1871034143652415809",
"id": "5:5772177826523179837",
"name": "exposureTime",
"type": 6
},
{
"id": "6:8846123268014704509",
"id": "6:979735190507089416",
"name": "temperature",
"type": 8
},
{
"id": "7:8561154143050278063",
"id": "7:1567591787936780727",
"name": "width",
"type": 5
},
{
"id": "8:6920579444153489022",
"id": "8:804894592407875320",
"name": "height",
"type": 5
},
{
"id": "9:4300769060778976734",
"id": "9:7150567366206966047",
"name": "binX",
"type": 5
},
{
"id": "10:4693474237106002327",
"id": "10:6904147472104067341",
"name": "binY",
"type": 5
},
{
"id": "11:8369728096653684761",
"id": "11:5805422636156073861",
"name": "gain",
"type": 8
},
{
"id": "12:617052828938607363",
"id": "12:3861144650886065321",
"name": "path",
"type": 9
},
{
"id": "13:5569629325911720184",
"id": "13:3755368355153819967",
"name": "enabled",
"type": 1
}
],
"relations": []
},
{
"id": "2:4800249862026080527",
"lastPropertyId": "3:211299529025119304",
"id": "2:5695036645028998704",
"lastPropertyId": "3:5935807626551879093",
"name": "PreferenceEntity",
"properties": [
{
"id": "1:3593540058272630983",
"id": "1:1241938942467328378",
"name": "id",
"type": 6,
"flags": 1
},
{
"id": "2:2699303611424729430",
"id": "2:5066364999797986961",
"name": "key",
"indexId": "3:2030544424571300028",
"indexId": "3:361394127200064680",
"type": 9,
"flags": 34848
},
{
"id": "3:211299529025119304",
"id": "3:5935807626551879093",
"name": "value",
"type": 9
}
],
"relations": []
},
{
"id": "3:9190695617085753667",
"lastPropertyId": "4:411434182698925224",
"id": "3:13725857459345728",
"lastPropertyId": "4:8575761112465612996",
"name": "SatelliteEntity",
"properties": [
{
"id": "1:7748265871438465999",
"id": "1:7008444193321057279",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:2980713713220488130",
"id": "2:7254931361809919912",
"name": "name",
"type": 9
},
{
"id": "3:8036745814034214740",
"id": "3:7655077553453802998",
"name": "tle",
"type": 9
},
{
"id": "4:411434182698925224",
"id": "4:8575761112465612996",
"name": "groups",
"type": 30
}
],
"relations": []
},
{
"id": "4:6299583728620001761",
"lastPropertyId": "12:4179508964623201115",
"id": "4:2355261488865870711",
"lastPropertyId": "12:8881688937650635468",
"name": "SimbadEntity",
"properties": [
{
"id": "1:7284883107181783588",
"id": "1:8754753767317947963",
"name": "id",
"type": 6,
"flags": 129
},
{
"id": "2:1059978401562504177",
"id": "2:875189598014282513",
"name": "name",
"type": 9
},
{
"id": "3:2238737597611607433",
"id": "3:1840539013499888018",
"name": "type",
"type": 5
},
{
"id": "4:6034348124979703831",
"id": "4:8380920369067256416",
"name": "rightAscensionJ2000",
"type": 8
},
{
"id": "5:6603670815168137185",
"id": "5:4114744755808135895",
"name": "declinationJ2000",
"type": 8
},
{
"id": "6:4798847469480514750",
"id": "6:5877086147655445788",
"name": "magnitude",
"type": 8
},
{
"id": "7:4280564484498302769",
"id": "7:4614518058111040649",
"name": "pmRA",
"type": 8
},
{
"id": "8:1070997648386390650",
"id": "8:5619165542749552220",
"name": "pmDEC",
"type": 8
},
{
"id": "9:7408560810497672822",
"id": "9:8196290885692683478",
"name": "parallax",
"type": 8
},
{
"id": "10:7464931444484734827",
"id": "10:2681231197677728845",
"name": "radialVelocity",
"type": 8
},
{
"id": "11:531497562996887037",
"id": "11:2414643968839286765",
"name": "redshift",
"type": 8
},
{
"id": "12:4179508964623201115",
"id": "12:8881688937650635468",
"name": "constellation",
"type": 5
}
],
"relations": []
}
],
"lastEntityId": "4:6299583728620001761",
"lastIndexId": "3:2030544424571300028",
"lastEntityId": "4:2355261488865870711",
"lastIndexId": "3:361394127200064680",
"lastRelationId": "0:0",
"lastSequenceId": "0:0",
"modelVersion": 5,
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/kotlin/nebulosa/api/Main.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package nebulosa.api

import com.sun.jna.Platform
import nebulosa.time.SystemClock
import org.springframework.boot.runApplication
import java.nio.file.Path
import java.time.LocalDate
Expand All @@ -26,7 +27,7 @@ fun initAppDirectory(): Path {

private fun Path.clearLogIfPastDays(days: Long = 7L) {
if (exists()) {
val pastDays = LocalDate.now().minusDays(days)
val pastDays = LocalDate.now(SystemClock).minusDays(days)

for (entry in listDirectoryEntries("nebulosa-*.log")) {
val logDate = entry.fileName.toString()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import nebulosa.api.cameras.CameraStartCaptureRequest
import nebulosa.guiding.GuideDirection

data class DARVStartRequest(
val capture: CameraStartCaptureRequest = CameraStartCaptureRequest.EMPTY,
val direction: GuideDirection = GuideDirection.NORTH,
val reversed: Boolean = false,
@JvmField val capture: CameraStartCaptureRequest = CameraStartCaptureRequest.EMPTY,
@JvmField val direction: GuideDirection = GuideDirection.NORTH,
@JvmField val reversed: Boolean = false,
)
26 changes: 13 additions & 13 deletions api/src/main/kotlin/nebulosa/api/atlas/BodyPosition.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ import nebulosa.nova.astrometry.Constellation
import nebulosa.skycatalog.SkyObject

data class BodyPosition(
@field:JsonSerialize(using = RightAscensionSerializer::class) val rightAscensionJ2000: Angle,
@field:JsonSerialize(using = DeclinationSerializer::class) val declinationJ2000: Angle,
@field:JsonSerialize(using = RightAscensionSerializer::class) val rightAscension: Angle,
@field:JsonSerialize(using = DeclinationSerializer::class) val declination: Angle,
@field:JsonSerialize(using = AzimuthSerializer::class) val azimuth: Angle,
@field:JsonSerialize(using = DeclinationSerializer::class) val altitude: Angle,
val magnitude: Double,
val constellation: Constellation,
val distance: Double,
val distanceUnit: String,
val illuminated: Double,
@field:JsonSerialize(using = DegreesSerializer::class) val elongation: Angle,
val leading: Boolean, // true = rises and sets BEFORE Sun.
@field:JsonSerialize(using = RightAscensionSerializer::class) @JvmField val rightAscensionJ2000: Angle,
@field:JsonSerialize(using = DeclinationSerializer::class) @JvmField val declinationJ2000: Angle,
@field:JsonSerialize(using = RightAscensionSerializer::class) @JvmField val rightAscension: Angle,
@field:JsonSerialize(using = DeclinationSerializer::class) @JvmField val declination: Angle,
@field:JsonSerialize(using = AzimuthSerializer::class) @JvmField val azimuth: Angle,
@field:JsonSerialize(using = DeclinationSerializer::class) @JvmField val altitude: Angle,
@JvmField val magnitude: Double,
@JvmField val constellation: Constellation,
@JvmField val distance: Double,
@JvmField val distanceUnit: String,
@JvmField val illuminated: Double,
@field:JsonSerialize(using = DegreesSerializer::class) @JvmField val elongation: Angle,
@JvmField val leading: Boolean, // true = rises and sets BEFORE Sun.
) {

companion object {
Expand Down
10 changes: 5 additions & 5 deletions api/src/main/kotlin/nebulosa/api/atlas/CloseApproach.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import java.time.format.DateTimeFormatter
import java.util.*

data class CloseApproach(
val name: String = "",
val designation: String = "",
val dateTime: Long = 0,
val distance: Double = 0.0,
val absoluteMagnitude: Double = 0.0,
@JvmField val name: String = "",
@JvmField val designation: String = "",
@JvmField val dateTime: Long = 0,
@JvmField val distance: Double = 0.0,
@JvmField val absoluteMagnitude: Double = 0.0,
) {

companion object {
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/kotlin/nebulosa/api/atlas/Location.kt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ data class Location(
@field:JsonSerialize(using = DegreesSerializer::class) @field:JsonDeserialize(using = DegreesDeserializer::class) override val latitude: Angle = 0.0,
@field:JsonSerialize(using = DegreesSerializer::class) @field:JsonDeserialize(using = DegreesDeserializer::class) override val longitude: Angle = 0.0,
@field:JsonSerialize(using = MetersSerializer::class) @field:JsonDeserialize(using = MetersDeserializer::class) override val elevation: Distance = 0.0,
val offsetInMinutes: Int = 0,
@JvmField val offsetInMinutes: Int = 0,
) : GeographicCoordinate, TimeZonedInSeconds {

override val offsetInSeconds = offsetInMinutes * 60
Expand Down
Loading

0 comments on commit a579e15

Please sign in to comment.