diff --git a/Acumuladores/RepEntradasUsadosClientes.aspx.vb b/Acumuladores/RepEntradasUsadosClientes.aspx.vb
index f20abeef3..8925785f9 100644
--- a/Acumuladores/RepEntradasUsadosClientes.aspx.vb
+++ b/Acumuladores/RepEntradasUsadosClientes.aspx.vb
@@ -61,11 +61,18 @@ Partial Class Acumuladores_RepEntradasUsadosClientes
     Protected Sub GvDatos_RowDataBound(sender As Object, e As GridViewRowEventArgs) Handles GvDatos.RowDataBound
         If e.Row.RowType = DataControlRowType.DataRow Then
 
-            If e.Row.DBCampo("EsHeader").ToString = "-1" Or e.Row.DBCampo("Codigo").ToString = "" Then
-                e.Row.CssClass = "SubTotales2"
-            End If
-
+            'If e.Row.DBCampo("EsHeader").ToString = "-1" Or e.Row.DBCampo("Codigo").ToString = "" Then
+            '    e.Row.CssClass = "SubTotales2"
+            'End If
+            If e.Row.DBCampo("TipoHeader").ToString = "1" Then
+                e.Row.CssClass = "Totales"
+            ElseIf e.Row.DBCampo("TipoHeader").ToString = "2" Then
+                e.Row.CssClass = "SubTotales"
+            ElseIf e.Row.DBCampo("TipoHeader").ToString = "3" Then
+                e.Row.CssClass = "SubTotales2"
+            End If
         End If
+
     End Sub
 
     Protected Sub BtnImprimir_Click(sender As Object, e As EventArgs)
diff --git a/App_Code/ClsBancos.vb b/App_Code/ClsBancos.vb
index dddbce407..8113ab863 100644
--- a/App_Code/ClsBancos.vb
+++ b/App_Code/ClsBancos.vb
@@ -1597,7 +1597,7 @@ Public Class ClsBancos
 
         Return Retorno
     End Function
-    Public Function CancelarBancos_IE(CveUsuario As Integer, CveIE As Integer, MesAnterior As Boolean, IdPoliza As Integer, Optional FechaCancelacion As Date = MinFecha, Optional TipoMovimiento As Integer = 1) As Boolean
+    Public Function CancelarBancos_IE(CveUsuario As Integer, CveIE As Integer, MesAnterior As Boolean, IdPoliza As Integer, FolioPoliza As Integer, Optional FechaCancelacion As Date = MinFecha, Optional TipoMovimiento As Integer = 1) As Boolean
 
         Dim Retorno As Boolean = False
         DataAdapter("PA_Banc_IECancelar")
@@ -1607,6 +1607,7 @@ Public Class ClsBancos
             .Add("@CveIE", SqlDbType.Int).Value = CveIE
             .Add("@MesAnterior", SqlDbType.Bit).Value = MesAnterior
             .Add("@IdPoliza", SqlDbType.Int).Value = IdPoliza
+            .Add("@FolioPoliza", SqlDbType.Int).Value = FolioPoliza
             .Add("@FechaCancelacion", SqlDbType.Date).Value = FechaCancelacion
             .Add("@TipoMovimiento", SqlDbType.Int).Value = TipoMovimiento
         End With
diff --git a/App_Code/ClsContabilidad.vb b/App_Code/ClsContabilidad.vb
index 4f7e0a8e2..e5a748ea3 100644
--- a/App_Code/ClsContabilidad.vb
+++ b/App_Code/ClsContabilidad.vb
@@ -388,7 +388,7 @@ Public Class ClsContabilidad
 
 
     Public Function GetProveedoresAuxiliar(CveProveedor As Integer, CveConceptoContable As Integer, FechaInicio As Date, FechaFin As Date, CveEmpresa As Integer,
-                                           Optional Opcion As Integer = 1, Optional CveTipoProveedor As Integer = -1) As Boolean
+                                           Optional Opcion As Integer = 1, Optional CveTipoProveedor As Integer = -1, Optional Contabilizable As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_Conta_ProveedoresAuxiliar")
@@ -402,6 +402,7 @@ Public Class ClsContabilidad
             .Add("@CveEmpresa", SqlDbType.Int).Value = CveEmpresa
             .Add("@Opcion", SqlDbType.Int).Value = Opcion
             .Add("@CveTipoProveedor", SqlDbType.Int).Value = CveTipoProveedor
+            .Add("@Contabilizable", SqlDbType.Int).Value = Contabilizable
         End With
 
         Try
@@ -1477,7 +1478,7 @@ Public Class ClsContabilidad
 
 
             Catch ex As Exception
-                ObjConta.RollBack()
+                If Not ContaCompartida Then ObjConta.RollBack()
                 OnError("Ocurrió un error al intentar contabilizar la PrePoliza", ex, SqlAdapter.SelectCommand.Parameters.ParametrosInfo)
                 'Alert("Ocurrió un error al guardar la póliza", TipoMensaje.MsgAdvertencia)
                 Retorno = False
diff --git a/App_Code/ClsEdocumentacion.vb b/App_Code/ClsEdocumentacion.vb
index 6b96bae06..b850d1078 100644
--- a/App_Code/ClsEdocumentacion.vb
+++ b/App_Code/ClsEdocumentacion.vb
@@ -128,7 +128,7 @@ Public Class ClsEdocumentacion
 #Region "D O C U M E N T A C I O N "
 
 
-    Public Function DocumentacionGet(CveDocumentacion As Integer, CveDocumentacionTipo As Integer, Estatus As Integer, CveEmpresa As Integer, Optional Modulo As Integer = 1) As Boolean
+    Public Function DocumentacionGet(CveDocumentacion As Integer, CveDocumentacionTipo As Integer, Estatus As Integer, CveEmpresa As Integer, Optional Modulo As Integer = -1) As Boolean
         Dim Retorno As Boolean = False
 
         DataAdapter("PA_Edoc_DocumentacionGet")
@@ -435,7 +435,7 @@ Public Class ClsEdocumentacion
         Return Retorno
     End Function
 
-    Public Function DocumentacionTipoGet(CveEmpresa As Integer, Optional Modulo As Integer = 1) As Boolean
+    Public Function DocumentacionTipoGet(CveEmpresa As Integer, Optional Modulo As Integer = -1) As Boolean
 
         Dim Retorno As Boolean = False
 
diff --git a/App_Code/ClsPaginas.vb b/App_Code/ClsPaginas.vb
index d85c936bf..56ef2a7dd 100644
--- a/App_Code/ClsPaginas.vb
+++ b/App_Code/ClsPaginas.vb
@@ -4565,8 +4565,10 @@ Public Class ClsPaginas
             PaginaDict.Add("/Ventas/Clientes.aspx".ToUpper(), 5)
             PaginaDict.Add("/Ventas/CatClientes.aspx".ToUpper(), 5)
             PaginaDict.Add("/Ventas/CatClientesClasificaciones.aspx".ToUpper(), 408)
-            PaginaDict.Add("/Ventas/Ventas.aspx".ToUpper(), 6)
-            PaginaDict.Add("/Ventas/RepVentas.aspx".ToUpper(), 9)
+            PaginaDict.Add("/Ventas/Ventas.aspx".ToUpper(), 6)
+            PaginaDict.Add("/Ventas/Ventas.aspx?Op=Cot".ToUpper(), 366)
+            PaginaDict.Add("/Ventas/RepVentas.aspx".ToUpper(), 9)
+            PaginaDict.Add("/Ventas/RepVentas.aspx?Op=Cot".ToUpper(), 367)
             PaginaDict.Add("/Ventas/RepRemisiones.aspx".ToUpper(), 430)
             PaginaDict.Add("/Ventas/RepRemisionesDetalle.aspx".ToUpper(), 430)
             PaginaDict.Add("/Ventas/RepCotizaciones.aspx".ToUpper(), 430)
@@ -4644,7 +4646,7 @@ Public Class ClsPaginas
             'PaginaDict.Add("/Ventas/Ventas.aspx".ToUpper(), 2016)
             'PaginaDict.Add("/Ventas/Clientes.aspx".ToUpper(), 2017)
             PaginaDict.Add("/Ventas/Ventas.aspx?Op=Rem".ToUpper(), 2018)
-            PaginaDict.Add("/Ventas/Ventas.aspx?Op=Cot".ToUpper(), 2019)
+            'PaginaDict.Add("/Ventas/Ventas.aspx?Op=Cot".ToUpper(), 2019)
             PaginaDict.Add("/Ventas/VentasH.aspx".ToUpper(), -1)
             PaginaDict.Add("/Ventas/ClientesAbonarH.aspx".ToUpper(), -1)
             PaginaDict.Add("/Ventas/PVRaul.aspx".ToUpper(), -1)
diff --git a/App_Code/Modelos.vb b/App_Code/Modelos.vb
index 447ab3844..3a75dc1df 100644
--- a/App_Code/Modelos.vb
+++ b/App_Code/Modelos.vb
@@ -3061,7 +3061,7 @@ Namespace Modelos
                                 CveCuentaContabilizacion = 0
                             End If
 
-                            If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, TipoMovimiento, importeMovimiento, Referencia, ConceptoContable, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=importeMX, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), CveCuenta:=CveCuenta, CveSubProyecto:=CveSubProyectoContabilizar, PorcentajeImpuesto:=PorcentajeImpuesto, TipoCambio:=tipoCambio) Then
+                            If Not ObjConta.AddPrePolizasDetalle(ObjFactura.CvePrePoliza, TipoMovimiento, importeMovimiento, Referencia, ConceptoContable, Concepto, FechaMovimiento, IdCtaContable, -1, CveVenta:=ObjFactura.CveVenta, CveCliente:=ObjFactura.CveCliente, CveIE:=CveIE, ImporteMX:=importeMX, ImporteME:=If(tipoCambio = 1, 0, importeMovimiento), CveCuenta:=CveCuenta, CveSubProyecto:=CveSubProyectoContabilizar, PorcentajeImpuesto:=PorcentajeImpuesto, TipoCambio:=tipoCambio, Contabilizable:=SeContabiliza) Then
                                 ErrorPrepoliza = True
                             Else
                                 ObjFactura.SeGuardoPrePoliza = True
@@ -4375,7 +4375,7 @@ Namespace Modelos
 
                                                         Dim AutoConta As Boolean = UsuarioActual.Empresa.Funcionalidad(200) = "1"
 
-                                                        If UsuarioActual.CveEmpresa = 119 AndAlso ObjFactura.TipoDocto.Contiene("Ant", "Rem", "RNC", "Cot", "Ped", "Pd2", "PA", "NC") Then
+                                                        If UsuarioActual.CveEmpresa = 119 AndAlso ObjFactura.TipoDocto.Contiene("Ant", "Rem", "RNC", "Cot", "Ped", "Pd2", "PA", "Egs", "Dev") Then
                                                             AutoConta = False
                                                         End If
 
diff --git a/Bancos/FluctuacionCambiaria.aspx.vb b/Bancos/FluctuacionCambiaria.aspx.vb
index 1855b24b4..00b3f2881 100644
--- a/Bancos/FluctuacionCambiaria.aspx.vb
+++ b/Bancos/FluctuacionCambiaria.aspx.vb
@@ -430,6 +430,7 @@ Partial Class Bancos_FluctuacionCambiaria
             If Conta.ContabilizarPrePoliza(CvePrePoliza, UsuarioActual.CveUsuario, UsuarioActual.Empresa, ObjConta:=ObjContPaq) Then
                 SeContabilizo = True
             Else
+                ErrorRegistrar = True
                 Alert("Ocurrio un Error al contabilizar, pongase en contacto con Soporte Técnico", TipoMensaje.MsgError)
             End If
         End If
@@ -437,10 +438,12 @@ Partial Class Bancos_FluctuacionCambiaria
         If Not ErrorRegistrar And SeContabilizo Then
 
             Conta.Commit()
+            ObjContPaq.Commit()
             Alert(String.Format("La Fluctuación se ha generado <br/> <a href='/Contabilidad/RegPrePoliza.aspx?CvePrePoliza={0}'>Ver PrePóliza</a>", CvePrePoliza), TipoMensaje.MsgInformacion)
             CargaDatosCuentas()
         Else
             Conta.RollBack()
+            ObjContPaq.Dispose()
         End If
         Conta.Dispose()
     End Sub
diff --git a/Bancos/IE.aspx.vb b/Bancos/IE.aspx.vb
index 1027f7906..e56e4f732 100644
--- a/Bancos/IE.aspx.vb
+++ b/Bancos/IE.aspx.vb
@@ -3878,7 +3878,7 @@ Partial Class Bancos_IE
 
                             'CANCELA IE
                             If Not ErrorCancelar Then
-                                If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
+                                If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, FolioPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
                                     ErrorCancelar = True
                                     MensajeError = "Error al cancelar IE"
                                 End If
@@ -3909,7 +3909,7 @@ Partial Class Bancos_IE
 
                         'CANCELA IE
                         If Not ErrorCancelar Then
-                            If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, False, IdPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
+                            If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, False, IdPolizaNueva, FolioPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
                                 ErrorCancelar = True
                                 MensajeError = "Error al cancelar IE"
                             End If
@@ -3932,13 +3932,13 @@ Partial Class Bancos_IE
             ' If TxtFechaDocumento.Text.ToDate.Month < TxtFechaCancelacion.Text.ToDate.Month Or TxtFechaDocumento.Text.ToDate.Year < TxtFechaCancelacion.Text.ToDate.Year Then
             If TxtFechaDocumento.Text.ToDate < TxtFechaCancelacion.Text.ToDate.FirstDayOfMonth Then
                 'CANCELA IE MES ANTERIOR
-                If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
+                If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, FolioPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
                     ErrorCancelar = True
                     MensajeError = "Error al cancelar IE MES ANTERIOR"
                 End If
             Else
                 'CANCELA IE MES ACTUAL
-                If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, False, IdPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
+                If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, False, IdPolizaNueva, FolioPolizaNueva, TxtFechaCancelacion.Text.ToDate) Then
                     ErrorCancelar = True
                     MensajeError = "Error al cancelar IE MES ACTUAL"
                 End If
@@ -4107,7 +4107,7 @@ Partial Class Bancos_IE
 
                         'genera nuevo IE contrario
                         If Not ErrorCancelar Then
-                            If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, TxtFechaDevuelto.Text.ToDate, 2) Then
+                            If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, FolioPolizaNueva, TxtFechaDevuelto.Text.ToDate, 2) Then
                                 ErrorCancelar = True
                             End If
                         End If
@@ -4123,7 +4123,7 @@ Partial Class Bancos_IE
         Else
 
             'siempre se hace una cancelación
-            If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, TxtFechaDevuelto.Text.ToDate, 2) Then
+            If Not Banc.CancelarBancos_IE(UsuarioActual.CveUsuario, CveIE, True, IdPolizaNueva, FolioPolizaNueva, TxtFechaDevuelto.Text.ToDate, 2) Then
                 ErrorCancelar = True
             End If
 
diff --git a/Bancos/PagoElectronico.aspx.vb b/Bancos/PagoElectronico.aspx.vb
index 4a70aa2a1..93a64cde4 100644
--- a/Bancos/PagoElectronico.aspx.vb
+++ b/Bancos/PagoElectronico.aspx.vb
@@ -1582,7 +1582,7 @@ Partial Class Bancos_PagoElectronico
                         Else
 
                             'Cuando salio NO exitoso cancelamos el IE
-                            If Not ObjIE.CancelarBancos_IE(UsuarioActual.CveUsuario, ArrayCveIEs(index).ToEntero, False, -1) Then
+                            If Not ObjIE.CancelarBancos_IE(UsuarioActual.CveUsuario, ArrayCveIEs(index).ToEntero, False, -1, -1) Then
                                 ErrorDB = True
                             End If
                         End If
diff --git a/Compras/ProveedoresAuxiliar.aspx b/Compras/ProveedoresAuxiliar.aspx
index 8afae6a37..4ef950a21 100644
--- a/Compras/ProveedoresAuxiliar.aspx
+++ b/Compras/ProveedoresAuxiliar.aspx
@@ -131,6 +131,14 @@
                                 <asp:ListItem Text="Acreedor" Value="2"></asp:ListItem>
                             </asp:DropDownList>
                         </div>
+                        <label class="col-md-1 truncate">Contabilizable:</label>
+                        <div class="col-md-3">
+                            <asp:DropDownList ID="DdlOpcionContabilizable" CssClass="form-control input-sm select2me" Width="260px" runat="server">
+                                <asp:ListItem Text="Todos" Value="-1"></asp:ListItem>
+                                <asp:ListItem Text="Contabilizable" Value="0"></asp:ListItem>
+                                <asp:ListItem Text="No contabilizable" Value="1"></asp:ListItem>
+                            </asp:DropDownList>
+                        </div>
                     </div>
                 </div>
             </div>
diff --git a/Compras/ProveedoresAuxiliar.aspx.vb b/Compras/ProveedoresAuxiliar.aspx.vb
index 9b727b010..926764dfe 100644
--- a/Compras/ProveedoresAuxiliar.aspx.vb
+++ b/Compras/ProveedoresAuxiliar.aspx.vb
@@ -81,7 +81,7 @@ Partial Class Compras_ProveedoresAuxiliar
 
         'Falta PA
         If ObjConta.GetProveedoresAuxiliar(DdlProveeedores.SelectedValue.ToEntero, -1, txtFechaI.Text.ToDate, txtFechaF.Text.ToDate, UsuarioActual.CveEmpresa,
-                                           DdlOpcion.SelectedValue.ToEntero, DdlTipoProveedor.SelectedValue.ToEntero) Then
+                                           DdlOpcion.SelectedValue.ToEntero, DdlTipoProveedor.SelectedValue.ToEntero, DdlOpcionContabilizable.SelectedValue.ToEntero) Then
             If DdlOpcion.SelectedValue.ToEntero = 2 Then
                 GvP.DataSource = ObjConta.DtResultados.FiltraParametros($" IIF(ISNULL(CveConceptoContable,0) = 5 AND Importe >= 0,0,1) = 1 ")
             Else
diff --git a/Contabilidad/RegPoliza.aspx.vb b/Contabilidad/RegPoliza.aspx.vb
index 443aa6d68..25dbcc116 100644
--- a/Contabilidad/RegPoliza.aspx.vb
+++ b/Contabilidad/RegPoliza.aspx.vb
@@ -1702,7 +1702,9 @@ Partial Class RegPoliza
 
         If ObjConta.RemovePoliza(IDPoliza) Then
             If ObjMov.DesvincularPrePolizaContabilizada(IDPoliza, UsuarioActual.CveEmpresa) Then
-                If Not ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Polizas", TxtNumeroPoliza.Text, DdlTipoPoliza.SelectedValue.ToEntero) Then
+                If ObjGral.AddHistorialBitacora(Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, Nothing, "", "", UsuarioActual.CveUsuario, UsuarioActual.CveEmpresa, 1, TxtDescripcion.Text, "Polizas", TxtNumeroPoliza.Text, DdlTipoPoliza.SelectedValue.ToEntero) Then
+
+                Else
                     ErrorTrans = True
                 End If
             Else
diff --git a/Contabilidad/RegPrePoliza.aspx.vb b/Contabilidad/RegPrePoliza.aspx.vb
index d89078102..071e8c784 100644
--- a/Contabilidad/RegPrePoliza.aspx.vb
+++ b/Contabilidad/RegPrePoliza.aspx.vb
@@ -1341,11 +1341,30 @@ Partial Class ContabilidadC_RegPrePoliza
 
     Private Sub BtnEliminar_Click(sender As Object, e As EventArgs) Handles BtnEliminar.Click
         Dim ObjContabilidad As New ClsContabilidad
-
+        ObjContabilidad.IniciaTransacSQL()
+        Dim ObjConta As New ClsContPAQi(UsuarioActual.Empresa)
+        ObjConta.IniciaTransacSQL()
+        Dim TieneError As Boolean = False
+
         If ObjContabilidad.RemovePrePolizas(CvePrePoliza, UsuarioActual.CveEmpresa) Then
+            If IdPoliza > 0 Then
+                If Not ObjConta.RemovePoliza(IdPoliza) Then
+                    TieneError = True
+                End If
+            End If
+
             Alert("La Prepóliza ha sido eliminada", TipoMensaje.MsgInformacion)
         Else
             Alert("La Prepóliza ha podido ser eliminada", TipoMensaje.MsgError)
