Resolve "Transition branch for CMB and Resq merging" #1181

Merged
korina.cordero merged 258 commits from 329-transition-branch-for-cmb-and-resq-merging into master 2020-04-03 02:49:26 +00:00
Showing only changes of commit fdf6861819 - Show all commits

View file

@ -1042,13 +1042,23 @@ $(function() {
var destLayerGroup = L.layerGroup().addTo(hmap);
var hubLayerGroup = L.layerGroup().addTo(hmap);
var dest_marker = new L.Marker([hub_lat, hub_lng]).bindPopup("Destination");
var dest_icon = L.icon({
iconUrl: '/assets/images/icon-destination.png',
shadowSize: [0,0]
});
var hub_icon = L.icon({
iconUrl: '/assets/images/icon-outlet.png',
shadowSize: [0,0]
});
var dest_marker = new L.Marker([hub_lat, hub_lng], {icon: dest_icon}).bindPopup("Destination");
destLayerGroup.addLayer(dest_marker);
{% for hub in hubs %}
var hub_marker = new L.Marker([{{ hub.hub.getCoordinates.getLatitude }},
{{ hub.hub.getCoordinates.getLongitude }}]).bindPopup("{{ hub.hub.getName }}");
{{ hub.hub.getCoordinates.getLongitude }}], {icon: hub_icon}).bindPopup("{{ hub.hub.getName }}");
hubLayerGroup.addLayer(hub_marker);
{% endfor %}