-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/Lisa/static/.DS_Store b/Lisa/static/.DS_Store
new file mode 100644
index 0000000..f677cc9
Binary files /dev/null and b/Lisa/static/.DS_Store differ
diff --git a/Joey/HeatMap/Assets/css/style.css b/Lisa/static/HeatMap/Assets/css/style.css
similarity index 100%
rename from Joey/HeatMap/Assets/css/style.css
rename to Lisa/static/HeatMap/Assets/css/style.css
diff --git a/Lisa/Myanmar_data_cleaned.csv b/Lisa/static/HeatMap/Assets/data.csv
similarity index 100%
rename from Lisa/Myanmar_data_cleaned.csv
rename to Lisa/static/HeatMap/Assets/data.csv
diff --git a/Joey/HeatMap/Assets/index.html b/Lisa/static/HeatMap/Assets/index.html
similarity index 100%
rename from Joey/HeatMap/Assets/index.html
rename to Lisa/static/HeatMap/Assets/index.html
diff --git a/Joey/HeatMap/Assets/js/config.js b/Lisa/static/HeatMap/Assets/js/config.js
similarity index 100%
rename from Joey/HeatMap/Assets/js/config.js
rename to Lisa/static/HeatMap/Assets/js/config.js
diff --git a/Joey/HeatMap/Assets/js/leaflet-heat.js b/Lisa/static/HeatMap/Assets/js/leaflet-heat.js
similarity index 100%
rename from Joey/HeatMap/Assets/js/leaflet-heat.js
rename to Lisa/static/HeatMap/Assets/js/leaflet-heat.js
diff --git a/Joey/HeatMap/Assets/js/map.js b/Lisa/static/HeatMap/Assets/js/map.js
similarity index 100%
rename from Joey/HeatMap/Assets/js/map.js
rename to Lisa/static/HeatMap/Assets/js/map.js
diff --git a/Joey/HeatMap/Assets/js/marker.js b/Lisa/static/HeatMap/Assets/js/marker.js
similarity index 100%
rename from Joey/HeatMap/Assets/js/marker.js
rename to Lisa/static/HeatMap/Assets/js/marker.js
diff --git a/Lisa/style.css b/Lisa/static/css/style.css
similarity index 100%
rename from Lisa/style.css
rename to Lisa/static/css/style.css
diff --git a/Lisa/static/images.csv b/Lisa/static/images.csv
new file mode 100644
index 0000000..27f1d94
--- /dev/null
+++ b/Lisa/static/images.csv
@@ -0,0 +1,20 @@
+Country,Region_State,Description,Image_Link,Coordinates
+Myanmar,Mandalay,"Police fire a water canon to disperse protesters in Mandalay. Protesters have taken to the streets following the military ousting of the democratically-elected government on Feb 1st (Source: Reuters, 8 Feb 2021). ",https://s.yimg.com/ny/api/res/1.2/THGAbwokoT5UZtt3FAJn0w--/YXBwaWQ9aGlnaGxhbmRlcjt3PTcwNTtoPTQ3MC41ODc1O2NmPXdlYnA-/https://s.yimg.com/uu/api/res/1.2/Y6FdqTRH5YRshow1pf.WfQ--~B/aD01MzQ7dz04MDA7YXBwaWQ9eXRhY2h5b24-/https://media.zenfs.com/en/reuters.com/e343833b20c2ac92ba7db658d80658dd,"(21.9219, 96.0678)"
+Myanmar,Yangon,"The mother of Aung Kaung Htet mourns at his funeral in Yangon. The 15 yr old was shot in the face at a protest against the military coup. Many civilians have died from gunshots to the head, suggesting deliberate targeting by security forces (Source: CNN/Getty Images, 14 April 2021). ",https://dynaimage.cdn.cnn.com/cnn/w_1100/https%3A%2F%2Fcdn.cnn.com%2Fcnnnext%2Fdam%2Fassets%2F210322114347-01-myanmar-unrest-0321-crop.jpg,"(16.8742, 96.2810)"
+Myanmar,Kayin,"Villagers injured during military air strikes in Kayni state shelter in the jungle (Source: The Straits Times, 31 Mar 2021)",https://static.straitstimes.com.sg/s3fs-public/styles/x_large/public/articles/2021/03/31/nz_wounded_310358.jpg?itok=aIJW0pGb×tamp=1617165812,"(18.06204, 97.4411)"
+Myanmar,Mandalay,"Two protesters were killed at peaceful demonstrations in Mandalay by members of government security forces. 37yr old Myo Naing was shot in the chest and 19yr old Kyel Sin was shot in the side, suggesting targeted killings (Source: Myanmar Now, 3 Mar 2021). ",https://myanmar-now.org/sites/myanmar-now.org/files/styles/news_detail_two_col/public/news-images/004_1.jpg?itok=ynMPZGFZ,"(21.9862, 96.0851)"
+Myanmar,Mandalay,"A man sifts through rubble after fires burn over 100 houses in Mandalay, leaving more than 500 people homeless (Source: Radio Free Asia, 01 April 2021). ",https://www.rfa.org/english/news/myanmar/trial-fires-04012021180942.html/fire-ruins.jpg/@@images/3202044b-5fca-4072-880d-358de5f78467.jpeg,"(21.8559, 96.0538)"
+Myanmar,Yangon,Images of tortured protesters were aired on public television on 18 April 2021 (Source: Twitter). ,https://pbs.twimg.com/media/EzQ4GvGVgAEf-w_?format=jpg&name=medium,"(16.7734, 96.1814)"
+Myanmar,Yangon,"Security officers dragging an injured protester in Tamwe, Yangon. There are numerous images of police and military dragging civilians (Source: REUTERS, 14 March 2021). ",https://s4.reutersmedia.net/resources/r/?m=02&d=20210316&t=2&i=1555069007&w=780&fh=&fw=&ll=&pl=&sq=&r=2021-03-16T120303Z_39167_MRPRC2GBM9L0WF7_RTRMADP_0_MYANMAR-POLITICS,"(16.8236, 96.1795)"
+Myanmar,Monywa,"Police beat anti-coup protesters in Monywa (Source: BM Global/Citizen journalist, 3 March 2021). ",https://i0.wp.com/www.rfa.org/english/news/myanmar/bloody-crackdowns-03032021145720.html/myanmar-police-crackdown-monywa-sagaing-mar3-2021.jpg/@@images/c9cbeae3-feea-4896-98d2-dc23e3e28a37.jpeg?ssl=1,"(22.1233, 95.1540)"
+Myanmar,Shwebo ,"13 yr old Htoo Myat Win is mourned by his father after being shot dead by government forces while playing near his home in Shwebo city (Source: The Irrawaddy, 31 March 2021). ",https://www.irrawaddy.com/wp-content/uploads/2021/03/htoo-myat-win-insert.jpg,"(22.5802, 95.6986)"
+Myanmar,Mawlamyine,"11yr old Aye Myat Thu was shot in the head while playing in front of her house in Mawlamyine. She was buried with colored pencils and toys (Source: The Irrawaddy, 31 March 2021). ",https://www.irrawaddy.com/wp-content/uploads/2021/03/1-update-1.jpg,"(16.4543, 97.6440)"
+Myanmar,Muse,"16yr old Ye Yint Naing was shot and killed by military forces, who then took his body and burned it without the family's consent (Source: The Irrawaddy, 31 March 2021). ",https://www.irrawaddy.com/wp-content/uploads/2021/03/ye-yint-naing.jpg,"(23.9933, 97.9103)"
+Myanmar,Day Pu No,5yr old Saw Ta Blut Soe was killed during airstrikes on his village by the military regime. ,https://www.irrawaddy.com/wp-content/uploads/2021/03/saw-ta-blut-soe.jpeg,"(18.0972, 97.4957)"
+Myanmar,Mandalay,"6yr old Khin Myo Chi was shot by military troops while sitting in her father's lap (Source: The Irrawaddy, 31 March 2021). ",https://www.irrawaddy.com/wp-content/uploads/2021/03/KhinMC-900x540.jpg,"(21.9408, 96.0944)"
+Myanmar,Mandalay,"16yr old Min Min Oo was fatally shot in the head while driving a motorcycle on March 14. Video footage shows the military using the passing motorbike as target practice. His body was then taken by junta forces and not returned (Source: The Irrawaddy, 31 March 2021). ",https://www.irrawaddy.com/wp-content/uploads/2021/03/Min-Min-Oo-675x900.jpeg,"(21.2912, 95.2906)"
+Myanmar,Pathein Township,"17yr old Hein Htet Aung was shot by soldiers and police the night of March 14 (Source: The Irrawaddy, 31 March 2021). ",https://www.irrawaddy.com/wp-content/uploads/2021/03/HeinHA-900x540.jpg,"(16.8201, 94.6188) "
+Myanmar,Myitkyina,"Protesters flee from gunfire in Myitkyina (Source: Myitkyina News via Reuters, 14 March 2021). ",https://images.hindustantimes.com/img/2021/03/14/550x309/2021-03-14T095649Z_1610568483_RC2XAM9A0VRY_RTRMADP_3_MYANMAR-POLITICS_1615716789799_1615716810441.JPG,"(25.3946, 97.3841)"
+Myanmar,Dawei,"Protesters erect a makeshift barrier in the street in Dawei, where there has been daily demonstrations since the Feb 1 coup and multiple people killed by military and police forces (Source: Associated Press Television News, 3 March 2021). ","https://img.republicworld.com/republic-prod/stories/promolarge/xxhdpi/oa4tkufba1qvnyjw_1614772438.jpeg?tr=w-758,h-433","(14.0920, 98.1951)"
+Myanmar,Unknown,"Riot police beating a protester after arresting him at a demonstration against the military coup (Source: Aung Kyaw Htet - SOPA Images/LightRocket/Getty Images, 5 March 2021). ",https://api.time.com/wp-content/uploads/2021/03/myanmar-riot-police.jpg?w=800&quality=85,"(20.1528, 92.8677)"
+Myanmar,Naypyidaw,"Police use a water cannon on peaceful protesters in Naypyidaw, the capitol (Source: Myanmar Now, 8 Feb 2021). ",https://pbs.twimg.com/media/EtwgugmVEAEa-yZ?format=jpg&name=medium,"(19.7633, 96.0785)"
diff --git a/Lisa/static/js/Myanmar.js b/Lisa/static/js/Myanmar.js
new file mode 100644
index 0000000..fb14db4
--- /dev/null
+++ b/Lisa/static/js/Myanmar.js
@@ -0,0 +1,69 @@
+function createMap(Myanmar_map) {
+ var map_base = L.tileLayer("https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}", {
+
+ tileSize: 512,
+ maxZoom: 18,
+ zoomOffset: -1,
+ id: "mapbox/streets-v11",
+ accessToken: API_KEY
+ })
+
+ var baseMap = {
+ "map_base": map_base
+ };
+
+ var overlayMaps = {
+ "Myanmar_map": Myanmar_map,
+ // "Heatmap": leaflet-heat.js,
+ // "Markermap": marker
+ }
+
+ var map = L.map("map", {
+ center: [21.9162, 95.9560],
+
+ zoom: 6,
+ layers: [map_base, Myanmar_map]//, Heatmap]
+ });
+
+ L.control.layers(baseMap, overlayMaps, {
+ collapsed: false
+ }).addTo(map);
+
+};
+
+
+ function createMarkers(data) {
+
+ var markers_list=[]
+ function create_icon(img_url){
+ var incident_icon=L.icon({
+
+ iconUrl: img_url,
+ iconSize: [45, 45],
+ iconAnchor: [22, 94],
+ popupAnchor: [-3, -76]
+ });
+ return incident_icon
+ }
+ // function createpopUp(PopUp){
+ // incident['img_url'],
+ // var Image_Link = img_url,
+
+
+ data.forEach(incident=>{
+ var coords=incident['Coordinates'].replace('(', '').replace(')', '').split(', ')
+
+ var one_marker=L.marker([parseFloat(coords[0]), parseFloat(coords[1])], {icon: create_icon(incident['Image_Link'])}).bindPopup(`
`)//"Bago"`); //incident['columnheader']
+ markers_list.push(one_marker)
+ })
+
+
+ return L.layerGroup(markers_list)
+ };
+
+
+
+d3.csv('../static/images.csv').then(data=>{
+ console.log(data)
+ createMap(createMarkers(data))
+});
\ No newline at end of file
diff --git a/Lisa/config.js b/Lisa/static/js/config.js
similarity index 100%
rename from Lisa/config.js
rename to Lisa/static/js/config.js
diff --git a/Lisa/static/js/leaflet-heat.js b/Lisa/static/js/leaflet-heat.js
new file mode 100644
index 0000000..891f63d
--- /dev/null
+++ b/Lisa/static/js/leaflet-heat.js
@@ -0,0 +1,112 @@
+/*
+ (c) 2014, Vladimir Agafonkin
+ simpleheat, a tiny JavaScript library for drawing heatmaps with Canvas
+ https://github.com/mourner/simpleheat
+*/
+!(function() {
+
+
+ function t(i) {
+ return this instanceof t ? (this._canvas = i = typeof i === "string" ? document.getElementById(i) : i, this._ctx = i.getContext("2d"), this._width = i.width, this._height = i.height, this._max = 1, void this.clear()) : new t(i);
+ }t.prototype = { defaultRadius: 25,
+ defaultGradient: { 0.4: "blue", 0.6: "cyan", 0.7: "lime", 0.8: "yellow", 1: "red" },
+ data: function(t, i) {
+ return this._data = t, this;
+ },
+ max: function(t) {
+ return this._max = t, this;
+ },
+ add: function(t) {
+ return this._data.push(t), this;
+ },
+ clear: function() {
+ return this._data = [], this;
+ },
+ radius: function(t, i) {
+ i = i || 15; var a = this._circle = document.createElement("canvas"),
+ s = a.getContext("2d"),
+ e = this._r = t + i; return a.width = a.height = 2 * e, s.shadowOffsetX = s.shadowOffsetY = 200, s.shadowBlur = i, s.shadowColor = "black", s.beginPath(), s.arc(e - 200, e - 200, t, 0, 2 * Math.PI, !0), s.closePath(), s.fill(), this;
+ },
+ gradient: function(t) {
+ var i = document.createElement("canvas"),
+ a = i.getContext("2d"),
+ s = a.createLinearGradient(0, 0, 0, 256); i.width = 1, i.height = 256; for (var e in t)s.addColorStop(e, t[e]); return a.fillStyle = s, a.fillRect(0, 0, 1, 256), this._grad = a.getImageData(0, 0, 1, 256).data, this;
+ },
+ draw: function(t) {
+ this._circle || this.radius(this.defaultRadius), this._grad || this.gradient(this.defaultGradient); var i = this._ctx; i.clearRect(0, 0, this._width, this._height); for (var a, s = 0, e = this._data.length; e > s; s++)a = this._data[s], i.globalAlpha = Math.max(a[2] / this._max, t || 0.05), i.drawImage(this._circle, a[0] - this._r, a[1] - this._r); var n = i.getImageData(0, 0, this._width, this._height); return this._colorize(n.data, this._grad), i.putImageData(n, 0, 0), this;
+ },
+ _colorize: function(t, i) {
+ for (var a, s = 3, e = t.length; e > s; s += 4)a = 4 * t[s], a && (t[s - 3] = i[a], t[s - 2] = i[a + 1], t[s - 1] = i[a + 2]);
+ } }, window.simpleheat = t;
+}()), /*
+ (c) 2014, Vladimir Agafonkin
+ Leaflet.heat, a tiny and fast heatmap plugin for Leaflet.
+ https://github.com/Leaflet/Leaflet.heat
+*/
+L.HeatLayer = (L.Layer ? L.Layer : L.Class).extend({ initialize: function(t, i) {
+ this._latlngs = t, L.setOptions(this, i);
+},
+ setLatLngs: function(t) {
+ return this._latlngs = t, this.redraw();
+ },
+ addLatLng: function(t) {
+ return this._latlngs.push(t), this.redraw();
+ },
+ setOptions: function(t) {
+ return L.setOptions(this, t), this._heat && this._updateOptions(), this.redraw();
+ },
+ redraw: function() {
+ return !this._heat || this._frame || this._map._animating || (this._frame = L.Util.requestAnimFrame(this._redraw, this)), this;
+ },
+ onAdd: function(t) {
+ this._map = t, this._canvas || this._initCanvas(), t._panes.overlayPane.appendChild(this._canvas), t.on("moveend", this._reset, this), t.options.zoomAnimation && L.Browser.any3d && t.on("zoomanim", this._animateZoom, this), this._reset();
+ },
+ onRemove: function(t) {
+ t.getPanes().overlayPane.removeChild(this._canvas), t.off("moveend", this._reset, this), t.options.zoomAnimation && t.off("zoomanim", this._animateZoom, this);
+ },
+ addTo: function(t) {
+ return t.addLayer(this), this;
+ },
+ _initCanvas: function() {
+ var t = this._canvas = L.DomUtil.create("canvas", "leaflet-heatmap-layer leaflet-layer"),
+ i = L.DomUtil.testProp(["transformOrigin", "WebkitTransformOrigin", "msTransformOrigin"]); t.style[i] = "50% 50%"; var a = this._map.getSize(); t.width = a.x, t.height = a.y; var s = this._map.options.zoomAnimation && L.Browser.any3d; L.DomUtil.addClass(t, "leaflet-zoom-" + (s ? "animated" : "hide")), this._heat = simpleheat(t), this._updateOptions();
+ },
+ _updateOptions: function() {
+ this._heat.radius(this.options.radius || this._heat.defaultRadius, this.options.blur), this.options.gradient && this._heat.gradient(this.options.gradient), this.options.max && this._heat.max(this.options.max);
+ },
+ _reset: function() {
+ var t = this._map.containerPointToLayerPoint([0, 0]); L.DomUtil.setPosition(this._canvas, t); var i = this._map.getSize(); this._heat._width !== i.x && (this._canvas.width = this._heat._width = i.x), this._heat._height !== i.y && (this._canvas.height = this._heat._height = i.y), this._redraw();
+ },
+ _redraw: function() {
+ var t,
+ i,
+ a,
+ s,
+ e,
+ n,
+ h,
+ o,
+ r,
+ d = [],
+ _ = this._heat._r,
+ l = this._map.getSize(),
+ m = new L.Bounds(L.point([-_, -_]), l.add([_, _])),
+ c = void 0 === this.options.max ? 1 : this.options.max,
+ u = void 0 === this.options.maxZoom ? this._map.getMaxZoom() : this.options.maxZoom,
+ f = 1 / Math.pow(2, Math.max(0, Math.min(u - this._map.getZoom(), 12))),
+ g = _ / 2,
+ p = [],
+ v = this._map._getMapPanePos(),
+ w = v.x % g,
+ y = v.y % g; for (t = 0, i = this._latlngs.length; i > t; t++) {
+ if (a = this._map.latLngToContainerPoint(this._latlngs[t]), m.contains(a)) {
+ e = Math.floor((a.x - w) / g) + 2, n = Math.floor((a.y - y) / g) + 2; var x = void 0 !== this._latlngs[t].alt ? this._latlngs[t].alt : void 0 !== this._latlngs[t][2] ? +this._latlngs[t][2] : 1; r = x * f, p[n] = p[n] || [], s = p[n][e], s ? (s[0] = (s[0] * s[2] + a.x * r) / (s[2] + r), s[1] = (s[1] * s[2] + a.y * r) / (s[2] + r), s[2] += r) : p[n][e] = [a.x, a.y, r];
+ }
+ } for (t = 0, i = p.length; i > t; t++) if (p[t]) for (h = 0, o = p[t].length; o > h; h++)s = p[t][h], s && d.push([Math.round(s[0]), Math.round(s[1]), Math.min(s[2], c)]); this._heat.data(d).draw(this.options.minOpacity), this._frame = null;
+ },
+ _animateZoom: function(t) {
+ var i = this._map.getZoomScale(t.zoom),
+ a = this._map._getCenterOffset(t.center)._multiplyBy(-i).subtract(this._map._getMapPanePos()); L.DomUtil.setTransform ? L.DomUtil.setTransform(this._canvas, a, i) : this._canvas.style[L.DomUtil.TRANSFORM] = L.DomUtil.getTranslateString(a) + " scale(" + i + ")";
+ } }), L.heatLayer = function(t, i) {
+ return new L.HeatLayer(t, i);
+ };
diff --git a/Lisa/static/js/map.js b/Lisa/static/js/map.js
new file mode 100644
index 0000000..21f66f1
--- /dev/null
+++ b/Lisa/static/js/map.js
@@ -0,0 +1,71 @@
+// Load data from API
+// https://gbfs.citibikenyc.com/gbfs/en/station_information.json
+var base_url ="data.csv"
+
+// create the map for Myanmar
+// https://leafletjs.com/examples/quick-start/
+var myMap=L.map('mapheat').setView([21.9162, 95.9560], 6);
+
+var streetLayer=L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
+ attribution: 'Map data ©
OpenStreetMap contributors, Imagery ©
Mapbox',
+ maxZoom: 18,
+ id: 'mapbox/streets-v11',
+ tileSize: 512,
+ zoomOffset: -1,
+ accessToken: API_KEY
+ }).addTo(myMap);
+
+var myIcon = L.icon({
+ iconUrl: "https://img.icons8.com/ultraviolet/40/000000/parking.png",
+ iconSize: [20, 20],
+ iconAnchor: [22, 94],
+});
+
+d3.csv(base_url).then(function(data){
+ console.log(data);
+ var heatArray=[]
+
+ for (var i = 0; i < data.length; i++) {
+
+ heatArray.push([data[i].latitude, data[i].longitude]);
+ }
+ console.log(heatArray);
+
+ var heat = L.heatLayer(heatArray, {
+ radius: 20,
+ blur: 15,
+ maxZoom: 10,
+ max:4,
+ gradient:{
+ 0.0:'green',
+ 0.5:'yellow',
+ 1.0:'red'
+ }
+ }).addTo(myMap);
+
+ });
+
+
+ // stations_ary=data['data']['stations'].slice(0,50)
+
+ // create markers for each station
+ // L.marker ([lat,lon])
+ // stations_ary.forEach(function(one_station){
+ // var marker = L.marker([one_station['lat'], one_station['lon']], {'icon': myIcon})
+ // .bindPopup(`
${one_station['name']}
Capacity: ${one_station['capacity']}
`)
+ // // marker.addTo(myMap)
+ // markerGroup.push(marker) // push each freshly added marker to array
+ // })
+ // var stationLayerGroup= L.layerGroup(markerGroup)
+ // .addTo(myMap);
+
+ // var baseLayers= {
+ // "Mapbox": streetLayer,
+ // // "OpenStreetMap": osm
+ // };
+ // var overlays={
+ // "Marker": stationLayerGroup
+ // // "Roads": roadsLayer
+ // };
+ // L.control.layers(baseLayers,overlays).addTo(myMap);
+
diff --git a/Lisa/static/js/marker.js b/Lisa/static/js/marker.js
new file mode 100644
index 0000000..b342332
--- /dev/null
+++ b/Lisa/static/js/marker.js
@@ -0,0 +1,58 @@
+// Load data from API
+// https://gbfs.citibikenyc.com/gbfs/en/station_information.json
+var base_url ="data.csv"
+
+// create the map for Myanmar
+// https://leafletjs.com/examples/quick-start/
+var myMap=L.map('mapid').setView([21.9162, 95.9560], 6);
+
+var streetLayer=L.tileLayer('https://api.mapbox.com/styles/v1/{id}/tiles/{z}/{x}/{y}?access_token={accessToken}', {
+ attribution: 'Map data ©
OpenStreetMap contributors, Imagery ©
Mapbox',
+ maxZoom: 18,
+ id: 'mapbox/streets-v11',
+ tileSize: 512,
+ zoomOffset: -1,
+ accessToken: API_KEY
+ }).addTo(myMap);
+
+// var myIcon = L.icon({
+// iconUrl: "https://img.icons8.com/ultraviolet/40/000000/parking.png",
+// iconSize: [20, 20],
+// iconAnchor: [22, 94],
+// });
+
+d3.csv(base_url).then(function(data){
+ console.log(data);
+ var heatArray=[]
+ for (var i = 0; i < data.length; i++) {
+ heatArray.push([data[i].latitude, data[i].longitude]);
+ L.marker(heatArray[i])
+ .bindPopup("
Place: " + data[i].location + "
Attack Type: " + data[i].event_type + "
").addTo(myMap);
+ }
+
+ });
+
+
+ // stations_ary=data['data']['stations'].slice(0,50)
+
+ // create markers for each station
+ // L.marker ([lat,lon])
+ // stations_ary.forEach(function(one_station){
+ // var marker = L.marker([one_station['lat'], one_station['lon']], {'icon': myIcon})
+ // .bindPopup(`
${one_station['name']}
Capacity: ${one_station['capacity']}
`)
+ // // marker.addTo(myMap)
+ // markerGroup.push(marker) // push each freshly added marker to array
+ // })
+ // var stationLayerGroup= L.layerGroup(markerGroup)
+ // .addTo(myMap);
+
+ // var baseLayers= {
+ // "Mapbox": streetLayer,
+ // // "OpenStreetMap": osm
+ // };
+ // var overlays={
+ // "Marker": stationLayerGroup
+ // // "Roads": roadsLayer
+ // };
+ // L.control.layers(baseLayers,overlays).addTo(myMap);
+
diff --git a/Lisa/index.html b/Lisa/templates/index.html
similarity index 57%
rename from Lisa/index.html
rename to Lisa/templates/index.html
index 17057f8..12407ed 100644
--- a/Lisa/index.html
+++ b/Lisa/templates/index.html
@@ -11,19 +11,26 @@
crossorigin="" />
-
+
+
+
+
-
+
+
-
+
+
-
-
+
+
+
+
+
-
+
-
+
+
+
+