From 1574edea88271f4edac1436b6aeb870a783cc635 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gi=C3=B2=20Diani?= Date: Wed, 18 Dec 2024 15:14:13 +0100 Subject: [PATCH] First steps Dashboard. --- dashboard/.env.example | 2 + dashboard/app/Api.php | 42 +++++ dashboard/resources/js/app.js | 32 +++- dashboard/resources/views/base.blade.php | 18 ++ dashboard/resources/views/main.blade.php | 45 ----- dashboard/resources/views/overview.blade.php | 123 +++++++++++++ dashboard/resources/views/property.blade.php | 98 +++++++++++ dashboard/resources/views/welcome.blade.php | 176 ------------------- dashboard/routes/web.php | 36 +++- etl/pixi.lock | 4 +- etl/pyproject.toml | 5 +- etl/src/api/main.py | 34 ++++ etl/src/dashboard/main.py | 22 --- etl/src/data/database.py | 5 +- etl/src/gio/index.html | 149 ---------------- etl/src/gio/test_duckdb.py | 9 +- 16 files changed, 389 insertions(+), 411 deletions(-) create mode 100644 dashboard/app/Api.php create mode 100644 dashboard/resources/views/base.blade.php delete mode 100644 dashboard/resources/views/main.blade.php create mode 100644 dashboard/resources/views/overview.blade.php create mode 100644 dashboard/resources/views/property.blade.php delete mode 100644 dashboard/resources/views/welcome.blade.php create mode 100644 etl/src/api/main.py delete mode 100644 etl/src/dashboard/main.py delete mode 100644 etl/src/gio/index.html diff --git a/dashboard/.env.example b/dashboard/.env.example index 6fb3de6..86c143e 100644 --- a/dashboard/.env.example +++ b/dashboard/.env.example @@ -64,3 +64,5 @@ AWS_BUCKET= AWS_USE_PATH_STYLE_ENDPOINT=false VITE_APP_NAME="${APP_NAME}" + +FASTAPI_URI=http://localhost:8080 diff --git a/dashboard/app/Api.php b/dashboard/app/Api.php new file mode 100644 index 0000000..338cd2d --- /dev/null +++ b/dashboard/app/Api.php @@ -0,0 +1,42 @@ +successful()){ + return $get->json(); + } + + return null; + } + + public static function propertiesPerRegion() + { + return self::get('/region/properties'); + } + + public static function propertyExtractions(int $id) + { + return self::get("/properties/extractions/{$id}"); + } + + + + + +} diff --git a/dashboard/resources/js/app.js b/dashboard/resources/js/app.js index 6d73b0e..389cfa5 100644 --- a/dashboard/resources/js/app.js +++ b/dashboard/resources/js/app.js @@ -1,12 +1,35 @@ import * as echarts from 'echarts'; import 'leaflet' +window.echarts = echarts; + +/* +const chartPropsPerRegion = document.getElementById('chart-props-per-region'); +const cPropsPerRegion = echarts.init(chartPropsPerRegion); + +const cPropsPerRegionOptions = { + xAxis: { + type: 'category', + data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'] + }, + yAxis: { + type: 'value' + }, + series: [ + { + data: [120, 200, 150, 80, 70, 110, 130], + type: 'bar' + } + ] +}; + +cPropsPerRegion.setOption(cPropsPerRegionOptions); + let properties = [[46.49593,9.83718],[46.48089,9.81599],[46.48824,9.83301],[46.497932,9.836767],[46.48615,9.83104],[46.4972399,9.8513866],[46.4867345,9.8349723],[46.4926593,9.8352605],[46.488409,9.840455],[46.5002929,9.8428447],[46.48024,9.81368],[46.48627,9.83095],[46.4904722,9.8346281],[46.48602,9.83109],[46.47736,9.81286],[46.4865553,9.8404283],[46.486563,9.8311711],[46.493988,9.836039],[46.4975,9.83937],[46.4852478,9.8316748],[46.488567,9.8424808],[46.4883782,9.8355532],[46.4868242,9.8332824],[46.49642,9.836712],[46.4883782,9.8355532],[46.47748,9.80948],[46.5002642,9.8429209],[46.4980738,9.8498749],[46.5034907,9.8465318],[46.4868242,9.8332824],[46.47927,9.81362],[46.4875089,9.8328176],[46.4884205,9.837406],[46.4861438,9.8311151],[46.49757,9.83946],[46.4933517,9.8352912],[46.4864667,9.8404068],[46.4866534,9.830708],[46.480585,9.815248],[46.4870555,9.8334099],[46.4786218,9.8127465],[46.48837,9.84037],[46.48604,9.83109],[46.4809238,9.8160696],[46.4898,9.83629],[46.48683,9.8333162],[46.4883782,9.8355532],[46.4771336,9.8134695],[46.4928286,9.8350188],[46.488891,9.841088],[46.499849,9.837025],[46.495869,9.837594],[46.47701,9.81146],[46.486404,9.8416679],[46.4783711,9.8132931],[46.49159,9.83546],[46.488303,9.840426],[46.4975017,9.8395553],[46.48672,9.83717],[46.4883753,9.8403742],[46.4883753,9.8403742],[46.4899857,9.8363568],[46.4863272,9.8405407],[46.497487,9.839477],[46.5020769,9.8418942],[46.50238,9.84558],[46.4884,9.84045],[46.48676,9.835],[46.4782248,9.8130534],[46.47749,9.80944],[46.48824,9.83301],[46.4869233,9.8376718],[46.4883782,9.8355532],[46.4882516,9.8402106],[46.49735,9.83945],[46.4883782,9.8355532],[46.48665,9.83723],[46.4883782,9.8355532],[46.49731,9.838838],[46.4883753,9.8403742],[46.4955609,9.8375856],[46.484052,9.8379806],[46.4883782,9.8355532],[46.496111,9.837175],[46.4843287,9.8376702],[46.4864902,9.8329028],[46.4895127,9.8359552],[46.503276,9.84604],[46.4852328,9.8323521],[46.4873273,9.8371615],[46.503511,9.846615],[46.48668,9.83719],[46.488172,9.833806],[46.4873397,9.831455],[46.4866534,9.830708],[46.495563,9.837539],[46.4984,9.84463],[46.4980738,9.8498749],[46.489777,9.8345806],[46.477581,9.810936],[46.4928286,9.8350188],[46.4974869,9.839558],[46.47591,9.8105111],[46.4887022,9.8352726],[46.4883233,9.8402706],[46.48668,9.83717],[46.47862,9.81366],[46.4891482,9.8343803],[46.4768608,9.813171],[46.477549,9.810314],[46.4895127,9.8359552],[46.498344,9.844374],[46.5032565,9.8460512],[46.4791522,9.8122151],[46.4985892,9.8401749],[46.48664,9.83696],[46.4859316,9.8307934],[46.48665,9.83723],[46.49876,9.837459],[46.4866,9.83716],[46.4885071,9.8411413],[46.4985324,9.8401342],[46.4849695,9.8320309],[46.4978506,9.8383183],[46.503635,9.846695],[46.5023548,9.8455593],[46.4865151,9.8403382],[46.48691,9.83212],[46.498764,9.8374597],[46.5003728,9.8424702],[46.498543,9.840123],[46.4987598,9.8374593],[46.487275,9.8323903],[46.5004613,9.8432744],[46.493155,9.835243],[46.4954953,9.8360637],[46.4890826,9.8354328],[46.4879702,9.8425062],[46.4974869,9.839558],[46.497987,9.8351241],[46.4768315,9.8132372],[46.503511,9.846615],[46.4891952,9.8354489],[46.489485,9.836001],[46.48838,9.83555],[46.4986225,9.8441318],[46.4886203,9.838023],[46.4883753,9.8403742],[46.496488,9.836766],[46.486678,9.837191],[46.476946,9.811528],[46.4786,9.81389],[46.4795257,9.8137264],[46.48089,9.81599],[46.498671,9.837675],[46.4883805,9.8355637],[46.4974869,9.839558],[46.4931507,9.8350282],[46.496111,9.837175],[46.4759,9.80941],[46.4809147,9.8159934],[46.477291,9.811467],[46.4763346,9.8103601],[46.48686,9.84097],[46.4909066,9.8347269],[46.502291,9.845428],[46.480674,9.814221],[46.484197,9.83739],[46.4918196,9.8345876],[46.4915284,9.8338491],[46.4974338,9.8350768],[46.48672,9.83717],[46.4867237,9.8371725],[46.48669,9.83724],[46.4939895,9.8359017],[46.5032761,9.84604],[46.498566,9.840089],[46.498344,9.844374],[46.4786235,9.8136651],[46.50028,9.84108],[46.4893186,9.8335381],[46.4873711,9.8325248],[46.4945882,9.835511],[46.475007,9.807983],[46.47591,9.8105111],[46.4971764,9.8369717],[46.4952387,9.8375284],[46.4940576,9.8369153],[46.4840021,9.8379366],[46.493951,9.835891],[46.5012405,9.8427173],[46.5388,9.87594],[46.60211,9.96407],[46.4946,9.90307],[46.55315,9.88566],[46.57833,9.92136],[46.55325,9.88494],[46.57227,9.93144],[46.6964,10.09554],[46.57807,9.92007],[46.4604,9.80592],[46.4329,9.76601],[46.50247,9.89315],[46.5144288,9.8599243],[46.60363,9.96082],[46.51445,9.85767],[46.57808,9.92007],[46.50533,9.89026],[46.57808,9.92007],[46.5785,9.91998],[46.6968,10.09621],[46.51028,9.85812],[46.57609,9.93219],[46.65407,10.0328],[46.55137,9.8876],[46.5759,9.93054],[46.41343,9.74001],[46.57322,9.93254],[46.51526,9.85821],[46.43307,9.76493],[46.53437,9.86964],[46.50093,9.8949],[46.60214,9.96407],[46.55337,9.89231],[46.49926,9.8962],[46.50068,9.8926],[46.50294,9.89265],[46.43313,9.7644],[46.55482,9.88683],[46.7947,10.24635],[46.69741,10.0937],[46.57324,9.93254],[46.57473,9.93214],[46.50247,9.89317],[46.42964,9.76165],[46.4989708,9.8966111],[46.53261,9.8685],[46.48933,9.90827],[46.60106,9.95979],[46.53252,9.86896],[46.51018,9.8559],[46.7,10.09],[46.7002101,10.094263],[46.48531,9.90863],[46.6965678,10.0959391],[46.5152,9.85819],[46.49788,9.89949],[46.53376,9.8713],[46.5345,9.86978],[46.61195,9.98439],[46.79799,10.29919],[46.48871,9.90872],[46.70336,10.09483],[46.45878,9.80805],[46.4890858,9.9085951],[46.55326,9.8857],[46.4627705,9.7966097],[46.79519,10.30224],[46.42975,9.76404],[46.48912,9.8957],[46.48505,9.90826],[46.48821,9.90837],[46.57861,9.92694],[46.79261,10.29354],[46.5327321,9.8691016],[46.49277,9.903],[46.49,9.90428],[46.49467,9.9007],[46.5534,9.88432],[46.4592,9.80846],[46.41409,9.75243],[46.55299,9.88993],[46.400687,9.695656],[46.4287838,9.7638845],[46.53783,9.87134],[46.497239,9.8984483],[46.5132752,9.856569],[46.49737,9.89746],[46.43364,9.76538],[46.43467,9.76566],[46.7963,10.30416],[46.5506,9.8869],[46.42966,9.76258],[46.433781,9.765144],[46.48813,9.90832],[46.5300784,9.8685666],[46.40656,9.69599],[46.50228,9.89287],[46.50291,9.89314],[46.53343,9.86977],[46.50201,9.89395],[46.4579,9.81314],[46.55299,9.88993],[46.53487,9.87172],[46.79437,10.24684],[46.536323,9.873959],[46.7954439,10.2538023],[46.433997,9.765498],[46.49494,9.90221],[46.45738,9.81487],[46.51519,9.85558],[46.50299,9.89268],[46.7922,10.29161],[46.77359,10.20271],[46.49246,9.90456],[46.41305,9.73989],[46.536348,9.869786],[46.40656,9.69599],[46.43288,9.76598],[46.509987,9.8539248],[46.79227,10.29163],[46.4579843,9.8135404],[46.458407,9.796621],[46.79531,10.30331],[46.536209,9.874049],[46.434338,9.76565],[46.43309,9.76398],[46.5535204,9.8912881],[46.43598,9.76688],[46.48894,9.90682],[46.4884253,9.9062128],[46.79948,10.3078],[46.458726,9.796228],[46.55299,9.88993],[46.6010027,9.9631681],[46.43276,9.7662],[46.43285,9.7661],[46.4616687,9.7964143],[46.50236,9.89183],[46.79451,10.24705],[46.53602,9.87527],[46.43417,9.76763],[46.4972811,9.8985026],[46.458175,9.795579],[46.79444,10.24664],[46.42978,9.76357],[46.48928,9.90832],[46.48977,9.89513],[46.4885,9.89457],[46.43436,9.76566],[46.48939,9.9056],[46.40638,9.69642],[46.4627705,9.7966097],[46.79565,10.29715],[46.49481,9.90197],[46.4628861,9.7967899],[46.7948484,10.2532831],[46.8183302,10.3397711],[46.79512,10.24701],[46.79365,10.29146],[46.80047,10.29931],[46.4359602,9.7668463],[46.7916,10.24673],[46.4627299,9.7967921],[46.55131,9.88652],[46.69846,10.09212],[46.4612334,9.7946465],[46.61168,9.98438],[46.7968884,10.3044409],[46.536222,9.874019],[46.7929832,10.2920387],[46.4627114,9.7968028],[46.60169,9.96059],[46.536915,9.871366],[46.69986,10.09256],[46.48956,9.90427],[46.79304,10.24749],[46.4359355,9.7672732],[46.835475,10.3810998],[46.42956,9.7616],[46.5378801,9.8756513],[46.433781,9.765144],[46.46046,9.795657],[46.50282,9.89311],[46.42934,9.76251],[46.458075,9.8138077],[46.8436,10.36075],[46.81197,10.31965],[46.799247,10.2935645],[46.4359355,9.7672732],[46.7985982,10.3026853],[46.48941,9.89561],[46.43523,9.76741],[46.40158,9.6956],[46.53596,9.875],[46.43399,9.76544],[46.55193,9.89044],[46.78672,10.28398],[46.48861,9.89479],[46.48575,9.90755],[46.4580911,9.8107131],[46.48477,9.90864],[46.4627114,9.7968028],[46.4597482,9.7959433],[46.42985,9.76558],[46.8173344,10.335409],[46.79879,10.29579],[46.79508,10.3032],[46.48615,9.90589],[46.5152512,9.8572464],[46.43489,9.76742],[46.459176,9.807722],[46.57908,9.92699],[46.5907944,9.9425304],[46.48805,9.90776],[46.4597482,9.7959433],[46.55299,9.88993],[46.403295,9.695247],[46.65325,10.0332],[46.5097713,9.859541],[46.43269,9.76727],[46.53269,9.86553],[46.5044748,9.8905525],[46.4065585,9.6962249],[46.4332,9.76445],[46.79284,10.24541],[46.76759,10.11064],[46.48506,9.90827],[46.49482,9.90102],[46.57768,9.91934],[46.7926609,10.2937308],[46.402518,9.699485],[46.42987,9.76387],[46.554002,9.885139],[46.53767,9.86978],[46.87069,10.42587],[46.45872,9.81326],[46.48575,9.90755],[46.51052,9.85534],[46.4627705,9.7966097],[46.79507,10.28751],[46.540908,9.880276],[46.48574,9.90755],[46.4972455,9.8984215],[46.7986428,10.2945489],[46.5105884,9.8585404],[46.79854,10.2955],[46.40256,9.69538],[46.486676,9.90917],[46.53184,9.87006],[46.57899,9.92686],[46.4948225,9.9019745],[46.49464,9.90307],[46.51487,9.8622],[46.4339,9.76395],[46.43287,9.76601],[46.40257,9.69538],[46.79474,10.29203],[46.40614,9.69594],[47.09011,9.29902],[47.09024,9.33744],[47.1496535,9.1435361],[46.99386,9.50846],[47.0937561,9.2973089],[47.12384,9.3161],[47.0908,9.2978],[47.0925656,9.2856842],[47.090429,9.2995673],[47.0381319,9.415214],[47.13016,9.21426],[47.0527931,9.4139957],[47.00963,9.52482],[47.0035165,9.5025466],[47.0066226,9.5045847],[47.0944135,9.286387],[47.089764,9.3040601],[47.0885188,9.3051517],[47.0861812,9.3064284],[47.0926708,9.3019263],[47.00369,9.5024086],[47.0920506,9.286285],[47.0996284,9.2604232],[47.09072,9.29779],[47.0892584,9.3007361],[47.149636,9.1360881],[47.13005,9.22739],[47.1475864,9.1752849],[47.10344,9.30264],[47.1485842,9.1350772],[47.11289,9.25131],[47.147884,9.1758126],[47.11307,9.27327],[47.0061371,9.4974252],[47.0037346,9.5023867],[46.9878323,9.4672584],[47.10311,9.29698],[47.0018428,9.5009594],[47.1129,9.27366],[47.1475864,9.1752849],[47.129615,9.2157081],[47.0836608,9.3064713],[47.1486259,9.1357867],[47.093968,9.2826748],[47.0910804,9.2949446],[47.0935882,9.2848206],[47.1503536,9.1363903],[47.1486081,9.1350315],[47.08334,9.30475],[47.0890666,9.3071687],[47.1482073,9.1464712],[47.0886805,9.300115],[47.0910736,9.2835861],[47.1485898,9.1358068],[47.1024,9.25666],[47.1042054,9.2565247],[47.0835012,9.307563],[47.0908682,9.3050914],[47.1487464,9.136045],[47.0913384,9.2954099],[47.1478662,9.1758214],[47.0899222,9.3050323],[47.1496785,9.1360454],[47.0049691,9.5032704],[47.0934647,9.2877671],[47.0898337,9.2946267],[47.0097978,9.5070111],[47.0937333,9.2862871],[47.147139,9.1671843],[47.1488176,9.1376202],[47.1401808,9.1300225],[47.00953,9.54435],[47.0840909,9.3052],[47.0979376,9.3075603],[47.0895122,9.3020725],[47.1503783,9.1364144],[47.1516298,9.1413501],[47.0023279,9.5015933],[47.11285,9.27359],[47.0899323,9.3032715],[47.0929177,9.3396583],[47.150526,9.1377356],[47.1493204,9.1429031],[47.0889682,9.3007852],[47.1478396,9.1758092],[47.1148478,9.256094],[47.0934395,9.2851719],[47.1496643,9.1405304],[47.0840983,9.3042223],[47.1506348,9.1350145],[47.14958,9.167463],[47.04294,9.41458],[46.9937048,9.4850461],[47.0982919,9.3067503],[47.0905607,9.3044458],[47.1493204,9.1429031],[47.0903295,9.2955059],[47.0904844,9.3045098],[47.1511983,9.158543],[47.0841185,9.3083784],[47.1488176,9.1376202],[47.0930202,9.2864218],[47.1496564,9.1405583],[47.0941206,9.2830919],[47.0907049,9.2977769],[46.9893443,9.4987615],[47.0095319,9.5443613],[47.1486606,9.135335],[47.15019,9.1446],[47.10475,9.23721],[47.0941506,9.2860383],[47.0931941,9.3186024],[47.0840357,9.305497],[46.9896178,9.4646057],[47.0901379,9.3051141],[47.150526,9.1377356],[47.1497622,9.1383781],[47.0080719,9.501543],[47.0849056,9.3032606],[46.99386,9.50846],[47.1034187,9.3027592],[47.0920819,9.2871889],[47.0918279,9.2864949],[47.1516298,9.1413501],[47.0966757,9.2848649],[47.0924633,9.2853999],[47.1492004,9.1441194],[47.1494535,9.1443895],[47.0909048,9.3061642],[47.1436366,9.1687265],[47.0265865,9.5132885],[47.0838536,9.3055592],[47.08934,9.3048],[47.1425525,9.16317],[47.0897909,9.3040254],[47.1511679,9.1585855],[47.1496313,9.1544595],[47.1482073,9.1464712],[47.0903669,9.2963755],[47.0966303,9.2839247],[47.0911485,9.2979258],[47.151195,9.1587093],[47.1478662,9.1758214],[47.1496123,9.1674592],[47.1496535,9.1435361],[47.151105,9.1354646],[47.1496313,9.1544595],[47.00948,9.54435],[47.0892836,9.3043674],[47.1486122,9.1349685],[47.0931645,9.3391031],[47.08966,9.29728],[47.0909293,9.2974952],[47.0912827,9.2982558],[47.1475173,9.1541166],[47.0940593,9.2888533],[47.103438,9.2961945],[47.089841,9.3040895],[47.0927356,9.2862126],[47.1488631,9.1375972],[47.08949,9.30417],[47.1425525,9.16317],[47.1497622,9.1383781],[47.1470711,9.1708897],[47.0889885,9.3053392],[47.1361478,9.099377],[47.0931868,9.2868869],[47.1425769,9.1624296],[47.0912018,9.3000394],[47.14907,9.13998],[47.1475189,9.1541165],[47.0901989,9.2950505],[47.1157482,9.2554745],[47.1474507,9.1753575],[47.1475846,9.1752849],[47.1153083,9.2570248],[47.1361465,9.0996163],[47.116113,9.1528289],[46.99419,9.50855],[47.11491,9.25601],[47.1475067,9.1772795],[47.1475327,9.1773552],[47.1511983,9.158543],[47.1496313,9.1544595],[47.1503536,9.1363903],[47.1488631,9.1375972],[47.0941506,9.2860383],[47.1511679,9.1585855],[47.1478662,9.1758214],[47.1478396,9.1758092],[47.1485898,9.1358068],[47.1474507,9.1753575],[47.1497622,9.1383781],[47.1473964,9.1750197],[47.1496123,9.1674592],[47.1487464,9.136045],[47.1506348,9.1350145],[46.8086631,9.8430198],[46.79295,9.81683],[46.7142,9.76761],[46.7883863,9.8215629],[46.8033735,9.8433746],[46.8023053,9.8414756],[46.7132569,9.7687448],[46.80245,9.8372],[46.7992588,9.8234512],[46.8065224,9.8349569],[46.7959396,9.8271902],[46.8040365,9.8373557],[46.8002651,9.8277855],[46.7943259,9.8204323],[46.7939511,9.8224337],[46.8033414,9.8377761],[46.8017615,9.8347858],[46.7936738,9.8227883],[46.7936348,9.8225973],[46.8092308,9.8422604],[46.808384,9.8371631],[46.7920269,9.816846],[46.8115912,9.847211],[46.793627,9.8224721],[46.7997578,9.8359198],[46.8105533,9.8401435],[46.7992369,9.823451],[46.8093755,9.8465007],[46.8132422,9.8422517],[46.7920334,9.8162759],[46.8027336,9.8310924],[46.7993864,9.8349277],[46.7920355,9.8167885],[46.8060374,9.8354352],[46.8051269,9.8355211],[46.792061,9.8166603],[46.7892857,9.8182646],[46.7936038,9.8227323],[46.7941404,9.8202668],[46.7952433,9.824772],[46.7989143,9.8312791],[46.8027326,9.8311079],[46.8101877,9.8364706],[46.7936568,9.822726],[46.79715,9.82037],[46.7936452,9.8227379],[46.78679,9.8218809],[46.7936495,9.822726],[46.8250631,9.8538151],[46.8027773,9.8341838],[46.8025731,9.8433616],[46.8124085,9.8455365],[46.7555128,9.7825241],[46.7913271,9.8162757],[46.8056764,9.8350951],[46.8104742,9.8383245],[46.8032932,9.8370466],[46.81252,9.84582],[46.7919163,9.8176838],[46.788033,9.816692],[46.799432,9.8322552],[46.8092437,9.8413254],[46.7937146,9.8292877],[46.8088483,9.8436036],[46.80577,9.8366612],[46.7932094,9.8159175],[46.7908756,9.8162915],[46.7959,9.8316035],[46.7903262,9.8183656],[46.8033657,9.8375068],[46.7977206,9.8346073],[46.7919606,9.8171641],[46.8011936,9.8332912],[46.8027336,9.8310924],[46.7606938,9.7909641],[46.7896855,9.8201239],[46.7933834,9.8163438],[46.8090563,9.8428596],[46.7916221,9.8167355],[46.7920334,9.8162759],[46.7910531,9.8159159],[46.7992367,9.8234082],[46.8032409,9.8370446],[46.8090217,9.8419365],[46.7953906,9.8177826],[46.81242,9.8455],[46.7919907,9.8171842],[46.7125388,9.7712108],[46.8104843,9.8451346],[46.8092905,9.8414648],[46.7991446,9.832914],[46.791699,9.8165471],[46.7125202,9.7710576],[46.790042,9.8143645],[46.8092227,9.8412932],[46.80924,9.84137],[46.8015421,9.8299715],[46.7968565,9.8216083],[46.8027021,9.8355153],[46.8055486,9.840615],[46.7902369,9.8183496],[46.7952027,9.824685],[46.792827,9.8230021],[46.7898597,9.8188197],[46.8095476,9.8468754],[46.7891,9.81765],[46.8000486,9.8340618],[46.8019379,9.8325509],[46.80526,9.84841],[46.8027333,9.8445063],[46.7928197,9.8231416],[46.79367,9.82278],[46.8134,9.84728],[46.7952027,9.8247386],[46.7976606,9.82155],[46.82727,9.85474],[46.8008447,9.8344814],[46.8064657,9.8406559],[46.8093406,9.8413216],[46.81287,9.85214],[46.7952741,9.8241565],[46.7934564,9.8229576],[46.7942006,9.820254],[46.8064648,9.8358327],[46.7924141,9.8232719],[46.81259,9.84551],[46.7927,9.82349],[46.7934142,9.8164255],[46.8072631,9.8376134],[46.7886735,9.8189417],[46.8108286,9.8346804],[46.8077338,9.8381272],[46.8027988,9.8372805],[46.7952248,9.8247172],[46.81102,9.84481],[46.8036498,9.8361887],[46.7922906,9.817275],[46.7927831,9.8230664],[46.7917019,9.8165518],[46.7980631,9.8345149],[46.7991452,9.8329222],[46.7900686,9.8133921],[46.7991452,9.8329222],[46.8000266,9.8340886],[46.8089005,9.8434021],[46.7919493,9.82719],[46.8093406,9.8413216],[46.8092244,9.8438462],[46.8088483,9.8436036],[46.8118221,9.8470246],[46.8000322,9.8341701],[46.7941688,9.8190924],[46.80577,9.8366612],[46.8241406,9.8607052],[46.7920486,9.8182106],[46.8127688,9.8463501],[46.7982651,9.8230113],[46.8004,9.83383],[46.8110288,9.8447204],[46.7989393,9.8356224],[46.7126403,9.7706258],[46.80417,9.8324],[46.7964701,9.8248942],[46.8096954,9.840577],[46.7989015,9.8324205],[46.8072116,9.8443187],[46.7996141,9.8327975],[46.8091564,9.8442866],[46.78317,9.8099721],[46.8032933,9.8333546],[46.8408457,9.8712152],[46.8012747,9.8277206],[46.809,9.84283],[46.7126403,9.7706258],[46.7952817,9.8246849],[46.8408457,9.8712151],[46.8115893,9.8465346],[46.7935981,9.8226617],[46.8024638,9.8380283],[46.8091691,9.844291],[46.7913471,9.8162836],[46.80526,9.84841],[46.7919098,9.8176784],[46.7960929,9.8201547],[46.8100443,9.8443893],[46.7924857,9.8200622],[46.74074,9.7752],[46.7957628,9.8267893],[46.7928837,9.8248499],[46.5099999,9.8612383],[46.5146464,9.8547644],[46.5857178,9.9372886],[46.8002651,9.8277855],[46.796572,9.8214751],[46.57808,9.92007],[46.4883753,9.8403742],[46.51519,9.85558],[46.7538789,9.7835492],[46.8040027,9.837579],[46.7841898,9.8162371],[46.43149,9.75846],[46.7996141,9.8327975],[46.7927943,9.8229865],[46.7922,10.29161],[46.457874,9.813156],[46.42964,9.76165],[46.515248,9.858231],[46.43428,9.76359],[46.435938,9.7675329],[46.5146464,9.8547644],[46.516158,9.862805],[46.4627114,9.7968028],[46.83294,10.38064],[46.4359355,9.7672732],[46.77638,10.15525],[46.458825,9.797046],[46.4627114,9.7968028],[46.808384,9.8371631],[46.48683,9.8333162],[46.5004613,9.8432744],[46.808384,9.8371631],[46.792061,9.8166603],[46.7555128,9.7825241],[46.8002651,9.8277855],[46.4891952,9.8354489],[46.488567,9.8424808],[46.492779,9.835059],[46.8002651,9.8277855],[46.4919667,9.8335799],[46.7996961,10.2985605],[46.57339,9.93481],[46.7931207,10.247367],[46.42976,9.76404],[46.4027723,9.6968194],[47.09011,9.29902],[47.1514285,9.1553726],[47.1042054,9.2565247],[47.1478662,9.1758214],[47.1475327,9.1773552],[47.1475189,9.1541165],[47.0901929,9.2988807],[47.1490749,9.1399819],[47.1153083,9.2570248],[47.11583,9.25793],[46.79872,9.82414],[46.4883753,9.8403742],[47.0907193,9.3012437],[46.498426,9.844033],[47.0906616,9.3015375],[46.4852328,9.8323521],[46.4882698,9.8356401],[46.498764,9.8374597],[46.4809238,9.8160696],[47.089841,9.3040895],[46.80692,9.83409],[46.8054573,9.8440973],[46.7953722,9.8177971],[46.5095678,9.8616622],[47.1478396,9.1758092],[47.0904984,9.304457],[47.1516298,9.1413501],[46.4580346,9.8124086],[46.7978706,10.3020812],[46.7988366,10.2997389],[46.7933995,10.2940714],[46.77485,10.200503],[46.7982651,9.8230113],[46.799432,9.8322552],[46.7973714,9.8348933],[46.4989708,9.8966111],[46.4612389,9.7946487],[46.4627705,9.7966097],[46.7950325,10.2901424],[46.4627705,9.7966097],[46.7984495,10.3012327],[46.4597716,9.797576],[46.4290725,9.7649574],[46.4612334,9.7946465],[46.7865969,10.2847978],[46.7928128,10.2928285],[46.5809503,9.9219662],[46.4597482,9.7959433],[46.816468,10.3408921],[46.79281,10.2928386],[46.5096931,9.8598204],[46.7767202,10.1486533],[46.7949241,10.2922603],[46.459177,9.796743],[46.7964312,10.2526474],[46.7768763,10.1485807],[46.79721,10.30664],[46.55299,9.88993],[46.6983388,10.0976336],[46.7720735,10.1956745],[46.77611,10.15461],[46.7926943,10.2938676],[46.510595,9.858583],[46.5117472,9.8569496],[46.81913,10.3416435],[46.81742,10.34091],[46.7995676,10.2962274],[46.8166,10.33363],[46.4611317,9.7948486],[46.4585961,9.8107166],[46.595561,9.950312],[46.7976263,10.3032086],[47.0968355,9.2850784],[47.1127448,9.2419733],[46.4843287,9.8376702],[46.4896304,9.8359213],[46.4955659,9.8375839],[46.4891482,9.8343803],[46.4883782,9.8355532],[46.48963,9.83592],[46.48862,9.83802],[47.1153083,9.2570248],[47.1129,9.27366],[47.11283,9.27356],[47.1158301,9.2579397],[47.012435,9.5023367],[46.4575708,9.8114181],[46.7982169,10.2986786],[46.4579843,9.8135404],[46.4627705,9.7966097],[46.4616687,9.7964143],[46.4357211,9.7682455],[46.7922,10.29161],[46.48574,9.90755],[46.7947611,10.2909066],[46.7927604,10.290882],[46.6010193,9.9631989],[46.4627262,9.7967867],[46.4359355,9.7672732],[46.40656,9.69599],[47.11307,9.27327],[47.09011,9.29902],[47.0840909,9.3052],[47.08934,9.3048],[47.1490749,9.1399819],[47.1361465,9.0996163],[46.808384,9.8371631],[46.7937264,9.8152347],[46.8310213,9.859618],[46.80526,9.84844],[46.80526,9.84841],[46.7919163,9.8176838],[46.7983588,9.8225887],[46.7897573,9.8145355],[46.781377,9.8749955],[46.8043241,9.8330226],[46.80009,9.8275],[46.7939641,9.8186695],[46.4782248,9.8130534],[46.487275,9.8323903],[46.4882698,9.8356401],[46.8002651,9.8277855],[46.8011936,9.8332912],[46.57806,9.92006],[46.7926609,10.2937308],[46.4627114,9.7968028],[46.5535794,9.891331],[46.4579843,9.8135404],[46.43277,9.76615],[47.0043782,9.5392063],[47.1425525,9.16317],[47.1496785,9.1360454],[47.1488631,9.1375972],[47.1503783,9.1364144],[47.1493204,9.1429031],[47.1496535,9.1435361],[47.1486259,9.1357867],[47.147884,9.1758126],[47.147139,9.1671843],[47.11289,9.25131],[47.1425769,9.1624296],[47.1482693,9.1464328],[46.4926593,9.8352605],[46.4867345,9.8349723],[46.4928286,9.8350188],[46.4895127,9.8359552],[46.4884205,9.837406],[46.4873711,9.8325248],[46.4786235,9.8136651],[46.4940576,9.8369153],[46.4849695,9.8320309],[46.7968884,10.3044409],[46.50983,9.85953],[46.59662,9.94938],[46.5130716,9.8606849],[47.08357,9.30699],[47.04986,9.44067],[47.08365,9.33486],[47.0879,9.30195],[47.09361,9.29768],[47.01698,9.42295],[47.1147,9.15048],[47.08885,9.30588],[46.4973082,9.8350232],[46.4974338,9.8350768],[46.77611,10.15461],[46.42976,9.76404],[46.42998,9.76384],[46.79872,10.29574],[46.45849,9.81359],[46.7928086,9.8230344],[47.0049691,9.5032704],[47.0920819,9.2871889],[47.0833613,9.3066216],[47.1153083,9.2570248],[46.7927625,9.8170111],[46.8093755,9.8465007],[46.5002929,9.8428447],[46.4868242,9.8332824],[46.4868242,9.8332824],[46.4883782,9.8355532],[46.4866534,9.830708],[46.4864667,9.8404068],[46.4870555,9.8334099],[46.5034907,9.8465318],[46.4875089,9.8328176],[46.4933517,9.8352912],[46.4883782,9.8355532],[46.4883782,9.8355532],[46.5020769,9.8418942],[46.4974869,9.839558],[46.4883782,9.8355532],[46.4899857,9.8363568],[46.4883782,9.8355532],[46.4883782,9.8355532],[46.4883753,9.8403742],[46.4873397,9.831455],[46.4864902,9.8329028],[46.4771336,9.8134695],[46.4895127,9.8359552],[46.484052,9.8379806],[46.4873273,9.8371615],[46.489777,9.8345806],[46.4859316,9.8307934],[46.4978506,9.8383183],[46.4954953,9.8360637],[46.5032565,9.8460512],[46.4986225,9.8441318],[46.4887022,9.8352726],[46.4866534,9.830708],[46.4974869,9.839558],[46.4985324,9.8401342],[46.4985892,9.8401749],[46.4879702,9.8425062],[46.4768608,9.813171],[46.4768315,9.8132372],[46.4987598,9.8374593],[46.4791522,9.8122151],[46.5003728,9.8424702],[46.4883805,9.8355637],[46.5132752,9.856569],[46.5144288,9.8599243],[46.509987,9.8539248],[46.7922,10.29161],[46.4612269,9.7946479],[46.79879,10.29579],[46.4357211,9.7682455],[46.4627705,9.7966097],[46.4612073,9.7946022],[46.7975401,10.2962309],[46.7947712,10.246253],[46.4359355,9.7672732],[46.77581,10.15065],[46.53602,9.87527],[46.4612389,9.7946599],[46.798967,10.2990764],[46.8173639,10.3315195],[46.4612463,9.7946546],[46.4612186,9.7946143],[46.435938,9.7675329],[46.5102541,9.8548103],[46.7916568,10.2439785],[46.4359602,9.7668463],[46.79507,10.28751],[46.533242,9.8694644],[46.79662,10.30444],[46.4612389,9.7946519],[46.8178927,10.3379985],[46.4359355,9.7672732],[46.798171,10.304156],[46.5130716,9.8606849],[46.4612426,9.7946581],[46.7966498,10.2969176],[46.4627705,9.7966097],[46.7846,10.2655],[46.4627114,9.7968028],[46.4627114,9.7968028],[46.7980169,10.3007526],[46.7944768,10.2472049],[46.4579843,9.8135404],[46.4627114,9.7968028],[46.46125,9.7946599],[46.7745799,10.2003414],[46.4612264,9.7946145],[46.7828475,10.2688841],[46.4290332,9.7629252],[46.4627114,9.7968028],[46.79327,10.2469],[46.7869825,10.2824914],[46.7945,10.24693],[46.797549,10.296283],[46.87249,10.42616],[46.7874053,10.2826041],[46.5130716,9.8606849],[46.5117472,9.8569496],[46.7975221,10.3023379],[46.5095176,9.8598482],[46.79281,10.2928386],[47.12384,9.3161],[46.4972399,9.8513866],[46.4928286,9.8350188],[46.8108422,9.8452292],[46.4783711,9.8132931],[46.487275,9.8323903],[46.489534,9.846025],[46.498748,9.845965],[46.485234,9.836164],[46.499736,9.846485],[46.8000493,9.8363594],[46.8005138,9.8279276],[46.7920334,9.8162759],[47.1485842,9.1350772],[47.150526,9.1377356],[47.089554,9.297765],[47.149561,9.152649],[47.12748,9.303099],[47.109482,9.241411],[47.0012724,9.5008323],[46.997092,9.508715],[47.003443,9.526791],[47.122612,9.127117],[47.1475864,9.1752849],[47.00465,9.503767],[47.1506348,9.1350145],[47.1488176,9.1376202],[47.1478662,9.1758214],[47.122612,9.127117],[47.012829,9.493875],[47.149561,9.152649],[47.1511004,9.1355488],[47.0012724,9.5008323],[47.1425769,9.1624296],[47.000144,9.501714],[47.00502,9.503587],[46.796572,9.8214751],[46.8056764,9.8350951],[46.7896766,9.817679],[46.802307,9.84228],[46.48938,9.835379],[46.4852,9.8118],[46.487211,9.841401],[46.49723,9.83782],[46.484942,9.820444],[46.48871,9.90872],[46.7917019,9.8165518],[46.7955176,9.8256504],[47.1506348,9.1350145],[46.7922,10.29161],[46.8021548,9.8350926],[46.808384,9.8371631],[47.1153083,9.2570248],[46.48683,9.8333162],[46.4867237,9.8371725],[46.4890826,9.8354328],[46.5035113,9.8466149],[47.1153083,9.2570248],[47.0930202,9.2864218],[47.1492004,9.1441194],[47.1506064,9.135485],[46.8002651,9.8277855],[46.808384,9.8371631],[46.7977662,9.8346909],[46.8024506,9.8289531],[46.80234,9.8288],[46.7928485,9.8242931],[46.7977412,9.8210813],[46.7934933,9.8229093],[46.7928014,9.8230447],[46.8091711,9.8423661],[46.797812,9.82476],[46.8074087,9.8357635],[46.5102541,9.8548103],[46.461129,9.7944435],[46.5038847,9.8916455],[46.43391,9.75418],[46.79799,10.29919],[46.7995676,10.2962274],[46.4579843,9.8135404],[46.43439,9.76737],[46.49482,9.90102],[46.5144444,9.8632678],[46.49063,9.9067],[46.7986,10.30798],[46.4359602,9.7668463],[46.7950325,10.2901424],[46.4594308,9.807659],[46.45712,9.8142],[46.49125,9.90241],[46.40259,9.69537],[46.79708,10.29356],[46.45984,9.79486],[46.5044748,9.8905525],[46.7937065,10.3001429],[46.5777,9.91934],[46.808384,9.8371631],[46.7907404,9.8156617],[47.0066226,9.5045847],[47.0935151,9.2859793],[47.1157482,9.2554745],[46.53268,9.8672],[46.5299837,9.8776399],[46.60586,9.95932],[46.5513071,9.8876664],[46.4864902,9.8329028],[46.8081439,9.8431005],[46.792061,9.8166603],[46.8004899,9.8280377],[46.7907404,9.8156617],[46.8017615,9.8347858],[46.7917019,9.8165518],[46.793184,9.8158683],[46.4795257,9.8137264],[46.4888912,9.8410877],[46.7922,10.29161],[46.4579681,9.8123898],[46.45897,9.79624],[46.4348,9.76819],[46.50835,9.85541],[46.81609,10.33671],[46.79562,10.30375],[46.5157407,9.8579024],[46.5087342,9.854629],[46.540908,9.880276],[46.40317,9.69603],[46.76802,10.11152],[46.7931153,10.2929928],[47.0840909,9.3052],[47.1425769,9.1624296],[46.7922,10.29161],[46.79507,10.28751],[46.46035,9.81245],[46.578801,9.9251714],[46.55077,9.88638],[46.8095,9.8439],[46.813093,9.8473261],[47.0066226,9.5045847],[46.4864902,9.8329028],[46.5003778,9.8424854],[46.4974338,9.8350768],[46.5003778,9.8424854],[46.42962,9.76172],[46.79507,10.28751],[46.53356,9.87151],[46.8065173,9.8349797],[46.7994359,9.834332],[46.53142,9.86707],[46.57727,9.91929],[46.63546,10.00369],[46.57768,9.91934],[46.48833,9.90808],[46.48575,9.90755],[46.5777,9.91934],[46.8060402,9.8353964],[46.8036977,9.8376663],[46.8011118,9.8354996],[46.788164,9.8168449],[46.48858,9.84293],[46.4888912,9.8410877],[46.8023642,9.8422554],[46.801556,9.8299734],[46.7973714,9.8348933],[46.5087342,9.854629],[46.48574,9.90755],[46.8048063,9.8363263],[46.83288,9.86139],[46.50247,9.89314],[46.51519,9.85558],[46.42976,9.76371],[46.69963,10.09708],[46.4904722,9.8346281],[46.4597716,9.797576],[46.4947833,9.9015727],[46.51441,9.85995],[46.53828,9.87443],[46.84322,10.36396],[46.4585704,9.8136476],[46.5107348,9.8545681],[46.80115,10.32385],[46.4928286,9.8350188],[46.476958,9.8115782],[46.8002651,9.8277855],[46.808384,9.8371631],[46.7933995,10.2940714],[46.435742,9.7679085],[46.4883233,9.8402706],[46.5023548,9.8455593],[46.4863272,9.8405407],[46.4945882,9.835511],[47.14742,9.17259],[47.1153083,9.2570248],[46.7867591,10.2824861],[46.5146464,9.8547644],[46.798171,10.304156],[46.77342,10.24088],[46.4359355,9.7672732],[46.7769303,10.14863],[46.8359533,10.3839248],[46.435742,9.7679085],[46.458075,9.8138077],[46.8175149,10.3390633],[46.5102499,9.860383],[46.4033327,9.6953544],[46.79482,10.29087],[46.84263,10.36523],[46.79714,10.25598],[46.4972455,9.8984215],[46.83294,10.38064],[46.75185,10.08304],[46.4975617,9.9001702],[46.8187,10.34078],[46.81794,10.3348],[46.71651,10.33279],[46.4357605,9.7681981],[46.7951084,10.2993173],[46.5372751,9.8731929],[46.79606,10.2534],[46.8,10.29],[46.4972811,9.8985026],[46.798669,10.2945311],[46.8,10.29635],[46.7968292,10.2945557],[46.79474,10.29203],[46.83574,10.38348],[46.4359602,9.7668463],[46.51512,9.857196],[46.4627705,9.7966097],[46.7932538,10.2463283],[46.4359355,9.7672732],[46.4335148,9.7652588],[46.5130716,9.8606849],[46.7984951,10.3044183],[46.5378877,9.8757008],[46.7995306,10.2973223],[46.435975,9.7666317],[46.536348,9.869786],[46.536915,9.871366],[46.79859,10.30793],[46.435938,9.7675329],[46.794893,10.245839],[46.6004187,9.9624177],[46.8183312,10.3343504],[46.4357605,9.7681981],[46.4357605,9.7681981],[46.46125,9.7946546],[46.43574,9.7679],[46.81621,10.33849],[46.7976162,10.2954692],[46.79811,10.2939],[46.486563,9.8311711],[46.4883782,9.8355532],[46.4852478,9.8316748],[46.498426,9.844033],[46.4980738,9.8498749],[46.4974869,9.839558],[46.47591,9.8105111],[46.497987,9.8351241],[46.486404,9.8416679],[46.4763346,9.8103601],[46.4915284,9.8338491],[46.5032761,9.84604],[46.4883753,9.8403742],[46.4809147,9.8159934],[46.4918196,9.8345876],[46.4971764,9.8369717],[46.4886203,9.838023],[46.4955609,9.8375856],[46.47591,9.8105111],[46.4865151,9.8403382],[46.4867276,9.8349994],[46.5012405,9.8427173],[46.4952387,9.8375284],[46.4939895,9.8359017],[47.1153083,9.2570248],[46.7936738,9.8227883],[46.7957628,9.8267893],[46.7936842,9.815117],[47.0901061,9.2989447],[47.129615,9.2157081],[46.5099999,9.8612383],[46.43487,9.76814],[46.51131,9.85454],[46.4345,9.76413],[46.48825,9.84021],[46.476958,9.8115782],[46.48672,9.83499],[46.4840021,9.8379366],[46.4993865,9.8339949],[46.5291913,9.8666497],[46.49482,9.90102],[46.5741978,9.9339454],[46.5302,9.86576],[46.435742,9.7679085],[46.4359602,9.7668463],[46.8021741,9.8379699],[46.49938,9.83399],[46.53004,9.86513],[46.51441,9.8582489],[46.601176,9.9632941],[46.54069,9.87994],[47.0912434,9.2869589],[46.7831457,9.8100102],[46.79995,9.83573],[46.8088414,9.8388685],[46.5035334,9.8466163],[46.50353,9.84661],[46.4357605,9.7681981],[46.435975,9.7666317],[46.4357605,9.7681981],[47.07394,9.33306],[46.81242,9.8455],[46.79943,9.83494],[46.80003,9.83417],[46.80299,9.84727],[46.7962623,9.821487],[46.42952,9.76338],[46.40347,9.70018],[46.49471,9.90178],[46.42934,9.76251],[46.42973,9.7631],[46.435938,9.7675329],[46.55061,9.88737],[46.5095176,9.8598482],[46.435742,9.7679085],[46.49003,9.90705],[46.43574,9.7679],[46.40288,9.69688],[46.69961,10.09719],[46.579,9.9266],[46.55299,9.88993],[46.435742,9.7679085],[46.7959,10.25358],[46.4786218,9.8127465],[46.808384,9.8371631],[46.801281,9.8367901],[46.7952027,9.8247386],[46.50201,9.89395],[46.50286,9.89314],[46.43417,9.76763],[46.530023,9.8685765],[46.50801,9.84979],[46.59637,9.95279],[46.5302,9.86576],[46.49741,9.83863],[46.4861438,9.8311151],[46.435742,9.7679085],[47.0891359,9.3055391],[46.55109,9.88753],[46.49105,9.90237],[46.55139,9.88758],[46.5082775,9.8499773],[46.57768,9.91934],[46.43277,9.76619],[46.4994976,9.8398021],[47.09011,9.29902],[46.801272,9.8368],[46.42985,9.76558],[46.4894,9.90734],[46.42979,9.76357],[47.0049691,9.5032704],[47.0892584,9.3007361],[47.0833613,9.3066216],[47.1499502,9.1443628],[47.096499,9.2853117],[47.0936476,9.2818338],[47.0927402,9.2854428],[47.0937561,9.2973089],[47.0861812,9.3064284],[47.090429,9.2995673],[47.0944135,9.286387],[46.9878323,9.4672584],[47.0910804,9.2949446],[47.0931535,9.2877159],[47.0932529,9.2878113],[47.0934375,9.2851989],[47.096499,9.2853117],[46.5023548,9.8455593],[46.43399,9.76538],[46.79562,10.30375],[46.7957762,9.8253091],[46.7952244,9.824758],[46.8079927,9.8425037],[46.808384,9.8371631],[46.7929879,9.8168351],[46.808384,9.8371631],[47.1153083,9.2570248],[46.9896178,9.4646057],[46.503276,9.84604],[46.5023548,9.8455593],[46.801272,9.8368],[46.4597716,9.797576],[46.7948484,10.2532831],[46.4612334,9.7946179]] const chartDom = document.getElementById('extractions'); const myChart = echarts.init(chartDom); - const filters = { regions: ["Davos", "Engadin", "Heidiland", "St. Moritz"] } @@ -164,11 +187,7 @@ const calOptData = new Promise((res, rej) => { calOptData.then((data) => { - /* - console.log(data); - console.log(data.length); - console.log(JSON.stringify(data)) - */ + const chartCapacity = document.getElementById('capacity'); const cCapacity = echarts.init(chartCapacity); @@ -256,3 +275,4 @@ calOptData.then((data) => { cCapacity.setOption(cCapacityOptions); }) +*/ diff --git a/dashboard/resources/views/base.blade.php b/dashboard/resources/views/base.blade.php new file mode 100644 index 0000000..db96cca --- /dev/null +++ b/dashboard/resources/views/base.blade.php @@ -0,0 +1,18 @@ + + + + + + + Dashboard + @vite(['resources/css/app.css', 'resources/js/app.js', 'node_modules/leaflet/dist/leaflet.css']) + + +
+ Dashboard +
+
+ @yield('main') +
+ + diff --git a/dashboard/resources/views/main.blade.php b/dashboard/resources/views/main.blade.php deleted file mode 100644 index dc6fbad..0000000 --- a/dashboard/resources/views/main.blade.php +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - Dashboard - @vite(['resources/css/app.css', 'resources/js/app.js', 'node_modules/leaflet/dist/leaflet.css']) - - -
- Dashboard -
-
-
-
-

