ultima estable

WorkerService1/WebApplication3/Clases/Constants.cs

@@ -24,7 +24,8 @@ namespace WebApplication3.Clases
             { "8", "#266A2E" }
         };
         public const string SVGFileName = "vector_image.svg";
+        public const string SVGGeoJson = "geoimage.svg";
         public const string PNGFileName = "color_map.png";
-        public const string GeoJsonFileName = "vector_image.geojson";
+        public const string GeoJsonFileName = "geoimage.geojson";
     }
 }

WorkerService1/WebApplication3/Clases/Parser.cs

@@ -632,7 +632,7 @@ namespace WebApplication3.Clases
             return piezometria;
         }
 
-        public void GetGeolocalizationFromFile(string file,out string worldX,out string worldY)
+        public void GetGeolocalizationFromFile(string file,out string worldX,out string worldY, out string angle, out string length, out string heigth)
         {
 
             string text = File.ReadAllText(file);
@@ -644,10 +644,17 @@ namespace WebApplication3.Clases
             string[] geolocation_data = geolocation_line.Split(" ", StringSplitOptions.RemoveEmptyEntries);
             string[] world_origin_x = geolocation_data[3].Split("World_Origin_X=", StringSplitOptions.RemoveEmptyEntries);
             string[] world_origin_y = geolocation_data[4].Split("World_Origin_Y=", StringSplitOptions.RemoveEmptyEntries);
+            string[] modelAngle = geolocation_data[5].Split("Angle=", StringSplitOptions.RemoveEmptyEntries);
+            string[] modelLength = geolocation_data[6].Split("Length=", StringSplitOptions.RemoveEmptyEntries);
+            string[] modelHeigth = geolocation_data[7].Split("Height=", StringSplitOptions.RemoveEmptyEntries);
 
 
             worldX = world_origin_x[0].Replace("\"", string.Empty);
             worldY = world_origin_y[0].Replace("\"", string.Empty);
+            angle = modelAngle[0].Replace("\"",string.Empty);
+            length = modelLength[0].Replace("\"", string.Empty);
+            heigth = modelHeigth[0].Replace("\"", string.Empty);
+
         }
 
         public WellData[] parseWellCSV(string file)
@@ -828,5 +835,18 @@ namespace WebApplication3.Clases
 
             return piezometerDatas.ToArray();
         }
+
+        public bool ModflowError(string file)
+        {
+            
+            string text = File.ReadAllText(file).ToLower();
+
+            if (!text.Contains("error"))
+            {
+                return false;
+            }
+
+            return true;
+        }
     }
 }

WorkerService1/WebApplication3/Clases/Utilities.cs

@@ -69,5 +69,34 @@ namespace WebApplication3.Clases
                 }
             }
         }
+        public static bool ModifySVG(string fileOriginal, string x, string y, string length, string height, string destinationFile)
+        {
+            string text = File.ReadAllText(fileOriginal);
+            bool result = true;
+
+            List<string> textLines = text.Split("\r\n", StringSplitOptions.RemoveEmptyEntries).ToList();
+
+            string aux = textLines.Find(x => x.Contains("metadata"));
+
+            if (aux != null)
+            {
+                try
+                {
+                    float latitude = float.Parse(x) + float.Parse(length);
+                    float longitude = float.Parse(y) + float.Parse(height);
+                    int index = textLines.IndexOf(aux);
+                    textLines[index] += "\r\n	<MetaInfo xmlns=\"http://www.prognoz.ru\">\r\n          < Geo >\r\n             < GeoItem X = \"" + 0 + "\" Y = \"" + 0 + "\" Latitude = \"" + x + "\" Longitude = \"" + y + "\" />                          < GeoItem X = \"" + x + "\" Y = \"" + y + "\" Latitude = \"" + latitude + "\" Longitude = \"" + longitude + "\" />\r\n          </ Geo >\r\n	</ MetaInfo > ";
+                    File.WriteAllLines(destinationFile, textLines);
+                }
+                catch(Exception ex)
+                {
+                    Logger.WriteLog(ex.Message);
+                    Logger.WriteLog(ex.InnerException.Message);
+                    result = false; ;
+                }
+            }
+
+            return result;
+        }
     }
 }

WorkerService1/WebApplication3/Controllers/AcuiferoController.cs

