diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java index abd7b33..c695628 100644 --- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java +++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java @@ -1002,8 +1002,7 @@ public class Controller { ArrayList poisList = new ArrayList<>(); for (Cache cache : cacheRepository.findAll()) { 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(), 0); + POI poi = new POI(cache.getName() + "_Station1", (float) station.getLattitude(), (float) station.getLongitude(), 201); poisList.add(poi); } @@ -1014,12 +1013,11 @@ public class Controller { int index = cache.getStationen().indexOf(aktuelleStation); for (int i = 1; i <= index; i++) { Station station = cache.getStationen().get(i); - // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst int categoryID; if (i < cache.getStationen().size() - 1) { // isnt endstation - categoryID = 1; + categoryID = 202; } else { // is endstation - categoryID = 2; + categoryID = 203; } POI poi = new POI(cache.getName() + "_Station" + (i + 1), (float) station.getLattitude(), (float) station.getLongitude(), categoryID); poisList.add(poi); diff --git a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java index d6a4051..0e88c13 100644 --- a/src/main/java/hhn/labsw/bugageocaching/helper/POI.java +++ b/src/main/java/hhn/labsw/bugageocaching/helper/POI.java @@ -5,8 +5,7 @@ public class POI { private String Name; private float Latitude; private float Longitude; - // ICONS müssen noch erstellt werden und die categoryID entsprechend angepasst - private int CategoryID; // 0 = grünes icon(startstation) // 1 = orangenes icon(folgestationen) // 2 = rotes icon(endstation) + private int CategoryID; // 201 = grünes icon(startstation) // 202 = blaues icon(folgestationen) // 203 = rotes icon(endstation) public POI(String name, float latitude, float longitude, int categoryID) { Name = name; diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java index d8784ec..af74433 100644 --- a/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java +++ b/src/main/java/hhn/labsw/bugageocaching/repositories/UserRepository.java @@ -45,7 +45,7 @@ public interface UserRepository extends CrudRepository { " AND t.id = ui.team_id\n" + " AND ui.team_id IS NOT NULL\n" + "GROUP BY teamname\n" + - "ORDER by ranking_points_sum DESC" + + "ORDER by ranking_points_sum DESC\n" + "LIMIT 10;", nativeQuery = true) List getTeamRankingList();