- Headline -

-
-

Lorem Ipsum...

-
-
-
-

- Anzahl Properties p. Extractions -

-
-
-
-
-
-

- Anzahl Properties p. Extractions -

-
-
-
-
-
-
-
- - - diff --git a/dashboard/resources/views/overview.blade.php b/dashboard/resources/views/overview.blade.php new file mode 100644 index 0000000..839761e --- /dev/null +++ b/dashboard/resources/views/overview.blade.php @@ -0,0 +1,123 @@ +@extends('base') +@section('main') +
+
+

+ Properties pro Region +

+
+
+
+
+
+

+ Anzahl Properties p. Extractions +

+
+
+
+
+
+

+ Anzahl Properties p. Extractions +

+
+
+
+
+
+
+ + +@endsection diff --git a/dashboard/resources/views/property.blade.php b/dashboard/resources/views/property.blade.php new file mode 100644 index 0000000..c132f70 --- /dev/null +++ b/dashboard/resources/views/property.blade.php @@ -0,0 +1,98 @@ +@extends('base') +@section('main') +
+
+

+ Properties pro Region +

+
+
+
+
+
+

+ Belegung am {{ json_decode($extractiondates)[0] }} +

+
+
+
+ +@endsection diff --git a/dashboard/resources/views/welcome.blade.php b/dashboard/resources/views/welcome.blade.php deleted file mode 100644 index 979e82a..0000000 --- a/dashboard/resources/views/welcome.blade.php +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - Laravel - - - - - - - @if (file_exists(public_path('build/manifest.json')) || file_exists(public_path('hot'))) - @vite(['resources/css/app.css', 'resources/js/app.js']) - @else - - @endif - - -
- Laravel background -
-
-
-
- -
- @if (Route::has('login')) - - @endif -
- -
-
- -
- Laravel documentation screenshot - -
-
- -
-
-
- -
- -
-

