diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/BreakPoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/BreakPoint.java deleted file mode 100644 index afe61c4..0000000 --- a/app/src/main/java/de/apps4ics/mountainnavigation/BreakPoint.java +++ /dev/null @@ -1,105 +0,0 @@ -package de.apps4ics.mountainnavigation; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; - -/** - * Created by Vinz on 03.11.2015. - */ -public class BreakPoint extends Poi { - int stone; - int bench; - int table; - int roofed; - - public BreakPoint(long _id) { - super(_id, Types.BREAK_POINT); - } - public BreakPoint(){ - super(Types.BREAK_POINT); - } - public BreakPoint(long _id, int stone, int bench, int table, int roofed, DbGeoPoint gp){ - super(_id, Types.BREAK_POINT, gp); - this.stone = stone; - this.bench = bench; - this.table = table; - this.roofed = roofed; - } - - public int getStone() { - return stone; - } - - public int getBench() { - return bench; - } - - public int getTable() { - return table; - } - - public int getRoofed() { - return roofed; - } -} - -class AddBreakpointDialog extends DialogFragment { - MainActivity ma; - - AddBreakpointDialog(MainActivity ma){ - this.ma = ma; - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - final CheckboxImageAdapter adapter = new CheckboxImageAdapter(getActivity(), ma.getBreakPointOptions(), null, ma.getBreakPointOptionsImgs()); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setTitle(R.string.break_point_dialog_title) - //.setIcon(res.getDrawable(R.drawable.break_point)) - .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - int[] options = adapter.getCheckedItems(); - int stone = 0; - int bench = 0; - int table = 0; - int roofed = 0; - for(int i=0; i getPathMarkers(){ + return pathMarkers; + } + + public void setPathMarkers(ArrayList al){ + pathMarkers = al; + } + public String[] getFountainSizes(){ return fountainSizes; } @@ -630,6 +654,17 @@ return fountainImgs; } + public String[] getPathOptions(){ + return pathOptions; + } + public String[] getPathDescs(){ + return pathDescs; + } + + public Integer[] getPathOptionImgs(){ + return pathOptionImgs; + } + private void setActiveNetwork(){ activeNetwork = cm.getActiveNetworkInfo(); } @@ -982,7 +1017,7 @@ .setPositiveButton(R.string.continue_button, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - AddPathDialog addPathDialog = new AddPathDialog(); + AddPathDialog addPathDialog = new AddPathDialog(MainActivity.this); addPathDialog.show(getFragmentManager(), "Add Path POI Dialog"); } }) @@ -1018,107 +1053,6 @@ popupMapView.getOverlays().add(overlay); } - public class AddPathDialog extends DialogFragment { - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - final CheckboxImageAdapter adapter = new CheckboxImageAdapter(MainActivity.this, pathOptions, pathDescs, pathOptionImgs); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - builder.setTitle(R.string.path_dialog_title) - .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - int[] options = adapter.getCheckedItems(); - int exposed = 0; - int diffWet = 0; - int giddiness = 0; - int climbing = 0; - for (int i = 0; i < options.length; ++i) { - switch (options[i]) { - case 0: - options[i] = Features.PATH_EXPOSED; - exposed = 1; - break; - case 1: - options[i] = Features.PATH_DIFF_WET; - diffWet = 1; - break; - case 2: - options[i] = Features.PATH_GIDDINESS; - giddiness = 1; - break; - case 3: - options[i] = Features.PATH_CLIMBING; - climbing = 1; - break; - } - } - if(pathMarkers.size() < 2){ - Log.e(TAG, "One of the path markers in addPathDialog is null!"); - } - - RoadManager roadManager = new OSRMRoadManager(); - ArrayList waypoints = new ArrayList<>(); - DbGeoPoint current = null; - DbGeoPoint last = null; - boolean currentNew = false; - boolean lastNew = false; - for(int i=0; i(); - } - }) - .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }) - .setAdapter(adapter, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - return builder.create(); - } - } - private void addCellReceptionPoi(){ setActiveNetwork(); if(activeNetwork != null && activeNetwork.isConnected()){ @@ -1175,7 +1109,7 @@ } } - private long addGp(DbGeoPoint dbgp){ + public long addGp(DbGeoPoint dbgp){ return dbHandler.addPoi(dbgp); } diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/Peak.java b/app/src/main/java/de/apps4ics/mountainnavigation/Peak.java deleted file mode 100644 index bc8326a..0000000 --- a/app/src/main/java/de/apps4ics/mountainnavigation/Peak.java +++ /dev/null @@ -1,62 +0,0 @@ -package de.apps4ics.mountainnavigation; - -import android.app.AlertDialog; -import android.app.Dialog; -import android.app.DialogFragment; -import android.content.DialogInterface; -import android.os.Bundle; -import android.widget.EditText; - -/** - * Created by Vinz on 03.11.2015. - */ -public class Peak extends Poi { - String name; - - public Peak(long _id) { - super(_id, Types.PEAK); - } - public Peak(){ - super(Types.PEAK); - } - public Peak(long _id, String name, DbGeoPoint gp){ - super(_id, Types.PEAK, gp); - this.name = name; - } - - public String getName() { - return name; - } -} - -class AddPeakDialog extends DialogFragment { - MainActivity ma; - - public AddPeakDialog(MainActivity ma){ - this.ma = ma; - } - - @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); - final EditText input = new EditText(ma.getApplicationContext()); - builder.setTitle(R.string.peak_dialog_title) - .setMessage(R.string.peak_dialog_msg) - .setView(input) - .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - String name = input.getText().toString().trim(); - if (name != null && !name.equals("")) { - ma.addPoi(new Peak(0, name, null)); - } - } - }) - .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, int which) { - } - }); - return builder.create(); - } -} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/Poi.java b/app/src/main/java/de/apps4ics/mountainnavigation/Poi.java deleted file mode 100644 index ca906f8..0000000 --- a/app/src/main/java/de/apps4ics/mountainnavigation/Poi.java +++ /dev/null @@ -1,352 +0,0 @@ -package de.apps4ics.mountainnavigation; - -/** - * Created by Vinz on 06.10.2015. - */ -public class Poi { - protected long _id; - protected int _type; - protected DbGeoPoint gp; - protected long gpId; - - public Poi() { - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - Poi poi = (Poi) o; - - if (_id != poi._id) return false; - if (_type != poi._type) return false; - return true; - } - - @Override - public int hashCode() { - int result = (int) _id; - result = 31 * result + _type; - return result; - } - - public long getGpId(){ - return gpId; - } - - public DbGeoPoint getGp(){ - return gp; - } - - public void setGpId(long gpId){ - this.gpId = gpId; - } - - public void setGp(DbGeoPoint gp){ - this.gp = gp; - this.gpId = gp.getId(); - } - - public Poi(int _type){ - this._type = _type; - } - - public Poi(long _id, int _type){ - this._id = _id; - this._type = _type; - } - - public Poi(long _id, int _type, DbGeoPoint _gp){ - this(_id, _type); - if(_gp != null){ - this.gp = _gp; - this.gpId = _gp.getId(); - } - } - - public long getId(){ - return _id; - } - - @Override - public String toString() { - return "Poi {" + - "_id=" + _id + - ", _type=" + _type + - '}'; - } - - public int getType(){ - return _type; - } - -} - -class Path extends Poi { - long gp_e_id; - long length; - int exposed; - int diffWet; - int giddiness; - int climbing; - DbGeoPoint end; - - public Path(long _id) { - super(_id, Types.PATH); - } - public Path() { - super(Types.PATH); - } - public Path(long _id, long _length, int exposed, int diff_wet, int giddiness, int climbing, DbGeoPoint start, DbGeoPoint end){ - super(_id, Types.PATH, start); - this.length = _length; - this.exposed = exposed; - this.diffWet = diff_wet; - this.giddiness = giddiness; - this.climbing = climbing; - this.end = end; - this.gp_e_id = end.getId(); - } - - public long getStartGpId() { - return gpId; - } - - public DbGeoPoint getStartGp(){ - return gp; - } - - public long getEndGpId() { - return gp_e_id; - } - - - public DbGeoPoint getEndGp(){ - return end; - } - - public long getLength() { - return length; - } - - public int getExposed() { - return exposed; - } - - public int getDiffWet() { - return diffWet; - } - - public int getGiddiness() { - return giddiness; - } - - public int getClimbing() { - return climbing; - } -} - -class TrashBin extends Poi { - public TrashBin(long _id) { - super(_id, Types.TRASH_BIN); - } - public TrashBin(){ - super(Types.TRASH_BIN); - } - public TrashBin(long id, DbGeoPoint gp){ - super(id, Types.TRASH_BIN, gp); - } -} - -class Image extends Poi { - String typeId; - byte[] image; - - public Image(long _id) { - super(_id, Types.PIC); - } - public Image(){ - super(Types.PIC); - } - public Image(long _id, String typeId, byte[] image, DbGeoPoint gp){ - super(_id, Types.PIC, gp); - this.typeId = typeId; - this.image = image; - } - - public String getTypeId(){ - return typeId; - } - - public byte[] getImage(){ - return image; - } -} - -class CellReception extends Poi { - int strength; - String opName; - String opCountry; - int roaming; - String nwType; - - public CellReception(long _id) { - super(_id, Types.CELL_RECEPTION); - } - public CellReception(){ - super(Types.CELL_RECEPTION); - } - public CellReception(long _id, int strength, String opName, String opCountry, int roaming, String nwType, DbGeoPoint gp){ - super(_id, Types.CELL_RECEPTION, gp); - this.strength = strength; - this.opName = opName; - this.opCountry = opCountry; - this.roaming = roaming; - this.nwType = nwType; - } - - public int getStrength() { - return strength; - } - - public String getOpName() { - return opName; - } - - public String getOpCountry() { - return opCountry; - } - - public int getRoaming() { - return roaming; - } - - public String getNwType() { - return nwType; - } -} - -class Wifi extends Poi { - String ssid; - int levels; - - public Wifi(long _id) { - super(_id, Types.WIFI); - } - public Wifi(){ - super(Types.WIFI); - } - public Wifi(long _id, String ssid, int levels, DbGeoPoint gp){ - super(_id, Types.WIFI, gp); - this.ssid = ssid; - this.levels = levels; - } - - public String getSsid() { - return ssid; - } - - public int getLevels() { - return levels; - } -} - -class Lift extends Poi { - DbGeoPoint end; - long endGpId; - String name; - - public Lift(long _id) { - super(_id, Types.LIFT); - } - public Lift(){ - super(Types.LIFT); - } - public Lift(long _id, String name, DbGeoPoint start, DbGeoPoint end){ - super(_id, Types.LIFT, start); - this.name = name; - this.end = end; - this.endGpId = end.getId(); - } - - public long getStartGpId() { - return gpId; - } - - public DbGeoPoint getStartGp(){ - return gp; - } - - public long getEndGpId() { - return endGpId; - } - - public DbGeoPoint getEndGp(){ - return end; - } - - public String getName() { - return name; - } -} - -class DbGeoPoint extends Poi { - private double lat; - private double lon; - private double alt; - private long _time; - private String _type_id; //_ => hut_2 - - public DbGeoPoint(long _id) { - super(_id, Types.GP); - } - public DbGeoPoint(){ - super(Types.GP); - } - - public DbGeoPoint(double aLatitude, double aLongitude, double aAltitude) { - this(aLatitude, aLongitude, aAltitude, System.currentTimeMillis()); - } - - public DbGeoPoint(double aLatitude, double aLongitude, double aAltitude, long _time) { - this(0, aLatitude, aLongitude, aAltitude, _time, ""); - } - - public DbGeoPoint(long id, double lat, double lon, double alt, long time, String type_id){ - super(id, Types.GP); - this.lat = lat; - this.lon = lon; - this.alt = alt; - this._time = time; - this._type_id = type_id; - } - - public double getLat(){ - return lat; - } - - public double getLon(){ - return lon; - } - - public double getAlt(){ - return alt; - } - - public long getTime(){ - return _time; - } - - public String getTypeId(){ - return _type_id; - } - - public void setTypeId(String typeId){ - _type_id = typeId; - } - - public void setId(long id){ - _id = id; - } -} diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddBreakPointDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddBreakPointDialog.java new file mode 100644 index 0000000..7335faa --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddBreakPointDialog.java @@ -0,0 +1,75 @@ +package de.apps4ics.mountainnavigation.pois; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.DialogInterface; +import android.os.Bundle; + +import de.apps4ics.mountainnavigation.CheckboxImageAdapter; +import de.apps4ics.mountainnavigation.Features; +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; + +/** + * Created by Vinz on 03.11.2015. + */ +public class AddBreakpointDialog extends DialogFragment { + MainActivity ma; + + public AddBreakpointDialog(){} + + public AddBreakpointDialog(MainActivity ma){ + this.ma = ma; + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + final CheckboxImageAdapter adapter = new CheckboxImageAdapter(getActivity(), ma.getBreakPointOptions(), null, ma.getBreakPointOptionsImgs()); + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + builder.setTitle(R.string.break_point_dialog_title) + //.setIcon(res.getDrawable(R.drawable.break_point)) + .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + int[] options = adapter.getCheckedItems(); + int stone = 0; + int bench = 0; + int table = 0; + int roofed = 0; + for(int i=0; i pathMarkers = ma.getPathMarkers(); + + if(pathMarkers.size() < 2){ + Log.e(MainActivity.TAG, "One of the path markers in addPathDialog is null!"); + } + + RoadManager roadManager = new OSRMRoadManager(); + ArrayList waypoints = new ArrayList<>(); + DbGeoPoint current = null; + DbGeoPoint last = null; + boolean currentNew = false; + boolean lastNew = false; + for(int i=0; i()); + } + }) + .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }) + .setAdapter(adapter, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + return builder.create(); + } +} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPeakDialog.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPeakDialog.java new file mode 100644 index 0000000..f911f4b --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/AddPeakDialog.java @@ -0,0 +1,46 @@ +package de.apps4ics.mountainnavigation.pois; + +import android.app.AlertDialog; +import android.app.Dialog; +import android.app.DialogFragment; +import android.content.DialogInterface; +import android.os.Bundle; +import android.widget.EditText; + +import de.apps4ics.mountainnavigation.MainActivity; +import de.apps4ics.mountainnavigation.R; + +/** + * Created by Vinz on 03.11.2015. + */ +public class AddPeakDialog extends DialogFragment { + MainActivity ma; + + public AddPeakDialog(MainActivity ma){ + this.ma = ma; + } + + @Override + public Dialog onCreateDialog(Bundle savedInstanceState) { + AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + final EditText input = new EditText(ma.getApplicationContext()); + builder.setTitle(R.string.peak_dialog_title) + .setMessage(R.string.peak_dialog_msg) + .setView(input) + .setPositiveButton(R.string.ok_button, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + String name = input.getText().toString().trim(); + if (name != null && !name.equals("")) { + ma.addPoi(new Peak(0, name, null)); + } + } + }) + .setNegativeButton(R.string.cancel_button, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + } + }); + return builder.create(); + } +} diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/BreakPoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/BreakPoint.java new file mode 100644 index 0000000..731ffdd --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/BreakPoint.java @@ -0,0 +1,43 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class BreakPoint extends Poi { + int stone; + int bench; + int table; + int roofed; + + public BreakPoint(long _id) { + super(_id, Types.BREAK_POINT); + } + public BreakPoint(){ + super(Types.BREAK_POINT); + } + public BreakPoint(long _id, int stone, int bench, int table, int roofed, DbGeoPoint gp){ + super(_id, Types.BREAK_POINT, gp); + this.stone = stone; + this.bench = bench; + this.table = table; + this.roofed = roofed; + } + + public int getStone() { + return stone; + } + + public int getBench() { + return bench; + } + + public int getTable() { + return table; + } + + public int getRoofed() { + return roofed; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/CellReception.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/CellReception.java new file mode 100644 index 0000000..2231f8d --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/CellReception.java @@ -0,0 +1,49 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class CellReception extends Poi { + int strength; + String opName; + String opCountry; + int roaming; + String nwType; + + public CellReception(long _id) { + super(_id, Types.CELL_RECEPTION); + } + public CellReception(){ + super(Types.CELL_RECEPTION); + } + public CellReception(long _id, int strength, String opName, String opCountry, int roaming, String nwType, DbGeoPoint gp){ + super(_id, Types.CELL_RECEPTION, gp); + this.strength = strength; + this.opName = opName; + this.opCountry = opCountry; + this.roaming = roaming; + this.nwType = nwType; + } + + public int getStrength() { + return strength; + } + + public String getOpName() { + return opName; + } + + public String getOpCountry() { + return opCountry; + } + + public int getRoaming() { + return roaming; + } + + public String getNwType() { + return nwType; + } +} diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java new file mode 100644 index 0000000..c224949 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/DbGeoPoint.java @@ -0,0 +1,66 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class DbGeoPoint extends Poi { + private double lat; + private double lon; + private double alt; + private long _time; + private String _type_id; //_ => hut_2 + + public DbGeoPoint(long _id) { + super(_id, Types.GP); + } + public DbGeoPoint(){ + super(Types.GP); + } + + public DbGeoPoint(double aLatitude, double aLongitude, double aAltitude) { + this(aLatitude, aLongitude, aAltitude, System.currentTimeMillis()); + } + + public DbGeoPoint(double aLatitude, double aLongitude, double aAltitude, long _time) { + this(0, aLatitude, aLongitude, aAltitude, _time, ""); + } + + public DbGeoPoint(long id, double lat, double lon, double alt, long time, String type_id){ + super(id, Types.GP); + this.lat = lat; + this.lon = lon; + this.alt = alt; + this._time = time; + this._type_id = type_id; + } + + public double getLat(){ + return lat; + } + + public double getLon(){ + return lon; + } + + public double getAlt(){ + return alt; + } + + public long getTime(){ + return _time; + } + + public String getTypeId(){ + return _type_id; + } + + public void setTypeId(String typeId){ + _type_id = typeId; + } + + public void setId(long id){ + _id = id; + } +} diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Fountain.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Fountain.java new file mode 100644 index 0000000..31006a1 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Fountain.java @@ -0,0 +1,24 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class Fountain extends Poi { + int size; + public Fountain(long _id){ + super(_id, Types.FOUNTAIN); + } + public Fountain(){ + super(Types.FOUNTAIN); + } + public Fountain(long _id, int size, DbGeoPoint gp){ + super(_id, Types.FOUNTAIN, gp); + this.size = size; + } + + public int getSize(){ + return size; + } +} diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Hut.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Hut.java new file mode 100644 index 0000000..bbdee76 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Hut.java @@ -0,0 +1,40 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; +import de.apps4ics.mountainnavigation.pois.DbGeoPoint; +import de.apps4ics.mountainnavigation.pois.Poi; + +/** + * Created by Vinz on 03.11.2015. + */ +public class Hut extends Poi { + int huttype; + int winterroom; + String name; + + public Hut(long _id) { + super(_id, Types.HUT); + } + public Hut(){ + super(Types.HUT); + } + public Hut(long _id, int hut_type, int winterroom, String name, DbGeoPoint gp){ + super(_id, Types.HUT, gp); + this.huttype = hut_type; + this.winterroom = winterroom; + this.name = name; + } + + public int getHutType() { + return huttype; + } + + public int getWinterRoom() { + return winterroom; + } + + public String getName() { + return name; + } +} + diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java new file mode 100644 index 0000000..094b116 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Image.java @@ -0,0 +1,31 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class Image extends Poi { + String typeId; + byte[] image; + + public Image(long _id) { + super(_id, Types.PIC); + } + public Image(){ + super(Types.PIC); + } + public Image(long _id, String typeId, byte[] image, DbGeoPoint gp){ + super(_id, Types.PIC, gp); + this.typeId = typeId; + this.image = image; + } + + public String getTypeId(){ + return typeId; + } + + public byte[] getImage(){ + return image; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Lift.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Lift.java new file mode 100644 index 0000000..c869b4e --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Lift.java @@ -0,0 +1,45 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class Lift extends Poi { + DbGeoPoint end; + long endGpId; + String name; + + public Lift(long _id) { + super(_id, Types.LIFT); + } + public Lift(){ + super(Types.LIFT); + } + public Lift(long _id, String name, DbGeoPoint start, DbGeoPoint end){ + super(_id, Types.LIFT, start); + this.name = name; + this.end = end; + this.endGpId = end.getId(); + } + + public long getStartGpId() { + return gpId; + } + + public DbGeoPoint getStartGp(){ + return gp; + } + + public long getEndGpId() { + return endGpId; + } + + public DbGeoPoint getEndGp(){ + return end; + } + + public String getName() { + return name; + } +} diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Path.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Path.java new file mode 100644 index 0000000..0dae224 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Path.java @@ -0,0 +1,70 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class Path extends Poi { + long gp_e_id; + long length; + int exposed; + int diffWet; + int giddiness; + int climbing; + DbGeoPoint end; + + public Path(long _id) { + super(_id, Types.PATH); + } + public Path() { + super(Types.PATH); + } + public Path(long _id, long _length, int exposed, int diff_wet, int giddiness, int climbing, DbGeoPoint start, DbGeoPoint end){ + super(_id, Types.PATH, start); + this.length = _length; + this.exposed = exposed; + this.diffWet = diff_wet; + this.giddiness = giddiness; + this.climbing = climbing; + this.end = end; + this.gp_e_id = end.getId(); + } + + public long getStartGpId() { + return gpId; + } + + public DbGeoPoint getStartGp(){ + return gp; + } + + public long getEndGpId() { + return gp_e_id; + } + + + public DbGeoPoint getEndGp(){ + return end; + } + + public long getLength() { + return length; + } + + public int getExposed() { + return exposed; + } + + public int getDiffWet() { + return diffWet; + } + + public int getGiddiness() { + return giddiness; + } + + public int getClimbing() { + return climbing; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Peak.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Peak.java new file mode 100644 index 0000000..d7aee0d --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Peak.java @@ -0,0 +1,25 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class Peak extends Poi { + String name; + + public Peak(long _id) { + super(_id, Types.PEAK); + } + public Peak(){ + super(Types.PEAK); + } + public Peak(long _id, String name, DbGeoPoint gp){ + super(_id, Types.PEAK, gp); + this.name = name; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Poi.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Poi.java new file mode 100644 index 0000000..2a195dd --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Poi.java @@ -0,0 +1,84 @@ +package de.apps4ics.mountainnavigation.pois; + +/** + * Created by Vinz on 06.10.2015. + */ +public class Poi { + protected long _id; + protected int _type; + protected DbGeoPoint gp; + protected long gpId; + + public Poi() { + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + + Poi poi = (Poi) o; + + if (_id != poi._id) return false; + if (_type != poi._type) return false; + return true; + } + + @Override + public int hashCode() { + int result = (int) _id; + result = 31 * result + _type; + return result; + } + + public long getGpId(){ + return gpId; + } + + public DbGeoPoint getGp(){ + return gp; + } + + public void setGpId(long gpId){ + this.gpId = gpId; + } + + public void setGp(DbGeoPoint gp){ + this.gp = gp; + this.gpId = gp.getId(); + } + + public Poi(int _type){ + this._type = _type; + } + + public Poi(long _id, int _type){ + this._id = _id; + this._type = _type; + } + + public Poi(long _id, int _type, DbGeoPoint _gp){ + this(_id, _type); + if(_gp != null){ + this.gp = _gp; + this.gpId = _gp.getId(); + } + } + + public long getId(){ + return _id; + } + + @Override + public String toString() { + return "Poi {" + + "_id=" + _id + + ", _type=" + _type + + '}'; + } + + public int getType(){ + return _type; + } + +} diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/TrashBin.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/TrashBin.java new file mode 100644 index 0000000..f611ba1 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/TrashBin.java @@ -0,0 +1,18 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class TrashBin extends Poi { + public TrashBin(long _id) { + super(_id, Types.TRASH_BIN); + } + public TrashBin(){ + super(Types.TRASH_BIN); + } + public TrashBin(long id, DbGeoPoint gp){ + super(id, Types.TRASH_BIN, gp); + } +} \ No newline at end of file diff --git a/app/src/main/java/de/apps4ics/mountainnavigation/pois/Wifi.java b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Wifi.java new file mode 100644 index 0000000..eeccf92 --- /dev/null +++ b/app/src/main/java/de/apps4ics/mountainnavigation/pois/Wifi.java @@ -0,0 +1,31 @@ +package de.apps4ics.mountainnavigation.pois; + +import de.apps4ics.mountainnavigation.Types; + +/** + * Created by Vinz on 03.11.2015. + */ +public class Wifi extends Poi { + String ssid; + int levels; + + public Wifi(long _id) { + super(_id, Types.WIFI); + } + public Wifi(){ + super(Types.WIFI); + } + public Wifi(long _id, String ssid, int levels, DbGeoPoint gp){ + super(_id, Types.WIFI, gp); + this.ssid = ssid; + this.levels = levels; + } + + public String getSsid() { + return ssid; + } + + public int getLevels() { + return levels; + } +}