modos de viaje

Helper/HelperGdb.cs

@@ -467,7 +467,7 @@ namespace OliviaAddInPro.Helper
                     {
                         ftclss = dtset.OpenDataset<FeatureClass>(ftclassName);                        
                     }
-                    catch (Exception ex)
+                    catch/* (Exception ex)*/
                     {
                         ftclss = null;
                     }
@@ -478,7 +478,7 @@ namespace OliviaAddInPro.Helper
                     {
                         ftclss = gdb.OpenDataset<FeatureClass>(ftclassName);
                     }
-                    catch (Exception ex)
+                    catch /*(Exception ex)*/
                     {
                         ftclss = null;
                     }
@@ -526,7 +526,7 @@ namespace OliviaAddInPro.Helper
                         {
                             ftclss = dtset.OpenDataset<FeatureClass>(ftclassName);
                         }
-                        catch (Exception ex)
+                        catch /*(Exception ex)*/
                         {
                             ftclss = null;
                         }
@@ -537,7 +537,7 @@ namespace OliviaAddInPro.Helper
                         {
                             ftclss = gdb.OpenDataset<FeatureClass>(ftclassName);
                         }
-                        catch (Exception ex)
+                        catch /*(Exception ex)*/
                         {
                             ftclss = null;
                         }
@@ -1759,7 +1759,7 @@ namespace OliviaAddInPro.Helper
         {
             Respuesta<ArcGIS.Core.Geometry.Geometry> resp = new Respuesta<ArcGIS.Core.Geometry.Geometry>();
             double buffer = 0;//m de distancia desde la instalación
-            bool repite = true;
+            //bool repite = true;
             ArcGIS.Core.Geometry.Geometry geom_pto, geom_sal;
             try
             {
@@ -2070,7 +2070,7 @@ namespace OliviaAddInPro.Helper
                       MapView.Active.Map.RemoveLayer(lyr);
                 return true;
             }
-            catch (Exception ex)
+            catch/*(Exception ex)*/
             {
                 return false;
             }
@@ -2130,7 +2130,7 @@ namespace OliviaAddInPro.Helper
                 else
                     return string.Empty;
             }
-            catch(Exception ex)
+            catch/*(Exception ex)*/
             {
                 return string.Empty;
             }
@@ -2218,7 +2218,7 @@ namespace OliviaAddInPro.Helper
                         return 0;
                     return 2;
                 }
-                catch (Exception ex)
+                catch /*(Exception ex)*/
                 {
                     return 1;
                 }
@@ -2248,8 +2248,8 @@ namespace OliviaAddInPro.Helper
                     return res;
                 }
                 //comprueba si extiste ya el dataset
-                bool repite = false;
+                //bool repite = false;
-                bool crea = false;
+                //bool crea = false;
                 int idat = 1;
                 int r = 2;
                 bool refspatdif = false;
@@ -2361,7 +2361,7 @@ namespace OliviaAddInPro.Helper
                 var environments = Geoprocessing.MakeEnvironmentArray(outputCoordinateSystem: spatref);
                 //CancelableProgressorSource cps = new CancelableProgressorSource();
                 var _cts = new System.Threading.CancellationTokenSource();
