natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move parse string table logic to method

This commit is contained in:
Thomas Skjølberg 2025-12-19 23:31:49 +01:00
parent 0cc6f10fcf
commit 09fa797cb4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src.java/crosby/binary/BinaryParser.java
View File

@ -34,7 +34,7 @@ public abstract class BinaryParser implements BlockReaderAdapter {
private long lat_offset;
private long lon_offset;
protected int date_granularity;
private String[] strings;
protected String[] strings;
/** Take a Info protocol buffer containing a date and convert it into a java Date object */
protected Date getDate(Osmformat.Info info) {
@ -100,12 +100,7 @@ public abstract class BinaryParser implements BlockReaderAdapter {
/** Parse a Primitive block (containing a string table, other paramaters, and PrimitiveGroups */
public void parse(Osmformat.PrimitiveBlock block) {
Osmformat.StringTable stablemessage = block.getStringtable();
strings = new String[stablemessage.getSCount()];
for (int i = 0; i < strings.length; i++) {
strings[i] = stablemessage.getS(i).toStringUtf8();
}
strings = parseStringTable(block.getStringtable());
granularity = block.getGranularity();
lat_offset = block.getLatOffset();
@ -122,6 +117,15 @@ public abstract class BinaryParser implements BlockReaderAdapter {
parseDense(groupmessage.getDense());
}
}
protected String[] parseStringTable(Osmformat.StringTable stablemessage) {
String[] strings = new String[stablemessage.getSCount()];
for (int i = 0; i < strings.length; i++) {
strings[i] = stablemessage.getS(i).toStringUtf8();
}
return strings;
}
/** Parse a list of Relation protocol buffers and send the resulting relations to a sink. */
protected abstract void parseRelations(List<Osmformat.Relation> rels);