Skip to content

Commit a3ecb07

Browse files
author
Sine Jespersen
authored
Merge pull request #22 from itk-dev/feature/add-proximity-to-poi
Feature/add proximity to poi
2 parents 84aa21e + 5b81b1b commit a3ecb07

File tree

7 files changed

+12387
-7412
lines changed

7 files changed

+12387
-7412
lines changed

package-lock.json

Lines changed: 12383 additions & 7400 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
"version": "0.1.0",
44
"private": true,
55
"dependencies": {
6-
"@testing-library/jest-dom": "^5.17.0",
7-
"@testing-library/react": "^13.4.0",
8-
"@testing-library/user-event": "^13.5.0",
96
"ol": "^7.4.0",
107
"proj4": "^2.9.0",
118
"react": "^18.2.0",

src/components/info.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function Info() {
1515
const distance = getDistanceBetweenCoordinates(
1616
lat,
1717
long,
18-
56.153574116526194,
18+
56.153574116526194, // Todo, as of now this is hardcoded to the center of Aarhus, this is perhaps not a good solution in the long run.
1919
10.21435188437761
2020
);
2121
setDistance(distance);

src/components/map/MapWrapper.jsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { latlngToUTM } from "../../util/helper";
1515
import ApiEndpointContext from "../../context/api-endpoint-context";
1616
import "./map-wrapper.css";
1717

18-
// Todo style this......
1918
function MapWrapper({ mapData, goToView, hideMapOverlay }) {
2019
const { mapUsername, mapPassword } = useContext(ApiEndpointContext);
2120
const [map, setMap] = useState();

src/components/points-of-interest/PointOfInterest.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ function PointOfInterest({
2222
subtitles,
2323
podcast,
2424
IFrameUrl,
25+
proximityToUnlock,
2526
},
2627
index,
2728
destinationChanged,
@@ -51,7 +52,7 @@ function PointOfInterest({
5152
);
5253
setProximity(distance);
5354
if (!unlocked && id === nextUnlockableId) {
54-
setUnlocked(distance < accuracy);
55+
setUnlocked(distance < accuracy || distance < proximityToUnlock);
5556
}
5657
}
5758
}, [latitude, longitude, lat, long, geolocationAvailable]);

src/components/routes/RoutePage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ function RoutePage() {
232232
<div className="pt-2">
233233
<p className="text-xs text-zinc-500">Igangværende afspilning</p>
234234
{/* TODO: Get the real name instead of Pizza 1 */}
235-
<p className="text-sm font-bold ">Pizza 1</p>
235+
{/* <p className="text-sm font-bold ">Pizza 1</p> */}
236236
<audio className="w-full" ref={audioRef} controls>
237237
<source src={`${fileUrl}${source}`} type="audio/mpeg" />
238238
Your browser does not support the audio element.

src/context/audio-context.jsx

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)