From 0e63e4736428552d841305a712a32691f06e20f4 Mon Sep 17 00:00:00 2001 From: Sami Mokaddem Date: Fri, 27 Oct 2017 08:30:04 +0200 Subject: [PATCH] Few cleanup --- server.py | 6 ------ templates/geo.html | 13 +------------ 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/server.py b/server.py index 3ff5b0b..174b393 100755 --- a/server.py +++ b/server.py @@ -194,15 +194,9 @@ def getCoordsByRadius(): dico_coord[str(coord)] = [data] for dicoCoord, array in dico_coord.items(): - print(array) dicoCoord = json.loads(dicoCoord) to_return.append([array, dicoCoord]) - #res = [ [json.loads(data), coord] for data, coord in res ] #correctly send the json - #to_return.append(res) - import pprint - pprint.pprint(to_return) - return jsonify(to_return) @app.route("/_logs") diff --git a/templates/geo.html b/templates/geo.html index 5bbf1c5..8dff025 100644 --- a/templates/geo.html +++ b/templates/geo.html @@ -335,17 +335,6 @@ small { savedMarkerRadius[i].remove(); // remove marker } - //for (var listIndex in allList) { - // var list = allList[listIndex]; - // for (var dayListIndex in list) { - // var jsonData = list[dayListIndex][0]; - // var coordJson = list[dayListIndex][1]; - - // var marker = L.marker([coordJson[1], coordJson[0]]).addTo(radiusOpenStreetMap); - // savedMarkerRadius.push(marker); - // marker.bindPopup(''+jsonData.categ+': '+jsonData.value, {autoClose:false}).openPopup(); - // } - //} for (var listIndex in allList) { var curMarker = allList[listIndex]; var dataText = ""; @@ -405,7 +394,7 @@ small { datePickerWidget.datepicker("setDate", new Date()); // radius - radiusOpenStreetMap = L.map('radiusMap', {closePopupOnClick: false} ).setView([30, 0], 2); + radiusOpenStreetMap = L.map('radiusMap').setView([30, 0], 2); new L.TileLayer(OSMURL, {minZoom: 0, maxZoom: 18}).addTo(radiusOpenStreetMap); datePickersRadiusWidgetFrom = $( "#datepickerRadiusFrom" ) datePickersRadiusWidgetFrom.datepicker(datePickerRadiusOptions);