Skip to content

Commit 7970ef4

Browse files
committed
Update VMS data structures to datex II v3
1 parent 30c849f commit 7970ef4

27 files changed

Lines changed: 525 additions & 555 deletions

verkeersdrukte/src/main/java/nl/bertriksikken/datex2/VmsPublication.java

Lines changed: 0 additions & 54 deletions
This file was deleted.

verkeersdrukte/src/main/java/nl/bertriksikken/datex2/VmsTablePublication.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

verkeersdrukte/src/main/java/nl/bertriksikken/datex2/VmsUnit.java

Lines changed: 0 additions & 120 deletions
This file was deleted.

verkeersdrukte/src/main/java/nl/bertriksikken/datex2/VmsUnitRecord.java

Lines changed: 0 additions & 89 deletions
This file was deleted.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package nl.bertriksikken.datex2v3;
2+
3+
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
4+
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
5+
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlText;
6+
7+
import java.util.ArrayList;
8+
import java.util.List;
9+
10+
public final class MultilingualString {
11+
12+
@JacksonXmlElementWrapper(localName = "com:values")
13+
@JacksonXmlProperty(localName = "com:value")
14+
List<MultilingualStringValue> values = new ArrayList<>();
15+
16+
// no-arg constructor for jackson
17+
private MultilingualString() {
18+
}
19+
20+
@Override
21+
public String toString() {
22+
return values.getFirst().value();
23+
}
24+
25+
public MultilingualString(String language, String text) {
26+
values.add(new MultilingualStringValue(language, text));
27+
}
28+
29+
public List<MultilingualStringValue> values() {
30+
return List.copyOf(values);
31+
}
32+
33+
public static final class MultilingualStringValue {
34+
@JacksonXmlProperty(localName = "lang", isAttribute = true)
35+
@SuppressWarnings("UnusedVariable")
36+
private final String language;
37+
@JacksonXmlText
38+
private final String value;
39+
40+
// no-arg jackson constructor
41+
private MultilingualStringValue() {
42+
this("", "");
43+
}
44+
45+
private MultilingualStringValue(String language, String value) {
46+
this.language = language;
47+
this.value = value;
48+
}
49+
50+
public String value() {
51+
return value;
52+
}
53+
}
54+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package nl.bertriksikken.datex2v3;
2+
3+
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
4+
5+
public record PointCoordinates(@JacksonXmlProperty(localName = "loc:latitude") double latitude,
6+
@JacksonXmlProperty(localName = "loc:longitude") double longitude) {
7+
}

0 commit comments

Comments
 (0)