-                var completa = false;
+                //var completa = false;
                 var gpres = Geoprocessing.ExecuteToolAsync("FeatureClassToFeatureClass_conversion", args, environments, _cts.Token, 
                                (event_name, o) =>  // implement delegate and handle events
                                {
@@ -2676,7 +2676,7 @@ namespace OliviaAddInPro.Helper
                     featureLayer.SetRenderer(uniqueValueRenderer);
 
                 }
-                catch (Exception ex)
+                catch /*(Exception ex)*/
                 {
 
                 }

Model/Limpieza.cs

@@ -65,6 +65,7 @@ namespace OliviaAddInPro.Model
 
             Respuesta<bool> res = new Respuesta<bool> { Value=false};
             Respuesta<TiposEjecucion> res2 = new Respuesta<TiposEjecucion> (){ Value = TiposEjecucion.FinEjecNOk };
+            Serv.TipoMv = TipoMV;
             res = Serv.Ejecuta(modo);            
 			if (res.Value)
             {

Model/OliviaConf.cs

@@ -202,6 +202,8 @@ namespace OliviaAddInPro.Model
         [Browsable(false)]
         public List<OliviaConfNW> ListaNw { get; set; }
         [Browsable(false)]
+        public List<OliviaConfMV> ListaMV { get; set; }
+        [Browsable(false)]
         public int t_vaciado_max { get; set; }
         [Browsable(false)]
         public int t_vaciado_min { get; set; }
@@ -244,7 +246,12 @@ namespace OliviaAddInPro.Model
         [Description("Red de carreteras que se usa para la navegación")]
         [Editor(typeof(PropertyGridFilePickerLine), typeof(PropertyGridFilePickerLine))]
         public string Path_Eje_via { get; set; }
-
+        [Category("General")]
+        [DisplayName("Conjunciones red de carreteras")]
+        [PropertyOrder(1)]
+        [Description("Conjunciones red de carreteras que se usa para la navegación")]
+        [Editor(typeof(PropertyGridFilePickerPto), typeof(PropertyGridFilePickerPto))]
+        public string Path_Conj_Eje_via { get; set; }
         [Category("General")]
         [DisplayName("Tipo Red de carreteras")]
         [PropertyOrder(1)]

Model/OliviaConfMV.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace OliviaAddInPro.Model
+{
+    [Serializable]
+    public class OliviaConfMV
+    {
+        public OliviaConfMV()
+        {
+        }
+
+        public string nombre { get; set; }
+        public string filtro_omitir { get; set; }
+        public string campo_prioridad { get; set; }
+    }
+}

Model/OliviaConfNW.cs

@@ -11,8 +11,8 @@ namespace OliviaAddInPro.Model
     public class OliviaConfNW
     {
         public OliviaConfNW()
-            {
+        {
-            }
+        }
 
         public string nombre { get; set; }
         public string campo_velocidad { get; set; }
@@ -24,5 +24,6 @@ namespace OliviaAddInPro.Model
         public string campo_elevacion_from { get; set; }
         public bool comprueba_elevacion { get; set; }
         public bool revisa_topologia { get; set; }
+        public bool revisa_conjunciones { get; set; }
     }
 }

Model/OliviaDef.cs

@@ -142,6 +142,7 @@ namespace OliviaAddInPro.Model
         public const string GG_pt   = "path_temp";
         public const string GG_pd   = "path_data";
         public const string GG_pn   = "path_nw";
+        public const string GG_pnj = "path_cnw";
         public const string GG_pcar = "path_cart";
         public const string GG_pcfg = "path_cfgeo";
         public const string GG_strtto = "str_tto";
@@ -162,6 +163,7 @@ namespace OliviaAddInPro.Model
         public const string GG_ais = "aislados";
         public const string GG_elev = "elevacion";
         public const string GG_topo = "reviTopo";
+        public const string GG_conj = "reviConj";
         /**
         * Define las propiedades de limpieza a enviar a oliviatasks
         */

Model/OliviaGlob.cs

@@ -51,10 +51,12 @@ namespace OliviaAddInPro.Model
             public static string DirData;           //<Dir donde están los shapefiles data y nw
             public static string PathData;          //<Path del shp con datos a planificar, ya filtrados e intersecados con las zonas y niveles
             public static string PathNW;            //<Path del shp con la red navegable
-
+            public static string PathNW_c;            //<Path del shp con las conjunciones de la red navegable
             //paths GDBs
             public static string PathGdbGen;        //<Path de la gdb general de la que se extraen los datos de interés
-            public static string PathGdbNw;         //<Path de la gdb referente a la red de carreteras de TOMTOM
+            public static string PathGdbNw;         //<Path de la gdb referente a la red de carreteras de
+            public static string PathGdbNw_conj;    //<Path de la gdb referente a las conjunciones de la red de carreteras
+
             public static string PathSimbVSM;       //<Path de la galeria de estilos aplicada por VSM
             public static string PathSimbESRI;       //<Path de la galeria de estilos de ESRI
 
@@ -84,8 +86,8 @@ namespace OliviaAddInPro.Model
         public struct Capas
         {
             public static string pathEjeVia;
-            public static string ftclass_ejes;      //<Nombre de la capa de ejes de carretera
+            //public static string ftclass_ejes;      //<Nombre de la capa de ejes de carretera
-            public static string ftclass_muni;      //<Nombre de la capa de municipios de TOMTOM
+            //public static string ftclass_muni;      //<Nombre de la capa de municipios de TOMTOM
         };
         private static TiposEjecucion tipoEjec;
         public static Limpieza limp;
@@ -390,7 +392,7 @@ namespace OliviaAddInPro.Model
          */
          public static void OpenManual()
         {
-            string[] archivos = null;
+            //string[] archivos = null;
 
             try
             {
@@ -430,6 +432,7 @@ namespace OliviaAddInPro.Model
 
             Paths.PathGdbGen = c.PathGdbGen;
             Paths.PathGdbNw = c.Path_Eje_via;
+            Paths.PathGdbNw_conj = c.Path_Conj_Eje_via;
             Paths.PathSimbVSM = c.PathSimbVSM;
             Paths.PathSimbESRI = c.PathSimbESRI;
             Conexion.Puerto = c.Puerto;
@@ -441,6 +444,7 @@ namespace OliviaAddInPro.Model
             //Capas.ftclass_ejes = c.eje_via;
             //Capas.ftclass_muni = c.municipios;
             Capas.pathEjeVia = c.Path_Eje_via;
+            //Capas.Path_Conj_Eje_via = c.Path_Conj_Eje_via;
             ///////////////////////////////////////
             //Capas, consultas, atributos y filtros de LIMPIEZA
             LimpiezaDef.Campos.consulta_entidad = c.cons_tip_ent;

Model/Recogida.cs

@@ -91,6 +91,7 @@ namespace OliviaAddInPro.Model
         {
             Respuesta<bool> res = new Respuesta<bool> { Value = false };
             Respuesta<TiposEjecucion> res2 = new Respuesta<TiposEjecucion>() { Value = TiposEjecucion.FinEjecNOk };
+            Serv.TipoMv = TipoMV;
             res = Serv.Ejecuta(modo);
             if (res.Value)
             {

Model/TratamientoComun.cs

@@ -25,6 +25,10 @@ namespace OliviaAddInPro.Model
          * String para Tipo de tratamiento, se guarda como columna en el shp
          */
         public string TipoTtoStr { get; set; } = String.Empty;
+        /**
+         * Tipo modo de viaje
+         */
+        public int TipoMV { get; set; } = 1;
         /**
          * Capa de ámbitos
          */
@@ -45,6 +49,7 @@ namespace OliviaAddInPro.Model
          * Nombre dle shp exportado de nw
          */
         public string NombreShpExportNw { get; set; } = string.Empty;
+        public string NombreShpExportNw_C { get; set; } = string.Empty;
         /**
          * Velocidad de desplazamiento, en km/h. Si es 0, es determinada por la vía
          */

Services/ConfigServ.cs

@@ -19,7 +19,7 @@ namespace OliviaAddInPro.Services
         public const string OlvRegKey = "SOFTWARE\\Narvaling\\Olivia_3_1";
         public const string OlvRegName = "workdir";
         public const string OlvConfigName = "olv.conf";
-        public const string VersionConfiguracion = "1.1.0.0";
+        public const string VersionConfiguracion = "1.1.0.2";
         public static ConfigServ Serv
         {
             get {
@@ -411,7 +411,8 @@ namespace OliviaAddInPro.Services
                 campo_elevacion_from= "$feature.F_ELEV",
                 campo_elevacion_to= "$feature.T_ELEV",
                 comprueba_elevacion =true,
-                revisa_topologia=false
+                revisa_topologia=false,
+                revisa_conjunciones = false
             });
             c.ListaNw.Add(new OliviaConfNW()
             {
@@ -424,7 +425,44 @@ namespace OliviaAddInPro.Services
                 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
+                revisa_topologia = false,
+                revisa_conjunciones = true
+            });
+            c.ListaMV = new List<OliviaConfMV>();
+            c.ListaMV.Add(new OliviaConfMV()
+            {
+                nombre = "Default",
+                filtro_omitir = "",
+                campo_prioridad = "0"
+            
+            });
+            c.ListaMV.Add(new OliviaConfMV()
+            {
+                nombre = "Peaton",
+                filtro_omitir = "",
+                campo_prioridad = "0"
+
+            });
+            c.ListaMV.Add(new OliviaConfMV()
+            {
+                nombre = "Vehiculo pequeño",
+                filtro_omitir = "",
+                campo_prioridad = "0"
+
+            });
+            c.ListaMV.Add(new OliviaConfMV()
+            {
+                nombre = "Vehiculo mediano",
+                filtro_omitir = "",
+                campo_prioridad = "0"
+
+            });
+            c.ListaMV.Add(new OliviaConfMV()
+            {
+                nombre = "Vehiculo grande",
+                filtro_omitir = "",
+                campo_prioridad = "0"
+
             });
             return c;
         }

Services/EjecServ.cs

@@ -28,6 +28,7 @@ namespace OliviaAddInPro.Services
         public string PREF_NAME_EXPORT = "data_";
         public string EXT_SHP = ".shp";
         public string PREF_NAME_EXPORT_NW = "nw_";
+        public string PREF_NAME_EXPORT_NW_CONJ = "nw_c_";
         public string NAME_CSV = "_L";
         public string EXT_CSV = ".csv";
         public string NAME_RUTA2 = "_R2";
@@ -42,9 +43,10 @@ namespace OliviaAddInPro.Services
         public string NAME_INSTAL = "_I";
         public string NAME_INSTAL_OUT = "_Instalacion";
 
+        public int TipoMv { get; set; }
         public string ErrStr = "";
         SpatialQueryFilter filtroEspacial = null;
-        SpatialReference spatRef = null;
+        //SpatialReference spatRef = null;
         SpatialReference spatRefData = null;
 
         public TratamientoComun com;
@@ -59,6 +61,7 @@ namespace OliviaAddInPro.Services
             ErrStr = string.Empty;
             OliviaGlob.Paths.PathData = string.Empty;
             OliviaGlob.Paths.PathNW = string.Empty;
+            OliviaGlob.Paths.PathNW_c= string.Empty;
             if (com.ProgrSrc._ProgrSrc.Getcancelled())
             {
                 ErrStr = Resource1.String_cancel_progreso;
@@ -366,6 +369,22 @@ namespace OliviaAddInPro.Services
                     ErrStr = Resource1.String_cancel_progreso;
                     return false;
                 }
+                com.NombreShpExportNw_C = PREF_NAME_EXPORT_NW_CONJ + fechaHora + EXT_SHP;
+                OliviaGlob.Paths.PathNW_c = OliviaGlob.Paths.DirData + com.NombreShpExportNw_C;
+                if (ComunDef.CamposNW.config.revisa_conjunciones)
+                {
+                    if (!HelperGdb.ExportShp2(OliviaGlob.Paths.PathGdbNw_conj, filtroEspacial, com.NombreShpExportNw_C, OliviaGlob.Paths.DirData, com.ProgrSrc._ProgrSrc, spatRefData, 100))
+                    {
+                        ErrStr = "Error al exportar la red navegable: " + HelperGdb.OutStr;
+                        return false;
+                    }
+                    if (com.ProgrSrc._ProgrSrc.Getcancelled())
+                    {
+                        ErrStr = Resource1.String_cancel_progreso;
+                        return false;
+                    }
+                }
+
                 //prepara campos estandar
                 if(!EstandarizaCamposNW(OliviaGlob.Paths.DirData+com.NombreShpExportNw))
                 {
@@ -685,7 +704,7 @@ namespace OliviaAddInPro.Services
                     {
                         return false;
                     }
-                    return true;
+                    //return true;
                 }
             }
         }
@@ -1140,6 +1159,11 @@ namespace OliviaAddInPro.Services
                 string capa_principal_nw = System.IO.Path.GetFileNameWithoutExtension(OliviaGlob.Paths.PathNW);
                 HelperGdb.CloseLayer(capa_principal_nw);
             }
+            if (!string.IsNullOrEmpty(OliviaGlob.Paths.PathNW_c))
+            {
+                string capa_principal_nw_c = System.IO.Path.GetFileNameWithoutExtension(OliviaGlob.Paths.PathNW_c);
+                HelperGdb.CloseLayer(capa_principal_nw_c);
+            }
         }
     }
 }

