diff --git a/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java b/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
index 945262fbb0f4632c61d18c9d8b10a06d42d62ea8..703545ea59da82ecad9d63ab03b6e432a797f94e 100644
--- a/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
+++ b/src/main/java/Team5/SmartTowns/landmarks/LandmarksController.java
@@ -79,6 +79,7 @@ public class LandmarksController {
int locationID = locationRepository.nametoLocationID(location.getLocationName());
// converts valid response using Location constructor into a submittable format to the sql table
+ System.out.println(locCoord.getLocationCoordsLong());
LocationsCoordinates ALocCoord = new LocationsCoordinates(locationID, locCoord.getLocationCoordsLat(), locCoord.getLocationCoordsLong());
boolean checkIfCoorsWithinBoundaries = placesCoordinatesRepo.checkIfCoordsAreWithinTownBoundary(ALocCoord);
if (checkIfCoorsWithinBoundaries==false){ // if coords outside associated town, form is returned to original state
diff --git a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
index b9f08193e5f31d8285e385cc6c9495cc15ddf3b1..441ddd59f342f0f65d2603fc64cad0f99442fb41 100644
--- a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
+++ b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
@@ -16,8 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
@Controller
@@ -35,6 +34,70 @@ public class PlacesController {
private RewardsRepository rewardsRepository;
+
+
+ @GetMapping("/towns")
+ public ModelAndView getTownPages(){
+ ModelAndView modelAndView = new ModelAndView("towns/townsPageList.html");
+ List<TownWithTrails> townsList = placeRepo.getAllTownCoords();
+ List<Trail> trailslocations = trailsRepo.getAllTrails();
+ modelAndView.addObject("trails", trailslocations);
+ modelAndView.addObject("towns", townsList);
+ return modelAndView;
+ }
+
+ @RequestMapping(value="/town", method= RequestMethod.POST)
+ public String sendHtmlFragmentTown(Model map) {
+ map.addAttribute("foo", "bar");
+ return "checkpoint/checkpoint";
+ }
+
+ @GetMapping("/towns/{town}")
+ public ModelAndView getResultBySearchKeyTowns(@PathVariable String town) {
+ List<TownWithTrails> townsList = placeRepo.getAllTownCoords();
+ List<Trail> trailslocations = trailsRepo.getAllTrails();
+ List<Trail> correctTrails = new ArrayList<>();
+ String townNamee="";
+ int indexTown=999;
+ for (int i=0;i<townsList.size();i++){
+ if (Objects.equals(townsList.get(i).getTownName(), town)){
+ indexTown=i;
+ townNamee=town;
+ }
+ }
+ if (indexTown!=999){
+ int townIDFromTable= placeRepo.getTownIDFromName(townNamee);
+ for (int i=0;i<trailslocations.size();i++){
+ int trailID = trailsRepo.getTrailIDFromTrailName(trailslocations.get(i).getTrailName());
+ if ((trailID>100)&&(trailID<200)&&(Objects.equals(townNamee, "Caerphilly"))){
+ correctTrails.add(trailslocations.get(i));
+ }
+ if ((trailID>200)&&(trailID<300)&&(Objects.equals(townNamee, "Risca"))){
+ correctTrails.add(trailslocations.get(i));
+ }
+ if ((trailID>300)&&(trailID<400)&& (Objects.equals(townNamee, "Penarth")) ){
+ correctTrails.add(trailslocations.get(i));
+ }
+ }
+ }
+
+ ModelAndView modelAndView= new ModelAndView("fragments/townsPageFrags :: townSection");
+ modelAndView.addObject("town", townsList.get(indexTown));
+ modelAndView.addObject("trails", correctTrails);
+ return modelAndView;}
+
+
+
+
+
+
+
+
+
+
+
+
+
@GetMapping("/checkpoints")
public ModelAndView getLocationPages(){
ModelAndView modelAndView = new ModelAndView("landmarks/locationPage.html");
@@ -42,7 +105,7 @@ public class PlacesController {
List<Location> approvedLocations = locationRepo.getAllApprovedLocations();
modelAndView.addObject("location", approvedLocations);
- modelAndView.addObject("locationCoords", locCoords);
+ modelAndView.addObject("locationCoords", reorderCoordsWRTLocations(locCoords));
return modelAndView;
}
@@ -55,19 +118,19 @@ public class PlacesController {
- @GetMapping("/checkpoints/{location}")
+ @GetMapping("/checkpoints/{location}")
public ModelAndView getResultBySearchKeyLocation(@PathVariable String location) {
- List<LocationsCoordinates> locCoords = placeRepo.getAllLocationCoords();
- List<Location> approvedLocations = locationRepo.getAllApprovedLocations();
+ List<LocationsCoordinates> locCoords = reorderCoordsWRTLocations(placeRepo.getAllLocationCoords());
+ List<Location> approvedLocations = locationRepo.getAllApprovedLocations();
- int locationID = 999;
- for (int i=0;i<approvedLocations.size();i++){
- if ( (approvedLocations.get(i).getLocationName().replace(' ', '-').trim().equals(location)) ){
- locationID= i;
- }
+ int locationID = 999;
+ for (int i=0;i<approvedLocations.size();i++){
+ if ( (approvedLocations.get(i).getLocationName().replace(' ', '-').trim().equals(location)) ){
+ locationID= i;
}
+ }
- String trailName=trailsRepo.getTrailNameWithID(approvedLocations.get(locationID).getLocationTrailID()).replace(' ', '-').trim();
+ String trailName=trailsRepo.getTrailNameWithID(approvedLocations.get(locationID).getLocationTrailID()).replace(' ', '-').trim();
ModelAndView modelAndView= new ModelAndView("fragments/locationPageFrags :: locationSection");
modelAndView.addObject("locCoord", locCoords.get(locationID));
modelAndView.addObject("trail", trailName);
@@ -77,6 +140,7 @@ public class PlacesController {
+
/// Trail webpage mapping
@@ -90,10 +154,11 @@ public class PlacesController {
modelAndView.addObject("trails", trailslocations);
modelAndView.addObject("locations", approvedLocations);
- modelAndView.addObject("locationCoords", locCoords);
+ modelAndView.addObject("locationCoords", reorderCoordsWRTLocations(locCoords));
return modelAndView;
}
+
@RequestMapping(value="/trail", method= RequestMethod.POST)
public String sendHtmlFragmentTrail(Model map) {
map.addAttribute("foo", "bar");
@@ -131,5 +196,41 @@ public class PlacesController {
modelAndView.addObject("stickers", rewardsRepository.getAllStickersFromPack(1));
return modelAndView;
}
+// public List<LocationsCoordinates> reorderCoordsWRTLocations(List<LocationsCoordinates> locCoords){
+// List<Location> approvedList = locationRepo.getAllLocation();
+//// List<LocationsCoordinates> locCoords = placeRepo.getAllLocationCoords();
+// List<Integer> locationID= new ArrayList<Integer>();
+// System.out.println(locCoords);
+// System.out.println("///////");
+// Collections.swap(locCoords,0,10);
+// for(int i=0;i<locCoords.size();i++){
+// if (i==locCoords.size()-1){
+// if (locCoords.get(i).getLocationID()<locCoords.get(i-1).getLocationID()){
+// Collections.swap(locCoords,i,i--);
+// i=0;
+// }
+//
+// }
+// if (locCoords.get(i).getLocationID()>locCoords.get(i++).getLocationID()){
+// System.out.println("ASDSADASD");
+// Collections.swap(locCoords,i,i++);
+// i=0;
+// }
+//
+// } System.out.println(locCoords);
+// return locCoords;
+//
+//
+//
+// }
+
+ // When adding to the locationsCoordinates table, the order is not based on LocationID order, therefore it is needed to rearrange this list to
+ // follow ascending locationID so that any new coordinates match up with their intended locations.
+ public List<LocationsCoordinates> reorderCoordsWRTLocations(List<LocationsCoordinates> locCoords){
+ Collections.sort(locCoords,
+ Comparator.comparingInt(LocationsCoordinates::getLocationID));
+ return locCoords;
+
+ }
}
diff --git a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
index a7a7dc86900df8bdfb0c0dd080fcced6d123d313..8e094c271de9688930b628edd2b808925716068e 100644
--- a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
+++ b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java
@@ -65,7 +65,7 @@ public class PlacesCoordinatesRepositoryJDBC implements PlacesCoordinatesReposit
public void addLocationCoord(LocationsCoordinates locCoords) {
String sql = "insert into locationCoordinates(locationID, locationCoordsLat,locationCoordsLong) values (?,?,?)";
- jdbc.update(sql,locCoords.getLocationID(), locCoords.getLocationCoordsLong(),locCoords.getLocationCoordsLat());
+ jdbc.update(sql,locCoords.getLocationID(), locCoords.getLocationCoordsLat(),locCoords.getLocationCoordsLong());
}
@Override
diff --git a/src/main/resources/static/css/homePageStyle.css b/src/main/resources/static/css/homePageStyle.css
index 4d69af3c489fc11c8772ed8e68eda94d2d536b75..271119c67ab8434f1e99a4525d119a18d1e34649 100644
--- a/src/main/resources/static/css/homePageStyle.css
+++ b/src/main/resources/static/css/homePageStyle.css
@@ -13,6 +13,11 @@ and (min-device-width: 1000px) {
grid-area: submitButton;
}
+
+ .reviewLand{
+ grid-area: reviewButton;
+ }
+
.Banner {
margin-top: 20px;
background-color: darkslategrey;
@@ -146,14 +151,15 @@ and (min-device-width: 1000px) {
.gridContainer1 {
- display: grid;
+ display:grid;
grid-template-columns: 10% 10% 60% 5% 5% 10%;
grid-template-rows: auto;
grid-template-areas:
". pageTitle pageTitle pageTitle pageTitle ."
- ". . . submitButton submitButton .";
+ ". reviewButton . submitButton submitButton .";
}
+
.gridContainer2 {
display: grid;
grid-template-columns: 10% 10% 60% 5% 5% 10%;
diff --git a/src/main/resources/templates/landmarks/locationApprovalFormTh.html b/src/main/resources/templates/landmarks/locationApprovalFormTh.html
index 9ec50fbdd3031fa7a289b40fd2df895ab3ce9e02..f63cfc04e9621e41826deace5fa7dc18789e34ed 100644
--- a/src/main/resources/templates/landmarks/locationApprovalFormTh.html
+++ b/src/main/resources/templates/landmarks/locationApprovalFormTh.html
@@ -18,7 +18,7 @@
<form action="/checkpointSubmitted" method="post" id="adminCheckpointApproval" name="adminCheckpointApproval" th:object="${locationCoord}" onsubmit="return acceptanceValidation()">
<label> Location:
- <select th:object="${location}" th:field="*{locationName}"}>
+ <select th:object="${location}" th:field="*{locationName}">
<!-- <select th:field="*{locationName}">-->
<option value="" hidden="true">Select Location</option>
<option value="" selected disabled>Select Location</option>
@@ -27,14 +27,13 @@
</select>
</label>
<br><br>
+ <div th:if="${param.error}" class="coordError">Invalid Coordinates entered</div>
<label> Location Latitude:
<input type="text" th:field="*{locationCoordsLat}" placeholder="Latitude Here">
- <div th:if="${param==error}" class="coordError">Invalid Coordinates entered</div>
<br><br>
<label> Location Longitude:
- <input type="text" th:field="*{locationCoordsLong}" placeholder="Latitude Here">
+ <input type="text" th:field="*{locationCoordsLong}" placeholder="Longitude Here">
</label><br><br>
- <div th:if="${param==error}" class="coordError">Invalid Coordinates entered<
<input type="submit">
</form>