aboutsummaryrefslogtreecommitdiffstats
path: root/main/src/cgeo/geocaching/maps/google
diff options
context:
space:
mode:
Diffstat (limited to 'main/src/cgeo/geocaching/maps/google')
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java (renamed from main/src/cgeo/geocaching/maps/google/googleCacheOverlay.java)8
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java (renamed from main/src/cgeo/geocaching/maps/google/googleCacheOverlayItem.java)4
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java (renamed from main/src/cgeo/geocaching/maps/google/googleGeoPoint.java)4
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java (renamed from main/src/cgeo/geocaching/maps/google/googleMapActivity.java)4
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleMapController.java (renamed from main/src/cgeo/geocaching/maps/google/googleMapController.java)4
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleMapFactory.java (renamed from main/src/cgeo/geocaching/maps/google/googleMapFactory.java)12
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java (renamed from main/src/cgeo/geocaching/maps/google/googleMapProjection.java)4
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleMapView.java (renamed from main/src/cgeo/geocaching/maps/google/googleMapView.java)22
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java (renamed from main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlay.java)8
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java (renamed from main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlayItem.java)4
-rw-r--r--main/src/cgeo/geocaching/maps/google/GoogleOverlay.java (renamed from main/src/cgeo/geocaching/maps/google/googleOverlay.java)4
11 files changed, 39 insertions, 39 deletions
diff --git a/main/src/cgeo/geocaching/maps/google/googleCacheOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
index b175842..f501b8c 100644
--- a/main/src/cgeo/geocaching/maps/google/googleCacheOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlay.java
@@ -23,12 +23,12 @@ import java.util.concurrent.locks.ReentrantLock;
* @author rsudev
*
*/
-public class googleCacheOverlay extends ItemizedOverlay<googleCacheOverlayItem> implements ItemizedOverlayImpl {
+public class GoogleCacheOverlay extends ItemizedOverlay<GoogleCacheOverlayItem> implements ItemizedOverlayImpl {
private CachesOverlay base;
private Lock lock = new ReentrantLock();
- public googleCacheOverlay(cgSettings settingsIn, Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
+ public GoogleCacheOverlay(cgSettings settingsIn, Context contextIn, Drawable markerIn, Boolean fromDetailIn) {
super(boundCenterBottom(markerIn));
base = new CachesOverlay(settingsIn, this, contextIn, fromDetailIn);
}
@@ -39,11 +39,11 @@ public class googleCacheOverlay extends ItemizedOverlay<googleCacheOverlayItem>
}
@Override
- protected googleCacheOverlayItem createItem(int i) {
+ protected GoogleCacheOverlayItem createItem(int i) {
if (base == null)
return null;
- return (googleCacheOverlayItem) base.createItem(i);
+ return (GoogleCacheOverlayItem) base.createItem(i);
}
@Override
diff --git a/main/src/cgeo/geocaching/maps/google/googleCacheOverlayItem.java b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java
index 001dab9..f138e90 100644
--- a/main/src/cgeo/geocaching/maps/google/googleCacheOverlayItem.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleCacheOverlayItem.java
@@ -6,11 +6,11 @@ import cgeo.geocaching.maps.interfaces.CachesOverlayItemImpl;
import com.google.android.maps.GeoPoint;
import com.google.android.maps.OverlayItem;
-public class googleCacheOverlayItem extends OverlayItem implements CachesOverlayItemImpl {
+public class GoogleCacheOverlayItem extends OverlayItem implements CachesOverlayItemImpl {
private String cacheType = null;
private cgCoord coord;
- public googleCacheOverlayItem(cgCoord coordinate, String type) {
+ public GoogleCacheOverlayItem(cgCoord coordinate, String type) {
super(new GeoPoint(coordinate.coords.getLatitudeE6(), coordinate.coords.getLongitudeE6()), coordinate.name, "");
this.cacheType = type;
diff --git a/main/src/cgeo/geocaching/maps/google/googleGeoPoint.java b/main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java
index 18cca20..56bc40c 100644
--- a/main/src/cgeo/geocaching/maps/google/googleGeoPoint.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleGeoPoint.java
@@ -4,9 +4,9 @@ import cgeo.geocaching.maps.interfaces.GeoPointImpl;
import com.google.android.maps.GeoPoint;
-public class googleGeoPoint extends GeoPoint implements GeoPointImpl {
+public class GoogleGeoPoint extends GeoPoint implements GeoPointImpl {
- public googleGeoPoint(int latitudeE6, int longitudeE6) {
+ public GoogleGeoPoint(int latitudeE6, int longitudeE6) {
super(latitudeE6, longitudeE6);
}
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapActivity.java b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
index a094064..ba53003 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapActivity.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapActivity.java
@@ -12,11 +12,11 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-public class googleMapActivity extends MapActivity implements MapActivityImpl {
+public class GoogleMapActivity extends MapActivity implements MapActivityImpl {
private AbstractMap mapBase;
- public googleMapActivity() {
+ public GoogleMapActivity() {
mapBase = new CGeoMap(this);
}
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapController.java b/main/src/cgeo/geocaching/maps/google/GoogleMapController.java
index cc607cc..fdd971c 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapController.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapController.java
@@ -6,11 +6,11 @@ import cgeo.geocaching.maps.interfaces.MapControllerImpl;
import com.google.android.maps.GeoPoint;
import com.google.android.maps.MapController;
-public class googleMapController implements MapControllerImpl {
+public class GoogleMapController implements MapControllerImpl {
private MapController mapController;
- public googleMapController(MapController mapControllerIn) {
+ public GoogleMapController(MapController mapControllerIn) {
mapController = mapControllerIn;
}
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapFactory.java b/main/src/cgeo/geocaching/maps/google/GoogleMapFactory.java
index c7eb33e..6ba8e33 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapFactory.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapFactory.java
@@ -13,11 +13,11 @@ import com.google.android.maps.MapActivity;
import android.content.Context;
-public class googleMapFactory implements MapFactory {
+public class GoogleMapFactory implements MapFactory {
@Override
public Class<? extends MapActivity> getMapClass() {
- return googleMapActivity.class;
+ return GoogleMapActivity.class;
}
@Override
@@ -27,23 +27,23 @@ public class googleMapFactory implements MapFactory {
@Override
public int getMapLayoutId() {
- return R.layout.googlemap;
+ return R.layout.map_google;
}
@Override
public GeoPointImpl getGeoPointBase(final Geopoint coords) {
- return new googleGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
+ return new GoogleGeoPoint(coords.getLatitudeE6(), coords.getLongitudeE6());
}
@Override
public CachesOverlayItemImpl getCachesOverlayItem(cgCoord coordinate, String type) {
- googleCacheOverlayItem baseItem = new googleCacheOverlayItem(coordinate, type);
+ GoogleCacheOverlayItem baseItem = new GoogleCacheOverlayItem(coordinate, type);
return baseItem;
}
@Override
public OtherCachersOverlayItemImpl getOtherCachersOverlayItemBase(Context context, cgUser userOne) {
- googleOtherCachersOverlayItem baseItem = new googleOtherCachersOverlayItem(context, userOne);
+ GoogleOtherCachersOverlayItem baseItem = new GoogleOtherCachersOverlayItem(context, userOne);
return baseItem;
}
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapProjection.java b/main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java
index 761f509..dc694b8 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapProjection.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapProjection.java
@@ -8,11 +8,11 @@ import com.google.android.maps.Projection;
import android.graphics.Point;
-public class googleMapProjection implements MapProjectionImpl {
+public class GoogleMapProjection implements MapProjectionImpl {
private Projection projection;
- public googleMapProjection(Projection projectionIn) {
+ public GoogleMapProjection(Projection projectionIn) {
projection = projectionIn;
}
diff --git a/main/src/cgeo/geocaching/maps/google/googleMapView.java b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
index 5b07cdf..0f7496b 100644
--- a/main/src/cgeo/geocaching/maps/google/googleMapView.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleMapView.java
@@ -28,21 +28,21 @@ import android.view.GestureDetector;
import android.view.GestureDetector.SimpleOnGestureListener;
import android.view.MotionEvent;
-public class googleMapView extends MapView implements MapViewImpl {
+public class GoogleMapView extends MapView implements MapViewImpl {
private GestureDetector gestureDetector;
private OnDragListener onDragListener;
- public googleMapView(Context context, AttributeSet attrs) {
+ public GoogleMapView(Context context, AttributeSet attrs) {
super(context, attrs);
gestureDetector = new GestureDetector(context, new GestureListener());
}
- public googleMapView(Context context, AttributeSet attrs, int defStyle) {
+ public GoogleMapView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
gestureDetector = new GestureDetector(context, new GestureListener());
}
- public googleMapView(Context context, String apiKey) {
+ public GoogleMapView(Context context, String apiKey) {
super(context, apiKey);
gestureDetector = new GestureDetector(context, new GestureListener());
}
@@ -71,13 +71,13 @@ public class googleMapView extends MapView implements MapViewImpl {
@Override
public MapControllerImpl getMapController() {
- return new googleMapController(getController());
+ return new GoogleMapController(getController());
}
@Override
public GeoPointImpl getMapViewCenter() {
GeoPoint point = getMapCenter();
- return new googleGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
+ return new GoogleGeoPoint(point.getLatitudeE6(), point.getLongitudeE6());
}
@Override
@@ -92,21 +92,21 @@ public class googleMapView extends MapView implements MapViewImpl {
@Override
public MapProjectionImpl getMapProjection() {
- return new googleMapProjection(getProjection());
+ return new GoogleMapProjection(getProjection());
}
@Override
public CachesOverlay createAddMapOverlay(cgSettings settings,
Context context, Drawable drawable, boolean fromDetailIntent) {
- googleCacheOverlay ovl = new googleCacheOverlay(settings, context, drawable, fromDetailIntent);
+ GoogleCacheOverlay ovl = new GoogleCacheOverlay(settings, context, drawable, fromDetailIntent);
getOverlays().add(ovl);
return ovl.getBase();
}
@Override
public OtherCachersOverlay createAddUsersOverlay(Context context, Drawable markerIn) {
- googleOtherCachersOverlay ovl = new googleOtherCachersOverlay(context, markerIn);
+ GoogleOtherCachersOverlay ovl = new GoogleOtherCachersOverlay(context, markerIn);
getOverlays().add(ovl);
return ovl.getBase();
}
@@ -115,7 +115,7 @@ public class googleMapView extends MapView implements MapViewImpl {
public PositionOverlay createAddPositionOverlay(Activity activity,
cgSettings settingsIn) {
- googleOverlay ovl = new googleOverlay(activity, settingsIn, overlayType.PositionOverlay);
+ GoogleOverlay ovl = new GoogleOverlay(activity, settingsIn, overlayType.PositionOverlay);
getOverlays().add(ovl);
return (PositionOverlay) ovl.getBase();
}
@@ -124,7 +124,7 @@ public class googleMapView extends MapView implements MapViewImpl {
public ScaleOverlay createAddScaleOverlay(Activity activity,
cgSettings settingsIn) {
- googleOverlay ovl = new googleOverlay(activity, settingsIn, overlayType.ScaleOverlay);
+ GoogleOverlay ovl = new GoogleOverlay(activity, settingsIn, overlayType.ScaleOverlay);
getOverlays().add(ovl);
return (ScaleOverlay) ovl.getBase();
}
diff --git a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java
index 11df0b7..def9482 100644
--- a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlay.java
@@ -16,12 +16,12 @@ import android.graphics.drawable.Drawable;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-public class googleOtherCachersOverlay extends ItemizedOverlay<googleOtherCachersOverlayItem> implements ItemizedOverlayImpl {
+public class GoogleOtherCachersOverlay extends ItemizedOverlay<GoogleOtherCachersOverlayItem> implements ItemizedOverlayImpl {
private OtherCachersOverlay base;
private Lock lock = new ReentrantLock();
- public googleOtherCachersOverlay(Context contextIn, Drawable markerIn) {
+ public GoogleOtherCachersOverlay(Context contextIn, Drawable markerIn) {
super(boundCenter(markerIn));
base = new OtherCachersOverlay(this, contextIn);
}
@@ -32,11 +32,11 @@ public class googleOtherCachersOverlay extends ItemizedOverlay<googleOtherCacher
}
@Override
- protected googleOtherCachersOverlayItem createItem(int i) {
+ protected GoogleOtherCachersOverlayItem createItem(int i) {
if (base == null)
return null;
- return (googleOtherCachersOverlayItem) base.createItem(i);
+ return (GoogleOtherCachersOverlayItem) base.createItem(i);
}
@Override
diff --git a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlayItem.java b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java
index d1aa635..f6fbcec 100644
--- a/main/src/cgeo/geocaching/maps/google/googleOtherCachersOverlayItem.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleOtherCachersOverlayItem.java
@@ -10,11 +10,11 @@ import com.google.android.maps.OverlayItem;
import android.content.Context;
import android.graphics.drawable.Drawable;
-public class googleOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl {
+public class GoogleOtherCachersOverlayItem extends OverlayItem implements OtherCachersOverlayItemImpl {
private Context context = null;
private cgUser user = null;
- public googleOtherCachersOverlayItem(Context contextIn, cgUser userIn) {
+ public GoogleOtherCachersOverlayItem(Context contextIn, cgUser userIn) {
super(new GeoPoint(userIn.coords.getLatitudeE6(), userIn.coords.getLongitudeE6()), userIn.username, "");
context = contextIn;
diff --git a/main/src/cgeo/geocaching/maps/google/googleOverlay.java b/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
index 1d7eb1c..03caafb 100644
--- a/main/src/cgeo/geocaching/maps/google/googleOverlay.java
+++ b/main/src/cgeo/geocaching/maps/google/GoogleOverlay.java
@@ -16,12 +16,12 @@ import android.graphics.Canvas;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
-public class googleOverlay extends Overlay implements OverlayImpl {
+public class GoogleOverlay extends Overlay implements OverlayImpl {
private GeneralOverlay overlayBase = null;
private Lock lock = new ReentrantLock();
- public googleOverlay(Activity activityIn, cgSettings settingsIn, overlayType ovlType) {
+ public GoogleOverlay(Activity activityIn, cgSettings settingsIn, overlayType ovlType) {
switch (ovlType) {
case PositionOverlay:
overlayBase = new PositionOverlay(settingsIn, activityIn, this);