xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

consistent formatting

Browse Source
This commit is contained in:
Hannes Janetzek
2013-09-23 17:59:51 +02:00
parent 57dfd91378
commit c720cf22aa
188 changed files with 4745 additions and 4470 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
vtm-extras/src/org/oscim/utils/wkb/Geometry.java
View File

@@ -75,14 +75,14 @@ abstract class Geometry implements Serializable {
static final int GEOMETRYCOLLECTION = 7;
static final String[] ALLTYPES = new String[] {
"", // internally used LinearRing does not have any text in front of
// it
"POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING",
"MULTIPOLYGON", "GEOMETRYCOLLECTION" };
"", // internally used LinearRing does not have any text in front of
// it
"POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING",
"MULTIPOLYGON", "GEOMETRYCOLLECTION" };
/**
* The Text representations of the geometry types
*
*
* @param type
* ...
* @return ...
@@ -125,7 +125,7 @@ abstract class Geometry implements Serializable {
/**
* Parse a SRID value, anything <= 0 is unknown
*
*
* @param srid
* ...
* @return ...
@@ -140,7 +140,7 @@ abstract class Geometry implements Serializable {
/**
* Constructor for subclasses
*
*
* @param type
* has to be given by all subclasses.
*/
@@ -162,30 +162,30 @@ abstract class Geometry implements Serializable {
@Override
public boolean equals(Object other) {
return (other != null) && (other instanceof Geometry)
&& equals((Geometry) other);
&& equals((Geometry) other);
}
/**
* geometry specific equals implementation - only defined for non-null
* values
*
*
* @param other
* ...
* @return ...
*/
public boolean equals(Geometry other) {
return (other != null) && (this.dimension == other.dimension)
&& (this.type == other.type) && (this.srid == other.srid)
&& (this.haveMeasure == other.haveMeasure)
&& other.getClass().equals(this.getClass())
&& this.equalsintern(other);
&& (this.type == other.type) && (this.srid == other.srid)
&& (this.haveMeasure == other.haveMeasure)
&& other.getClass().equals(this.getClass())
&& this.equalsintern(other);
}
/**
* Whether test coordinates for geometry - subclass specific code
* Implementors can assume that dimensin, type, srid
* and haveMeasure are equal, other != null and other is the same subclass.
*
*
* @param other
* ...
* @return ...
@@ -194,14 +194,14 @@ abstract class Geometry implements Serializable {
/**
* Return the number of Points of the geometry
*
*
* @return ...
*/
abstract int numPoints();
/**
* Get the nth Point of the geometry
*
*
* @param n
* the index of the point, from 0 to numPoints()-1;
* @throws ArrayIndexOutOfBoundsException
@@ -222,7 +222,7 @@ abstract class Geometry implements Serializable {
/**
* The OGIS geometry type number of this geometry.
*
*
* @return ...
*/
int getType() {
@@ -231,7 +231,7 @@ abstract class Geometry implements Serializable {
/**
* Return the Type as String
*
*
* @return ...
*/
String getTypeString() {
@@ -240,7 +240,7 @@ abstract class Geometry implements Serializable {
/**
* Returns whether we have a measure
*
*
* @return ....
*/
boolean isMeasured() {
@@ -251,7 +251,7 @@ abstract class Geometry implements Serializable {
* Queries the number of geometric dimensions of this geometry. This does
* not include measures, as opposed to the
* server.
*
*
* @return The dimensionality (eg, 2D or 3D) of this geometry.
*/
int getDimension() {
@@ -260,7 +260,7 @@ abstract class Geometry implements Serializable {
/**
* The OGIS geometry type number of this geometry.
*
*
* @return ...
*/
int getSrid() {
@@ -270,7 +270,7 @@ abstract class Geometry implements Serializable {
/**
* Recursively sets the srid on this geometry and all contained
* subgeometries
*
*
* @param srid
* ...
*/
@@ -293,7 +293,7 @@ abstract class Geometry implements Serializable {
/**
* Render the WKT version of this Geometry (without SRID) into the given
* StringBuffer.
*
*
* @param sb
* ...
* @param putM
@@ -314,7 +314,7 @@ abstract class Geometry implements Serializable {
/**
* Render the WKT without the type name, but including the brackets into the
* StringBuffer
*
*
* @param sb
* ...
*/
@@ -327,7 +327,7 @@ abstract class Geometry implements Serializable {
/**
* Render the "inner" part of the WKT (inside the brackets) into the
* StringBuffer.
*
*
* @param SB
* ...
*/
@@ -335,7 +335,7 @@ abstract class Geometry implements Serializable {
/**
* backwards compatibility method
*
*
* @return ...
*/
String getValue() {
@@ -354,7 +354,7 @@ abstract class Geometry implements Serializable {
* NULL or inconsistent subgeometries. BinaryParser and WKTParser should
* only generate consistent geometries.
* BinaryWriter may produce invalid results on inconsistent geometries.
*
*
* @return true if all checks are passed.
*/
boolean checkConsistency() {
@@ -363,7 +363,7 @@ abstract class Geometry implements Serializable {
/**
* Splits the SRID=4711; part of a EWKT rep if present and sets the srid.
*
*
* @param value
* ...
* @return value without the SRID=4711; part
@@ -374,7 +374,7 @@ abstract class Geometry implements Serializable {
int index = v.indexOf(';', 5); // sridprefix length is 5
if (index == -1) {
throw new IllegalArgumentException(
"Error parsing Geometry - SRID not delimited with ';' ");
"Error parsing Geometry - SRID not delimited with ';' ");
}
this.srid = Integer.parseInt(v.substring(5, index));
return v.substring(index + 1).trim();

36
vtm-extras/src/org/oscim/utils/wkb/ValueGetter.java
View File

@@ -37,7 +37,7 @@ abstract class ValueGetter {
/**
* Get a byte, should be equal for all endians
*
*
* @return ...
*/
byte getByte() {
@@ -58,7 +58,7 @@ abstract class ValueGetter {
/**
* Get a 32-Bit integer
*
*
* @param index
* ...
* @return ...
@@ -68,7 +68,7 @@ abstract class ValueGetter {
/**
* Get a long value. This is not needed directly, but as a nice side-effect
* from GetDouble.
*
*
* @param index
* ...
* @return ...
@@ -77,7 +77,7 @@ abstract class ValueGetter {
/**
* Get a double.
*
*
* @return ...
*/
double getDouble() {
@@ -95,19 +95,19 @@ abstract class ValueGetter {
@Override
protected int getInt(int index) {
return ((data[index] & 0xFF) << 24) + ((data[index + 1] & 0xFF) << 16)
+ ((data[index + 2] & 0xFF) << 8) + (data[index + 3] & 0xFF);
+ ((data[index + 2] & 0xFF) << 8) + (data[index + 3] & 0xFF);
}
@Override
protected long getLong(int index) {
return ((long) (data[index] & 0xFF) << 56) | ((long) (data[index + 1] & 0xFF) << 48)
| ((long) (data[index + 2] & 0xFF) << 40)
| ((long) (data[index + 3] & 0xFF) << 32)
| ((long) (data[index + 4] & 0xFF) << 24)
| ((long) (data[index + 5] & 0xFF) << 16)
| ((long) (data[index + 6] & 0xFF) << 8)
| ((long) (data[index + 7] & 0xFF) << 0);
| ((long) (data[index + 2] & 0xFF) << 40)
| ((long) (data[index + 3] & 0xFF) << 32)
| ((long) (data[index + 4] & 0xFF) << 24)
| ((long) (data[index + 5] & 0xFF) << 16)
| ((long) (data[index + 6] & 0xFF) << 8)
| ((long) (data[index + 7] & 0xFF) << 0);
}
}
@@ -121,18 +121,18 @@ abstract class ValueGetter {
@Override
protected int getInt(int index) {
return ((data[index + 3] & 0xFF) << 24) + ((data[index + 2] & 0xFF) << 16)
+ ((data[index + 1] & 0xFF) << 8) + (data[index] & 0xFF);
+ ((data[index + 1] & 0xFF) << 8) + (data[index] & 0xFF);
}
@Override
protected long getLong(int index) {
return ((long) (data[index + 7] & 0xFF) << 56)
| ((long) (data[index + 6] & 0xFF) << 48)
| ((long) (data[index + 5] & 0xFF) << 40)
| ((long) (data[index + 4] & 0xFF) << 32)
| ((long) (data[index + 3] & 0xFF) << 24)
| ((long) (data[index + 2] & 0xFF) << 16)
| ((long) (data[index + 1] & 0xFF) << 8) | ((long) (data[index] & 0xFF) << 0);
| ((long) (data[index + 6] & 0xFF) << 48)
| ((long) (data[index + 5] & 0xFF) << 40)
| ((long) (data[index + 4] & 0xFF) << 32)
| ((long) (data[index + 3] & 0xFF) << 24)
| ((long) (data[index + 2] & 0xFF) << 16)
| ((long) (data[index + 1] & 0xFF) << 8) | ((long) (data[index] & 0xFF) << 0);
}
}

63
vtm-extras/src/org/oscim/utils/wkb/WKBReader.java
View File

@@ -73,35 +73,35 @@ public class WKBReader {
data.getInt();
}
switch (realtype) {
case Geometry.POINT:
mGeom.startPoints();
parsePoint(data, haveZ, haveM);
break;
case Geometry.LINESTRING:
mGeom.startLine();
parseLineString(data, haveZ, haveM);
break;
case Geometry.POLYGON:
mGeom.startPolygon();
parsePolygon(data, haveZ, haveM);
break;
case Geometry.MULTIPOINT:
mGeom.startPoints();
parseMultiPoint(data);
break;
case Geometry.MULTILINESTRING:
mGeom.startLine();
parseMultiLineString(data);
break;
case Geometry.MULTIPOLYGON:
mGeom.startPolygon();
parseMultiPolygon(data);
break;
case Geometry.GEOMETRYCOLLECTION:
parseCollection(data);
break;
default:
throw new IllegalArgumentException("Unknown Geometry Type: " + realtype);
case Geometry.POINT:
mGeom.startPoints();
parsePoint(data, haveZ, haveM);
break;
case Geometry.LINESTRING:
mGeom.startLine();
parseLineString(data, haveZ, haveM);
break;
case Geometry.POLYGON:
mGeom.startPolygon();
parsePolygon(data, haveZ, haveM);
break;
case Geometry.MULTIPOINT:
mGeom.startPoints();
parseMultiPoint(data);
break;
case Geometry.MULTILINESTRING:
mGeom.startLine();
parseMultiLineString(data);
break;
case Geometry.MULTIPOLYGON:
mGeom.startPolygon();
parseMultiPolygon(data);
break;
case Geometry.GEOMETRYCOLLECTION:
parseCollection(data);
break;
default:
throw new IllegalArgumentException("Unknown Geometry Type: " + realtype);
}
if (count == 0) {
@@ -132,7 +132,7 @@ public class WKBReader {
/**
* Parse an Array of "full" Geometries
*
*
* @param data
* ...
* @param count
@@ -193,7 +193,6 @@ public class WKBReader {
if (i > 0)
mGeom.startHole();
int points = data.getInt();
for (int j = 0; j < points; j++) {
@@ -254,7 +253,7 @@ public class WKBReader {
/**
* Converting a string of hex character to bytes
*
*
* from http://stackoverflow.com/questions/140131/convert-a-string-
* representation-of-a-hex-dump-to-a-byte-array-using-java
*/