Further work on map integration todo look at locations in\heritence

src/main/java/Team5/SmartTowns/data/LocationRepository.java

@@ -10,6 +10,9 @@ public interface LocationRepository {
 
 
     List<Location> getApprovedLocations();
+
+    List<Location> getApprovedLocations2(List<Location> list);
+
     List<Location> getUnapprovedLocations();
 
 

src/main/java/Team5/SmartTowns/data/LocationRepositoryJDBC.java

@@ -42,7 +42,8 @@ public class LocationRepositoryJDBC implements LocationRepository {
 
     @Override
     public List<Location> getApprovedLocations(){
-        List<Location> locations = getAllLocation();
+        JdbcTemplate jdbc = new JdbcTemplate();
+        List<Location> locations = new LocationRepositoryJDBC(jdbc).getAllLocation();
         List<Location> locationApprovalList= new ArrayList<Location>();
         for (Location loc :locations){
             if (loc.isLocationApproved()) {
@@ -51,6 +52,19 @@ public class LocationRepositoryJDBC implements LocationRepository {
         } return locationApprovalList;
  }
 
+    @Override
+    public List<Location> getApprovedLocations2(List<Location> list){
+
+        List<Location> locationApprovalList= new ArrayList<Location>();
+        for (Location loc :list){
+            if (loc.isLocationApproved()) {
+                locationApprovalList.add(loc);
+            }
+        } return locationApprovalList;
+    }
+
+
+
     @Override
     public List<Location> getUnapprovedLocations(){
         List<Location> locations = getAllLocation();
@@ -63,11 +77,9 @@ public class LocationRepositoryJDBC implements LocationRepository {
     }
 
 
-
-
-
-
-
+    public JdbcTemplate getJdbc() {
+        return jdbc;
+    }
 
     public LocationRepositoryJDBC() {
     }

src/main/java/Team5/SmartTowns/placeswithcoordinates/LocationsCoordinates.java

@@ -21,6 +21,11 @@ public class LocationsCoordinates  extends LocationRepositoryJDBC {
     private String locationCoordsLong;
     private JdbcTemplate jdbc;
 
+    public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc){
+        JdbcTemplate jdbcSuper= new LocationRepositoryJDBC().getJdbc();
+        return new LocationRepositoryJDBC(jdbcSuper).getApprovedLocations();
+    }
+
 
     public int getLocationID() {
         return locationID;
@@ -66,10 +71,10 @@ public class LocationsCoordinates  extends LocationRepositoryJDBC {
 
 
 
-    public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc){
-        LocationsCoordinates jdbcSuper= new LocationsCoordinates(aJdbc);
-        return new LocationRepositoryJDBC(aJdbc).getApprovedLocations();
-    }
+//    public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc){
+//        JdbcTemplate jdbcSuper= new LocationRepositoryJDBC().getJdbc();
+//        return new LocationRepositoryJDBC(jdbcSuper).getApprovedLocations();
+//    }
 
     public List<Location> getFullUnapprovedLocations(JdbcTemplate aJdbc){
         LocationsCoordinates jdbcSuper= new LocationsCoordinates(aJdbc);

src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java

 package Team5.SmartTowns.placeswithcoordinates;
 
+import Team5.SmartTowns.data.Location;
+import Team5.SmartTowns.data.LocationRepository;
+import Team5.SmartTowns.data.TrailsRepository;
 import Team5.SmartTowns.trails.Trail;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,10 +19,34 @@ import java.util.List;
 @Controller
 public class PlacesController {
 
+    @Autowired
+    private PlacesCoordinatesRepository placeRepo;
+    @Autowired
+    private LocationRepository locationRepo;
 
 
-    //GC example
 
+
+    @GetMapping("/checkpoint")
+    public ModelAndView getLocationPages(){
+        ModelAndView modelAndView = new ModelAndView("landmarks/locationPage.html");
+//        List<Location> locations =  locationRepo.getAllLocation();
+//        List<Location> approvedLocations =  locationRepo.getApprovedLocations2(locations);
+        List<LocationsCoordinates> locCoords = placeRepo.getAllLocationCoords();
+//        modelAndView.addObject("locations", approvedLocations);
+        modelAndView.addObject("locationCoords", locCoords);
+        return  modelAndView;
+    }
+//
+//    @RequestMapping(value="/location", method= RequestMethod.POST)
+//    public String sendHtmlFragment(Model map) {
+//        map.addAttribute("foo", "bar");
+//        return "checkpoint/checkpoint";
+//    }
+//
+//
+//    //GC example
+//
 //    @GetMapping("/allTrails")
 //    public ModelAndView getAllTrails(){
 //        ModelAndView mav = new ModelAndView("allTrails/allTrails");

src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesCoordinatesRepositoryJDBC.java

 package Team5.SmartTowns.placeswithcoordinates;
 
 import Team5.SmartTowns.data.Location;
+import Team5.SmartTowns.data.LocationRepositoryJDBC;
 import org.springframework.boot.autoconfigure.integration.IntegrationProperties;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
@@ -72,11 +73,17 @@ public class PlacesCoordinatesRepositoryJDBC implements PlacesCoordinatesReposit
 
     }
 
-    @Override //TODO CHECK
+
     public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc) {
-        return null;
+        LocationsCoordinates jdbcSuper= new LocationsCoordinates(aJdbc);
+        return new LocationRepositoryJDBC(aJdbc).getApprovedLocations();
     }
 
+//    @Override //TODO CHECK
+//    public List<Location> getFullApprovedLocations(JdbcTemplate aJdbc) {
+//        return null;
+//    }
+
 
     public boolean checkInputtedCoordsMatchTown(String inpLatCoords, String inpLongCoords, String townName){
      PlacesCoordinatesRepositoryJDBC jbdcsecond = new PlacesCoordinatesRepositoryJDBC(jdbc);

src/main/resources/templates/landmarks/locationPage.html

@@ -6,5 +6,40 @@
 </head>
 <body>
 
+<main>
+    <div th:each="coord, indexValue:${locationCoords}">
+        <p th:text="*{coord.getLocationID()}"></p>
+<!--        <p th:text="${locations[indexValue.index]}"></p>-->
+
+
+<!--&lt;!&ndash;        <H1 th:text="${location[indexValue.index].getLocationName()}"> </H1>&ndash;&gt;-->
+
+
+        <iframe
+                width="300"
+                height="170"
+                frameborder="0"
+                scrolling="no"
+                marginheight="0"
+                marginwidth="0"
+                th:src="https://maps.google.com/maps?q='+*{coord.getLocationCoordsLat()}+','+*{coord.getLocationCoordsLong()}+'&hl=es&z=14&amp;output=embed"
+        >
+        </iframe>
+        <br />
+        <small>
+            <a
+                    th:href="https://maps.google.com/maps?q='+{coord.getLocationCoordsLat()}+','+*{coord.getLocationCoordsLong()}+'&hl=es;z=14&amp;output=embed"
+                    style="color:#0000FF;text-align:left"
+                    target="_blank"
+            >
+                See map bigger
+            </a>
+        </small>
+
+    </div>
+
+
+</main>
+
 </body>
 </html>
\ No newline at end of file