Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix time representation #140

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix time representation #140

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 27 additions & 31 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,41 +110,37 @@
L.marker(user.coordinates, { icon })
.addTo(map)
.bindPopup(() => {
// see https://stackoverflow.com/a/38671346/14457064
const userBounds = L.latLngBounds(
user.coordinates,
user.coordinates,
);

for (const overlay of Object.values(map._layers)) {
if (overlay._layers) {
for (const feature of Object.values(overlay._layers)) {
let bounds;
if (feature.getBounds) {
bounds = feature.getBounds();
} else if (feature._latlng) {
bounds = L.latLngBounds(
feature._latlng,
feature._latlng,
);
}

if (bounds && userBounds.intersects(bounds)) {
const paragraph =
container.getElementsByTagName("p")[0] ??
document.createElement("p");
paragraph.innerText = `${new Date().toLocaleString(
"sv",
{ timeZone: feature.feature.properties.tz_name1st },
)} (${feature.feature.properties.time_zone})`;

container.appendChild(paragraph);

return container;
if (user.timezone === undefined) {
const userPoint = map.latLngToLayerPoint(user.coordinates);
for (const timezoneLayer of Object.values(L.timezones._layers)) {
if (timezoneLayer._containsPoint(userPoint)) {
if (user.timezone === undefined) {
// Some timezones have no tz_name1st.
// utc_format has their offset as "UTCsHH:MM", but
// toLocaleString doesn't like that UTC prefix nor the
// "±" sign in the ones with 0 offset.
const properties = timezoneLayer.feature.properties;
user.timezone = properties.tz_name1st
?? (properties.zone == 0 ? "+00" : properties.utc_format.substring(3));
} else {
// Several timezones may contain a point near the limit
// at some zoom levels
user.timezone = undefined;
break;
}
}
}
}
if (user.timezone !== undefined) {
const paragraph =
container.getElementsByTagName("p")[0] ??
document.createElement("p");
paragraph.innerText = `${new Date().toLocaleString(
undefined,
{ timeZone: user.timezone, timeZoneName: 'shortOffset'},
)}`;
container.appendChild(paragraph);
}

return container;
});
Expand Down