Services/FinProcServ.cs

@@ -162,7 +162,7 @@ namespace OliviaAddInPro.Services
         public static void BorraFiles()
         {
             string[] list = null;
-            string capa_principal, capa_principal_nw;
+            string capa_principal, capa_principal_nw, capa_principal_nw_c;
             if (!string.IsNullOrEmpty(OliviaGlob.Paths.PathData))
                 capa_principal = System.IO.Path.GetFileNameWithoutExtension(OliviaGlob.Paths.PathData);
             else
@@ -170,8 +170,11 @@ namespace OliviaAddInPro.Services
             if (!string.IsNullOrEmpty(OliviaGlob.Paths.PathNW))
                 capa_principal_nw = System.IO.Path.GetFileNameWithoutExtension(OliviaGlob.Paths.PathNW);
             else
-                capa_principal_nw = null;            
+                capa_principal_nw = null;
-
+            if (!string.IsNullOrEmpty(OliviaGlob.Paths.PathNW_c))
+                capa_principal_nw_c = System.IO.Path.GetFileNameWithoutExtension(OliviaGlob.Paths.PathNW_c);
+            else
+                capa_principal_nw_c = null;
             try
             {
                 if (capa_principal != null && HelperGdb.CloseLayer(capa_principal))
@@ -200,6 +203,19 @@ namespace OliviaAddInPro.Services
                         }
                     }
                 }
