JoeKung/Progetto-m152-Angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source 
# Conflicts:
#	src/app/home/home.component.ts
This commit is contained in:
grata
2023-04-03 14:17:30 +02:00
parent 98fad879f6 fe105a7924
commit dc8d60ff06
14 changed files with 240 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/assets/data.json
View File

@@ -1,27 +1,66 @@
{
"nome": "Biasca",
"provincia": "TI",
"waypoints": [
{
"nome": "Punto 1",
"lat": 46.123,
"lon": 8.123,
"descrizione": "Descrizione del punto 1",
"foto": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
},
{
"nome": "Punto 2",
"lat": 46.123,
"lon": 8.123,
"descrizione": "Descrizione del punto 2",
"foto": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
},
{
"nome": "Punto 3",
"lat": 46.123,
"lon": 8.123,
"descrizione": "Descrizione del punto 3",
"foto": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
}
]
}
[
{
"location": "Biasca",
"region": "ticino",
"lat": 46.123,
"lon": 8.123,
"waypoints": [
{
"id": 1,
"name": "Punto 1",
"lat": 46.123,
"lon": 8.123,
"description": "Descrizione del punto 1",
"img": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
},
{
"id": 2,
"name": "Punto 2",
"lat": 46.123,
"lon": 8.123,
"description": "Descrizione del punto 2",
"img": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
},
{
"id": 3,
"name": "Punto 3",
"lat": 46.123,
"lon": 8.123,
"description": "Descrizione del punto 3",
"img": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
}
]
},
{
"location": "Lugano",
"region": "TI",
"lat": 46.123,
"lon": 8.123,
"waypoints": [
{
"id": 4,
"name": "Punto 1",
"lat": 46.123,
"lon": 8.123,
"description": "un grandissimo",
"img": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
},
{
"id": 5,
"name": "Punto 2",
"lat": 46.123,
"lon": 8.123,
"description": "Descrizione del punto 2",
"img": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
},
{
"id": 6,
"name": "Punto 3",
"lat": 46.123,
"lon": 8.123,
"description": "Descrizione del punto 3",
"img": "https://www.google.com/images/branding/googlelogo/1x/googlelogo_color_272x92dp.png"
}
]
}
]