Skip to content

Dev1.2.2 #115

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

Merged
merged 6 commits into from
May 20, 2016
Merged

Dev1.2.2 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28c9a68
added support for GeoJSON to geometry collections
estoianovici May 17, 2015
2da35cb
Merge pull request #87 from estoianovici/master
stolstov May 19, 2015
ca64269
Merge branch 'master' into dev1.2.2
stolstov Jan 7, 2016
d9a9a3c
Update MultiVertexGeometryImpl.java
stolstov Mar 10, 2016
d08e90c
buffer fix, geojson reqrite, more public methods
stolstov May 4, 2016
0f0b226
Merge branch 'dev1.2.2' of https://github.com/Esri/geometry-api-java …
stolstov May 4, 2016
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,4 @@ Icon?
ehthumbs.db
Thumbs.db
target/*
/bin/
20 changes: 10 additions & 10 deletions src/main/java/com/esri/core/geometry/AttributeStreamOfDbl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public AttributeStreamOfDbl(AttributeStreamOfDbl other, int maxSize) {

/**
* Reads a value from the buffer at given offset.
*
*
* @param offset
* is the element number in the stream.
*/
Expand All @@ -103,7 +103,7 @@ public double get(int offset) {

/**
* Overwrites given element with new value.
*
*
* @param offset
* is the element number in the stream.
* @param value
Expand All @@ -125,7 +125,7 @@ public void set(int offset, double value) {

/**
* Reads a value from the buffer at given offset.
*
*
* @param offset
* is the element number in the stream.
*/
Expand All @@ -136,7 +136,7 @@ public void read(int offset, Point2D outPoint) {

/**
* Overwrites given element with new value.
*
*
* @param offset
* is the element number in the stream.
* @param value
Expand Down Expand Up @@ -213,7 +213,7 @@ public void resize(int newSize) {

if (newSize <= m_size) {
if ((newSize * 5) / 4 < m_buffer.length) {// decrease when the 25%
// margin is exceeded
// margin is exceeded
double[] newBuffer = new double[newSize];
System.arraycopy(m_buffer, 0, newBuffer, 0, newSize);
m_buffer = newBuffer;
Expand Down Expand Up @@ -251,7 +251,7 @@ public void resize(int newSize, double defaultValue) {
"invalid call. Attribute Stream is locked and cannot be resized.");
if (newSize <= m_size) {
if ((newSize * 5) / 4 < m_buffer.length) {// decrease when the 25%
// margin is exceeded
// margin is exceeded
double[] newBuffer = new double[newSize];
System.arraycopy(m_buffer, 0, newBuffer, 0, newSize);
m_buffer = newBuffer;
Expand Down Expand Up @@ -579,8 +579,8 @@ public void eraseRange(int index, int count, int validSize) {
throw new GeometryException("invalid_call");

if (validSize - (index + count) > 0) {
System.arraycopy(m_buffer, index + count, m_buffer, index, validSize
- (index + count));
System.arraycopy(m_buffer, index + count, m_buffer, index,
validSize - (index + count));
}
m_size -= count;
}
Expand Down Expand Up @@ -656,8 +656,8 @@ public void writeRange(int startElement, int count,
throw new IllegalArgumentException();

AttributeStreamOfDbl src = (AttributeStreamOfDbl) _src; // the input
// type must
// match
// type must
// match

if (src.size() < (int) (srcStart + count))
throw new IllegalArgumentException();
Expand Down
Loading