+                if (capa_principal_nw_c != null && HelperGdb.CloseLayer(capa_principal_nw_c))
+                {
+                    list = System.IO.Directory.GetFiles(OliviaGlob.Paths.DirData, capa_principal_nw_c + "*");
+                    if (list.Length > 0)
+                    {
+                        foreach (string f in list)
+                        {
+                            if (System.IO.Path.GetExtension(f) == ".lock")
+                                continue;
+                            System.IO.File.Delete(f);
+                        }
+                    }
+                }
             }
             catch (Exception ex)
             {
@@ -218,7 +234,7 @@ namespace OliviaAddInPro.Services
                 System.IO.Path.GetFileNameWithoutExtension(OliviaGlob.Paths.PathData) + inst.ServCom.NAME_CSV + ".*");
 
             string Title = "Directorio para guardar Secuencia de la Planificación";
-            string Filter = "Secuencia en formato CSV (*.csv)|*.csv";
+            //string Filter = "Secuencia en formato CSV (*.csv)|*.csv";
             inst.decode_gdb(System.IO.Path.GetFileNameWithoutExtension(OliviaGlob.Paths.PathData),
                     out auxi, out nombre);
             if (!string.IsNullOrEmpty(pathImport))

Services/LanzaSrv/LanzaLimpSrv.cs

