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

Revert "Excise references to now-obsolete Nodes" 

This reverts commit a625c34e7d.
This commit is contained in:
Scott Crosby 2010-08-30 08:30:13 -05:00
parent a625c34e7d
commit f933cf162e
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,7 @@ public abstract class BinaryParser implements BlockReaderAdapter {
for (Osmformat.PrimitiveGroup groupmessage : block
.getPrimitivegroupList()) {
// Exactly one of these should trigger on each loop.
parseNodes(groupmessage.getNodesList());
parseWays(groupmessage.getWaysList());
parseRelations(groupmessage.getRelationsList());
if (groupmessage.hasDense())
@ -107,6 +108,7 @@ public abstract class BinaryParser implements BlockReaderAdapter {
protected abstract void parseRelations(List<Osmformat.Relation> rels);
protected abstract void parseDense(Osmformat.DenseNodes nodes);
protected abstract void parseNodes(List<Osmformat.Node> nodes);
protected abstract void parseWays(List<Osmformat.Way> ways);
protected abstract void parse(Osmformat.HeaderBlock header);

14
src/osmformat.proto
View File

@ -107,6 +107,7 @@ message PrimitiveBlock {
// Group of OSMPrimitives. All primitives in a group must be the same type.
message PrimitiveGroup {
repeated Node nodes = 1;
optional DenseNodes dense = 2;
repeated Way ways = 3;
repeated Relation relations = 4;
@ -148,6 +149,19 @@ message ChangeSet {
optional HeaderBBox bbox = 11;
}
message Node {
required sint64 id = 1;
// Parallel arrays.
repeated uint32 keys = 2 [packed = true]; // String IDs.
repeated uint32 vals = 3 [packed = true]; // String IDs.
optional Info info = 4;
required sint64 lat = 8;
required sint64 lon = 9;
}
/* Used to densly represent a sequence of nodes that do not have any tags.
We represent these nodes columnwise as five columns: ID's, lats, and