yolo

app/app.py

@@ -28,10 +28,6 @@ wine_list = wine_similarity_df['NAME'].unique()
 
 
 
-
-
-
-
 ## Layout ##
 
 dashboard_layout =  html.Div([
@@ -40,7 +36,7 @@ dashboard_layout =  html.Div([
     dcc.Graph(id='graph-content'),
 
 
-
+    dcc.Graph(id='world-map-fig'),
 
     html.H1(children='Wine Recommender', style={'textAlign':'center'}),
     dcc.Dropdown(wine_list, wine_list[0], id='dropdown-selection'),
@@ -49,6 +45,9 @@ dashboard_layout =  html.Div([
 
 
 
+
+
+
 wiki_layout = html.Div([
     dcc.Link('Dashboard', href='/'),
 
@@ -59,11 +58,9 @@ wiki_layout = html.Div([
 
                     html.H3('What is this project about?'),
 
-                    html.P('something'),
-
-                    html.H3('How does it work?'),
+                    html.P('We are a group of 4 Computer Science Engineering Students with a solid Artificial Intelligence background.'),
+                    html.P('This project aims to showcase AI applications for improving Wine Tourism for SOGRAPE.'),
 
-                    #Insert image of the system
 
                     html.H3('\'Bout us'),
                     html.Img(src='/assets/tourdevino_logo.webp', style={'width': '40%', 'height': 'auto', 'display': 'block', 'margin-left': 'auto', 'margin-right': 'auto'}),
@@ -73,11 +70,6 @@ wiki_layout = html.Div([
                     html.H4('André Catarino'),
                     html.H4('Dinis Costa'),
                     html.H4('Paulo Fidalgo'),
-                    
-
-
-                    html.H3('References'),
-                    html.P('The boiler model was based on the following paper:'),
 
 
         ], className='six columns'),], className='row'),
@@ -101,15 +93,41 @@ def display_page(pathname):
 @app.callback(
     Output('graph-content', 'figure'),
     Output('wine-recommendation', 'children'),
+    Output('world-map-fig', 'figure'),
     Input('dropdown-selection', 'value')
 )
 def update_graph(value):
+    ### Wine Recommendation ###
     recommended_wines = None
     if value:
         recommended_wines = core.get_top_5_similar_wines(value, wine_similarity_df)[1:]
         recommended_wines = "; ".join(recommended_wines)
 
-    return px.line(df, x='year', y='pop'), recommended_wines
+
+    ### World Map of wineyards ###
+
+    geo_df = pd.read_csv('data/processed_wineyards.csv')
+
+
+    world_map_fig = px.scatter_map(geo_df,
+                            lat=geo_df['coord_x'],
+                            lon=geo_df['coord_y'],
+                            hover_name=geo_df['name'],
+                            zoom=4,
+                            hover_data={
+                                'IsTouristic': True,
+                                'Wine Type': True,
+                                'Country': True,
+                                'Region': True,
+                                'Address': True,
+
+                            },
+                            title='Wineyards around the world',
+                            )
+    
+
+
+    return px.line(df, x='year', y='pop'), recommended_wines, world_map_fig
 
 
 if __name__ == "__main__":

app/dashboard.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 6,
    "metadata": {},
    "outputs": [
     {
@@ -20,11 +20,38 @@
        "        "
       ],
       "text/plain": [
-       "<IPython.lib.display.IFrame at 0x2b21db970>"
+       "<IPython.lib.display.IFrame at 0x28f564370>"
       ]
      },
      "metadata": {},
      "output_type": "display_data"
+    },
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "[2024-09-17 12:44:28,042] ERROR in app: Exception on /_dash-update-component [POST]\n",
+      "Traceback (most recent call last):\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/flask/app.py\", line 1473, in wsgi_app\n",
+      "    response = self.full_dispatch_request()\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/flask/app.py\", line 882, in full_dispatch_request\n",
+      "    rv = self.handle_user_exception(e)\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/flask/app.py\", line 880, in full_dispatch_request\n",
+      "    rv = self.dispatch_request()\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/flask/app.py\", line 865, in dispatch_request\n",
+      "    return self.ensure_sync(self.view_functions[rule.endpoint])(**view_args)  # type: ignore[no-any-return]\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/dash/dash.py\", line 1376, in dispatch\n",
+      "    ctx.run(\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/dash/_callback.py\", line 514, in add_context\n",
+      "    raise err\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/dash/_callback.py\", line 503, in add_context\n",
+      "    output_value = _invoke_callback(func, *func_args, **func_kwargs)\n",
+      "  File \"/Users/ruimelo/anaconda3/envs/gan-nlp/lib/python3.10/site-packages/dash/_callback.py\", line 43, in _invoke_callback\n",
+      "    return func(*args, **kwargs)  # %% callback invoked %%\n",
+      "  File \"/var/folders/b4/lwfgccm95kqd2skcwvrt2fr00000gn/T/ipykernel_62984/1808289814.py\", line 112, in update_graph\n",
+      "    world_map_fig = px.scatter_map(geo_df,\n",
+      "TypeError: scatter_map() got an unexpected keyword argument 'projection_type'\n"
+     ]
     }
    ],
    "source": [
@@ -58,10 +85,6 @@
     "\n",
     "\n",
     "\n",
-    "\n",
-    "\n",
-    "\n",
-    "\n",
     "## Layout ##\n",
     "\n",
     "dashboard_layout =  html.Div([\n",
@@ -70,7 +93,7 @@
     "    dcc.Graph(id='graph-content'),\n",
     "\n",
     "\n",
-    "\n",
+    "    dcc.Graph(id='world-map-fig'),\n",
     "\n",
     "    html.H1(children='Wine Recommender', style={'textAlign':'center'}),\n",
     "    dcc.Dropdown(wine_list, wine_list[0], id='dropdown-selection'),\n",
@@ -79,6 +102,9 @@
     "\n",
     "\n",
     "\n",
+    "\n",
+    "\n",
+    "\n",
     "wiki_layout = html.Div([\n",
     "    dcc.Link('Dashboard', href='/'),\n",
     "\n",
@@ -89,11 +115,9 @@
     "\n",
     "                    html.H3('What is this project about?'),\n",
     "\n",
-    "                    html.P('something'),\n",
-    "\n",
-    "                    html.H3('How does it work?'),\n",
+    "                    html.P('We are a group of 4 Computer Science Engineering Students with a solid Artificial Intelligence background.'),\n",
+    "                    html.P('This project aims to showcase AI applications for improving Wine Tourism for SOGRAPE.'),\n",
     "\n",
-    "                    #Insert image of the system\n",
     "\n",
     "                    html.H3('\\'Bout us'),\n",
     "                    html.Img(src='/assets/tourdevino_logo.webp', style={'width': '40%', 'height': 'auto', 'display': 'block', 'margin-left': 'auto', 'margin-right': 'auto'}),\n",
@@ -103,11 +127,6 @@
     "                    html.H4('André Catarino'),\n",
     "                    html.H4('Dinis Costa'),\n",
     "                    html.H4('Paulo Fidalgo'),\n",
-    "                    \n",
-    "\n",
-    "\n",
-    "                    html.H3('References'),\n",
-    "                    html.P('The boiler model was based on the following paper:'),\n",
     "\n",
     "\n",
     "        ], className='six columns'),], className='row'),\n",
@@ -131,15 +150,41 @@
     "@app.callback(\n",
     "    Output('graph-content', 'figure'),\n",
     "    Output('wine-recommendation', 'children'),\n",
+    "    Output('world-map-fig', 'figure'),\n",
     "    Input('dropdown-selection', 'value')\n",
     ")\n",
     "def update_graph(value):\n",
+    "    ### Wine Recommendation ###\n",
     "    recommended_wines = None\n",
     "    if value:\n",
     "        recommended_wines = core.get_top_5_similar_wines(value, wine_similarity_df)[1:]\n",
     "        recommended_wines = \"; \".join(recommended_wines)\n",
     "\n",
-    "    return px.line(df, x='year', y='pop'), recommended_wines\n",
+    "\n",
+    "    ### World Map of wineyards ###\n",
+    "\n",
+    "    geo_df = pd.read_csv('data/processed_wineyards.csv')\n",
+    "\n",
+    "\n",
+    "    world_map_fig = px.scatter_map(geo_df,\n",
+    "                            lat=geo_df['coord_x'],\n",
+    "                            lon=geo_df['coord_y'],\n",
+    "                            hover_name=geo_df['name'],\n",
+    "                            zoom=4,\n",
+    "                            hover_data={\n",
+    "                                'IsTouristic': True,\n",
+    "                                'Wine Type': True,\n",
+    "                                'Country': True,\n",
+    "                                'Region': True,\n",
+    "                                'Address': True,\n",
+    "\n",
+    "                            },\n",
+    "                            title='Wineyards around the world',\n",
+    "                            )\n",
+    "    \n",
+    "\n",
+    "\n",
+    "    return px.line(df, x='year', y='pop'), recommended_wines, world_map_fig\n",
     "\n",
     "\n",
     "if __name__ == \"__main__\":\n",

app/data/processed_wineyards.csv

@@ -0,0 +1,14 @@
+,name,IsTouristic,LOCAL TYPE,Wine Type,SIZE,Country,Region,Address,coord,coord_x,coord_y
+0,Quinta de Azevedo,No,Quinta,Verde,41.0,Portugal,Douro,"R. Conde de Azevedo 237, 4750-511 Roriz","41.57330853032964, -8.533706262471226",41.57330853032964,-8.533706262471226
+1,Quinta do Porto,No,Quinta,Douro,27.0,Portugal,Douro,"N226, 5100","41.1285485073888, -7.816127554438324",41.1285485073888,-7.816127554438324
+2,Quinta do Seixo,Quinta do Seixo,Quinta,,100.0,Portugal,Douro,"Largo de Eiras 37, 5150-084 Almendra","41.02111060351561, -7.011243914386894",41.02111060351561,-7.011243914386894
+3,Quinta do Caêdo,No,Quinta,,22.0,Portugal,Douro,5130-126 Ervedosa do Douro,"41.191193966639496, -7.464240963577649",41.191193966639496,-7.464240963577649
+4,Quinta do Vau,No,Quinta,,73.0,Portugal,Douro,"Quinta do Vau, 7750-301 Mértola","37.63310013834872, -7.664460830879209",37.63310013834872,-7.664460830879209
+5,Quinta do Sairrão,No,Quinta,,170.0,Portugal,Douro,"Quinta do Sairrão Valença do Douro, 5130-909 São João da Pesqueira","41.12585233297436, -7.4043047394921855",41.12585233297436,-7.4043047394921855
+6,Quinta da Leda,No,Quinta,,158.0,Portugal,Douro,"Largo de Eiras 37, 5150-084 Almendra","41.0211631569069, -7.011313646768633",41.0211631569069,-7.011313646768633
+7,Quinta dos Carvalhais,No,Quinta,,106.0,Portugal,Dão,6370-140 Fornos de Algodres,"40.68806430590881, -7.380353578401911",40.68806430590881,-7.380353578401911
+8,Quinta do Romeira,No,Quinta,,73.0,Portugal,Bucelas,"Quinta da Romeira de Cima, 2670-678 Bucelas","38.90339927862606, -9.08272372295126",38.90339927862606,-9.08272372295126
+9,Herdade do Peso,No,Quinta,,162.0,Portugal,Alentejo,"W8W4+9X, Fajarda","38.94607643846798, -8.692547592716494",38.94607643846798,-8.692547592716494
+10,Santiago Ruiz,No,Quinta,Branco,38.0,Espanha,Rías Baixas,"Rua do Vinicultor, Santiago Ruiz, s/n, 36760 San Miguel de Tabagón, Pontevedra, Espanha","41.941794564806685, -8.802269831979137",41.941794564806685,-8.802269831979137
+11,Viña Lanciano,LAN,Quinta,,72.0,Espanha,Rioja,"Paraje de Buicio s/n, 26360 Fuenmayor, Espanha","42.46620857388223, -2.6026644530093135",42.46620857388223,-2.6026644530093135
+12,Finca los Llanos,No,Quinta,,25.0,Espanha,Rueda,"Calle Sierra Nevada, 18413 Capileira, Granada, Espanha","36.97246300856455, -3.358175904877671",36.97246300856455,-3.358175904877671

app/data/wineyards.csv

@@ -0,0 +1,19 @@
+NAME,IsTouristic,LOCAL TYPE,WINE TYPE,SIZE,COUNTRY,REGION,ADDRESS,COORD
+Quinta de Azevedo,No,Quinta,Verde,41,Portugal,Douro,"R. Conde de Azevedo 237, 4750-511 Roriz","41.57330853032964, -8.533706262471226"
+Quinta do Porto,No,Quinta,Douro,27,Portugal,Douro,"N226, 5100","41.1285485073888, -7.816127554438324"
+Quinta do Seixo,Quinta do Seixo,Quinta,,100,Portugal,Douro,"Largo de Eiras 37, 5150-084 Almendra","41.02111060351561, -7.011243914386894"
+Quinta do Caêdo,No,Quinta,,22,Portugal,Douro,5130-126 Ervedosa do Douro,"41.191193966639496, -7.464240963577649"
+Quinta do Vau,No,Quinta,,73,Portugal,Douro,"Quinta do Vau, 7750-301 Mértola","37.63310013834872, -7.664460830879209"
+Quinta do Sairrão,No,Quinta,,170,Portugal,Douro,"Quinta do Sairrão Valença do Douro, 5130-909 São João da Pesqueira","41.12585233297436, -7.4043047394921855"
+Quinta da Leda,No,Quinta,,158,Portugal,Douro,"Largo de Eiras 37, 5150-084 Almendra","41.0211631569069, -7.011313646768633"
+Quinta dos Carvalhais,No,Quinta,,106,Portugal,Dão,6370-140 Fornos de Algodres,"40.68806430590881, -7.380353578401911"
+Quinta do Romeira,No,Quinta,,73,Portugal,Bucelas,"Quinta da Romeira de Cima, 2670-678 Bucelas","38.90339927862606, -9.08272372295126"
+Herdade do Peso,No,Quinta,,162,Portugal,Alentejo,"W8W4+9X, Fajarda","38.94607643846798, -8.692547592716494"
+Santiago Ruiz,No,Quinta,Branco,38,Espanha,Rías Baixas,"Rua do Vinicultor, Santiago Ruiz, s/n, 36760 San Miguel de Tabagón, Pontevedra, Espanha","41.941794564806685, -8.802269831979137"
+Viña Lanciano,LAN,Quinta,,72,Espanha,Rioja,"Paraje de Buicio s/n, 26360 Fuenmayor, Espanha","42.46620857388223, -2.6026644530093135"
+Finca los Llanos,No,Quinta,,25,Espanha,Rueda,"Calle Sierra Nevada, 18413 Capileira, Granada, Espanha","36.97246300856455, -3.358175904877671"
+Ribera del Duero,No,Region,Tinto,,Espanha,Ribera del Duero,,
+Jerez de la Frontera,No,Region,,,Espanha,Jerez de la Frontera,Jerez de la Frontera,
+Caves Ferreira,Caves Ferreira,Cave,Porto Wine,,Portugal,,,
+Caves Sandeman,Caves Sandeman,Cave,,,Portugal,,,
+Loja da Estação do Pinhão,Loja da Estação do Pinhão,Loja,,,Portugal,,,