diff --git a/app/app.iml b/app/app.iml
index 7e64eb1..afa3736 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -81,9 +81,12 @@
-
-
-
+
+
+
+
+
+
@@ -104,21 +107,24 @@
-
+
-
-
-
-
+
+
+
+
-
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
index 1a71d6b..a58d939 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/handlers/DatabaseHandler.java
@@ -98,7 +98,6 @@
private static final String KEY_WIFI_SSID = "_wifi_ssid";
private static final String KEY_WIFI_LEVELS = "_wifi_levels";
private static final String KEY_IMAGE_IMG = "_img_src";
- private static final String KEY_IMAGE_ASSOC = "_associated_poi";
public DatabaseHandler(Context context){
super(context, DATABASE_NAME, null, DATABASE_VERSION);
@@ -182,8 +181,7 @@
String CREATE_IMAGE_TABLE = "CREATE TABLE " + TABLE_IMAGE + "("
+ KEY_POI_ID + " INTEGER PRIMARY KEY,"
+ KEY_GP_ID + " INTEGER,"
- + KEY_IMAGE_IMG + " BLOB,"
- + KEY_IMAGE_ASSOC + " INTEGER" + ")";
+ + KEY_IMAGE_IMG + " BLOB" + ")";
db.execSQL(CREATE_IMAGE_TABLE);
//create trash bin table
String CREATE_TRASH_TABLE = "CREATE TABLE " + TABLE_TRASH_BIN + "("
@@ -431,13 +429,12 @@
long _id = cursor.getLong(0);
long _gp_id = cursor.getLong(1);
byte[] img = cursor.getBlob(2);
- int assoc_poi = cursor.getInt(3);
- return new Image(_id, img, assoc_poi, getGeoPoint(_gp_id));
+ return new Image(_id, img, getGeoPoint(_gp_id));
}
private Image getImage(SQLiteDatabase db, long id){
Cursor cursor = db.query(TABLE_IMAGE,
- new String[]{KEY_POI_ID, KEY_GP_ID, KEY_IMAGE_IMG, KEY_IMAGE_ASSOC},
+ new String[]{KEY_POI_ID, KEY_GP_ID, KEY_IMAGE_IMG},
KEY_POI_ID + "=?",
new String[]{String.valueOf(id)}, null, null, null, null);
if (cursor != null) {
diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java
index 6f272e3..46ebfa9 100644
--- a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java
+++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java
@@ -23,7 +23,6 @@
public class Image extends Poi {
private byte[] image;
- private int associated_poi_type;
public Image(long _id) {
super(_id, Types.PIC);
@@ -31,14 +30,13 @@
public Image(){
super(Types.PIC);
}
- public Image(long _id, byte[] image, int associated_poi_type, DbGeoPoint gp){
+ public Image(long _id, byte[] image, DbGeoPoint gp){
super(_id, Types.PIC, gp);
this.image = image;
- this.associated_poi_type = associated_poi_type;
}
- public int getAssociatedPoiType(){
- return associated_poi_type;
+ public long getGpId(){
+ return gpId;
}
public byte[] getImage(){