+            TieneError = True
+        End If
+
+        If Not TieneError Then
+            ObjContabilidad.Commit()
+            ObjConta.Commit()
+        Else
+            ObjContabilidad.RollBack()
+            ObjConta.RollBack()
         End If
 
         ObjContabilidad.Dispose()
diff --git a/Empresas/57/Formatos/Factura.rdlc b/Empresas/57/Formatos/Factura.rdlc
index d09c31329..b7edb3bc0 100644
--- a/Empresas/57/Formatos/Factura.rdlc
+++ b/Empresas/57/Formatos/Factura.rdlc
@@ -816,8 +816,15 @@
                   <FontWeight>Normal</FontWeight>
                 </Style>
               </TextRun>
+            </TextRuns>
+            <Style>
+              <TextAlign>Center</TextAlign>
+            </Style>
+          </Paragraph>
+          <Paragraph>
+            <TextRuns>
               <TextRun>
-                <Value>=Parameters!RFC.Value</Value>
+                <Value>GOTE811117236</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
                   <FontSize>8pt</FontSize>
@@ -832,7 +839,7 @@
         </Paragraphs>
         <rd:DefaultName>Textbox4</rd:DefaultName>
         <Left>1.78362in</Left>
-        <Height>0.46414in</Height>
+        <Height>0.56136in</Height>
         <Width>3.96172in</Width>
         <ZIndex>5</ZIndex>
         <Style>
@@ -1121,7 +1128,7 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>=Parameters!DomicilioExpedicion.Value</Value>
+                <Value>=Parameters!DomicilioSucursal.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
                   <FontSize>7.5pt</FontSize>
@@ -1135,9 +1142,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox10</rd:DefaultName>
-        <Top>0.46414in</Top>
+        <Top>0.58914in</Top>
         <Left>1.87861in</Left>
-        <Height>0.69679in</Height>
+        <Height>0.6374in</Height>
         <Width>1.65152in</Width>
         <ZIndex>13</ZIndex>
         <Style>
@@ -1172,7 +1179,7 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>=Parameters!DomicilioExpedicion.Value</Value>
+                <Value>=Parameters!DomicilioSucursal.Value</Value>
                 <Style>
                   <FontFamily>Calibri</FontFamily>
                   <FontSize>7.5pt</FontSize>
@@ -1186,9 +1193,9 @@
           </Paragraph>
         </Paragraphs>
         <rd:DefaultName>Textbox10</rd:DefaultName>
-        <Top>0.46414in</Top>
+        <Top>0.58914in</Top>
         <Left>3.84822in</Left>
-        <Height>0.69679in</Height>
+        <Height>0.6374in</Height>
         <Width>1.786in</Width>
         <ZIndex>14</ZIndex>
         <Style>
@@ -1219,8 +1226,9 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.28209in</Top>
+        <Left>0.13897cm</Left>
         <Height>0.23611in</Height>
-        <Width>0.89901in</Width>
+        <Width>0.85202in</Width>
         <ZIndex>15</ZIndex>
         <Style>
           <Border>
@@ -1294,7 +1302,6 @@
               <TextRun>
                 <Value>Dirección</Value>
                 <Style>
-                  <FontFamily>Calibri</FontFamily>
                   <FontSize>9pt</FontSize>
                 </Style>
               </TextRun>
@@ -1304,7 +1311,7 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.53208in</Top>
-        <Left>0.04514in</Left>
+        <Left>0.05471in</Left>
         <Height>0.23611in</Height>
         <Width>0.85387in</Width>
         <ZIndex>17</ZIndex>
@@ -1379,9 +1386,8 @@
           <Paragraph>
             <TextRuns>
               <TextRun>
-                <Value>Cuidad</Value>
+                <Value>Ciudad</Value>
                 <Style>
-                  <FontFamily>Calibri</FontFamily>
                   <FontSize>9pt</FontSize>
                 </Style>
               </TextRun>
@@ -1391,7 +1397,7 @@
         </Paragraphs>
         <rd:DefaultName>Textbox19</rd:DefaultName>
         <Top>1.7682in</Top>
-        <Left>0.04514in</Left>
+        <Left>0.05471in</Left>
         <Height>0.25in</Height>
         <Width>0.85387in</Width>
         <ZIndex>19</ZIndex>
diff --git a/Empresas/72/Formatos/Factura.rdlc b/Empresas/72/Formatos/Factura.rdlc
index c01f96238..cc919a0a0 100644
--- a/Empresas/72/Formatos/Factura.rdlc
+++ b/Empresas/72/Formatos/Factura.rdlc
@@ -3375,7 +3375,15 @@
               <Paragraph>
                 <TextRuns>
                   <TextRun>
-                    <Value>Scotiabank            CTA. 0686 4074            CLABE 0447 7011 006 8640 743</Value>
+                    <Value>CONVENIO CIE Bancomer: 001598120 Referencia:</Value>
+                    <Style>
+                      <FontFamily>Myriad Pro</FontFamily>
+                      <FontSize>9.64pt</FontSize>
+                      <FontWeight>Bold</FontWeight>
+                    </Style>
+                  </TextRun>
+                  <TextRun>
+                    <Value>=Parameters!ClienteCodigo.Value</Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>9.64pt</FontSize>
@@ -3388,15 +3396,7 @@
               <Paragraph>
                 <TextRuns>
                   <TextRun>
-                    <Value>Referencia:  </Value>
-                    <Style>
-                      <FontFamily>Myriad Pro</FontFamily>
-                      <FontSize>9.64pt</FontSize>
-                      <FontWeight>Bold</FontWeight>
-                    </Style>
-                  </TextRun>
-                  <TextRun>
-                    <Value>=Parameters!Referencia.Value</Value>
+                    <Value>Scotiabank            CTA. 0686 4074            CLABE 0447 7011 006 8640 743</Value>
                     <Style>
                       <FontFamily>Myriad Pro</FontFamily>
                       <FontSize>9.64pt</FontSize>
@@ -3411,7 +3411,7 @@
             <Top>6.7921in</Top>
             <Left>0.16632cm</Left>
             <Height>0.36385in</Height>
-            <Width>4.87092in</Width>
+            <Width>4.94037in</Width>
             <ZIndex>14</ZIndex>
             <Style>
               <Border>
diff --git a/GPS/Rastreo.aspx b/GPS/Rastreo.aspx
index d09872508..ffa349c1b 100644
--- a/GPS/Rastreo.aspx
+++ b/GPS/Rastreo.aspx
@@ -255,7 +255,7 @@
     <li>
         <asp:UpdatePanel runat="server" UpdateMode="conditional">
             <ContentTemplate>
-                <asp:LinkButton ID="LnkDibujo" OnClientClick="PreparaDibujado();" CommandArgument="KM" Text="<i class='fa fa-pencil-square-o'></i><span>Dibujar GeoReferencia</span>" runat="server">
+                <asp:LinkButton ID="LnkDibujo" OnClientClick="PreparaDibujado();" CommandArgument="KM" Text="<i class='fa fa-pencil-square-o'></i><span>Dibujar GeoReferencia/Punto de Interés</span>" runat="server">
                 </asp:LinkButton>
             </ContentTemplate>
         </asp:UpdatePanel>
@@ -274,6 +274,7 @@
             <asp:HiddenField ID="GeoRutaHistorico" runat="server" ClientIDMode="Static" />
             <asp:HiddenField ID="HdnOpcion" ClientIDMode="static" runat="server" />
             <asp:HiddenField ID="HdnDirecciones" ClientIDMode="static" runat="server" />
+            <asp:HiddenField ID="HdnGrupo" runat="server" Value="-1" ClientIDMode="Static" />
         </ContentTemplate>
     </asp:UpdatePanel>
     <asp:UpdatePanel ID="UpDatosMapa" runat="server" UpdateMode="Conditional">
@@ -316,7 +317,7 @@
                                 </asp:GridView>
                             </ContentTemplate>
                         </asp:UpdatePanel>
-                    </div>               
+                    </div>
                 </ContentTemplate>
             </asp:UpdatePanel>
         </div>
@@ -404,7 +405,7 @@
                                                 <div class="form-group form-md-line-input input-iconright">
                                                     <label>Trazar Geocercas: </label>
                                                     <br />
-                                                    <asp:CheckBox ID="ChkTrazarGeocercas" Text=" " runat="server" CssClass="chksino" Width="250px"></asp:CheckBox>
+                                                    <asp:CheckBox ID="ChkTrazarGeocercas" AutoPostBack="true" OnCheckedChanged="ChkTrazarGeocercas_CheckedChanged" Text=" " runat="server" CssClass="chksino" Width="250px"></asp:CheckBox>
                                                 </div>
                                             </div>
                                             <div class="col-md-3" runat="server" visible="False" id="dvTrazoRutas">
@@ -414,7 +415,14 @@
                                                     <asp:CheckBox ID="ChkTrazarGeorutas" AutoPostBack="true" Text=" " runat="server" CssClass="chksino" Width="250px" OnCheckedChanged="ChkTrazarGeorutas_CheckedChanged"></asp:CheckBox>
                                                 </div>
                                             </div>
-                                            <div class="col-md-6">
+                                            <div class="col-md-3" runat="server" visible="False" id="dvTrazoPI">
+                                                <div class="form-group form-md-line-input input-iconright">
+                                                    <label>Trazar P. de Interés: </label>
+                                                    <br />
+                                                    <asp:CheckBox ID="ChkTrazarPuntosInteres" AutoPostBack="true" Text=" " runat="server" CssClass="chksino" Width="250px" OnCheckedChanged="ChkTrazarPI_CheckedChanged"></asp:CheckBox>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-3">
                                             </div>
                                         </div>
                                     </ContentTemplate>
@@ -819,6 +827,49 @@
             </asp:UpdatePanel>
         </div>
     </div>
+    <div id="DivGeoCercas" class="modal ADS fade" role="dialog">
+        <div class="modal-dialog">
+            <asp:UpdatePanel ID="UpGeoCercas" class="modal-content rowpadding" tabindex="-1" runat="server" UpdateMode="Conditional">
+                <ContentTemplate>
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title" id="H3" runat="server">Trazar GeoCercas</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="row" style="margin-left: 0px; margin-top: 5px; margin-bottom: 5px; text-align: right" align="left">
+                            <div style="margin-right: 15px">
+                                <input type="text" id="TxtBusquedaGeo" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusquedaGeo','{0}')", GvGeoCercas.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
+                                <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvGeorutas.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
+                            </div>
+                        </div>
+                        <asp:GridView ID="GvGeoCercas" runat="server" GridLines="None" data-height="200" DataKeyNames="Coordenadas,GeoReferencia,Color" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" data-sort="true" BorderWidth="1" BorderColor="#D3D3D3" CellSpacing="0" Width="100%" AutoGenerateColumns="False" EmptyDataText="No se encontraron registros">
+                            <Columns>
+                                <asp:TemplateField ItemStyle-HorizontalAlign="center" ItemStyle-Width="10%" ItemStyle-CssClass="NoClick">
+                                    <HeaderTemplate>
+                                        <asp:CheckBox runat="server" ID="chkSelectAll" CssClass="ChkAllClickGeo" />
+                                    </HeaderTemplate>
+                                    <ItemTemplate>
+                                        <asp:CheckBox runat="server" ID="ChkGeo" CssClass="ChkAllEvtGeo" />
+                                    </ItemTemplate>
+                                </asp:TemplateField>
+                                <asp:BoundField DataField="GeoReferencia" ItemStyle-Width="20%" HeaderText="Geocerca" ItemStyle-HorizontalAlign="Left" />
+                                <asp:TemplateField HeaderText="Color" ItemStyle-Width="20%" ItemStyle-HorizontalAlign="Center">
+                                    <ItemTemplate>
+                                        <asp:LinkButton ID="imgColor" HeaderText="Color" runat="server" Style="height: 20px;" Enabled="false" CausesValidation="False" CssClass="btn btn-circle btn-sm green" />
+                                    </ItemTemplate>
+                                </asp:TemplateField>
+                            </Columns>
+                        </asp:GridView>
+                    </div>
+                    <div class="modal-footer">
+                        <button data-dismiss="modal" class="btn btn-default">Cerrar</button>
+                    </div>
+                </ContentTemplate>
+            </asp:UpdatePanel>
+        </div>
+    </div>
     <div id="DivGeoRutas" class="modal ADS fade" role="dialog">
         <div class="modal-dialog">
             <asp:UpdatePanel ID="UpGeorutas" class="modal-content rowpadding" tabindex="-1" runat="server" UpdateMode="Conditional">
@@ -836,14 +887,16 @@
                                 <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvGeorutas.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
                             </div>
                         </div>
-                        <asp:GridView ID="GvGeorutas" runat="server" GridLines="None" data-height="200" DataKeyNames="Coordenadas,CveGeoReferencia,GeoReferencia, CveDispositivo,Tipo,Color,Estatus,FechaInicio,FechaFin,AplicaLunes,AplicaMartes,AplicaMiercoles,AplicaJueves,AplicaViernes,AplicaSabado,AplicaDomingo, HoraInicio, HoraFin, Tolerancia" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" data-sort="true" BorderWidth="1" BorderColor="#D3D3D3" CellSpacing="0" Width="100%" AutoGenerateColumns="False" EmptyDataText="No se encontraron registros">
+                        <asp:GridView ID="GvGeorutas" runat="server" GridLines="None" data-height="200" DataKeyNames="Coordenadas,GeoReferencia,Color" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" data-sort="true" BorderWidth="1" BorderColor="#D3D3D3" CellSpacing="0" Width="100%" AutoGenerateColumns="False" EmptyDataText="No se encontraron registros">
                             <Columns>
-                                <asp:TemplateField ItemStyle-HorizontalAlign="center" ItemStyle-Width="10%">
+                                <asp:TemplateField ItemStyle-HorizontalAlign="center" ItemStyle-Width="10%" ItemStyle-CssClass="NoClick">
+                                    <HeaderTemplate>
+                                        <asp:CheckBox runat="server" ID="chkSelectAll" CssClass="ChkAllClickRuta" />
+                                    </HeaderTemplate>
                                     <ItemTemplate>
-                                        <asp:CheckBox runat="server" ID="ChkRutas" />
+                                        <asp:CheckBox runat="server" ID="ChkRutas" CssClass="ChkAllEvtRuta" />
                                     </ItemTemplate>
                                 </asp:TemplateField>
-                                <asp:BoundField DataField="Tipo" ItemStyle-Width="20%" HeaderText="Tipo" ItemStyle-HorizontalAlign="Left" />
                                 <asp:BoundField DataField="GeoReferencia" ItemStyle-Width="20%" HeaderText="GeoReferencia" ItemStyle-HorizontalAlign="Left" />
                                 <asp:TemplateField HeaderText="Color" ItemStyle-Width="20%" ItemStyle-HorizontalAlign="Center">
                                     <ItemTemplate>
@@ -860,6 +913,87 @@
             </asp:UpdatePanel>
         </div>
     </div>
+    <div id="DivMostrarPI" class="modal ADS fade" role="dialog">
+        <div class="modal-dialog">
+            <asp:UpdatePanel ID="UpMostarPI" class="modal-content rowpadding" tabindex="-1" runat="server" UpdateMode="Conditional">
+                <ContentTemplate>
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title" id="H2" runat="server">Trazar Puntos de Interés</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="row" style="margin-left: 0px; margin-top: 5px; margin-bottom: 5px; text-align: right" align="left">
+                            <div style="margin-right: 15px">
+                                <input type="text" id="TxtBusquedaPI" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtBusquedaPI','{0}')", GvGeorutas.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
+                                <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtBusqueda','{0}')", GvGeorutas.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
+                            </div>
+                        </div>
+                        <asp:GridView ID="GVPuntosInteres" runat="server" GridLines="None" DataKeyNames="Punto,PuntoDeInteres" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" data-height="150" data-sort="true" BorderWidth="1" BorderColor="#D3D3D3" CellSpacing="0" Width="100%" AutoGenerateColumns="False" EmptyDataText="No se encontraron registros">
+                            <Columns>
+                                <asp:TemplateField ItemStyle-HorizontalAlign="center" ItemStyle-Width="10%" ItemStyle-CssClass="NoClick">
+                                    <HeaderTemplate>
+                                        <asp:CheckBox runat="server" ID="chkSelectAll" CssClass="ChkAllClickPI" />
+                                    </HeaderTemplate>
+                                    <ItemTemplate>
+                                        <asp:CheckBox runat="server" ID="ChkPI" CssClass="ChkAllEvtPI" />
+                                    </ItemTemplate>
+                                </asp:TemplateField>
+                                <asp:BoundField DataField="PuntoDeInteres" ItemStyle-Width="30%" HeaderText="PuntoDeInteres" ItemStyle-HorizontalAlign="Left" />
+                                <asp:BoundField DataField="Descripcion" ItemStyle-Width="30%" HeaderText="Descripcion" ItemStyle-HorizontalAlign="Left" />
+                            </Columns>
+                        </asp:GridView>
+                    </div>
+                    <div class="modal-footer">
+                        <button data-dismiss="modal" class="btn btn-default">Cerrar</button>
+                    </div>
+                </ContentTemplate>
+            </asp:UpdatePanel>
+        </div>
+    </div>
+    <div id="DivAgregarPuntoInteres" class="modal ADS fade" role="dialog">
+        <div class="modal-dialog">
+            <asp:UpdatePanel ID="UpAgregarPuntoInteres" class="modal-content rowpadding" tabindex="-1" runat="server" UpdateMode="Conditional">
+                <ContentTemplate>
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                            <span aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title">Agregar Punto(s) de interés</h4>
+                    </div>
+                    <div class="modal-body">
+                        <div class="form-group form-md-line-input input-iconright">
+                            <asp:TextBox ID="TxtNombrePI" runat="server" CssClass="form-control" CausesValidation="true"></asp:TextBox>
+                            <asp:RequiredFieldValidator ID="RFVNombrePI" runat="server" CssClass="help-block errorimput" ControlToValidate="TxtNombrePI" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Nombre''</b> es necesario, por favor ingréselo." ValidationGroup="GrpPuntoInteres"></asp:RequiredFieldValidator>
+                            <label id="lblPuntos" for="<%= TxtNombrePI.ClientID.ToString()%>">Nombre Punto De Interés:</label>
+                        </div>
+                        <div class="form-group form-md-line-input input-iconright" style="width: 80%; margin-bottom: 20px;">
+                            <asp:TextBox ID="TxtDescripcion" runat="server" CssClass="form-control" CausesValidation="true"></asp:TextBox>
+                            <asp:RequiredFieldValidator ID="RequiredFieldValidator8" runat="server" CssClass="help-block errorimput" ControlToValidate="TxtDescripcion" ErrorMessage="<b><span style='text-decoration: underline'>ERROR:</span></b><br />El campo <b>''Descripcion''</b> es necesario, por favor ingréselo." ValidationGroup="GrpPuntoInteres"></asp:RequiredFieldValidator>
+                            <label for="<%= TxtDescripcion.ClientID.ToString()%>">Descripción:</label>
+                        </div>
+                        <div class="row" style="margin-left: 0px; margin-top: 5px; margin-bottom: 5px; text-align: right" align="left">
+                            <div style="margin-right: 15px">
+                                <input type="text" id="TxtGVGrupo" class="form-control input-sm" onkeyup="<%= String.Format("FiltrarTabla('TxtGVGrupo','{0}')", GvGrupos.ClientID) %>" style="display: inline-block; margin-right: -20px; width: 150px;" />
+                                <a href="javascript:;" onclick="<%= String.Format("FiltrarTabla('TxtGVGrupo','{0}')", GvGrupos.ClientID) %>" style="margin-top: -3px;" class="btn btn-circle btn-sm label-info"><i class="icon-magnifier"></i></a>
+                            </div>
+                        </div>
+                        <asp:GridView ID="GvGrupos" runat="server" GridLines="None" DataKeyNames="CvePuntoDeInteresGrupo,PuntoDeInteresGrupo,Descripcion" CssClass="table table-striped table-advance table-hover Widthall ScrollAD" data-height="150" BorderWidth="1" BorderColor="#D3D3D3" CellSpacing="0" Width="100%" AutoGenerateColumns="False" EmptyDataText="No se encontraron registros">
+                            <Columns>
+                                <asp:BoundField DataField="PuntoDeInteresGrupo" ItemStyle-Width="45%" HeaderText="Agregar a Grupo" ItemStyle-HorizontalAlign="Left" />
+                                <asp:BoundField DataField="Descripcion" ItemStyle-Width="45%" HeaderText="Descripcion" ItemStyle-HorizontalAlign="Left" />
+                            </Columns>
+                        </asp:GridView>
+                    </div>
+                    <div class="modal-footer">
+                        <asp:LinkButton ID="BtnAgregarPunto" runat="server" CssClass="btn btn-primary" ValidationGroup="GrpPuntoInteres"> <i class='material-icons'>done_all</i> Agregar</asp:LinkButton>
+                        <button class="btn btn-default" data-dismiss="modal" value="Cancelar">Cancelar </button>
+                    </div>
+                </ContentTemplate>
+            </asp:UpdatePanel>
+        </div>
+    </div>
     <div runat="server" class="row" style="margin: 0px 0px 10px 0px; display: none">
         <asp:Button runat="server" OnClick="btnImprimir_Click" ID="btnImprimir" CommandArgument="PDF" ToolTip="Imprimir en PDF" CssClass="btn btn-circle mysmallbtn grey" Text="<i class='fa fa-print' aria-hidden='true'></i>"></asp:Button>
         <asp:Button runat="server" OnClick="btnImprimir_Click" ID="BtnImprimirEX" CommandArgument="EXCEL" ToolTip="Imprimir en EXCEL" CssClass="btn btn-circle btn-xs mysmallbtn green" Text="<i class='fa fa-file-excel-o' aria-hidden='true'></i>"></asp:Button>
