Haldis/haldis
3
0
Fork 0
Code Issues 39 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #113 from ZeusWPI/fix_map

Browse source 
Fix map
This commit is contained in:
Maxime 2019-04-30 17:28:50 +02:00 committed by GitHub
commit 7802464c66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/static/js/map.js
View file

@ -27,7 +27,8 @@ function performRequest(url, location, success_callback) {
let marker_icon = L.icon({ let marker_icon = L.icon({
iconUrl: "/static/images/marker-icon.png", iconUrl: "/static/images/marker-icon.png",
shadowUrl: "/static/images/marker-shadow.png" shadowUrl: "/static/images/marker-shadow.png",
iconAnchor: [12, 41]
}); });
let callback = function OSMCallBack(location, data) { let callback = function OSMCallBack(location, data) {

9
app/templates/maps.html
View file

@ -23,13 +23,16 @@
let locations = []; let locations = [];
let loc = {}; let loc = {};
{% for loc in locations -%} {% for loc in locations -%}
{% if loc.address %}
loc = { loc = {
"address": "{{loc.address}}", "address": "{{loc.address}}",
"name": "{{loc.name}}" "name": "{{loc.name}}"
}; };
locations.push(loc); locations.push(loc);
{%- endfor %}
{% endif %}
{%- endfor %}
loadmap(locations); loadmap(locations);
</script> </script>