@@ -159,17 +159,17 @@ namespace WebApplication3.Controllers
         [HttpPost("TestBinary")]
         public bool TestBinario([FromBody] DatosPostAcuifero datos)
         {
-            string file = Constants.PathZip + "test.zip";
-            Utilities.BinaryToFile(datos.Fichero.Test, file);
-
-            if (System.IO.File.Exists(file)) 
-            {
-                return true;
-            }
-            else
-            {
-                return false;
-            }
+            //string file = Constants.PathZip + "test.zip";
+            //Utilities.BinaryToFile(datos.Fichero.Test, file);
+            return true;
+            //if (System.IO.File.Exists(file)) 
+            //{
+            //    return true;
+            //}
+            //else
+            //{
+            //    return false;
+            //}
 
         }
         // POST: api/Acuifero
@@ -210,12 +210,15 @@ namespace WebApplication3.Controllers
                 //1.2 - Obtencion de coordenadas de origen (en el mundo) del modelo
                 string geoFile = files.Find(x => x.Contains(".vmf"));
                 Logger.WriteLog("geofile " + geoFile);
-                string world_origin_x, world_origin_y;
+                string world_origin_x, world_origin_y, angle, length, height;
 
-                parser.GetGeolocalizationFromFile(geoFile, out world_origin_x, out world_origin_y);
+                parser.GetGeolocalizationFromFile(geoFile, out world_origin_x, out world_origin_y, out angle, out length, out height);
 
                 acuifero.WorldOriginX = world_origin_x;
                 acuifero.WorldOriginY = world_origin_y;
+                acuifero.Angle = angle;
+                acuifero.Length = length;
+                acuifero.Height = height;
 
                 _context.Acuiferos.Add(acuifero);
                 await _context.SaveChangesAsync();

WorkerService1/WebApplication3/Controllers/ServiceQueueController.cs

@@ -120,6 +120,37 @@ namespace WebApplication3.Controllers
             return CreatedAtAction("GetQueueItem", new { id = serviceQueueItem.Id }, serviceQueueItem);
         }
 
+        [NonAction]
+        public async Task<ActionResult<ServiceQueue>> SetError(uint id)
+        {
+            var serviceQueueItem = await _context.ServiceQueue.FindAsync(id);
+
+            serviceQueueItem.Error = 1;
+            serviceQueueItem.Corriendo = 0;
+            serviceQueueItem.Terminado = 1;
+            serviceQueueItem.Fin = DateTime.Now.ToString();
+
+            _context.Entry(serviceQueueItem).State = EntityState.Modified;
+
+            try
+            {
+                await _context.SaveChangesAsync();
+            }
+            catch (DbUpdateConcurrencyException)
+            {
+                if (!ServiceQueueExists(id))
+                {
+                    return NotFound();
+                }
+                else
+                {
+                    throw;
+                }
+            }
+
+            return CreatedAtAction("GetQueueItem", new { id = serviceQueueItem.Id }, serviceQueueItem);
+        }
+
 
         // POST: api/ServiceQueue
         // To protect from overposting attacks, see https://go.microsoft.com/fwlink/?linkid=2123754

WorkerService1/WebApplication3/Controllers/SimulacionController.cs

@@ -221,6 +221,7 @@ namespace WebApplication3.Controllers
 
             uint simulacionId = (uint)serviceQueue.IdSimulacion;
             Simulacion simulacion = _context.Simulaciones.Find(simulacionId);
+            Acuifero aquifer = _context.Acuiferos.Find(simulacion.IdAcuifero);
 
             //Obtenemos el nombre de fichero original del acuifero
             string zip = acuiferoController.GetFicheroZip((uint)simulacion.IdAcuifero);
@@ -363,6 +364,15 @@ namespace WebApplication3.Controllers
                 Thread.Sleep(5000);
                 Logger.WriteLog("fin modflow");
 
+                string modelResultsFile = files.Find(x => x.Contains(".LST"));
+
+                if (parser.ModflowError(modelResultsFile))
+                {
+                    Logger.WriteLog("El fichero LST para la simulacion con id interno "+simulacion.Id+" tiene error");
+                    await serviceQueueController.SetError(serviceQueue.Id);
+                    return true;
+                }
+
                 //6.Ejecucion Zonebudget
                 //Seguidamente miramos el fichero de resultado de zonas (si existe)
                 if (zoneFile != null && System.IO.File.Exists(zoneFile))
@@ -382,7 +392,6 @@ namespace WebApplication3.Controllers
                 files = Directory.GetFiles(workingDirectory).ToList<string>();
 
                 string zoneResultsFile = files.Find(x => x.Contains(".zblst"));
-                string modelResultsFile = files.Find(x => x.Contains(".LST"));
                 string piezometryFile = files.Find(x => x.Contains(".HDS"));
 
                 //Parseo del fichero de balance hidrico por zonas