@@ -906,6 +1040,11 @@
         var retorno;
         $('body').on('click', '.ChkAllClick input', function () { $(".ChkAllEvt input").not(this).prop('checked', $('.ChkAllClick input').is(':checked')); });
         $('body').on('click', '.ChkAllClick2 input', function () { $(".ChkAllEvt input").not(this).prop('checked', $('.ChkAllClick2 input').is(':checked')); });
+
+        $('body').on('click', '.ChkAllClickGeo input', function () { $(".ChkAllEvtGeo input").not(this).prop('checked', $('.ChkAllClickGeo input').is(':checked')); });
+        $('body').on('click', '.ChkAllClickRuta input', function () { $(".ChkAllEvtRuta input").not(this).prop('checked', $('.ChkAllClickRuta input').is(':checked')); });
+        $('body').on('click', '.ChkAllClickPI input', function () { $(".ChkAllEvtPI input").not(this).prop('checked', $('.ChkAllClickPI input').is(':checked')); });
+
         function initMap() {
             map = new google.maps.Map(document.getElementById('map'), {
                 center: { lat: 24.6345, lng: -102.5528 },
@@ -915,23 +1054,20 @@
             var ShowDiv1 = document.createElement('div');
             var ShowDivControl = new ShowDiv(ShowDiv1, map);
 
-
             ShowDiv1.index = 1;
             ShowDiv1.id = "showdiv1"
 
             map.controls[google.maps.ControlPosition.BOTTOM_CENTER].push(ShowDiv1);
 
-
             var upControlDiv = document.createElement('div');
             var upControl = new ControlLabels(upControlDiv, map);
 
             upControlDiv.index = 1;
             map.controls[google.maps.ControlPosition.TOP_LEFT].push(upControlDiv);
 
-            var upGeoDiv = document.createElement('div');
-            var upGeo = new ControlGeocercas(upGeoDiv, map);
-
-            map.controls[google.maps.ControlPosition.TOP_LEFT].push(upGeoDiv);
+            initGeocercas();
+            initGeoRutas();
+            initPI();
 
             geocoder = new google.maps.Geocoder();
 
@@ -1018,7 +1154,7 @@
                     }
                 });
             }, timeout + (j));
