diff --git a/jm2l/static/img/SophiaTech - plan.png b/jm2l/static/img/SophiaTech - plan.png new file mode 100644 index 0000000..7760757 Binary files /dev/null and b/jm2l/static/img/SophiaTech - plan.png differ diff --git a/jm2l/templates/Public/Plan.mako b/jm2l/templates/Public/Plan.mako index 2192d01..5d82674 100644 --- a/jm2l/templates/Public/Plan.mako +++ b/jm2l/templates/Public/Plan.mako @@ -1,12 +1,26 @@ <%inherit file="jm2l:templates/layout.mako"/> <%def name="jsAddOn_head()"> + <%def name="cssAddOn()"> @@ -56,10 +70,29 @@ var osmUrl='http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'; var osmAttrib='Map data © OpenStreetMap contributors'; var osm = new L.TileLayer(osmUrl, {minZoom: 7, maxZoom: 18, attribution: osmAttrib}); - // start the map on specified GPS Coords - map.setView(new L.LatLng(43.61562,7.0724),15); - marker = L.marker([43.615693, 7.0726221]).addTo(map); + map.setView(new L.LatLng(43.6137, 7.07502),16); + marker = L.marker([43.61556, 7.07176], { + icon: L.divIcon({ className: 'circle_place', + iconSize: [30, 30] })}).addTo(map); + marker.bindTooltip('Accueil
JM2L', {direction: 'top', offset:L.point(0, -10)}).openTooltip(); map.addLayer(osm); + // start the map on specified GPS Coords + var car_route = L.Routing.control({ + autoRoute: false, + show: false, + waypoints: [ L.latLng([43.61201, 7.07812]), L.latLng([43.6144, 7.07326]) ], + createMarker: function(i, wp) { + if (i==1) { + return L.marker(wp.latLng, { + icon: L.divIcon({ className: 'car_place', iconSize: [30, 30] }) + }).bindTooltip('Parking P2 (conseillé)', {direction: 'right'}) + } else { + return L.marker(wp.latLng).bindTooltip('Suivre Campus Poly\'tech', {direction: 'bottom'}); + } + } + }); + car_route.route({geometryOnly: true}); + car_route.addTo(map); @@ -67,7 +100,7 @@
- +