@@ -477,16 +486,26 @@ namespace WebApplication3.Controllers
                 /*
                  * se transforma la imagen vectorial obtenida anteriormente para transformarla en un geojson
                  */
-                string svgFile = workingDirectory + Constants.SVGFileName;
-                await serviceController.GetGeoJsonFromSVG(workingDirectory, svgFile);
-
-                await SetGeoJson(simulacionId, workingDirectory+Constants.GeoJsonFileName);
+                string svgFileOriginal = workingDirectory + Constants.SVGFileName;
+                string svgModifiedFile = workingDirectory + Constants.SVGGeoJson;
+                string geoJsonFile = workingDirectory + Constants.GeoJsonFileName;
+                if (System.IO.File.Exists(svgFileOriginal))
+                {
+                    if (Utilities.ModifySVG(svgFileOriginal, aquifer.WorldOriginX, aquifer.WorldOriginY, aquifer.Length, aquifer.Height, svgModifiedFile))
+                    {
+                        await serviceController.GetGeoJsonFromSVG(workingDirectory, svgModifiedFile);
+                        if (System.IO.File.Exists(geoJsonFile))
+                        {
+                            await SetGeoJson(simulacionId, geoJsonFile);
+                        }
+                    }
+                }
                 
                 await serviceQueueController.SetTerminado(serviceQueue.Id);
                 Logger.WriteLog("terminado");
                 try
                 {
-                    System.IO.Directory.Delete(workingDirectory);
+                    Directory.Delete(workingDirectory);
                 }catch(Exception ex)
                 {
                     Logger.WriteLog(ex.Message);

WorkerService1/WebApplication3/Models/Acuifero.cs

@@ -12,6 +12,9 @@ namespace WebApplication3.Models
         public string Fichero { get; set; }
         public string WorldOriginX { get; set; }
         public string WorldOriginY { get; set; }
+        public string Angle { get; set; }
+        public string Length { get; set; }
+        public string Height { get; set; }
         public string RechargeGeometry { get; set; }
         public string RechargeColorMap { get; set; }
 

WorkerService1/WebApplication3/Models/AquiferContext.cs

@@ -74,6 +74,9 @@ namespace WebApplication3.Models
 
                 entity.Property(e => e.WorldOriginX).HasColumnName("world_origin_x");
                 entity.Property(e => e.WorldOriginY).HasColumnName("world_origin_y");
+                entity.Property(e => e.Angle).HasColumnName("angle");
+                entity.Property(e => e.Length).HasColumnName("length");
+                entity.Property(e => e.Height).HasColumnName("height");
                 entity.Property(e => e.RechargeGeometry).HasColumnName("recharge_geometry");
                 entity.Property(e => e.RechargeColorMap).HasColumnName("recharge_color_map");
 

WorkerService1/WebApplication3/Program.cs

@@ -32,15 +32,21 @@ namespace WebApplication3
                     services.AddLogging();
                     services.AddHostedService<Worker>();
                     services.AddHostedService<QueueWorker>();
+
                 })
                 .ConfigureWebHostDefaults( webBuilder =>
                 {
                     webBuilder.UseStartup<Startup>();
+                    webBuilder.UseHttpSys(options =>
+                    {
+                        options.MaxRequestBodySize = 300_000_000;
+                    });
 
                 } ).ConfigureWebHost( config =>
                 {
                     config.UseUrls( "http://*:5050" );
 
+
                 } ).UseWindowsService();
 
     }

WorkerService1/WebApplication3/Startup.cs

@@ -13,7 +13,7 @@ using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using WebApplication3.Models;
-
+using Microsoft.AspNetCore.Http.Features;
 
 namespace WebApplication3
 {
@@ -32,6 +32,7 @@ namespace WebApplication3
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices( IServiceCollection services )
         {
+                     
             services.AddDbContext<AquiferContext>(opt =>
                        opt.UseMySql(Configuration.GetConnectionString("AquiferDatabase"), Microsoft.EntityFrameworkCore.ServerVersion.Parse("5.7.24-mysql"))
             );
@@ -41,11 +42,13 @@ namespace WebApplication3
              {
                  c.SwaggerDoc( "v1", new OpenApiInfo { Title = "WebApplication3", Version = "v1" } );
              } );
+
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
         public void Configure( IApplicationBuilder app, IWebHostEnvironment env )
         {
+            
             if( env.IsDevelopment() )
             {
                 app.UseDeveloperExceptionPage();
@@ -63,6 +66,7 @@ namespace WebApplication3
              {
                  endpoints.MapControllers();
              } );
+
         }
     }
 }