Skip to content
Snippets Groups Projects
Commit 1f112eb1 authored by Gabriel Copat's avatar Gabriel Copat
Browse files

Fixed maps so they show in the trail screen

parent 8437d0cc
No related branches found
No related tags found
1 merge request!36Resolve "As a user I want to be able to use the application on any device e.g. iPhone, iPad, Laptop"
Hide whitespace changes
Inline Side-by-side
src/main/java/Team5/SmartTowns/towns/TownStorage.java
+ 2
− 2
View file @ 1f112eb1
......@@ -12,8 +12,8 @@ public class TownStorage {
townList.addAll(
List.of(
new Towns("Caerphilly",01,3,70,"/images/banners/CaerphillyCastle.jpg"),
new Towns("Risca",02,2,34,"/images/banners/RiscaBanner.jpg"),
new Towns("Penarth",03,5,0,"/images/banners/PenarthBanner.jpg"),
new Towns("Risca",02,1,34,"/images/banners/RiscaBanner.jpg"),
new Towns("Penarth",03,1,0,"/images/banners/PenarthBanner.jpg"),
new Towns("Penarth",03,5,50,"/images/banners/PenarthBanner.jpg"),
new Towns("Caerphilly",01,3,70,"/images/banners/CaerphillyCastle.jpg"),
new Towns("Risca",02,2,90,"/images/banners/RiscaBanner.jpg"),
......
src/main/java/Team5/SmartTowns/trails/Trail.java deleted 100644 → 0
+ 0
− 40
View file @ 8437d0cc
//package Team5.SmartTowns.trails;
//
//import lombok.Data;
//
//import java.io.File;
//import java.util.List;
//
//@Data
//public class Trail {
// public static List<Trail> trails = List.of(
// new Trail(1,"Caerphilly Castle Trail", "Take a stroll through the grounds of one of Europe's finest historic buildings and you will see stunning views of the castle and the lakes. The route of the trail is marked with eight special circular markers, which depict various fascinating historical facts relating to the castle. Pupils from Ysgol Gynradd Gymraeg Caerffili, Plasyfelin Junior School, Ysgol Y Castell and Twyn Primary worked with the artist to come up with the different designs. You do not need to pay to go in the castle to complete this trail. This Trail is fairly short at 1.5 miles and very suitable for wheelchairs and pushchairs as the route stays mostly on well-marked and ramped paths with just a couple of short diversions onto grassed areas."),
// new Trail(2,"Trail2", "This is trail two"),
// new Trail(3,"Trail3", "This is trail three"),
// new Trail(4,"Trail4", "This is trail four"),
// new Trail(5,"A Dragon's Tale", "EDITING THIS")
// );
//
// int id;
// String name;
// String description;
// int nLandmarks;
// int difficulty; //1-5
// String imgPath;
//
// public Trail(int id, String name, String description) {
// this.id = id;
// this.name = name;
// this.description = description;
// imgPath = findImagePath();
// }
//
// private String findImagePath(){
// /* Finds the image in the Path folder, if image is not found assigns default image */
// String imgPath = "images/trails/trail" + id + ".jpg";
// String notFoundPath = "images/trails/trailNotFound.jpg";
//
// File imgFile = new File("src/main/resources/static/" + imgPath);
// return imgFile.exists() ? imgPath : notFoundPath;
// }
//}
src/main/resources/templates/fragments/trailsPageFrags.html
+ 11
− 18
View file @ 1f112eb1
......@@ -4,7 +4,7 @@
<meta charset="UTF-8">
<title th:text="${trail.getTrailName()}"></title>
<link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
<link rel="stylesheet" th:href="@{/css/trailsPageFragsStyle.css}">
<link rel="stylesheet" th:href="@{/css/mobile-style.css}">
<link rel="stylesheet" th:href="@{/css/userProfile.css}">
......@@ -28,9 +28,10 @@
scrolling="yes"
marginheight="0"
marginwidth="0"
src="https://www.google.com/maps/dir/51.57623,-3.21910/51.575372,-3.219186/51.576363,-3.220712//@11z">
src="https://maps.google.com/maps?q=51.57623,-3.21910&output=svembed">
</iframe>
<div><a href="https://www.google.com/maps/dir/51.57623,-3.21910/51.575372,-3.219186/51.576363,-3.220712//@11z">Trail Map</a></div>
<div><a href="https://www.google.com/maps/dir/51.57623,-3.21910/51.575372,-3.219186/51.576363,-3.220712//@11z&output=svembed">Trail Map</a></div>
</div>
......@@ -42,7 +43,8 @@
scrolling="yes"
marginheight="0"
marginwidth="0"
th:src="'https://www.google.com/maps/dir/51.57239,-3.21992/51.57230,-3.21938//@&hl=en&z=20&amp;output=embed'">
src="https://maps.google.com/maps?q=51.57239,-3.21992&output=svembed">
</iframe>
<div><a href="https://www.google.com/maps/dir/51.57239,-3.21992/51.57230,-3.21938//@11z">Trail Map</a></div>
......@@ -55,7 +57,8 @@
scrolling="yes"
marginheight="0"
marginwidth="0"
th:src="'https://www.google.com/maps/dir/51.57168,-3.21861/51.57465,-3.22022//@11z'">
th:src="'https://maps.google.com/maps?q=51.57168,-3.21861&output=svembed'">
</iframe>
<div>
<a href="https://www.google.com/maps/dir/51.57168,-3.21861/51.57465,-3.22022//@11z">Trail Map</a></div>
......@@ -69,7 +72,7 @@
scrolling="yes"
marginheight="0"
marginwidth="0"
th:src="'https://www.google.com/maps/dir/51.61117,-3.10198/51.61655,-3.12371 //@11z'">
th:src="'https://maps.google.com/maps?q=51.61117,-3.10198&output=svembed'">
</iframe>
<div><a href="https://www.google.com/maps/dir/51.61117,-3.10198/51.61655,-3.12371 //@11z">Trail Map</a></div>
</div>
......@@ -81,7 +84,8 @@
scrolling="yes"
marginheight="0"
marginwidth="0"
th:src="'https://www.google.com/maps/dir/51.43484,-3.16492/51.43547,-3.16789//@11z'">
th:src="'https://maps.google.com/maps?q=51.43484,-3.164928&output=svembed'">
</iframe>
<div>
<a href="https://www.google.com/maps/dir/51.43484,-3.16492/51.43547,-3.16789//@11z">Trail Map</a>
......@@ -95,24 +99,13 @@
<div><a th:href="'/checkpoints/'+${locations[indexValue.index].getLocationName().replace(' ', '-')}" th:text="${locations[indexValue.index].getLocationName()}"></a></div>
<ul></ul>
</li>
</div>
</div>
</article>
<article>
<h1> Stickers </h1>
<br>
<div class="stickersContainer">
<img th:class="'stickerImg gotSticker'" th:each="sticker : ${stickers}" th:src="@{'../' + ${sticker.getDisplayImg()}}"
th:id="'img' + ${sticker.getId()}" th:alt="${sticker.getName()}" >
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment