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

Add missing @Override annotations (#617)

Browse Source
This commit is contained in:
Gustl22 2018-12-12 00:49:00 +01:00 committed by Emux
parent a62d77583b
commit d806d6bcca
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
52 changed files with 514 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vtm-android-example/src/org/oscim/android/test/MapActivity.java
View File

@ -38,6 +38,7 @@ public class MapActivity extends Activity {
this(R.layout.activity_map);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(mContentView);

1
vtm-android-example/src/org/oscim/android/test/MultiMapViewActivity.java
View File

@ -35,6 +35,7 @@ public class MultiMapViewActivity extends Activity {
private MapView mMapView1, mMapView2;
private MapPreferences mPrefs1, mPrefs2;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_map_multi);

3
vtm-android-example/src/org/oscim/android/test/PoiSearchActivity.java
View File

@ -96,6 +96,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
Button addItem = (Button) findViewById(R.id.add_item);
addItem.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
searchPatterns.add(new Pattern("", ""));
adapter.notifyDataSetChanged();
@ -104,6 +105,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
Button startSearch = (Button) findViewById(R.id.start_search);
startSearch.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// Clear overlays
mMarkerLayer.removeAllItems();
@ -244,6 +246,7 @@ public class PoiSearchActivity extends MapsforgeActivity implements ItemizedLaye
Button remove = (Button) convertView.findViewById(R.id.remove);
remove.setTag(pattern);
remove.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Pattern pat = (Pattern) v.getTag();
remove(pat);

2
vtm-android/src/org/oscim/android/MapView.java
View File

@ -139,10 +139,12 @@ public class MapView extends GLSurfaceView {
mMap.destroy();
}
@Override
public void onPause() {
mMap.pause(true);
}
@Override
public void onResume() {
mMap.pause(false);
}

3
vtm-app/src/org/oscim/app/MapLayers.java
View File

@ -56,15 +56,18 @@ public class MapLayers {
}
static Config[] configs = new Config[]{new Config("OPENSCIENCEMAP4") {
@Override
TileSource init() {
return new OSciMap4TileSource();
}
}, new Config("MAPSFORGE") {
@Override
TileSource init() {
return new MapFileTileSource().setOption("file",
"/storage/sdcard0/germany.map");
}
}, new Config("MAPNIK_VECTOR") {
@Override
TileSource init() {
return new MapnikVectorTileSource();
}

1
vtm-app/src/org/osmdroid/location/FlickrPOIProvider.java
View File

@ -149,6 +149,7 @@ public class FlickrPOIProvider implements POIProvider {
* Null if
* technical issue.
*/
@Override
public ArrayList<POI> getPOIInside(BoundingBox boundingBox, String query, int maxResults) {
String url = getUrlInside(boundingBox, maxResults);
return getThem(url);

1
vtm-app/src/org/osmdroid/location/FourSquareProvider.java
View File

@ -137,6 +137,7 @@ public class FourSquareProvider implements POIProvider {
* Null if
* technical issue.
*/
@Override
public ArrayList<POI> getPOIInside(BoundingBox boundingBox, String query, int maxResults) {
String url = getUrlInside(boundingBox, query, maxResults);
return getThem(url);

1
vtm-app/src/org/osmdroid/location/NominatimPOIProvider.java
View File

@ -150,6 +150,7 @@ public class NominatimPOIProvider implements POIProvider {
* @param maxResults ...
* @return list of POIs, null if technical issue.
*/
@Override
public ArrayList<POI> getPOIInside(BoundingBox boundingBox, String type, int maxResults) {
String url = getUrlInside(boundingBox, type, maxResults);
return getThem(url);

1
vtm-app/src/org/osmdroid/location/PicasaPOIProvider.java
View File

@ -95,6 +95,7 @@ public class PicasaPOIProvider implements POIProvider {
* @return list of POI, Picasa photos inside the bounding box. Null if
* technical issue.
*/
@Override
public List<POI> getPOIInside(BoundingBox boundingBox, String query, int maxResults) {
String url = getUrlInside(boundingBox, maxResults, query);
return getThem(url);

144
vtm-desktop/src/org/oscim/gdx/LwjglGL20.java
View File

@ -68,54 +68,67 @@ public class LwjglGL20 implements GL {
return intBuffer;
}
@Override
public void activeTexture(int texture) {
GL13.glActiveTexture(texture);
}
@Override
public void attachShader(int program, int shader) {
GL20.glAttachShader(program, shader);
}
@Override
public void bindAttribLocation(int program, int index, String name) {
GL20.glBindAttribLocation(program, index, name);
}
@Override
public void bindBuffer(int target, int buffer) {
GL15.glBindBuffer(target, buffer);
}
@Override
public void bindFramebuffer(int target, int framebuffer) {
EXTFramebufferObject.glBindFramebufferEXT(target, framebuffer);
}
@Override
public void bindRenderbuffer(int target, int renderbuffer) {
EXTFramebufferObject.glBindRenderbufferEXT(target, renderbuffer);
}
@Override
public void bindTexture(int target, int texture) {
GL11.glBindTexture(target, texture);
}
@Override
public void blendColor(float red, float green, float blue, float alpha) {
GL14.glBlendColor(red, green, blue, alpha);
}
@Override
public void blendEquation(int mode) {
GL14.glBlendEquation(mode);
}
@Override
public void blendEquationSeparate(int modeRGB, int modeAlpha) {
GL20.glBlendEquationSeparate(modeRGB, modeAlpha);
}
@Override
public void blendFunc(int sfactor, int dfactor) {
GL11.glBlendFunc(sfactor, dfactor);
}
@Override
public void blendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
GL14.glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
}
@Override
public void bufferData(int target, int size, Buffer data, int usage) {
if (data == null)
GL15.glBufferData(target, size, usage);
@ -131,6 +144,7 @@ public class LwjglGL20 implements GL {
GL15.glBufferData(target, (ShortBuffer) data, usage);
}
@Override
public void bufferSubData(int target, int offset, int size, Buffer data) {
if (data == null)
throw new GdxRuntimeException("Using null for the data not possible, blame LWJGL");
@ -146,34 +160,42 @@ public class LwjglGL20 implements GL {
GL15.glBufferSubData(target, offset, (ShortBuffer) data);
}
@Override
public int checkFramebufferStatus(int target) {
return EXTFramebufferObject.glCheckFramebufferStatusEXT(target);
}
@Override
public void clear(int mask) {
GL11.glClear(mask);
}
@Override
public void clearColor(float red, float green, float blue, float alpha) {
GL11.glClearColor(red, green, blue, alpha);
}
@Override
public void clearDepthf(float depth) {
GL11.glClearDepth(depth);
}
@Override
public void clearStencil(int s) {
GL11.glClearStencil(s);
}
@Override
public void colorMask(boolean red, boolean green, boolean blue, boolean alpha) {
GL11.glColorMask(red, green, blue, alpha);
}
@Override
public void compileShader(int shader) {
GL20.glCompileShader(shader);
}
@Override
public void compressedTexImage2D(int target, int level, int internalformat, int width, int height, int border,
int imageSize, Buffer data) {
if (data instanceof ByteBuffer) {
@ -183,31 +205,38 @@ public class LwjglGL20 implements GL {
}
}
@Override
public void compressedTexSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format,
int imageSize, Buffer data) {
throw new GdxRuntimeException("not implemented");
}
@Override
public void copyTexImage2D(int target, int level, int internalformat, int x, int y, int width, int height, int border) {
GL11.glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
}
@Override
public void copyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y, int width, int height) {
GL11.glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
}
@Override
public int createProgram() {
return GL20.glCreateProgram();
}
@Override
public int createShader(int type) {
return GL20.glCreateShader(type);
}
@Override
public void cullFace(int mode) {
GL11.glCullFace(mode);
}
@Override
public void deleteBuffers(int n, IntBuffer buffers) {
GL15.glDeleteBuffers(buffers);
}
@ -216,6 +245,7 @@ public class LwjglGL20 implements GL {
GL15.glDeleteBuffers(buffer);
}
@Override
public void deleteFramebuffers(int n, IntBuffer framebuffers) {
EXTFramebufferObject.glDeleteFramebuffersEXT(framebuffers);
}
@ -224,10 +254,12 @@ public class LwjglGL20 implements GL {
EXTFramebufferObject.glDeleteFramebuffersEXT(framebuffer);
}
@Override
public void deleteProgram(int program) {
GL20.glDeleteProgram(program);
}
@Override
public void deleteRenderbuffers(int n, IntBuffer renderbuffers) {
EXTFramebufferObject.glDeleteRenderbuffersEXT(renderbuffers);
}
@ -236,10 +268,12 @@ public class LwjglGL20 implements GL {
EXTFramebufferObject.glDeleteRenderbuffersEXT(renderbuffer);
}
@Override
public void deleteShader(int shader) {
GL20.glDeleteShader(shader);
}
@Override
public void deleteTextures(int n, IntBuffer textures) {
GL11.glDeleteTextures(textures);
}
@ -248,34 +282,42 @@ public class LwjglGL20 implements GL {
GL11.glDeleteTextures(texture);
}
@Override
public void depthFunc(int func) {
GL11.glDepthFunc(func);
}
@Override
public void depthMask(boolean flag) {
GL11.glDepthMask(flag);
}
@Override
public void depthRangef(float zNear, float zFar) {
GL11.glDepthRange(zNear, zFar);
}
@Override
public void detachShader(int program, int shader) {
GL20.glDetachShader(program, shader);
}
@Override
public void disable(int cap) {
GL11.glDisable(cap);
}
@Override
public void disableVertexAttribArray(int index) {
GL20.glDisableVertexAttribArray(index);
}
@Override
public void drawArrays(int mode, int first, int count) {
GL11.glDrawArrays(mode, first, count);
}
@Override
public void drawElements(int mode, int count, int type, Buffer indices) {
if (indices instanceof ShortBuffer && type == com.badlogic.gdx.graphics.GL20.GL_UNSIGNED_SHORT)
GL11.glDrawElements(mode, (ShortBuffer) indices);
@ -288,34 +330,42 @@ public class LwjglGL20 implements GL {
+ " with this method. Use ShortBuffer or ByteBuffer instead. Blame LWJGL");
}
@Override
public void enable(int cap) {
GL11.glEnable(cap);
}
@Override
public void enableVertexAttribArray(int index) {
GL20.glEnableVertexAttribArray(index);
}
@Override
public void finish() {
GL11.glFinish();
}
@Override
public void flush() {
GL11.glFlush();
}
@Override
public void framebufferRenderbuffer(int target, int attachment, int renderbuffertarget, int renderbuffer) {
EXTFramebufferObject.glFramebufferRenderbufferEXT(target, attachment, renderbuffertarget, renderbuffer);
}
@Override
public void framebufferTexture2D(int target, int attachment, int textarget, int texture, int level) {
EXTFramebufferObject.glFramebufferTexture2DEXT(target, attachment, textarget, texture, level);
}
@Override
public void frontFace(int mode) {
GL11.glFrontFace(mode);
}
@Override
public void genBuffers(int n, IntBuffer buffers) {
GL15.glGenBuffers(buffers);
}
@ -324,6 +374,7 @@ public class LwjglGL20 implements GL {
return GL15.glGenBuffers();
}
@Override
public void genFramebuffers(int n, IntBuffer framebuffers) {
EXTFramebufferObject.glGenFramebuffersEXT(framebuffers);
}
@ -332,6 +383,7 @@ public class LwjglGL20 implements GL {
return EXTFramebufferObject.glGenFramebuffersEXT();
}
@Override
public void genRenderbuffers(int n, IntBuffer renderbuffers) {
EXTFramebufferObject.glGenRenderbuffersEXT(renderbuffers);
}
@ -340,6 +392,7 @@ public class LwjglGL20 implements GL {
return EXTFramebufferObject.glGenRenderbuffersEXT();
}
@Override
public void genTextures(int n, IntBuffer textures) {
GL11.glGenTextures(textures);
}
@ -348,10 +401,12 @@ public class LwjglGL20 implements GL {
return GL11.glGenTextures();
}
@Override
public void generateMipmap(int target) {
EXTFramebufferObject.glGenerateMipmapEXT(target);
}
@Override
public String getActiveAttrib(int program, int index, IntBuffer size, Buffer type) {
// FIXME this is less than ideal of course...
IntBuffer typeTmp = BufferUtils.createIntBuffer(2);
@ -361,6 +416,7 @@ public class LwjglGL20 implements GL {
return name;
}
@Override
public String getActiveUniform(int program, int index, IntBuffer size, Buffer type) {
// FIXME this is less than ideal of course...
IntBuffer typeTmp = BufferUtils.createIntBuffer(2);
@ -370,38 +426,47 @@ public class LwjglGL20 implements GL {
return name;
}
@Override
public void getAttachedShaders(int program, int maxcount, Buffer count, IntBuffer shaders) {
GL20.glGetAttachedShaders(program, (IntBuffer) count, shaders);
}
@Override
public int getAttribLocation(int program, String name) {
return GL20.glGetAttribLocation(program, name);
}
@Override
public void getBooleanv(int pname, Buffer params) {
GL11.glGetBoolean(pname, (ByteBuffer) params);
}
@Override
public void getBufferParameteriv(int target, int pname, IntBuffer params) {
GL15.glGetBufferParameter(target, pname, params);
}
@Override
public int getError() {
return GL11.glGetError();
}
@Override
public void getFloatv(int pname, FloatBuffer params) {
GL11.glGetFloat(pname, params);
}
@Override
public void getFramebufferAttachmentParameteriv(int target, int attachment, int pname, IntBuffer params) {
EXTFramebufferObject.glGetFramebufferAttachmentParameterEXT(target, attachment, pname, params);
}
@Override
public void getIntegerv(int pname, IntBuffer params) {
GL11.glGetInteger(pname, params);
}
@Override
public String getProgramInfoLog(int program) {
ByteBuffer buffer = ByteBuffer.allocateDirect(1024 * 10);
buffer.order(ByteOrder.nativeOrder());
@ -416,14 +481,17 @@ public class LwjglGL20 implements GL {
return new String(bytes);
}
@Override
public void getProgramiv(int program, int pname, IntBuffer params) {
GL20.glGetProgram(program, pname, params);
}
@Override
public void getRenderbufferParameteriv(int target, int pname, IntBuffer params) {
EXTFramebufferObject.glGetRenderbufferParameterEXT(target, pname, params);
}
@Override
public String getShaderInfoLog(int shader) {
ByteBuffer buffer = ByteBuffer.allocateDirect(1024 * 10);
buffer.order(ByteOrder.nativeOrder());
@ -438,98 +506,122 @@ public class LwjglGL20 implements GL {
return new String(bytes);
}
@Override
public void getShaderPrecisionFormat(int shadertype, int precisiontype, IntBuffer range, IntBuffer precision) {
throw new UnsupportedOperationException("unsupported, won't implement");
}
@Override
public void getShaderiv(int shader, int pname, IntBuffer params) {
GL20.glGetShader(shader, pname, params);
}
@Override
public String getString(int name) {
return GL11.glGetString(name);
}
@Override
public void getTexParameterfv(int target, int pname, FloatBuffer params) {
GL11.glGetTexParameter(target, pname, params);
}
@Override
public void getTexParameteriv(int target, int pname, IntBuffer params) {
GL11.glGetTexParameter(target, pname, params);
}
@Override
public int getUniformLocation(int program, String name) {
return GL20.glGetUniformLocation(program, name);
}
@Override
public void getUniformfv(int program, int location, FloatBuffer params) {
GL20.glGetUniform(program, location, params);
}
@Override
public void getUniformiv(int program, int location, IntBuffer params) {
GL20.glGetUniform(program, location, params);
}
@Override
public void getVertexAttribPointerv(int index, int pname, Buffer pointer) {
throw new UnsupportedOperationException("unsupported, won't implement");
}
@Override
public void getVertexAttribfv(int index, int pname, FloatBuffer params) {
GL20.glGetVertexAttrib(index, pname, params);
}
@Override
public void getVertexAttribiv(int index, int pname, IntBuffer params) {
GL20.glGetVertexAttrib(index, pname, params);
}
@Override
public void hint(int target, int mode) {
GL11.glHint(target, mode);
}
@Override
public boolean isBuffer(int buffer) {
return GL15.glIsBuffer(buffer);
}
@Override
public boolean isEnabled(int cap) {
return GL11.glIsEnabled(cap);
}
@Override
public boolean isFramebuffer(int framebuffer) {
return EXTFramebufferObject.glIsFramebufferEXT(framebuffer);
}
@Override
public boolean isProgram(int program) {
return GL20.glIsProgram(program);
}
@Override
public boolean isRenderbuffer(int renderbuffer) {
return EXTFramebufferObject.glIsRenderbufferEXT(renderbuffer);
}
@Override
public boolean isShader(int shader) {
return GL20.glIsShader(shader);
}
@Override
public boolean isTexture(int texture) {
return GL11.glIsTexture(texture);
}
@Override
public void lineWidth(float width) {
GL11.glLineWidth(width);
}
@Override
public void linkProgram(int program) {
GL20.glLinkProgram(program);
}
@Override
public void pixelStorei(int pname, int param) {
GL11.glPixelStorei(pname, param);
}
@Override
public void polygonOffset(float factor, float units) {
GL11.glPolygonOffset(factor, units);
}
@Override
public void readPixels(int x, int y, int width, int height, int format, int type, Buffer pixels) {
if (pixels instanceof ByteBuffer)
GL11.glReadPixels(x, y, width, height, format, type, (ByteBuffer) pixels);
@ -544,54 +636,67 @@ public class LwjglGL20 implements GL {
+ " with this method. Use ByteBuffer, ShortBuffer, IntBuffer or FloatBuffer instead. Blame LWJGL");
}
@Override
public void releaseShaderCompiler() {
// nothing to do here
}
@Override
public void renderbufferStorage(int target, int internalformat, int width, int height) {
EXTFramebufferObject.glRenderbufferStorageEXT(target, internalformat, width, height);
}
@Override
public void sampleCoverage(float value, boolean invert) {
GL13.glSampleCoverage(value, invert);
}
@Override
public void scissor(int x, int y, int width, int height) {
GL11.glScissor(x, y, width, height);
}
@Override
public void shaderBinary(int n, IntBuffer shaders, int binaryformat, Buffer binary, int length) {
throw new UnsupportedOperationException("unsupported, won't implement");
}
@Override
public void shaderSource(int shader, String string) {
GL20.glShaderSource(shader, string);
}
@Override
public void stencilFunc(int func, int ref, int mask) {
GL11.glStencilFunc(func, ref, mask);
}
@Override
public void stencilFuncSeparate(int face, int func, int ref, int mask) {
GL20.glStencilFuncSeparate(face, func, ref, mask);
}
@Override
public void stencilMask(int mask) {
GL11.glStencilMask(mask);
}
@Override
public void stencilMaskSeparate(int face, int mask) {
GL20.glStencilMaskSeparate(face, mask);
}
@Override
public void stencilOp(int fail, int zfail, int zpass) {
GL11.glStencilOp(fail, zfail, zpass);
}
@Override
public void stencilOpSeparate(int face, int fail, int zfail, int zpass) {
GL20.glStencilOpSeparate(face, fail, zfail, zpass);
}
@Override
public void texImage2D(int target, int level, int internalformat, int width, int height, int border, int format, int type,
Buffer pixels) {
if (pixels == null)
@ -611,22 +716,27 @@ public class LwjglGL20 implements GL {
+ " with this method. Use ByteBuffer, ShortBuffer, IntBuffer, FloatBuffer or DoubleBuffer instead. Blame LWJGL");
}
@Override
public void texParameterf(int target, int pname, float param) {
GL11.glTexParameterf(target, pname, param);
}
@Override
public void texParameterfv(int target, int pname, FloatBuffer params) {
GL11.glTexParameter(target, pname, params);
}
@Override
public void texParameteri(int target, int pname, int param) {
GL11.glTexParameteri(target, pname, param);
}
@Override
public void texParameteriv(int target, int pname, IntBuffer params) {
GL11.glTexParameter(target, pname, params);
}
@Override
public void texSubImage2D(int target, int level, int xoffset, int yoffset, int width, int height, int format, int type,
Buffer pixels) {
if (pixels instanceof ByteBuffer)
@ -644,10 +754,12 @@ public class LwjglGL20 implements GL {
+ " with this method. Use ByteBuffer, ShortBuffer, IntBuffer, FloatBuffer or DoubleBuffer instead. Blame LWJGL");
}
@Override
public void uniform1f(int location, float x) {
GL20.glUniform1f(location, x);
}
@Override
public void uniform1fv(int location, int count, FloatBuffer v) {
GL20.glUniform1(location, v);
}
@ -656,10 +768,12 @@ public class LwjglGL20 implements GL {
GL20.glUniform1(location, toFloatBuffer(v, offset, count));
}
@Override
public void uniform1i(int location, int x) {
GL20.glUniform1i(location, x);
}
@Override
public void uniform1iv(int location, int count, IntBuffer v) {
GL20.glUniform1(location, v);
}
@ -668,10 +782,12 @@ public class LwjglGL20 implements GL {
GL20.glUniform1(location, toIntBuffer(v, offset, count));
}
@Override
public void uniform2f(int location, float x, float y) {
GL20.glUniform2f(location, x, y);
}
@Override
public void uniform2fv(int location, int count, FloatBuffer v) {
GL20.glUniform2(location, v);
}
@ -680,10 +796,12 @@ public class LwjglGL20 implements GL {
GL20.glUniform2(location, toFloatBuffer(v, offset, count << 1));
}
@Override
public void uniform2i(int location, int x, int y) {
GL20.glUniform2i(location, x, y);
}
@Override
public void uniform2iv(int location, int count, IntBuffer v) {
GL20.glUniform2(location, v);
}
@ -692,10 +810,12 @@ public class LwjglGL20 implements GL {
GL20.glUniform2(location, toIntBuffer(v, offset, count << 1));
}
@Override
public void uniform3f(int location, float x, float y, float z) {
GL20.glUniform3f(location, x, y, z);
}
@Override
public void uniform3fv(int location, int count, FloatBuffer v) {
GL20.glUniform3(location, v);
}
@ -704,10 +824,12 @@ public class LwjglGL20 implements GL {
GL20.glUniform3(location, toFloatBuffer(v, offset, count * 3));
}
@Override
public void uniform3i(int location, int x, int y, int z) {
GL20.glUniform3i(location, x, y, z);
}
@Override
public void uniform3iv(int location, int count, IntBuffer v) {
GL20.glUniform3(location, v);
}
@ -716,10 +838,12 @@ public class LwjglGL20 implements GL {
GL20.glUniform3(location, toIntBuffer(v, offset, count * 3));
}
@Override
public void uniform4f(int location, float x, float y, float z, float w) {
GL20.glUniform4f(location, x, y, z, w);
}
@Override
public void uniform4fv(int location, int count, FloatBuffer v) {
GL20.glUniform4(location, v);
}
@ -728,10 +852,12 @@ public class LwjglGL20 implements GL {
GL20.glUniform4(location, toFloatBuffer(v, offset, count << 2));
}
@Override
public void uniform4i(int location, int x, int y, int z, int w) {
GL20.glUniform4i(location, x, y, z, w);
}
@Override
public void uniform4iv(int location, int count, IntBuffer v) {
GL20.glUniform4(location, v);
}
@ -740,6 +866,7 @@ public class LwjglGL20 implements GL {
GL20.glUniform4(location, toIntBuffer(v, offset, count << 2));
}
@Override
public void uniformMatrix2fv(int location, int count, boolean transpose, FloatBuffer value) {
GL20.glUniformMatrix2(location, transpose, value);
}
@ -748,6 +875,7 @@ public class LwjglGL20 implements GL {
GL20.glUniformMatrix2(location, transpose, toFloatBuffer(value, offset, count << 2));
}
@Override
public void uniformMatrix3fv(int location, int count, boolean transpose, FloatBuffer value) {
GL20.glUniformMatrix3(location, transpose, value);
}
@ -756,6 +884,7 @@ public class LwjglGL20 implements GL {
GL20.glUniformMatrix3(location, transpose, toFloatBuffer(value, offset, count * 9));
}
@Override
public void uniformMatrix4fv(int location, int count, boolean transpose, FloatBuffer value) {
GL20.glUniformMatrix4(location, transpose, value);
}
@ -764,46 +893,57 @@ public class LwjglGL20 implements GL {
GL20.glUniformMatrix4(location, transpose, toFloatBuffer(value, offset, count << 4));
}
@Override
public void useProgram(int program) {
GL20.glUseProgram(program);
}
@Override
public void validateProgram(int program) {
GL20.glValidateProgram(program);
}
@Override
public void vertexAttrib1f(int indx, float x) {
GL20.glVertexAttrib1f(indx, x);
}
@Override
public void vertexAttrib1fv(int indx, FloatBuffer values) {
GL20.glVertexAttrib1f(indx, values.get());
}
@Override
public void vertexAttrib2f(int indx, float x, float y) {
GL20.glVertexAttrib2f(indx, x, y);
}
@Override
public void vertexAttrib2fv(int indx, FloatBuffer values) {
GL20.glVertexAttrib2f(indx, values.get(), values.get());
}
@Override
public void vertexAttrib3f(int indx, float x, float y, float z) {
GL20.glVertexAttrib3f(indx, x, y, z);
}
@Override
public void vertexAttrib3fv(int indx, FloatBuffer values) {
GL20.glVertexAttrib3f(indx, values.get(), values.get(), values.get());
}
@Override
public void vertexAttrib4f(int indx, float x, float y, float z, float w) {
GL20.glVertexAttrib4f(indx, x, y, z, w);
}
@Override
public void vertexAttrib4fv(int indx, FloatBuffer values) {
GL20.glVertexAttrib4f(indx, values.get(), values.get(), values.get(), values.get());
}
@Override
public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride, Buffer buffer) {
if (buffer instanceof ByteBuffer) {
if (type == BYTE)
@ -834,18 +974,22 @@ public class LwjglGL20 implements GL {
+ " with this method. Use ByteBuffer instead. Blame LWJGL");
}
@Override
public void viewport(int x, int y, int width, int height) {
GL11.glViewport(x, y, width, height);
}
@Override
public void drawElements(int mode, int count, int type, int indices) {
GL11.glDrawElements(mode, count, type, indices);
}
@Override
public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride, int ptr) {
GL20.glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
}
@Override
public void getShaderSource(int shader, int bufsize, Buffer length, String source) {
}
}

1
vtm-extras/src/org/oscim/core/osm/OsmWay.java
View File

@ -43,6 +43,7 @@ public class OsmWay extends OsmElement {
return "w" + id;
}
@Override
public Geometry toJts() {
double[] coords = new double[nodes.size() * 2];
int i = 0;

144
vtm-ios/src/org/oscim/ios/backend/IosGL.java
View File

@ -29,38 +29,47 @@ public class IosGL implements GL {
private static final IOSGLES20 iOSGL = new IOSGLES20();
@Override
public void activeTexture(int texture) {
iOSGL.glActiveTexture(texture);
}
@Override
public void bindTexture(int target, int texture) {
iOSGL.glBindTexture(target, texture);
}
@Override
public void blendFunc(int sfactor, int dfactor) {
iOSGL.glBlendFunc(sfactor, dfactor);
}
@Override
public void clear(int mask) {
iOSGL.glClear(mask);
}
@Override
public void clearColor(float red, float green, float blue, float alpha) {
iOSGL.glClearColor(red, green, blue, alpha);
}
@Override
public void clearDepthf(float depth) {
iOSGL.glClearDepthf(depth);
}
@Override
public void clearStencil(int s) {
iOSGL.glClearStencil(s);
}
@Override
public void colorMask(boolean red, boolean green, boolean blue, boolean alpha) {
iOSGL.glColorMask(red, green, blue, alpha);
}
@Override
public void compressedTexImage2D(int target, int level, int internalformat, int width,
int height, int border,
int imageSize, Buffer data) {
@ -75,6 +84,7 @@ public class IosGL implements GL {
data);
}
@Override
public void compressedTexSubImage2D(int target, int level, int xoffset, int yoffset,
int width, int height, int format,
int imageSize, Buffer data) {
@ -90,6 +100,7 @@ public class IosGL implements GL {
data);
}
@Override
public void copyTexImage2D(int target, int level, int internalformat, int x, int y,
int width, int height, int border) {
iOSGL.glCopyTexImage2D(
@ -103,6 +114,7 @@ public class IosGL implements GL {
border);
}
@Override
public void copyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
int width, int height) {
iOSGL.glCopyTexSubImage2D(
@ -116,86 +128,107 @@ public class IosGL implements GL {
height);
}
@Override
public void cullFace(int mode) {
iOSGL.glCullFace(mode);
}
@Override
public void deleteTextures(int n, IntBuffer textures) {
iOSGL.glDeleteTextures(n, textures);
}
@Override
public void depthFunc(int func) {
iOSGL.glDepthFunc(func);
}
@Override
public void depthMask(boolean flag) {
iOSGL.glDepthMask(flag);
}
@Override
public void depthRangef(float zNear, float zFar) {
iOSGL.glDepthRangef(zNear, zFar);
}
@Override
public void disable(int cap) {
iOSGL.glDisable(cap);
}
@Override
public void drawArrays(int mode, int first, int count) {
iOSGL.glDrawArrays(mode, first, count);
}
@Override
public void drawElements(int mode, int count, int type, Buffer indices) {
iOSGL.glDrawElements(mode, count, type, indices);
}
@Override
public void enable(int cap) {
iOSGL.glEnable(cap);
}
@Override
public void finish() {
iOSGL.glFinish();
}
@Override
public void flush() {
iOSGL.glFlush();
}
@Override
public void frontFace(int mode) {
iOSGL.glFrontFace(mode);
}
@Override
public void genTextures(int n, IntBuffer textures) {
iOSGL.glGenTextures(n, textures);
}
@Override
public int getError() {
return iOSGL.glGetError();
}
@Override
public void getIntegerv(int pname, IntBuffer params) {
iOSGL.glGetIntegerv(pname, params);
}
@Override
public String getString(int name) {
return iOSGL.glGetString(name);
}
@Override
public void hint(int target, int mode) {
iOSGL.glHint(target, mode);
}
@Override
public void lineWidth(float width) {
iOSGL.glLineWidth(width);
}
@Override
public void pixelStorei(int pname, int param) {
iOSGL.glPixelStorei(pname, param);
}
@Override
public void polygonOffset(float factor, float units) {
iOSGL.glPolygonOffset(factor, units);
}
@Override
public void readPixels(int x, int y, int width, int height, int format, int type,
Buffer pixels) {
iOSGL.glReadPixels(
@ -208,22 +241,27 @@ public class IosGL implements GL {
pixels);
}
@Override
public void scissor(int x, int y, int width, int height) {
iOSGL.glScissor(x, y, width, height);
}
@Override
public void stencilFunc(int func, int ref, int mask) {
iOSGL.glStencilFunc(func, ref, mask);
}
@Override
public void stencilMask(int mask) {
iOSGL.glStencilMask(mask);
}
@Override
public void stencilOp(int fail, int zfail, int zpass) {
iOSGL.glStencilOp(fail, zfail, zpass);
}
@Override
public void texImage2D(int target, int level, int internalFormat, int width, int height,
int border, int format, int type,
Buffer pixels) {
@ -239,10 +277,12 @@ public class IosGL implements GL {
pixels);
}
@Override
public void texParameterf(int target, int pname, float param) {
iOSGL.glTexParameterf(target, pname, param);
}
@Override
public void texSubImage2D(int target, int level, int xoffset, int yoffset, int width,
int height, int format, int type,
Buffer pixels) {
@ -258,152 +298,189 @@ public class IosGL implements GL {
pixels);
}
@Override
public void viewport(int x, int y, int width, int height) {
iOSGL.glViewport(x, y, width, height);
}
@Override
public void getFloatv(int pname, FloatBuffer params) {
iOSGL.glGetFloatv(pname, params);
}
@Override
public void getTexParameterfv(int target, int pname, FloatBuffer params) {
iOSGL.glGetTexParameterfv(target, pname, params);
}
@Override
public void texParameterfv(int target, int pname, FloatBuffer params) {
iOSGL.glTexParameterfv(target, pname, params);
}
@Override
public void bindBuffer(int target, int buffer) {
iOSGL.glBindBuffer(target, buffer);
}
@Override
public void bufferData(int target, int size, Buffer data, int usage) {
iOSGL.glBufferData(target, size, data, usage);
}
@Override
public void bufferSubData(int target, int offset, int size, Buffer data) {
iOSGL.glBufferSubData(target, offset, size, data);
}
@Override
public void deleteBuffers(int n, IntBuffer buffers) {
iOSGL.glDeleteBuffers(n, buffers);
}
@Override
public void getBufferParameteriv(int target, int pname, IntBuffer params) {
iOSGL.glGetBufferParameteriv(target, pname, params);
}
@Override
public void genBuffers(int n, IntBuffer buffers) {
iOSGL.glGenBuffers(n, buffers);
}
@Override
public void getTexParameteriv(int target, int pname, IntBuffer params) {
iOSGL.glGetTexParameteriv(target, pname, params);
}
@Override
public boolean isBuffer(int buffer) {
return iOSGL.glIsBuffer(buffer);
}
@Override
public boolean isEnabled(int cap) {
return iOSGL.glIsEnabled(cap);
}
@Override
public boolean isTexture(int texture) {
return iOSGL.glIsTexture(texture);
}
@Override
public void texParameteri(int target, int pname, int param) {
iOSGL.glTexParameteri(target, pname, param);
}
@Override
public void texParameteriv(int target, int pname, IntBuffer params) {
iOSGL.glTexParameteriv(target, pname, params);
}
@Override
public void drawElements(int mode, int count, int type, int indices) {
iOSGL.glDrawElements(mode, count, type, indices);
}
@Override
public void attachShader(int program, int shader) {
iOSGL.glAttachShader(program, shader);
}
@Override
public void bindAttribLocation(int program, int index, String name) {
iOSGL.glBindAttribLocation(program, index, name);
}
@Override
public void bindFramebuffer(int target, int framebuffer) {
iOSGL.glBindFramebuffer(target, framebuffer);
}
@Override
public void bindRenderbuffer(int target, int renderbuffer) {
iOSGL.glBindRenderbuffer(target, renderbuffer);
}
@Override
public void blendColor(float red, float green, float blue, float alpha) {
iOSGL.glBlendColor(red, green, blue, alpha);
}
@Override
public void blendEquation(int mode) {
iOSGL.glBlendEquation(mode);
}
@Override
public void blendEquationSeparate(int modeRGB, int modeAlpha) {
iOSGL.glBlendEquationSeparate(modeRGB, modeAlpha);
}
@Override
public void blendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
iOSGL.glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
}
@Override
public int checkFramebufferStatus(int target) {
return iOSGL.glCheckFramebufferStatus(target);
}
@Override
public void compileShader(int shader) {
iOSGL.glCompileShader(shader);
}
@Override
public int createProgram() {
return iOSGL.glCreateProgram();
}
@Override
public int createShader(int type) {
return iOSGL.glCreateShader(type);
}
@Override
public void deleteFramebuffers(int n, IntBuffer framebuffers) {
iOSGL.glDeleteFramebuffers(n, framebuffers);
}
@Override
public void deleteProgram(int program) {
iOSGL.glDeleteProgram(program);
}
@Override
public void deleteRenderbuffers(int n, IntBuffer renderbuffers) {
iOSGL.glDeleteRenderbuffers(
n,
renderbuffers);
}
@Override
public void deleteShader(int shader) {
iOSGL.glDeleteShader(shader);
}
@Override
public void detachShader(int program, int shader) {
iOSGL.glDetachShader(program, shader);
}
@Override
public void disableVertexAttribArray(int index) {
iOSGL.glDisableVertexAttribArray(index);
}
@Override
public void enableVertexAttribArray(int index) {
iOSGL.glEnableVertexAttribArray(index);
}
@Override
public void framebufferRenderbuffer(int target, int attachment, int renderbuffertarget,
int renderbuffer) {
iOSGL.glFramebufferRenderbuffer(
@ -413,6 +490,7 @@ public class IosGL implements GL {
renderbuffer);
}
@Override
public void framebufferTexture2D(int target, int attachment, int textarget, int texture,
int level) {
iOSGL.glFramebufferTexture2D(
@ -423,19 +501,23 @@ public class IosGL implements GL {
level);
}
@Override
public void generateMipmap(int target) {
iOSGL.glGenerateMipmap(target);
}
@Override
public void genFramebuffers(int n, IntBuffer framebuffers) {
iOSGL.glGenFramebuffers(n, framebuffers);
}
@Override
public void genRenderbuffers(int n, IntBuffer renderbuffers) {
iOSGL
.glGenRenderbuffers(n, renderbuffers);
}
@Override
public String getActiveAttrib(int program, int index, IntBuffer size, Buffer type) {
return iOSGL.glGetActiveAttrib(
program,
@ -444,6 +526,7 @@ public class IosGL implements GL {
type);
}
@Override
public String getActiveUniform(int program, int index, IntBuffer size, Buffer type) {
return iOSGL.glGetActiveUniform(
program,
@ -452,6 +535,7 @@ public class IosGL implements GL {
type);
}
@Override
public void getAttachedShaders(int program, int maxcount, Buffer count, IntBuffer shaders) {
iOSGL.glGetAttachedShaders(
program,
@ -460,14 +544,17 @@ public class IosGL implements GL {
shaders);
}
@Override
public int getAttribLocation(int program, String name) {
return iOSGL.glGetAttribLocation(program, name);
}
@Override
public void getBooleanv(int pname, Buffer params) {
iOSGL.glGetBooleanv(pname, params);
}
@Override
public void getFramebufferAttachmentParameteriv(int target, int attachment, int pname,
IntBuffer params) {
iOSGL.glGetFramebufferAttachmentParameteriv(
@ -477,14 +564,17 @@ public class IosGL implements GL {
params);
}
@Override
public void getProgramiv(int program, int pname, IntBuffer params) {
iOSGL.glGetProgramiv(program, pname, params);
}
@Override
public String getProgramInfoLog(int program) {
return iOSGL.glGetProgramInfoLog(program);
}
@Override
public void getRenderbufferParameteriv(int target, int pname, IntBuffer params) {
iOSGL.glGetRenderbufferParameteriv(
target,
@ -492,14 +582,17 @@ public class IosGL implements GL {
params);
}
@Override
public void getShaderiv(int shader, int pname, IntBuffer params) {
iOSGL.glGetShaderiv(shader, pname, params);
}
@Override
public String getShaderInfoLog(int shader) {
return iOSGL.glGetShaderInfoLog(shader);
}
@Override
public void getShaderPrecisionFormat(int shadertype, int precisiontype, IntBuffer range,
IntBuffer precision) {
iOSGL.glGetShaderPrecisionFormat(
@ -509,30 +602,37 @@ public class IosGL implements GL {
precision);
}
@Override
public void getShaderSource(int shader, int bufsize, Buffer length, String source) {
throw new UnsupportedOperationException("Not implemented");
}
@Override
public void getUniformfv(int program, int location, FloatBuffer params) {
iOSGL.glGetUniformfv(program, location, params);
}
@Override
public void getUniformiv(int program, int location, IntBuffer params) {
iOSGL.glGetUniformiv(program, location, params);
}
@Override
public int getUniformLocation(int program, String name) {
return iOSGL.glGetUniformLocation(program, name);
}
@Override
public void getVertexAttribfv(int index, int pname, FloatBuffer params) {
iOSGL.glGetVertexAttribfv(index, pname, params);
}
@Override
public void getVertexAttribiv(int index, int pname, IntBuffer params) {
iOSGL.glGetVertexAttribiv(index, pname, params);
}
@Override
public void getVertexAttribPointerv(int index, int pname, Buffer pointer) {
iOSGL.glGetVertexAttribPointerv(
index,
@ -540,38 +640,47 @@ public class IosGL implements GL {
pointer);
}
@Override
public boolean isFramebuffer(int framebuffer) {
return iOSGL.glIsFramebuffer(framebuffer);
}
@Override
public boolean isProgram(int program) {
return iOSGL.glIsProgram(program);
}
@Override
public boolean isRenderbuffer(int renderbuffer) {
return iOSGL.glIsRenderbuffer(renderbuffer);
}
@Override
public boolean isShader(int shader) {
return iOSGL.glIsShader(shader);
}
@Override
public void linkProgram(int program) {
iOSGL.glLinkProgram(program);
}
@Override
public void releaseShaderCompiler() {
iOSGL.glReleaseShaderCompiler();
}
@Override
public void renderbufferStorage(int target, int internalformat, int width, int height) {
iOSGL.glRenderbufferStorage(target, internalformat, width, height);
}
@Override
public void sampleCoverage(float value, boolean invert) {
iOSGL.glSampleCoverage(value, invert);
}
@Override
public void shaderBinary(int n, IntBuffer shaders, int binaryformat, Buffer binary, int length) {
iOSGL.glShaderBinary(
n,
@ -581,86 +690,107 @@ public class IosGL implements GL {
length);
}
@Override
public void shaderSource(int shader, String string) {
iOSGL.glShaderSource(shader, string);
}
@Override
public void stencilFuncSeparate(int face, int func, int ref, int mask) {
iOSGL.glStencilFuncSeparate(face, func, ref, mask);
}
@Override
public void stencilMaskSeparate(int face, int mask) {
iOSGL.glStencilMaskSeparate(face, mask);
}
@Override
public void stencilOpSeparate(int face, int fail, int zfail, int zpass) {
iOSGL.glStencilOpSeparate(face, fail, zfail, zpass);
}
@Override
public void uniform1f(int location, float x) {
iOSGL.glUniform1f(location, x);
}
@Override
public void uniform1fv(int location, int count, FloatBuffer v) {
iOSGL.glUniform1fv(location, count, v);
}
@Override
public void uniform1i(int location, int x) {
iOSGL.glUniform1i(location, x);
}
@Override
public void uniform1iv(int location, int count, IntBuffer v) {
iOSGL.glUniform1iv(location, count, v);
}
@Override
public void uniform2f(int location, float x, float y) {
iOSGL.glUniform2f(location, x, y);
}
@Override
public void uniform2fv(int location, int count, FloatBuffer v) {
iOSGL.glUniform2fv(location, count, v);
}
@Override
public void uniform2i(int location, int x, int y) {
iOSGL.glUniform2i(location, x, y);
}
@Override
public void uniform2iv(int location, int count, IntBuffer v) {
iOSGL.glUniform2iv(location, count, v);
}
@Override
public void uniform3f(int location, float x, float y, float z) {
iOSGL.glUniform3f(location, x, y, z);
}
@Override
public void uniform3fv(int location, int count, FloatBuffer v) {
iOSGL.glUniform3fv(location, count, v);
}
@Override
public void uniform3i(int location, int x, int y, int z) {
iOSGL.glUniform3i(location, x, y, z);
}
@Override
public void uniform3iv(int location, int count, IntBuffer v) {
iOSGL.glUniform3iv(location, count, v);
}
@Override
public void uniform4f(int location, float x, float y, float z, float w) {
iOSGL.glUniform4f(location, x, y, z, w);
}
@Override
public void uniform4fv(int location, int count, FloatBuffer v) {
iOSGL.glUniform4fv(location, count, v);
}
@Override
public void uniform4i(int location, int x, int y, int z, int w) {
iOSGL.glUniform4i(location, x, y, z, w);
}
@Override
public void uniform4iv(int location, int count, IntBuffer v) {
iOSGL.glUniform4iv(location, count, v);
}
@Override
public void uniformMatrix2fv(int location, int count, boolean transpose, FloatBuffer value) {
iOSGL.glUniformMatrix2fv(
location,
@ -669,6 +799,7 @@ public class IosGL implements GL {
value);
}
@Override
public void uniformMatrix3fv(int location, int count, boolean transpose, FloatBuffer value) {
iOSGL.glUniformMatrix3fv(
location,
@ -677,6 +808,7 @@ public class IosGL implements GL {
value);
}
@Override
public void uniformMatrix4fv(int location, int count, boolean transpose, FloatBuffer value) {
iOSGL.glUniformMatrix4fv(
location,
@ -685,46 +817,57 @@ public class IosGL implements GL {
value);
}
@Override
public void useProgram(int program) {
iOSGL.glUseProgram(program);
}
@Override
public void validateProgram(int program) {
iOSGL.glValidateProgram(program);
}
@Override
public void vertexAttrib1f(int indx, float x) {
iOSGL.glVertexAttrib1f(indx, x);
}
@Override
public void vertexAttrib1fv(int indx, FloatBuffer values) {
iOSGL.glVertexAttrib1fv(indx, values);
}
@Override
public void vertexAttrib2f(int indx, float x, float y) {
iOSGL.glVertexAttrib2f(indx, x, y);
}
@Override
public void vertexAttrib2fv(int indx, FloatBuffer values) {
iOSGL.glVertexAttrib2fv(indx, values);
}
@Override
public void vertexAttrib3f(int indx, float x, float y, float z) {
iOSGL.glVertexAttrib3f(indx, x, y, z);
}
@Override
public void vertexAttrib3fv(int indx, FloatBuffer values) {
iOSGL.glVertexAttrib3fv(indx, values);
}
@Override
public void vertexAttrib4f(int indx, float x, float y, float z, float w) {
iOSGL.glVertexAttrib4f(indx, x, y, z, w);
}
@Override
public void vertexAttrib4fv(int indx, FloatBuffer values) {
iOSGL.glVertexAttrib4fv(indx, values);
}
@Override
public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
Buffer ptr) {
iOSGL.glVertexAttribPointer(
@ -736,6 +879,7 @@ public class IosGL implements GL {
ptr);
}
@Override
public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
int ptr) {
iOSGL.glVertexAttribPointer(indx, size, type, normalized, stride, ptr);

5
vtm-ios/src/svg/SVGRenderer.java
View File

@ -44,6 +44,7 @@ public class SVGRenderer extends SVGParser implements SVGContext, GHRenderable {
initObject(init(utf8String));
}
@Override
@Method(selector = "initWithString:")
protected native
@Pointer
@ -54,15 +55,19 @@ public class SVGRenderer extends SVGParser implements SVGContext, GHRenderable {
@ByVal
CGRect getViewRect();
@Override
@Method(selector = "colorForSVGColorString:")
public native UIColor colorForSVGColorString(String svgColorString);
@Override
@Method(selector = "objectAtURL:")
public native NSObject objectAtURL(String aLocation);
@Override
@Property(selector = "transform")
public native CGAffineTransform getTransform();
@Override
@Property(selector = "hidden")
public native boolean isHidden();

2
vtm-jeo/src/org/oscim/layers/OSMIndoorLayer.java
View File

@ -65,6 +65,7 @@ public class OSMIndoorLayer extends JeoVectorLayer {
mTextLayer.prepare();
}
@Override
protected void addLine(Task t, Feature f, Rule rule, Geometry g) {
if (((LineString) g).isClosed()) {
@ -86,6 +87,7 @@ public class OSMIndoorLayer extends JeoVectorLayer {
addLine(t, g, ll);
}
@Override
protected void addPolygon(Task t, Feature f, Rule rule, Geometry g) {
int level = getLevel(f);

1
vtm-json/src/org/oscim/tiling/source/geojson/MapzenGeojsonTileSource.java
View File

@ -42,6 +42,7 @@ public class MapzenGeojsonTileSource extends GeojsonTileSource {
return self();
}
@Override
public MapzenGeojsonTileSource build() {
return new MapzenGeojsonTileSource(this);
}

1
vtm-json/src/org/oscim/tiling/source/geojson/NextzenGeojsonTileSource.java
View File

@ -41,6 +41,7 @@ public class NextzenGeojsonTileSource extends GeojsonTileSource {
return self();
}
@Override
public NextzenGeojsonTileSource build() {
return new NextzenGeojsonTileSource(this);
}

1
vtm-mvt/src/org/oscim/tiling/source/mvt/MapilionMvtTileSource.java
View File

@ -37,6 +37,7 @@ public class MapilionMvtTileSource extends UrlTileSource {
return self();
}
@Override
public MapilionMvtTileSource build() {
return new MapilionMvtTileSource(this);
}

1
vtm-mvt/src/org/oscim/tiling/source/mvt/MapzenMvtTileSource.java
View File

@ -41,6 +41,7 @@ public class MapzenMvtTileSource extends UrlTileSource {
return self();
}
@Override
public MapzenMvtTileSource build() {
return new MapzenMvtTileSource(this);
}

1
vtm-mvt/src/org/oscim/tiling/source/mvt/NextzenMvtTileSource.java
View File

@ -38,6 +38,7 @@ public class NextzenMvtTileSource extends UrlTileSource {
return self();
}
@Override
public NextzenMvtTileSource build() {
return new NextzenMvtTileSource(this);
}

1
vtm-mvt/src/org/oscim/tiling/source/mvt/OpenMapTilesMvtTileSource.java
View File

@ -41,6 +41,7 @@ public class OpenMapTilesMvtTileSource extends UrlTileSource {
return self();
}
@Override
public OpenMapTilesMvtTileSource build() {
return new OpenMapTilesMvtTileSource(this);
}

1
vtm-theme-comparator/src/org/oscim/theme/comparator/editor/Menu.java
View File

@ -39,6 +39,7 @@ class Menu extends JToolBar {
JButton openButton = new JButton(ICON_OPEN);
openButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
try {
themeLoader.selectThemeFile();

1
vtm-theme-comparator/src/org/oscim/theme/comparator/mapsforge/MapsforgeMapPanel.java
View File

@ -80,6 +80,7 @@ public class MapsforgeMapPanel extends JPanel {
mapView.setBounds(10, 20, getWidth() - 20, getHeight() - 30);
}
@Override
public void componentMoved(ComponentEvent e) {
super.componentMoved(e);
mapView.setBounds(10, 20, getWidth() - 20, getHeight() - 30);

1
vtm-theme-comparator/src/org/oscim/theme/comparator/vtm/MapAdapter.java
View File

@ -124,6 +124,7 @@ public class MapAdapter extends Map implements Map.UpdateListener {
}
@Override
public boolean handleGesture(Gesture g, MotionEvent e) {
this.updateMap(true);
return super.handleGesture(g, e);

6
vtm-web-app/src/org/oscim/web/client/SearchBox.java
View File

@ -125,6 +125,7 @@ public class SearchBox {
return this.lon;
}-*/;
@Override
public final native String getIcon() /*-{
return this.icon;
}-*/;
@ -242,6 +243,7 @@ public class SearchBox {
}
});
selectionModel.addSelectionChangeHandler(new SelectionChangeEvent.Handler() {
@Override
public void onSelectionChange(SelectionChangeEvent event) {
final PoiData d = selectionModel.getSelectedObject();
@ -307,6 +309,7 @@ public class SearchBox {
/**
* Fired when the user clicks on the sendButton.
*/
@Override
public void onClick(ClickEvent event) {
sendRequest();
}
@ -314,6 +317,7 @@ public class SearchBox {
/**
* Fired when the user types in the nameField.
*/
@Override
public void onKeyUp(KeyUpEvent event) {
if (event.getNativeKeyCode() == KeyCodes.KEY_ENTER) {
sendRequest();
@ -335,11 +339,13 @@ public class SearchBox {
JsonpRequestBuilder builder = new JsonpRequestBuilder();
builder.setCallbackParam("json_callback");
builder.requestObject(url, new AsyncCallback<JsArray<NominatimData>>() {
@Override
public void onFailure(Throwable caught) {
log.debug("request failed");
searchButton.setEnabled(true);
}
@Override
public void onSuccess(JsArray<NominatimData> data) {
List<PoiData> items = new ArrayList<PoiData>();
for (int i = 0, n = data.length(); i < n; i++) {

144
vtm-web/src/org/oscim/gdx/client/GdxGL.java
View File

@ -73,38 +73,47 @@ public class GdxGL extends GwtGL20 implements GL {
}
}
@Override
public void activeTexture(int texture) {
glActiveTexture(texture);
}
@Override
public void bindTexture(int target, int texture) {
glBindTexture(target, texture);
}
@Override
public void blendFunc(int sfactor, int dfactor) {
glBlendFunc(sfactor, dfactor);
}
@Override
public void clear(int mask) {
glClear(mask);
}
@Override
public void clearColor(float red, float green, float blue, float alpha) {
glClearColor(red, green, blue, alpha);
}
@Override
public void clearDepthf(float depth) {
glClearDepthf(depth);
}
@Override
public void clearStencil(int s) {
glClearStencil(s);
}
@Override
public void colorMask(boolean red, boolean green, boolean blue, boolean alpha) {
glColorMask(red, green, blue, alpha);
}
@Override
public void compressedTexImage2D(int target, int level, int internalformat, int width,
int height, int border,
int imageSize, Buffer data) {
@ -119,6 +128,7 @@ public class GdxGL extends GwtGL20 implements GL {
data);
}
@Override
public void compressedTexSubImage2D(int target, int level, int xoffset, int yoffset,
int width, int height, int format,
int imageSize, Buffer data) {
@ -133,117 +143,145 @@ public class GdxGL extends GwtGL20 implements GL {
data);
}
@Override
public void copyTexImage2D(int target, int level, int internalformat, int x, int y,
int width, int height, int border) {
glCopyTexImage2D(target, level, internalformat, x, y, width, height, border);
}
@Override
public void copyTexSubImage2D(int target, int level, int xoffset, int yoffset, int x, int y,
int width, int height) {
glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y, width, height);
}
@Override
public void cullFace(int mode) {
glCullFace(mode);
}
@Override
public void deleteTextures(int n, IntBuffer textures) {
glDeleteTextures(n, textures);
}
@Override
public void depthFunc(int func) {
glDepthFunc(func);
}
@Override
public void depthMask(boolean flag) {
glDepthMask(flag);
}
@Override
public void depthRangef(float zNear, float zFar) {
glDepthRangef(zNear, zFar);
}
@Override
public void disable(int cap) {
glDisable(cap);
}
@Override
public void drawArrays(int mode, int first, int count) {
glDrawArrays(mode, first, count);
}
@Override
public void drawElements(int mode, int count, int type, Buffer indices) {
glDrawElements(mode, count, type, indices);
}
@Override
public void enable(int cap) {
glEnable(cap);
}
@Override
public void finish() {
glFinish();
}
@Override
public void flush() {
glFlush();
}
@Override
public void frontFace(int mode) {
glFrontFace(mode);
}
@Override
public void genTextures(int n, IntBuffer textures) {
glGenTextures(n, textures);
}
@Override
public int getError() {
return glGetError();
}
@Override
public void getIntegerv(int pname, IntBuffer params) {
glGetIntegerv(pname, params);
}
@Override
public String getString(int name) {
return glGetString(name);
}
@Override
public void hint(int target, int mode) {
glHint(target, mode);
}
@Override
public void lineWidth(float width) {
glLineWidth(width);
}
@Override
public void pixelStorei(int pname, int param) {
glPixelStorei(pname, param);
}
@Override
public void polygonOffset(float factor, float units) {
glPolygonOffset(factor, units);
}
@Override
public void readPixels(int x, int y, int width, int height, int format, int type,
Buffer pixels) {
glReadPixels(x, y, width, height, format, type, pixels);
}
@Override
public void scissor(int x, int y, int width, int height) {
glScissor(x, y, width, height);
}
@Override
public void stencilFunc(int func, int ref, int mask) {
glStencilFunc(func, ref, mask);
}
@Override
public void stencilMask(int mask) {
glStencilMask(mask);
}
@Override
public void stencilOp(int fail, int zfail, int zpass) {
glStencilOp(fail, zfail, zpass);
}
@Override
public void texImage2D(int target, int level, int internalFormat, int width, int height,
int border, int format, int type,
Buffer pixels) {
@ -258,10 +296,12 @@ public class GdxGL extends GwtGL20 implements GL {
pixels);
}
@Override
public void texParameterf(int target, int pname, float param) {
glTexParameterf(target, pname, param);
}
@Override
public void texSubImage2D(int target, int level, int xoffset, int yoffset, int width,
int height, int format, int type,
Buffer pixels) {
@ -276,172 +316,214 @@ public class GdxGL extends GwtGL20 implements GL {
pixels);
}
@Override
public void viewport(int x, int y, int width, int height) {
glViewport(x, y, width, height);
}
@Override
public void getFloatv(int pname, FloatBuffer params) {
glGetFloatv(pname, params);
}
@Override
public void getTexParameterfv(int target, int pname, FloatBuffer params) {
glGetTexParameterfv(target, pname, params);
}
@Override
public void texParameterfv(int target, int pname, FloatBuffer params) {
glTexParameterfv(target, pname, params);
}
@Override
public void bindBuffer(int target, int buffer) {
glBindBuffer(target, buffer);
}
@Override
public void bufferData(int target, int size, Buffer data, int usage) {
glBufferData(target, size, data, usage);
}
@Override
public void bufferSubData(int target, int offset, int size, Buffer data) {
glBufferSubData(target, offset, size, data);
}
@Override
public void deleteBuffers(int n, IntBuffer buffers) {
glDeleteBuffers(n, buffers);
}
@Override
public void getBufferParameteriv(int target, int pname, IntBuffer params) {
glGetBufferParameteriv(target, pname, params);
}
@Override
public void genBuffers(int n, IntBuffer buffers) {
glGenBuffers(n, buffers);
}
@Override
public void getTexParameteriv(int target, int pname, IntBuffer params) {
glGetTexParameteriv(target, pname, params);
}
@Override
public boolean isBuffer(int buffer) {
return glIsBuffer(buffer);
}
@Override
public boolean isEnabled(int cap) {
return glIsEnabled(cap);
}
@Override
public boolean isTexture(int texture) {
return glIsTexture(texture);
}
@Override
public void texParameteri(int target, int pname, int param) {
glTexParameteri(target, pname, param);
}
@Override
public void texParameteriv(int target, int pname, IntBuffer params) {
glTexParameteriv(target, pname, params);
}
@Override
public void drawElements(int mode, int count, int type, int indices) {
glDrawElements(mode, count, type, indices);
}
@Override
public void attachShader(int program, int shader) {
glAttachShader(program, shader);
}
@Override
public void bindAttribLocation(int program, int index, String name) {
glBindAttribLocation(program, index, name);
}
@Override
public void bindFramebuffer(int target, int framebuffer) {
glBindFramebuffer(target, framebuffer);
}
@Override
public void bindRenderbuffer(int target, int renderbuffer) {
glBindRenderbuffer(target, renderbuffer);
}
@Override
public void blendColor(float red, float green, float blue, float alpha) {
glBlendColor(red, green, blue, alpha);
}
@Override
public void blendEquation(int mode) {
glBlendEquation(mode);
}
@Override
public void blendEquationSeparate(int modeRGB, int modeAlpha) {
glBlendEquationSeparate(modeRGB, modeAlpha);
}
@Override
public void blendFuncSeparate(int srcRGB, int dstRGB, int srcAlpha, int dstAlpha) {
glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
}
@Override
public int checkFramebufferStatus(int target) {
return glCheckFramebufferStatus(target);
}
@Override
public void compileShader(int shader) {
glCompileShader(shader);
}
@Override
public int createProgram() {
return glCreateProgram();
}
@Override
public int createShader(int type) {
return glCreateShader(type);
}
@Override
public void deleteFramebuffers(int n, IntBuffer framebuffers) {
glDeleteFramebuffers(n, framebuffers);
}
@Override
public void deleteProgram(int program) {
glDeleteProgram(program);
}
@Override
public void deleteRenderbuffers(int n, IntBuffer renderbuffers) {
glDeleteRenderbuffers(n, renderbuffers);
}
@Override
public void deleteShader(int shader) {
glDeleteShader(shader);
}
@Override
public void detachShader(int program, int shader) {
glDetachShader(program, shader);
}
@Override
public void disableVertexAttribArray(int index) {
glDisableVertexAttribArray(index);
}
@Override
public void enableVertexAttribArray(int index) {
glEnableVertexAttribArray(index);
}
@Override
public void framebufferRenderbuffer(int target, int attachment, int renderbuffertarget,
int renderbuffer) {
glFramebufferRenderbuffer(target, attachment, renderbuffertarget, renderbuffer);
}
@Override
public void framebufferTexture2D(int target, int attachment, int textarget, int texture,
int level) {
glFramebufferTexture2D(target, attachment, textarget, texture, level);
}
@Override
public void generateMipmap(int target) {
glGenerateMipmap(target);
}
@Override
public void genFramebuffers(int n, IntBuffer framebuffers) {
glGenFramebuffers(n, framebuffers);
}
@Override
public void genRenderbuffers(int n, IntBuffer renderbuffers) {
glGenRenderbuffers(n, renderbuffers);
}
@Override
public String getActiveAttrib(int program, int index, IntBuffer size, Buffer type) {
return glGetActiveAttrib(program,
index,
@ -449,6 +531,7 @@ public class GdxGL extends GwtGL20 implements GL {
type);
}
@Override
public String getActiveUniform(int program, int index, IntBuffer size, Buffer type) {
return glGetActiveUniform(program,
index,
@ -456,6 +539,7 @@ public class GdxGL extends GwtGL20 implements GL {
type);
}
@Override
public void getAttachedShaders(int program, int maxcount, Buffer count, IntBuffer shaders) {
glGetAttachedShaders(program,
maxcount,
@ -463,14 +547,17 @@ public class GdxGL extends GwtGL20 implements GL {
shaders);
}
@Override
public int getAttribLocation(int program, String name) {
return glGetAttribLocation(program, name);
}
@Override
public void getBooleanv(int pname, Buffer params) {
glGetBooleanv(pname, params);
}
@Override
public void getFramebufferAttachmentParameteriv(int target, int attachment, int pname,
IntBuffer params) {
glGetFramebufferAttachmentParameteriv(target,
@ -479,26 +566,32 @@ public class GdxGL extends GwtGL20 implements GL {
params);
}
@Override
public void getProgramiv(int program, int pname, IntBuffer params) {
glGetProgramiv(program, pname, params);
}
@Override
public String getProgramInfoLog(int program) {
return glGetProgramInfoLog(program);
}
@Override
public void getRenderbufferParameteriv(int target, int pname, IntBuffer params) {
glGetRenderbufferParameteriv(target, pname, params);
}
@Override
public void getShaderiv(int shader, int pname, IntBuffer params) {
glGetShaderiv(shader, pname, params);
}
@Override
public String getShaderInfoLog(int shader) {
return glGetShaderInfoLog(shader);
}
@Override
public void getShaderPrecisionFormat(int shadertype, int precisiontype, IntBuffer range,
IntBuffer precision) {
glGetShaderPrecisionFormat(shadertype,
@ -507,66 +600,82 @@ public class GdxGL extends GwtGL20 implements GL {
precision);
}
@Override
public void getShaderSource(int shader, int bufsize, Buffer length, String source) {
throw new UnsupportedOperationException("Not implemented");
}
@Override
public void getUniformfv(int program, int location, FloatBuffer params) {
glGetUniformfv(program, location, params);
}
@Override
public void getUniformiv(int program, int location, IntBuffer params) {
glGetUniformiv(program, location, params);
}
@Override
public int getUniformLocation(int program, String name) {
return glGetUniformLocation(program, name);
}
@Override
public void getVertexAttribfv(int index, int pname, FloatBuffer params) {
glGetVertexAttribfv(index, pname, params);
}
@Override
public void getVertexAttribiv(int index, int pname, IntBuffer params) {
glGetVertexAttribiv(index, pname, params);
}
@Override
public void getVertexAttribPointerv(int index, int pname, Buffer pointer) {
glGetVertexAttribPointerv(index, pname, pointer);
}
@Override
public boolean isFramebuffer(int framebuffer) {
return glIsFramebuffer(framebuffer);
}
@Override
public boolean isProgram(int program) {
return glIsProgram(program);
}
@Override
public boolean isRenderbuffer(int renderbuffer) {
return glIsRenderbuffer(renderbuffer);
}
@Override
public boolean isShader(int shader) {
return glIsShader(shader);
}
@Override
public void linkProgram(int program) {
glLinkProgram(program);
}
@Override
public void releaseShaderCompiler() {
glReleaseShaderCompiler();
}
@Override
public void renderbufferStorage(int target, int internalformat, int width, int height) {
glRenderbufferStorage(target, internalformat, width, height);
}
@Override
public void sampleCoverage(float value, boolean invert) {
glSampleCoverage(value, invert);
}
@Override
public void shaderBinary(int n, IntBuffer shaders, int binaryformat, Buffer binary, int length) {
glShaderBinary(n,
shaders,
@ -575,143 +684,178 @@ public class GdxGL extends GwtGL20 implements GL {
length);
}
@Override
public void shaderSource(int shader, String string) {
glShaderSource(shader, string);
}
@Override
public void stencilFuncSeparate(int face, int func, int ref, int mask) {
glStencilFuncSeparate(face, func, ref, mask);
}
@Override
public void stencilMaskSeparate(int face, int mask) {
glStencilMaskSeparate(face, mask);
}
@Override
public void stencilOpSeparate(int face, int fail, int zfail, int zpass) {
glStencilOpSeparate(face, fail, zfail, zpass);
}
@Override
public void uniform1f(int location, float x) {
glUniform1f(location, x);
}
@Override
public void uniform1fv(int location, int count, FloatBuffer v) {
glUniform1fv(location, count, v);
}
@Override
public void uniform1i(int location, int x) {
glUniform1i(location, x);
}
@Override
public void uniform1iv(int location, int count, IntBuffer v) {
glUniform1iv(location, count, v);
}
@Override
public void uniform2f(int location, float x, float y) {
glUniform2f(location, x, y);
}
@Override
public void uniform2fv(int location, int count, FloatBuffer v) {
glUniform2fv(location, count, v);
}
@Override
public void uniform2i(int location, int x, int y) {
glUniform2i(location, x, y);
}
@Override
public void uniform2iv(int location, int count, IntBuffer v) {
glUniform2iv(location, count, v);
}
@Override
public void uniform3f(int location, float x, float y, float z) {
glUniform3f(location, x, y, z);
}
@Override
public void uniform3fv(int location, int count, FloatBuffer v) {
glUniform3fv(location, count, v);
}
@Override
public void uniform3i(int location, int x, int y, int z) {
glUniform3i(location, x, y, z);
}
@Override
public void uniform3iv(int location, int count, IntBuffer v) {
glUniform3iv(location, count, v);
}
@Override
public void uniform4f(int location, float x, float y, float z, float w) {
glUniform4f(location, x, y, z, w);
}
@Override
public void uniform4fv(int location, int count, FloatBuffer v) {
glUniform4fv(location, count, v);
}
@Override
public void uniform4i(int location, int x, int y, int z, int w) {
glUniform4i(location, x, y, z, w);
}
@Override
public void uniform4iv(int location, int count, IntBuffer v) {
glUniform4iv(location, count, v);
}
@Override
public void uniformMatrix2fv(int location, int count, boolean transpose, FloatBuffer value) {
glUniformMatrix2fv(location, count, transpose, value);
}
@Override
public void uniformMatrix3fv(int location, int count, boolean transpose, FloatBuffer value) {
glUniformMatrix3fv(location, count, transpose, value);
}
@Override
public void uniformMatrix4fv(int location, int count, boolean transpose, FloatBuffer value) {
glUniformMatrix4fv(location, count, transpose, value);
}
@Override
public void useProgram(int program) {
glUseProgram(program);
}
@Override
public void validateProgram(int program) {
glValidateProgram(program);
}
@Override
public void vertexAttrib1f(int indx, float x) {
glVertexAttrib1f(indx, x);
}
@Override
public void vertexAttrib1fv(int indx, FloatBuffer values) {
glVertexAttrib1fv(indx, values);
}
@Override
public void vertexAttrib2f(int indx, float x, float y) {
glVertexAttrib2f(indx, x, y);
}
@Override
public void vertexAttrib2fv(int indx, FloatBuffer values) {
glVertexAttrib2fv(indx, values);
}
@Override
public void vertexAttrib3f(int indx, float x, float y, float z) {
glVertexAttrib3f(indx, x, y, z);
}
@Override
public void vertexAttrib3fv(int indx, FloatBuffer values) {
glVertexAttrib3fv(indx, values);
}
@Override
public void vertexAttrib4f(int indx, float x, float y, float z, float w) {
glVertexAttrib4f(indx, x, y, z, w);
}
@Override
public void vertexAttrib4fv(int indx, FloatBuffer values) {
glVertexAttrib4fv(indx, values);
}
@Override
public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
Buffer ptr) {
glVertexAttribPointer(indx, size, type, normalized, stride, ptr);
}
@Override
public void vertexAttribPointer(int indx, int size, int type, boolean normalized, int stride,
int ptr) {
glVertexAttribPointer(indx, size, type, normalized, stride, ptr);

1
vtm-web/src/org/oscim/gdx/emu/com/badlogic/gdx/backends/gwt/GwtInput.java
View File

@ -187,6 +187,7 @@ public class GwtInput implements Input {
return justPressedKeys[key];
}
@Override
public void getTextInput(TextInputListener listener, String title, String text, String hint) {
TextInputDialogBox dialog = new TextInputDialogBox(title, text, hint);
final TextInputListener capturedListener = listener;

4
vtm-web/src/org/oscim/gdx/emu/org/oscim/backend/MyAttributes.java
View File

@ -12,18 +12,22 @@ public class MyAttributes implements Attributes {
map = n.getAttributes();
}
@Override
public String getValue(int i) {
return map.item(i).getNodeValue();
}
@Override
public int getLength() {
return map.getLength();
}
@Override
public String getLocalName(int i) {
return map.item(i).getNodeName();
}
@Override
public String getValue(String string) {
Node n = map.getNamedItem(string);
if (n == null)

1
vtm-web/src/org/oscim/gdx/emu/org/oscim/tiling/source/LwHttp.java
View File

@ -58,6 +58,7 @@ public class LwHttp implements HttpEngine {
}
}
@Override
public void close() {
if (mHttpRequest == null)
return;

2
vtm-web/src/org/oscim/gdx/emu/org/oscim/tiling/source/bitmap/BitmapTileSource.java
View File

@ -47,6 +47,7 @@ public class BitmapTileSource extends UrlTileSource {
super(null, "/{Z}/{X}/{Y}.png");
}
@Override
public BitmapTileSource build() {
return new BitmapTileSource(this);
}
@ -115,6 +116,7 @@ public class BitmapTileSource extends UrlTileSource {
RootPanel.get().add(img);
img.addLoadHandler(new LoadHandler() {
@Override
public void onLoad(LoadEvent event) {
TileLoader.postLoadDelay(new LoadDelayTask<Image>(tile, sink, img) {

2
vtm-web/src/org/oscim/tiling/source/JsonTileDataSource.java
View File

@ -88,6 +88,7 @@ public class JsonTileDataSource implements ITileDataSource {
//builder.setCallbackParam("json_callback");
mRequestHandle = builder.requestObject(url, new AsyncCallback<JavaScriptObject>() {
@Override
public void onFailure(Throwable caught) {
mSink.completed(FAILED);
@ -95,6 +96,7 @@ public class JsonTileDataSource implements ITileDataSource {
//mRequestHandle.cancel();
}
@Override
public void onSuccess(JavaScriptObject jso) {
if (mTile.state(State.NONE)) {
log.debug("tile cleared {}", url);

1
vtm/src/org/oscim/layers/tile/MapTile.java
View File

@ -155,6 +155,7 @@ public class MapTile extends Tile {
protected abstract void dispose();
@Override
public TileData next() {
return (TileData) next;
}

1
vtm/src/org/oscim/layers/tile/vector/OsmTileLayer.java
View File

@ -62,6 +62,7 @@ public class OsmTileLayer extends VectorTileLayer {
new TagReplacement(Tag.KEY_MIN_HEIGHT)
};
@Override
protected TagSet filterTags(TagSet tagSet) {
Tag[] tags = tagSet.getTags();

1
vtm/src/org/oscim/layers/tile/vector/labeling/LabelLayer.java
View File

@ -97,6 +97,7 @@ public class LabelLayer extends Layer implements Map.UpdateListener, TileManager
mLabelPlacer.cleanup();
}
@Override
public synchronized boolean isRunning() {
return mRunning;
}

1
vtm/src/org/oscim/renderer/bucket/ExtrusionBucket.java
View File

@ -659,6 +659,7 @@ public class ExtrusionBucket extends RenderBucket {
}
}
@Override
public ExtrusionBucket next() {
return (ExtrusionBucket) next;
}

1
vtm/src/org/oscim/renderer/bucket/LineTexBucket.java
View File

@ -101,6 +101,7 @@ public final class LineTexBucket extends LineBucket {
this.evenSegment = true;
}
@Override
public void addLine(GeometryBuffer geom) {
addLine(geom.points, geom.index, -1, false);
}

1
vtm/src/org/oscim/renderer/bucket/MeshBucket.java
View File

@ -91,6 +91,7 @@ public class MeshBucket extends RenderBucket {
//tess.addContour2D(geom.index, geom.points);
}
@Override
protected void prepare() {
if (tess == null)
return;

1
vtm/src/org/oscim/renderer/bucket/TextureBucket.java
View File

@ -76,6 +76,7 @@ public class TextureBucket extends RenderBucket {
compileVertexItems(vboData);
}
@Override
protected void clear() {
while (textures != null)
textures = textures.dispose();

1
vtm/src/org/oscim/renderer/bucket/TextureItem.java
View File

@ -194,6 +194,7 @@ public class TextureItem extends Inlist<TextureItem> {
/**
* Retrieve a TextureItem from pool.
*/
@Override
public synchronized TextureItem get() {
TextureItem t = super.get();

1
vtm/src/org/oscim/theme/ThemeUtils.java
View File

@ -39,6 +39,7 @@ public final class ThemeUtils {
final AtomicBoolean isMapsforgeTheme = new AtomicBoolean(false);
try {
new XMLReaderAdapter().parse(new DefaultHandler() {
@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
if (localName.equals("rendertheme")) {
isMapsforgeTheme.set(uri.equals("http://mapsforge.org/renderTheme"));

1
vtm/src/org/oscim/theme/styles/AreaStyle.java
View File

@ -289,6 +289,7 @@ public class AreaStyle extends RenderStyle<AreaStyle> {
return self();
}
@Override
public AreaStyle build() {
return new AreaStyle(this);
}

1
vtm/src/org/oscim/theme/styles/CircleStyle.java
View File

@ -106,6 +106,7 @@ public final class CircleStyle extends RenderStyle<CircleStyle> {
return self();
}
@Override
public CircleStyle build() {
return new CircleStyle(this);
}

1
vtm/src/org/oscim/theme/styles/ExtrusionStyle.java
View File

@ -176,6 +176,7 @@ public class ExtrusionStyle extends RenderStyle<ExtrusionStyle> {
return self();
}
@Override
public ExtrusionStyle build() {
return new ExtrusionStyle(this);
}

1
vtm/src/org/oscim/theme/styles/LineStyle.java
View File

@ -334,6 +334,7 @@ public final class LineStyle extends RenderStyle<LineStyle> {
return self();
}
@Override
public LineStyle build() {
return new LineStyle(this);
}

1
vtm/src/org/oscim/theme/styles/SymbolStyle.java
View File

@ -206,6 +206,7 @@ public final class SymbolStyle extends RenderStyle<SymbolStyle> {
return self();
}
@Override
public SymbolStyle build() {
return new SymbolStyle(this);
}

1
vtm/src/org/oscim/theme/styles/TextStyle.java
View File

@ -74,6 +74,7 @@ public final class TextStyle extends RenderStyle<TextStyle> {
reset();
}
@Override
public TextStyle build() {
TextStyle t = new TextStyle(this);
t.fontHeight = t.paint.getFontHeight();

1
vtm/src/org/oscim/tiling/source/LwHttp.java
View File

@ -255,6 +255,7 @@ public class LwHttp implements HttpEngine {
throw new IOException("No Socket");
}
@Override
public synchronized InputStream read() throws IOException {
checkSocket();

1
vtm/src/org/oscim/tiling/source/bitmap/BitmapTileSource.java
View File

@ -41,6 +41,7 @@ public class BitmapTileSource extends UrlTileSource {
super(null, "/{Z}/{X}/{Y}.png");
}
@Override
public BitmapTileSource build() {
return new BitmapTileSource(this);
}

1
vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
View File

@ -34,6 +34,7 @@ public class OSciMap4TileSource extends UrlTileSource {
overZoom(17);
}
@Override
public OSciMap4TileSource build() {
return new OSciMap4TileSource(this);
}

6
vtm/src/org/oscim/utils/BitmapPacker.java
View File

@ -129,9 +129,11 @@ public class BitmapPacker {
public static class GuillotineStrategy implements PackStrategy {
Comparator<Bitmap> comparator;
@Override
public void sort(ArrayList<Bitmap> Bitmaps) {
if (comparator == null) {
comparator = new Comparator<Bitmap>() {
@Override
public int compare(Bitmap o1, Bitmap o2) {
return Math.max(o1.getWidth(), o1.getHeight()) - Math.max(o2.getWidth(), o2.getHeight());
}
@ -140,6 +142,7 @@ public class BitmapPacker {
Collections.sort(Bitmaps, comparator);
}
@Override
public PackerAtlasItem pack(BitmapPacker packer, Object key, Rect rect) {
GuillotineAtlasItem atlasItem;
if (packer.packerAtlasItems.size() == 0) {
@ -236,9 +239,11 @@ public class BitmapPacker {
public static class SkylineStrategy implements PackStrategy {
Comparator<Bitmap> comparator;
@Override
public void sort(ArrayList<Bitmap> images) {
if (comparator == null) {
comparator = new Comparator<Bitmap>() {
@Override
public int compare(Bitmap o1, Bitmap o2) {
return o1.getHeight() - o2.getHeight();
}
@ -247,6 +252,7 @@ public class BitmapPacker {
Collections.sort(images, comparator);
}
@Override
public PackerAtlasItem pack(BitmapPacker packer, Object key, Rect rect) {
int padding = packer.padding;
int atlasWidth = packer.atlasWidth - padding * 2, atlasHeight = packer.atlasHeight - padding * 2;

8
vtm/src/org/oscim/utils/RTree.java
View File

@ -290,6 +290,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
releaseRect(r);
}
@Override
public void insert(Box box, T item) {
Rect r = getRect();
r.set(box);
@ -312,6 +313,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return removed;
}
@Override
public boolean remove(Box box, T item) {
Rect r = getRect();
r.set(box);
@ -342,6 +344,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return true;
}
@Override
public boolean search(Box bbox, SearchCb<T> cb, Object context) {
Rect r = getRect();
r.set(bbox);
@ -352,6 +355,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return true;
}
@Override
public List<T> search(Box bbox, List<T> results) {
if (results == null)
results = new ArrayList<T>(16);
@ -370,6 +374,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
* Count the data elements in this container. This is slow as no internal
* counter is maintained.
*/
@Override
public int size() {
int[] count = {0};
countRec(mRoot, count);
@ -393,6 +398,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
/**
* Remove all entries from tree.
*/
@Override
public void clear() {
/* Delete all existing nodes */
reset();
@ -913,6 +919,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
return new Stack();
}
@Override
protected boolean clearItem(Stack item) {
if (item.tos != 0) {
item.tos = 0;
@ -1007,6 +1014,7 @@ public class RTree<T> implements SpatialIndex<T>, Iterable<T> {
/* Find the next data element */
@SuppressWarnings("unchecked")
@Override
public T next() {
assert (isNotNull());
StackElement curTos = stack[tos - 1];

1
vtm/src/org/oscim/utils/async/AsyncTask.java
View File

@ -48,6 +48,7 @@ public abstract class AsyncTask extends Task {
*
* @return Task.DONE on success, Task.ERROR otherwise
*/
@Override
public abstract int go(boolean canceled);
/**

2
vtm/src/org/oscim/utils/quadtree/BoxTree.java
View File

@ -186,6 +186,7 @@ public class BoxTree<T extends BoxItem<E>, E> extends TileIndex<BoxNode<T>, T> {
return new Stack<BoxNode<T>>();
}
@Override
protected boolean clearItem(Stack<BoxNode<T>> item) {
if (item.tos != 0) {
item.tos = 0;
@ -678,6 +679,7 @@ public class BoxTree<T extends BoxItem<E>, E> extends TileIndex<BoxNode<T>, T> {
root.refs = 0;
}
@Override
public int size() {
return root.refs;
}