Documentation

- -

- Laravel has wonderful documentation covering every aspect of the framework. Whether you are a newcomer or have prior experience with Laravel, we recommend reading our documentation from beginning to end. -

-
-
- - -
- - - -
- -
- -
-

Laracasts

- -

- Laracasts offers thousands of video tutorials on Laravel, PHP, and JavaScript development. Check them out, see for yourself, and massively level up your development skills in the process. -

-
- - - - - -
- -
- -
-

Laravel News

- -

- Laravel News is a community driven portal and newsletter aggregating all of the latest and most important news in the Laravel ecosystem, including new package releases and tutorials. -

-
- - - - -
-
- - - - - -
- -
-

Vibrant Ecosystem

- -

- Laravel's robust library of first-party tools and libraries, such as Forge, Vapor, Nova, Envoyer, and Herd help you take your projects to the next level. Pair them with powerful open source libraries like Cashier, Dusk, Echo, Horizon, Sanctum, Telescope, and more. -

-
-
-
-
- -
- Laravel v{{ Illuminate\Foundation\Application::VERSION }} (PHP v{{ PHP_VERSION }}) -
-
-
-
- - diff --git a/dashboard/routes/web.php b/dashboard/routes/web.php index 50a4ce9..f2b4991 100644 --- a/dashboard/routes/web.php +++ b/dashboard/routes/web.php @@ -1,7 +1,41 @@ [json_encode($propsPerRegionName), json_encode($propsPerRegionCounts)]]); +}); + +Route::get('/prop/{id}', function (int $id) { + + $extractions = Api::propertyExtractions($id); + $data = []; + $dates = []; + + foreach ($extractions as $ext) { + + $series = []; + $dates[] = $ext['created_at']; + $extCalendar = json_decode($ext['calendar'], 1); + + foreach ($extCalendar as $date => $status) { + $series[] = [$date, $status]; + } + + $data[] = $series; + + } + + return view('property', ["extractiondates" => json_encode($dates), "calendar" => $data]); }); diff --git a/etl/pixi.lock b/etl/pixi.lock index d19827e..f78ba19 100644 --- a/etl/pixi.lock +++ b/etl/pixi.lock @@ -2200,9 +2200,7 @@ packages: name: consultancy-2 version: 0.1.0 path: . - sha256: c5e1a7be44a8bc92a9119ccc4b7e7e7b3db765694b975b5cd30b288638254471 - requires_dist: - - polars + sha256: 878bb6af1502cc9ac71feab6f184f593077f134626d6f8c552e9bcafb178f6b4 requires_python: '>=3.11' editable: true - kind: conda diff --git a/etl/pyproject.toml b/etl/pyproject.toml index 9808103..5ae9848 100644 --- a/etl/pyproject.toml +++ b/etl/pyproject.toml @@ -1,7 +1,6 @@ [project] -authors = [{name = "Giò Diani", email = "mail@gionathandiani.name"}] -dependencies = ["polars"] -description = "Add a short description here" +authors = [{name = "Giò Diani", email = "mail@gionathandiani.name"}, {name = "Mauro Stoffel", email = "mauro.stoffel@stud.fhgr.ch"}, {name = "Colin Bolli", email = "colin.bolli@stud.fhgr.ch"}, {name = "Charles Winkler", email = "charles.winkler@stud.fhgr.ch"}] +description = "Datenauferbeitung" name = "consultancy_2" requires-python = ">= 3.11" version = "0.1.0" diff --git a/etl/src/api/main.py b/etl/src/api/main.py new file mode 100644 index 0000000..81e1ef2 --- /dev/null +++ b/etl/src/api/main.py @@ -0,0 +1,34 @@ +import data +import polars as pl +from fastapi import FastAPI, Response + +d = data.load() + +app = FastAPI() + +@app.get("/") +def read_root(): + return {"Hi there!"} + +@app.get("/items/{item_id}") +def read_item(item_id: int): + ext = d.extractions_for(item_id).pl() + out = ext.with_columns(pl.col("calendar").str.extract_all(r"([0-9]{4}-[0-9]{2}-[0-9]{2})|[0-2]").alias("calendar_data")) + out = out.drop(['calendar', 'property_id']) + return Response(content=out.write_json(), media_type="application/json") + +@app.get("/region/properties") +def properties_region(): + return d.properties_per_region().pl().to_dicts() + +@app.get("/properties/growth") +def properties_growth(): + options = {"dates" : d.properties_growth().pl()['date'].to_list(), "values" : d.properties_growth().pl()['properties_count'].to_list()} + return options + +@app.get("/properties/extractions/{id}") +def property_extractions(id: int): + return d.extractions_for(property_id = id).pl().to_dicts() + + + diff --git a/etl/src/dashboard/main.py b/etl/src/dashboard/main.py deleted file mode 100644 index 17275ac..0000000 --- a/etl/src/dashboard/main.py +++ /dev/null @@ -1,22 +0,0 @@ -from typing import Union - -import polars as pl -from fastapi import FastAPI, Response - -import data - -d = data.load() - -app = FastAPI() - - -@app.get("/") -def read_root(): - return {"Hello": "World"} - -@app.get("/items/{item_id}") -def read_item(item_id: int): - ext = d.extractions_for(item_id).pl() - out = ext.with_columns(pl.col("calendar").str.extract_all(r"([0-9]{4}-[0-9]{2}-[0-9]{2})|[0-2]").alias("calendar_data")) - out = out.drop(['calendar', 'property_id']) - return Response(content=out.write_json(), media_type="application/json") \ No newline at end of file diff --git a/etl/src/data/database.py b/etl/src/data/database.py index b4d7c3b..b223d49 100644 --- a/etl/src/data/database.py +++ b/etl/src/data/database.py @@ -69,6 +69,8 @@ class Database: GROUP BY properties.seed_id, regions.name + ORDER BY + count_properties ASC """) def propIds_with_region(self): @@ -208,7 +210,7 @@ class Database: """) def extractions(self): - return self.connection.sql(f""" + return self.connection.sql(""" SELECT JSON_EXTRACT(body, '$.content.days') as calendar, property_id, @@ -226,7 +228,6 @@ class Database: return self.connection.sql(f""" SELECT JSON_EXTRACT(body, '$.content.days') as calendar, - property_id, created_at FROM consultancy_d.extractions diff --git a/etl/src/gio/index.html b/etl/src/gio/index.html deleted file mode 100644 index 573717d..0000000 --- a/etl/src/gio/index.html +++ /dev/null @@ -1,149 +0,0 @@ - - - - - - Document - - - - - - -
- -
- - - -
-
-
-
-
-
- - - - - \ No newline at end of file diff --git a/etl/src/gio/test_duckdb.py b/etl/src/gio/test_duckdb.py index 33939bc..6ddef74 100644 --- a/etl/src/gio/test_duckdb.py +++ b/etl/src/gio/test_duckdb.py @@ -1,8 +1,9 @@ +import data import polars as pl -import data - inst = data.load() + +""" test = inst.extractions_for(1).pl() out = test.with_columns( @@ -11,6 +12,6 @@ out = test.with_columns( out = out.drop(['calendar', 'property_id']) print(out.to_dict(as_series=True)) +""" - - +print(inst.price_developement_per_property().pl())