@@ -82,6 +82,7 @@ namespace OliviaAddInPro.Services.LanzaSrv
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + (limp.IgnoAis ? 1 : 0) + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_elev + GeneralDef.EjecGeoParamIgual + (ComunDef.CamposNW.config.comprueba_elevacion ? 1 : 0) + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_topo + GeneralDef.EjecGeoParamIgual + (ComunDef.CamposNW.config.revisa_topologia ? 1 : 0) + " " +
+                GeneralDef.EjecGeoParamSep + GeneralDef.GG_conj + GeneralDef.EjecGeoParamIgual + (ComunDef.CamposNW.config.revisa_conjunciones ? 1 : 0) + " " +
                 //campos del dbf de limpieza para leer
                 GeneralDef.EjecGeoParamSep + GeneralDef.GAA_obser + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Campos.consulta_observ + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GAA_anch_tip + GeneralDef.EjecGeoParamIgual + LimpiezaDef.Campos.consulta_anch_tip + " " +

Services/LanzaSrv/LanzaOlvServ.cs

@@ -76,6 +76,7 @@ namespace OliviaAddInPro.Services.LanzaSrv
                 //paths de archivos
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_pd + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathData + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_pn + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathNW + " " +
+                GeneralDef.EjecGeoParamSep + GeneralDef.GG_pnj + GeneralDef.EjecGeoParamIgual + OliviaGlob.Paths.PathNW_c + " " +
                 //nombres de cols de sector y secuencia
                 GeneralDef.EjecGeoParamSep + GeneralDef.GTO_camp_sector + GeneralDef.EjecGeoParamIgual + ComunDef.CamposCom.consulta_sector + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GTO_camp_secuencia + GeneralDef.EjecGeoParamIgual + ComunDef.CamposCom.consulta_secuen + " " +

Services/LanzaSrv/LanzaRecoSrv.cs

@@ -93,6 +93,7 @@ namespace OliviaAddInPro.Services.LanzaSrv
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_ais + GeneralDef.EjecGeoParamIgual + (reco.IgnoAis?1:0) + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_elev + GeneralDef.EjecGeoParamIgual + (ComunDef.CamposNW.config.comprueba_elevacion ? 1 : 0) + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GG_topo + GeneralDef.EjecGeoParamIgual + (ComunDef.CamposNW.config.revisa_topologia ? 1 : 0) + " " +
+                GeneralDef.EjecGeoParamSep + GeneralDef.GG_conj + GeneralDef.EjecGeoParamIgual + (ComunDef.CamposNW.config.revisa_conjunciones ? 1 : 0) + " " +
                 GeneralDef.EjecGeoParamSep + GeneralDef.GR_lateral + GeneralDef.EjecGeoParamIgual + reco.TipoLate + " " +
                 //mima de la nw
                 GeneralDef.EjecGeoParamSep + GeneralDef.GTO_mima_xmin + GeneralDef.EjecGeoParamIgual + reco.MimaNw.XMin + " " +

