From 3b42f1b37912df4da45119a12caa7205bcb7a186 Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Wed, 22 Nov 2023 23:01:24 +0100
Subject: [PATCH] =?UTF-8?q?a=C3=B1adir=20comprobaciones=20de=20elevacion?=
 =?UTF-8?q?=20de=20manera=20estandar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Model/ComunDef.cs      |  2 ++
 Model/OliviaConfNW.cs  |  3 ++-
 Services/ConfigServ.cs |  6 +++++-
 Services/EjecServ.cs   | 22 ++++++++++++++++++++--
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/Model/ComunDef.cs b/Model/ComunDef.cs
index abe6a95..b13c4c0 100644
--- a/Model/ComunDef.cs
+++ b/Model/ComunDef.cs
@@ -24,6 +24,8 @@ namespace OliviaAddInPro.Model
             public static string cons_name="_dir";     //<Campo que indica el nombre de la calle
             public static string cons_fow="_pea";      //Campo que indica el tipo de vial, si es peatonal o no
             public static string cons_evit = "_evita";      //Campo que indica si el vial es evitable
+            public static string cons_ele_f = "_elev_f";      //altura from
+            public static string cons_ele_t = "_elev_t";      //altura to
             public static OliviaConfNW config;  //configuracion para sacar capmos por defecto
         };
 
diff --git a/Model/OliviaConfNW.cs b/Model/OliviaConfNW.cs
index 57009bc..4ca9f69 100644
--- a/Model/OliviaConfNW.cs
+++ b/Model/OliviaConfNW.cs
@@ -20,7 +20,8 @@ namespace OliviaAddInPro.Model
         public string campo_sentidoFT { get; set; }
         public string campo_sentidoTf { get; set; }
         public string campo_peatonal { get; set; }
-
+        public string campo_elevacion_to { get; set; }
+        public string campo_elevacion_from { get; set; }
         public bool comprueba_elevacion { get; set; }
         public bool revisa_topologia { get; set; }
     }
diff --git a/Services/ConfigServ.cs b/Services/ConfigServ.cs
index a886473..458d528 100644
--- a/Services/ConfigServ.cs
+++ b/Services/ConfigServ.cs
@@ -407,7 +407,9 @@ namespace OliviaAddInPro.Services
                 campo_peatonal= "IIf( $feature.FOW == 14 || $feature.ONEWAY == 'N', 1, 0)",
                 campo_sentidoFT= "IIF($feature.ONEWAY== 'FT' || $feature.ONEWAY == '', 1 , 0)",
                 campo_sentidoTf= "IIF($feature.ONEWAY == 'TF' || $feature.ONEWAY == '', 1, 0)",
-                comprueba_elevacion=true,
+                campo_elevacion_from= "$feature.F_ELEV",
+                campo_elevacion_to= "$feature.T_ELEV",
+                comprueba_elevacion =true,
                 revisa_topologia=false
             });
             c.ListaNw.Add(new OliviaConfNW()
@@ -418,6 +420,8 @@ namespace OliviaAddInPro.Services
                 campo_peatonal = "IIF( $feature.FT_RST_AUT == 'Y' && $feature.TF_RST_AUT == 'Y', 1, 0)",
                 campo_sentidoFT = "IIf( $feature.FT_RST_AUT == 'N', 1, 0)",
                 campo_sentidoTf = "IIf( $feature.TF_RST_AUT == 'N', 1, 0)",
+                campo_elevacion_from = "IIf( $feature.F_ZLEV != null, $feature.F_ZLEV, 0",
+                campo_elevacion_to = "IIf( $feature.T_ZLEV != null, $feature.T_ZLEV, 0",
                 comprueba_elevacion = false,
                 revisa_topologia = true
             });
diff --git a/Services/EjecServ.cs b/Services/EjecServ.cs
index 152a352..0f199ed 100644
--- a/Services/EjecServ.cs
+++ b/Services/EjecServ.cs
@@ -383,7 +383,7 @@ namespace OliviaAddInPro.Services
         }
         bool EstandarizaCamposNW(string pathNW)
         {
-            HelperGdb.FieldToAdd[] fields = new HelperGdb.FieldToAdd[6];
+            HelperGdb.FieldToAdd[] fields = new HelperGdb.FieldToAdd[8];
             //campo SECTOR
             int i = 0;
             fields[i].Name = ComunDef.CamposNW.cons_kph;
@@ -420,8 +420,20 @@ namespace OliviaAddInPro.Services
             fields[i].Alias = ComunDef.CamposNW.cons_name;
             fields[i].Tipo = "TEXT";
             fields[i].Length = 128;
+            i++;
+
+            fields[i].Name = ComunDef.CamposNW.cons_ele_f;
+            fields[i].Alias = ComunDef.CamposNW.cons_ele_f;
+            fields[i].Tipo = "FLOAT";
+            fields[i].Length = 0;
+            i++;
+            fields[i].Name = ComunDef.CamposNW.cons_ele_t;
+            fields[i].Alias = ComunDef.CamposNW.cons_ele_t;
+            fields[i].Tipo = "FLOAT";
+            fields[i].Length = 0;
+
+            i++;
 
-           
 
             if (!HelperGdb.AddFieldsSync(pathNW, fields))
                 return false;
@@ -436,6 +448,12 @@ namespace OliviaAddInPro.Services
                 return false;
             if (!HelperGdb.CalculateFieldsSync(pathNW, ComunDef.CamposNW.cons_onewFT, ComunDef.CamposNW.config.campo_sentidoFT))
                 return false;
+
+            if (!HelperGdb.CalculateFieldsSync(pathNW, ComunDef.CamposNW.cons_ele_t, ComunDef.CamposNW.config.campo_elevacion_to))
+                return false;
+            if (!HelperGdb.CalculateFieldsSync(pathNW, ComunDef.CamposNW.cons_ele_f, ComunDef.CamposNW.config.campo_elevacion_from))
+                return false;
+
             if (!HelperGdb.CalculateFieldsSync(pathNW, ComunDef.CamposNW.cons_evit, "0"))
                 return false;
             return true;