diff --git a/parser/pbf/internal/osmpbf/fileformat.proto b/parser/pbf/internal/osmpbf/fileformat.proto index d5c4290..28d53ad 100644 --- a/parser/pbf/internal/osmpbf/fileformat.proto +++ b/parser/pbf/internal/osmpbf/fileformat.proto @@ -1,28 +1,7 @@ -/** Copyright (c) 2010 Scott A. Crosby. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - -*/ - syntax = "proto2"; -option optimize_for = LITE_RUNTIME; -option java_package = "crosby.binary"; + package osmpbf; -//protoc --java_out=../.. fileformat.proto - - // // STORAGE LAYER: Storing primitives. // diff --git a/parser/pbf/internal/osmpbf/osmformat.proto b/parser/pbf/internal/osmpbf/osmformat.proto index 981182b..789365a 100644 --- a/parser/pbf/internal/osmpbf/osmformat.proto +++ b/parser/pbf/internal/osmpbf/osmformat.proto @@ -1,26 +1,9 @@ -/** Copyright (c) 2010 Scott A. Crosby. - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program. If not, see . - -*/ - syntax = "proto2"; -option optimize_for = LITE_RUNTIME; -option java_package = "crosby.binary"; + package osmpbf; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; + /* OSM Binary file format This is the master schema file of the OSM binary file format. This @@ -106,12 +89,8 @@ message PrimitiveBlock { optional int64 lat_offset = 19 [default=0]; optional int64 lon_offset = 20 [default=0]; -// Granularity of dates, normally represented in units of milliseconds since the 1970 epoch. + // Granularity of dates, normally represented in units of milliseconds since the 1970 epoch. optional int32 date_granularity = 18 [default=1000]; - - - // Proposed extension: - //optional BBox bbox = XX; } // Group of OSMPrimitives. All primitives in a group must be the same type.