Services/LimpiezaServ.cs

@@ -6,6 +6,7 @@ using OliviaAddInPro.Helper;
 using OliviaAddInPro.Model;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -105,7 +106,14 @@ namespace OliviaAddInPro.Services
 
             return consulta;
         }
+        public ObservableCollection<string> GetNombreModosViajes()
+        {
 
+            var conf=ConfigServ.Serv.Leer();
+            if(conf.ListaMV==null  || conf.ListaMV.Count<=0 )
+                return new ObservableCollection<string>();
+            return (ObservableCollection<string>)conf.ListaMV.Select(c => c.nombre);
+        }
         /**
          * Comprueba lo necesario para ver si hay campos para la planificación
          */
@@ -152,7 +160,7 @@ namespace OliviaAddInPro.Services
         public bool CompruebaCamposLimp(string pathCapa)
         {
             string[] camps = limp.GetCampos(pathCapa);
-            int res = 1;
+            //int res = 1;
             if ((camps == null) || (HelperGdb.CheckFileds(pathCapa, camps) != 0))
             {
                 ErrStr = HelperGdb.OutStr;

Services/ProcesoEjecServ.cs

@@ -14,11 +14,11 @@ namespace OliviaAddInPro.Services
     public class ProcesoEjecServ
     {
         Cstr_socket soc = null;
-        int m_out=0;
+        //int m_out=0;
         int m_miliseconds=200;
         int m_tm_progr=1000;
         int modo_fin = 0;
-        bool cancela = false;
+        //bool cancela = false;
         bool cancela_fin = false;
         bool conectado = false;
         bool permu = false;
@@ -509,7 +509,7 @@ namespace OliviaAddInPro.Services
          */
         private void pon_barstate(TiposActu actu)
         {
-            int col = 1;
+            //int col = 1;
 
            
              if ((actu == TiposActu.ActuMal) || (actu == TiposActu.ActuFinNOk))

View/Configuracion/PropertyGridFilePickerPto.xaml

@@ -0,0 +1,14 @@
+<UserControl x:Class="OliviaAddInPro.View.Configuracion.PropertyGridFilePickerPto"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:OliviaAddInPro.View.Configuracion"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800"
+             x:Name="TheControl">
+    <DockPanel>
+        <Button x:Name="PickFileButton" Content="…" Click="PickFileButton_Click" DockPanel.Dock="Right" Width="15" />
+        <TextBox Text="{Binding ElementName=TheControl, Path=Value}" />
+    </DockPanel>
+</UserControl>

View/Configuracion/PropertyGridFilePickerPto.xaml.cs

@@ -0,0 +1,65 @@
+using Microsoft.Win32;
+using OliviaAddInPro.Helper;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.PropertyGrid;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+using static OliviaAddInPro.Helper.HelperGdb;
+
+namespace OliviaAddInPro.View.Configuracion
+{
+    /// <summary>
+    /// Lógica de interacción para PropertyGridFilePicker.xaml
+    /// </summary>
+    public partial class PropertyGridFilePickerPto : ITypeEditor
+    {
+        public PropertyGridFilePickerPto()
+        {
+            InitializeComponent();
+        }
+        public string Value
+        {
+            get { return (string)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for Value.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register("Value", typeof(string), typeof(PropertyGridFilePickerPto), new PropertyMetadata(null));
+
+
+
+        public FrameworkElement ResolveEditor(PropertyItem propertyItem)
+        {
+            Binding binding = new Binding("Value");
+            binding.Source = propertyItem;
+            binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+            BindingOperations.SetBinding(this, ValueProperty, binding);
+            return this;
+        }
+
+        private void PickFileButton_Click(object sender, RoutedEventArgs e)
+        {
+            OpenFileDialog fd = new OpenFileDialog();
+            var st = HelperGdb.OpenFileDialog(TiposOpenFileDlg.OpenFtrClassPoint, Value);
+            if (!string.IsNullOrEmpty(st))
+            {
+                Value = st;
+            }
+        }
+    }
+
+    
+}

View/Limpieza/PaneLimpiezaSub1.xaml

@@ -32,8 +32,12 @@
             <ComboBox x:Name="comboBox_tto" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=TiposTto, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" 
                       VerticalAlignment="Top" Width="260" DropDownOpened="ComboBox_DropDownOpened" SelectionChanged="comboBox_tto_SelectionChanged"
                       SelectedIndex="{Binding Path=TipoTto, Mode = TwoWay}"/>
-            <Label  Content="Ámbitos de Trabajo" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.391,-0.203" FontWeight="DemiBold"/>
+        <Label  Content="Modos de viaje" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" FontWeight="DemiBold"/>
-            <ComboBox x:Name="comboBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=OpsAmbs, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" 
+        <ComboBox x:Name="comboBox_mv" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=TiposMv, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" 
+                      VerticalAlignment="Top" Width="260" SelectionChanged="comboBox_mv_SelectionChanged"
+                      SelectedIndex="{Binding Path=TipoMv, Mode = TwoWay}"/>
+        <Label  Content="Ámbitos de Trabajo" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.391,-0.203" FontWeight="DemiBold"/>
+        <ComboBox x:Name="comboBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=tiposMv, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" 
                       VerticalAlignment="Top" Width="260" SelectionChanged="comboBox_ambitos_SelectionChanged"
                       SelectedIndex="{Binding Path=SelOpAmb, Mode = TwoWay}"/>
         <ListBox x:Name="listBox_ambitos" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=Ambitos, Mode = TwoWay}" HorizontalAlignment="Left" Height="100" 

View/Limpieza/PaneLimpiezaSub1.xaml.cs

@@ -80,7 +80,20 @@ namespace OliviaAddInPro
              }   
                 
         }
+        private void comboBox_mv_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            int i = -1;
+            if (sender is System.Windows.Controls.ComboBox combo)
+            {
+                i = combo.SelectedIndex;
 
+                if (DataContext is PaneLimpiezaSub1ViewModel mod)
+                {
+                    mod.ComboMvSel(i);
+                }
+            }
+
+        }
         private void comboBox_ambitos_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             int i = -1;

View/Recogida/PaneRecogidaSub1.xaml

@@ -5,7 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:extensions="clr-namespace:ArcGIS.Desktop.Extensions;assembly=ArcGIS.Desktop.Extensions"
              xmlns:ui="clr-namespace:OliviaAddInPro"             
-             mc:Ignorable="d" d:DesignWidth="300" Height="390"
+             mc:Ignorable="d" d:DesignWidth="300" Height="422"
              d:DataContext="{Binding Path=ui.PaneRecogidaSub1ViewModel}" Loaded="UserControl_Loaded" Unloaded="UserControl_Unloaded" >
     <UserControl.Resources>
         <ResourceDictionary>
@@ -94,6 +94,10 @@
             <TextBox x:Name="txtBox_kgCapac" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" Grid.Column="1" Margin="5,0,0,3" TextWrapping="NoWrap" Text="{Binding Path=TextKgCapac, Mode = TwoWay}" TextAlignment="Right" MaxLength="8" PreviewTextInput="txtBox_kgCapac_PreviewTextInput"/>
             <Label x:Name="label_kgmax" Grid.Column="2" Content="kg máx. por viaje" Margin="0,-1,0,0"/>
         </Grid>
+        <Label  Content="Modos de viaje" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" FontWeight="DemiBold"/>
+        <ComboBox x:Name="comboBox_mv" IsEnabled="{Binding Path=CapaAbierta, Mode = TwoWay}" ItemsSource="{Binding Path=TiposMv, Mode = TwoWay}" HorizontalAlignment="Left" Margin="20,0,0,0" 
+                      VerticalAlignment="Top" Width="260" SelectionChanged="comboBox_mv_SelectionChanged"
+                      SelectedIndex="{Binding Path=TipoMv, Mode = TwoWay}"/>
         <Label  Content="Tiempo de vaciado de contenedor" HorizontalAlignment="Left" Margin="15,0,0,0" VerticalAlignment="Top" RenderTransformOrigin="-0.391,-0.203" FontWeight="DemiBold"/>
         <Grid Margin="20,0,0,0">
             <Grid.ColumnDefinitions>

View/Recogida/PaneRecogidaSub1.xaml.cs

@@ -110,7 +110,20 @@ namespace OliviaAddInPro
                 }
             }
         }
