Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update proto file #4

Merged
merged 4 commits into from
Apr 29, 2021
Merged

Update proto file #4

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c1d9501
Update proto file
mmgeorge Apr 28, 2021
e27c4f0
Add back copyright
mmgeorge Apr 28, 2021
d60c027
Remove trailing whitespace
mmgeorge Apr 29, 2021
b17a111
Fix formatting
mmgeorge Apr 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 12 additions & 18 deletions proto/FeatureCollection/FeatureCollection.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

syntax = "proto3";
package esriPBuffer;
option java_package = "com.esri.arcgis.protobuf";
option optimize_for = LITE_RUNTIME;

message FeatureCollectionPBuffer {
Expand All @@ -23,6 +24,7 @@ message FeatureCollectionPBuffer {
esriGeometryTypePolyline = 2;
esriGeometryTypePolygon = 3;
esriGeometryTypeMultipatch = 4;
esriGeometryTypeNone = 127;
}

// FieldType
Expand Down Expand Up @@ -86,11 +88,11 @@ message FeatureCollectionPBuffer {
}

message Field {
string name = 1;
string name = 1;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You accidentally checked in some trailing whitespace here, and below around L144 + L175

FieldType fieldType = 2;
string alias = 3;
string alias = 3;
SQLType sqlType = 4;
string domain = 5;
string domain = 5;
string defaultValue = 6;
}

Expand All @@ -110,17 +112,15 @@ message FeatureCollectionPBuffer {
}

message Geometry {
GeometryType geometryType = 1;
repeated uint32 lengths = 2 [packed = true]; // coordinate structure in lengths
repeated sint32 coords = 3 [packed = true]; // delta-encoded integer values
repeated sint64 coords = 3 [packed = true]; // delta-encoded integer values
}

message esriShapeBuffer {
bytes bytes = 1;
bytes bytes = 1;
}

message Feature {
//repeated uint32 attributes = 1 [packed = true];
repeated Value attributes = 1;
oneof compressed_geometry {
Geometry geometry = 2;
Expand All @@ -129,13 +129,6 @@ message FeatureCollectionPBuffer {
Geometry centroid = 4;
}

message FeatureCollection {
uint32 featureAttributeCount = 1;
//repeated uint32 attributes = 2 [packed = true];
repeated Value attributes= 2;
repeated sint32 coords = 3 [packed = true]; // delta-encoded integer value
}

message UniqueIdField {
string name = 1;
bool isSystemMaintained = 2;
Expand All @@ -148,7 +141,7 @@ message FeatureCollectionPBuffer {
}

message ServerGens {
uint64 minServerGen = 1;
uint64 minServerGen = 1;
uint64 serverGen = 2;
}

Expand Down Expand Up @@ -179,7 +172,7 @@ message FeatureCollectionPBuffer {
string geohashFieldName = 4;
GeometryProperties geometryProperties = 5;
ServerGens serverGens = 6;
GeometryType geometryType = 7;
GeometryType geometryType = 7;
SpatialReference spatialReference = 8;
bool exceededTransferLimit = 9;
bool hasZ = 10;
Expand All @@ -188,7 +181,6 @@ message FeatureCollectionPBuffer {
repeated Field fields = 13;
repeated Value values = 14;
repeated Feature features = 15;
FeatureCollection featureCollection = 16;
}

message CountResult{
Expand All @@ -201,13 +193,15 @@ message FeatureCollectionPBuffer {
repeated uint64 objectIds = 3 [packed = true];
}

message QueryResult {
message QueryResult
{
oneof Results {
FeatureResult featureResult = 1;
CountResult countResult = 2;
ObjectIdsResult idsResult = 3;
}
}

// Any compliant implementation must first read the version
// number encoded in this message and choose the correct
// implementation for this version number before proceeding to
Expand Down