Skip to content

Added missing approach settlement fields. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jakaarl wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Added missing approach settlement fields. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d788802
Added missing approach settlement fields.
jakaarl Oct 21, 2023
96a62ea
Added StationAllegiance to approachsettlement.
jakaarl Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

group = 'io.edpn.backend'
version = '0.0.4-SNAPSHOT'
version = '0.0.5-SNAPSHOT'
compileJava.options.encoding = 'UTF-8'

repositories {
Expand Down
10 changes: 8 additions & 2 deletions ...a/io/edpn/backend/messageprocessorlib/application/dto/eddn/ApproachSettlementMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public LocalDateTime messageTimeStamp() {

public record Payload(
@JsonProperty("SystemAddress") long systemAddress,
@JsonProperty("StarSystem")String starSystem,
@JsonProperty("StarSystem") String starSystem,
@JsonProperty("StarPos") double[] starPos,
@JsonProperty("MarketID") long marketId,
@JsonProperty("horizons") boolean horizons,
Expand All @@ -31,7 +31,13 @@ public record Payload(
@JsonProperty("Name") String name,
@JsonProperty("Latitude") long latitude,
@JsonProperty("Longitude") long longitude,
@JsonProperty("timestamp") String timestamp
@JsonProperty("timestamp") String timestamp,
@JsonProperty("StationGovernment") String stationGovernment,
@JsonProperty("StationAllegiance") String stationAllegiance,
@JsonProperty("StationEconomies") Economy[] stationEconomies,
@JsonProperty("StationFaction") Faction stationFaction,
@JsonProperty("StationServices") String[] stationServices,
@JsonProperty("StationEconomy") String stationEconomy
) implements EddnMessage.Payload {

@JsonProperty(value = "event", access = JsonProperty.Access.READ_ONLY)
Expand Down
5 changes: 1 addition & 4 deletions src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/CommodityMessage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ public record Commodity(
@JsonProperty("statusFlags") String[] statusFlags
) {}

record Economy(
@JsonProperty("name") String name,
@JsonProperty("proportion") double proportion
) {}
}

}
8 changes: 8 additions & 0 deletions src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Economy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package io.edpn.backend.messageprocessorlib.application.dto.eddn;

import com.fasterxml.jackson.annotation.JsonProperty;

public record Economy(
@JsonProperty("name") String name,
@JsonProperty("proportion") double proportion
) {}
7 changes: 7 additions & 0 deletions src/main/java/io/edpn/backend/messageprocessorlib/application/dto/eddn/Faction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package io.edpn.backend.messageprocessorlib.application.dto.eddn;

import com.fasterxml.jackson.annotation.JsonProperty;

public record Faction(
@JsonProperty("Name") String name
) {}