From db7f4092cb32d868af04dcc6e80d801a841632ed Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Sun, 26 Sep 2021 01:58:26 +0200
Subject: [PATCH 1/2] Parametros de configuracion y valores por defecto

---
 .gitignore                                    |   1 +
 Model/OliviaConf.cs                           | 655 +++++++++++++++++-
 OliviaAddInPro.csproj                         |   6 +
 Services/ConfigServ.cs                        | 238 ++++++-
 .../Configuracion/PaneConfigViewModel.cs      |   1 +
 packages.config                               |   4 +
 6 files changed, 880 insertions(+), 25 deletions(-)
 create mode 100644 packages.config

diff --git a/.gitignore b/.gitignore
index 1362a34..32a63cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /.vs/*
 /bin/*
 /obj/*
+/packages/*
diff --git a/Model/OliviaConf.cs b/Model/OliviaConf.cs
index 4d0a576..2ce0f50 100644
--- a/Model/OliviaConf.cs
+++ b/Model/OliviaConf.cs
@@ -7,14 +7,9 @@ using System.Threading.Tasks;
 
 namespace OliviaAddInPro.Model
 {
+    [Serializable]
     class OliviaConf
     {
-        private static OliviaConf conf=null;
-
-        public OliviaConf()
-        {
-
-        }
         #region PropiedadesOcultas
 
         #region Paths
@@ -31,8 +26,95 @@ namespace OliviaAddInPro.Model
         public string path_data { get; set; }
 
         #endregion
+        #region FILTROS_LIMP
+        [Browsable(false)]
+        public string ejes { get; set; }
+        [Browsable(false)]
+        public string bord_libre_mec { get; set; }
+        [Browsable(false)]
+        public string bord_libre_no_mec { get; set; }
+        [Browsable(false)]
+        public string bord_aparc { get; set; }
+        [Browsable(false)]
+        public string bord_acera_mec { get; set; }
+        [Browsable(false)]
+        public string bord_acera_no_mec { get; set; }
+        [Browsable(false)]
+        public string calle_peat_mec { get; set; }
+        [Browsable(false)]
+        public string calle_peat_no_mec { get; set; }
+        [Browsable(false)]
+        public string caida_hoja_mec { get; set; }
+        [Browsable(false)]
+        public string caida_hoja_no_mec { get; set; }
+        [Browsable(false)]
+        public string contenedores { get; set; }
+        [Browsable(false)]
+        public string pape { get; set; }
+        [Browsable(false)]
+        public string zon_inf { get; set; }
+        [Browsable(false)]
+        public string pipican { get; set; }
+        [Browsable(false)]
+        public string sanecan { get; set; }
+
+
+    #endregion
+    #region PARAM_LIMP_Ocult
+    [Browsable(false)]
+        public int t_tratamiento_max { get; set; }
+        [Browsable(false)]
+        public int t_tratamiento_min { get; set; }
+        [Browsable(false)]
+        public int v_desplaz_max { get; set; }
+        [Browsable(false)]
+        public int v_desplaz_min { get; set; }
+        [Browsable(false)]
+        public int t_carga_desc_max { get; set; }
+        [Browsable(false)]
+        public int t_carga_desc_min { get; set; }
+        [Browsable(false)]
+        public int t_desplaz_max { get; set; }
+        [Browsable(false)]
+        public int t_desplaz_min { get; set; }
+        [Browsable(false)]
+        public int t_convenio_max { get; set; }
+        [Browsable(false)]
+        public int t_convenio_min { get; set; }
+        [Browsable(false)]
+        public int t_descanso_max { get; set; }
+        [Browsable(false)]
+        public int t_descanso_min { get; set; }
+        [Browsable(false)]
+        public int ancho_via_max { get; set; }
+        [Browsable(false)]
+        public int ancho_via_min { get; set; }
 
         #endregion
+        #region ParametrosReco_Ocultos
+        [Browsable(false)]
+        public int t_vaciado_max { get; set; }
+        [Browsable(false)]
+        public int t_vaciado_min { get; set; }
+        [Browsable(false)]
+        public int t_llega_sale_max { get; set; }
+        [Browsable(false)]
+        public int t_llega_sale_min { get; set; }
+        [Browsable(false)]
+        public int t_descarga_max { get; set; }
+        [Browsable(false)]
+        public int t_descarga_min { get; set; }
+        [Browsable(false)]
+        public int R_t_convenio_max { get; set; }
+        [Browsable(false)]
+        public int R_t_convenio_min { get; set; }
+        [Browsable(false)]
+        public int R_t_descanso_max { get; set; }
+        [Browsable(false)]
+        public int R_t_descanso_min { get; set; }
+        #endregion
+        #endregion
+        #region General
         [Category("General")]
         [DisplayName("Red de carreteras")]
         [Description("Red de carreteras que se usara para la navegación")]
@@ -47,7 +129,9 @@ namespace OliviaAddInPro.Model
         [DisplayName("Buffer de exportado (m)")]
         [Description("Buuffer extra, en metros, que se va a exportar de la red de carreteras")]
         public int buffer_export { get; set; }
-
+        #endregion
+        
+        #region CAPAS_GENERALES
         [Category("Capas Generales")]
         [DisplayName("Eje de via")]
         [Description("Capa de eje de via que se usara")]
@@ -57,7 +141,8 @@ namespace OliviaAddInPro.Model
         [DisplayName("Capa municipios")]
         [Description("Capa municipios")]
         public string municipios { get; set; }
-
+        #endregion
+        #region CAMPOS_LIMP
         [Category("Campos Limpieza")]
         [DisplayName("Tipo entidad")]
         [Description("Nombre del campo tipo de entidad")]
@@ -82,6 +167,9 @@ namespace OliviaAddInPro.Model
         [DisplayName("Tipo de aparcamiento")]
         [Description("Nombre del campo que indica el tipo de aparcamiento")]
         public string cons_tipolo { get; set; }
+        #endregion
+
+        #region ATRIBUTOS_LIMP
 
         [Category("Atributos limpieza")]
         [DisplayName("Acera")]
@@ -91,7 +179,7 @@ namespace OliviaAddInPro.Model
         [Category("Atributos limpieza")]
         [DisplayName("Banda Aparcamiento")]
         [Description("Valor para el atributo banda de aparcamiento")]
-        public int atr_aparc { get; set; }
+        public string atr_aparc { get; set; }
 
         [Category("Atributos limpieza")]
         [DisplayName("Bordillo libre")]
@@ -111,7 +199,7 @@ namespace OliviaAddInPro.Model
         [Category("Atributos limpieza")]
         [DisplayName("Mecanizable")]
         [Description("Valor para el atributo de si es mecanizable")]
-        public int atr_mec_s { get; set; }
+        public string atr_mec_s { get; set; }
 
         [Category("Atributos limpieza")]
         [DisplayName("No mecanizable")]
@@ -136,7 +224,7 @@ namespace OliviaAddInPro.Model
         [Category("Atributos limpieza")]
         [DisplayName("Papelera")]
         [Description("Valor para el atributo papelera")]
-        public int atr_pape { get; set; }
+        public string atr_pape { get; set; }
 
         [Category("Atributos limpieza")]
         [DisplayName("Paso a nivel")]
@@ -156,7 +244,7 @@ namespace OliviaAddInPro.Model
         [Category("Atributos limpieza")]
         [DisplayName("Areas Terrizas")]
         [Description("Valor para el atributo areas terrizas")]
-        public int atr_terri { get; set; }
+        public string atr_terri { get; set; }
 
         [Category("Atributos limpieza")]
         [DisplayName("Ocio")]
@@ -181,7 +269,7 @@ namespace OliviaAddInPro.Model
         [Category("Atributos limpieza")]
         [DisplayName("Playa")]
         [Description("Valor para el atributo playa")]
-        public int atr_play { get; set; }
+        public string atr_play { get; set; }
 
         [Category("Atributos limpieza")]
         [DisplayName("Polideportivo")]
@@ -206,30 +294,551 @@ namespace OliviaAddInPro.Model
         [Category("Atributos limpieza")]
         [DisplayName("Aparcamiento en linea")]
         [Description("Valor para el atributo aparcamiento en linea")]
-        public int atr_ap_lin { get; set; }
+        public string atr_ap_lin { get; set; }
 
         [Category("Atributos limpieza")]
         [DisplayName("Aparacamiento en bateria")]
         [Description("Valor para el atributo aparcamiento en bateria")]
         public string atr_ap_bat { get; set; }
-        /*
-        [Category("Atributos limpieza")]
+        #endregion
+
+        #region PARAM_LIMP
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo jornada")]
+        [Description("Tiempo de la jornada en minutos")]
+        public int t_convenio { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo desplazamiento")]
+        [Description("Tiempo de desplazamiento en minutos")]
+        public int t_desplaz { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo de descarga")]
+        [Description("Tiempo de descarga en minutos")]
+        public int t_carga_desc { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo de Descanso")]
+        [Description("Tiempo de descanso en minutos")]
+        public int t_descanso { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Hora de inicio")]
+        [Description("Hora de inicio")]
+        public int hora_inicio { get; set; }    //ES UNA HORA, SON LOS MINUTOS DESDE LAS 00, PERO TIENE QUE APARECER CON FORMATO DE TIME 07:30, POR EJEMPLO
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Ancho via")]
+        [Description("Ancho via en metros")]
+        public int ancho_via { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo barrido manual")]
+        [Description("Tiempo tratamiento barrido manual")]
+        public int t_tratamiento_BarMan { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo barrido manual mantenimiento")]
+        [Description("Tiempo tratamiento barrido manual de mantenimiento")]
+        public int t_tratamiento_BarManMant { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("tiempo barrido manual motorizado")]
+        [Description("Tiempo de tratamiento de Barrido manual motorizado")]
+        public int t_tratamiento_BarMMot { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo barrido mecánico calzadas")]
+        [Description("Tiempo de tratamiento de Barrido mecánico de calzadas")]
+        public int t_tratamiento_BarMC { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo barrido mecánico aceras peatonales")]
+        [Description("Tiempo de tratamiento de Barrido mecánico de aceras peatonales")]
+        public int t_tratamiento_BarMAP { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo barrido mixto")]
+        [Description("Tiempo de tratamiento de barrido mixto")]
+        public int t_tratamiento_BarMix { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo baldeo manual")]
+        [Description("Tiempo de tratamiento de baldeo manual")]
+        public int t_tratamiento_BalMan { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo baldeo mecánico calzadas")]
+        [Description("Tiempo de tratamiento de Baldeo mecánico calzadas")]
+        public int t_tratamiento_BalMC { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo baldeo mecanico aceras peatonales")]
+        [Description("Tiempo de tratamiento de Baldeo mecánico aceras peatonales")]
+        public int t_tratamiento_BalMAP { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo baldeo mixto")]
+        [Description("Tiempo de tratamiento de baldeo mixto")]
+        public int t_tratamiento_BalMix { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo brigada limpieza")]
+        [Description("Tiempo de tratamiento de brigada limpieza")]
+        public int t_tratamiento_BL { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo caída hoja")]
+        [Description("Tiempo de tratamiento de caída de hoja")]
+        public int t_tratamiento_CH { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo vaciado papeleras")]
+        [Description("Tiempo de tratamiento de vaciado papeleras")]
+        public int t_tratamiento_VPap { get; set; }
+
+        [Category("Parametros limpieza")]
         [DisplayName("")]
         [Description("")]
-        public string puerto { get; set; }
+        public int t_tratamiento_LPap { get; set; }
 
-        [Category("Atributos limpieza")]
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo limpieza papeleras")]
+        [Description("Tiempo de tratamiento de limpieza papeleras")]
+        public int t_tratamiento_LC { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo limpieza contenedores")]
+        [Description("Tiempo de tratamiento de limpieza contenedores")]
+        public int t_tratamiento_LZI { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo limpieza pipicanes")]
+        [Description("Tiempo de tratamiento de Limpieza pipicanes")]
+        public int t_tratamiento_LPip { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Tiempo limpieza saneacanes")]
+        [Description("Tiempo de tratamiento de Limpieza sanecanes")]
+        public int t_tratamiento_LS { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. barrido manual")]
+        [Description("Velocidad de desplazamiento de barrido Manual")]
+        public int v_desp_BarMan { get; set; }
+        
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. barrido mantenimiento manual")]
+        [Description("Velocidad de desplazamiento de barrido mantenimiento manual")]
+        public int v_desp_BarManMant { get; set; }
+        
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. des. barrido manual motorizado")]
+        [Description("Velocidad de desplazamiento de Barrido manual motorizado")]
+        public int v_desp_BarMMot { get; set; }
+       
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. barrido mecánico calzadas")]
+        [Description("Velocidad de desplazamiento de barrido mecánico de calzadas")]
+        public int v_desp_BarMC { get; set; }
+        
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. barrido aceras peatonales")]
+        [Description("Velocidad de desplazamiento de barrido mecánico aceras peatonales")]
+        public int v_desp_BarMAP { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. barrido mixto")]
+        [Description("Velocidad de desplazamiento de barrido mixto")]
+        public int v_desp_BarMix { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. baldeo manual")]
+        [Description("Velocidad de desplazamiento de baldeo manual")]
+        public int v_desp_BalMan { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. baldeo mecánico calzadas")]
+        [Description("Velocidad de desplazamiento de baldeo mecánico de calzadas")]
+        public int v_desp_BalMC { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. baldeo aceras peatonales")]
+        [Description("Velocidad de desplazamiento de Baldeo_mecanico_aceras_peatonales")]
+        public int v_desp_BalMAP { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. baldeo mixto")]
+        [Description("Velocidad de desplazamiento de baldeo mixto")]
+        public int v_desp_BalMix { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("vel. desp. brigada limpieza")]
+        [Description("Velocidad de desplazamiento de brigada de limpieza")]
+        public int v_desp_BL { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. caída hoja")]
+        [Description("Velocidad de desplazamiento de Caída de hoja")]
+        public int v_desp_CH { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. vaciado papeleras")]
+        [Description("Velocidad de desplazamiento de vaciado de papeleras")]
+        public int v_desp_VPap { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("vel. desp. limpieza papeleras")]
+        [Description("Velocidad de desplazamiento de limpieza de papeleras")]
+        public int v_desp_LPap { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. limpieza contenedores")]
+        [Description("Velocidad de desplazamiento de Limpieza de contenedores")]
+        public int v_desp_LC { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. limpieza zonas infantiles")]
+        [Description("Velocidad de desplazamiento de Limpieza de zonas infantiles")]
+        public int v_desp_LZI { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. limpieza pipicanes")]
+        [Description("Velocidad de desplazamiento de Limpieza de pipicanes")]
+        public int v_desp_LPip { get; set; }
+
+        [Category("Parametros limpieza")]
+        [DisplayName("Vel. desp. limpieza saneacanes")]
+        [Description("Velocidad de desplazamiento de Limpieza de sanecanes")]
+        public int v_desp_LS { get; set; }
+
+        #endregion
+
+        #region OtrosParametros
+        [Category("Otros parametros")]
         [DisplayName("")]
         [Description("")]
-        public string puerto { get; set; }
+        public double Ancho_peat_def { get; set; }
 
-        /*
-        [Category("")]
+        [Category("Otros parametros")]
         [DisplayName("")]
         [Description("")]
-        public string puerto { get; set; }
+        public double Ancho_acera_def { get; set; }
 
-       }*/
+        [Category("Otros parametros")]
+        [DisplayName("")]
+        [Description("")]
+        public double Ancho_ap_lin_def { get; set; }
+
+        [Category("Otros parametros")]
+        [DisplayName("")]
+        [Description("")]
+        public double Ancho_ap_bat_def { get; set; }
+
+        [Category("Otros parametros")]
+        [DisplayName("")]
+        [Description("")]
+        public double Ancho_bord_lib_def { get; set; }
+
+        [Category("Otros parametros")]
+        [DisplayName("")]
+        [Description("")]
+        public double Desv_max { get; set; }
+
+        [Category("Otros parametros")]
+        [DisplayName("")]
+        [Description("")]
+        public double Desv_max_abs { get; set; }
+
+        [Category("Otros parametros")]
+        [DisplayName("")]
+        [Description("")]
+        public double Giro_max_vehiculo { get; set; }
+        #endregion
+        #region CamposRecogida
+
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public string id { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public string nomrec { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public string lateralidad { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public string frac { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public string capac { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public string uds { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public string kgrec { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int kgrec_val { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int is_lleno { get; set; }
+        [Category("Campos Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int is_campo { get; set; }
+        #endregion
+        #region AtributosRecogida
+        [Category("Atributos recogida")]
+        [DisplayName("Organica")]
+        [Description("Atributo organica")]
+        public string organica { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Resto")]
+        [Description("Atributo resto")]
+        public string resto { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Envases")]
+        [Description("Atributo envases")]
+        public string envase { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Papel")]
+        [Description("Atributo de papel")]
+        public string papel { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Vidrio")]
+        [Description("Atributo de vidrio")]
+        public string vidrio { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Carga trasera")]
+        [Description("Atributo de carga trasera")]
+        public string trasera { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Carga lateral")]
+        [Description("Atributo de carga lateral")]
+        public string lateral { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Carga superior")]
+        [Description("Atributo de carga superior")]
+        public string superior { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Bilateral")]
+        [Description("Atributo de carga bilateral")]
+        public string bilat { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Bolseo")]
+        [Description("Atributo de bolseo")]
+        public string bolseo { get; set; }
+        [Category("Atributos recogida")]
+        [DisplayName("Lavado")]
+        [Description("Atributo lavado")]
+        public string lavado { get; set; }
+        #endregion
+        #region AtributosCargaLateral
+        [Category("Atributos Carga lateral")]
+        [DisplayName("Carga ambos")]
+        [Description("Atributo para carga por ambos lados")]
+        public string ambos { get; set; }
+        [Category("Atributos Carga lateral")]
+        [DisplayName("Carga derecha")]
+        [Description("Atributo para carga derecha")]
+        public string derecha { get; set; }
+        [Category("Atributos Carga lateral")]
+        [DisplayName("Carga izquierda")]
+        [Description("Atributo para carga izquierda")]
+        public string izquierda { get; set; }
+        #endregion
+
+        #region ParametrosRecogida
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_llega_sale { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_descarga { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int R_t_convenio { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int R_t_descanso { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int R_hora_inicio { get; set; } 	//ES UNA HORA, SON LOS MINUTOS DESDE LAS 00, PERO TIENE QUE APARECER CON FORMATO DE TIME 07:30, POR EJEMPLO
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_vehi_org { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_vehi_res { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_vehi_env { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_vehi_pap { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_vehi_vid { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_vehi_otr { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_cont_org { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_cont_res { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_cont_env { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_cont_pap { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_cont_vid { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int dens_cont_otr { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public double anch_vehi_3 { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public double anch_vehi_2 { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public double anch_vehi_s { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public double radio_giro_3 { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public double radio_giro_2 { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public double radio_giro_s { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_vaci_trasera { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_vaci_lateral { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_vaci_superior { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_vaci_bilateral { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_vaci_bolseo { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_vaci_lavado { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int t_vaci_otra { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int kgmax_max { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int kgmax_min { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int carga_max_max { get; set; }
+        [Category("Parametros Recogida")]
+        [DisplayName("")]
+        [Description("")]
+        public int carga_max_min { get; set; }
+
+        #endregion
+
+        #region CambosNW
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public string cons_onew { get; set; }
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public string cons_kph { get; set; }
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public string cons_fow { get; set; }
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public string cons_name { get; set; }
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public string atr_TF { get; set; }
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public string atr_FT { get; set; }
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public string atr_N { get; set; }
+        [Category("Campos network")]
+        [DisplayName("")]
+        [Description("")]
+        public int atr_pedes { get; set; }
+        
+        #endregion
 
     }
 }
diff --git a/OliviaAddInPro.csproj b/OliviaAddInPro.csproj
index 356689b..f19240f 100644
--- a/OliviaAddInPro.csproj
+++ b/OliviaAddInPro.csproj
@@ -42,6 +42,9 @@
     <PlatformTarget>AnyCPU</PlatformTarget>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -322,6 +325,9 @@
   <ItemGroup>
     <Resource Include="View\OliviaIconPro.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!--
   PackageAction can be:
diff --git a/Services/ConfigServ.cs b/Services/ConfigServ.cs
index 6a1e92b..9df6dc6 100644
--- a/Services/ConfigServ.cs
+++ b/Services/ConfigServ.cs
@@ -4,13 +4,17 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using System.IO;
+using Newtonsoft.Json;
 
 namespace OliviaAddInPro.Services
 {
     class ConfigServ
     {
+        private static string pathConfig = "F:\\temp\\olv\\olv.conf";
         private static ConfigServ configServ=null;
 
+        
         public static ConfigServ Serv
         {
             get {
@@ -22,13 +26,243 @@ namespace OliviaAddInPro.Services
 
         public OliviaConf Leer()
         {
-            return new OliviaConf();
+            OliviaConf res = null;
+            try
+            {
+                res= JsonConvert.DeserializeObject<OliviaConf>(File.ReadAllText(pathConfig));
+            }catch(Exception e)
+            {
+                var ee = e;
+                res = null;
+            }
+            if(res==null)
+                res = Default();
+
+            return res;
         }
 
         public void Guardar(OliviaConf conf)
         {
-
+            string  jsonString = JsonConvert.SerializeObject(conf);
+            File.WriteAllText(pathConfig, jsonString);
         }
 
+        private OliviaConf Default()
+        {
+            var c= new OliviaConf();
+            c.red_carreteras = @"C:\Proyectos\Olivia\Datos\gdbs\TomTom_Q4_2015.gdb";
+            c.puerto = 19995;
+            c.buffer_export = 1000;
+            c.path_work = "C:\\Olivia\\";
+            c.path_exe=@"%dir_work%bin\OliviaTasks.exe";
+            c.path_temp = @"%dir_work%temp\";
+            c.path_data=@"%dir_work%data\";
+
+            c.eje_via = "TomTom_Q4_2015___nw";
+            c.municipios = "TomTom_Q4_2015___a8";
+
+            c.cons_tip_ent= "NOM_TIPO_ENTIDAD";
+            c.cons_mecaniz= "MECANIZABLE";
+            c.cons_obser= "OBSERVACIONES";
+            c.cons_anch_tip= "ANCHO_TIPO";
+            c.cons_tipolo= "TIPOLOGIA";
+
+            c.atr_acera="Aceras";
+            c.atr_aparc="Banda Aparcamiento";
+            c.atr_bord="Bordillo Libre";
+            c.atr_hoja="Caida Hoja";
+            c.atr_peat="Peatonales";
+            c.atr_mec_s="Si";
+            c.atr_mec_n="No";
+            c.atr_esca="Escaleras";
+            c.atr_fuent="Fuentes";
+            c.atr_infan="JuegosInfantiles";
+            c.atr_pape="Papelera";
+            c.atr_paso_niv="Paso_Dist_Nivel";
+            c.atr_pipi="Pipican";
+            c.atr_sane="Sanecan";
+            c.atr_terri="Areas Terrizas";
+            c.atr_ocio="Ocio";
+            c.atr_org_ofi="Organismos_Oficiales";
+            c.atr_parq="Parques";
+            c.atr_park="Parquin";
+            c.atr_play="Playa";
+            c.atr_polid="Polideportivo";
+            c.atr_turis="Puntos_Interes_Turistico";
+            c.atr_solar="Solares";
+            c.atr_suelo="Uso_Suelos";
+            c.atr_ap_lin="Linea";
+            c.atr_ap_bat="Bateria";
+
+            c.ejes = "";
+            c.bord_libre_mec=@"NOM_TIPO_ENTIDAD = 'Bordillo Libre' AND MECANIZABLE = 'Si'";
+            c.bord_libre_no_mec= @"NOM_TIPO_ENTIDAD = 'Bordillo Libre' AND MECANIZABLE = 'No'";
+            c.bord_aparc= @"NOM_TIPO_ENTIDAD = 'Banda Aparcamiento'";
+            c.bord_acera_mec= @"NOM_TIPO_ENTIDAD = 'Aceras' AND MECANIZABLE = 'Si'";
+            c.bord_acera_no_mec= @"NOM_TIPO_ENTIDAD = 'Aceras' AND MECANIZABLE = 'No'";
+            c.calle_peat_mec= @"NOM_TIPO_ENTIDAD = 'Peatonales' AND MECANIZABLE = 'Si'";
+            c.calle_peat_no_mec= @"NOM_TIPO_ENTIDAD = 'Peatonales' AND MECANIZABLE = 'No'";
+            c.caida_hoja_mec= @"NOM_TIPO_ENTIDAD = 'Caida Hoja' AND MECANIZABLE = 'Si'";
+            c.caida_hoja_no_mec= @"NOM_TIPO_ENTIDAD = 'Caida Hoja' AND MECANIZABLE = 'No'";
+            c.contenedores = "";
+            c.pape= @"NOM_TIPO_ENTIDAD = 'Papelera'";
+            c.zon_inf= @"NOM_TIPO_ENTIDAD = 'JuegosInfantiles'";
+            c.pipican= @"NOM_TIPO_ENTIDAD = 'Pipican'";
+            c.sanecan= @"NOM_TIPO_ENTIDAD = 'Sanecan'";
+
+
+            c.t_tratamiento_max = 40000;
+            c.t_tratamiento_min=0;
+            c.v_desplaz_max=40000;
+            c.v_desplaz_min=0;
+            c.t_carga_desc_max=40000;
+            c.t_carga_desc_min=0;
+            c.t_desplaz_max=40000;
+            c.t_desplaz_min=0;
+            c.t_convenio_max=40000;
+            c.t_convenio_min=0;
+            c.t_descanso_max=40000;
+            c.t_descanso_min=0;
+            c.ancho_via_max=2000;
+            c.ancho_via_min=0;
+
+            c.t_convenio=480;
+            c.t_desplaz=25;
+            c.t_carga_desc=40;
+            c.t_descanso=30;
+            c.hora_inicio=420; 	//ES UNA HORA, SON LOS MINUTOS DESDE LAS 00, PERO TIENE QUE APARECER CON FORMATO DE TIME 07:30, POR EJEMPLO
+            c.ancho_via=2;
+            c.t_tratamiento_BarMan=2900;
+            c.t_tratamiento_BarManMant=2900;
+            c.t_tratamiento_BarMMot=3500;
+            c.t_tratamiento_BarMC=4000;
+            c.t_tratamiento_BarMAP=4200;
+            c.t_tratamiento_BarMix=5600;
+            c.t_tratamiento_BalMan=4000;
+            c.t_tratamiento_BalMC=5000;
+            c.t_tratamiento_BalMAP=4200;
+            c.t_tratamiento_BalMix=5600;
+            c.t_tratamiento_BL=4000;
+            c.t_tratamiento_CH=5600;
+            c.t_tratamiento_VPap=1;
+            c.t_tratamiento_LPap=5;
+            c.t_tratamiento_LC=5;
+            c.t_tratamiento_LZI=30;
+            c.t_tratamiento_LPip=30;
+            c.t_tratamiento_LS=5;
+            c.v_desp_BarMan=5;
+            c.v_desp_BarManMant=5;
+            c.v_desp_BarMMot=25;
+            c.v_desp_BarMC=15;
+            c.v_desp_BarMAP=15;
+            c.v_desp_BarMix=15;
+            c.v_desp_BalMan=15;
+            c.v_desp_BalMC=0;
+            c.v_desp_BalMAP=15;
+            c.v_desp_BalMix=15;
+            c.v_desp_BL=5;
+            c.v_desp_CH=15;
+            c.v_desp_VPap=0;
+            c.v_desp_LPap=0;
+            c.v_desp_LC=0;
+            c.v_desp_LZI=0;
+            c.v_desp_LPip=0;
+            c.v_desp_LS=0;
+
+            c.Giro_max_vehiculo=175.0000000;
+            c.Ancho_peat_def=6.0000000;
+            c.Ancho_acera_def=1.5000000;
+            c.Ancho_ap_lin_def=2.0000000;
+            c.Ancho_ap_bat_def=4.0000000;
+            c.Ancho_bord_lib_def=1.5000000;
+            c.Desv_max=0.1500000;
+            c.Desv_max_abs=1800.0000000;
+            
+            //Reco
+            c.id= "OBJECTID";
+            c.nomrec= "NOMB_TIP_REC";
+            c.lateralidad= "LATERALIDAD";
+            c.frac= "FRACCION";
+            c.capac= "CAPACIDAD";
+            c.uds= "UNIDADES";
+            c.kgrec= "KGRECO";
+            c.kgrec_val=200;
+            c.is_lleno=0;
+            c.is_campo=0;
+            
+            //AtriReco
+            c.organica= "Organica";
+            c.resto= "Resto";
+            c.envase= "Envases";
+            c.papel= "PapelCarton";
+            c.vidrio= "Vidrio";
+            c.trasera= "Carga Trasera";
+            c.lateral= "Carga Lateral";
+            c.superior= "Carga Superior";
+            c.bilat= "Carga Bilateral";
+            c.bolseo= "Bolseo";
+            c.lavado= "Lavado de cont";
+
+            //lateral---
+            c.ambos= "Ambos";
+            c.derecha= "Derecha";
+            c.izquierda="Izquierda";
+
+            //RecoParam
+            c.t_vaciado_max=40000;
+            c.t_vaciado_min=0;
+            c.t_llega_sale_max=40000;
+            c.t_llega_sale_min=0;
+            c.t_descarga_max=40000;
+            c.t_descarga_min=0;
+            c.R_t_convenio_max = 40000;
+            c.R_t_convenio_min = 0;
+            c.R_t_descanso_max = 40000;
+            c.R_t_descanso_min = 0;
+            c.t_llega_sale=5;
+            c.t_descarga=40;
+            c.R_t_convenio = 480;
+            c.R_t_descanso = 30;
+            c.R_hora_inicio = 420;	//ES UNA HORA, SON LOS MINUTOS DESDE LAS 00, PERO TIENE QUE APARECER CON FORMATO DE TIME 07:30, POR EJEMPLO
+            c.dens_vehi_org=500;
+            c.dens_vehi_res=500;
+            c.dens_vehi_env=120;
+            c.dens_vehi_pap=250;
+            c.dens_vehi_vid=350;
+            c.dens_vehi_otr=100;
+            c.dens_cont_org=150;
+            c.dens_cont_res=100;
+            c.dens_cont_env=28;
+            c.dens_cont_pap=90;
+            c.dens_cont_vid=250;
+            c.dens_cont_otr=100;
+            c.anch_vehi_3=2.4000000;
+            c.anch_vehi_2=2.2000000;
+            c.anch_vehi_s=2.0000000;
+            c.radio_giro_3=175.0000000;
+            c.radio_giro_2=175.0000000;
+            c.radio_giro_s=175.0000000;
+            c.t_vaci_trasera=30;
+            c.t_vaci_lateral=90;
+            c.t_vaci_superior=180;
+            c.t_vaci_bilateral=100;
+            c.t_vaci_bolseo=5;
+            c.t_vaci_lavado=60;
+            c.t_vaci_otra=60;
+            c.kgmax_max=20000;
+            c.kgmax_min=0;
+            c.carga_max_max=100;
+            c.carga_max_min=50;
+            //Campos NW
+            c.cons_onew="ONEWAY";
+            c.cons_kph="KPH";
+            c.cons_fow="FOW";
+            c.cons_name="NAME";
+            c.atr_TF="TF";
+            c.atr_FT="FT";
+            c.atr_N = "N";
+            c.atr_pedes=14;
+            return c;
+        }
     }
 }
diff --git a/ViewModel/Configuracion/PaneConfigViewModel.cs b/ViewModel/Configuracion/PaneConfigViewModel.cs
index 0e18d9e..3da223c 100644
--- a/ViewModel/Configuracion/PaneConfigViewModel.cs
+++ b/ViewModel/Configuracion/PaneConfigViewModel.cs
@@ -28,6 +28,7 @@ namespace OliviaAddInPro
             set 
             { 
                 base.SetProperty(ref conf, value, () => conf);
+                base.NotifyPropertyChanged("Configuracion");
                 //ConfiguracioProperty.Update();
              }
             
diff --git a/packages.config b/packages.config
new file mode 100644
index 0000000..bc2a97e
--- /dev/null
+++ b/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+</packages>
\ No newline at end of file

From 93b5ffc4fb5b7ad22e8548e0ba13fddabe3ef87e Mon Sep 17 00:00:00 2001
From: Gerardo <gerardo@narvaling.com>
Date: Mon, 27 Sep 2021 00:40:53 +0200
Subject: [PATCH 2/2] Inyeccion configuracion a parametros limpieza

---
 Model/OliviaConf.cs    | 150 +++++++++++++++++++++-------
 Model/OliviaGlob.cs    | 217 +++++++++++++++++++++--------------------
 Services/ConfigServ.cs |  39 +++++++-
 3 files changed, 260 insertions(+), 146 deletions(-)

diff --git a/Model/OliviaConf.cs b/Model/OliviaConf.cs
index 2ce0f50..4c5e524 100644
--- a/Model/OliviaConf.cs
+++ b/Model/OliviaConf.cs
@@ -92,6 +92,7 @@ namespace OliviaAddInPro.Model
 
         #endregion
         #region ParametrosReco_Ocultos
+        
         [Browsable(false)]
         public int t_vaciado_max { get; set; }
         [Browsable(false)]
@@ -113,6 +114,19 @@ namespace OliviaAddInPro.Model
         [Browsable(false)]
         public int R_t_descanso_min { get; set; }
         #endregion
+        #region OtrasConfiguraciones
+        [Browsable(false)]
+        public string PathGdbGen { get; set; }
+
+        [Browsable(false)]
+        public string PathCartela { get; set; }
+
+        [Browsable(false)]
+        public string PathSimbVSM { get; set; }
+
+        [Browsable(false)]
+        public string PathSimbESRI { get; set; }
+        #endregion
         #endregion
         #region General
         [Category("General")]
@@ -142,6 +156,19 @@ namespace OliviaAddInPro.Model
         [Description("Capa municipios")]
         public string municipios { get; set; }
         #endregion
+
+        #region CamposGenerales
+        [Category("Campos Generales")]
+        [DisplayName("Sector")]
+        [Description("Nombre del campo sector")]
+        public string consulta_sector { get; set; }
+
+        [Category("Campos Generales")]
+        [DisplayName("Secuencia")]
+        [Description("Nombre del campo secuencia")]
+        public string consulta_secuen { get; set; }
+
+        #endregion  
         #region CAMPOS_LIMP
         [Category("Campos Limpieza")]
         [DisplayName("Tipo entidad")]
@@ -521,87 +548,97 @@ namespace OliviaAddInPro.Model
 
         #region OtrosParametros
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Ancho calle peatonal")]
+        [Description("Ancho por defecto calle peatonal. En metros")]
         public double Ancho_peat_def { get; set; }
 
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Ancho Acera")]
+        [Description("Ancho de acera por defecto. En metros")]
         public double Ancho_acera_def { get; set; }
 
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Ancho aparcamiento linea")]
+        [Description("Ancho por defecto del aparcamiento en linea. En metros")]
         public double Ancho_ap_lin_def { get; set; }
 
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Ancho aparcamiento bateria")]
+        [Description("Ancho por defecto del aparcamiento en bateria. En metros")]
         public double Ancho_ap_bat_def { get; set; }
 
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Ancho bordillo libre")]
+        [Description("Ancho por defecto del bordillo libre. en metros")]
         public double Ancho_bord_lib_def { get; set; }
 
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Desviación máxima relativa")]
+        [Description("Desviacion maxima relativa permitida para la sectorización")]
         public double Desv_max { get; set; }
 
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Desviación maxima absoluta")]
+        [Description("Desviacion maxima absoluta permitida en la sectorización. en segundos")]
         public double Desv_max_abs { get; set; }
 
         [Category("Otros parametros")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Giro maximo vehículo")]
+        [Description("Giro maximo permitido al vehiculo. En grados")]
         public double Giro_max_vehiculo { get; set; }
         #endregion
         #region CamposRecogida
-
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public string id { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public string nomrec { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public string lateralidad { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public string frac { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public string capac { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public string uds { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public string kgrec { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public int kgrec_val { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public int is_lleno { get; set; }
+        [Browsable(false)]
         [Category("Campos Recogida")]
         [DisplayName("")]
         [Description("")]
         public int is_campo { get; set; }
+
         #endregion
         #region AtributosRecogida
         [Category("Atributos recogida")]
@@ -665,138 +702,172 @@ namespace OliviaAddInPro.Model
         #endregion
 
         #region ParametrosRecogida
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_llega_sale { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_descarga { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int R_t_convenio { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int R_t_descanso { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int R_hora_inicio { get; set; } 	//ES UNA HORA, SON LOS MINUTOS DESDE LAS 00, PERO TIENE QUE APARECER CON FORMATO DE TIME 07:30, POR EJEMPLO
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_vehi_org { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_vehi_res { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_vehi_env { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_vehi_pap { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_vehi_vid { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_vehi_otr { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_cont_org { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_cont_res { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_cont_env { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_cont_pap { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_cont_vid { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int dens_cont_otr { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public double anch_vehi_3 { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public double anch_vehi_2 { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public double anch_vehi_s { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public double radio_giro_3 { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public double radio_giro_2 { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public double radio_giro_s { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_vaci_trasera { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_vaci_lateral { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_vaci_superior { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_vaci_bilateral { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_vaci_bolseo { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_vaci_lavado { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int t_vaci_otra { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int kgmax_max { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int kgmax_min { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
         public int carga_max_max { get; set; }
+        [Browsable(false)]
         [Category("Parametros Recogida")]
         [DisplayName("")]
         [Description("")]
@@ -806,36 +877,41 @@ namespace OliviaAddInPro.Model
 
         #region CambosNW
         [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Sentido de la calle")]
+        [Description("Nombre de la columna que indica si la calle es de doble sentido o no.")]
         public string cons_onew { get; set; }
+
         [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Velocidad calle")]
+        [Description("Nombre de la columna que indica la velociad de la calle")]
         public string cons_kph { get; set; }
+
         [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Tipo calle")]
+        [Description("Nombre de la columna que india el tipo de calle.")]
         public string cons_fow { get; set; }
+
         [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+        [DisplayName("Nombre calle")]
+        [Description("Nombre de la columna que indica el nombre de la calle")]
         public string cons_name { get; set; }
-        [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+
+        [Category("Atributos network")]
+        [DisplayName("To-From")]
+        [Description("Valor que indica la dirección To-From")]
         public string atr_TF { get; set; }
-        [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+
+        [Category("Atributos network")]
+        [DisplayName("From-To")]
+        [Description("Valor que indica la dirección From-To")]
         public string atr_FT { get; set; }
-        [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+        [Category("Atributos network")]
+        [DisplayName("Sin circulación")]
+        [Description("Valor que indica no circulación")]
         public string atr_N { get; set; }
-        [Category("Campos network")]
-        [DisplayName("")]
-        [Description("")]
+        [Category("Atributos network")]
+        [DisplayName("Peatonal")]
+        [Description("Valor que indica que es calle peatonal")]
         public int atr_pedes { get; set; }
         
         #endregion
diff --git a/Model/OliviaGlob.cs b/Model/OliviaGlob.cs
index 00d7c6f..1d7f307 100644
--- a/Model/OliviaGlob.cs
+++ b/Model/OliviaGlob.cs
@@ -124,25 +124,26 @@ namespace OliviaAddInPro.Model
          */
         public static void IniDefault()
         {
-            Paths.PathWork = "C:\\Olivia\\";
-            Paths.PathExeOlivia = "C:\\Olivia\\release\\OliviaTasks.exe";
-            Paths.DirData = "C:\\Olivia\\data\\";
-            Paths.PathTemp = "C:\\Olivia\\temp\\";
-            Paths.PathCartela = "C:\\olivia\\data\\Plantilla.mxd";
+            var c = ConfigServ.Serv.Leer();
+            Paths.PathWork = c.path_work;
+            Paths.PathExeOlivia = c.path_exe;
+            Paths.DirData = c.path_data;
+            Paths.PathTemp = c.path_temp;
+            c.PathCartela = c.PathCartela;
 
-            Paths.PathGdbGen = "C:\\Olivia\\gdb\\BASE DE DATOS.gdb";
-            Paths.PathGdbNw = "C:\\Datos ejemplo\\BUENO\\Multinet_Q4_2015\\TomTom_Q4_2015.gdb";
-            Paths.PathSimbVSM = "C:\\Olivia\\styles\\Simbologia.style";
-            Paths.PathSimbESRI = "C:\\Olivia\\styles\\ESRI.style";
-            //puerto = 19995;
-            //buff_export = 1000;
+            Paths.PathGdbGen = c.PathGdbGen;
+            Paths.PathGdbNw = c.red_carreteras;
+            Paths.PathSimbVSM = c.PathSimbVSM;
+            Paths.PathSimbESRI = c.PathSimbESRI;
+            //puerto = c.puerto;
+            //buff_export = c.buffer_export;
 
             ///////////////////////////////////////
             //Capas, consultas y filtros GENERALES
-            /*Capas.ftclass_ejes = "TomTom_Q4_2015___nw";
+            /*Capas.ftclass_ejes = c.eje_via;
             Capas.ftclass_zonas = "SubNiveles";
             Capas.ftclass_restri = "TomTom_Q4_2015___rs";
-            Capas.ftclass_muni = "TomTom_Q4_2015___a8";*/
+            Capas.ftclass_muni = c.municipios;*/
 
             ///////////////////////////////////////
             //Capas, consultas, atributos y filtros de LIMPIEZA
@@ -152,106 +153,106 @@ namespace OliviaAddInPro.Model
             LimpiezaDef.Capas.ftclass_limp_mec = "b_LimpMececanica";
             LimpiezaDef.Capas.ftclass_instala = "c_Instalaciones";
 
-            LimpiezaDef.Campos.consulta_entidad = "NOM_TIPO_ENTIDAD";
-            LimpiezaDef.Campos.consulta_mecan = "MECANIZABLE";
-            LimpiezaDef.Campos.consulta_observ = "OBSERVACIONES";
-            LimpiezaDef.Campos.consulta_anch_tip = "ANCHO_TIPO";
-            LimpiezaDef.Campos.consulta_tipolo = "TIPOLOGIA";
-            LimpiezaDef.Campos.consulta_sector = "SECTOR";
-            LimpiezaDef.Campos.consulta_secuen = "SECUENCIA";
+            LimpiezaDef.Campos.consulta_entidad = c.cons_tip_ent;
+            LimpiezaDef.Campos.consulta_mecan = c.cons_mecaniz;
+            LimpiezaDef.Campos.consulta_observ = c.cons_obser;
+            LimpiezaDef.Campos.consulta_anch_tip = c.cons_anch_tip;
+            LimpiezaDef.Campos.consulta_tipolo = c.cons_tipolo;
+            LimpiezaDef.Campos.consulta_sector = c.consulta_sector;
+            LimpiezaDef.Campos.consulta_secuen = c.consulta_secuen;
 
-            LimpiezaDef.Atributos.atr_esca = "Escaleras";
-            LimpiezaDef.Atributos.atr_fuent = "Fuentes";
-            LimpiezaDef.Atributos.atr_infan = "JuegosInfantiles";
-            LimpiezaDef.Atributos.atr_pape = "Papelera";
-            LimpiezaDef.Atributos.atr_paso_niv = "Paso_Dist_Nivel";
-            LimpiezaDef.Atributos.atr_pipi = "Pipican";
-            LimpiezaDef.Atributos.atr_sane = "Sanecan";
-            LimpiezaDef.Atributos.atr_acera = "Aceras";
-            LimpiezaDef.Atributos.atr_aparc = "Banda Aparcamiento";
-            LimpiezaDef.Atributos.atr_bord = "Bordillo Libre";
-            LimpiezaDef.Atributos.atr_hoja = "Caida Hoja";
-            LimpiezaDef.Atributos.atr_peat = "Peatonales";
-            LimpiezaDef.Atributos.atr_terri = "Areas Terrizas";
-            LimpiezaDef.Atributos.atr_ocio = "Ocio";
-            LimpiezaDef.Atributos.atr_org_ofi = "Organismos_Oficiales";
-            LimpiezaDef.Atributos.atr_parq = "Parques";
-            LimpiezaDef.Atributos.atr_park = "Parquin";
-            LimpiezaDef.Atributos.atr_play = "Playa";
-            LimpiezaDef.Atributos.atr_polid = "Polideportivo";
-            LimpiezaDef.Atributos.atr_turis = "Puntos_Interes_Turistico";
-            LimpiezaDef.Atributos.atr_solar = "Solares";
-            LimpiezaDef.Atributos.atr_suelo = "Uso_Suelos";
-            LimpiezaDef.Atributos.atr_ap_lin = "Linea";
-            LimpiezaDef.Atributos.atr_ap_bat = "Bateria";
+            LimpiezaDef.Atributos.atr_esca = c.atr_esca;
+            LimpiezaDef.Atributos.atr_fuent = c.atr_fuent;
+            LimpiezaDef.Atributos.atr_infan = c.atr_infan;
+            LimpiezaDef.Atributos.atr_pape = c.atr_pape;
+            LimpiezaDef.Atributos.atr_paso_niv = c.atr_paso_niv;
+            LimpiezaDef.Atributos.atr_pipi = c.atr_pipi;
+            LimpiezaDef.Atributos.atr_sane = c.atr_sane;
+            LimpiezaDef.Atributos.atr_acera = c.atr_acera;
+            LimpiezaDef.Atributos.atr_aparc = c.atr_aparc;
+            LimpiezaDef.Atributos.atr_bord = c.atr_bord;
+            LimpiezaDef.Atributos.atr_hoja = c.atr_hoja;
+            LimpiezaDef.Atributos.atr_peat = c.atr_peat;
+            LimpiezaDef.Atributos.atr_terri = c.atr_terri;
+            LimpiezaDef.Atributos.atr_ocio = c.atr_ocio;
+            LimpiezaDef.Atributos.atr_org_ofi = c.atr_org_ofi;
+            LimpiezaDef.Atributos.atr_parq = c.atr_parq;
+            LimpiezaDef.Atributos.atr_park = c.atr_park;
+            LimpiezaDef.Atributos.atr_play = c.atr_play;
+            LimpiezaDef.Atributos.atr_polid = c.atr_polid;
+            LimpiezaDef.Atributos.atr_turis = c.atr_turis;
+            LimpiezaDef.Atributos.atr_solar = c.atr_solar;
+            LimpiezaDef.Atributos.atr_suelo = c.atr_suelo;
+            LimpiezaDef.Atributos.atr_ap_lin = c.atr_ap_lin;
+            LimpiezaDef.Atributos.atr_ap_bat = c.atr_ap_bat;
 
             //para el grupo PARAMETROS de LIMPIEZA
-            LimpiezaDef.Parametros.t_ttoM = 40000;
-            LimpiezaDef.Parametros.t_ttom = 0;
-            LimpiezaDef.Parametros.v_despM = 40000;
-            LimpiezaDef.Parametros.v_despm = 0;
-            LimpiezaDef.Parametros.t_cardescM = 40000;
-            LimpiezaDef.Parametros.t_cardescm = 0;
-            LimpiezaDef.Parametros.t_cardesc = 40;
-            LimpiezaDef.Parametros.t_despM = 40000;
-            LimpiezaDef.Parametros.t_despm = 0;
-            LimpiezaDef.Parametros.t_desp = 25;
-            LimpiezaDef.Parametros.t_convM = 40000;
-            LimpiezaDef.Parametros.t_convm = 0;
-            LimpiezaDef.Parametros.t_conv = 60 * 8;
-            LimpiezaDef.Parametros.t_descansoM = 40000;
-            LimpiezaDef.Parametros.t_descansom = 0;
-            LimpiezaDef.Parametros.t_descanso = 30;
-            LimpiezaDef.Parametros.h_inicio = 420;
-            LimpiezaDef.Parametros.ancho_viaM = 2000;
-            LimpiezaDef.Parametros.ancho_viam = 0;
-            LimpiezaDef.Parametros.ancho_via = 2;
-            LimpiezaDef.Parametros.ttoBarMan = 2900;
-            LimpiezaDef.Parametros.ttoBarManMant = 2900;
-            LimpiezaDef.Parametros.ttoBarMMot = 3500;
-            LimpiezaDef.Parametros.ttoBarMC = 4000;
-            LimpiezaDef.Parametros.ttoBarMAP = 4200;
-            LimpiezaDef.Parametros.ttoBarMix = 5600;
-            LimpiezaDef.Parametros.ttoBalMan = 4000;
-            LimpiezaDef.Parametros.ttoBalMC = 5000;
-            LimpiezaDef.Parametros.ttoBalMAP = 4200;
-            LimpiezaDef.Parametros.ttoBalMix = 5600;
-            LimpiezaDef.Parametros.ttoBL = 4000;
-            LimpiezaDef.Parametros.ttoCH = 5600;
-            LimpiezaDef.Parametros.ttoVPap = 1;
-            LimpiezaDef.Parametros.ttoLPap = 5;
-            LimpiezaDef.Parametros.ttoLC = 5;
-            LimpiezaDef.Parametros.ttoLZI = 30;
-            LimpiezaDef.Parametros.ttoLPip = 30;
-            LimpiezaDef.Parametros.ttoLS = 5;
-            LimpiezaDef.Parametros.vdespBarMan = 5;
-            LimpiezaDef.Parametros.vdespBarManMant = 5;
-            LimpiezaDef.Parametros.vdespBarMMot = 25;
-            LimpiezaDef.Parametros.vdespBarMC = 15;
-            LimpiezaDef.Parametros.vdespBarMAP = 15;
-            LimpiezaDef.Parametros.vdespBarMix = 15;
-            LimpiezaDef.Parametros.vdespBalMan = 15;
-            LimpiezaDef.Parametros.vdespBalMC = 0;
-            LimpiezaDef.Parametros.vdespBalMAP = 15;
-            LimpiezaDef.Parametros.vdespBalMix = 15;
-            LimpiezaDef.Parametros.vdespBL = 5;
-            LimpiezaDef.Parametros.vdespCH = 15;
-            LimpiezaDef.Parametros.vdespVPap = 0;
-            LimpiezaDef.Parametros.vdespLPap = 0;
-            LimpiezaDef.Parametros.vdespLC = 0;
-            LimpiezaDef.Parametros.vdespLZI = 0;
-            LimpiezaDef.Parametros.vdespLPip = 0;
-            LimpiezaDef.Parametros.vdespLS = 0;
+            LimpiezaDef.Parametros.t_ttoM = c.t_tratamiento_max;
+            LimpiezaDef.Parametros.t_ttom = c.t_tratamiento_min;
+            LimpiezaDef.Parametros.v_despM = c.v_desplaz_max;
+            LimpiezaDef.Parametros.v_despm = c.v_desplaz_min;
+            LimpiezaDef.Parametros.t_cardescM = c.t_carga_desc_max;
+            LimpiezaDef.Parametros.t_cardescm = c.t_carga_desc_min;
+            LimpiezaDef.Parametros.t_cardesc = c.t_carga_desc;
+            LimpiezaDef.Parametros.t_despM = c.t_carga_desc_max;
+            LimpiezaDef.Parametros.t_despm = c.t_carga_desc_min;
+            LimpiezaDef.Parametros.t_desp = c.t_desplaz;
+            LimpiezaDef.Parametros.t_convM = c.t_convenio_max;
+            LimpiezaDef.Parametros.t_convm = c.t_convenio_min;
+            LimpiezaDef.Parametros.t_conv = c.t_convenio;
+            LimpiezaDef.Parametros.t_descansoM = c.t_descanso_max;
+            LimpiezaDef.Parametros.t_descansom = c.t_descanso_min;
+            LimpiezaDef.Parametros.t_descanso = c.t_descanso;
+            LimpiezaDef.Parametros.h_inicio = c.hora_inicio;
+            LimpiezaDef.Parametros.ancho_viaM = c.ancho_via_max;
+            LimpiezaDef.Parametros.ancho_viam = c.ancho_via_min;
+            LimpiezaDef.Parametros.ancho_via = c.ancho_via;
+            LimpiezaDef.Parametros.ttoBarMan = c.t_tratamiento_BarMan;
+            LimpiezaDef.Parametros.ttoBarManMant = c.t_tratamiento_BarManMant;
+            LimpiezaDef.Parametros.ttoBarMMot = c.t_tratamiento_BarMMot;
+            LimpiezaDef.Parametros.ttoBarMC = c.t_tratamiento_BarMC;
+            LimpiezaDef.Parametros.ttoBarMAP = c.t_tratamiento_BarMAP;
+            LimpiezaDef.Parametros.ttoBarMix = c.t_tratamiento_BarMix;
+            LimpiezaDef.Parametros.ttoBalMan = c.t_tratamiento_BalMan;
+            LimpiezaDef.Parametros.ttoBalMC = c.t_tratamiento_BalMC;
+            LimpiezaDef.Parametros.ttoBalMAP = c.t_tratamiento_BalMAP;
+            LimpiezaDef.Parametros.ttoBalMix = c.t_tratamiento_BalMix;
+            LimpiezaDef.Parametros.ttoBL = c.t_tratamiento_BL;
+            LimpiezaDef.Parametros.ttoCH = c.t_tratamiento_CH;
+            LimpiezaDef.Parametros.ttoVPap = c.t_tratamiento_VPap;
+            LimpiezaDef.Parametros.ttoLPap = c.t_tratamiento_LPap;
+            LimpiezaDef.Parametros.ttoLC = c.t_tratamiento_LC;
+            LimpiezaDef.Parametros.ttoLZI = c.t_tratamiento_LZI;
+            LimpiezaDef.Parametros.ttoLPip = c.t_tratamiento_LPip;
+            LimpiezaDef.Parametros.ttoLS = c.t_tratamiento_LS;
+            LimpiezaDef.Parametros.vdespBarMan = c.v_desp_BarMan;
+            LimpiezaDef.Parametros.vdespBarManMant = c.v_desp_BarManMant;
+            LimpiezaDef.Parametros.vdespBarMMot = c.v_desp_BarMMot;
+            LimpiezaDef.Parametros.vdespBarMC = c.v_desp_BarMC;
+            LimpiezaDef.Parametros.vdespBarMAP = c.v_desp_BarMAP;
+            LimpiezaDef.Parametros.vdespBarMix = c.v_desp_BarMix;
+            LimpiezaDef.Parametros.vdespBalMan = c.v_desp_BalMan;
+            LimpiezaDef.Parametros.vdespBalMC = c.v_desp_BalMC;
+            LimpiezaDef.Parametros.vdespBalMAP = c.v_desp_BalMAP;
+            LimpiezaDef.Parametros.vdespBalMix = c.v_desp_BalMix;
+            LimpiezaDef.Parametros.vdespBL = c.v_desp_BL;
+            LimpiezaDef.Parametros.vdespCH = c.v_desp_CH;
+            LimpiezaDef.Parametros.vdespVPap = c.v_desp_VPap;
+            LimpiezaDef.Parametros.vdespLPap = c.v_desp_LPap;
+            LimpiezaDef.Parametros.vdespLC = c.v_desp_LC;
+            LimpiezaDef.Parametros.vdespLZI = c.v_desp_LZI;
+            LimpiezaDef.Parametros.vdespLPip = c.v_desp_LPip;
+            LimpiezaDef.Parametros.vdespLS = c.v_desp_LS;
             LimpiezaDef.Parametros.umbral_reco = 80;
 
-            LimpiezaDef.OtrosParam.giro_max = 175;
-            LimpiezaDef.OtrosParam.anch_peat = 6;
-            LimpiezaDef.OtrosParam.anch_ace = 1.5;
-            LimpiezaDef.OtrosParam.anch_aplin = 2;
-            LimpiezaDef.OtrosParam.anch_apbat = 4;
-            LimpiezaDef.OtrosParam.anch_bordlib = 1.5;
-            LimpiezaDef.OtrosParam.desv_max = 0.15;
-            LimpiezaDef.OtrosParam.desv_max_abs = 1800;
+            LimpiezaDef.OtrosParam.giro_max = c.Giro_max_vehiculo;
+            LimpiezaDef.OtrosParam.anch_peat = c.Ancho_peat_def;
+            LimpiezaDef.OtrosParam.anch_ace = c.Ancho_acera_def;
+            LimpiezaDef.OtrosParam.anch_aplin = c.Ancho_ap_lin_def;
+            LimpiezaDef.OtrosParam.anch_apbat = c.Ancho_ap_bat_def;
+            LimpiezaDef.OtrosParam.anch_bordlib = c.Ancho_bord_lib_def;
+            LimpiezaDef.OtrosParam.desv_max = c.Desv_max;
+            LimpiezaDef.OtrosParam.desv_max_abs = c.Desv_max_abs;
 
             ///////////////////////////////////////
             //Capas, consultas, atributos y filtros de RECOGIDA
diff --git a/Services/ConfigServ.cs b/Services/ConfigServ.cs
index 9df6dc6..e097697 100644
--- a/Services/ConfigServ.cs
+++ b/Services/ConfigServ.cs
@@ -13,7 +13,7 @@ namespace OliviaAddInPro.Services
     {
         private static string pathConfig = "F:\\temp\\olv\\olv.conf";
         private static ConfigServ configServ=null;
-
+        private static string nameDirWork = "%dir_work%"; 
         
         public static ConfigServ Serv
         {
@@ -38,18 +38,55 @@ namespace OliviaAddInPro.Services
             if(res==null)
                 res = Default();
 
+            res.path_exe = pon_path_absoluto(res.path_exe, res.path_work);
+            res.path_temp = pon_path_absoluto(res.path_temp, res.path_work);
+            res.path_data = pon_path_absoluto(res.path_data, res.path_work);
             return res;
         }
 
         public void Guardar(OliviaConf conf)
         {
+            conf.path_exe = pon_path_relativo(conf.path_exe, conf.path_work);
+            conf.path_temp = pon_path_relativo(conf.path_temp, conf.path_work);
+            conf.path_data = pon_path_relativo(conf.path_data, conf.path_work);
+
             string  jsonString = JsonConvert.SerializeObject(conf);
             File.WriteAllText(pathConfig, jsonString);
+
+            conf.path_exe = pon_path_absoluto(conf.path_exe, conf.path_work);
+            conf.path_temp = pon_path_absoluto(conf.path_temp, conf.path_work);
+            conf.path_data = pon_path_absoluto(conf.path_data, conf.path_work);
+        }
+        /**
+         * cambia la carpeta referida a directorio de trabajo por los caracteres OliviaDirWork (%dir_work%)
+         */
+        private string pon_path_relativo(string path, string DirWork)
+        {
+            if (DirWork == null || DirWork[0] == 0)
+                return path;
+            return path.Replace(nameDirWork, DirWork);
         }
 
+        /**
+         * cambia los caracteres OliviaDirWork (%dir_work%) por la ruta correspondiente en el disco duro
+         */
+        private string pon_path_absoluto(string path, string DirWork)
+        {
+            if (DirWork == null || DirWork[0] == 0)
+                return path;
+            return path.Replace(DirWork, nameDirWork);
+        }
         private OliviaConf Default()
         {
             var c= new OliviaConf();
+            c.PathGdbGen = "C:\\Olivia\\gdb\\BASE DE DATOS.gdb";
+            c.PathSimbVSM = "C:\\Olivia\\styles\\Simbologia.style";
+            c.PathSimbESRI = "C:\\Olivia\\styles\\ESRI.style";
+            c.PathCartela = "C:\\olivia\\data\\Plantilla.mxd";
+
+            c.consulta_sector = "SECTOR";
+            c.consulta_secuen = "SECUENCIA";
+
             c.red_carreteras = @"C:\Proyectos\Olivia\Datos\gdbs\TomTom_Q4_2015.gdb";
             c.puerto = 19995;
             c.buffer_export = 1000;