tvolkmann/labswp_2019_sose_geocaching
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adjusted categoryID values for POIS

Browse Source
This commit is contained in:
Michael 2019-05-07 17:45:28 +02:00
parent 51e87c239a
commit d32d8ca3ea
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
View File

@ -1002,8 +1002,7 @@ public class Controller {
ArrayList<POI> poisList = new ArrayList<>(); ArrayList<POI> poisList = new ArrayList<>();
for (Cache cache : cacheRepository.findAll()) { for (Cache cache : cacheRepository.findAll()) {
Station station = cache.getStationen().get(0); Station station = cache.getStationen().get(0);
// ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst POI poi = new POI(cache.getName() + "_Station1", (float) station.getLattitude(), (float) station.getLongitude(), 201);
POI poi = new POI(cache.getName() + "_Station1", (float) station.getLattitude(), (float) station.getLongitude(), 0);
poisList.add(poi); poisList.add(poi);
} }
@ -1014,12 +1013,11 @@ public class Controller {
int index = cache.getStationen().indexOf(aktuelleStation); int index = cache.getStationen().indexOf(aktuelleStation);
for (int i = 1; i <= index; i++) { for (int i = 1; i <= index; i++) {
Station station = cache.getStationen().get(i); Station station = cache.getStationen().get(i);
// ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst
int categoryID; int categoryID;
if (i < cache.getStationen().size() - 1) { // isnt endstation if (i < cache.getStationen().size() - 1) { // isnt endstation
categoryID = 1; categoryID = 202;
} else { // is endstation } else { // is endstation
categoryID = 2; categoryID = 203;
} }
POI poi = new POI(cache.getName() + "_Station" + (i + 1), (float) station.getLattitude(), (float) station.getLongitude(), categoryID); POI poi = new POI(cache.getName() + "_Station" + (i + 1), (float) station.getLattitude(), (float) station.getLongitude(), categoryID);
poisList.add(poi); poisList.add(poi);

3
src/main/java/hhn/labsw/bugageocaching/helper/POI.java
View File

@ -5,8 +5,7 @@ public class POI {
private String Name; private String Name;
private float Latitude; private float Latitude;
private float Longitude; private float Longitude;
// ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst private int CategoryID; // 201 = grünes icon(startstation) // 202 = blaues icon(folgestationen) // 203 = rotes icon(endstation)
private int CategoryID; // 0 = grünes icon(startstation) // 1 = orangenes icon(folgestationen) // 2 = rotes icon(endstation)
public POI(String name, float latitude, float longitude, int categoryID) { public POI(String name, float latitude, float longitude, int categoryID) {
Name = name; Name = name;

2
src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java
View File

@ -45,7 +45,7 @@ public interface UserRepository extends CrudRepository<User, Integer> {
" AND t.id = ui.team_id\n" + " AND t.id = ui.team_id\n" +
" AND ui.team_id IS NOT NULL\n" + " AND ui.team_id IS NOT NULL\n" +
"GROUP BY teamname\n" + "GROUP BY teamname\n" +
"ORDER by ranking_points_sum DESC" + "ORDER by ranking_points_sum DESC\n" +
"LIMIT 10;", nativeQuery = true) "LIMIT 10;", nativeQuery = true)
List<Object[]> getTeamRankingList(); List<Object[]> getTeamRankingList();