Update Amica restaurants for latest remote changes

amica.pl

@@ -2,8 +2,8 @@ use vars qw(@day_names);
 use JSON;
 
 my @restaurant_info = (
-  [ "(TaY) Amica Minerva", "http://www.amica.fi/minerva", "", "middle", "http://www.amica.fi/modules/json/json/Index?costNumber=0815" ],
-  [ "(TTY) Ravintola Reaktori", "http://www.amica.fi/reaktori", "", "middle", "http://www.amica.fi/modules/json/json/Index?costNumber=0812" ]
+  [ "(TaY) Amica Minerva", "http://www.amica.fi/minerva", "", "middle", "http://www.amica.fi/api/restaurant/menu/week?language=fi&restaurantPageId=7381" ],
+  [ "(TTY) Ravintola Reaktori", "http://www.amica.fi/reaktori", "", "middle", "http://www.amica.fi/api/restaurant/menu/week?language=fi&restaurantPageId=69171" ]
 );
 
 sub utf8_to_8859 {
@@ -28,14 +28,16 @@ sub parse_amica {
   my @week_foods = ();
 
   my $data = from_json($json);
-  my $MenusForDays = $data->{'MenusForDays'};
-  foreach my $MenuForDay (@$MenusForDays) {
-    my $SetMenus = $MenuForDay->{'SetMenus'};
+  my $LunchMenus = $data->{'LunchMenus'};
+  foreach my $LunchMenu (@$LunchMenus) {
+    my $SetMenus = $LunchMenu->{'SetMenus'};
     foreach my $SetMenu (@$SetMenus) {
-      my $Components = $SetMenu->{'Components'};
-      foreach my $Component (@$Components) {
+      my $Meals = $SetMenu->{'Meals'};
+      foreach my $Meal (@$Meals) {
         $cur_food .= "\n" if $cur_food ne "";
-        $cur_food .= $Component;
+        $cur_food .= $Meal->{'Name'};
+	my $Diets = $Meal->{'Diets'};
+	$cur_food .= ' (' . join(', ', @$Diets) . ')';
       }
       push @cur_day_foods, utf8_to_8859($cur_food) if ($cur_food ne "");
       $cur_food = "";
@@ -64,7 +66,7 @@ sub get_amica_restaurant {
   foreach my $i (@restaurant_info) {
     my @info = @{$i};
     my $temp_fname = "amica$count.temp.html";
-    my $url = "${info[4]}&firstDay=$first_day&lastDay=$last_day&language=fi";
+    my $url = "${info[4]}&weekDate=$first_day";
     if (!-f $temp_fname || !$use_old) {
       system("wget -q --timeout=10 -O $temp_fname.tmp '$url' && mv $temp_fname.tmp $temp_fname") if ($url ne "");
     }