rename getViewport/Animator/Layer() to viewport/animator/layers()

- these are composite parts of Map

vtm-android-example/src/org/oscim/android/test/BitmapTileMapActivity.java

@@ -52,14 +52,14 @@ public class BitmapTileMapActivity extends MapActivity {
 		registerMapView(mMapView);
 
 		MapRenderer.setBackgroundColor(0xff777777);
-		mMap.getLayers().add(new TileGridLayer(mMap, Color.GRAY, 1.8f, 8));
+		mMap.layers().add(new TileGridLayer(mMap, Color.GRAY, 1.8f, 8));
 
 		if (USE_CACHE) {
 			mCache = new TileCache(this, null, mTileSource.getClass().getSimpleName());
 			mCache.setCacheSize(512 * (1 << 10));
 			mTileSource.setCache(mCache);
 		}
-		mMap.getLayers().add(new BitmapTileLayer(mMap, mTileSource));
+		mMap.layers().add(new BitmapTileLayer(mMap, mTileSource));
 
 		mMap.setMapPosition(0, 0, 1 << 2);
 	}

vtm-android-example/src/org/oscim/android/test/MapsforgeMapActivity.java

@@ -101,7 +101,7 @@ public class MapsforgeMapActivity extends MapActivity {
 
 				VectorTileLayer l = mMap.setBaseMap(mTileSource);
 				mMap.setTheme(InternalRenderTheme.DEFAULT);
-				mMap.getLayers().add(new LabelLayer(mMap, l));
+				mMap.layers().add(new LabelLayer(mMap, l));
 
 				MapInfo info = mTileSource.getMapInfo();
 				if (info.boundingBox != null) {

vtm-android-example/src/org/oscim/android/test/MarkerOverlayActivity.java

@@ -51,7 +51,7 @@ implements OnItemGestureListener<MarkerItem> {
 		        new ItemizedLayer<MarkerItem>(mMap, new ArrayList<MarkerItem>(),
 		                                          symbol, this);
 
-		mMap.getLayers().add(markerLayer);
+		mMap.layers().add(markerLayer);
 
 		List<MarkerItem> pts = new ArrayList<MarkerItem>();
 
@@ -63,7 +63,7 @@ implements OnItemGestureListener<MarkerItem> {
 
 		markerLayer.addItems(pts);
 
-		mMap.getLayers().add(new TileGridLayer(mMap));
+		mMap.layers().add(new TileGridLayer(mMap));
 		mMap.setMapPosition(0, 0, 1);
 	}
 

vtm-android-example/src/org/oscim/android/test/PathOverlayActivity.java

@@ -47,7 +47,7 @@ public class PathOverlayActivity extends BitmapTileMapActivity {
 			PathLayer pathLayer = new PathLayer(mMap, c, 3);
 			pathLayer.setPoints(pts);
 
-			mMap.getLayers().add(pathLayer);
+			mMap.layers().add(pathLayer);
 		}
 
 		for (double lat = -90; lat <= 90; lat += 5) {
@@ -61,7 +61,7 @@ public class PathOverlayActivity extends BitmapTileMapActivity {
 			PathLayer pathLayer = new PathLayer(mMap, c, 3);
 			pathLayer.setPoints(pts);
 
-			mMap.getLayers().add(pathLayer);
+			mMap.layers().add(pathLayer);
 		}
 
 		mMap.setMapPosition(0, 0, 1);

vtm-android-example/src/org/oscim/android/test/SimpleMapActivity.java

@@ -30,7 +30,7 @@ public class SimpleMapActivity extends BaseMapActivity {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		Layers layers = mMap.getLayers();
+		Layers layers = mMap.layers();
 		layers.add(new BuildingLayer(mMap, mBaseLayer));
 		layers.add(new LabelLayer(mMap, mBaseLayer));
 

vtm-android/src/org/oscim/android/Compass.java

@@ -33,7 +33,7 @@ public class Compass {
 				mAngle = event.values[0];
 
 				if (mMap != null) {
-					mMap.getViewport().setRotation(-mAngle);
+					mMap.viewport().setRotation(-mAngle);
 					mMap.updateMap(true);
 				}
 			}
@@ -65,6 +65,6 @@ public class Compass {
 
 	public void disable() {
 		mSensorManager.unregisterListener(mListener);
-		mMap.getViewport().setRotation(0);
+		mMap.viewport().setRotation(0);
 	}
 }

vtm-android/src/org/oscim/android/MapActivity.java

@@ -68,7 +68,7 @@ public abstract class MapActivity extends FragmentActivity {
 		// save the map position
 		MapPosition mapPosition = new MapPosition();
 
-		mMap.getViewport().getMapPosition(mapPosition);
+		mMap.viewport().getMapPosition(mapPosition);
 
 		GeoPoint geoPoint = mapPosition.getGeoPoint();
 

vtm-android/src/org/oscim/android/MapView.java

@@ -184,6 +184,6 @@ public class MapView extends RelativeLayout {
 		mInitialized = (mWidth > 0 && mHeight > 0);
 
 		if (mInitialized)
-			mMap.getViewport().setViewport(width, height);
+			mMap.viewport().setScreenSize(width, height);
 	}
 }

vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java

@@ -126,7 +126,7 @@ class GwtGdxMap extends GdxMap {
 			private MapPosition pos = new MapPosition();
 
 			public void run() {
-				mMap.getViewport().getMapPosition(pos);
+				mMap.viewport().getMapPosition(pos);
 				int lat = (int) (MercatorProjection.toLatitude(pos.y) * 1000);
 				int lon = (int) (MercatorProjection.toLongitude(pos.x) * 1000);
 				int rot = (int) (pos.angle);

vtm-gdx-html/src/org/oscim/gdx/client/SearchBox.java

@@ -204,7 +204,7 @@ public class SearchBox {
 		final TextBox searchField = new TextBox();
 		//searchField.setText("Bremen");
 		final PathLayer mOverlay = new PathLayer(map, 0xCC0000FF);
-		map.getLayers().add(mOverlay);
+		map.layers().add(mOverlay);
 
 		// We can add style names to widgets
 		searchButton.addStyleName("sendButton");
@@ -255,9 +255,9 @@ public class SearchBox {
 					if (b.maxLatitudeE6 - b.minLatitudeE6 < 100 &&
 					        b.maxLongitudeE6 - b.minLongitudeE6 < 100)
 						// for small bbox use zoom=16 to get an overview
-						map.getAnimator().animateTo(500, b.getCenterPoint(), 1 << 16, false);
+						map.animator().animateTo(500, b.getCenterPoint(), 1 << 16, false);
 					else
-						map.getAnimator().animateTo(b);
+						map.animator().animateTo(b);
 					if (d instanceof NominatimData && ((NominatimData) d).getWkt() != null) {
 						String wkt = ((NominatimData) d).getWkt();
 
@@ -288,8 +288,8 @@ public class SearchBox {
 				} else {
 					MapPosition pos = new MapPosition();
 
-					map.getViewport().setTilt(0);
+					map.viewport().setTilt(0);
-					map.getViewport().setRotation(0);
+					map.viewport().setRotation(0);
 
 					pos.setZoomLevel(13);
 					pos.setPosition(d.getLatitude(), d.getLongitude());

vtm-gdx/src/org/oscim/gdx/GdxMap.java

@@ -129,7 +129,7 @@ public abstract class GdxMap implements ApplicationListener {
 
 	protected void initDefaultLayers(TileSource tileSource, boolean tileGrid, boolean labels,
 	        boolean buildings) {
-		Layers layers = mMap.getLayers();
+		Layers layers = mMap.layers();
 
 		if (tileSource != null) {
 			mMapLayer = mMap.setBaseMap(tileSource);
@@ -166,7 +166,7 @@ public abstract class GdxMap implements ApplicationListener {
 		mWidth = w;
 		mHeight = h;
 
-		mMap.getViewport().setViewport(w, h);
+		mMap.viewport().setScreenSize(w, h);
 
 		//MapPosition p = new MapPosition();
 		//p.setZoomLevel(14);
@@ -222,7 +222,7 @@ public abstract class GdxMap implements ApplicationListener {
 		mWidth = w;
 		mHeight = h;
 
-		mMap.getViewport().setViewport(w, h);
+		mMap.viewport().setScreenSize(w, h);
 		mMapRenderer.onSurfaceChanged(w, h);
 		mMap.render();
 	}
@@ -244,7 +244,7 @@ public abstract class GdxMap implements ApplicationListener {
 		private Viewport mMapPosition;
 
 		public TouchHandler() {
-			mMapPosition = mMap.getViewport();
+			mMapPosition = mMap.viewport();
 		}
 
 		private boolean mActiveScale;
@@ -304,14 +304,14 @@ public abstract class GdxMap implements ApplicationListener {
 					if (mGridLayer == null) {
 						mGridLayer = new TileGridLayer(mMap);
 						mGridLayer.setEnabled(true);
-						mMap.getLayers().add(mGridLayer);
+						mMap.layers().add(mGridLayer);
 					} else {
 						if (mGridLayer.isEnabled()) {
 							mGridLayer.setEnabled(false);
-							mMap.getLayers().remove(mGridLayer);
+							mMap.layers().remove(mGridLayer);
 						} else {
 							mGridLayer.setEnabled(true);
-							mMap.getLayers().add(mGridLayer);
+							mMap.layers().add(mGridLayer);
 						}
 					}
 					mMap.render();
@@ -391,12 +391,12 @@ public abstract class GdxMap implements ApplicationListener {
 
 			if (amount > 0) {
 
-				mMap.getAnimator().animateZoom(150, 0.8f, 0, 0);
+				mMap.animator().animateZoom(150, 0.8f, 0, 0);
 			} else {
 				float fx = mPosX - mMap.getWidth() / 2;
 				float fy = mPosY - mMap.getHeight() / 2;
 
-				mMap.getAnimator().animateZoom(150, 1.25f, fx, fy);
+				mMap.animator().animateZoom(150, 1.25f, fx, fy);
 			}
 			mMap.updateMap(false);
 
@@ -437,7 +437,7 @@ public abstract class GdxMap implements ApplicationListener {
 		private Viewport mMapPosition;
 
 		public ViewController() {
-			mMapPosition = mMap.getViewport();
+			mMapPosition = mMap.viewport();
 		}
 
 		@Override
@@ -464,7 +464,7 @@ public abstract class GdxMap implements ApplicationListener {
 			//log.debug("fling " + button + " " + velocityX + "/" + velocityY);
 			if (mayFling && button == Buttons.LEFT) {
 				int m = Tile.SIZE * 4;
-				mMap.getAnimator().animateFling((int) velocityX, (int) velocityY, -m, m, -m, m);
+				mMap.animator().animateFling((int) velocityX, (int) velocityY, -m, m, -m, m);
 				return true;
 			}
 			return false;

vtm/src/org/oscim/layers/MapEventLayer.java

@@ -76,7 +76,7 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
 
 	public MapEventLayer(Map map) {
 		super(map);
-		mViewport = map.getViewport();
+		mViewport = map.viewport();
 		mTracker = new VelocityTracker();
 	}
 
@@ -110,7 +110,7 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
 		int action = getAction(e);
 
 		if (action == MotionEvent.ACTION_DOWN) {
-			mMap.getAnimator().cancel();
+			mMap.animator().cancel();
 
 			mDoubleTap = false;
 			mStartMove = -1;
@@ -372,7 +372,7 @@ public class MapEventLayer extends Layer implements Map.InputListener, GestureLi
 		int w = Tile.SIZE * 3;
 		int h = Tile.SIZE * 3;
 
-		mMap.getAnimator().animateFling(Math.round(velocityX),
+		mMap.animator().animateFling(Math.round(velocityX),
 		                                Math.round(velocityY),
 		                                -w, w, -h, h);
 		return true;

vtm/src/org/oscim/layers/marker/ItemizedLayer.java

@@ -167,7 +167,7 @@ public class ItemizedLayer<Item extends MarkerItem> extends MarkerLayer<Item>
 
 		int eventX = (int) event.getX() - mMap.getWidth() / 2;
 		int eventY = (int) event.getY() - mMap.getHeight() / 2;
-		Viewport mapPosition = mMap.getViewport();
+		Viewport mapPosition = mMap.viewport();
 
 		BoundingBox bbox = mapPosition.getViewBox();
 

vtm/src/org/oscim/layers/marker/MarkerRenderer.java

@@ -78,7 +78,7 @@ public class MarkerRenderer extends ElementRenderer {
 		int changedVisible = 0;
 		int numVisible = 0;
 
-		mMarkerLayer.map().getViewport().getMapExtents(mBox, mExtents);
+		mMarkerLayer.map().viewport().getMapExtents(mBox, mExtents);
 
 		long flip = (long) (Tile.SIZE * pos.scale) >> 1;
 

vtm/src/org/oscim/layers/tile/vector/labeling/LabelPlacement.java

@@ -284,7 +284,7 @@ public class LabelPlacement {
 		}
 
 		MapPosition pos = work.pos;
-		boolean changedPos = mMap.getViewport().getMapPosition(pos);
+		boolean changedPos = mMap.viewport().getMapPosition(pos);
 
 		/* do not loop! */
 		if (!changedTiles && !changedPos)

vtm/src/org/oscim/map/Map.java

@@ -226,18 +226,24 @@ public abstract class Map {
 		return pos;
 	}
 
-	public Viewport getViewport() {
+	/**
+	 * @return Viewport instance
+	 */
+	public Viewport viewport() {
 		return mViewport;
 	}
 
-	public Layers getLayers() {
+	/**
+	 * @return Layers instance
+	 */
+	public Layers layers() {
 		return mLayers;
 	}
 
 	/**
 	 * @return MapAnimator instance
 	 */
-	public MapAnimator getAnimator() {
+	public MapAnimator animator() {
 		return mAnimator;
 	}
 

vtm/src/org/oscim/map/Viewport.java

@@ -78,7 +78,7 @@ public class Viewport {
 		mPos.tilt = 0;
 	}
 
-	public synchronized void setViewport(int width, int height) {
+	public synchronized void setScreenSize(int width, int height) {
 		float s = VIEW_SCALE;
 		float aspect = height / (float) width;
 		float[] tmp = new float[16];

vtm/src/org/oscim/renderer/MapRenderer.java

@@ -236,10 +236,10 @@ public class MapRenderer {
 		GLState.bindTex2D(-1);
 		GLState.useProgram(-1);
 
-		mMap.getAnimator().updateAnimation();
+		mMap.animator().updateAnimation();
 
 		MapPosition pos = mMapPosition;
-		Viewport viewport = mMap.getViewport();
+		Viewport viewport = mMap.viewport();
 		boolean changed = false;
 
 		synchronized (viewport) {
@@ -261,7 +261,7 @@ public class MapRenderer {
 		}
 
 		/* update layers */
-		LayerRenderer[] layers = mMap.getLayers().getLayerRenderer();
+		LayerRenderer[] layers = mMap.layers().getLayerRenderer();
 
 		for (int i = 0, n = layers.length; i < n; i++) {
 			LayerRenderer renderer = layers[i];
@@ -304,7 +304,7 @@ public class MapRenderer {
 		screenWidth = width;
 		screenHeight = height;
 
-		mMap.getViewport().getMatrix(null, mMatrices.proj, null);
+		mMap.viewport().getMatrix(null, mMatrices.proj, null);
 
 		GL.glViewport(0, 0, width, height);
 		GL.glScissor(0, 0, width, height);

vtm/src/org/oscim/tiling/TileManager.java

@@ -130,7 +130,7 @@ public class TileManager {
 		mCacheLimit = cacheLimit;
 		mCacheReduce = 0;
 
-		mViewport = map.getViewport();
+		mViewport = map.viewport();
 
 		jobQueue = new JobQueue();
 		mJobs = new ArrayList<MapTile>();