+        private void comboBox_mv_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            int i = -1;
+            if (sender is System.Windows.Controls.ComboBox combo)
+            {
+                i = combo.SelectedIndex;
 
+                if (DataContext is PaneRecogidaSub1ViewModel mod)
+                {
+                    mod.ComboMvSel(i);
+                }
+            }
+
+        }
         private void comboBox_tipoCapac_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             int i = -1;

ViewModel/Limpieza/PaneLimpiezaSub1ViewModel.cs

@@ -27,6 +27,7 @@ namespace OliviaAddInPro
     {
 
         private ObservableCollection<string> tiposTto = new ObservableCollection<string>(LimpiezaDef.tipos_tto_str);
+        private ObservableCollection<string> tiposMv = new ObservableCollection<string>();
         private ObservableCollection<string> opsAmbs=new ObservableCollection<string>();
         private int selOpAmb = -1;
         private ObservableCollection<CheckedListItem<string>> ambitos = new ObservableCollection<CheckedListItem<string>>();  
@@ -114,6 +115,25 @@ namespace OliviaAddInPro
                 base.NotifyPropertyChanged("TiposTto");
             }
         }
+        public ObservableCollection<string> TiposMv
+        {
+            get { return tiposMv; }
+            set
+            {
+                tiposMv = value;
+                base.NotifyPropertyChanged("TiposMv");
+            }
+        }
+        private int tipoMv = -1;
+        public int TipoMv
+        {
+            get { return tipoMv; }
+            set
+            {
+                tipoMv = value;
+                base.NotifyPropertyChanged("TipoMv");
+            }
+        }
         private int tipoTto = -1;
         public int TipoTto
         {
@@ -199,6 +219,7 @@ namespace OliviaAddInPro
             lblUdsVeloDespl = "km/h";
             limpServ = new LimpiezaServ(null); //no hace falta instancia limp
             textAnchoVia = LimpiezaDef.Parametros.ancho_via.ToString();
+            tiposMv = limpServ.GetNombreModosViajes();
         }
         /**
          * Realiza las comprobaciones para cuando se ha abierto una capa
@@ -245,10 +266,14 @@ namespace OliviaAddInPro
             CapaAbierta = true;
             return true;
         }
-        /**
+            public void ComboMvSel(int tto)
-         * Realiza los cambios en los ámbitos cuando se ha seleccionado un tratamiento
+            {
-         */
+                tipoMv = tto;
-         public void ComboTtoSel(int tto)
+            }
+            /**
+             * Realiza los cambios en los ámbitos cuando se ha seleccionado un tratamiento
+             */
+            public void ComboTtoSel(int tto)
         {
             if (tto < 0)
                 return;

ViewModel/Recogida/PaneRecogidaSub1ViewModel.cs

@@ -32,7 +32,7 @@ namespace OliviaAddInPro
         private ObservableCollection<string> tiposVehic = new ObservableCollection<string>();
         private ObservableCollection<string> tiposCapac = new ObservableCollection<string>();
         private RecogidaServ recoServ = new RecogidaServ(null); //no hace falta instancia reco aquí
-
+        private ObservableCollection<string> tiposMv = new ObservableCollection<string>();
         /** 
         * Array de booleanos enumerando si se existen en la capa seleccionada los tipos de fracción
         */
@@ -47,6 +47,29 @@ namespace OliviaAddInPro
         public bool[] tipos_vehic_bool = new bool[(int)RecogidaDef.TiposVehic.N];
 
         #region Properties     
+        public ObservableCollection<string> TiposMv
+        {
+            get { return tiposMv; }
+            set
+            {
+                tiposMv = value;
+                base.NotifyPropertyChanged("TiposMv");
+            }
+        }
+        private int tipoMv = -1;
+        public int TipoMv
+        {
+            get { return tipoMv; }
+            set
+            {
+                tipoMv = value;
+                base.NotifyPropertyChanged("TipoMv");
+            }
+        }
+        public void ComboMvSel(int tto)
+        {
+            tipoMv = tto;
+        }
 
         public override string DisplayName
         {
@@ -261,6 +284,7 @@ namespace OliviaAddInPro
             {
                 KgCont = RecogidaDef.kgrec_cont;
             }
+            tiposMv = new LimpiezaServ(null).GetNombreModosViajes();
         }
         /**
          * Realiza las comprobaciones para cuando se ha abierto una capa