diff --git a/database.py b/database.py index 80aaa96f8fb2b77f826f70ebd72d8e4aab5080dc..046e671b807aa7a0a5053f7fca700d4378bc1ff1 100644 --- a/database.py +++ b/database.py @@ -59,8 +59,11 @@ with Connection() as conn: def lookup_address(address: str): with Connection() as conn: conn.execute("SELECT latlong FROM AddressToLatLong WHERE address = ?", (address,)) - res = conn.cursor.fetchone()[0] - (lat, long) = res.split(",") + res = conn.cursor.fetchone() + if res == None: + return None + + (lat, long) = res[0].split(",") return (float(lat), float(long)) def set_address_latlong(address: str, latlong: Tuple[float, float]): diff --git a/static/scripts/map.js b/static/scripts/map.js index b914908779ccf53be1a13621990d7dc31d58ebda..f33f6db9212ccd72e5156a519c57854bbf185703 100644 --- a/static/scripts/map.js +++ b/static/scripts/map.js @@ -5,6 +5,9 @@ L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", { }).addTo(map); for (let workspace of mapData) { + if (workspace.latlong == null) + continue; + L.marker(workspace.latlong).addTo(map) .bindPopup(`<div class="popup"><div><a href="/workspace/${ encodeURIComponent(workspace.id) }" class="popup-title">${ escapeHTML(workspace.name)