Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Updated protobuffer files to newest version.

Browse Source
This commit is contained in:
DennisOSRM 2012-05-15 16:43:52 +02:00
parent cbddbb598f
commit 2eb251bd7f
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
DataStructures/pbf-proto/fileformat.proto
View File

@ -1,20 +1,21 @@
/** Copyright (c) 2010 Scott A. Crosby. <scott@sacrosby.com> /** Copyright (c) 2010 Scott A. Crosby. <scott@sacrosby.com>
This program is free software: you can redistribute it and/or modify This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as it under the terms of the GNU Lesser General Public License as
published by the Free Software Foundation, either version 3 of the published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version. License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU Lesser General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
option optimize_for = LITE_RUNTIME;
option java_package = "crosby.binary"; option java_package = "crosby.binary";
package OSMPBF; package OSMPBF;
@ -22,7 +23,7 @@ package OSMPBF;
// //
// STORAGE LAYER: Storing primitives. // STORAGE LAYER: Storing primitives.
// //
message Blob { message Blob {
@ -49,5 +50,3 @@ message BlobHeader {
optional bytes indexdata = 2; optional bytes indexdata = 2;
required int32 datasize = 3; required int32 datasize = 3;
} }

26
DataStructures/pbf-proto/osmformat.proto
View File

@ -8,13 +8,14 @@
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU Lesser General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
option optimize_for = LITE_RUNTIME;
option java_package = "crosby.binary"; option java_package = "crosby.binary";
package OSMPBF; package OSMPBF;
@ -125,6 +126,16 @@ message Info {
optional int64 changeset = 3; optional int64 changeset = 3;
optional int32 uid = 4; optional int32 uid = 4;
optional uint32 user_sid = 5; // String IDs optional uint32 user_sid = 5; // String IDs
// The visible flag is used to store history information. It indicates that
// the current object version has been created by a delete operation on the
// OSM API.
// When a writer sets this flag, it MUST add a required_features tag with
// value "HistoricalInformation" to the HeaderBlock.
// If this flag is not available for some object it MUST be assumed to be
// true if the file has the required_features tag "HistoricalInformation"
// set.
optional bool visible = 6;
} }
/** Optional metadata that may be included into each primitive. Special dense format used in DenseNodes. */ /** Optional metadata that may be included into each primitive. Special dense format used in DenseNodes. */
@ -134,6 +145,16 @@ message DenseInfo {
repeated sint64 changeset = 3 [packed = true]; // DELTA coded repeated sint64 changeset = 3 [packed = true]; // DELTA coded
repeated sint32 uid = 4 [packed = true]; // DELTA coded repeated sint32 uid = 4 [packed = true]; // DELTA coded
repeated sint32 user_sid = 5 [packed = true]; // String IDs for usernames. DELTA coded repeated sint32 user_sid = 5 [packed = true]; // String IDs for usernames. DELTA coded
// The visible flag is used to store history information. It indicates that
// the current object version has been created by a delete operation on the
// OSM API.
// When a writer sets this flag, it MUST add a required_features tag with
// value "HistoricalInformation" to the HeaderBlock.
// If this flag is not available for some object it MUST be assumed to be
// true if the file has the required_features tag "HistoricalInformation"
// set.
repeated bool visible = 6 [packed = true];
} }
@ -223,4 +244,3 @@ message Relation {
repeated sint64 memids = 9 [packed = true]; // DELTA encoded repeated sint64 memids = 9 [packed = true]; // DELTA encoded
repeated MemberType types = 10 [packed = true]; repeated MemberType types = 10 [packed = true];
} }