diff --git a/apis/interactive_maps.py b/apis/interactive_maps.py index 3fd51ce..9f6a760 100644 --- a/apis/interactive_maps.py +++ b/apis/interactive_maps.py @@ -23,9 +23,9 @@ class SwissMap: def destination_map(self, customer_id, own_location, destination): local_m = self.m folium.Marker( - location=destination[1], # coordinates for the marker - popup=destination[0], # pop-up label for the marker - icon=folium.Icon(color="green") + location=own_location[1], # coordinates for the marker + popup=own_location[0], # pop-up label for the marker + icon=folium.Icon(color="blue") ).add_to(local_m) folium.Marker( location=destination[1], # coordinates for the marker diff --git a/static/destinationmap_customer=235_destinationZermatt.html b/static/destinationmap_customer=235_destinationZermatt.html index 78e33d8..1dc43a6 100644 --- a/static/destinationmap_customer=235_destinationZermatt.html +++ b/static/destinationmap_customer=235_destinationZermatt.html @@ -23,7 +23,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <style> - #map_b701048f05f8433f916238ad451ead9e { + #map_4b63fb42cb6348acbbbbe2dc0559bc1e { position: relative; width: 100.0%; height: 100.0%; @@ -35,13 +35,13 @@ </head> <body> - <div class="folium-map" id="map_b701048f05f8433f916238ad451ead9e" ></div> + <div class="folium-map" id="map_4b63fb42cb6348acbbbbe2dc0559bc1e" ></div> </body> <script> - var map_b701048f05f8433f916238ad451ead9e = L.map( - "map_b701048f05f8433f916238ad451ead9e", + var map_4b63fb42cb6348acbbbbe2dc0559bc1e = L.map( + "map_4b63fb42cb6348acbbbbe2dc0559bc1e", { center: [46.8132, 8.2242], crs: L.CRS.EPSG3857, @@ -55,57 +55,57 @@ - var tile_layer_103d661571e847a2b745c5a1e69c09d3 = L.tileLayer( + var tile_layer_b2bae53ccf9445a0b5609c122deab36b = L.tileLayer( "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {"attribution": "Data by \u0026copy; \u003ca href=\"http://openstreetmap.org\"\u003eOpenStreetMap\u003c/a\u003e, under \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eODbL\u003c/a\u003e.", "detectRetina": false, "maxNativeZoom": 12, "maxZoom": 12, "minZoom": 6, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false} - ).addTo(map_b701048f05f8433f916238ad451ead9e); + ).addTo(map_4b63fb42cb6348acbbbbe2dc0559bc1e); - var marker_beee87cd35034028ab299e35349249df = L.marker( - [46.11654, 7.445683], + var marker_84f3e52feaf44598b8d58d47cf2ad70f = L.marker( + [46.8132, 8.2242], {} - ).addTo(map_b701048f05f8433f916238ad451ead9e); + ).addTo(map_4b63fb42cb6348acbbbbe2dc0559bc1e); - var icon_d5a01419ab0c4b83b1b6d47167511bc7 = L.AwesomeMarkers.icon( - {"extraClasses": "fa-rotate-0", "icon": "info-sign", "iconColor": "white", "markerColor": "green", "prefix": "glyphicon"} + var icon_987ec2f0ba2749639d6e66b006ca73fe = L.AwesomeMarkers.icon( + {"extraClasses": "fa-rotate-0", "icon": "info-sign", "iconColor": "white", "markerColor": "blue", "prefix": "glyphicon"} ); - marker_beee87cd35034028ab299e35349249df.setIcon(icon_d5a01419ab0c4b83b1b6d47167511bc7); + marker_84f3e52feaf44598b8d58d47cf2ad70f.setIcon(icon_987ec2f0ba2749639d6e66b006ca73fe); - var popup_a8a29b98a2b442b481061d3ca1120ec2 = L.popup({"maxWidth": "100%"}); + var popup_db1aeaec08e344808ae98672134955ad = L.popup({"maxWidth": "100%"}); - var html_b782302722f94830a783f53c204a57c7 = $(`<div id="html_b782302722f94830a783f53c204a57c7" style="width: 100.0%; height: 100.0%;">Zermatt</div>`)[0]; - popup_a8a29b98a2b442b481061d3ca1120ec2.setContent(html_b782302722f94830a783f53c204a57c7); + var html_8865aed1bbfd4317a3a1237ebf1ab2e6 = $(`<div id="html_8865aed1bbfd4317a3a1237ebf1ab2e6" style="width: 100.0%; height: 100.0%;">Center of Switzerland</div>`)[0]; + popup_db1aeaec08e344808ae98672134955ad.setContent(html_8865aed1bbfd4317a3a1237ebf1ab2e6); - marker_beee87cd35034028ab299e35349249df.bindPopup(popup_a8a29b98a2b442b481061d3ca1120ec2) + marker_84f3e52feaf44598b8d58d47cf2ad70f.bindPopup(popup_db1aeaec08e344808ae98672134955ad) ; - var marker_2ba3962a3d0645f180e621dacc7c2be5 = L.marker( + var marker_1272f16aaca64b1ab1f4cb9b6d780f7b = L.marker( [46.11654, 7.445683], {} - ).addTo(map_b701048f05f8433f916238ad451ead9e); + ).addTo(map_4b63fb42cb6348acbbbbe2dc0559bc1e); - var icon_bd7c6c1ec5bb417580238125cf97b5ad = L.AwesomeMarkers.icon( + var icon_738d450b21d14420a5d2cd646d02205e = L.AwesomeMarkers.icon( {"extraClasses": "fa-rotate-0", "icon": "info-sign", "iconColor": "white", "markerColor": "red", "prefix": "glyphicon"} ); - marker_2ba3962a3d0645f180e621dacc7c2be5.setIcon(icon_bd7c6c1ec5bb417580238125cf97b5ad); + marker_1272f16aaca64b1ab1f4cb9b6d780f7b.setIcon(icon_738d450b21d14420a5d2cd646d02205e); - var popup_a013a69b0826485ebd6de9e92e23f5d8 = L.popup({"maxWidth": "100%"}); + var popup_e9d4a3b3f96c4667a814e1ce08cd182a = L.popup({"maxWidth": "100%"}); - var html_2fff8d7d90e14a05b0391089c4b8febe = $(`<div id="html_2fff8d7d90e14a05b0391089c4b8febe" style="width: 100.0%; height: 100.0%;">Zermatt</div>`)[0]; - popup_a013a69b0826485ebd6de9e92e23f5d8.setContent(html_2fff8d7d90e14a05b0391089c4b8febe); + var html_25f8c05b4a6148f9ad5c6afdef318f62 = $(`<div id="html_25f8c05b4a6148f9ad5c6afdef318f62" style="width: 100.0%; height: 100.0%;">Zermatt</div>`)[0]; + popup_e9d4a3b3f96c4667a814e1ce08cd182a.setContent(html_25f8c05b4a6148f9ad5c6afdef318f62); - marker_2ba3962a3d0645f180e621dacc7c2be5.bindPopup(popup_a013a69b0826485ebd6de9e92e23f5d8) + marker_1272f16aaca64b1ab1f4cb9b6d780f7b.bindPopup(popup_e9d4a3b3f96c4667a814e1ce08cd182a) ; diff --git a/static/travelhistorymap_customer235.html b/static/travelhistorymap_customer235.html index 81670b0..7c96fd0 100644 --- a/static/travelhistorymap_customer235.html +++ b/static/travelhistorymap_customer235.html @@ -23,7 +23,7 @@ <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <style> - #map_9f412d0133c04e4cb11e6432fb576de7 { + #map_43982fff96ac4010a4abc5d891617cbb { position: relative; width: 100.0%; height: 100.0%; @@ -35,13 +35,13 @@ </head> <body> - <div class="folium-map" id="map_9f412d0133c04e4cb11e6432fb576de7" ></div> + <div class="folium-map" id="map_43982fff96ac4010a4abc5d891617cbb" ></div> </body> <script> - var map_9f412d0133c04e4cb11e6432fb576de7 = L.map( - "map_9f412d0133c04e4cb11e6432fb576de7", + var map_43982fff96ac4010a4abc5d891617cbb = L.map( + "map_43982fff96ac4010a4abc5d891617cbb", { center: [46.8132, 8.2242], crs: L.CRS.EPSG3857, @@ -55,57 +55,57 @@ - var tile_layer_0592c151fded464b8ea84cfbf78012ee = L.tileLayer( + var tile_layer_b9dad930005b49d7a6ede10b36ae3893 = L.tileLayer( "https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {"attribution": "Data by \u0026copy; \u003ca href=\"http://openstreetmap.org\"\u003eOpenStreetMap\u003c/a\u003e, under \u003ca href=\"http://www.openstreetmap.org/copyright\"\u003eODbL\u003c/a\u003e.", "detectRetina": false, "maxNativeZoom": 12, "maxZoom": 12, "minZoom": 6, "noWrap": false, "opacity": 1, "subdomains": "abc", "tms": false} - ).addTo(map_9f412d0133c04e4cb11e6432fb576de7); + ).addTo(map_43982fff96ac4010a4abc5d891617cbb); - var marker_0c80bf0358324e1c80fd5190416c59f7 = L.marker( + var marker_3f81fbaf36ef48e4aac4e125680bcbde = L.marker( [46.8132, 8.2242], {} - ).addTo(map_9f412d0133c04e4cb11e6432fb576de7); + ).addTo(map_43982fff96ac4010a4abc5d891617cbb); - var icon_1bd7c0a756224987a078c8c7e23ff5d5 = L.AwesomeMarkers.icon( + var icon_8f74cd48d4174f2da53e683ebe79b2a1 = L.AwesomeMarkers.icon( {"extraClasses": "fa-rotate-0", "icon": "info-sign", "iconColor": "white", "markerColor": "red", "prefix": "glyphicon"} ); - marker_0c80bf0358324e1c80fd5190416c59f7.setIcon(icon_1bd7c0a756224987a078c8c7e23ff5d5); + marker_3f81fbaf36ef48e4aac4e125680bcbde.setIcon(icon_8f74cd48d4174f2da53e683ebe79b2a1); - var popup_86c1972da0984da7b723bf3ab1b48c5a = L.popup({"maxWidth": "100%"}); + var popup_0516c2ff9ba64321beab63bd5c2dc036 = L.popup({"maxWidth": "100%"}); - var html_086c037b7ad040ffb69dd27b6b2c45d3 = $(`<div id="html_086c037b7ad040ffb69dd27b6b2c45d3" style="width: 100.0%; height: 100.0%;">Center of Switzerland</div>`)[0]; - popup_86c1972da0984da7b723bf3ab1b48c5a.setContent(html_086c037b7ad040ffb69dd27b6b2c45d3); + var html_3fb7d1b852e440e38d58826bc6138c85 = $(`<div id="html_3fb7d1b852e440e38d58826bc6138c85" style="width: 100.0%; height: 100.0%;">Center of Switzerland</div>`)[0]; + popup_0516c2ff9ba64321beab63bd5c2dc036.setContent(html_3fb7d1b852e440e38d58826bc6138c85); - marker_0c80bf0358324e1c80fd5190416c59f7.bindPopup(popup_86c1972da0984da7b723bf3ab1b48c5a) + marker_3f81fbaf36ef48e4aac4e125680bcbde.bindPopup(popup_0516c2ff9ba64321beab63bd5c2dc036) ; - var marker_0f1166d399cc43c480a96ee61f367325 = L.marker( + var marker_56b1a2aedccd4326a7a2fd12e6e90e33 = L.marker( [46.11654, 7.445683], {} - ).addTo(map_9f412d0133c04e4cb11e6432fb576de7); + ).addTo(map_43982fff96ac4010a4abc5d891617cbb); - var icon_ec0f924a0ff34c2b80aaec432cef3054 = L.AwesomeMarkers.icon( + var icon_4c40d69ea15e447782f4671a041bcf71 = L.AwesomeMarkers.icon( {"extraClasses": "fa-rotate-0", "icon": "info-sign", "iconColor": "white", "markerColor": "red", "prefix": "glyphicon"} ); - marker_0f1166d399cc43c480a96ee61f367325.setIcon(icon_ec0f924a0ff34c2b80aaec432cef3054); + marker_56b1a2aedccd4326a7a2fd12e6e90e33.setIcon(icon_4c40d69ea15e447782f4671a041bcf71); - var popup_f54e4ca89ed0415f824886e7b27d5d9f = L.popup({"maxWidth": "100%"}); + var popup_f50bc115e4424589908ad94c7a17c6f2 = L.popup({"maxWidth": "100%"}); - var html_5c80b60971604eb6b3a5e3442618c5b3 = $(`<div id="html_5c80b60971604eb6b3a5e3442618c5b3" style="width: 100.0%; height: 100.0%;">Zermatt</div>`)[0]; - popup_f54e4ca89ed0415f824886e7b27d5d9f.setContent(html_5c80b60971604eb6b3a5e3442618c5b3); + var html_ae4e05924c31455bb2a115c202a4f83a = $(`<div id="html_ae4e05924c31455bb2a115c202a4f83a" style="width: 100.0%; height: 100.0%;">Zermatt</div>`)[0]; + popup_f50bc115e4424589908ad94c7a17c6f2.setContent(html_ae4e05924c31455bb2a115c202a4f83a); - marker_0f1166d399cc43c480a96ee61f367325.bindPopup(popup_f54e4ca89ed0415f824886e7b27d5d9f) + marker_56b1a2aedccd4326a7a2fd12e6e90e33.bindPopup(popup_f50bc115e4424589908ad94c7a17c6f2) ;