-        }
+            }
 
             function CalculaRutaHistorica(coordenadasRuta, lastCoord) {
                 if (coordenadasRuta.length > 0) {
@@ -1724,307 +1860,255 @@
                 var lng = posicion.lng
                 var url = '<%= ClsPaginas.UrlDirecciones%>' + 'nominatim/reverse.php?format=jsonv2&lat=' + lat + '&lon=' + lng;
 
-            $.getJSON(url, function (data) {
-                if (typeof (data.error) === 'undefined') {
-                    marker.formatted_address = data.display_name;
-                    var contenido = infowindow.getContent();
-                    debugger;
-                    if (contenido.indexOf("direccion") >= 0) {
-                        var html = $($.parseHTML(contenido));
-                        var dir = html.filter(".direccion");;
-                        dir.text("Dirección: " + data.display_name);
-                        var htmlstring = "";
-                        for (var i = 0; i < html.length; i++) {
-                            htmlstring = htmlstring.concat(html[i].outerHTML);
-                        }
-                        infowindow.setContent(htmlstring);
-                    } else {
-                        infowindow.setContent(contenido + "<div class='direccion' style='margin-left:5px'>" + "Dirección: " + data.display_name + "</div>");
-                    }
-                    if (indice > -1) {
-                        if (data.display_name.length > 74) {
-                            if (typeof (tr) !== 'undefined') {
-                                tr.cells[2].innerHTML = data.display_name.substring(0, 74) + '...'
-                            }
+                $.getJSON(url, function (data) {
+                    if (typeof (data.error) === 'undefined') {
+                        marker.formatted_address = data.display_name;
+                        var contenido = infowindow.getContent();
+                        debugger;
+                        if (contenido.indexOf("direccion") >= 0) {
+                            var html = $($.parseHTML(contenido));
+                            var dir = html.filter(".direccion");;
+                            dir.text("Dirección: " + data.display_name);
+                            var htmlstring = "";
+                            for (var i = 0; i < html.length; i++) {
+                                htmlstring = htmlstring.concat(html[i].outerHTML);
+                            }
+                            infowindow.setContent(htmlstring);
                         } else {
-                            if (typeof (tr) !== 'undefined') {
-                                tr.cells[2].innerHTML = data.display_name
+                            infowindow.setContent(contenido + "<div class='direccion' style='margin-left:5px'>" + "Dirección: " + data.display_name + "</div>");
+                        }
+                        if (indice > -1) {
+                            if (data.display_name.length > 74) {
+                                if (typeof (tr) !== 'undefined') {
+                                    tr.cells[2].innerHTML = data.display_name.substring(0, 74) + '...'
+                                }
+                            } else {
+                                if (typeof (tr) !== 'undefined') {
+                                    tr.cells[2].innerHTML = data.display_name
+                                }
                             }
                         }
-                    }
-                } else {
-                    marker.formatted_address = "Dirección no encontrada";
-                    if (contenido.indexOf("direccion") >= 0) {
-                        var html = $($.parseHTML(contenido));
-                        var dir = html.filter(".direccion");;
-                        dir.text("Dirección no encontrada");
-                        var htmlstring = "";
-                        for (var i = 0; i < html.length; i++) {
-                            htmlstring = htmlstring.concat(html[i].outerHTML);
-                        }
-                        infowindow.setContent(htmlstring);
                     } else {
-                        infowindow.setContent(infowindow.getContent() + "<div style='margin-left:5px'> Dirección: No Encontrada </div>");
-                    }
-
-                    if (indice) {
-                        var col = indice + 1
-                        var tr = $('#C_GvBarra tr').filter(':nth-child(' + col + ')')
-                        tr.find("td").filter(':nth-child(3)').html(results[0].formatted_address);
-                    }
-                }
-            });
-            //if (marker.formatted_address) { return false; }
-            //else if (marker.formatted_addressrow) {
-            //    infowindow.setContent(infowindow.getContent() + "<div style='margin-left:5px'>" + "Dirección: " + marker.formatted_addressrow + "</div>");
-            //    marker.formatted_address = marker.formatted_addressrow
-            //} else if ($("#C_GvBarra").DataTable().row(indice).node().cells[2].innerHTML.trim() != "Haga click para ver Dirección") {
-            //    marker.formatted_address = $("#C_GvBarra").DataTable().row(indice).node().cells[2].innerHTML.trim();
-            //    infowindow.setContent(infowindow.getContent() + "<div style='margin-left:5px'>" + "Dirección: " + $("#C_GvBarra").DataTable().row(indice).node().cells[2].innerHTML.trim() + "</div>");
-            //}
-            //else {
-
-            //}
-
-        }
-
-        var multiplicador = 1;
-        function doScaledTimeout(i, newPlay) {
-            if (newPlay) {
-                if (multiplicador >= 1 && multiplicador < i) {
-                    multiplicador++;
-                } else {
-                    multiplicador = 1;
-                }
-            } else {
-                multiplicador = i;
-            }
-            var to = setTimeout(function () {
-                pauseIndex = i;
-                $("#C_GvBarra").DataTable().rows(i).nodes().to$("#row0").click()
-            }, multiplicador * 250);
-            ejecuciones.push(to);
-        }
-        var indiceAnteriorKM = 0;
-        function doScaledCLickKM(boton, i) {
-            setTimeout(function () {
-                if (typeof ($("C_GVKm")) !== 'undefined') {
-                    if ($("[idgv='" + i + "']") != null) {
-                        $("[idgv='" + indiceAnteriorKM + "']").css("background-color", 'initial');
-                        $("[idgv='" + i + "']").css("background-color", '#F5B27A');
-                    }
-                }
-                indiceAnteriorKM = i;
-                $(boton).click();
-            }, 250);
-        }
-        function doScaledCLick(boton) {
-
-            setTimeout(function () {
-                $(boton).click();
-            }, 250);
-        }
-
-        function rad(x) { return x * Math.PI / 180; }
-
-        function find_closest_marker(LatLng, Opcion) {
-            var lat = LatLng.lat;
-            var lng = LatLng.lng;
-            var R = 6371; // radius of earth in km
-            var distances = [];
-            var closest = -1;
-            for (i = 0; i < markers.length; i++) {
-                var mlat = markers[i].position.lat();
-                var mlng = markers[i].position.lng();
-                var dLat = rad(mlat - lat);
-                var dLong = rad(mlng - lng);
-                var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-                    Math.cos(rad(lat)) * Math.cos(rad(lat)) * Math.sin(dLong / 2) * Math.sin(dLong / 2);
-                var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-                var d = R * c;
-                distances[i] = d;
-                if (closest == -1 || d < distances[closest]) {
-                    closest = i;
-                }
-            }
-            if (Opcion === 0) {
-                if (markers[closest].getAnimation() != google.maps.Animation.BOUNCE) {
-                    markers[closest].setAnimation(google.maps.Animation.BOUNCE);
-                } else {
-                    markers[closest].setAnimation(null);
-                }
-
-                stopAnimation(markers[closest])
-            }
-            //else if (Opcion === 1) {
-            //  google.maps.event.trigger(markers[closest], 'click')
-            //}
-        }
-
-        function stopAnimation(marker) {
-            setTimeout(function () {
-                marker.setAnimation(null);
-            }, 750);
-        }
-
-        function DeleteMarkers() {
-            for (var i = 0; i < markers.length; i++) {
-                markers[i].setMap(null);
-            }
-            markers = [];
-            for (var i = 0; i < polylines.length; i++) {
-                polylines[i].setMap(null);
-            }
-            polylines = [];
-            coordspoly = [];
-        }
-
-        function calculateAndDisplayRoute(origin, destination) {
-            directionsService.route({
-                origin: origin,
-                destination: destination,
-                travelMode: 'DRIVING'
-            }, function (response, status) {
-                if (status === 'OK') {
-                    directionsDisplay.setDirections(response);
-                    directionsDisplay.setMap(map);
-                } else {
-                    window.alert('Directions request failed due to ' + status);
-                }
-            });
-        }
-
-        function fitBoundsToVisibleMarkers() {
-
-            var bounds = new google.maps.LatLngBounds();
-
-            for (var i = 0; i < markers.length; i++) {
-                if (markers[i].getVisible()) {
-                    bounds.extend(markers[i].getPosition());
-                }
-            }
-
-            map.fitBounds(bounds);
-
-        }
-
-        function ShowDiv(controlDiv, map) {
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.style.backgroundColor = '#444d58';
-            controlUI.style.border = '2px solid #444d58';
-            controlUI.style.borderRadius = '3px';
-            controlUI.style.width = '100%'
-            controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
-            controlUI.style.cursor = 'pointer';
-            controlUI.style.marginRight = '5px';
-            controlUI.style.marginTop = '5px';
-            controlUI.style.marginBottom = '0px';
-            controlUI.style.textAlign = 'center';
-            //    controlUI.title = 'Click para borrar el último punto dibujado';
-            controlDiv.appendChild(controlUI);
-
-            // Set CSS for the control interior.
-            var controlText = document.createElement('div');
-            controlText.style.color = '#ebebeb';
-            controlText.id = "ShowDiv3"
-            controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
-            controlText.style.fontSize = '14px';
-            controlText.style.lineHeight = '20px';
-            controlText.style.paddingLeft = '5px';
-            controlText.style.paddingRight = '5px';
-            controlText.innerHTML = '<i class="fa fa-angle-up" aria-hidden="true"></i>';
-            controlUI.appendChild(controlText);
-
-            // Setup the click event listeners: simply set the map to Chicago.
-            controlUI.addEventListener('click', function () {
-                FNShowDiv();
-            });
-        }
-
-        var open = false;
-        var pause = true;
-        var startPlay = true;
-        var pauseIndex = 0;
-        var ejecuciones = [];
-        function stopTimeout() {
-            for (var i = 0; i < ejecuciones.length; i++) {
-                if (ejecuciones[i] != null) {
-                    clearTimeout(ejecuciones[i]);
-                }
-            }
-        }
-        function Play() {
-            var NoRows = $("#C_GvBarra").DataTable().rows().nodes().length;
-            $("#HdnOpcion").val("Play");
-            for (var i = pauseIndex; i < NoRows; i++) {
-                var newPlay = false;
-                if (pauseIndex > 0) {
-                    newPlay = true;
-                } else {
-                    newPlay = false;
-                }
-                doScaledTimeout(i, newPlay);
-            }
-            if (pauseIndex == (NoRows - 1)) {
-                pause = true;
-                startPlay = true;
-                pauseIndex = 0;
-            }
-        }
-        function OpcionesHistorico() {
-            if ($("#HdnOpcion").val() === 'All' || $("#HdnOpcion").val() === 'Idle' || $("#HdnOpcion").val() === 'Ralenti') {
-                $('#btnPlay').css('display', '');
-                $('#btnPrintExcel').css('display', '');
-                $('#btnPrintPDF').css('display', '');
-                $("#btnPlay").click(function () {
-                    pause = !pause;
-                    if (pause) {
-                        stopTimeout();
-                    } else {
-                        if (startPlay) {
-                            startPlay = false;
-                            Play();
+                        marker.formatted_address = "Dirección no encontrada";
+                        if (contenido.indexOf("direccion") >= 0) {
+                            var html = $($.parseHTML(contenido));
+                            var dir = html.filter(".direccion");;
+                            dir.text("Dirección no encontrada");
+                            var htmlstring = "";
+                            for (var i = 0; i < html.length; i++) {
+                                htmlstring = htmlstring.concat(html[i].outerHTML);
+                            }
+                            infowindow.setContent(htmlstring);
                         } else {
-                            Play();
-                        }
-                    }
-                    if ($('#btnPlay > i').hasClass("fa-pause")) {
-                        $('#btnPlay > i').removeClass("fa-pause").addClass("fa-play");
-                    } else if ($('#btnPlay > i').hasClass("fa-play")) {
-                        $('#btnPlay > i').removeClass("fa-play").addClass("fa-pause");
-                    }
+                            infowindow.setContent(infowindow.getContent() + "<div style='margin-left:5px'> Dirección: No Encontrada </div>");
+                        }
 
+                        if (indice) {
+                            var col = indice + 1
+                            var tr = $('#C_GvBarra tr').filter(':nth-child(' + col + ')')
+                            tr.find("td").filter(':nth-child(3)').html(results[0].formatted_address);
+                        }
+                    }
                 });
-                $("#btnPrintExcel").click(function () {
-                    var s;
-                    for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
-                        s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
-                    }
-                    $("#HdnDirecciones").val(s);
-                    doScaledCLick("#C_BtnImprimirEX")
-                });
-                $("#btnPrintPDF").click(function () {
-                    var s = "";
-                    for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
-                        s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
-                    }
-                    $("#HdnDirecciones").val(s);
-                    doScaledCLick("#C_btnImprimir")
-                });
-            }
-        }
-        function FNShowDiv() {
-            if (open === false) {
-                //$("#ChkSeguimiento").appendTo("#DivSeguimiento");
-                //$("#ChkSeguimiento").appendTo("#DivSeguimiento");
-                $("#h").modal()
-                $("#ShowDiv3").css("line-height", "34px")
-                open = true
-                $("#ShowDiv3").html('<i class="fa fa-angle-down" aria-hidden="true"></i>')
+                //if (marker.formatted_address) { return false; }
+                //else if (marker.formatted_addressrow) {
+                //    infowindow.setContent(infowindow.getContent() + "<div style='margin-left:5px'>" + "Dirección: " + marker.formatted_addressrow + "</div>");
+                //    marker.formatted_address = marker.formatted_addressrow
+                //} else if ($("#C_GvBarra").DataTable().row(indice).node().cells[2].innerHTML.trim() != "Haga click para ver Dirección") {
+                //    marker.formatted_address = $("#C_GvBarra").DataTable().row(indice).node().cells[2].innerHTML.trim();
+                //    infowindow.setContent(infowindow.getContent() + "<div style='margin-left:5px'>" + "Dirección: " + $("#C_GvBarra").DataTable().row(indice).node().cells[2].innerHTML.trim() + "</div>");
+                //}
+                //else {
+
+                //}
+
+            }
+
+            var multiplicador = 1;
+            function doScaledTimeout(i, newPlay) {
+                if (newPlay) {
+                    if (multiplicador >= 1 && multiplicador < i) {
+                        multiplicador++;
+                    } else {
+                        multiplicador = 1;
+                    }
+                } else {
+                    multiplicador = i;
+                }
+                var to = setTimeout(function () {
+                    pauseIndex = i;
+                    $("#C_GvBarra").DataTable().rows(i).nodes().to$("#row0").click()
+                }, multiplicador * 250);
+                ejecuciones.push(to);
+            }
+            var indiceAnteriorKM = 0;
+            function doScaledCLickKM(boton, i) {
                 setTimeout(function () {
-                    $('.table.ADScrollPaginator2').DataTable().draw();
-                }, 150);
+                    if (typeof ($("C_GVKm")) !== 'undefined') {
+                        if ($("[idgv='" + i + "']") != null) {
+                            $("[idgv='" + indiceAnteriorKM + "']").css("background-color", 'initial');
+                            $("[idgv='" + i + "']").css("background-color", '#F5B27A');
+                        }
+                    }
+                    indiceAnteriorKM = i;
+                    $(boton).click();
+                }, 250);
+            }
+            function doScaledCLick(boton) {
+
+                setTimeout(function () {
+                    $(boton).click();
+                }, 250);
+            }
+
+            function rad(x) { return x * Math.PI / 180; }
+
+            function find_closest_marker(LatLng, Opcion) {
+                var lat = LatLng.lat;
+                var lng = LatLng.lng;
+                var R = 6371; // radius of earth in km
+                var distances = [];
+                var closest = -1;
+                for (i = 0; i < markers.length; i++) {
+                    var mlat = markers[i].position.lat();
+                    var mlng = markers[i].position.lng();
+                    var dLat = rad(mlat - lat);
+                    var dLong = rad(mlng - lng);
+                    var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+                        Math.cos(rad(lat)) * Math.cos(rad(lat)) * Math.sin(dLong / 2) * Math.sin(dLong / 2);
+                    var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+                    var d = R * c;
+                    distances[i] = d;
+                    if (closest == -1 || d < distances[closest]) {
+                        closest = i;
+                    }
+                }
+                if (Opcion === 0) {
+                    if (markers[closest].getAnimation() != google.maps.Animation.BOUNCE) {
+                        markers[closest].setAnimation(google.maps.Animation.BOUNCE);
+                    } else {
+                        markers[closest].setAnimation(null);
+                    }
+
+                    stopAnimation(markers[closest])
+                }
+                //else if (Opcion === 1) {
+                //  google.maps.event.trigger(markers[closest], 'click')
+                //}
+            }
+
+            function stopAnimation(marker) {
+                setTimeout(function () {
+                    marker.setAnimation(null);
+                }, 750);
+            }
+
+            function DeleteMarkers() {
+                for (var i = 0; i < markers.length; i++) {
+                    markers[i].setMap(null);
+                }
+                markers = [];
+                for (var i = 0; i < polylines.length; i++) {
+                    polylines[i].setMap(null);
+                }
+                polylines = [];
+                coordspoly = [];
+            }
+
+            function calculateAndDisplayRoute(origin, destination) {
+                directionsService.route({
+                    origin: origin,
+                    destination: destination,
+                    travelMode: 'DRIVING'
+                }, function (response, status) {
+                    if (status === 'OK') {
+                        directionsDisplay.setDirections(response);
+                        directionsDisplay.setMap(map);
+                    } else {
+                        window.alert('Directions request failed due to ' + status);
+                    }
+                });
+            }
+
+            function fitBoundsToVisibleMarkers() {
+
+                var bounds = new google.maps.LatLngBounds();
+
+                for (var i = 0; i < markers.length; i++) {
+                    if (markers[i].getVisible()) {
+                        bounds.extend(markers[i].getPosition());
+                    }
+                }
+
+                map.fitBounds(bounds);
+
+            }
+
+            function ShowDiv(controlDiv, map) {
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.style.backgroundColor = '#444d58';
+                controlUI.style.border = '2px solid #444d58';
+                controlUI.style.borderRadius = '3px';
+                controlUI.style.width = '100%'
+                controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
+                controlUI.style.cursor = 'pointer';
+                controlUI.style.marginRight = '5px';
+                controlUI.style.marginTop = '5px';
+                controlUI.style.marginBottom = '0px';
+                controlUI.style.textAlign = 'center';
+                //    controlUI.title = 'Click para borrar el último punto dibujado';
+                controlDiv.appendChild(controlUI);
+
+                // Set CSS for the control interior.
+                var controlText = document.createElement('div');
+                controlText.style.color = '#ebebeb';
+                controlText.id = "ShowDiv3"
+                controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
+                controlText.style.fontSize = '14px';
+                controlText.style.lineHeight = '20px';
+                controlText.style.paddingLeft = '5px';
+                controlText.style.paddingRight = '5px';
+                controlText.innerHTML = '<i class="fa fa-angle-up" aria-hidden="true"></i>';
+                controlUI.appendChild(controlText);
+
+                // Setup the click event listeners: simply set the map to Chicago.
+                controlUI.addEventListener('click', function () {
+                    FNShowDiv();
+                });
+            }
+
+            var open = false;
+            var pause = true;
+            var startPlay = true;
+            var pauseIndex = 0;
+            var ejecuciones = [];
+            function stopTimeout() {
+                for (var i = 0; i < ejecuciones.length; i++) {
+                    if (ejecuciones[i] != null) {
+                        clearTimeout(ejecuciones[i]);
+                    }
+                }
+            }
+            function Play() {
+                var NoRows = $("#C_GvBarra").DataTable().rows().nodes().length;
+                $("#HdnOpcion").val("Play");
+                for (var i = pauseIndex; i < NoRows; i++) {
+                    var newPlay = false;
+                    if (pauseIndex > 0) {
+                        newPlay = true;
+                    } else {
+                        newPlay = false;
+                    }
+                    doScaledTimeout(i, newPlay);
+                }
+                if (pauseIndex == (NoRows - 1)) {
+                    pause = true;
+                    startPlay = true;
+                    pauseIndex = 0;
+                }
+            }
+            function OpcionesHistorico() {
                 if ($("#HdnOpcion").val() === 'All' || $("#HdnOpcion").val() === 'Idle' || $("#HdnOpcion").val() === 'Ralenti') {
                     $('#btnPlay').css('display', '');
                     $('#btnPrintExcel').css('display', '');
@@ -2064,936 +2148,986 @@
                         $("#HdnDirecciones").val(s);
                         doScaledCLick("#C_btnImprimir")
                     });
-                } else if ($("#HdnOpcion").val() === 'Speed') {
-
-                    $('#btnPrintExcel').css('display', '');
-                    $('#btnPrintPDF').css('display', '');
-
-                    $("#btnPrintExcel").click(function () {
-                        var s;
-                        for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
-                            s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
-                        }
-                        $("#HdnDirecciones").val(s);
-                        doScaledCLick("#C_BtnImprimirEX")
-                    });
-                    $("#btnPrintPDF").click(function () {
-                        var s = "";
-                        for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
-                            s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
-                        }
-                        $("#HdnDirecciones").val(s);
-                        doScaledCLick("#C_btnImprimir")
-                    });
-                } else if ($("#HdnOpcion").val() === 'Last') {
-                    $('#btnPrintExcel').css('display', '');
-                    $("#btnPrintExcel").click(function () {
-                        var s;
-                        for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
-                            s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
-                        }
-                        $("#HdnDirecciones").val(s);
-                        doScaledCLick("#C_BtnImprimirEX");
-                    });
-                }
-            } else {
-                $("#h").modal('hide')
-                $("#ShowDiv3").css("line-height", "20px")
-                open = false
-                $("#ShowDiv3").html('<i class="fa fa-angle-up" aria-hidden="true"></i>')
-            }
-        }
-
-        function CargaComandos(Vehiculo, CveDispositivo) {
-            //  if (open) { FNShowDiv(); }
-            $("#HdnCveDipositivo").val(CveDispositivo)
-            $("#myModalLabel").text("Comando para vehículo: " + Vehiculo)
-            closeLastOpenedInfoWindow();
-            $("#divComandos").modal()
-            $("#C_BtnCargaComandos").click()
-        }
-
-
-        //Region GEOREFERENCIAS
-        var mcoords = [];
-        var markersg = [];
-        var s = "";
-        var nextSegment;
-
-        function PreparaDibujado(index) {
-            if ($("#ULTIMOPUNTODV").length <= 0) {
-                var upControlDiv = document.createElement('div');
-                var upControl = new ControlUltimoPunto(upControlDiv, map);
-                upControlDiv.index = 1;
-                upControlDiv.id = "ULTIMOPUNTODV"
-                map.controls[google.maps.ControlPosition.TOP_RIGHT].push(upControlDiv);
-            }
-            if ($("#DVSELECT").length <= 0) {
-                var SelectControlDiv = document.createElement('div');
-                var SelectControl = new ControlSelect(SelectControlDiv, map);
-                SelectControlDiv.id = "DVSELECT"
-                SelectControlDiv.index = 1;
-                map.controls[google.maps.ControlPosition.TOP_LEFT].push(SelectControlDiv);
-                map.addListener('click', addLatLng);
-            }
-
-            if ($("#DvGuardar").length <= 0) {
-                var routeControlDiv = document.createElement('div');
-                var routeControl = new ControlGuardarRuta(routeControlDiv, map);
-                routeControlDiv.id = "DvGuardar"
-                if (typeof (index) !== 'undefined') {
-                    routeControlDiv.index = index;
-                }
-                map.controls[google.maps.ControlPosition.TOP_RIGHT].push(routeControlDiv);
-            }
-
-        }
-        function PreparaDibujadoHistorico() {
-            if ($("#DvGuardarHistorico").length <= 0) {
-                var routeControlDiv = document.createElement('div');
-                var routeControl = new ControlGuardarRutaHistorico(routeControlDiv, map);
-                routeControlDiv.id = "DvGuardarHistorico"
-                routeControlDiv.index = 2;
-                map.controls[google.maps.ControlPosition.TOP_RIGHT].push(routeControlDiv);
-            }
-        }
-
-        function TerminaDibujado() {
-            if ($("#ULTIMOPUNTODV").length > 0) {
-                $("#ULTIMOPUNTODV").remove()
-            }
-            if ($("#DVSELECT").length > 0) {
-                $("#DVSELECT").remove()
-                google.maps.event.clearListeners(map, 'click');
-                DeleteMarkersG();
-            }
-            if ($("#DvGuardar").length > 0) {
-                $("#DvGuardar").remove()
-            }
-        }
-
-        function ControlUltimoPunto(controlDiv, map) {
-
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.style.backgroundColor = '#fff';
-            controlUI.style.border = '2px solid #fff';
-            controlUI.style.borderRadius = '3px';
-            controlUI.style.width = '165px'
-            controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
-            controlUI.style.cursor = 'pointer';
-            controlUI.style.marginRight = '5px';
-            controlUI.style.marginTop = '5px';
-            controlUI.style.marginBottom = '22px';
-            controlUI.style.textAlign = 'center';
-            controlUI.title = 'Click para borrar el último punto dibujado';
-            controlDiv.appendChild(controlUI);
-
-            // Set CSS for the control interior.
-            var controlText = document.createElement('div');
-            controlText.style.color = 'rgb(25,25,25)';
-            controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
-            controlText.style.fontSize = '14px';
-            controlText.style.lineHeight = '38px';
-            controlText.style.paddingLeft = '5px';
-            controlText.style.paddingRight = '5px';
-            controlText.innerHTML = 'Borrar Último Punto';
-            controlUI.appendChild(controlText);
-
-            // Setup the click event listeners: simply set the map to Chicago.
-            controlUI.addEventListener('click', function () {
-                EliminarUltimoPunto();
-            });
-
-        }
-
-        function ControlSelect(controlDiv, map) {
-
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.style.marginLeft = '10px';
-            controlUI.style.zIndex = '0';
-            controlUI.style.cursor = 'pointer';
-            // controlUI.style.position = 'absolute';
-            controlUI.style.left = "0px";
-            controlUI.style.width = "150px";
-            controlUI.style.marginTop = "10px"
-            controlUI.style.top = "0px";
-            controlUI.className = 'gmnoprint';
-
-            controlDiv.appendChild(controlUI);
-
-            var ControlSub1 = document.createElement('div')
-            ControlSub1.style.float = 'left';
-            ControlSub1.className = 'gm-style-mtc'
-            controlUI.appendChild(ControlSub1)
-
-            var ControlSub2 = document.createElement('div')
-            ControlSub2.style.direction = 'ltr';
-            ControlSub2.style.overflow = 'hidden';
-            ControlSub2.id = "Geocerca"
-            ControlSub2.style.textAlign = 'center';
-            ControlSub2.style.position = 'relative';
-            ControlSub2.style.color = 'rgb(0,0,0)';
-            ControlSub2.style.fontFamily = ' "Open Sans", sans-serif; ';
-            ControlSub2.style.msUserSelect = 'none;';
-            ControlSub2.style.fontSize = '11px'
-            ControlSub2.style.backgroundColor = 'rgb(255,255,255)'
-            ControlSub2.style.padding = '11px'
-            ControlSub2.style.backgroundClip = 'padding-box'
-            ControlSub2.style.minWidth = '28px'
-            ControlSub2.style.fontWeight = '500'
-            ControlSub2.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
-            ControlSub2.innerHTML = 'Geocerca'
-            ControlSub1.appendChild(ControlSub2)
-
-            var ControlSub3 = document.createElement('div')
-            ControlSub3.style.float = 'left';
-            ControlSub3.className = 'gm-style-mtc'
-            controlUI.appendChild(ControlSub3)
-
-            var ControlSub4 = document.createElement('div')
-            ControlSub4.style.direction = 'ltr';
-            ControlSub4.style.overflow = 'hidden';
-            ControlSub4.style.textAlign = 'center';
-            ControlSub4.id = "Georuta"
-            ControlSub4.style.position = 'relative';
-            ControlSub4.style.color = 'rgb(86,86,86)';
-            ControlSub4.style.fontFamily = ' "Open Sans", sans-serif; ';
-            ControlSub4.style.msUserSelect = 'none;';
-            ControlSub4.style.fontSize = '11px'
-            ControlSub4.style.backgroundColor = 'rgb(255,255,255)'
-            ControlSub4.style.padding = '11px'
-            ControlSub4.style.backgroundClip = 'padding-box'
-            ControlSub4.style.minWidth = '38px'
-            ControlSub4.style.fontWeight = '500'
-            ControlSub4.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
-            ControlSub4.style.borderLeft = '0px;'
-            ControlSub4.innerHTML = 'Georuta'
-            ControlSub3.appendChild(ControlSub4)
-
-
-            // Setup the click event listeners: simply set the map to Chicago.
-            ControlSub3.addEventListener('click', function () {
-                CambiaTipo('Georuta');
-            });
-
-            ControlSub1.addEventListener('click', function () {
-                CambiaTipo('Geocerca');
-            });
-
-        }
-
-        function ControlColor(controlDiv, map) {
-
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.style.backgroundColor = '#fff';
-            controlUI.style.border = '2px solid #fff';
-            controlUI.style.borderRadius = '3px';
-            controlUI.style.pointer = '3px';
-            controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
-            controlUI.style.cursor = 'pointer';
-            controlUI.style.marginLeft = '10px';
-            controlUI.style.marginTop = '5px';
-            controlUI.style.marginBottom = '22px';
-            controlUI.style.textAlign = 'center';
-            controlUI.style.color = 'rgb(25,25,25)';
-            controlUI.style.fontFamily = ' "Open Sans", sans-serif; ';
-            controlUI.style.fontSize = '14px';
-            controlUI.style.paddingLeft = '5px';
-            controlUI.style.paddingRight = '5px';
-            controlUI.innerHTML = 'Cambiar Color '
-            controlUI.title = 'Click para cambiar el color del polygono';
-            controlDiv.appendChild(controlUI);
-
-            // Set CSS for the control interior.
-            var controlText = document.createElement('input');
-            controlText.type = 'hidden';
-            controlText.id = 'hidden-input'
-            controlText.className = 'demo'
-            controlText.value = '#0088FF'
-            controlText.onchange = function () { CambiaColor(); };
-            controlUI.appendChild(controlText);
-
-            // Setup the click event listeners: simply set the map to Chicago.
-            controlUI.addEventListener('click', function () {
-                ComponentsColorPickers.init();
-            });
-
-
-        }
-
-        function ControlGuardarRuta(controlDiv, map) {
-
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.id = "btnGuardarRuta"
-            controlUI.style.display = 'none';
-            controlUI.style.backgroundColor = '#4B77BE';
-            controlUI.style.color = "#fff";
-            controlUI.style.borderRadius = '3px';
-            controlUI.style.width = '165px'
-            controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
-            controlUI.style.cursor = 'pointer';
-            controlUI.style.marginRight = '5px';
-            controlUI.style.marginTop = '5px';
-            controlUI.style.marginBottom = '22px';
-            controlUI.style.textAlign = 'center';
-            controlUI.title = 'Guardar la ruta trazada como georeferencia';
-            controlDiv.appendChild(controlUI);
-
-            // Set CSS for the control interior.
-            var controlText = document.createElement('div');
-            controlText.style.color = '#fff';
-            controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
-            controlText.style.fontSize = '14px';
-            controlText.style.lineHeight = '38px';
-            controlText.style.paddingLeft = '5px';
-            controlText.style.paddingRight = '5px';
-            controlText.innerHTML = 'Guardar GeoReferencia';
-            controlUI.appendChild(controlText);
-
-            // Setup the click event listeners: simply set the map to Chicago.
-            controlUI.addEventListener('click', function () {
-                var r = polygon.getPath();
-                var s = "";
-                r.forEach(function (xy, i) { s += xy.lng() + ' ' + xy.lat() + ',' })
-                //s += r.j[0].lng() + ' ' + r.j[0].lat();
-                $("#GeoCerca").val(s);
-
-                $("#divAgregarGeoreferencia").modal();
-                $("#C_TxtNombre").val("")
-                $("#C_TxtTolerancia").val("")
-                $("#C_TxtFechaFG").val("")
-                $("#C_TxtFechaIG").val("")
-                $(".geo").checked = false
-            });
-
-        }
-        function CargaVehiculosHistoricos() {
-            var data = [];
-            for (var i = 0; i < geoRutasHistoricas.length; i++) {
-                var dato = {
-                    id: geoRutasHistoricas[i].ValueEquipo,
-                    text: geoRutasHistoricas[i].NombreEquipo
-                };
-                data.push(dato);
-            }
-
-            $("#C_DdlEquipoHis").select2({
-                data: data
-            });
-
-            $('#C_DdlEquipoHis').on('select2:select', function (e) {
-                var geoRuta = geoRutasHistoricas.filter(function (item) { return (item.ValueEquipo == parseInt($("#C_DdlEquipoHis").val())); })
-                if (geoRuta.length = 1) {
-                    $("#GeoRutaHistorico").val(JSON.stringify(geoRuta[0]));
-                }
-
-            });
-            $("#C_TxtNombreHis").val("")
-            $("#C_TxtToleHis").val("")
-            $("#C_TxtFechaIHis").val("")
-            $("#C_TxtFechaFHis").val("")
-            $(".geo").checked = false
-        }
-        var geoRutasHistoricas = [];
-        function ControlGuardarRutaHistorico(controlDiv, map) {
-
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.id = "btnGuardarRutaHistorico"
-            //controlUI.style.display = 'none';
-            controlUI.style.backgroundColor = '#4B77BE';
-            controlUI.style.color = "#fff";
-            controlUI.style.borderRadius = '3px';
-            controlUI.style.width = '165px'
-            controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
-            controlUI.style.cursor = 'pointer';
-            controlUI.style.marginRight = '5px';
-            controlUI.style.marginTop = '5px';
-            controlUI.style.marginBottom = '22px';
-            controlUI.style.textAlign = 'center';
-            controlUI.title = 'Guardar la ruta trazada como georeferencia';
-            controlDiv.appendChild(controlUI);
-
-            // Set CSS for the control interior.
-            var controlText = document.createElement('div');
-            controlText.style.color = '#fff';
-            controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
-            controlText.style.fontSize = '14px';
-            controlText.style.lineHeight = '38px';
-            controlText.style.paddingLeft = '5px';
-            controlText.style.paddingRight = '5px';
-            controlText.innerHTML = 'Guardar Ruta';
-            controlUI.appendChild(controlText);
-
-            // Setup the click event listeners: simply set the map to Chicago.
-            controlUI.addEventListener('click', function () {
-
-                CargaVehiculosHistoricos();
-
-                $("#divAgregarGeoreferenciaHistorico").modal('show');
-
-                if (geoRutasHistoricas.length > 0) {
-                    $('#C_DdlEquipoHis').val(geoRutasHistoricas[0].ValueEquipo).trigger('change.select2');
-                    $("#GeoRutaHistorico").val(JSON.stringify(geoRutasHistoricas[0]));
-                }
-            });
-
-        }
-
-        function CambiaTipo(Tipo) {
-            DeleteMarkersG();
-            if (Tipo === 'Geocerca') {
-                $("#HdnTipo").val('Geocerca')
-                $("#Geocerca").css("font-weight", "bold")
-                $("#Georuta").css("font-weight", "normal")
-            } else if (Tipo === 'Georuta') {
-                $("#HdnTipo").val('Georuta')
-                $("#Geocerca").css("font-weight", "normal")
-                $("#Georuta").css("font-weight", "bold")
-            }
-        }
-
-        function addLatLng(event) {
-            // var path = poly.getPath();
-            // path.push(event.latLng);
-            var lat = event.latLng.lat();
-            var lng = event.latLng.lng();
-            mcoords.push(event.latLng)
-
-            var info = new google.maps.InfoWindow({
-                content: "(" + lat + " " + lng + ")"
-            });
-
-            var marker = new google.maps.Marker({
-                position: event.latLng,
-                title: 'Punto',
-                map: map
-            });
-            markersg.push(marker);
-            marker.addListener('click', function () {
-                info.open(map, marker);
-            });
-            if ($("#HdnTipo").val() === 'Georuta') {
-                if (markersg.length > 1) {
-                    CreaRuta();
-                    $("#btnGuardarRuta").css("display", "")
                 }
             }
-            else if ($("#HdnTipo").val() === 'Geocerca') {
-                var h = $('#GeoCerca').val() + lng + " " + lat + ","
-                $('#GeoCerca').val(h)
-                if (markersg.length == 1) {
-                    $('#CommandArg').val(lng + " " + lat)
-                }
-                if (markersg.length === 3) {
-                    creaPoligono();
-                    $("#btnGuardarRuta").css("display", "")
-                } else if (markersg.length > 3) {
-                    var path = polygon.getPath();
-                    path.push(event.latLng)
-                }
-            }
-
-        }
-
-        function creaPoligono() {
-            polygon = new google.maps.Polygon({
-                paths: mcoords,
-                strokeColor: "#0088FF",
-                strokeOpacity: 0.8,
-                strokeWeight: 2,
-                fillColor: "#0088FF",
-                fillOpacity: 0.35,
-                editable: true
-            });
-            polygon.setMap(map);
-            $("#C_BtnCrear").prop('disabled', false);
-        }
-
-        function CreaRuta() {
-            var start = markersg[0].position;
-            var end = markersg[markersg.length - 1].position;
-            var waypts = [];
-            s = ""
-
-            for (var i = 1; i < markersg.length - 1; i++) {
-                waypts.push({
-                    location: markersg[i].position,
-                    stopover: true
-                });
-            }
-            directionsService.route({
-                origin: start,
-                destination: end,
-                travelMode: 'DRIVING',
-                waypoints: waypts
-            }, function (response, status) {
-                if (status === 'OK') {
-                    directionsDisplay.setDirections(response);
-                    directionsDisplay.setMap(map);
-
-                    var legs = response.routes[0].legs;
-                    for (i = 0; i < legs.length; i++) {
-                        var steps = legs[i].steps;
-                        for (j = 0; j < steps.length; j++) {
-                            var nextSegment = steps[j].path;
-                            for (k = 0; k < nextSegment.length; k++) {
-                                s = s + nextSegment[k] + '+'
+            function FNShowDiv() {
+                if (open === false) {
+                    //$("#ChkSeguimiento").appendTo("#DivSeguimiento");
+                    //$("#ChkSeguimiento").appendTo("#DivSeguimiento");
+                    $("#h").modal()
+                    $("#ShowDiv3").css("line-height", "34px")
+                    open = true
+                    $("#ShowDiv3").html('<i class="fa fa-angle-down" aria-hidden="true"></i>')
+                    setTimeout(function () {
+                        $('.table.ADScrollPaginator2').DataTable().draw();
+                    }, 150);
+                    if ($("#HdnOpcion").val() === 'All' || $("#HdnOpcion").val() === 'Idle' || $("#HdnOpcion").val() === 'Ralenti') {
+                        $('#btnPlay').css('display', '');
+                        $('#btnPrintExcel').css('display', '');
+                        $('#btnPrintPDF').css('display', '');
+                        $("#btnPlay").click(function () {
+                            pause = !pause;
+                            if (pause) {
+                                stopTimeout();
+                            } else {
+                                if (startPlay) {
+                                    startPlay = false;
+                                    Play();
+                                } else {
+                                    Play();
+                                }
+                            }
+                            if ($('#btnPlay > i').hasClass("fa-pause")) {
+                                $('#btnPlay > i').removeClass("fa-pause").addClass("fa-play");
+                            } else if ($('#btnPlay > i').hasClass("fa-play")) {
+                                $('#btnPlay > i').removeClass("fa-play").addClass("fa-pause");
                             }
-                        }
-                    }
-                    $('#CommandArg').val(s);
-                } else {
-                    window.alert('Directions request failed due to ' + status);
-                }
-            });
-        }
 
-        function EliminarUltimoPunto() {
-            if (markersg.length > 0) {
-                markersg[markersg.length - 1].setMap(null)
-                markersg.splice((markersg.length - 1), 1);
-                mcoords.splice((mcoords.length - 1), 1);
+                        });
+                        $("#btnPrintExcel").click(function () {
+                            var s;
+                            for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
+                                s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
+                            }
+                            $("#HdnDirecciones").val(s);
+                            doScaledCLick("#C_BtnImprimirEX")
+                        });
+                        $("#btnPrintPDF").click(function () {
+                            var s = "";
+                            for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
+                                s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
+                            }
+                            $("#HdnDirecciones").val(s);
+                            doScaledCLick("#C_btnImprimir")
+                        });
+                    } else if ($("#HdnOpcion").val() === 'Speed') {
+
+                        $('#btnPrintExcel').css('display', '');
+                        $('#btnPrintPDF').css('display', '');
+
+                        $("#btnPrintExcel").click(function () {
+                            var s;
+                            for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
+                                s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
+                            }
+                            $("#HdnDirecciones").val(s);
+                            doScaledCLick("#C_BtnImprimirEX")
+                        });
+                        $("#btnPrintPDF").click(function () {
+                            var s = "";
+                            for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
+                                s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
+                            }
+                            $("#HdnDirecciones").val(s);
+                            doScaledCLick("#C_btnImprimir")
+                        });
+                    } else if ($("#HdnOpcion").val() === 'Last') {
+                        $('#btnPrintExcel').css('display', '');
+                        $("#btnPrintExcel").click(function () {
+                            var s;
+                            for (var i = 0; i < $("#C_GvBarra").DataTable().rows().nodes().length; i++) {
+                                s = s + $("#C_GvBarra").DataTable().row(i).node().cells[2].title.trim() + ';';
+                            }
+                            $("#HdnDirecciones").val(s);
+                            doScaledCLick("#C_BtnImprimirEX");
+                        });
+                    }
+                } else {
+                    $("#h").modal('hide')
+                    $("#ShowDiv3").css("line-height", "20px")
+                    open = false
+                    $("#ShowDiv3").html('<i class="fa fa-angle-up" aria-hidden="true"></i>')
+                }
+            }
+
+            function CargaComandos(Vehiculo, CveDispositivo) {
+                //  if (open) { FNShowDiv(); }
+                $("#HdnCveDipositivo").val(CveDispositivo)
+                $("#myModalLabel").text("Comando para vehículo: " + Vehiculo)
+                closeLastOpenedInfoWindow();
+                $("#divComandos").modal()
+                $("#C_BtnCargaComandos").click()
+            }
+
+
+            //Region GEOREFERENCIAS
+            var mcoords = [];
+            var markersg = [];
+            var s = "";
+            var nextSegment;
+
+            function PreparaDibujado(index) {
+                if ($("#ULTIMOPUNTODV").length <= 0) {
+                    var upControlDiv = document.createElement('div');
+                    var upControl = new ControlUltimoPunto(upControlDiv, map);
+                    upControlDiv.index = 1;
+                    upControlDiv.id = "ULTIMOPUNTODV"
+                    map.controls[google.maps.ControlPosition.TOP_RIGHT].push(upControlDiv);
+                }
+                if ($("#DVSELECT").length <= 0) {
+                    var SelectControlDiv = document.createElement('div');
+                    var SelectControl = new ControlSelect(SelectControlDiv, map);
+                    SelectControlDiv.id = "DVSELECT"
+                    SelectControlDiv.index = 1;
+                    map.controls[google.maps.ControlPosition.TOP_LEFT].push(SelectControlDiv);
+                    map.addListener('click', addLatLng);
+                    CambiaTipo("Geocerca");
+                }
+
+                if ($("#DvGuardar").length <= 0) {
+                    var routeControlDiv = document.createElement('div');
+                    var routeControl = new ControlGuardarRuta(routeControlDiv, map);
+                    routeControlDiv.id = "DvGuardar"
+                    if (typeof (index) !== 'undefined') {
+                        routeControlDiv.index = index;
+                    }
+                    map.controls[google.maps.ControlPosition.TOP_RIGHT].push(routeControlDiv);
+                }
+
+                if ($("#DvGuardarPI").length <= 0) {
+                    var routeControlDiv = document.createElement('div');
+                    var routeControl = new ControlGuardarPuntoInteres(routeControlDiv, map);
+                    routeControlDiv.id = "DvGuardarPI"
+                    if (typeof (index) !== 'undefined') {
+                        routeControlDiv.index = index + 1;
+                    }
+                    map.controls[google.maps.ControlPosition.TOP_RIGHT].push(routeControlDiv);
+                }
+
+            }
+            function PreparaDibujadoHistorico() {
+                if ($("#DvGuardarHistorico").length <= 0) {
+                    var routeControlDiv = document.createElement('div');
+                    var routeControl = new ControlGuardarRutaHistorico(routeControlDiv, map);
+                    routeControlDiv.id = "DvGuardarHistorico"
+                    routeControlDiv.index = 2;
+                    map.controls[google.maps.ControlPosition.TOP_RIGHT].push(routeControlDiv);
+                }
+            }
+
+            function TerminaDibujado() {
+                if ($("#ULTIMOPUNTODV").length > 0) {
+                    $("#ULTIMOPUNTODV").remove()
+                }
+                if ($("#DVSELECT").length > 0) {
+                    $("#DVSELECT").remove()
+                    google.maps.event.clearListeners(map, 'click');
+                    DeleteMarkersG();
+                }
+                if ($("#DvGuardar").length > 0) {
+                    $("#DvGuardar").remove()
+                }
+            }
+
+            function ControlUltimoPunto(controlDiv, map) {
+
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.style.backgroundColor = '#fff';
+                controlUI.style.border = '2px solid #fff';
+                controlUI.style.borderRadius = '3px';
+                controlUI.style.width = '165px'
+                controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
+                controlUI.style.cursor = 'pointer';
+                controlUI.style.marginRight = '5px';
+                controlUI.style.marginTop = '5px';
+                controlUI.style.marginBottom = '22px';
+                controlUI.style.textAlign = 'center';
+                controlUI.title = 'Click para borrar el último punto dibujado';
+                controlDiv.appendChild(controlUI);
+
+                // Set CSS for the control interior.
+                var controlText = document.createElement('div');
+                controlText.style.color = 'rgb(25,25,25)';
+                controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
+                controlText.style.fontSize = '14px';
+                controlText.style.lineHeight = '38px';
+                controlText.style.paddingLeft = '5px';
+                controlText.style.paddingRight = '5px';
+                controlText.innerHTML = 'Borrar Último Punto';
+                controlUI.appendChild(controlText);
+
+                // Setup the click event listeners: simply set the map to Chicago.
+                controlUI.addEventListener('click', function () {
+                    EliminarUltimoPunto();
+                });
+
+            }
+
+            function ControlSelect(controlDiv, map) {
+
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.style.marginLeft = '10px';
+                controlUI.style.zIndex = '0';
+                controlUI.style.cursor = 'pointer';
+                // controlUI.style.position = 'absolute';
+                controlUI.style.left = "0px";
+                controlUI.style.width = "400px";
+                controlUI.style.marginTop = "10px"
+                controlUI.style.top = "0px";
+                controlUI.className = 'gmnoprint';
+
+                controlDiv.appendChild(controlUI);
+
+                var ControlSub1 = document.createElement('div')
+                ControlSub1.style.float = 'left';
+                ControlSub1.className = 'gm-style-mtc'
+                controlUI.appendChild(ControlSub1)
+
+                var ControlSub2 = document.createElement('div')
+                ControlSub2.style.direction = 'ltr';
+                ControlSub2.style.overflow = 'hidden';
+                ControlSub2.id = "Geocerca"
+                ControlSub2.style.textAlign = 'center';
+                ControlSub2.style.position = 'relative';
+                ControlSub2.style.color = 'rgb(0,0,0)';
+                ControlSub2.style.fontFamily = ' "Open Sans", sans-serif; ';
+                ControlSub2.style.msUserSelect = 'none;';
+                ControlSub2.style.fontSize = '11px'
+                ControlSub2.style.backgroundColor = 'rgb(255,255,255)'
+                ControlSub2.style.padding = '11px'
+                ControlSub2.style.backgroundClip = 'padding-box'
+                ControlSub2.style.minWidth = '28px'
+                ControlSub2.style.fontWeight = '500'
+                ControlSub2.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
+                ControlSub2.innerHTML = 'Dibujar Geocerca'
+                ControlSub1.appendChild(ControlSub2)
+
+                var ControlSub3 = document.createElement('div')
+                ControlSub3.style.float = 'left';
+                ControlSub3.className = 'gm-style-mtc'
+                controlUI.appendChild(ControlSub3)
+
+                var ControlSub4 = document.createElement('div')
+                ControlSub4.style.direction = 'ltr';
+                ControlSub4.style.overflow = 'hidden';
+                ControlSub4.style.textAlign = 'center';
+                ControlSub4.id = "Georuta"
+                ControlSub4.style.position = 'relative';
+                ControlSub4.style.color = 'rgb(86,86,86)';
+                ControlSub4.style.fontFamily = ' "Open Sans", sans-serif; ';
+                ControlSub4.style.msUserSelect = 'none;';
+                ControlSub4.style.fontSize = '11px'
+                ControlSub4.style.backgroundColor = 'rgb(255,255,255)'
+                ControlSub4.style.padding = '11px'
+                ControlSub4.style.backgroundClip = 'padding-box'
+                ControlSub4.style.minWidth = '38px'
+                ControlSub4.style.fontWeight = '500'
+                ControlSub4.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
+                ControlSub4.style.borderLeft = '0px;'
+                ControlSub4.innerHTML = 'Dibujar Georuta'
+                ControlSub3.appendChild(ControlSub4)
+
+                var ControlSub5 = document.createElement('div')
+                ControlSub5.style.float = 'left';
+                ControlSub5.className = 'gm-style-mtc'
+                controlUI.appendChild(ControlSub5)
+
+                var ControlSub6 = document.createElement('div')
+                ControlSub6.style.direction = 'ltr';
+                ControlSub6.style.overflow = 'hidden';
+                ControlSub6.style.textAlign = 'center';
+                ControlSub6.id = "PuntoInteres"
+                ControlSub6.style.position = 'relative';
+                ControlSub6.style.color = 'rgb(86,86,86)';
+                ControlSub6.style.fontFamily = ' "Open Sans", sans-serif; ';
+                ControlSub6.style.msUserSelect = 'none;';
+                ControlSub6.style.fontSize = '11px'
+                ControlSub6.style.backgroundColor = 'rgb(255,255,255)'
+                ControlSub6.style.padding = '11px'
+                ControlSub6.style.backgroundClip = 'padding-box'
+                ControlSub6.style.minWidth = '38px'
+                ControlSub6.style.fontWeight = '500'
+                ControlSub6.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
+                ControlSub6.style.borderLeft = '0px;'
+                ControlSub6.innerHTML = 'Dibujar Punto de Interés'
+                ControlSub5.appendChild(ControlSub6)
+
+                // Setup the click event listeners: simply set the map to Chicago.
+                ControlSub5.addEventListener('click', function () {
+                    CambiaTipo('PuntoInteres');
+                });
+
+                ControlSub3.addEventListener('click', function () {
+                    CambiaTipo('Georuta');
+                });
+
+                ControlSub1.addEventListener('click', function () {
+                    CambiaTipo('Geocerca');
+                });
+
+            }
+
+            function ControlColor(controlDiv, map) {
+
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.style.backgroundColor = '#fff';
+                controlUI.style.border = '2px solid #fff';
+                controlUI.style.borderRadius = '3px';
+                controlUI.style.pointer = '3px';
+                controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
+                controlUI.style.cursor = 'pointer';
+                controlUI.style.marginLeft = '10px';
+                controlUI.style.marginTop = '5px';
+                controlUI.style.marginBottom = '22px';
+                controlUI.style.textAlign = 'center';
+                controlUI.style.color = 'rgb(25,25,25)';
+                controlUI.style.fontFamily = ' "Open Sans", sans-serif; ';
+                controlUI.style.fontSize = '14px';
+                controlUI.style.paddingLeft = '5px';
+                controlUI.style.paddingRight = '5px';
+                controlUI.innerHTML = 'Cambiar Color '
+                controlUI.title = 'Click para cambiar el color del polygono';
+                controlDiv.appendChild(controlUI);
+
+                // Set CSS for the control interior.
+                var controlText = document.createElement('input');
+                controlText.type = 'hidden';
+                controlText.id = 'hidden-input'
+                controlText.className = 'demo'
+                controlText.value = '#0088FF'
+                controlText.onchange = function () { CambiaColor(); };
+                controlUI.appendChild(controlText);
+
+                // Setup the click event listeners: simply set the map to Chicago.
+                controlUI.addEventListener('click', function () {
+                    ComponentsColorPickers.init();
+                });
+
+
+            }
+
+            function ControlGuardarRuta(controlDiv, map) {
+
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.id = "btnGuardarRuta"
+                controlUI.style.display = 'none';
+                controlUI.style.backgroundColor = '#4B77BE';
+                controlUI.style.color = "#fff";
+                controlUI.style.borderRadius = '3px';
+                controlUI.style.width = '165px'
+                controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
+                controlUI.style.cursor = 'pointer';
+                controlUI.style.marginRight = '5px';
+                controlUI.style.marginTop = '5px';
+                controlUI.style.marginBottom = '22px';
+                controlUI.style.textAlign = 'center';
+                controlUI.title = 'Guardar la ruta trazada como georeferencia';
+                controlDiv.appendChild(controlUI);
+
+                // Set CSS for the control interior.
+                var controlText = document.createElement('div');
+                controlText.style.color = '#fff';
+                controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
+                controlText.style.fontSize = '14px';
+                controlText.style.lineHeight = '38px';
+                controlText.style.paddingLeft = '5px';
+                controlText.style.paddingRight = '5px';
+                controlText.innerHTML = 'Guardar GeoReferencia';
+                controlUI.appendChild(controlText);
+
+                // Setup the click event listeners: simply set the map to Chicago.
+                controlUI.addEventListener('click', function () {
+                    var r = polygon.getPath();
+                    var s = "";
+                    r.forEach(function (xy, i) { s += xy.lng() + ' ' + xy.lat() + ',' })
+                    //s += r.j[0].lng() + ' ' + r.j[0].lat();
+                    $("#GeoCerca").val(s);
+
+                    $("#divAgregarGeoreferencia").modal();
+                    $("#C_TxtNombre").val("")
+                    $("#C_TxtTolerancia").val("")
+                    $("#C_TxtFechaFG").val("")
+                    $("#C_TxtFechaIG").val("")
+                    $(".geo").checked = false
+                });
+
+            }
+
+            function CargaVehiculosHistoricos() {
+                var data = [];
+                for (var i = 0; i < geoRutasHistoricas.length; i++) {
+                    var dato = {
+                        id: geoRutasHistoricas[i].ValueEquipo,
+                        text: geoRutasHistoricas[i].NombreEquipo
+                    };
+                    data.push(dato);
+                }
+
+                $("#C_DdlEquipoHis").select2({
+                    data: data
+                });
+
+                $('#C_DdlEquipoHis').on('select2:select', function (e) {
+                    var geoRuta = geoRutasHistoricas.filter(function (item) { return (item.ValueEquipo == parseInt($("#C_DdlEquipoHis").val())); })
+                    if (geoRuta.length = 1) {
+                        $("#GeoRutaHistorico").val(JSON.stringify(geoRuta[0]));
+                    }
+
+                });
+                $("#C_TxtNombreHis").val("")
+                $("#C_TxtToleHis").val("")
+                $("#C_TxtFechaIHis").val("")
+                $("#C_TxtFechaFHis").val("")
+                $(".geo").checked = false
+            }
+            var geoRutasHistoricas = [];
+            function ControlGuardarRutaHistorico(controlDiv, map) {
+
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.id = "btnGuardarRutaHistorico"
+                //controlUI.style.display = 'none';
+                controlUI.style.backgroundColor = '#4B77BE';
+                controlUI.style.color = "#fff";
+                controlUI.style.borderRadius = '3px';
+                controlUI.style.width = '165px'
+                controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
+                controlUI.style.cursor = 'pointer';
+                controlUI.style.marginRight = '5px';
+                controlUI.style.marginTop = '5px';
+                controlUI.style.marginBottom = '22px';
+                controlUI.style.textAlign = 'center';
+                controlUI.title = 'Guardar la ruta trazada como georeferencia';
+                controlDiv.appendChild(controlUI);
+
+                // Set CSS for the control interior.
+                var controlText = document.createElement('div');
+                controlText.style.color = '#fff';
+                controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
+                controlText.style.fontSize = '14px';
+                controlText.style.lineHeight = '38px';
+                controlText.style.paddingLeft = '5px';
+                controlText.style.paddingRight = '5px';
+                controlText.innerHTML = 'Guardar Ruta';
+                controlUI.appendChild(controlText);
+
+                // Setup the click event listeners: simply set the map to Chicago.
+                controlUI.addEventListener('click', function () {
+
+                    CargaVehiculosHistoricos();
+
+                    $("#divAgregarGeoreferenciaHistorico").modal('show');
+
+                    if (geoRutasHistoricas.length > 0) {
+                        $('#C_DdlEquipoHis').val(geoRutasHistoricas[0].ValueEquipo).trigger('change.select2');
+                        $("#GeoRutaHistorico").val(JSON.stringify(geoRutasHistoricas[0]));
+                    }
+                });
+
+            }
+
+            function ControlGuardarPuntoInteres(controlDiv, map) {
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.id = "btnGuardarPuntoInteres"
+                controlUI.style.display = 'none';
+                controlUI.style.backgroundColor = '#4B77BE';
+                controlUI.style.color = "#fff";
+                controlUI.style.borderRadius = '3px';
+                controlUI.style.width = '165px'
+                controlUI.style.boxShadow = '0 2px 6px rgba(0,0,0,.3)';
+                controlUI.style.cursor = 'pointer';
+                controlUI.style.marginRight = '5px';
+                controlUI.style.marginTop = '5px';
+                controlUI.style.marginBottom = '22px';
+                controlUI.style.textAlign = 'center';
+                controlUI.title = 'Guardar el punto de interés';
+                controlDiv.appendChild(controlUI);
+
+                // Set CSS for the control interior.
+                var controlText = document.createElement('div');
+                controlText.style.color = '#fff';
+                controlText.style.fontFamily = ' "Open Sans", sans-serif; ';
+                controlText.style.fontSize = '14px';
+                controlText.style.lineHeight = '38px';
+                controlText.style.paddingLeft = '5px';
+                controlText.style.paddingRight = '5px';
+                controlText.innerHTML = 'Guardar Punto de Interés';
+                controlUI.appendChild(controlText);
+
+                // Setup the click event listeners: simply set the map to Chicago.
+                controlUI.addEventListener('click', function () {
+
+                    $("#C_TxtNombrePI").val("")
+                    $("#C_TxtDescripcion").val("")
+                    $("#HdnGrupo").val("-1");
+                    $("#GeoCerca").val("");
+
+                    if (markersg.length > 0) {
+                        var punto = "(" + markersg[0].position.lng() + ' ' + markersg[0].position.lat() + ")";
+                        $("#GeoCerca").val(punto);
+                        $("#DivAgregarPuntoInteres").modal({ backdrop: 'static', keyboard: false });
+                    } else {
+                        alert("No hay puntos de interés en el mapa");
+                    }
+                });
+
+            }
+            var indiceAnteriorPI = 0;
+            function CargaDatosSeleccionadosPI(indice, valor) {
+                var columnaSeleccionada = 2 + indice;
+                $('#HdnGrupo').val(valor);
+                $('#C_GvGrupos tr').filter(':nth-child(' + indiceAnterior + ')').css('background-color', 'initial');
+                $('#C_GvGrupos tr').filter(':nth-child(' + columnaSeleccionada + ')').css('background-color', '#F5B27A');
+                indiceAnteriorPI = columnaSeleccionada;
+            }
+            function CambiaTipo(Tipo) {
+                DeleteMarkersG();
+                if (Tipo === 'Geocerca') {
+                    $("#HdnTipo").val('Geocerca')
+                    SelectBoton("Geocerca");
+                    DeselectBoton("Georuta");
+                    DeselectBoton("PuntoInteres");
+                } else if (Tipo === 'Georuta') {
+                    $("#HdnTipo").val('Georuta')
+                    SelectBoton("Georuta");
+                    DeselectBoton("Geocerca");
+                    DeselectBoton("PuntoInteres");
+                } else if (Tipo === 'PuntoInteres') {
+                    $("#HdnTipo").val('PuntoInteres')
+                    SelectBoton("PuntoInteres");
+                    DeselectBoton("Geocerca");
+                    DeselectBoton("Georuta");
+                }
+            }
+            function SelectBoton(boton) {
+                $("#" + boton).css("background-color", "#3598DC");
+                $("#" + boton).css("color", "white");
+            }
+            function DeselectBoton(boton) {
+                $("#" + boton).css("background-color", "rgb(255, 255, 255)");
+                $("#" + boton).css("color", "black");
+            }
+
+            function addLatLng(event) {
+                //SOLO SE PUEDE AGREGAR UN PUNTO DE INTERES A LA VEZ
+                if (markersg.length >= 1 && $("#HdnTipo").val() === 'PuntoInteres') {
+                    $("#btnGuardarPuntoInteres").css("display", "")
+                    return;
+                }
+
+                var lat = event.latLng.lat();
+                var lng = event.latLng.lng();
+                mcoords.push(event.latLng)
+
+                var info = new google.maps.InfoWindow({
+                    content: "(" + lat + " " + lng + ")"
+                });
+
+                var marker = new google.maps.Marker({
+                    position: event.latLng,
+                    title: 'Punto',
+                    map: map
+                });
+                markersg.push(marker);
+                marker.addListener('click', function () {
+                    info.open(map, marker);
+                });
+
                 if ($("#HdnTipo").val() === 'Georuta') {
-                    if (markersg.length >= 2) {
-                        CreaRuta();
-                    } else { directionsDisplay.setMap(null); $("#btnGuardarRuta").css("display", "none"); }
+                    if (markersg.length > 1) {
+                        CreaRuta();
+                        $("#btnGuardarRuta").css("display", "")
+                    }
                 }
                 else if ($("#HdnTipo").val() === 'Geocerca') {
-                    if (typeof polygon != 'undefined') {
-                        polygon.setMap(null);
-                        if (markersg.length >= 3) {
-                            creaPoligono($("#hidden-input").val());
-                        } else {
-                            $("#btnGuardarRuta").css("display", "none")
-                        }
+                    var h = $('#GeoCerca').val() + lng + " " + lat + ","
+                    $('#GeoCerca').val(h)
+                    if (markersg.length == 1) {
+                        $('#CommandArg').val(lng + " " + lat)
                     }
-                    var h;
-                    $('#GeoCerca').val('')
-                    for (var i = 0; i < mcoords.length; i++) {
-                        var lat = mcoords[i].lat()
-                        var lng = mcoords[i].lng()
-                        h = $('#GeoCerca').val() + lng + " " + lat + ","
-                        $('#GeoCerca').val(h)
-                        if (i === 0) {
-                            $('#CommandArg').val(lng + " " + lat)
+                    if (markersg.length === 3) {
+                        creaPoligono();
+                        $("#btnGuardarRuta").css("display", "")
+                    } else if (markersg.length > 3) {
+                        var path = polygon.getPath();
+                        path.push(event.latLng)
+                    }
+                } else if ($("#HdnTipo").val() === 'PuntoInteres') {
+                    if (markersg.length > 0) {
+                        $("#btnGuardarPuntoInteres").css("display", "")
+                    }
+                }
+
+            }
+
+            function creaPoligono() {
+                polygon = new google.maps.Polygon({
+                    paths: mcoords,
+                    strokeColor: "#0088FF",
+                    strokeOpacity: 0.8,
+                    strokeWeight: 2,
+                    fillColor: "#0088FF",
+                    fillOpacity: 0.35,
+                    editable: true
+                });
+                polygon.setMap(map);
+                $("#C_BtnCrear").prop('disabled', false);
+            }
+
+            function CreaRuta() {
+                var start = markersg[0].position;
+                var end = markersg[markersg.length - 1].position;
+                var waypts = [];
+                s = ""
+
+                for (var i = 1; i < markersg.length - 1; i++) {
+                    waypts.push({
+                        location: markersg[i].position,
+                        stopover: true
+                    });
+                }
+                directionsService.route({
+                    origin: start,
+                    destination: end,
+                    travelMode: 'DRIVING',
+                    waypoints: waypts
+                }, function (response, status) {
+                    if (status === 'OK') {
+                        directionsDisplay.setDirections(response);
+                        directionsDisplay.setMap(map);
+
+                        var legs = response.routes[0].legs;
+                        for (i = 0; i < legs.length; i++) {
+                            var steps = legs[i].steps;
+                            for (j = 0; j < steps.length; j++) {
+                                var nextSegment = steps[j].path;
+                                for (k = 0; k < nextSegment.length; k++) {
+                                    s = s + nextSegment[k] + '+'
+                                }
+                            }
+                        }
+                        $('#CommandArg').val(s);
+                    } else {
+                        window.alert('Directions request failed due to ' + status);
+                    }
+                });
+            }
+
+            function EliminarUltimoPunto() {
+                if (markersg.length > 0) {
+                    markersg[markersg.length - 1].setMap(null)
+                    markersg.splice((markersg.length - 1), 1);
+                    mcoords.splice((mcoords.length - 1), 1);
+
+                    if ($("#HdnTipo").val() === 'Georuta') {
+                        if (markersg.length >= 2) {
+                            CreaRuta();
+                        } else { directionsDisplay.setMap(null); $("#btnGuardarRuta").css("display", "none"); }
+                    } else if ($("#HdnTipo").val() === 'Geocerca') {
+                        if (typeof polygon != 'undefined') {
+                            polygon.setMap(null);
+                            if (markersg.length >= 3) {
+                                creaPoligono($("#hidden-input").val());
+                            } else {
+                                $("#btnGuardarRuta").css("display", "none")
+                            }
+                        }
+                        var h;
+                        $('#GeoCerca').val('')
+                        for (var i = 0; i < mcoords.length; i++) {
+                            var lat = mcoords[i].lat()
+                            var lng = mcoords[i].lng()
+                            h = $('#GeoCerca').val() + lng + " " + lat + ","
+                            $('#GeoCerca').val(h)
+                            if (i === 0) {
+                                $('#CommandArg').val(lng + " " + lat)
+                            }
+                        }
+                    } else if ($("#HdnTipo").val() === 'PuntoInteres') {
+                        if (markersg.length <= 0) {
+                            $("#btnGuardarPuntoInteres").css("display", "none")
                         }
                     }
                 }
-            }
-        }
-
-        function DeleteMarkersG() {
-            for (var i = 0; i < markersg.length; i++) {
-                markersg[i].setMap(null);
             }
-            markersg = [];
-            directionsDisplay.setMap(null);
-            mcoords = [];
-            $('#GeoCerca').val('')
-            if (typeof polygon != 'undefined') {
-                polygon.setMap(null);
-            }
-            $("#btnGuardarRuta").css("display", "none")
-        }
 
-        function CambiaColor() {
-            $("#C_TxtColor").val($("#hidden-input").val())
-        }
-        function CambiaColorH() {
-            $("#C_TxtColorH").val($("#hidden-input-Hist").val())
-        }
-
-        function Limpieza() {
-            DeleteMarkersG();
-            //$('#C_TxtHoraI').datetimepicker({
-            //    datepicker: false,
-            //    lang: 'es',
-            //    format: 'H:i',
-            //    formatDate: 'H:i',
-            //    step: 30
-            //});
-            //$('#C_TxtHoraF').datetimepicker({
-            //    datepicker: false,
-            //    lang: 'es',
-            //    format: 'H:i',
-            //    formatDate: 'H:i',
-            //    step: 30
-            //});
-            $('#divAgregarGeoreferencia').modal('hide');
-        }
-        function ControlLabels(controlDiv, map) {
-
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.style.marginLeft = '10px';
-            controlUI.style.zIndex = '0';
-            controlUI.style.cursor = 'pointer';
-            // controlUI.style.position = 'absolute';
-            controlUI.style.left = "0px";
-            controlUI.style.width = "150px";
-            controlUI.style.marginTop = "10px"
-            controlUI.style.top = "0px";
-            controlUI.className = 'gmnoprint';
-
-            controlDiv.appendChild(controlUI);
-
-            var ControlSub1 = document.createElement('div')
-            ControlSub1.style.float = 'left';
-            ControlSub1.className = 'gm-style-mtc'
-            controlUI.appendChild(ControlSub1)
-
-            var ControlSub2 = document.createElement('div')
-            ControlSub2.style.direction = 'ltr';
-            ControlSub2.style.overflow = 'hidden';
-            ControlSub2.id = "LnkEtiquetas"
-            ControlSub2.style.textAlign = 'center';
-            ControlSub2.style.position = 'relative';
-            ControlSub2.style.color = 'rgb(0,0,0)';
-            ControlSub2.style.fontFamily = ' "Open Sans", sans-serif; ';
-            ControlSub2.style.msUserSelect = 'none;';
-            ControlSub2.style.fontSize = '11px'
-            ControlSub2.style.backgroundColor = 'rgb(255,255,255)'
-            ControlSub2.style.padding = '11px'
-            ControlSub2.style.backgroundClip = 'padding-box'
-            ControlSub2.style.minWidth = '28px'
-            ControlSub2.style.fontWeight = '500'
-            ControlSub2.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
-            ControlSub2.innerHTML = 'Mostrar Etiquetas'
-            ControlSub1.appendChild(ControlSub2)
-
-            ControlSub1.addEventListener('click', function () {
-                EscondeLabels();
-            });
-
-        }
-        function ControlGeocercas(controlDiv, map) {
-
-            // Set CSS for the control border.
-            var controlUI = document.createElement('div');
-            controlUI.style.marginLeft = '10px';
-            controlUI.style.zIndex = '0';
-            controlUI.style.cursor = 'pointer';
-            // controlUI.style.position = 'absolute';
-            controlUI.style.left = "0px";
-            controlUI.style.width = "150px";
-            controlUI.style.marginTop = "10px"
-            controlUI.style.top = "0px";
-            controlUI.className = 'gmnoprint';
-
-            controlDiv.appendChild(controlUI);
-
-            var ControlSub1 = document.createElement('div')
-            ControlSub1.style.float = 'left';
-            ControlSub1.className = 'gm-style-mtc'
-            controlUI.appendChild(ControlSub1)
-
-            var ControlSub2 = document.createElement('div')
-            ControlSub2.style.direction = 'ltr';
-            ControlSub2.style.overflow = 'hidden';
-            ControlSub2.id = "LnkMostarGeocercas"
-            ControlSub2.style.textAlign = 'center';
-            ControlSub2.style.position = 'relative';
-            ControlSub2.style.color = 'rgb(0,0,0)';
-            ControlSub2.style.fontFamily = ' "Open Sans", sans-serif; ';
-            ControlSub2.style.msUserSelect = 'none;';
-            ControlSub2.style.fontSize = '11px'
-            ControlSub2.style.display = 'none'
-            ControlSub2.style.backgroundColor = 'rgb(255,255,255)'
-            ControlSub2.style.padding = '11px'
-            ControlSub2.style.backgroundClip = 'padding-box'
-            ControlSub2.style.minWidth = '28px'
-            ControlSub2.style.fontWeight = '500'
-            ControlSub2.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
-            ControlSub2.innerHTML = 'Mostrar Geocercas'
-            ControlSub1.appendChild(ControlSub2)
-
-            ControlSub1.addEventListener('click', function () {
-                VerGeocercas();
-            });
-
-        }
-
-
-        var visible = false
-        function EscondeLabels() {
-
-            if (visible) {
-                for (var i = 0; i < markers.length; i++) {
-                    markers[i].setLabel(null);
+            function DeleteMarkersG() {
+                for (var i = 0; i < markersg.length; i++) {
+                    markersg[i].setMap(null);
                 }
-                visible = false
-            } else {
-                for (var i = 0; i < markers.length; i++) {
-                    var label = {
-                        text: markers[i].Nombre,
-                        fontSize: "12px",
-                        color: 'black',
-                        fontWeight: 'bolder'
+                markersg = [];
+                directionsDisplay.setMap(null);
+                mcoords = [];
+                $('#GeoCerca').val('')
+                if (typeof polygon != 'undefined') {
+                    polygon.setMap(null);
+                }
+                $("#btnGuardarRuta").css("display", "none");
+                $("#btnGuardarPuntoInteres").css("display", "none");
+            }
+
+            function CambiaColor() {
+                $("#C_TxtColor").val($("#hidden-input").val())
+            }
+            function CambiaColorH() {
+                $("#C_TxtColorH").val($("#hidden-input-Hist").val())
+            }
+
+            function Limpieza() {
+                DeleteMarkersG();
+                //$('#C_TxtHoraI').datetimepicker({
+                //    datepicker: false,
+                //    lang: 'es',
+                //    format: 'H:i',
+                //    formatDate: 'H:i',
+                //    step: 30
+                //});
+                //$('#C_TxtHoraF').datetimepicker({
+                //    datepicker: false,
+                //    lang: 'es',
+                //    format: 'H:i',
+                //    formatDate: 'H:i',
+                //    step: 30
+                //});
+                $('#divAgregarGeoreferencia').modal('hide');
+            }
+            function ControlLabels(controlDiv, map) {
+
+                // Set CSS for the control border.
+                var controlUI = document.createElement('div');
+                controlUI.style.marginLeft = '10px';
+                controlUI.style.zIndex = '0';
+                controlUI.style.cursor = 'pointer';
+                // controlUI.style.position = 'absolute';
+                controlUI.style.left = "0px";
+                controlUI.style.width = "150px";
+                controlUI.style.marginTop = "10px"
+                controlUI.style.top = "0px";
+                controlUI.className = 'gmnoprint';
+
+                controlDiv.appendChild(controlUI);
+
+                var ControlSub1 = document.createElement('div')
+                ControlSub1.style.float = 'left';
+                ControlSub1.className = 'gm-style-mtc'
+                controlUI.appendChild(ControlSub1)
+
+                var ControlSub2 = document.createElement('div')
+                ControlSub2.style.direction = 'ltr';
+                ControlSub2.style.overflow = 'hidden';
+                ControlSub2.id = "LnkEtiquetas"
+                ControlSub2.style.textAlign = 'center';
+                ControlSub2.style.position = 'relative';
+                ControlSub2.style.color = 'rgb(0,0,0)';
+                ControlSub2.style.fontFamily = ' "Open Sans", sans-serif; ';
+                ControlSub2.style.msUserSelect = 'none;';
+                ControlSub2.style.fontSize = '11px'
+                ControlSub2.style.backgroundColor = 'rgb(255,255,255)'
+                ControlSub2.style.padding = '11px'
+                ControlSub2.style.backgroundClip = 'padding-box'
+                ControlSub2.style.minWidth = '28px'
+                ControlSub2.style.fontWeight = '500'
+                ControlSub2.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
+                ControlSub2.innerHTML = 'Mostrar Etiquetas'
+                ControlSub1.appendChild(ControlSub2)
+
+                ControlSub1.addEventListener('click', function () {
+                    EscondeLabels();
+                });
+
+            }
+
+            var visible = false
+            function EscondeLabels() {
+
+                if (visible) {
+                    for (var i = 0; i < markers.length; i++) {
+                        markers[i].setLabel(null);
                     }
-                    markers[i].setLabel(label);
+                    visible = false
+                } else {
+                    for (var i = 0; i < markers.length; i++) {
+                        var label = {
+                            text: markers[i].Nombre,
+                            fontSize: "12px",
+                            color: 'black',
+                            fontWeight: 'bolder'
+                        }
+                        markers[i].setLabel(label);
+                    }
+                    visible = true
                 }
-                visible = true
-            }
-            for (var i = 0; i < markers.length; i++) {
-                markers[i].setMap(null);
-            }
-            for (var i = 0; i < markers.length; i++) {
-                markers[i].setMap(map);
-            }
-        }
-
-        //END REGION
-
-        //REGION GEOCERCAS
-        var polygonsGeocercas = [];
-        var markersGeo = [];
-
-        var IsGeoVisibles = false;
-
-        function VerGeocercas() {
-            if (IsGeoVisibles) {
-                HideGeocercas();
-                IsGeoVisibles = false;
-            } else {
-                CargaGeocercas();
-                IsGeoVisibles = true;
-            }
-        }
-        function CargaGeocercas() {
-            for (var i = 0; i < polygonsGeocercas.length; i++) {
-                polygonsGeocercas[i].setMap(map);
-            }
-            for (var j = 0; j < markersGeo.length; j++) {
-                markersGeo[j].setMap(map);
-            }
-        }
-
-        function DeleteGeocercas() {
-            for (var i = 0; i < polygonsGeocercas.length; i++) {
-                polygonsGeocercas[i].setMap(null);
-            }
-            for (var j = 0; j < markersGeo.length; j++) {
-                markersGeo[j].setMap(null);
-            }
-            polygonsGeocercas = [];
-            markersGeo = [];
-        }
-        function HideGeocercas() {
-            for (var i = 0; i < polygonsGeocercas.length; i++) {
-                polygonsGeocercas[i].setMap(null);
-            }
-            for (var j = 0; j < markersGeo.length; j++) {
-                markersGeo[j].setMap(null);
-            }
-        }
-        function creaPoligonoGeocerca(coords, color, Geocerca) {
-            var polygon = new google.maps.Polygon({
-                paths: coords,
-                strokeColor: color,
-                strokeOpacity: 0.8,
-                strokeWeight: 2,
-                fillColor: color,
-                fillOpacity: 0.35
-            });
-            polygonsGeocercas.push(polygon);
-            CreaMarcadorPoligonoGeocerca(coords, Geocerca);
-        }
-        function CreaMarcadorPoligonoGeocerca(coords, GeoCerca) {
-            var bounds = new google.maps.LatLngBounds();
-            for (i = 0; i < coords.length; i++) {
-                bounds.extend(coords[i]);
-            }
-
-            var marker = new google.maps.Marker({
-                position: bounds.getCenter(),
-                title: GeoCerca
-            });
-
-            var infowindow = new google.maps.InfoWindow({
-                content: '<h4><b>' + GeoCerca + '</b></h4>'
-            });
-
-            marker.addListener('click', function () {
-                closeLastOpenedInfoWindow();
-                infowindow.open(map, marker);
-                lastOpenedInfoWindow = infowindow;
-            });
-
-            markersGeo.push(marker);
-        }
-        //END REGION
-
-        //REGION PARADAS
-        var polygonsParadas = [];
-        var markersParadas = [];
-
-        function creaPoligonoParada(coords, color, Geocerca) {
-            var polygon = new google.maps.Polygon({
-                paths: coords,
-                strokeColor: color,
-                strokeOpacity: 0.8,
-                strokeWeight: 2,
-                fillColor: color,
-                fillOpacity: 0.35
-            });
-            polygon.setMap(map);
-            polygonsParadas.push(polygon);
-            CreaMarcadorPoligonoParada(coords, Geocerca);
-        }
-
-        function CreaMarcadorPoligonoParada(coords, GeoCerca) {
-            var bounds = new google.maps.LatLngBounds();
-            for (i = 0; i < coords.length; i++) {
-                bounds.extend(coords[i]);
-            }
-
-            var marker = new google.maps.Marker({
-                position: bounds.getCenter(),
-                title: GeoCerca,
-                map: map
-            });
-
-            var infowindow = new google.maps.InfoWindow({
-                content: '<h4><b>' + GeoCerca + '</b></h4>'
-            });
-
-            marker.addListener('click', function () {
-                closeLastOpenedInfoWindow();
-                infowindow.open(map, marker);
-                lastOpenedInfoWindow = infowindow;
-            });
-
-            markersParadas.push(marker);
-        }
-        function DeletemarkersParadas() {
-            for (var i = 0; i < markersParadas.length; i++) {
-                markersParadas[i].setMap(null);
-            }
-            markersParadas = [];
-            for (var j = 0; j < polygonsParadas.length; j++) {
-                if (typeof polygonsParadas[j] != 'undefined') {
-                    polygonsParadas[j].setMap(null);
+                for (var i = 0; i < markers.length; i++) {
+                    markers[i].setMap(null);
+                }
+                for (var i = 0; i < markers.length; i++) {
+                    markers[i].setMap(map);
                 }
             }
-            polygonsParadas = [];
 
-        }
-        //END REGION
+            //END REGION
 
-        //REGION GEOCERCAS EN RASTREO CONTINUO
-        var polygonsGeoRastreo = [];
-        var markersGeoRastreo = [];
+            //REGION PARADAS
+            var polygonsParadas = [];
+            var markersParadas = [];
 
-        function creaPoligonoGeoRastreo(coords, color, Geocerca) {
-            var polygon = new google.maps.Polygon({
-                paths: coords,
-                strokeColor: color,
-                strokeOpacity: 0.8,
-                strokeWeight: 2,
-                fillColor: color,
-                fillOpacity: 0.35
-            });
-            polygon.setMap(map);
-            polygonsGeoRastreo.push(polygon);
-            CreaMarcadorPoligonoGeoRastreo(coords, Geocerca);
-        }
-
-        function CreaMarcadorPoligonoGeoRastreo(coords, GeoCerca) {
-            var bounds = new google.maps.LatLngBounds();
-            for (i = 0; i < coords.length; i++) {
-                bounds.extend(coords[i]);
+            function creaPoligonoParada(coords, color, Geocerca) {
+                var polygon = new google.maps.Polygon({
+                    paths: coords,
+                    strokeColor: color,
+                    strokeOpacity: 0.8,
+                    strokeWeight: 2,
+                    fillColor: color,
+                    fillOpacity: 0.35
+                });
+                polygon.setMap(map);
+                polygonsParadas.push(polygon);
+                CreaMarcadorPoligonoParada(coords, Geocerca);
             }
 
-            var marker = new google.maps.Marker({
-                position: bounds.getCenter(),
-                title: GeoCerca,
-                map: map
-            });
+            function CreaMarcadorPoligonoParada(coords, GeoCerca) {
+                var bounds = new google.maps.LatLngBounds();
+                for (i = 0; i < coords.length; i++) {
+                    bounds.extend(coords[i]);
+                }
 
-            var infowindow = new google.maps.InfoWindow({
-                content: '<h4><b>' + GeoCerca + '</b></h4>'
-            });
+                var marker = new google.maps.Marker({
+                    position: bounds.getCenter(),
+                    title: GeoCerca,
+                    map: map
+                });
 
-            marker.addListener('click', function () {
-                closeLastOpenedInfoWindow();
-                infowindow.open(map, marker);
-                lastOpenedInfoWindow = infowindow;
-            });
+                var infowindow = new google.maps.InfoWindow({
+                    content: '<h4><b>' + GeoCerca + '</b></h4>'
+                });
 
-            markersGeoRastreo.push(marker);
-        }
-        function DeletemarkersGeoRastreo() {
-            for (var i = 0; i < markersGeoRastreo.length; i++) {
-                markersGeoRastreo[i].setMap(null);
+                marker.addListener('click', function () {
+                    closeLastOpenedInfoWindow();
+                    infowindow.open(map, marker);
+                    lastOpenedInfoWindow = infowindow;
+                });
+
+                markersParadas.push(marker);
             }
-            markersGeoRastreo = [];
-            for (var j = 0; j < polygonsGeoRastreo.length; j++) {
-                if (typeof polygonsGeoRastreo[j] != 'undefined') {
-                    polygonsGeoRastreo[j].setMap(null);
+            function DeletemarkersParadas() {
+                for (var i = 0; i < markersParadas.length; i++) {
+                    markersParadas[i].setMap(null);
+                }
+                markersParadas = [];
+                for (var j = 0; j < polygonsParadas.length; j++) {
+                    if (typeof polygonsParadas[j] != 'undefined') {
+                        polygonsParadas[j].setMap(null);
+                    }
+                }
+                polygonsParadas = [];
+
+            }
+            //END REGION
+
+            //REGION GEOCERCAS EN RASTREO CONTINUO
+            var polygonsGeoRastreo = [];
+            var markersGeoRastreo = [];
+
+            function creaPoligonoGeoRastreo(coords, color, Geocerca) {
+                var polygon = new google.maps.Polygon({
+                    paths: coords,
+                    strokeColor: color,
+                    strokeOpacity: 0.8,
+                    strokeWeight: 2,
+                    fillColor: color,
+                    fillOpacity: 0.35
+                });
+                polygon.setMap(map);
+                polygonsGeoRastreo.push(polygon);
+                CreaMarcadorPoligonoGeoRastreo(coords, Geocerca);
+            }
+
+            function CreaMarcadorPoligonoGeoRastreo(coords, GeoCerca) {
+                var bounds = new google.maps.LatLngBounds();
+                for (i = 0; i < coords.length; i++) {
+                    bounds.extend(coords[i]);
+                }
+
+                var marker = new google.maps.Marker({
+                    position: bounds.getCenter(),
+                    title: GeoCerca,
+                    map: map
+                });
+
+                var infowindow = new google.maps.InfoWindow({
+                    content: '<h4><b>' + GeoCerca + '</b></h4>'
+                });
+
+                marker.addListener('click', function () {
+                    closeLastOpenedInfoWindow();
+                    infowindow.open(map, marker);
+                    lastOpenedInfoWindow = infowindow;
+                });
+
+                markersGeoRastreo.push(marker);
+            }
+            function DeletemarkersGeoRastreo() {
+                for (var i = 0; i < markersGeoRastreo.length; i++) {
+                    markersGeoRastreo[i].setMap(null);
+                }
+                markersGeoRastreo = [];
+                for (var j = 0; j < polygonsGeoRastreo.length; j++) {
+                    if (typeof polygonsGeoRastreo[j] != 'undefined') {
+                        polygonsGeoRastreo[j].setMap(null);
+                    }
+                }
+                polygonsGeoRastreo = [];
+
+            }
+            //END REGION
+            function myfunction() {
+                var arrayOfStrings = HdnTextFilter.value.split("");
+                for (var i = 0; i < arrayOfStrings.length; i++) {
+                    var e = jQuery.Event("keypress");
+                    e.which = arrayOfStrings[i].charCodeAt(0);; // m code value
+                    e.altKey = true; // Alt key pressed
+                    $("#C_GvBarra_filter > div > input").trigger(e);
                 }
             }
-            polygonsGeoRastreo = [];
 
-        }
-        //END REGION
-        function myfunction() {
-            var arrayOfStrings = HdnTextFilter.value.split("");
-            for (var i = 0; i < arrayOfStrings.length; i++) {
-                var e = jQuery.Event("keypress");
-                e.which = arrayOfStrings[i].charCodeAt(0);; // m code value
-                e.altKey = true; // Alt key pressed
-                $("#C_GvBarra_filter > div > input").trigger(e);
-            }
-        }
+            function CargaHistorico() {
+                debugger;
+                var datos = JSON.parse(HdnJSScript.value);
 
-        function CargaHistorico() {
-            debugger;
-            var datos = JSON.parse(HdnJSScript.value);
+                eval(datos.MarcadoresScript);
+                eval(datos.PolylineScript);
+            }
 
-            eval(datos.MarcadoresScript);
-            eval(datos.PolylineScript);
-        }
-
-        function GvBarraPaginator() {
-            $('.table.PaginarGV').each(function () {
-                var Tthis = $(this);
-                if (!$.fn.DataTable.isDataTable(Tthis) && Tthis.find("th").length > 0) {
-                    Tthis.prepend(("<thead></thead>"));
-                    Tthis.find('thead').append($("#C_GvBarra").find("tr:first"));
-                    var table = Tthis.DataTable({
-                        //data: datasource,
-                        //columns: [
-                        //   { title: "Vehiculo" },
-                        //   { title: "Fecha" },
-                        //   { title: "TiempoDetenido" },
-                        //   { title: "Extn." },
-                        //   { title: "Start date" },
-                        //   { title: "Salary" }
-                        //],
-                        deferRender: true,
-                        deferLoading: 100,
-                        scrollY: 130,
-                        scrollCollapse: true,
-                        scroller: {
-                            displayBuffer: 20
-                        },
-                        ordering: true
-                    });
-                    var tkeys = new $.fn.dataTable.KeyTable(table, {
-                        // options
-                    });
-                    var parent = Tthis.parent().parent().parent();
-                    $('.dataTables_scrollHeadInner > .table.ADScrollPaginator2').find('th').addClass('importantth');
-                    parent.find(".dataTables_paginate").css("display", "none");
-                    parent.find(".dataTables_length").css("display", "none");
-                }
-            });
-        }
+            function GvBarraPaginator() {
+                $('.table.PaginarGV').each(function () {
+                    var Tthis = $(this);
+                    if (!$.fn.DataTable.isDataTable(Tthis) && Tthis.find("th").length > 0) {
+                        Tthis.prepend(("<thead></thead>"));
+                        Tthis.find('thead').append($("#C_GvBarra").find("tr:first"));
+                        var table = Tthis.DataTable({
+                            //data: datasource,
+                            //columns: [
+                            //   { title: "Vehiculo" },
+                            //   { title: "Fecha" },
+                            //   { title: "TiempoDetenido" },
+                            //   { title: "Extn." },
+                            //   { title: "Start date" },
+                            //   { title: "Salary" }
+                            //],
+                            deferRender: true,
+                            deferLoading: 100,
+                            scrollY: 130,
+                            scrollCollapse: true,
+                            scroller: {
+                                displayBuffer: 20
+                            },
+                            ordering: true
+                        });
+                        var tkeys = new $.fn.dataTable.KeyTable(table, {
+                            // options
+                        });
+                        var parent = Tthis.parent().parent().parent();
+                        $('.dataTables_scrollHeadInner > .table.ADScrollPaginator2').find('th').addClass('importantth');
+                        parent.find(".dataTables_paginate").css("display", "none");
+                        parent.find(".dataTables_length").css("display", "none");
+                    }
+                });
+            }
 
     </script>
     <script
@@ -3002,5 +3136,7 @@
     <script src="../Metronic/assets/global/plugins/jquery-minicolors/jquery.minicolors.min.js"></script>
     <script src="../Metronic/assets/global/plugins/jquery-minicolors/components-color-pickers.min.js"></script>
     <script src="Rastreo/JS/GeoRutas.js"></script>
+    <script src="Rastreo/JS/PuntosDeInteres.js"></script>
+    <script src="Rastreo/JS/Geocercas.js"></script>
 </asp:Content>
 
diff --git a/GPS/Rastreo.aspx.vb b/GPS/Rastreo.aspx.vb
index e0566065a..3d48426b6 100644
--- a/GPS/Rastreo.aspx.vb
+++ b/GPS/Rastreo.aspx.vb
@@ -127,6 +127,7 @@ Partial Class GPS_Rastreo
             CargaDispositivos()
             CargaEventos()
             CargaGrupos()
+            CargaGruposPI()
             CreaTmpDTDetalle()
             IndiceGV = 0
         End If
@@ -144,6 +145,16 @@ Partial Class GPS_Rastreo
         RegistraScript("$('#C_GvDispositivos_chkSelectAll').click(function () { $("".ChkAllEvt input"").not(this).prop('checked',$(this).is(':checked')); });", "1")
 
     End Sub
+    Private Sub CargaGruposPI()
+        Dim ObjGPS As New ClsGPS
+        If ObjGPS.PuntoDeInteresGrupoGet(-1, 1) Then
+            GvGrupos.DataSource = ObjGPS.DtResultados
+        End If
+        ObjGPS.Dispose()
+        GvGrupos.DataBind()
+
+        UpAgregarPuntoInteres.Update()
+    End Sub
 
     Private Sub CargaEventos()
         Dim GPS As New ClsGPS
@@ -325,41 +336,33 @@ Partial Class GPS_Rastreo
                         Mensajes = Mensajes + $"{GVRow.DataKey("NoEconomico").ToString},"
 
                     End If
-                End If
-            ElseIf Opcion = "All" Then
-
-                'Dim CveDispositivo = GVRow.DataKey("CveDispositivo").ToEntero
-                'Dim RowDispositivo As DataRow = GlobalDTDispositivos(UsuarioActual.CveCliente).FiltroPrimero($"CveDispositivo = {CveDispositivo}")
-                'Dim json As JObject = GPS.GetPosicionEquipoJson(CveDispositivo, FechaI, FechaF, RowDispositivo("Icono").ToString, RowDispositivo("ColorTrazo").ToString, GVRow.DataKey("NombreVehiculo").ToString, UsuarioActual.TienePermisoProceso(200))
-                'HdnJSScript.Value = json.ToString()
-                'DtPosiciones = GPS.DtPosicionesResultados '.AsEnumerable().Take(1000).CopyToDataTable()
-                'UpDatosMapa.Update()
-
-                'RegistraScript($"CargaHistorico(); PreparaDibujadoHistorico();PreparaDibujado(3);")
-
-
-                If ChkTrazarGeocercas.Checked Then
-                    Dim DtGeocercas As DataTable = Nothing
-
-                    If GPS.GetReferenciaDetalle(-1, -1, GVRow.DataKey("CveDispositivo").ToEntero, UsuarioActual.CveCliente) Then
-                        DtGeocercas = GPS.DtResultados.FiltraParametros("EsParada = False And Tipo='Geocerca' AND Estatus = 1")
-                    End If
-
-                    'SI TIENE GEOREFERENCIAS LAS MOSTRAMOS
-                    If DtGeocercas IsNot Nothing Then
-                        Dim SbJS As New StringBuilder
-                        SbJS.Append("$('#LnkMostarGeocercas').css('display', 'block'); setTimeout(function(){  ")
-                        For Each Dr As DataRow In DtGeocercas.Rows
-                            Dim CoordsParada = SQLToGmapsJArray(Dr("Coordenadas").ToString, "POLYGON")
-                            SbJS.AppendFormat(" creaPoligonoGeocerca({0},'{1}','{2}'); ", CoordsParada.ToString, Dr("Color").ToString, Dr("GeoReferencia").ToString)
-                        Next
-                        SbJS.Append(" VerGeocercas(); },1000);")
-                        RegistraScript(SbJS.ToString)
-                    End If
-                Else
-                    RegistraScript("$('#LnkMostarGeocercas').css('display', 'none');")
+                End If
+
+                If ChkTrazarGeocercas.Checked Then
+                    MostrarGeoCercas()
+                End If
+
+                If ChkTrazarGeorutas.Checked Then
+                    MostrarGeoRutas()
+                End If
+
+                If ChkTrazarPuntosInteres.Checked Then
+                    MostrarPuntosDeInteres()
                 End If
 
+            ElseIf Opcion = "All" Then
+
+                If ChkTrazarGeocercas.Checked Then
+                    MostrarGeoCercas()
+                End If
+
+                If ChkTrazarGeorutas.Checked Then
+                    MostrarGeoRutas()
+                End If
+
+                If ChkTrazarPuntosInteres.Checked Then
+                    MostrarPuntosDeInteres()
+                End If
 
                 If GPS.GetPosicionEquipo(GVRow.DataKey("CveDispositivo").ToEntero, FechaI, FechaF) Then
                     If GPS.DtResultados.Rows.Count > 0 Then
@@ -572,7 +575,20 @@ Partial Class GPS_Rastreo
                             End If
                             RegistraScript($"CreaMarcador({Coord},'{row("NombreVehiculo")}', '{Info}', '{Icono}');", row("CveDispositivo").ToString)
                             AddRowPosiciones(Vehiculo, Coord, row("SPD").ToString.ToDouble, Fecha, row("CveDispositivo").ToString.ToEntero, row("TiempoDetenido").ToString.ToDouble)
-                        Next
+                        Next
+
+                        If ChkTrazarGeocercas.Checked Then
+                            MostrarGeoCercas()
+                        End If
+
+                        If ChkTrazarGeorutas.Checked Then
+                            MostrarGeoRutas()
+                        End If
+
+                        If ChkTrazarPuntosInteres.Checked Then
+                            MostrarPuntosDeInteres()
+                        End If
+
                     Else
                         Alert($"No se encontraron resultados")
                     End If
@@ -619,15 +635,16 @@ Partial Class GPS_Rastreo
                         Next
 
                         If ChkTrazarGeocercas.Checked Then
-                            Dim Dispositivos As String = Equipos.Replace(";", ",").Remove(Equipos.Length - 1, 1)
-                            CargaGeocercas(Dispositivos)
+                            MostrarGeoCercas()
                         End If
 
                         If ChkTrazarGeorutas.Checked Then
-                            MostarGeoRutas()
+                            MostrarGeoRutas()
+                        End If
+
+                        If ChkTrazarPuntosInteres.Checked Then
+                            MostrarPuntosDeInteres()
                         End If
-
-                        RegistraScript("setTimeout(function(){  $('#LnkMostarGeocercas').css('display', 'block'); },1000);")
                     Else
                         Alert($"No se encontraron resultados", TipoMensaje.MsgAdvertencia)
                     End If
@@ -702,29 +719,47 @@ Partial Class GPS_Rastreo
         GPS.Dispose()
     End Sub
     Private Sub CargaGeocercas(Dispositivos As String)
-        Dim DtGeocercas As DataTable = Nothing
-
-        Dim ObjGPSGeo As New ClsGPS
-        If ObjGPSGeo.GetReferenciaDetalle(-1, -1, -1, UsuarioActual.CveCliente) Then
-            DtGeocercas = ObjGPSGeo.DtResultados.FiltraParametros("EsParada = False AND Tipo='Geocerca' AND Estatus = 1")
-        End If
-        ObjGPSGeo.Dispose()
-
-        'SI TIENE GEOREFERENCIAS LAS MOSTRAMOS
-        If DtGeocercas IsNot Nothing Then
-            Dim DtParadasDispositivo = DtGeocercas.FiltraParametros($"CveDispositivo IN({Dispositivos})", "", {"Color", "GeoReferencia", "Coordenadas"})
-            Dim SbJS As New StringBuilder
-            SbJS.Append("$('#LnkMostarGeocercas').css('display', 'block'); setTimeout(function(){  ")
-            For Each Dr As DataRow In DtParadasDispositivo.Rows
-                SbJS.AppendFormat(" creaPoligonoGeocerca({0},'{1}','{2}'); ", SQLToGmapsJArray(Dr("Coordenadas").ToString, "POLYGON"), Dr("Color").ToString, Dr("GeoReferencia").ToString)
-            Next
-            SbJS.Append(" VerGeocercas(); },1000);")
-            RegistraScript(SbJS.ToString)
-        End If
+        Try
+            Dim DtGeocercas As DataTable = Nothing
+
+            Dim ObjGPSGeo As New ClsGPS
+            If ObjGPSGeo.GetReferenciaDetalle(-1, -1, -1, UsuarioActual.CveCliente) Then
+                DtGeocercas = ObjGPSGeo.DtResultados.FiltraParametros("EsParada = False AND Tipo='Geocerca' AND Estatus = 1")
+            End If
+            ObjGPSGeo.Dispose()
+
+            'SI TIENE GEOREFERENCIAS LAS MOSTRAMOS
+            If DtGeocercas IsNot Nothing Then
+                Dim DtParadasDispositivo = DtGeocercas.FiltraParametros($"CveDispositivo IN({Dispositivos})", DistinctColumns:={"GeoReferencia", "Coordenadas", "Color"})
+
+                GvGeoCercas.DataSource = DtParadasDispositivo
+                GvGeoCercas.DataBind()
+            End If
+        Catch ex As Exception
+            OnError("Ocurrió un error al consultar las geocercas", ex)
+        End Try
+        UpGeoCercas.Update()
     End Sub
-    Private Sub MostarGeoRutas()
+    Private Sub MostrarGeoCercas()
         Dim count = 0
-        RegistraScript($"initGeoRutas();", count.ToString())
+        Try
+            RegistraScript($"NuevaConsultaGeoCercas();", count.ToString())
+            For Each GvRow As GridViewRow In GvGeoCercas.Rows
+                If GvRow.RowType = DataControlRowType.DataRow Then
+                    If GvRow.FCCheckBox("ChkGeo").Checked Then
+                        count += 1
+                        RegistraScript(String.Format("creaPoligonoGeocerca({0},'{1}','{2}'); ", SQLToGmapsJArray(GvRow.DataKey("Coordenadas"), "POLYGON"), GvRow.DataKey("Color"), GvRow.DataKey("GeoReferencia")), count.ToString())
+                    End If
+                End If
+            Next
+            RegistraScript("VerGeocercas();", (count + 1).ToString())
+        Catch ex As Exception
+            OnError("Ocurrió un error al consultar las geocercas", ex)
+        End Try
+    End Sub
+    Private Sub MostrarGeoRutas()
+        Dim count = 0
+        RegistraScript($"NuevaConsultaGeoRutas();", count.ToString())
 
         For Each GvRow As GridViewRow In GvGeorutas.Rows
             If GvRow.RowType = DataControlRowType.DataRow Then
@@ -736,6 +771,20 @@ Partial Class GPS_Rastreo
             End If
         Next
 
+    End Sub
+
+    Private Sub MostrarPuntosDeInteres()
+        RegistraScript($"NuevaConsultaPI();", "0")
+
+        For Each GvRow As GridViewRow In GVPuntosInteres.Rows
+            If GvRow.RowType = DataControlRowType.DataRow Then
+                If GvRow.FCCheckBox("ChkPI").Checked Then
+                    Dim coords = SQLToGmaps(GvRow.DataKey("Punto"), "POINT")
+                    RegistraScript($"CreaMarcadorPI({coords}, '{GvRow.DataKey("PuntoDeInteres").ToString}')", GvRow.RowIndex.ToString())
+                End If
+            End If
+        Next
+
     End Sub
     Protected Sub TimmerRefresh_Tick(sender As Object, e As EventArgs)
 
@@ -778,7 +827,6 @@ Partial Class GPS_Rastreo
                                 End If
                             End If
 
-
                             If chkTrazarLinea.Checked Then
                                 TrazarLineaContinuo = True
                                 CreaDTCoordenadas()
@@ -1144,10 +1192,18 @@ Partial Class GPS_Rastreo
 
     Protected Sub CargaOpcion(opcion As String)
         TimmerRefresh.Enabled = False
-        HdnOpcion.Value = opcion
+        HdnOpcion.Value = opcion
+
+        dvTrazo.Visible = False
+        dvTrazoGeo.Visible = False
+        dvTrazoRutas.Visible = False
+        dvTrazoPI.Visible = False
+
+        chkTrazarLinea.Checked = False
+        ChkTrazarGeocercas.Checked = False
+        ChkTrazarGeorutas.Checked = False
+        ChkTrazarPuntosInteres.Checked = False
 
-        chkTrazarLinea.Visible = False
-        ChkTrazarGeocercas.Visible = False
         DvPaginacion.Visible = False
         rowImpresionesKM.Visible = False
         If opcion = "All" Then
@@ -1158,6 +1214,7 @@ Partial Class GPS_Rastreo
             dvTrazo.Visible = False
             dvTrazoGeo.Visible = True
             dvTrazoRutas.Visible = True
+            dvTrazoPI.Visible = True
             ChkTrazarGeocercas.Visible = True
             dvMinutos.Visible = False
             RegistraScript("$('#dvConsulta').modal();TerminaDibujado();")
@@ -1172,6 +1229,7 @@ Partial Class GPS_Rastreo
             dvTrazo.Visible = False
             dvTrazoGeo.Visible = False
             dvTrazoRutas.Visible = False
+            dvTrazoPI.Visible = False
             dvMinutos.Visible = False
             BtnRastrear.ValidationGroup = "GrpFechas"
             RegistraScript("$('#dvConsulta').modal();TerminaDibujado();")
@@ -1184,6 +1242,7 @@ Partial Class GPS_Rastreo
             dvTrazo.Visible = False
             dvTrazoGeo.Visible = False
             dvTrazoRutas.Visible = False
+            dvTrazoPI.Visible = False
             dvDispositivos.Visible = True
             dvMinutos.Visible = False
             GvDispositivos.DataSource = GlobalDTDispositivosUsuarios(UsuarioActual.CveCliente, UsuarioActual.CveUsuario).FiltraParametros("Estatus = 1 AND LimiteVelocidad = 1")
@@ -1201,6 +1260,7 @@ Partial Class GPS_Rastreo
             dvTrazo.Visible = False
             dvTrazoGeo.Visible = False
             dvTrazoRutas.Visible = False
+            dvTrazoPI.Visible = False
             dvMinutos.Visible = True
             dvEventos.Visible = False
             BtnRastrear.ValidationGroup = "GrpFechas"
@@ -1214,6 +1274,7 @@ Partial Class GPS_Rastreo
             dvTrazo.Visible = False
             dvTrazoGeo.Visible = False
             dvTrazoRutas.Visible = False
+            dvTrazoPI.Visible = False
             dvMinutos.Visible = False
             dvEventos.Visible = False
             BtnRastrear.ValidationGroup = "GrpFechas"
@@ -1223,8 +1284,9 @@ Partial Class GPS_Rastreo
             dvFechas.Visible = False
             dvDispositivos.Visible = True
             dvTrazo.Visible = False
-            dvTrazoGeo.Visible = False
-            dvTrazoRutas.Visible = False
+            dvTrazoGeo.Visible = True
+            dvTrazoRutas.Visible = True
+            dvTrazoPI.Visible = True
             dvMinutos.Visible = False
             dvEventos.Visible = False
             BtnRastrear.ValidationGroup = "xx"
@@ -1236,23 +1298,13 @@ Partial Class GPS_Rastreo
             dvTrazo.Visible = True
             dvTrazoGeo.Visible = True
             dvTrazoRutas.Visible = True
+            dvTrazoPI.Visible = True
             dvEventos.Visible = False
             BtnRastrear.ValidationGroup = "xx"
             RegistraScript("$('#dvConsulta').modal();TerminaDibujado();")
             myModalLabel2.InnerHtml = "Rastreo Continuo"
             chkTrazarLinea.Visible = True
             ChkTrazarGeocercas.Visible = True
-        ElseIf opcion = "Watch" Then
-            dvFechas.Visible = False
-            dvDispositivos.Visible = True
-            dvMinutos.Visible = False
-            dvTrazo.Visible = True
-            dvTrazoGeo.Visible = True
-            dvTrazoRutas.Visible = True
-            dvEventos.Visible = False
-            BtnRastrear.ValidationGroup = "xx"
-            RegistraScript("$('#dvConsulta').modal();TerminaDibujado();")
-            myModalLabel2.InnerHtml = "Rastreo Continuo"
         ElseIf opcion = "KM" Then
             dvFechas.Visible = True
             dvDispositivos.Visible = False
@@ -1260,6 +1312,7 @@ Partial Class GPS_Rastreo
             dvTrazo.Visible = False
             dvTrazoGeo.Visible = False
             dvTrazoRutas.Visible = False
+            dvTrazoPI.Visible = False
             dvEventos.Visible = False
             BtnRastrear.ValidationGroup = "xx"
             RegistraScript("$('#dvConsulta').modal();TerminaDibujado();")
@@ -1267,7 +1320,11 @@ Partial Class GPS_Rastreo
         ElseIf opcion = "TPS" Then
             dvFechas.Visible = False
             dvDispositivos.Visible = True
-            dvMinutos.Visible = False
+            dvMinutos.Visible = False
+            dvTrazo.Visible = False
+            dvTrazoGeo.Visible = False
+            dvTrazoRutas.Visible = False
+            dvTrazoPI.Visible = False
             DivFechasGVBarra.Visible = False
             GvDispositivos.DataSource = GlobalDTDispositivosUsuarios(UsuarioActual.CveCliente, UsuarioActual.CveUsuario).FiltraParametros("CveModelo = 17")
             GvDispositivos.DataBind()
@@ -1275,24 +1332,35 @@ Partial Class GPS_Rastreo
             dvEventos.Visible = False
             RegistraScript("$('#dvConsulta').modal();TerminaDibujado();")
             myModalLabel2.InnerHtml = "Contador de pasajeros"
+        End If
+
+        If Not dvTrazoGeo.Visible Then
+            RegistraScript("$('#LnkMostarGeocercas').css('display', 'none');")
         End If
+
         If dvTrazoRutas.Visible Then
             CargaGeoRutas()
         Else
             RegistraScript("$('#LnkMostarGeoRutas').css('display', 'none');")
         End If
+
+        If dvTrazoPI.Visible Then
+            CargaPI()
+        Else
+            RegistraScript("$('#LnkMostarPI').css('display', 'none');")
+        End If
+
         If opcion <> "Speed" AndAlso opcion <> "TPS" AndAlso Filtrado Then
             CargaDispositivos()
             Filtrado = False
         End If
+
         RegistraScript("$(""#h"").modal('hide');
                 $(""#ShowDiv3"").css(""line-height"", ""20px"");
                 open = false;
                 $(""#ShowDiv3"").html('<i class=""fa fa-angle-up"" aria-hidden=""True""></i>');", "HideDiv")
         RegistraScript("$(""input[name^='ctl00$C$GvDispositivos']"").not(this).prop('checked', false);$('#C_GvDispositivos_chkSelectAll').click(function () { $(""input[name^='ctl00$C$GvDispositivos']"").not(this).prop('checked', this.checked); });", "chkGV")
 
-
-
         UPConsulta.Update()
     End Sub
 
@@ -2158,12 +2226,39 @@ Partial Class GPS_Rastreo
         End Using
         Return retorno
     End Function
-#Region "G E O R U T A S"
+#Region "G E O R E F E R E N C I A S"
+    Protected Sub ChkTrazarGeocercas_CheckedChanged(sender As Object, e As EventArgs)
+        If ChkTrazarGeocercas.Checked Then
+            Dim CountEquipos As Integer = 0
+            Dim Equipos As New StringBuilder()
+            For Each row As GridViewRow In GvDispositivos.Rows
+                If row.FCCheckBox("chkDis").Checked Then
+                    CountEquipos += 1
+                    Equipos.Append($"{row.DataKey("CveDispositivo")};")
+                End If
+            Next
+
+            If CountEquipos > 0 Then
+                Dim Dispositivos As String = Equipos.Replace(";", ",").Remove(Equipos.Length - 1, 1).ToString()
+                CargaGeocercas(Dispositivos)
+
+                RegistraScript("$('#DivGeoCercas').modal('show');")
+            Else
+                Alert("No hay equipos seleccionados", TipoMensaje.MsgAdvertencia)
+            End If
+
+        End If
+    End Sub
     Protected Sub ChkTrazarGeorutas_CheckedChanged(sender As Object, e As EventArgs)
         If ChkTrazarGeorutas.Checked Then
             RegistraScript("$('#DivGeoRutas').modal('show');")
         End If
     End Sub
+    Protected Sub ChkTrazarPI_CheckedChanged(sender As Object, e As EventArgs)
+        If ChkTrazarPuntosInteres.Checked Then
+            RegistraScript("$('#DivMostrarPI').modal('show');")
+        End If
+    End Sub
 
     Private Sub CargaGeoRutas()
         Dim ObjGPS As New ClsGPS
@@ -2175,6 +2270,49 @@ Partial Class GPS_Rastreo
 
         UpGeorutas.Update()
     End Sub
+    Private Sub CargaPI()
+        Dim ObjGPS As New ClsGPS
+        If ObjGPS.PuntoDeInteresGet(-1, UsuarioActual.CveCliente, 1, -1) Then
+            GVPuntosInteres.DataSource = ObjGPS.DtResultados
+        End If
+        ObjGPS.Dispose()
+        GVPuntosInteres.DataBind()
+
+        UpMostarPI.Update()
+    End Sub
 #End Region
 
+    Protected Sub GvGrupos_RowDataBound(sender As Object, e As System.Web.UI.WebControls.GridViewRowEventArgs) Handles GvGrupos.RowDataBound
+        If e.Row.RowType = DataControlRowType.DataRow Then
+            e.Row.Attributes.Add("onClick", $"CargaDatosSeleccionadosPI({e.Row.RowIndex}, '{e.Row.DBCampo("CvePuntoDeInteresGrupo").ToString}');")
+        End If
+    End Sub
+
+    Protected Sub BtnAgregarPunto_Click(sender As Object, e As EventArgs) Handles BtnAgregarPunto.Click
+        Dim HuboError = False
+        Dim ObjGPS As New ClsGPS
+        ObjGPS.IniciaTransacSQL()
+        Try
+            Dim GEOM As String = $"POINT{GeoCerca.Value}"
+            If Not ObjGPS.PuntoDeInteresAdd(TxtNombrePI.Text, UsuarioActual.CveCliente, GEOM, True, TxtDescripcion.Text, HdnGrupo.Value.ToEntero) Then
+                HuboError = True
+            End If
+        Catch ex As Exception
+            HuboError = True
+            OnError("Ocurrió un error al agregar el punto de interés", ex)
+        End Try
+
+        If HuboError Then
+            ObjGPS.RollBack()
+        Else
+            ObjGPS.Commit()
+            TxtDescripcion.Text = ""
+            TxtNombre.Text = ""
+            Alert("El punto de interés se agregó correctamente", TipoMensaje.MsgInformacion)
+
+            RegistraScript("$('#DivAgregarPuntoInteres').modal('hide');DeleteMarkersG();", "1")
+        End If
+
+        UpAgregarPuntoInteres.Update()
+    End Sub
 End Class
diff --git a/GPS/Rastreo/JS/Geocercas.js b/GPS/Rastreo/JS/Geocercas.js
new file mode 100644
index 000000000..2b261c4fd
--- /dev/null
+++ b/GPS/Rastreo/JS/Geocercas.js
@@ -0,0 +1,139 @@
+//REGION GEOCERCAS
+var polygonsGeocercas = [];
+var markersGeo = [];
+var IsGeoVisibles = false;
+
+
+function initGeocercas() {
+    //NuevaConsultaGeoCercas();
+    var upGeoDiv = document.createElement('div');
+    var upGeo = new ControlGeocercas(upGeoDiv, map);
+
+    map.controls[google.maps.ControlPosition.TOP_LEFT].push(upGeoDiv);
+}
+
+function NuevaConsultaGeoCercas() {
+    HideGeocercas();
+    DeleteGeocercas();
+
+    $("#LnkMostarGeocercas").css("display", "block");
+}
+
+function VerGeocercas() {
+    if (IsGeoVisibles) {
+        HideGeocercas();
+        IsGeoVisibles = false;
+    } else {
+        CargaGeocercas();
+        IsGeoVisibles = true;
+    }
+}
+function CargaGeocercas() {
+    for (var i = 0; i < polygonsGeocercas.length; i++) {
+        polygonsGeocercas[i].setMap(map);
+    }
+    for (var j = 0; j < markersGeo.length; j++) {
+        markersGeo[j].setMap(map);
+    }
+}
+
+function DeleteGeocercas() {
+    for (var i = 0; i < polygonsGeocercas.length; i++) {
+        polygonsGeocercas[i].setMap(null);
+    }
+    for (var j = 0; j < markersGeo.length; j++) {
+        markersGeo[j].setMap(null);
+    }
+    polygonsGeocercas = [];
+    markersGeo = [];
+}
+function HideGeocercas() {
+    for (var i = 0; i < polygonsGeocercas.length; i++) {
+        polygonsGeocercas[i].setMap(null);
+    }
+    for (var j = 0; j < markersGeo.length; j++) {
+        markersGeo[j].setMap(null);
+    }
+}
+function creaPoligonoGeocerca(coords, color, Geocerca) {
+    var polygon = new google.maps.Polygon({
+        paths: coords,
+        strokeColor: color,
+        strokeOpacity: 0.8,
+        strokeWeight: 2,
+        fillColor: color,
+        fillOpacity: 0.35
+    });
+    polygonsGeocercas.push(polygon);
+    CreaMarcadorPoligonoGeocerca(coords, Geocerca);
+}
+function CreaMarcadorPoligonoGeocerca(coords, GeoCerca) {
+    var bounds = new google.maps.LatLngBounds();
+    for (i = 0; i < coords.length; i++) {
+        bounds.extend(coords[i]);
+    }
+
+    var marker = new google.maps.Marker({
+        position: bounds.getCenter(),
+        title: GeoCerca
+    });
+
+    var infowindow = new google.maps.InfoWindow({
+        content: '<h4><b>' + GeoCerca + '</b></h4>'
+    });
+
+    marker.addListener('click', function () {
+        closeLastOpenedInfoWindow();
+        infowindow.open(map, marker);
+        lastOpenedInfoWindow = infowindow;
+    });
+
+    markersGeo.push(marker);
+}
+
+function ControlGeocercas(controlDiv, map) {
+
+    // Set CSS for the control border.
+    var controlUI = document.createElement('div');
+    controlUI.style.marginLeft = '10px';
+    controlUI.style.zIndex = '0';
+    controlUI.style.cursor = 'pointer';
+    // controlUI.style.position = 'absolute';
+    controlUI.style.left = "0px";
+    controlUI.style.width = "150px";
+    controlUI.style.marginTop = "10px"
+    controlUI.style.top = "0px";
+    controlUI.className = 'gmnoprint';
+
+    controlDiv.appendChild(controlUI);
+
+    var ControlSub1 = document.createElement('div')
+    ControlSub1.style.float = 'left';
+    ControlSub1.className = 'gm-style-mtc'
+    controlUI.appendChild(ControlSub1)
+
+    var ControlSub2 = document.createElement('div')
+    ControlSub2.style.direction = 'ltr';
+    ControlSub2.style.overflow = 'hidden';
+    ControlSub2.id = "LnkMostarGeocercas"
+    ControlSub2.style.textAlign = 'center';
+    ControlSub2.style.position = 'relative';
+    ControlSub2.style.color = 'rgb(0,0,0)';
+    ControlSub2.style.fontFamily = ' "Open Sans", sans-serif; ';
+    ControlSub2.style.msUserSelect = 'none;';
+    ControlSub2.style.fontSize = '11px'
+    ControlSub2.style.display = 'none'
+    ControlSub2.style.backgroundColor = 'rgb(255,255,255)'
+    ControlSub2.style.padding = '11px'
+    ControlSub2.style.backgroundClip = 'padding-box'
+    ControlSub2.style.minWidth = '28px'
+    ControlSub2.style.fontWeight = '500'
+    ControlSub2.style.boxShadow = '0 1px 4px -1px rgba(0,0,0,.3)';
+    ControlSub2.innerHTML = 'Mostrar Geocercas'
+    ControlSub1.appendChild(ControlSub2)
+
+    ControlSub1.addEventListener('click', function () {
+        VerGeocercas();
+    });
+}
+//END REGION
\ No newline at end of file