Point
- *
+ *
* @author Kevin Glass
*/
private class PointList {
@@ -328,7 +328,7 @@ public class Triangulator {
/**
* Add a point to the list
- *
+ *
* @param point The point to add
*/
public void add(Point point) {
@@ -346,7 +346,7 @@ public class Triangulator {
/**
* Get the size of the list
- *
+ *
* @return The size of the list
*/
public int size() {
@@ -355,7 +355,7 @@ public class Triangulator {
/**
* Get a point a specific index in the list
- *
+ *
* @param i The index of the point to retrieve
* @return The point
*/
diff --git a/vtm-extras/src/org/oscim/utils/osm/OSMData.java b/vtm-extras/src/org/oscim/utils/osm/OSMData.java
index 4cb31ce2..9615ebb8 100644
--- a/vtm-extras/src/org/oscim/utils/osm/OSMData.java
+++ b/vtm-extras/src/org/oscim/utils/osm/OSMData.java
@@ -27,7 +27,7 @@ public class OSMData {
private final Collection* The byte order is big-endian. - * + * * @param buffer * the byte array. * @param offset @@ -31,15 +31,15 @@ final class Deserializer { */ static long getFiveBytesLong(byte[] buffer, int offset) { return (buffer[offset] & 0xffL) << 32 | (buffer[offset + 1] & 0xffL) << 24 - | (buffer[offset + 2] & 0xffL) << 16 - | (buffer[offset + 3] & 0xffL) << 8 | (buffer[offset + 4] & 0xffL); + | (buffer[offset + 2] & 0xffL) << 16 + | (buffer[offset + 3] & 0xffL) << 8 | (buffer[offset + 4] & 0xffL); } /** * Converts four bytes of a byte array to a signed int. *
* The byte order is big-endian. - * + * * @param buffer * the byte array. * @param offset @@ -48,15 +48,15 @@ final class Deserializer { */ static int getInt(byte[] buffer, int offset) { return buffer[offset] << 24 | (buffer[offset + 1] & 0xff) << 16 - | (buffer[offset + 2] & 0xff) << 8 - | (buffer[offset + 3] & 0xff); + | (buffer[offset + 2] & 0xff) << 8 + | (buffer[offset + 3] & 0xff); } /** * Converts eight bytes of a byte array to a signed long. *
* The byte order is big-endian. - * + * * @param buffer * the byte array. * @param offset @@ -65,17 +65,17 @@ final class Deserializer { */ static long getLong(byte[] buffer, int offset) { return (buffer[offset] & 0xffL) << 56 | (buffer[offset + 1] & 0xffL) << 48 - | (buffer[offset + 2] & 0xffL) << 40 - | (buffer[offset + 3] & 0xffL) << 32 | (buffer[offset + 4] & 0xffL) << 24 - | (buffer[offset + 5] & 0xffL) << 16 | (buffer[offset + 6] & 0xffL) << 8 - | (buffer[offset + 7] & 0xffL); + | (buffer[offset + 2] & 0xffL) << 40 + | (buffer[offset + 3] & 0xffL) << 32 | (buffer[offset + 4] & 0xffL) << 24 + | (buffer[offset + 5] & 0xffL) << 16 | (buffer[offset + 6] & 0xffL) << 8 + | (buffer[offset + 7] & 0xffL); } /** * Converts two bytes of a byte array to a signed int. *
* The byte order is big-endian.
- *
+ *
* @param buffer
* the byte array.
* @param offset
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/IndexCache.java b/vtm/src/org/oscim/tiling/source/mapfile/IndexCache.java
index 8301b896..ed8a872b 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/IndexCache.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/IndexCache.java
@@ -39,7 +39,7 @@ class IndexCache {
* Maximum size in bytes of one index block.
*/
private static final int SIZE_OF_INDEX_BLOCK = INDEX_ENTRIES_PER_BLOCK
- * SubFileParameter.BYTES_PER_INDEX_ENTRY;
+ * SubFileParameter.BYTES_PER_INDEX_ENTRY;
private final Map
* The byte order is big-endian.
- *
+ *
* @return the int value.
*/
public int readInt() {
@@ -94,16 +94,16 @@ public class ReadBuffer {
mBufferPosition += 4;
return data[pos] << 24
- | (data[pos + 1] & 0xff) << 16
- | (data[pos + 2] & 0xff) << 8
- | (data[pos + 3] & 0xff);
+ | (data[pos + 1] & 0xff) << 16
+ | (data[pos + 2] & 0xff) << 8
+ | (data[pos + 3] & 0xff);
}
/**
* Converts eight bytes from the read buffer to a signed long.
*
* The byte order is big-endian.
- *
+ *
* @return the long value.
*/
public long readLong() {
@@ -112,13 +112,13 @@ public class ReadBuffer {
mBufferPosition += 8;
return (data[pos] & 0xffL) << 56
- | (data[pos + 1] & 0xffL) << 48
- | (data[pos + 2] & 0xffL) << 40
- | (data[pos + 3] & 0xffL) << 32
- | (data[pos + 4] & 0xffL) << 24
- | (data[pos + 5] & 0xffL) << 16
- | (data[pos + 6] & 0xffL) << 8
- | (data[pos + 7] & 0xffL);
+ | (data[pos + 1] & 0xffL) << 48
+ | (data[pos + 2] & 0xffL) << 40
+ | (data[pos + 3] & 0xffL) << 32
+ | (data[pos + 4] & 0xffL) << 24
+ | (data[pos + 5] & 0xffL) << 16
+ | (data[pos + 6] & 0xffL) << 8
+ | (data[pos + 7] & 0xffL);
}
@@ -126,7 +126,7 @@ public class ReadBuffer {
* Converts two bytes from the read buffer to a signed int.
*
* The byte order is big-endian.
- *
+ *
* @return the int value.
*/
public int readShort() {
@@ -140,7 +140,7 @@ public class ReadBuffer {
* The first bit is for continuation info, the other six (last byte) or
* seven (all other bytes) bits are for data. The second bit in the last
* byte indicates the sign of the number.
- *
+ *
* @return the value.
*/
public int readSignedInt() {
@@ -160,7 +160,7 @@ public class ReadBuffer {
flag = ((data[pos + 1] & 0x40) >> 6);
return (((data[pos] & 0x7f)
- | (data[pos + 1] & 0x3f) << 7) ^ -flag) + flag;
+ | (data[pos + 1] & 0x3f) << 7) ^ -flag) + flag;
}
@@ -169,8 +169,8 @@ public class ReadBuffer {
flag = ((data[pos + 2] & 0x40) >> 6);
return (((data[pos] & 0x7f)
- | (data[pos + 1] & 0x7f) << 7
- | (data[pos + 2] & 0x3f) << 14) ^ -flag) + flag;
+ | (data[pos + 1] & 0x7f) << 7
+ | (data[pos + 2] & 0x3f) << 14) ^ -flag) + flag;
}
@@ -179,19 +179,19 @@ public class ReadBuffer {
flag = ((data[pos + 3] & 0x40) >> 6);
return (((data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14)
- | ((data[pos + 3] & 0x3f) << 21)) ^ -flag) + flag;
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14)
+ | ((data[pos + 3] & 0x3f) << 21)) ^ -flag) + flag;
}
mBufferPosition += 5;
flag = ((data[pos + 4] & 0x40) >> 6);
return ((((data[pos] & 0x7f)
- | (data[pos + 1] & 0x7f) << 7
- | (data[pos + 2] & 0x7f) << 14
- | (data[pos + 3] & 0x7f) << 21
- | (data[pos + 4] & 0x3f) << 28)) ^ -flag) + flag;
+ | (data[pos + 1] & 0x7f) << 7
+ | (data[pos + 2] & 0x7f) << 14
+ | (data[pos + 3] & 0x7f) << 21
+ | (data[pos + 4] & 0x3f) << 28)) ^ -flag) + flag;
}
@@ -202,7 +202,7 @@ public class ReadBuffer {
* The first bit is for continuation info, the other six (last byte) or
* seven (all other bytes) bits are for data. The second bit in the last
* byte indicates the sign of the number.
- *
+ *
* @param values
* result values
* @param length
@@ -227,7 +227,7 @@ public class ReadBuffer {
flag = ((data[pos + 1] & 0x40) >> 6);
values[i] = (((data[pos] & 0x7f)
- | ((data[pos + 1] & 0x3f) << 7)) ^ -flag) + flag;
+ | ((data[pos + 1] & 0x3f) << 7)) ^ -flag) + flag;
pos += 2;
} else if ((data[pos + 2] & 0x80) == 0) {
@@ -235,8 +235,8 @@ public class ReadBuffer {
flag = ((data[pos + 2] & 0x40) >> 6);
values[i] = (((data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x3f) << 14)) ^ -flag) + flag;
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x3f) << 14)) ^ -flag) + flag;
pos += 3;
} else if ((data[pos + 3] & 0x80) == 0) {
@@ -244,19 +244,19 @@ public class ReadBuffer {
flag = ((data[pos + 3] & 0x40) >> 6);
values[i] = (((data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14)
- | ((data[pos + 3] & 0x3f) << 21)) ^ -flag) + flag;
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14)
+ | ((data[pos + 3] & 0x3f) << 21)) ^ -flag) + flag;
pos += 4;
} else {
flag = ((data[pos + 4] & 0x40) >> 6);
values[i] = ((((data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14)
- | ((data[pos + 3] & 0x7f) << 21)
- | ((data[pos + 4] & 0x3f) << 28))) ^ -flag) + flag;
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14)
+ | ((data[pos + 3] & 0x7f) << 21)
+ | ((data[pos + 4] & 0x3f) << 28))) ^ -flag) + flag;
pos += 5;
}
@@ -271,7 +271,7 @@ public class ReadBuffer {
*
* The first bit is for continuation info, the other seven bits are for
* data.
- *
+ *
* @return the int value.
*/
public int readUnsignedInt() {
@@ -286,35 +286,35 @@ public class ReadBuffer {
if ((data[pos + 1] & 0x80) == 0) {
mBufferPosition += 2;
return (data[pos] & 0x7f)
- | (data[pos + 1] & 0x7f) << 7;
+ | (data[pos + 1] & 0x7f) << 7;
}
if ((data[pos + 2] & 0x80) == 0) {
mBufferPosition += 3;
return (data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14);
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14);
}
if ((data[pos + 3] & 0x80) == 0) {
mBufferPosition += 4;
return (data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14)
- | ((data[pos + 3] & 0x7f) << 21);
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14)
+ | ((data[pos + 3] & 0x7f) << 21);
}
mBufferPosition += 5;
return (data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14)
- | ((data[pos + 3] & 0x7f) << 21)
- | ((data[pos + 4] & 0x7f) << 28);
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14)
+ | ((data[pos + 3] & 0x7f) << 21)
+ | ((data[pos + 4] & 0x7f) << 28);
}
/**
* Decodes a variable amount of bytes from the read buffer to a string.
- *
+ *
* @return the UTF-8 decoded string (may be null).
*/
public String readUTF8EncodedString() {
@@ -333,7 +333,7 @@ public class ReadBuffer {
/**
* Decodes the given amount of bytes from the read buffer to a string.
- *
+ *
* @param stringLength
* the length of the string in bytes.
* @return the UTF-8 decoded string (may be null).
@@ -343,7 +343,7 @@ public class ReadBuffer {
mBufferPosition += stringLength;
try {
return new String(mBufferData, mBufferPosition - stringLength, stringLength,
- CHARSET_UTF8);
+ CHARSET_UTF8);
} catch (UnsupportedEncodingException e) {
throw new IllegalStateException(e);
}
@@ -354,7 +354,7 @@ public class ReadBuffer {
/**
* Decodes a variable amount of bytes from the read buffer to a string.
- *
+ *
* @param position
* buffer offset position of string
* @return the UTF-8 decoded string (may be null).
@@ -383,7 +383,7 @@ public class ReadBuffer {
/**
* Sets the buffer position to the given offset.
- *
+ *
* @param bufferPosition
* the buffer position.
*/
@@ -393,7 +393,7 @@ public class ReadBuffer {
/**
* Skips the given number of bytes in the read buffer.
- *
+ *
* @param bytes
* the number of bytes to skip.
*/
@@ -435,25 +435,25 @@ public class ReadBuffer {
pos += 1;
} else if ((data[pos + 1] & 0x80) == 0) {
skip = (data[pos] & 0x7f)
- | (data[pos + 1] & 0x7f) << 7;
+ | (data[pos + 1] & 0x7f) << 7;
pos += 2;
} else if ((data[pos + 2] & 0x80) == 0) {
skip = (data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14);
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14);
pos += 3;
} else if ((data[pos + 3] & 0x80) == 0) {
skip = (data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14)
- | ((data[pos + 3] & 0x7f) << 21);
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14)
+ | ((data[pos + 3] & 0x7f) << 21);
pos += 4;
} else {
skip = (data[pos] & 0x7f)
- | ((data[pos + 1] & 0x7f) << 7)
- | ((data[pos + 2] & 0x7f) << 14)
- | ((data[pos + 3] & 0x7f) << 21)
- | ((data[pos + 4] & 0x7f) << 28);
+ | ((data[pos + 1] & 0x7f) << 7)
+ | ((data[pos + 2] & 0x7f) << 14)
+ | ((data[pos + 3] & 0x7f) << 21)
+ | ((data[pos + 4] & 0x7f) << 28);
pos += 5;
}
// invalid way size
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java b/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java
index e2fc161a..bf0eb734 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileHeader.java
@@ -80,7 +80,7 @@ public class MapFileHeader {
/**
* Reads and validates the header block from the map file.
- *
+ *
* @param readBuffer
* the ReadBuffer for the file data.
* @param fileSize
@@ -108,8 +108,7 @@ public class MapFileHeader {
return openResult;
}
- openResult = RequiredFields
- .readFileSize(readBuffer, fileSize, mapFileInfoBuilder);
+ openResult = RequiredFields.readFileSize(readBuffer, fileSize, mapFileInfoBuilder);
if (!openResult.isSuccess()) {
return openResult;
}
@@ -160,7 +159,7 @@ public class MapFileHeader {
}
private OpenResult readSubFileParameters(ReadBuffer readBuffer, long fileSize,
- MapFileInfoBuilder mapFileInfoBuilder) {
+ MapFileInfoBuilder mapFileInfoBuilder) {
// get and check the number of sub-files (1 byte)
byte numberOfSubFiles = readBuffer.readByte();
if (numberOfSubFiles < 1) {
@@ -200,7 +199,7 @@ public class MapFileHeader {
// check for valid zoom level range
if (zoomLevelMin > zoomLevelMax) {
return new OpenResult("invalid zoom level range: " + zoomLevelMin + SPACE
- + zoomLevelMax);
+ + zoomLevelMax);
}
// get and check the start address of the sub-file (8 bytes)
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileInfo.java b/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileInfo.java
index 35507f6f..0e5f57ad 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileInfo.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/MapFileInfo.java
@@ -18,7 +18,7 @@ import org.oscim.core.Tag;
/**
* Contains the immutable metadata of a map file.
- *
+ *
*/
public class MapFileInfo extends org.oscim.tiling.source.mapfile.MapInfo {
@@ -49,16 +49,16 @@ public class MapFileInfo extends org.oscim.tiling.source.mapfile.MapInfo {
MapFileInfo(MapFileInfoBuilder mapFileInfoBuilder) {
super(mapFileInfoBuilder.boundingBox,
- mapFileInfoBuilder.optionalFields.startZoomLevel,
- mapFileInfoBuilder.optionalFields.startPosition,
- mapFileInfoBuilder.projectionName,
- mapFileInfoBuilder.mapDate,
- mapFileInfoBuilder.fileSize,
- mapFileInfoBuilder.fileVersion,
- mapFileInfoBuilder.optionalFields.languagePreference,
- mapFileInfoBuilder.optionalFields.comment,
- mapFileInfoBuilder.optionalFields.createdBy,
- mapFileInfoBuilder.zoomLevel);
+ mapFileInfoBuilder.optionalFields.startZoomLevel,
+ mapFileInfoBuilder.optionalFields.startPosition,
+ mapFileInfoBuilder.projectionName,
+ mapFileInfoBuilder.mapDate,
+ mapFileInfoBuilder.fileSize,
+ mapFileInfoBuilder.fileVersion,
+ mapFileInfoBuilder.optionalFields.languagePreference,
+ mapFileInfoBuilder.optionalFields.comment,
+ mapFileInfoBuilder.optionalFields.createdBy,
+ mapFileInfoBuilder.zoomLevel);
debugFile = mapFileInfoBuilder.optionalFields.isDebugFile;
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java b/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java
index b32194ec..b52093ed 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/OptionalFields.java
@@ -60,7 +60,7 @@ final class OptionalFields {
private static final int START_ZOOM_LEVEL_MAX = 22;
static OpenResult readOptionalFields(ReadBuffer readBuffer,
- MapFileInfoBuilder mapFileInfoBuilder) {
+ MapFileInfoBuilder mapFileInfoBuilder) {
OptionalFields optionalFields = new OptionalFields(readBuffer.readByte());
mapFileInfoBuilder.optionalFields = optionalFields;
@@ -108,14 +108,14 @@ final class OptionalFields {
// get and check the start position latitude (4 byte)
int mapStartLatitude = readBuffer.readInt();
if (mapStartLatitude < RequiredFields.LATITUDE_MIN
- || mapStartLatitude > RequiredFields.LATITUDE_MAX) {
+ || mapStartLatitude > RequiredFields.LATITUDE_MAX) {
return new OpenResult("invalid map start latitude: " + mapStartLatitude);
}
// get and check the start position longitude (4 byte)
int mapStartLongitude = readBuffer.readInt();
if (mapStartLongitude < RequiredFields.LONGITUDE_MIN
- || mapStartLongitude > RequiredFields.LONGITUDE_MAX) {
+ || mapStartLongitude > RequiredFields.LONGITUDE_MAX) {
return new OpenResult("invalid map start longitude: " + mapStartLongitude);
}
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java b/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java
index a004f7f3..b51e3f0b 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/RequiredFields.java
@@ -106,12 +106,12 @@ final class RequiredFields {
}
mapFileInfoBuilder.boundingBox = new BoundingBox(minLatitude, minLongitude, maxLatitude,
- maxLongitude);
+ maxLongitude);
return OpenResult.SUCCESS;
}
static OpenResult readFileSize(ReadBuffer readBuffer, long fileSize,
- MapFileInfoBuilder mapFileInfoBuilder) {
+ MapFileInfoBuilder mapFileInfoBuilder) {
// get and check the file size (8 bytes)
long headerFileSize = readBuffer.readLong();
if (headerFileSize != fileSize) {
@@ -178,7 +178,7 @@ final class RequiredFields {
}
static OpenResult readProjectionName(ReadBuffer readBuffer,
- MapFileInfoBuilder mapFileInfoBuilder) {
+ MapFileInfoBuilder mapFileInfoBuilder) {
// get and check the projection name
String projectionName = readBuffer.readUTF8EncodedString();
if (!MERCATOR.equals(projectionName)) {
diff --git a/vtm/src/org/oscim/tiling/source/mapfile/header/SubFileParameter.java b/vtm/src/org/oscim/tiling/source/mapfile/header/SubFileParameter.java
index 976f53b5..6e664104 100644
--- a/vtm/src/org/oscim/tiling/source/mapfile/header/SubFileParameter.java
+++ b/vtm/src/org/oscim/tiling/source/mapfile/header/SubFileParameter.java
@@ -110,7 +110,6 @@ public class SubFileParameter {
*/
private final int hashCodeValue;
-
SubFileParameter(SubFileParameterBuilder subFileParameterBuilder) {
this.startAddress = subFileParameterBuilder.startAddress;
this.indexStartAddress = subFileParameterBuilder.indexStartAddress;
@@ -122,17 +121,21 @@ public class SubFileParameter {
// calculate the XY numbers of the boundary tiles in this sub-file
this.boundaryTileBottom = Projection.latitudeToTileY(
- subFileParameterBuilder.boundingBox.minLatitudeE6
- / COORDINATES_DIVISOR, this.baseZoomLevel);
+ subFileParameterBuilder.boundingBox.minLatitudeE6
+ / COORDINATES_DIVISOR,
+ this.baseZoomLevel);
this.boundaryTileLeft = Projection.longitudeToTileX(
- subFileParameterBuilder.boundingBox.minLongitudeE6
- / COORDINATES_DIVISOR, this.baseZoomLevel);
+ subFileParameterBuilder.boundingBox.minLongitudeE6
+ / COORDINATES_DIVISOR,
+ this.baseZoomLevel);
this.boundaryTileTop = Projection.latitudeToTileY(
- subFileParameterBuilder.boundingBox.maxLatitudeE6
- / COORDINATES_DIVISOR, this.baseZoomLevel);
+ subFileParameterBuilder.boundingBox.maxLatitudeE6
+ / COORDINATES_DIVISOR,
+ this.baseZoomLevel);
this.boundaryTileRight = Projection.longitudeToTileX(
- subFileParameterBuilder.boundingBox.maxLongitudeE6
- / COORDINATES_DIVISOR, this.baseZoomLevel);
+ subFileParameterBuilder.boundingBox.maxLongitudeE6
+ / COORDINATES_DIVISOR,
+ this.baseZoomLevel);
// calculate the horizontal and vertical amount of blocks in this sub-file
this.blocksWidth = this.boundaryTileRight - this.boundaryTileLeft + 1;
diff --git a/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java b/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
index b8916be6..482f1e84 100644
--- a/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
+++ b/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
@@ -39,10 +39,10 @@ public class MapnikVectorTileSource extends UrlTileSource {
protected int formatTilePath(Tile tile, byte[] path, int pos) {
// url formatter for mapbox streets
byte[] hexTable = {
- '0', '1', '2', '3',
- '4', '5', '6', '7',
- '8', '9', 'a', 'b',
- 'c', 'd', 'e', 'f'
+ '0', '1', '2', '3',
+ '4', '5', '6', '7',
+ '8', '9', 'a', 'b',
+ 'c', 'd', 'e', 'f'
};
path[pos++] = '/';
diff --git a/vtm/src/org/oscim/tiling/source/mapnik/TileDecoder.java b/vtm/src/org/oscim/tiling/source/mapnik/TileDecoder.java
index c688ed44..84c20af8 100644
--- a/vtm/src/org/oscim/tiling/source/mapnik/TileDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/mapnik/TileDecoder.java
@@ -14,7 +14,6 @@
*/
package org.oscim.tiling.source.mapnik;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -70,8 +69,9 @@ public class TileDecoder extends PbfDecoder {
private float mScale;
@Override
- public boolean decode(Tile tile, ITileDataSink mapDataCallback, InputStream is, int contentLength)
- throws IOException {
+ public boolean decode(Tile tile, ITileDataSink mapDataCallback, InputStream is,
+ int contentLength)
+ throws IOException {
if (debug)
Log.d(TAG, tile + " decode");
@@ -97,7 +97,7 @@ public class TileDecoder extends PbfDecoder {
}
}
- if (hasData()){
+ if (hasData()) {
error(tile + " invalid tile");
return false;
}
@@ -475,14 +475,14 @@ public class TileDecoder extends PbfDecoder {
int dx = (curX - prevX);
int dy = (curY - prevY);
- if (isPoly && num == 0 && cnt > 0){
+ if (isPoly && num == 0 && cnt > 0) {
prevX = curX;
prevY = curY;
// only add last point if it is di
int ppos = cnt * 2;
if (elem.points[elem.pointPos - ppos] != curX
- || elem.points[elem.pointPos - ppos + 1] != curY)
+ || elem.points[elem.pointPos - ppos + 1] != curY)
elem.addPoint(curX / mScale, curY / mScale);
lastClip = false;
@@ -490,11 +490,11 @@ public class TileDecoder extends PbfDecoder {
}
if ((isPoint || cmd == MOVE_TO)
- || (dx > pixel || dx < -pixel)
- || (dy > pixel || dy < -pixel)
- // hack to not clip at tile boundaries
- || (curX <= 0 || curX >= 4095)
- || (curY <= 0 || curY >= 4095)) {
+ || (dx > pixel || dx < -pixel)
+ || (dy > pixel || dy < -pixel)
+ // hack to not clip at tile boundaries
+ || (curX <= 0 || curX >= 4095)
+ || (curY <= 0 || curY >= 4095)) {
prevX = curX;
prevY = curY;
diff --git a/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
index 9e1653c8..d51573fc 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
@@ -20,9 +20,10 @@ import org.oscim.tiling.source.ITileDataSource;
import org.oscim.tiling.source.common.LwHttp;
import org.oscim.tiling.source.common.PbfTileDataSource;
import org.oscim.tiling.source.common.UrlTileSource;
+
/**
* Deprecated
- *
+ *
*/
public class OSciMap1TileSource extends UrlTileSource {
diff --git a/vtm/src/org/oscim/tiling/source/oscimap/Tags.java b/vtm/src/org/oscim/tiling/source/oscimap/Tags.java
index e797bfd2..a4fcb8b0 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap/Tags.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap/Tags.java
@@ -271,7 +271,7 @@ public class Tags {
private static final String s_siding = "siding".intern();
private static final String s_aeroway = "aeroway".intern();
private static final String s_emergency_access_point = "emergency_access_point"
- .intern();
+ .intern();
private static final String s_watermill = "watermill".intern();
private static final String s_college = "college".intern();
private static final String s_landuse = "landuse".intern();
@@ -368,7 +368,7 @@ public class Tags {
private static final String s_helipad = "helipad".intern();
private static final String s_railway = "railway".intern();
private static final String s_greenhouse_horticulture = "greenhouse_horticulture"
- .intern();
+ .intern();
private static final String s_wall = "wall".intern();
private static final String s_recycling = "recycling".intern();
private static final String s_passing_place = "passing_place".intern();
@@ -582,377 +582,377 @@ public class Tags {
public static final Tag[] tags = {
- new Tag(s_building, s_yes, false), new Tag(s_highway, s_residential, false),
- new Tag(s_highway, s_service, false), new Tag(s_waterway, s_stream, false),
- new Tag(s_highway, s_unclassified, false), new Tag(s_highway, s_track, false),
- new Tag(s_oneway, s_yes, false), new Tag(s_natural, s_water, false),
- new Tag(s_highway, s_footway, false), new Tag(s_access, s_private, false),
- new Tag(s_highway, s_tertiary, false), new Tag(s_highway, s_path, false),
- new Tag(s_highway, s_secondary, false), new Tag(s_landuse, s_forest, false),
- new Tag(s_bridge, s_yes, false), new Tag(s_natural, s_tree, false),
- new Tag(s_surface, s_paved, false), new Tag(s_natural, s_wood, false),
- new Tag(s_highway, s_primary, false), new Tag(s_landuse, s_grass, false),
- new Tag(s_landuse, s_residential, false), new Tag(s_surface, s_unpaved, false),
- new Tag(s_highway, s_bus_stop, false), new Tag(s_surface, s_asphalt, false),
- new Tag(s_bicycle, s_yes, false), new Tag(s_amenity, s_parking, false),
- new Tag(s_place, s_locality, false), new Tag(s_railway, s_rail, false),
- new Tag(s_service, s_parking_aisle, false),
- new Tag(s_boundary, s_administrative, false),
- new Tag(s_building, s_house, false), new Tag(s_place, s_village, false),
- new Tag(s_natural, s_coastline, false), new Tag(s_tracktype, s_grade2, false),
- new Tag(s_oneway, s_no, false), new Tag(s_service, s_driveway, false),
- new Tag(s_highway, s_turning_circle, false), new Tag(s_place, s_hamlet, false),
- new Tag(s_natural, s_wetland, false), new Tag(s_tracktype, s_grade3, false),
- new Tag(s_waterway, s_river, false), new Tag(s_highway, s_cycleway, false),
- new Tag(s_barrier, s_fence, false), new Tag(s_building, s_residential, false),
- new Tag(s_amenity, s_school, false), new Tag(s_highway, s_crossing, false),
- new Tag(s_admin_level, s_8, false), new Tag(s_highway, s_trunk, false),
- new Tag(s_amenity, s_place_of_worship, false),
- new Tag(s_landuse, s_farmland, false), new Tag(s_tracktype, s_grade1, false),
- new Tag(s_highway, s_road, false), new Tag(s_landuse, s_farm, false),
- new Tag(s_surface, s_gravel, false), new Tag(s_landuse, s_meadow, false),
- new Tag(s_highway, s_motorway, false),
- new Tag(s_highway, s_traffic_signals, false),
- new Tag(s_building, s_hut, false), new Tag(s_highway, s_motorway_link, false),
- new Tag(s_tracktype, s_grade4, false), new Tag(s_barrier, s_gate, false),
- new Tag(s_highway, s_living_street, false), new Tag(s_bicycle, s_no, false),
- new Tag(s_leisure, s_pitch, false), new Tag(s_tunnel, s_yes, false),
- new Tag(s_surface, s_ground, false), new Tag(s_highway, s_steps, false),
- new Tag(s_natural, s_land, false), new Tag(s_man_made, s_survey_point, false),
- new Tag(s_tracktype, s_grade5, false), new Tag(s_waterway, s_ditch, false),
- new Tag(s_leisure, s_park, false), new Tag(s_amenity, s_restaurant, false),
- new Tag(s_barrier, s_wall, false), new Tag(s_waterway, s_riverbank, false),
- new Tag(s_amenity, s_bench, false), new Tag(s_building, s_garage, false),
- new Tag(s_natural, s_scrub, false), new Tag(s_highway, s_pedestrian, false),
- new Tag(s_natural, s_peak, false), new Tag(s_building, s_entrance, false),
- new Tag(s_landuse, s_reservoir, false), new Tag(s_access, s_yes, false),
- new Tag(s_bicycle, s_designated, false),
- new Tag(s_leisure, s_swimming_pool, false),
- new Tag(s_landuse, s_farmyard, false),
- new Tag(s_railway, s_level_crossing, false),
- new Tag(s_building, s_apartments, false), new Tag(s_surface, s_grass, false),
- new Tag(s_wheelchair, s_yes, false), new Tag(s_service, s_alley, false),
- new Tag(s_landuse, s_industrial, false), new Tag(s_amenity, s_fuel, false),
- new Tag(s_surface, s_dirt, false), new Tag(s_highway, s_trunk_link, false),
- new Tag(s_waterway, s_drain, false), new Tag(s_barrier, s_hedge, false),
- new Tag(s_amenity, s_grave_yard, false),
- new Tag(s_tourism, s_information, false),
- new Tag(s_shop, s_supermarket, false),
- new Tag(s_highway, s_primary_link, false), new Tag(s_wood, s_deciduous, false),
- new Tag(s_leisure, s_playground, false), new Tag(s_building, s_roof, false),
- new Tag(s_building, s_industrial, false),
- new Tag(s_amenity, s_post_box, false), new Tag(s_waterway, s_canal, false),
- new Tag(s_barrier, s_bollard, false), new Tag(s_leisure, s_garden, false),
- new Tag(s_wood, s_mixed, false), new Tag(s_landuse, s_cemetery, false),
- new Tag(s_landuse, s_orchard, false), new Tag(s_shop, s_convenience, false),
- new Tag(s_access, s_permissive, false), new Tag(s_surface, s_concrete, false),
- new Tag(s_surface, s_paving_stones, false), new Tag(s_service, s_spur, false),
- new Tag(s_building, s_garages, false), new Tag(s_amenity, s_bank, false),
- new Tag(s_tourism, s_hotel, false), new Tag(s_access, s_no, false),
- new Tag(s_amenity, s_fast_food, false), new Tag(s_man_made, s_pier, false),
- new Tag(s_amenity, s_kindergarten, false),
- new Tag(s_access, s_agricultural, false),
- new Tag(s_surface, s_cobblestone, false), new Tag(s_wheelchair, s_no, false),
- new Tag(s_amenity, s_cafe, false), new Tag(s_amenity, s_hospital, false),
- new Tag(s_amenity, s_post_office, false),
- new Tag(s_amenity, s_public_building, false),
- new Tag(s_amenity, s_recycling, false),
- new Tag(s_highway, s_street_lamp, false), new Tag(s_man_made, s_tower, false),
- new Tag(s_waterway, s_dam, false), new Tag(s_amenity, s_pub, false),
- new Tag(s_wood, s_coniferous, false), new Tag(s_access, s_destination, false),
- new Tag(s_admin_level, s_6, false), new Tag(s_landuse, s_commercial, false),
- new Tag(s_amenity, s_pharmacy, false), new Tag(s_railway, s_abandoned, false),
- new Tag(s_service, s_yard, false), new Tag(s_place, s_island, false),
- new Tag(s_oneway, s__1, false), new Tag(s_landuse, s_quarry, false),
- new Tag(s_landuse, s_vineyard, false),
- new Tag(s_highway, s_motorway_junction, false),
- new Tag(s_railway, s_station, false), new Tag(s_landuse, s_allotments, false),
- new Tag(s_barrier, s_lift_gate, false), new Tag(s_admin_level, s_10, false),
- new Tag(s_amenity, s_telephone, false), new Tag(s_place, s_town, false),
- new Tag(s_man_made, s_cutline, false), new Tag(s_place, s_suburb, false),
- new Tag(s_aeroway, s_taxiway, false), new Tag(s_wheelchair, s_limited, false),
- new Tag(s_highway, s_secondary_link, false),
- new Tag(s_leisure, s_sports_centre, false),
- new Tag(s_amenity, s_bicycle_parking, false),
- new Tag(s_surface, s_sand, false), new Tag(s_highway, s_stop, false),
- new Tag(s_man_made, s_works, false), new Tag(s_landuse, s_retail, false),
- new Tag(s_amenity, s_fire_station, false), new Tag(s_service, s_siding, false),
- new Tag(s_amenity, s_toilets, false), new Tag(s_bench, s_yes, false),
- new Tag(s_oneway, s_1, false), new Tag(s_surface, s_compacted, false),
- new Tag(s_landuse, s_basin, false), new Tag(s_amenity, s_police, false),
- new Tag(s_railway, s_tram, false), new Tag(s_route, s_road, false),
- new Tag(s_natural, s_cliff, false), new Tag(s_highway, s_construction, false),
- new Tag(s_aeroway, s_aerodrome, false), new Tag(s_entrance, s_yes, false),
- new Tag(s_man_made, s_storage_tank, false), new Tag(s_amenity, s_atm, false),
- new Tag(s_tourism, s_attraction, false), new Tag(s_route, s_bus, false),
- new Tag(s_shop, s_bakery, false), new Tag(s_tourism, s_viewpoint, false),
- new Tag(s_amenity, s_swimming_pool, false), new Tag(s_natural, s_beach, false),
- new Tag(s_tourism, s_picnic_site, false), new Tag(s_oneway, s_true, false),
- new Tag(s_highway, s_bridleway, false), new Tag(s_tourism, s_camp_site, false),
- new Tag(s_abutters, s_residential, false),
- new Tag(s_leisure, s_nature_reserve, false),
- new Tag(s_amenity, s_drinking_water, false), new Tag(s_shop, s_clothes, false),
- new Tag(s_natural, s_heath, false),
- new Tag(s_highway, s_mini_roundabout, false),
- new Tag(s_landuse, s_construction, false),
- new Tag(s_amenity, s_waste_basket, false),
- new Tag(s_railway, s_platform, false), new Tag(s_amenity, s_townhall, false),
- new Tag(s_shop, s_hairdresser, false), new Tag(s_amenity, s_shelter, false),
- new Tag(s_admin_level, s_9, false),
- new Tag(s_building, s_farm_auxiliary, false),
- new Tag(s_amenity, s_library, false), new Tag(s_building, s_detached, false),
- new Tag(s_admin_level, s_4, false), new Tag(s_landuse, s_village_green, false),
- new Tag(s_barrier, s_stile, false), new Tag(s_landuse, s_garages, false),
- new Tag(s_amenity, s_bar, false), new Tag(s_railway, s_buffer_stop, false),
- new Tag(s_wetland, s_marsh, false), new Tag(s_tourism, s_museum, false),
- new Tag(s_barrier, s_cycle_barrier, false), new Tag(s_route, s_bicycle, false),
- new Tag(s_railway, s_tram_stop, false),
- new Tag(s_amenity, s_parking_space, false),
- new Tag(s_barrier, s_retaining_wall, false),
- new Tag(s_landuse, s_recreation_ground, false),
- new Tag(s_amenity, s_university, false),
- new Tag(s_highway, s_tertiary_link, false),
- new Tag(s_building, s_terrace, false), new Tag(s_shop, s_car_repair, false),
- new Tag(s_amenity, s_hunting_stand, false),
- new Tag(s_amenity, s_fountain, false), new Tag(s_man_made, s_pipeline, false),
- new Tag(s_wetland, s_swamp, false), new Tag(s_shop, s_car, false),
- new Tag(s_bench, s_no, false), new Tag(s_tunnel, s_culvert, false),
- new Tag(s_building, s_school, false), new Tag(s_barrier, s_entrance, false),
- new Tag(s_railway, s_disused, false), new Tag(s_railway, s_crossing, false),
- new Tag(s_building, s_church, false),
- new Tag(s_amenity, s_social_facility, false), new Tag(s_natural, s_bay, false),
- new Tag(s_shop, s_kiosk, false), new Tag(s_amenity, s_vending_machine, false),
- new Tag(s_route, s_hiking, false), new Tag(s_natural, s_spring, false),
- new Tag(s_leisure, s_common, false), new Tag(s_railway, s_switch, false),
- new Tag(s_waterway, s_rapids, false), new Tag(s_admin_level, s_7, false),
- new Tag(s_leisure, s_stadium, false), new Tag(s_leisure, s_track, false),
- new Tag(s_place, s_isolated_dwelling, false), new Tag(s_place, s_islet, false),
- new Tag(s_waterway, s_weir, false), new Tag(s_amenity, s_doctors, false),
- new Tag(s_access, s_designated, false),
- new Tag(s_landuse, s_conservation, false),
- new Tag(s_waterway, s_artificial, false),
- new Tag(s_amenity, s_bus_station, false),
- new Tag(s_leisure, s_golf_course, false),
- new Tag(s_shop, s_doityourself, false), new Tag(s_building, s_service, false),
- new Tag(s_tourism, s_guest_house, false), new Tag(s_aeroway, s_runway, false),
- new Tag(s_place, s_city, false), new Tag(s_railway, s_subway, false),
- new Tag(s_man_made, s_wastewater_plant, false),
- new Tag(s_building, s_commercial, false), new Tag(s_railway, s_halt, false),
- new Tag(s_amenity, s_emergency_phone, false),
- new Tag(s_building, s_retail, false), new Tag(s_barrier, s_block, false),
- new Tag(s_leisure, s_recreation_ground, false),
- new Tag(s_access, s_forestry, false), new Tag(s_amenity, s_college, false),
- new Tag(s_highway, s_platform, false), new Tag(s_access, s_unknown, false),
- new Tag(s_man_made, s_water_tower, false),
- new Tag(s_surface, s_pebblestone, false), new Tag(s_bridge, s_viaduct, false),
- new Tag(s_shop, s_butcher, false), new Tag(s_shop, s_florist, false),
- new Tag(s_boundary, s_landuse, false), new Tag(s_aeroway, s_helipad, false),
- new Tag(s_building, s_hangar, false), new Tag(s_natural, s_glacier, false),
- new Tag(s_highway, s_proposed, false), new Tag(s_shop, s_mall, false),
- new Tag(s_barrier, s_toll_booth, false),
- new Tag(s_amenity, s_fire_hydrant, false),
- new Tag(s_building, s_manufacture, false), new Tag(s_building, s_farm, false),
- new Tag(s_surface, s_wood, false), new Tag(s_amenity, s_car_wash, false),
- new Tag(s_amenity, s_dentist, false), new Tag(s_natural, s_marsh, false),
- new Tag(s_man_made, s_surveillance, false), new Tag(s_shop, s_bicycle, false),
- new Tag(s_route, s_foot, false), new Tag(s_amenity, s_theatre, false),
- new Tag(s_building, s_office, false), new Tag(s_railway, s_light_rail, false),
- new Tag(s_man_made, s_petroleum_well, false),
- new Tag(s_amenity, s_taxi, false), new Tag(s_building, s_greenhouse, false),
- new Tag(s_landuse, s_brownfield, false),
- new Tag(s_bicycle, s_permissive, false), new Tag(s_admin_level, s_2, false),
- new Tag(s_aeroway, s_apron, false), new Tag(s_building, s_cabin, false),
- new Tag(s_amenity, s_cinema, false), new Tag(s_access, s_customers, false),
- new Tag(s_tourism, s_motel, false), new Tag(s_railway, s_narrow_gauge, false),
- new Tag(s_amenity, s_marketplace, false), new Tag(s_shop, s_furniture, false),
- new Tag(s_entrance, s_staircase, false), new Tag(s_tourism, s_artwork, false),
- new Tag(s_natural, s_grassland, false), new Tag(s_shop, s_books, false),
- new Tag(s_admin_level, s_5, false), new Tag(s_man_made, s_groyne, false),
- new Tag(s_waterway, s_lock_gate, false),
- new Tag(s_highway, s_emergency_access_point, false),
- new Tag(s_natural, s_sand, false), new Tag(s_landuse, s_military, false),
- new Tag(s_boundary, s_protected_area, false),
- new Tag(s_amenity, s_community_centre, false),
- new Tag(s_barrier, s_kissing_gate, false),
- new Tag(s_highway, s_speed_camera, false),
- new Tag(s_boundary, s_national_park, false),
- new Tag(s_railway, s_subway_entrance, false),
- new Tag(s_man_made, s_silo, false), new Tag(s_shop, s_alcohol, false),
- new Tag(s_highway, s_give_way, false), new Tag(s_leisure, s_slipway, false),
- new Tag(s_shop, s_electronics, false), new Tag(s_bicycle, s_dismount, false),
- new Tag(s_leisure, s_marina, false), new Tag(s_entrance, s_main, false),
- new Tag(s_boundary, s_postal_code, false),
- new Tag(s_landuse, s_greenhouse_horticulture, false),
- new Tag(s_highway, s_milestone, false),
- new Tag(s_natural, s_cave_entrance, false),
- new Tag(s_landuse, s_landfill, false), new Tag(s_shop, s_chemist, false),
- new Tag(s_shop, s_shoes, false), new Tag(s_barrier, s_cattle_grid, false),
- new Tag(s_landuse, s_railway, false), new Tag(s_tourism, s_hostel, false),
- new Tag(s_tourism, s_chalet, false), new Tag(s_place, s_county, false),
- new Tag(s_shop, s_department_store, false), new Tag(s_highway, s_ford, false),
- new Tag(s_natural, s_scree, false), new Tag(s_landuse, s_greenfield, false),
- new Tag(s_amenity, s_nursing_home, false),
- new Tag(s_barrier, s_wire_fence, false),
- new Tag(s_access, s_restricted, false),
- new Tag(s_man_made, s_reservoir_covered, false),
- new Tag(s_amenity, s_bicycle_rental, false), new Tag(s_man_made, s_MDF, false),
- new Tag(s_man_made, s_water_well, false), new Tag(s_landuse, s_field, false),
- new Tag(s_landuse, s_wood, false), new Tag(s_shop, s_hardware, false),
- new Tag(s_tourism, s_alpine_hut, false), new Tag(s_natural, s_tree_row, false),
- new Tag(s_tourism, s_caravan_site, false), new Tag(s_bridge, s_no, false),
- new Tag(s_wetland, s_bog, false), new Tag(s_amenity, s_courthouse, false),
- new Tag(s_route, s_ferry, false), new Tag(s_barrier, s_city_wall, false),
- new Tag(s_amenity, s_veterinary, false), new Tag(s_shop, s_jewelry, false),
- new Tag(s_building, s_transportation, false),
- new Tag(s_amenity, s_arts_centre, false),
- new Tag(s_bicycle, s_official, false), new Tag(s_shop, s_optician, false),
- new Tag(s_shop, s_yes, false), new Tag(s_building, s_collapsed, false),
- new Tag(s_shop, s_garden_centre, false), new Tag(s_man_made, s_chimney, false),
- new Tag(s_man_made, s_mine, false), new Tag(s_bench, s_unknown, false),
- new Tag(s_railway, s_preserved, false), new Tag(s_building, s_public, false),
- new Tag(s_amenity, s_ferry_terminal, false),
- new Tag(s_highway, s_raceway, false), new Tag(s_natural, s_rock, false),
- new Tag(s_tunnel, s_no, false), new Tag(s_building, s_university, false),
- new Tag(s_shop, s_beverages, false),
- new Tag(s_amenity, s_waste_disposal, false),
- new Tag(s_building, s_warehouse, false),
- new Tag(s_leisure, s_water_park, false), new Tag(s_shop, s_gift, false),
- new Tag(s_place, s_farm, false), new Tag(s_wetland, s_tidalflat, false),
- new Tag(s_waterway, s_waterfall, false), new Tag(s_man_made, s_dolphin, false),
- new Tag(s_service, s_drive_through, false),
- new Tag(s_amenity, s_nightclub, false), new Tag(s_building, s_shed, false),
- new Tag(s_shop, s_greengrocer, false), new Tag(s_natural, s_fell, false),
- new Tag(s_wetland, s_wet_meadow, false), new Tag(s_aeroway, s_gate, false),
- new Tag(s_shop, s_computer, false), new Tag(s_man_made, s_lighthouse, false),
- new Tag(s_wetland, s_reedbed, false), new Tag(s_man_made, s_breakwater, false),
- new Tag(s_surface, s_Dirt_Sand, false), new Tag(s_barrier, s_ditch, false),
- new Tag(s_barrier, s_yes, false), new Tag(s_amenity, s_biergarten, false),
- new Tag(s_shop, s_mobile_phone, false), new Tag(s_route, s_mtb, false),
- new Tag(s_amenity, s_grit_bin, false), new Tag(s_amenity, s_bbq, false),
- new Tag(s_shop, s_sports, false), new Tag(s_barrier, s_wood_fence, false),
- new Tag(s_entrance, s_home, false), new Tag(s_shop, s_laundry, false),
- new Tag(s_man_made, s_gasometer, false),
- new Tag(s_barrier, s_embankment, false), new Tag(s_shop, s_toys, false),
- new Tag(s_wetland, s_saltmarsh, false), new Tag(s_waterway, s_soakhole, false),
- new Tag(s_shop, s_travel_agency, false),
- new Tag(s_man_made, s_water_works, false), new Tag(s_route, s_railway, false),
- new Tag(s_amenity, s_prison, false), new Tag(s_highway, s_rest_area, false),
- new Tag(s_shop, s_stationery, false), new Tag(s_admin_level, s_11, false),
- new Tag(s_building, s_train_station, false),
- new Tag(s_building, s_storage_tank, false),
- new Tag(s_man_made, s_windmill, false), new Tag(s_shop, s_beauty, false),
- new Tag(s_building, s_semi, false), new Tag(s_highway, s_services, false),
- new Tag(s_bicycle, s_private, false), new Tag(s_route, s_ski, false),
- new Tag(s_service, s_emergency_access, false),
- new Tag(s_building, s_factory, false),
- new Tag(s_man_made, s_reinforced_slope, false),
- new Tag(s_amenity, s_car_sharing, false), new Tag(s_surface, s_earth, false),
- new Tag(s_shop, s_hifi, false), new Tag(s_amenity, s_car_rental, false),
- new Tag(s_barrier, s_hedge_bank, false),
- new Tag(s_shop, s_confectionery, false), new Tag(s_aeroway, s_terminal, false),
- new Tag(s_highway, s_passing_place, false),
- new Tag(s_building, s_building, false), new Tag(s_man_made, s_dyke, false),
- new Tag(s_building, s_construction, false), new Tag(s_building, s_shop, false),
- new Tag(s_natural, s_reef, false), new Tag(s_landuse, s_aquaculture, false),
- new Tag(s_shop, s_dry_cleaning, false), new Tag(s_amenity, s_embassy, false),
- new Tag(s_shop, s_newsagent, false), new Tag(s_landuse, s_salt_pond, false),
- new Tag(s_railway, s_spur, false), new Tag(s_wheelchair, s_unknown, false),
- new Tag(s_tourism, s_zoo, false), new Tag(s_man_made, s_waterway, false),
- new Tag(s_surface, s_fine_gravel, false), new Tag(s_shop, s_motorcycle, false),
- new Tag(s_building, s_Building, false),
- new Tag(s_railway, s_construction, false),
- new Tag(s_place, s_neighbourhood, false), new Tag(s_route, s_train, false),
- new Tag(s_building, s_no, false), new Tag(s_natural, s_mud, false),
- new Tag(s_place, s_region, false),
- new Tag(s_landuse, s_reservoir_watershed, false),
- new Tag(s_boundary, s_marker, false), new Tag(s_man_made, s_beacon, false),
- new Tag(s_shop, s_outdoor, false), new Tag(s_access, s_public, false),
- new Tag(s_abutters, s_industrial, false), new Tag(s_building, s_barn, false),
- new Tag(s_leisure, s_picnic_table, false),
- new Tag(s_building, s_hospital, false), new Tag(s_access, s_official, false),
- new Tag(s_shop, s_variety_store, false), new Tag(s_man_made, s_crane, false),
- new Tag(s_amenity, s_parking_fuel, false), new Tag(s_route, s_tram, false),
- new Tag(s_tourism, s_theme_park, false), new Tag(s_shop, s_pet, false),
- new Tag(s_building, s_kindergarten, false),
- new Tag(s_man_made, s_storage, false), new Tag(s_man_made, s_mast, false),
- new Tag(s_amenity, s_parking_entrance, false),
- new Tag(s_amenity, s_clock, false),
- new Tag(s_landuse, s_industrial_retail, false),
- new Tag(s_shop, s_video, false), new Tag(s_access, s_delivery, false),
- new Tag(s_amenity, s_driving_school, false), new Tag(s_service, s_yes, false),
- new Tag(s_natural, s_bare_rock, false), new Tag(s_building, s_chapel, false),
- new Tag(s_natural, s_volcano, false), new Tag(s_waterway, s_dock, false),
- new Tag(s_building, s_dormitory, false),
- new Tag(s_amenity, s_boat_storage, false), new Tag(s_man_made, s_tank, false),
- new Tag(s_man_made, s_flagpole, false),
- new Tag(s_surface, s_grass_paver, false), new Tag(s_shop, s_organic, false),
- new Tag(s_natural, s_landform, false), new Tag(s_highway, s_unsurfaced, false),
- new Tag(s_route, s_power, false), new Tag(s_surface, s_mud, false),
- new Tag(s_building, s_building_concrete, false),
- new Tag(s_abutters, s_retail, false), new Tag(s_building, s_store, false),
- new Tag(s_shop, s_vacant, false), new Tag(s_leisure, s_miniature_golf, false),
- new Tag(s_man_made, s_monitoring_station, false),
- new Tag(s_natural, s_waterfall, false), new Tag(s_aeroway, s_hangar, false),
- new Tag(s_shop, s_boutique, false), new Tag(s_route, s_detour, false),
- new Tag(s_building, s_way, false), new Tag(s_railway, s_stop, false),
- new Tag(s_amenity, s_ice_cream, false), new Tag(s_building, s_storage, false),
- new Tag(s_shop, s_car_parts, false), new Tag(s_natural, s_ridge, false),
- new Tag(s_shop, s_tyres, false), new Tag(s_railway, s_dismantled, false),
- new Tag(s_amenity, s_shop, false), new Tag(s_landuse, s_plant_nursery, false),
- new Tag(s_building, s_residentiel1, false),
- new Tag(s_barrier, s_field_boundary, false),
- new Tag(s_barrier, s_border_control, false),
- new Tag(s_surface, s_Paved, false), new Tag(s_barrier, s_sally_port, false),
- new Tag(s_amenity, s_bureau_de_change, false),
- new Tag(s_leisure, s_fishing, false),
- new Tag(s_amenity, s_charging_station, false),
- new Tag(s_building, s_supermarket, false), new Tag(s_highway, s_stile, false),
- new Tag(s_amenity, s_sauna, false), new Tag(s_place, s_municipality, false),
- new Tag(s_building, s_hotel, false), new Tag(s_surface, s_metal, false),
- new Tag(s_highway, s_incline_steep, false),
- new Tag(s_shop, s_estate_agent, false), new Tag(s_natural, s_grass, false),
- new Tag(s_shop, s_pharmacy, false),
- new Tag(s_surface, s_concrete_plates, false),
- new Tag(s_shop, s_copyshop, false),
- new Tag(s_surface, s_paving_stones_30, false),
- new Tag(s_surface, s_interlock, false), new Tag(s_access, s_hov, false),
- new Tag(s_highway, s_elevator, false),
- new Tag(s_boundary, s_local_authority, false),
- new Tag(s_man_made, s_communications_tower, false),
- new Tag(s_shop, s_deli, false), new Tag(s_barrier, s_turnstile, false),
- new Tag(s_building, s_offices, false), new Tag(s_building, s_bunker, false),
- new Tag(s_natural, s_stone, false),
- new Tag(s_railway, s_railway_crossing, false),
- new Tag(s_leisure, s_dog_park, false),
- new Tag(s_building, s_semi_detached, false),
- new Tag(s_man_made, s_watermill, false), new Tag(s_route, s_trolleybus, false),
- new Tag(s_admin_level, s_3, false), new Tag(s_building, s_block, false),
- new Tag(s_barrier, s_guard_rail, false), new Tag(s_bicycle, s_unknown, false),
- new Tag(s_highway, s_abandoned, false), new Tag(s_surface, s_dirt_sand, false),
- new Tag(s_barrier, s_chain, false), new Tag(s_barrier, s_bump_gate, false),
- new Tag(s_building, s_residental, false), new Tag(s_surface, s_cement, false),
- new Tag(s_man_made, s_embankment, false), new Tag(s_building, s_ruins, false),
- new Tag(s_highway, s_incline, false), new Tag(s_abutters, s_commercial, false),
- new Tag(s_barrier, s_hampshire_gate, false), new Tag(s_shop, s_music, false),
- new Tag(s_shop, s_funeral_directors, false),
- new Tag(s_wetland, s_mangrove, false), new Tag(s_place, s_borough, false),
- new Tag(s_building, s_apartment, false), new Tag(s_boundary, s_census, false),
- new Tag(s_barrier, s_kerb, false), new Tag(s_building, s_glasshouse, false),
- new Tag(s_aeroway, s_holding_position, false),
- new Tag(s_shop, s_general, false), new Tag(s_building, s_tank, false),
- new Tag(s_railway, s_monorail, false), new Tag(s_service, s_parking, false),
- new Tag(s_place, s_state, false), new Tag(s_railway, s_proposed, false),
- new Tag(s_shop, s_art, false), new Tag(s_natural, s_hill, false),
- new Tag(s_railway, s_turntable, false), new Tag(s_tourism, s_cabin, false),
- new Tag(s_shop, s_photo, false), new Tag(s_boundary, s_lot, false),
- new Tag(s_shop, s_fishmonger, false), new Tag(s_amenity, s_clinic, false),
- new Tag(s_boundary, s_political, false), new Tag(s_man_made, s_well, false),
- new Tag(s_highway, s_byway, false), new Tag(s_leisure, s_horse_riding, false),
- new Tag(s_service, s_bus, false), new Tag(s_building, s_tower, false),
- new Tag(s_entrance, s_service, false), new Tag(s_shop, s_fabric, false),
- new Tag(s_railway, s_miniature, false), new Tag(s_abutters, s_mixed, false),
- new Tag(s_surface, s_stone, false), new Tag(s_access, s_emergency, false),
- new Tag(s_landuse, s_mine, false), new Tag(s_amenity, s_shower, false),
- new Tag(s_waterway, s_lock, false)
+ new Tag(s_building, s_yes, false), new Tag(s_highway, s_residential, false),
+ new Tag(s_highway, s_service, false), new Tag(s_waterway, s_stream, false),
+ new Tag(s_highway, s_unclassified, false), new Tag(s_highway, s_track, false),
+ new Tag(s_oneway, s_yes, false), new Tag(s_natural, s_water, false),
+ new Tag(s_highway, s_footway, false), new Tag(s_access, s_private, false),
+ new Tag(s_highway, s_tertiary, false), new Tag(s_highway, s_path, false),
+ new Tag(s_highway, s_secondary, false), new Tag(s_landuse, s_forest, false),
+ new Tag(s_bridge, s_yes, false), new Tag(s_natural, s_tree, false),
+ new Tag(s_surface, s_paved, false), new Tag(s_natural, s_wood, false),
+ new Tag(s_highway, s_primary, false), new Tag(s_landuse, s_grass, false),
+ new Tag(s_landuse, s_residential, false), new Tag(s_surface, s_unpaved, false),
+ new Tag(s_highway, s_bus_stop, false), new Tag(s_surface, s_asphalt, false),
+ new Tag(s_bicycle, s_yes, false), new Tag(s_amenity, s_parking, false),
+ new Tag(s_place, s_locality, false), new Tag(s_railway, s_rail, false),
+ new Tag(s_service, s_parking_aisle, false),
+ new Tag(s_boundary, s_administrative, false),
+ new Tag(s_building, s_house, false), new Tag(s_place, s_village, false),
+ new Tag(s_natural, s_coastline, false), new Tag(s_tracktype, s_grade2, false),
+ new Tag(s_oneway, s_no, false), new Tag(s_service, s_driveway, false),
+ new Tag(s_highway, s_turning_circle, false), new Tag(s_place, s_hamlet, false),
+ new Tag(s_natural, s_wetland, false), new Tag(s_tracktype, s_grade3, false),
+ new Tag(s_waterway, s_river, false), new Tag(s_highway, s_cycleway, false),
+ new Tag(s_barrier, s_fence, false), new Tag(s_building, s_residential, false),
+ new Tag(s_amenity, s_school, false), new Tag(s_highway, s_crossing, false),
+ new Tag(s_admin_level, s_8, false), new Tag(s_highway, s_trunk, false),
+ new Tag(s_amenity, s_place_of_worship, false),
+ new Tag(s_landuse, s_farmland, false), new Tag(s_tracktype, s_grade1, false),
+ new Tag(s_highway, s_road, false), new Tag(s_landuse, s_farm, false),
+ new Tag(s_surface, s_gravel, false), new Tag(s_landuse, s_meadow, false),
+ new Tag(s_highway, s_motorway, false),
+ new Tag(s_highway, s_traffic_signals, false),
+ new Tag(s_building, s_hut, false), new Tag(s_highway, s_motorway_link, false),
+ new Tag(s_tracktype, s_grade4, false), new Tag(s_barrier, s_gate, false),
+ new Tag(s_highway, s_living_street, false), new Tag(s_bicycle, s_no, false),
+ new Tag(s_leisure, s_pitch, false), new Tag(s_tunnel, s_yes, false),
+ new Tag(s_surface, s_ground, false), new Tag(s_highway, s_steps, false),
+ new Tag(s_natural, s_land, false), new Tag(s_man_made, s_survey_point, false),
+ new Tag(s_tracktype, s_grade5, false), new Tag(s_waterway, s_ditch, false),
+ new Tag(s_leisure, s_park, false), new Tag(s_amenity, s_restaurant, false),
+ new Tag(s_barrier, s_wall, false), new Tag(s_waterway, s_riverbank, false),
+ new Tag(s_amenity, s_bench, false), new Tag(s_building, s_garage, false),
+ new Tag(s_natural, s_scrub, false), new Tag(s_highway, s_pedestrian, false),
+ new Tag(s_natural, s_peak, false), new Tag(s_building, s_entrance, false),
+ new Tag(s_landuse, s_reservoir, false), new Tag(s_access, s_yes, false),
+ new Tag(s_bicycle, s_designated, false),
+ new Tag(s_leisure, s_swimming_pool, false),
+ new Tag(s_landuse, s_farmyard, false),
+ new Tag(s_railway, s_level_crossing, false),
+ new Tag(s_building, s_apartments, false), new Tag(s_surface, s_grass, false),
+ new Tag(s_wheelchair, s_yes, false), new Tag(s_service, s_alley, false),
+ new Tag(s_landuse, s_industrial, false), new Tag(s_amenity, s_fuel, false),
+ new Tag(s_surface, s_dirt, false), new Tag(s_highway, s_trunk_link, false),
+ new Tag(s_waterway, s_drain, false), new Tag(s_barrier, s_hedge, false),
+ new Tag(s_amenity, s_grave_yard, false),
+ new Tag(s_tourism, s_information, false),
+ new Tag(s_shop, s_supermarket, false),
+ new Tag(s_highway, s_primary_link, false), new Tag(s_wood, s_deciduous, false),
+ new Tag(s_leisure, s_playground, false), new Tag(s_building, s_roof, false),
+ new Tag(s_building, s_industrial, false),
+ new Tag(s_amenity, s_post_box, false), new Tag(s_waterway, s_canal, false),
+ new Tag(s_barrier, s_bollard, false), new Tag(s_leisure, s_garden, false),
+ new Tag(s_wood, s_mixed, false), new Tag(s_landuse, s_cemetery, false),
+ new Tag(s_landuse, s_orchard, false), new Tag(s_shop, s_convenience, false),
+ new Tag(s_access, s_permissive, false), new Tag(s_surface, s_concrete, false),
+ new Tag(s_surface, s_paving_stones, false), new Tag(s_service, s_spur, false),
+ new Tag(s_building, s_garages, false), new Tag(s_amenity, s_bank, false),
+ new Tag(s_tourism, s_hotel, false), new Tag(s_access, s_no, false),
+ new Tag(s_amenity, s_fast_food, false), new Tag(s_man_made, s_pier, false),
+ new Tag(s_amenity, s_kindergarten, false),
+ new Tag(s_access, s_agricultural, false),
+ new Tag(s_surface, s_cobblestone, false), new Tag(s_wheelchair, s_no, false),
+ new Tag(s_amenity, s_cafe, false), new Tag(s_amenity, s_hospital, false),
+ new Tag(s_amenity, s_post_office, false),
+ new Tag(s_amenity, s_public_building, false),
+ new Tag(s_amenity, s_recycling, false),
+ new Tag(s_highway, s_street_lamp, false), new Tag(s_man_made, s_tower, false),
+ new Tag(s_waterway, s_dam, false), new Tag(s_amenity, s_pub, false),
+ new Tag(s_wood, s_coniferous, false), new Tag(s_access, s_destination, false),
+ new Tag(s_admin_level, s_6, false), new Tag(s_landuse, s_commercial, false),
+ new Tag(s_amenity, s_pharmacy, false), new Tag(s_railway, s_abandoned, false),
+ new Tag(s_service, s_yard, false), new Tag(s_place, s_island, false),
+ new Tag(s_oneway, s__1, false), new Tag(s_landuse, s_quarry, false),
+ new Tag(s_landuse, s_vineyard, false),
+ new Tag(s_highway, s_motorway_junction, false),
+ new Tag(s_railway, s_station, false), new Tag(s_landuse, s_allotments, false),
+ new Tag(s_barrier, s_lift_gate, false), new Tag(s_admin_level, s_10, false),
+ new Tag(s_amenity, s_telephone, false), new Tag(s_place, s_town, false),
+ new Tag(s_man_made, s_cutline, false), new Tag(s_place, s_suburb, false),
+ new Tag(s_aeroway, s_taxiway, false), new Tag(s_wheelchair, s_limited, false),
+ new Tag(s_highway, s_secondary_link, false),
+ new Tag(s_leisure, s_sports_centre, false),
+ new Tag(s_amenity, s_bicycle_parking, false),
+ new Tag(s_surface, s_sand, false), new Tag(s_highway, s_stop, false),
+ new Tag(s_man_made, s_works, false), new Tag(s_landuse, s_retail, false),
+ new Tag(s_amenity, s_fire_station, false), new Tag(s_service, s_siding, false),
+ new Tag(s_amenity, s_toilets, false), new Tag(s_bench, s_yes, false),
+ new Tag(s_oneway, s_1, false), new Tag(s_surface, s_compacted, false),
+ new Tag(s_landuse, s_basin, false), new Tag(s_amenity, s_police, false),
+ new Tag(s_railway, s_tram, false), new Tag(s_route, s_road, false),
+ new Tag(s_natural, s_cliff, false), new Tag(s_highway, s_construction, false),
+ new Tag(s_aeroway, s_aerodrome, false), new Tag(s_entrance, s_yes, false),
+ new Tag(s_man_made, s_storage_tank, false), new Tag(s_amenity, s_atm, false),
+ new Tag(s_tourism, s_attraction, false), new Tag(s_route, s_bus, false),
+ new Tag(s_shop, s_bakery, false), new Tag(s_tourism, s_viewpoint, false),
+ new Tag(s_amenity, s_swimming_pool, false), new Tag(s_natural, s_beach, false),
+ new Tag(s_tourism, s_picnic_site, false), new Tag(s_oneway, s_true, false),
+ new Tag(s_highway, s_bridleway, false), new Tag(s_tourism, s_camp_site, false),
+ new Tag(s_abutters, s_residential, false),
+ new Tag(s_leisure, s_nature_reserve, false),
+ new Tag(s_amenity, s_drinking_water, false), new Tag(s_shop, s_clothes, false),
+ new Tag(s_natural, s_heath, false),
+ new Tag(s_highway, s_mini_roundabout, false),
+ new Tag(s_landuse, s_construction, false),
+ new Tag(s_amenity, s_waste_basket, false),
+ new Tag(s_railway, s_platform, false), new Tag(s_amenity, s_townhall, false),
+ new Tag(s_shop, s_hairdresser, false), new Tag(s_amenity, s_shelter, false),
+ new Tag(s_admin_level, s_9, false),
+ new Tag(s_building, s_farm_auxiliary, false),
+ new Tag(s_amenity, s_library, false), new Tag(s_building, s_detached, false),
+ new Tag(s_admin_level, s_4, false), new Tag(s_landuse, s_village_green, false),
+ new Tag(s_barrier, s_stile, false), new Tag(s_landuse, s_garages, false),
+ new Tag(s_amenity, s_bar, false), new Tag(s_railway, s_buffer_stop, false),
+ new Tag(s_wetland, s_marsh, false), new Tag(s_tourism, s_museum, false),
+ new Tag(s_barrier, s_cycle_barrier, false), new Tag(s_route, s_bicycle, false),
+ new Tag(s_railway, s_tram_stop, false),
+ new Tag(s_amenity, s_parking_space, false),
+ new Tag(s_barrier, s_retaining_wall, false),
+ new Tag(s_landuse, s_recreation_ground, false),
+ new Tag(s_amenity, s_university, false),
+ new Tag(s_highway, s_tertiary_link, false),
+ new Tag(s_building, s_terrace, false), new Tag(s_shop, s_car_repair, false),
+ new Tag(s_amenity, s_hunting_stand, false),
+ new Tag(s_amenity, s_fountain, false), new Tag(s_man_made, s_pipeline, false),
+ new Tag(s_wetland, s_swamp, false), new Tag(s_shop, s_car, false),
+ new Tag(s_bench, s_no, false), new Tag(s_tunnel, s_culvert, false),
+ new Tag(s_building, s_school, false), new Tag(s_barrier, s_entrance, false),
+ new Tag(s_railway, s_disused, false), new Tag(s_railway, s_crossing, false),
+ new Tag(s_building, s_church, false),
+ new Tag(s_amenity, s_social_facility, false), new Tag(s_natural, s_bay, false),
+ new Tag(s_shop, s_kiosk, false), new Tag(s_amenity, s_vending_machine, false),
+ new Tag(s_route, s_hiking, false), new Tag(s_natural, s_spring, false),
+ new Tag(s_leisure, s_common, false), new Tag(s_railway, s_switch, false),
+ new Tag(s_waterway, s_rapids, false), new Tag(s_admin_level, s_7, false),
+ new Tag(s_leisure, s_stadium, false), new Tag(s_leisure, s_track, false),
+ new Tag(s_place, s_isolated_dwelling, false), new Tag(s_place, s_islet, false),
+ new Tag(s_waterway, s_weir, false), new Tag(s_amenity, s_doctors, false),
+ new Tag(s_access, s_designated, false),
+ new Tag(s_landuse, s_conservation, false),
+ new Tag(s_waterway, s_artificial, false),
+ new Tag(s_amenity, s_bus_station, false),
+ new Tag(s_leisure, s_golf_course, false),
+ new Tag(s_shop, s_doityourself, false), new Tag(s_building, s_service, false),
+ new Tag(s_tourism, s_guest_house, false), new Tag(s_aeroway, s_runway, false),
+ new Tag(s_place, s_city, false), new Tag(s_railway, s_subway, false),
+ new Tag(s_man_made, s_wastewater_plant, false),
+ new Tag(s_building, s_commercial, false), new Tag(s_railway, s_halt, false),
+ new Tag(s_amenity, s_emergency_phone, false),
+ new Tag(s_building, s_retail, false), new Tag(s_barrier, s_block, false),
+ new Tag(s_leisure, s_recreation_ground, false),
+ new Tag(s_access, s_forestry, false), new Tag(s_amenity, s_college, false),
+ new Tag(s_highway, s_platform, false), new Tag(s_access, s_unknown, false),
+ new Tag(s_man_made, s_water_tower, false),
+ new Tag(s_surface, s_pebblestone, false), new Tag(s_bridge, s_viaduct, false),
+ new Tag(s_shop, s_butcher, false), new Tag(s_shop, s_florist, false),
+ new Tag(s_boundary, s_landuse, false), new Tag(s_aeroway, s_helipad, false),
+ new Tag(s_building, s_hangar, false), new Tag(s_natural, s_glacier, false),
+ new Tag(s_highway, s_proposed, false), new Tag(s_shop, s_mall, false),
+ new Tag(s_barrier, s_toll_booth, false),
+ new Tag(s_amenity, s_fire_hydrant, false),
+ new Tag(s_building, s_manufacture, false), new Tag(s_building, s_farm, false),
+ new Tag(s_surface, s_wood, false), new Tag(s_amenity, s_car_wash, false),
+ new Tag(s_amenity, s_dentist, false), new Tag(s_natural, s_marsh, false),
+ new Tag(s_man_made, s_surveillance, false), new Tag(s_shop, s_bicycle, false),
+ new Tag(s_route, s_foot, false), new Tag(s_amenity, s_theatre, false),
+ new Tag(s_building, s_office, false), new Tag(s_railway, s_light_rail, false),
+ new Tag(s_man_made, s_petroleum_well, false),
+ new Tag(s_amenity, s_taxi, false), new Tag(s_building, s_greenhouse, false),
+ new Tag(s_landuse, s_brownfield, false),
+ new Tag(s_bicycle, s_permissive, false), new Tag(s_admin_level, s_2, false),
+ new Tag(s_aeroway, s_apron, false), new Tag(s_building, s_cabin, false),
+ new Tag(s_amenity, s_cinema, false), new Tag(s_access, s_customers, false),
+ new Tag(s_tourism, s_motel, false), new Tag(s_railway, s_narrow_gauge, false),
+ new Tag(s_amenity, s_marketplace, false), new Tag(s_shop, s_furniture, false),
+ new Tag(s_entrance, s_staircase, false), new Tag(s_tourism, s_artwork, false),
+ new Tag(s_natural, s_grassland, false), new Tag(s_shop, s_books, false),
+ new Tag(s_admin_level, s_5, false), new Tag(s_man_made, s_groyne, false),
+ new Tag(s_waterway, s_lock_gate, false),
+ new Tag(s_highway, s_emergency_access_point, false),
+ new Tag(s_natural, s_sand, false), new Tag(s_landuse, s_military, false),
+ new Tag(s_boundary, s_protected_area, false),
+ new Tag(s_amenity, s_community_centre, false),
+ new Tag(s_barrier, s_kissing_gate, false),
+ new Tag(s_highway, s_speed_camera, false),
+ new Tag(s_boundary, s_national_park, false),
+ new Tag(s_railway, s_subway_entrance, false),
+ new Tag(s_man_made, s_silo, false), new Tag(s_shop, s_alcohol, false),
+ new Tag(s_highway, s_give_way, false), new Tag(s_leisure, s_slipway, false),
+ new Tag(s_shop, s_electronics, false), new Tag(s_bicycle, s_dismount, false),
+ new Tag(s_leisure, s_marina, false), new Tag(s_entrance, s_main, false),
+ new Tag(s_boundary, s_postal_code, false),
+ new Tag(s_landuse, s_greenhouse_horticulture, false),
+ new Tag(s_highway, s_milestone, false),
+ new Tag(s_natural, s_cave_entrance, false),
+ new Tag(s_landuse, s_landfill, false), new Tag(s_shop, s_chemist, false),
+ new Tag(s_shop, s_shoes, false), new Tag(s_barrier, s_cattle_grid, false),
+ new Tag(s_landuse, s_railway, false), new Tag(s_tourism, s_hostel, false),
+ new Tag(s_tourism, s_chalet, false), new Tag(s_place, s_county, false),
+ new Tag(s_shop, s_department_store, false), new Tag(s_highway, s_ford, false),
+ new Tag(s_natural, s_scree, false), new Tag(s_landuse, s_greenfield, false),
+ new Tag(s_amenity, s_nursing_home, false),
+ new Tag(s_barrier, s_wire_fence, false),
+ new Tag(s_access, s_restricted, false),
+ new Tag(s_man_made, s_reservoir_covered, false),
+ new Tag(s_amenity, s_bicycle_rental, false), new Tag(s_man_made, s_MDF, false),
+ new Tag(s_man_made, s_water_well, false), new Tag(s_landuse, s_field, false),
+ new Tag(s_landuse, s_wood, false), new Tag(s_shop, s_hardware, false),
+ new Tag(s_tourism, s_alpine_hut, false), new Tag(s_natural, s_tree_row, false),
+ new Tag(s_tourism, s_caravan_site, false), new Tag(s_bridge, s_no, false),
+ new Tag(s_wetland, s_bog, false), new Tag(s_amenity, s_courthouse, false),
+ new Tag(s_route, s_ferry, false), new Tag(s_barrier, s_city_wall, false),
+ new Tag(s_amenity, s_veterinary, false), new Tag(s_shop, s_jewelry, false),
+ new Tag(s_building, s_transportation, false),
+ new Tag(s_amenity, s_arts_centre, false),
+ new Tag(s_bicycle, s_official, false), new Tag(s_shop, s_optician, false),
+ new Tag(s_shop, s_yes, false), new Tag(s_building, s_collapsed, false),
+ new Tag(s_shop, s_garden_centre, false), new Tag(s_man_made, s_chimney, false),
+ new Tag(s_man_made, s_mine, false), new Tag(s_bench, s_unknown, false),
+ new Tag(s_railway, s_preserved, false), new Tag(s_building, s_public, false),
+ new Tag(s_amenity, s_ferry_terminal, false),
+ new Tag(s_highway, s_raceway, false), new Tag(s_natural, s_rock, false),
+ new Tag(s_tunnel, s_no, false), new Tag(s_building, s_university, false),
+ new Tag(s_shop, s_beverages, false),
+ new Tag(s_amenity, s_waste_disposal, false),
+ new Tag(s_building, s_warehouse, false),
+ new Tag(s_leisure, s_water_park, false), new Tag(s_shop, s_gift, false),
+ new Tag(s_place, s_farm, false), new Tag(s_wetland, s_tidalflat, false),
+ new Tag(s_waterway, s_waterfall, false), new Tag(s_man_made, s_dolphin, false),
+ new Tag(s_service, s_drive_through, false),
+ new Tag(s_amenity, s_nightclub, false), new Tag(s_building, s_shed, false),
+ new Tag(s_shop, s_greengrocer, false), new Tag(s_natural, s_fell, false),
+ new Tag(s_wetland, s_wet_meadow, false), new Tag(s_aeroway, s_gate, false),
+ new Tag(s_shop, s_computer, false), new Tag(s_man_made, s_lighthouse, false),
+ new Tag(s_wetland, s_reedbed, false), new Tag(s_man_made, s_breakwater, false),
+ new Tag(s_surface, s_Dirt_Sand, false), new Tag(s_barrier, s_ditch, false),
+ new Tag(s_barrier, s_yes, false), new Tag(s_amenity, s_biergarten, false),
+ new Tag(s_shop, s_mobile_phone, false), new Tag(s_route, s_mtb, false),
+ new Tag(s_amenity, s_grit_bin, false), new Tag(s_amenity, s_bbq, false),
+ new Tag(s_shop, s_sports, false), new Tag(s_barrier, s_wood_fence, false),
+ new Tag(s_entrance, s_home, false), new Tag(s_shop, s_laundry, false),
+ new Tag(s_man_made, s_gasometer, false),
+ new Tag(s_barrier, s_embankment, false), new Tag(s_shop, s_toys, false),
+ new Tag(s_wetland, s_saltmarsh, false), new Tag(s_waterway, s_soakhole, false),
+ new Tag(s_shop, s_travel_agency, false),
+ new Tag(s_man_made, s_water_works, false), new Tag(s_route, s_railway, false),
+ new Tag(s_amenity, s_prison, false), new Tag(s_highway, s_rest_area, false),
+ new Tag(s_shop, s_stationery, false), new Tag(s_admin_level, s_11, false),
+ new Tag(s_building, s_train_station, false),
+ new Tag(s_building, s_storage_tank, false),
+ new Tag(s_man_made, s_windmill, false), new Tag(s_shop, s_beauty, false),
+ new Tag(s_building, s_semi, false), new Tag(s_highway, s_services, false),
+ new Tag(s_bicycle, s_private, false), new Tag(s_route, s_ski, false),
+ new Tag(s_service, s_emergency_access, false),
+ new Tag(s_building, s_factory, false),
+ new Tag(s_man_made, s_reinforced_slope, false),
+ new Tag(s_amenity, s_car_sharing, false), new Tag(s_surface, s_earth, false),
+ new Tag(s_shop, s_hifi, false), new Tag(s_amenity, s_car_rental, false),
+ new Tag(s_barrier, s_hedge_bank, false),
+ new Tag(s_shop, s_confectionery, false), new Tag(s_aeroway, s_terminal, false),
+ new Tag(s_highway, s_passing_place, false),
+ new Tag(s_building, s_building, false), new Tag(s_man_made, s_dyke, false),
+ new Tag(s_building, s_construction, false), new Tag(s_building, s_shop, false),
+ new Tag(s_natural, s_reef, false), new Tag(s_landuse, s_aquaculture, false),
+ new Tag(s_shop, s_dry_cleaning, false), new Tag(s_amenity, s_embassy, false),
+ new Tag(s_shop, s_newsagent, false), new Tag(s_landuse, s_salt_pond, false),
+ new Tag(s_railway, s_spur, false), new Tag(s_wheelchair, s_unknown, false),
+ new Tag(s_tourism, s_zoo, false), new Tag(s_man_made, s_waterway, false),
+ new Tag(s_surface, s_fine_gravel, false), new Tag(s_shop, s_motorcycle, false),
+ new Tag(s_building, s_Building, false),
+ new Tag(s_railway, s_construction, false),
+ new Tag(s_place, s_neighbourhood, false), new Tag(s_route, s_train, false),
+ new Tag(s_building, s_no, false), new Tag(s_natural, s_mud, false),
+ new Tag(s_place, s_region, false),
+ new Tag(s_landuse, s_reservoir_watershed, false),
+ new Tag(s_boundary, s_marker, false), new Tag(s_man_made, s_beacon, false),
+ new Tag(s_shop, s_outdoor, false), new Tag(s_access, s_public, false),
+ new Tag(s_abutters, s_industrial, false), new Tag(s_building, s_barn, false),
+ new Tag(s_leisure, s_picnic_table, false),
+ new Tag(s_building, s_hospital, false), new Tag(s_access, s_official, false),
+ new Tag(s_shop, s_variety_store, false), new Tag(s_man_made, s_crane, false),
+ new Tag(s_amenity, s_parking_fuel, false), new Tag(s_route, s_tram, false),
+ new Tag(s_tourism, s_theme_park, false), new Tag(s_shop, s_pet, false),
+ new Tag(s_building, s_kindergarten, false),
+ new Tag(s_man_made, s_storage, false), new Tag(s_man_made, s_mast, false),
+ new Tag(s_amenity, s_parking_entrance, false),
+ new Tag(s_amenity, s_clock, false),
+ new Tag(s_landuse, s_industrial_retail, false),
+ new Tag(s_shop, s_video, false), new Tag(s_access, s_delivery, false),
+ new Tag(s_amenity, s_driving_school, false), new Tag(s_service, s_yes, false),
+ new Tag(s_natural, s_bare_rock, false), new Tag(s_building, s_chapel, false),
+ new Tag(s_natural, s_volcano, false), new Tag(s_waterway, s_dock, false),
+ new Tag(s_building, s_dormitory, false),
+ new Tag(s_amenity, s_boat_storage, false), new Tag(s_man_made, s_tank, false),
+ new Tag(s_man_made, s_flagpole, false),
+ new Tag(s_surface, s_grass_paver, false), new Tag(s_shop, s_organic, false),
+ new Tag(s_natural, s_landform, false), new Tag(s_highway, s_unsurfaced, false),
+ new Tag(s_route, s_power, false), new Tag(s_surface, s_mud, false),
+ new Tag(s_building, s_building_concrete, false),
+ new Tag(s_abutters, s_retail, false), new Tag(s_building, s_store, false),
+ new Tag(s_shop, s_vacant, false), new Tag(s_leisure, s_miniature_golf, false),
+ new Tag(s_man_made, s_monitoring_station, false),
+ new Tag(s_natural, s_waterfall, false), new Tag(s_aeroway, s_hangar, false),
+ new Tag(s_shop, s_boutique, false), new Tag(s_route, s_detour, false),
+ new Tag(s_building, s_way, false), new Tag(s_railway, s_stop, false),
+ new Tag(s_amenity, s_ice_cream, false), new Tag(s_building, s_storage, false),
+ new Tag(s_shop, s_car_parts, false), new Tag(s_natural, s_ridge, false),
+ new Tag(s_shop, s_tyres, false), new Tag(s_railway, s_dismantled, false),
+ new Tag(s_amenity, s_shop, false), new Tag(s_landuse, s_plant_nursery, false),
+ new Tag(s_building, s_residentiel1, false),
+ new Tag(s_barrier, s_field_boundary, false),
+ new Tag(s_barrier, s_border_control, false),
+ new Tag(s_surface, s_Paved, false), new Tag(s_barrier, s_sally_port, false),
+ new Tag(s_amenity, s_bureau_de_change, false),
+ new Tag(s_leisure, s_fishing, false),
+ new Tag(s_amenity, s_charging_station, false),
+ new Tag(s_building, s_supermarket, false), new Tag(s_highway, s_stile, false),
+ new Tag(s_amenity, s_sauna, false), new Tag(s_place, s_municipality, false),
+ new Tag(s_building, s_hotel, false), new Tag(s_surface, s_metal, false),
+ new Tag(s_highway, s_incline_steep, false),
+ new Tag(s_shop, s_estate_agent, false), new Tag(s_natural, s_grass, false),
+ new Tag(s_shop, s_pharmacy, false),
+ new Tag(s_surface, s_concrete_plates, false),
+ new Tag(s_shop, s_copyshop, false),
+ new Tag(s_surface, s_paving_stones_30, false),
+ new Tag(s_surface, s_interlock, false), new Tag(s_access, s_hov, false),
+ new Tag(s_highway, s_elevator, false),
+ new Tag(s_boundary, s_local_authority, false),
+ new Tag(s_man_made, s_communications_tower, false),
+ new Tag(s_shop, s_deli, false), new Tag(s_barrier, s_turnstile, false),
+ new Tag(s_building, s_offices, false), new Tag(s_building, s_bunker, false),
+ new Tag(s_natural, s_stone, false),
+ new Tag(s_railway, s_railway_crossing, false),
+ new Tag(s_leisure, s_dog_park, false),
+ new Tag(s_building, s_semi_detached, false),
+ new Tag(s_man_made, s_watermill, false), new Tag(s_route, s_trolleybus, false),
+ new Tag(s_admin_level, s_3, false), new Tag(s_building, s_block, false),
+ new Tag(s_barrier, s_guard_rail, false), new Tag(s_bicycle, s_unknown, false),
+ new Tag(s_highway, s_abandoned, false), new Tag(s_surface, s_dirt_sand, false),
+ new Tag(s_barrier, s_chain, false), new Tag(s_barrier, s_bump_gate, false),
+ new Tag(s_building, s_residental, false), new Tag(s_surface, s_cement, false),
+ new Tag(s_man_made, s_embankment, false), new Tag(s_building, s_ruins, false),
+ new Tag(s_highway, s_incline, false), new Tag(s_abutters, s_commercial, false),
+ new Tag(s_barrier, s_hampshire_gate, false), new Tag(s_shop, s_music, false),
+ new Tag(s_shop, s_funeral_directors, false),
+ new Tag(s_wetland, s_mangrove, false), new Tag(s_place, s_borough, false),
+ new Tag(s_building, s_apartment, false), new Tag(s_boundary, s_census, false),
+ new Tag(s_barrier, s_kerb, false), new Tag(s_building, s_glasshouse, false),
+ new Tag(s_aeroway, s_holding_position, false),
+ new Tag(s_shop, s_general, false), new Tag(s_building, s_tank, false),
+ new Tag(s_railway, s_monorail, false), new Tag(s_service, s_parking, false),
+ new Tag(s_place, s_state, false), new Tag(s_railway, s_proposed, false),
+ new Tag(s_shop, s_art, false), new Tag(s_natural, s_hill, false),
+ new Tag(s_railway, s_turntable, false), new Tag(s_tourism, s_cabin, false),
+ new Tag(s_shop, s_photo, false), new Tag(s_boundary, s_lot, false),
+ new Tag(s_shop, s_fishmonger, false), new Tag(s_amenity, s_clinic, false),
+ new Tag(s_boundary, s_political, false), new Tag(s_man_made, s_well, false),
+ new Tag(s_highway, s_byway, false), new Tag(s_leisure, s_horse_riding, false),
+ new Tag(s_service, s_bus, false), new Tag(s_building, s_tower, false),
+ new Tag(s_entrance, s_service, false), new Tag(s_shop, s_fabric, false),
+ new Tag(s_railway, s_miniature, false), new Tag(s_abutters, s_mixed, false),
+ new Tag(s_surface, s_stone, false), new Tag(s_access, s_emergency, false),
+ new Tag(s_landuse, s_mine, false), new Tag(s_amenity, s_shower, false),
+ new Tag(s_waterway, s_lock, false)
};
}
diff --git a/vtm/src/org/oscim/tiling/source/oscimap/TileDecoder.java b/vtm/src/org/oscim/tiling/source/oscimap/TileDecoder.java
index 39597d3d..fea0c277 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap/TileDecoder.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap/TileDecoder.java
@@ -67,7 +67,7 @@ public class TileDecoder extends PbfDecoder {
@Override
public boolean decode(Tile tile, ITileDataSink sink, InputStream is, int contentLength)
- throws IOException {
+ throws IOException {
setInputStream(is, contentLength);
@@ -78,19 +78,20 @@ public class TileDecoder extends PbfDecoder {
}
private static final int MAX_TAGS_CACHE = 100;
- private static Map
* Thanks to Riven on JavaGaming.org for the basis of sin/cos/atan2/floor/ceil.
- * @author Nathan Sweet */
+ *
+ * @author Nathan Sweet
+ */
public class MathUtils {
static public final float nanoToSec = 1 / 1000000000f;
@@ -48,9 +51,9 @@ public class MathUtils {
static final float[] table = new float[SIN_COUNT];
static {
for (int i = 0; i < SIN_COUNT; i++)
- table[i] = (float)Math.sin((i + 0.5f) / SIN_COUNT * radFull);
+ table[i] = (float) Math.sin((i + 0.5f) / SIN_COUNT * radFull);
for (int i = 0; i < 360; i += 90)
- table[(int)(i * degToIndex) & SIN_MASK] = (float)Math.sin(i * degreesToRadians);
+ table[(int) (i * degToIndex) & SIN_MASK] = (float) Math.sin(i * degreesToRadians);
}
}
@@ -58,30 +61,30 @@ public class MathUtils {
static final float[] table = new float[SIN_COUNT];
static {
for (int i = 0; i < SIN_COUNT; i++)
- table[i] = (float)Math.cos((i + 0.5f) / SIN_COUNT * radFull);
+ table[i] = (float) Math.cos((i + 0.5f) / SIN_COUNT * radFull);
for (int i = 0; i < 360; i += 90)
- table[(int)(i * degToIndex) & SIN_MASK] = (float)Math.cos(i * degreesToRadians);
+ table[(int) (i * degToIndex) & SIN_MASK] = (float) Math.cos(i * degreesToRadians);
}
}
/** Returns the sine in radians. */
- static public final float sin (float radians) {
- return Sin.table[(int)(radians * radToIndex) & SIN_MASK];
+ static public final float sin(float radians) {
+ return Sin.table[(int) (radians * radToIndex) & SIN_MASK];
}
/** Returns the cosine in radians. */
- static public final float cos (float radians) {
- return Cos.table[(int)(radians * radToIndex) & SIN_MASK];
+ static public final float cos(float radians) {
+ return Cos.table[(int) (radians * radToIndex) & SIN_MASK];
}
/** Returns the sine in radians. */
- static public final float sinDeg (float degrees) {
- return Sin.table[(int)(degrees * degToIndex) & SIN_MASK];
+ static public final float sinDeg(float degrees) {
+ return Sin.table[(int) (degrees * degToIndex) & SIN_MASK];
}
/** Returns the cosine in radians. */
- static public final float cosDeg (float degrees) {
- return Cos.table[(int)(degrees * degToIndex) & SIN_MASK];
+ static public final float cosDeg(float degrees) {
+ return Cos.table[(int) (degrees * degToIndex) & SIN_MASK];
}
// ---
@@ -90,7 +93,7 @@ public class MathUtils {
static private final int ATAN2_BITS2 = ATAN2_BITS << 1;
static private final int ATAN2_MASK = ~(-1 << ATAN2_BITS2);
static private final int ATAN2_COUNT = ATAN2_MASK + 1;
- static final int ATAN2_DIM = (int)Math.sqrt(ATAN2_COUNT);
+ static final int ATAN2_DIM = (int) Math.sqrt(ATAN2_COUNT);
static private final float INV_ATAN2_DIM_MINUS_1 = 1.0f / (ATAN2_DIM - 1);
static private class Atan2 {
@@ -98,16 +101,16 @@ public class MathUtils {
static {
for (int i = 0; i < ATAN2_DIM; i++) {
for (int j = 0; j < ATAN2_DIM; j++) {
- float x0 = (float)i / ATAN2_DIM;
- float y0 = (float)j / ATAN2_DIM;
- table[j * ATAN2_DIM + i] = (float)Math.atan2(y0, x0);
+ float x0 = (float) i / ATAN2_DIM;
+ float y0 = (float) j / ATAN2_DIM;
+ table[j * ATAN2_DIM + i] = (float) Math.atan2(y0, x0);
}
}
}
}
/** Returns atan2 in radians from a lookup table. */
- static public final float atan2 (float y, float x) {
+ static public final float atan2(float y, float x) {
float add, mul;
if (x < 0) {
if (y < 0) {
@@ -126,8 +129,8 @@ public class MathUtils {
add = 0;
}
float invDiv = 1 / ((x < y ? y : x) * INV_ATAN2_DIM_MINUS_1);
- int xi = (int)(x * invDiv);
- int yi = (int)(y * invDiv);
+ int xi = (int) (x * invDiv);
+ int yi = (int) (y * invDiv);
return (Atan2.table[yi * ATAN2_DIM + xi] + add) * mul;
}
@@ -135,41 +138,51 @@ public class MathUtils {
static public Random random = new Random();
- /** Returns a random number between 0 (inclusive) and the specified value (inclusive). */
- static public final int random (int range) {
+ /**
+ * Returns a random number between 0 (inclusive) and the specified value
+ * (inclusive).
+ */
+ static public final int random(int range) {
return random.nextInt(range + 1);
}
/** Returns a random number between start (inclusive) and end (inclusive). */
- static public final int random (int start, int end) {
+ static public final int random(int start, int end) {
return start + random.nextInt(end - start + 1);
}
/** Returns a random boolean value. */
- static public final boolean randomBoolean () {
+ static public final boolean randomBoolean() {
return random.nextBoolean();
}
/** Returns random number between 0.0 (inclusive) and 1.0 (exclusive). */
- static public final float random () {
+ static public final float random() {
return random.nextFloat();
}
- /** Returns a random number between 0 (inclusive) and the specified value (exclusive). */
- static public final float random (float range) {
+ /**
+ * Returns a random number between 0 (inclusive) and the specified value
+ * (exclusive).
+ */
+ static public final float random(float range) {
return random.nextFloat() * range;
}
/** Returns a random number between start (inclusive) and end (exclusive). */
- static public final float random (float start, float end) {
+ static public final float random(float start, float end) {
return start + random.nextFloat() * (end - start);
}
// ---
- /** Returns the next power of two. Returns the specified value if the value is already a power of two. */
- static public int nextPowerOfTwo (int value) {
- if (value == 0) return 1;
+ /**
+ * Returns the next power of two. Returns the specified value if the value
+ * is already a power of two.
+ */
+ static public int nextPowerOfTwo(int value) {
+ if (value == 0)
+ return 1;
value--;
value |= value >> 1;
value |= value >> 2;
@@ -179,27 +192,33 @@ public class MathUtils {
return value + 1;
}
- static public boolean isPowerOfTwo (int value) {
+ static public boolean isPowerOfTwo(int value) {
return value != 0 && (value & value - 1) == 0;
}
// ---
- static public int clamp (int value, int min, int max) {
- if (value < min) return min;
- if (value > max) return max;
+ static public int clamp(int value, int min, int max) {
+ if (value < min)
+ return min;
+ if (value > max)
+ return max;
return value;
}
- static public short clamp (short value, short min, short max) {
- if (value < min) return min;
- if (value > max) return max;
+ static public short clamp(short value, short min, short max) {
+ if (value < min)
+ return min;
+ if (value > max)
+ return max;
return value;
}
- static public float clamp (float value, float min, float max) {
- if (value < min) return min;
- if (value > max) return max;
+ static public float clamp(float value, float min, float max) {
+ if (value < min)
+ return min;
+ if (value > max)
+ return max;
return value;
}
@@ -211,38 +230,56 @@ public class MathUtils {
static private final double BIG_ENOUGH_CEIL = Double.longBitsToDouble(Double.doubleToLongBits(BIG_ENOUGH_INT + 1) - 1);
static private final double BIG_ENOUGH_ROUND = BIG_ENOUGH_INT + 0.5f;
- /** Returns the largest integer less than or equal to the specified float. This method will only properly floor floats from
- * -(2^14) to (Float.MAX_VALUE - 2^14). */
- static public int floor (float x) {
- return (int)(x + BIG_ENOUGH_FLOOR) - BIG_ENOUGH_INT;
+ /**
+ * Returns the largest integer less than or equal to the specified float.
+ * This method will only properly floor floats from
+ * -(2^14) to (Float.MAX_VALUE - 2^14).
+ */
+ static public int floor(float x) {
+ return (int) (x + BIG_ENOUGH_FLOOR) - BIG_ENOUGH_INT;
}
- /** Returns the largest integer less than or equal to the specified float. This method will only properly floor floats that are
- * positive. Note this method simply casts the float to int. */
- static public int floorPositive (float x) {
- return (int)x;
+ /**
+ * Returns the largest integer less than or equal to the specified float.
+ * This method will only properly floor floats that are
+ * positive. Note this method simply casts the float to int.
+ */
+ static public int floorPositive(float x) {
+ return (int) x;
}
- /** Returns the smallest integer greater than or equal to the specified float. This method will only properly ceil floats from
- * -(2^14) to (Float.MAX_VALUE - 2^14). */
- static public int ceil (float x) {
- return (int)(x + BIG_ENOUGH_CEIL) - BIG_ENOUGH_INT;
+ /**
+ * Returns the smallest integer greater than or equal to the specified
+ * float. This method will only properly ceil floats from
+ * -(2^14) to (Float.MAX_VALUE - 2^14).
+ */
+ static public int ceil(float x) {
+ return (int) (x + BIG_ENOUGH_CEIL) - BIG_ENOUGH_INT;
}
- /** Returns the smallest integer greater than or equal to the specified float. This method will only properly ceil floats that
- * are positive. */
- static public int ceilPositive (float x) {
- return (int)(x + CEIL);
+ /**
+ * Returns the smallest integer greater than or equal to the specified
+ * float. This method will only properly ceil floats that
+ * are positive.
+ */
+ static public int ceilPositive(float x) {
+ return (int) (x + CEIL);
}
- /** Returns the closest integer to the specified float. This method will only properly round floats from -(2^14) to
- * (Float.MAX_VALUE - 2^14). */
- static public int round (float x) {
- return (int)(x + BIG_ENOUGH_ROUND) - BIG_ENOUGH_INT;
+ /**
+ * Returns the closest integer to the specified float. This method will only
+ * properly round floats from -(2^14) to
+ * (Float.MAX_VALUE - 2^14).
+ */
+ static public int round(float x) {
+ return (int) (x + BIG_ENOUGH_ROUND) - BIG_ENOUGH_INT;
}
- /** Returns the closest integer to the specified float. This method will only properly round floats that are positive. */
- static public int roundPositive (float x) {
- return (int)(x + 0.5f);
+ /**
+ * Returns the closest integer to the specified float. This method will only
+ * properly round floats that are positive.
+ */
+ static public int roundPositive(float x) {
+ return (int) (x + 0.5f);
}
}
diff --git a/vtm/src/org/oscim/utils/OBB2D.java b/vtm/src/org/oscim/utils/OBB2D.java
index 9bcceb89..11fcfc0b 100644
--- a/vtm/src/org/oscim/utils/OBB2D.java
+++ b/vtm/src/org/oscim/utils/OBB2D.java
@@ -16,7 +16,7 @@ package org.oscim.utils;
/**
* from http://www.flipcode.com/archives/2D_OBB_Intersection.shtml
- *
+ *
* @author Morgan McGuire morgan@cs.brown.edu
* @author Hannes Janetzek
*/
@@ -134,14 +134,15 @@ public class OBB2D {
computeAxes();
}
- public void setNormalized(float cx, float cy, float vx, float vy, float width, float height, float dy) {
+ public void setNormalized(float cx, float cy, float vx, float vy, float width, float height,
+ float dy) {
float ux = -vy;
float uy = vx;
float hw = width / 2;
float hh = height / 2;
- if (dy != 0){
+ if (dy != 0) {
cx += vx * dy + vy * dy;
cy += -vy * dy + vx * dy;
}
diff --git a/vtm/src/org/oscim/utils/PausableThread.java b/vtm/src/org/oscim/utils/PausableThread.java
index e84bf02f..0d9c4220 100644
--- a/vtm/src/org/oscim/utils/PausableThread.java
+++ b/vtm/src/org/oscim/utils/PausableThread.java
@@ -134,7 +134,7 @@ public abstract class PausableThread extends Thread {
/**
* Called when this thread is not paused and should do its work.
- *
+ *
* @throws InterruptedException
* if the thread has been interrupted.
*/
diff --git a/vtm/src/org/oscim/utils/UTF8Decoder.java b/vtm/src/org/oscim/utils/UTF8Decoder.java
index 63add61b..59d9ff2e 100644
--- a/vtm/src/org/oscim/utils/UTF8Decoder.java
+++ b/vtm/src/org/oscim/utils/UTF8Decoder.java
@@ -1,4 +1,3 @@
-
package org.oscim.utils;
/*
@@ -29,7 +28,7 @@ public class UTF8Decoder {
public String decode(byte[] data, int offset, int byteCount) {
if ((offset | byteCount) < 0 || byteCount > data.length - offset) {
throw new IllegalArgumentException("Brrr " + data.length
- + " " + offset + " " + byteCount);
+ + " " + offset + " " + byteCount);
}
byte[] d = data;
@@ -51,7 +50,7 @@ public class UTF8Decoder {
int val = b0 & 0xff;
v[s++] = (char) val;
} else if (((b0 & 0xe0) == 0xc0) || ((b0 & 0xf0) == 0xe0) ||
- ((b0 & 0xf8) == 0xf0) || ((b0 & 0xfc) == 0xf8) || ((b0 & 0xfe) == 0xfc)) {
+ ((b0 & 0xf8) == 0xf0) || ((b0 & 0xfc) == 0xf8) || ((b0 & 0xfe) == 0xfc)) {
int utfCount = 1;
if ((b0 & 0xf0) == 0xe0)
utfCount = 2;
diff --git a/vtm/src/org/oscim/utils/async/AsyncExecutor.java b/vtm/src/org/oscim/utils/async/AsyncExecutor.java
index 575e7c99..54b8a714 100644
--- a/vtm/src/org/oscim/utils/async/AsyncExecutor.java
+++ b/vtm/src/org/oscim/utils/async/AsyncExecutor.java
@@ -23,25 +23,29 @@ import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
/**
- * Allows asnynchronous execution of {@link AsyncTask} instances on a separate thread.
- * Needs to be disposed via a call to {@link #dispose()} when no longer used, in which
+ * Allows asnynchronous execution of {@link AsyncTask} instances on a separate
+ * thread.
+ * Needs to be disposed via a call to {@link #dispose()} when no longer used, in
+ * which
* case the executor waits for running tasks to finish. Scheduled but not yet
* running tasks will not be executed.
+ *
* @author badlogic
- *
+ *
*/
public class AsyncExecutor {
private final ExecutorService executor;
/**
- * Creates a new AsynchExecutor that allows maxConcurrent
- * {@link Runnable} instances to run in parallel.
+ * Creates a new AsynchExecutor that allows maxConcurrent {@link Runnable}
+ * instances to run in parallel.
+ *
* @param maxConcurrent
*/
public AsyncExecutor(int maxConcurrent) {
executor = Executors.newFixedThreadPool(maxConcurrent, new ThreadFactory() {
@Override
- public Thread newThread (Runnable r) {
+ public Thread newThread(Runnable r) {
Thread thread = new Thread(r, "VtmAsyncExecutor");
thread.setDaemon(true);
return thread;
@@ -53,13 +57,14 @@ public class AsyncExecutor {
* Submits a {@link Runnable} to be executed asynchronously. If
* maxConcurrent runnables are already running, the runnable
* will be queued.
+ *
* @param task the task to execute asynchronously
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
public