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

package/naming reorganization:

Browse Source 
- RenderLayer -> LayerRenderer
  as this LayerRenderer just the rendering implementation of a Layer
  - not a 'layer' itself
- move renderer.sublayer.*Renderer into their respective *Layer classes
- move layers.labeling to layers.tile.vector.labeling
  (until there is a common labeling framework)
- remove layers.overlay
  - move Marker stuff to layers.marker
- merge TileRenderer into TileRenderLayer

- rename renderer.sublayers to renderer.elements
- move layers.tile.* to tiling package
- move tilesource.* to tiling.source

- rename oscim.view -> oscim.map
This commit is contained in:
Hannes Janetzek
2013-09-11 18:28:27 +02:00
parent c6eedc4df7
commit 67a3cbadf7
139 changed files with 3989 additions and 4278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@
*/
package org.oscim.android;
import org.oscim.view.Map;
import org.oscim.map.Map;
import android.content.Context;
import android.hardware.Sensor;

4
vtm-android/src/org/oscim/android/GLView.java
View File

@@ -17,14 +17,14 @@ package org.oscim.android;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
import org.oscim.view.Map;
import org.oscim.map.Map;
import android.content.Context;
import android.opengl.GLSurfaceView;
public class GLView extends GLSurfaceView {
class GLRenderer extends org.oscim.renderer.GLRenderer implements GLSurfaceView.Renderer{
class GLRenderer extends org.oscim.renderer.MapRenderer implements GLSurfaceView.Renderer{
public GLRenderer(Map map) {
super(map);

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

@@ -16,7 +16,7 @@ package org.oscim.android;
import org.oscim.core.GeoPoint;
import org.oscim.core.MapPosition;
import org.oscim.view.Map;
import org.oscim.map.Map;
import android.app.Activity;
import android.content.SharedPreferences;

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

@@ -23,7 +23,7 @@ import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.GLAdapter;
import org.oscim.backend.Log;
import org.oscim.core.Tile;
import org.oscim.view.Map;
import org.oscim.map.Map;
import android.content.Context;
import android.util.AttributeSet;

8
vtm-android/src/org/oscim/android/canvas/AndroidGraphics.java
View File

@@ -22,8 +22,8 @@ import org.oscim.backend.CanvasAdapter;
import org.oscim.backend.canvas.Bitmap;
import org.oscim.backend.canvas.Canvas;
import org.oscim.backend.canvas.Paint;
import org.oscim.layers.overlay.OverlayItem.HotspotPlace;
import org.oscim.layers.overlay.OverlayMarker;
import org.oscim.layers.marker.MarkerItem.HotspotPlace;
import org.oscim.layers.marker.MarkerSymbol;
import android.content.res.Resources;
import android.graphics.Bitmap.Config;
@@ -113,14 +113,14 @@ public final class AndroidGraphics extends CanvasAdapter {
return new AndroidBitmap(bitmap);
}
public static OverlayMarker makeMarker(Resources res, int id, HotspotPlace place) {
public static MarkerSymbol makeMarker(Resources res, int id, HotspotPlace place) {
if (place == null)
place = HotspotPlace.CENTER;
Drawable drawable = res.getDrawable(id);
return new OverlayMarker(drawableToBitmap(drawable), place);
return new MarkerSymbol(drawableToBitmap(drawable), place);
}
}