aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libs/mapsforge-map-0.2.3.jarbin396702 -> 0 bytes
-rw-r--r--res/values/strings.xml7
-rw-r--r--src/cgeo/geocaching/googlemaps/googleMapActivity.java11
-rw-r--r--src/cgeo/geocaching/mapcommon/MapBase.java7
-rw-r--r--src/cgeo/geocaching/mapcommon/cgeomap.java26
-rw-r--r--src/cgeo/geocaching/mapinterfaces/ActivityImpl.java5
-rw-r--r--src/cgeo/geocaching/mapsforge/mfMapActivity.java11
-rw-r--r--src/cgeo/geocaching/mapsforge/mfMapView.java16
8 files changed, 65 insertions, 18 deletions
diff --git a/libs/mapsforge-map-0.2.3.jar b/libs/mapsforge-map-0.2.3.jar
deleted file mode 100644
index b744efc..0000000
--- a/libs/mapsforge-map-0.2.3.jar
+++ /dev/null
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c31ac80..6c9ab8f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,8 +4,8 @@
<string name="app_name_compass">c:geo compass</string>
<!-- keys -->
- <string name="maps_api_keyx">0_xEJVmqy36u8h1HaFz1YeOknLa7fozNSKI4lHg</string> <!-- dev -->
- <string name="maps_api_key">0_xEJVmqy36vnWDcOuXUXTpS6JMk-OuN3w1BfJw</string> <!-- market -->
+ <string name="maps_api_key">0_xEJVmqy36u8h1HaFz1YeOknLa7fozNSKI4lHg</string> <!-- dev -->
+ <string name="maps_api_keyx">0_xEJVmqy36vnWDcOuXUXTpS6JMk-OuN3w1BfJw</string> <!-- market -->
<!-- basics -->
<string name="cache">Cache</string>
@@ -834,13 +834,14 @@
<!-- changelog -->
<string name="changelog">\n
- <b>2.26</b> (__.07.2011)\n
+ <b>2.26</b> (once in 2011)\n
· new: Autoinsert of signature\n
· new: Send to c:geo from web\n
· fix: Live map, better loading\n
· fix: Overwriting coords with wrong ones\n
· fix: Loading caches on Live map\n
· fix: GCVote issues\n
+ · fix: ForceClose on maps (home, help)\n
\n
<b>2.25</b> (11.06.2011)\n
· fix: Performance &amp; usability\n
diff --git a/src/cgeo/geocaching/googlemaps/googleMapActivity.java b/src/cgeo/geocaching/googlemaps/googleMapActivity.java
index a95b741..3a366dd 100644
--- a/src/cgeo/geocaching/googlemaps/googleMapActivity.java
+++ b/src/cgeo/geocaching/googlemaps/googleMapActivity.java
@@ -4,6 +4,7 @@ import android.app.Activity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
import cgeo.geocaching.mapcommon.MapBase;
import cgeo.geocaching.mapcommon.cgeomap;
import cgeo.geocaching.mapinterfaces.ActivityImpl;
@@ -98,4 +99,14 @@ public class googleMapActivity extends MapActivity implements ActivityImpl {
return super.onPrepareOptionsMenu(menu);
}
+ // close activity and open homescreen
+ public void goHome(View view) {
+ mapBase.goHome(view);
+ }
+
+ // open manual entry
+ public void goManual(View view) {
+ mapBase.goManual(view);
+ }
+
}
diff --git a/src/cgeo/geocaching/mapcommon/MapBase.java b/src/cgeo/geocaching/mapcommon/MapBase.java
index 2340998..cd4c12d 100644
--- a/src/cgeo/geocaching/mapcommon/MapBase.java
+++ b/src/cgeo/geocaching/mapcommon/MapBase.java
@@ -6,6 +6,7 @@ import android.content.res.Resources;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
/**
* Base class for the map activity. Delegates base class calls to the
@@ -13,7 +14,7 @@ import android.view.MenuItem;
* @author rsudev
*
*/
-public class MapBase {
+public abstract class MapBase {
ActivityImpl mapActivity;
@@ -61,4 +62,8 @@ public class MapBase {
return mapActivity.superOnOptionsItemSelected(item);
}
+ public abstract void goHome(View view);
+
+ public abstract void goManual(View view);
+
}
diff --git a/src/cgeo/geocaching/mapcommon/cgeomap.java b/src/cgeo/geocaching/mapcommon/cgeomap.java
index 7ba7532..0722981 100644
--- a/src/cgeo/geocaching/mapcommon/cgeomap.java
+++ b/src/cgeo/geocaching/mapcommon/cgeomap.java
@@ -1,19 +1,26 @@
package cgeo.geocaching.mapcommon;
-import gnu.android.app.appmanualclient.*;
+import gnu.android.app.appmanualclient.AppManualReaderClient;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
import android.app.Activity;
import android.app.ProgressDialog;
-import java.util.ArrayList;
-import android.os.Bundle;
-import android.view.Menu;
-import android.view.MenuItem;
import android.content.DialogInterface;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
+import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
+import android.util.Log;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.ImageView;
import cgeo.geocaching.R;
import cgeo.geocaching.cgBase;
import cgeo.geocaching.cgCache;
@@ -35,15 +42,6 @@ import cgeo.geocaching.mapinterfaces.MapFactory;
import cgeo.geocaching.mapinterfaces.MapViewImpl;
import cgeo.geocaching.mapinterfaces.UserOverlayItemImpl;
-import android.util.Log;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.ImageView;
-import cgeo.geocaching.cgSearch;
-
-import java.util.HashMap;
-import java.util.Locale;
-
public class cgeomap extends MapBase {
private Resources res = null;
diff --git a/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java b/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java
index 1895744..12f00e9 100644
--- a/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java
+++ b/src/cgeo/geocaching/mapinterfaces/ActivityImpl.java
@@ -5,6 +5,7 @@ import android.content.res.Resources;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
/**
* Defines the common functions of the provider-specific
@@ -29,5 +30,9 @@ public interface ActivityImpl {
boolean superOnPrepareOptionsMenu(Menu menu);
boolean superOnOptionsItemSelected(MenuItem item);
+
+ public abstract void goHome(View view);
+
+ public abstract void goManual(View view);
}
diff --git a/src/cgeo/geocaching/mapsforge/mfMapActivity.java b/src/cgeo/geocaching/mapsforge/mfMapActivity.java
index b878def..1e179dd 100644
--- a/src/cgeo/geocaching/mapsforge/mfMapActivity.java
+++ b/src/cgeo/geocaching/mapsforge/mfMapActivity.java
@@ -6,6 +6,7 @@ import android.app.Activity;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
import cgeo.geocaching.mapcommon.MapBase;
import cgeo.geocaching.mapcommon.cgeomap;
import cgeo.geocaching.mapinterfaces.ActivityImpl;
@@ -93,4 +94,14 @@ public class mfMapActivity extends MapActivity implements ActivityImpl {
public boolean superOnPrepareOptionsMenu(Menu menu) {
return super.onPrepareOptionsMenu(menu);
}
+
+ // close activity and open homescreen
+ public void goHome(View view) {
+ mapBase.goHome(view);
+ }
+
+ // open manual entry
+ public void goManual(View view) {
+ mapBase.goManual(view);
+ }
}
diff --git a/src/cgeo/geocaching/mapsforge/mfMapView.java b/src/cgeo/geocaching/mapsforge/mfMapView.java
index a68e7c0..e463a26 100644
--- a/src/cgeo/geocaching/mapsforge/mfMapView.java
+++ b/src/cgeo/geocaching/mapsforge/mfMapView.java
@@ -1,6 +1,7 @@
package cgeo.geocaching.mapsforge;
import org.mapsforge.android.maps.GeoPoint;
+import org.mapsforge.android.maps.MapDatabase;
import org.mapsforge.android.maps.MapView;
import org.mapsforge.android.maps.MapViewMode;
import org.mapsforge.android.maps.Overlay;
@@ -136,6 +137,21 @@ public class mfMapView extends MapView implements MapViewImpl {
public void setBuiltinScale(boolean b) {
setScaleBar(b);
}
+
+ /**
+ * Checks whether a given file is a valid map file.
+ *
+ * @param file
+ * the path to the map file that should be tested.
+ * @return true if the file is a valid map file, false otherwise.
+ */
+ public static boolean isValidMapFile(String file) {
+ MapDatabase testDatabase = new MapDatabase();
+ boolean isValid = testDatabase.openFile(file);
+ testDatabase.closeFile();
+ return isValid;
+ }
+
@Override
public void setMapSource(cgSettings settings) {
generated by cgit v1.1 at 2025-11-13 18:12:34 +0000