Skip to content

Commit

Permalink
Simplifica uso de mapa. Con https://gitlab.com/pasosdeJesus/sivel2_ge…
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Sep 16, 2024
1 parent 251834f commit c8b8ab0
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 32 deletions.
32 changes: 15 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
revision: 7eea7af9fade94b84d2ea674eefdf24971815c47
revision: 721bffbad28fc9570fcc8137ca8677b4f90689eb
branch: main
specs:
heb412_gen (2.3.0.alfa2)
Expand All @@ -46,7 +46,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/mr519_gen.git
revision: 2d58a40a419d5e8b27f0d12b61e72f4420625996
revision: 1f252269fe870dd2794a0a1ced0a090581834e37
branch: main
specs:
mr519_gen (2.3.0.alfa2)
Expand All @@ -55,7 +55,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/msip.git
revision: dc7da1e51a6f00823cfb274f37d67341278fc132
revision: 0f3194d499e681b342e3c015befd6d85c4758acf
branch: main
specs:
msip (2.3.0.alfa2)
Expand All @@ -75,7 +75,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
revision: edaa3c5187823e98080e49fba083b6e4b0cd827b
revision: df1cdd240c272f09ee7ab5ec72aca14dc388f8ca
branch: main
specs:
sivel2_gen (2.3.0.alfa2)
Expand Down Expand Up @@ -249,20 +249,20 @@ GEM
rails (>= 6.0.0)
stimulus-rails
turbo-rails
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.14.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jbuilder (2.12.0)
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jsbundling-rails (1.3.1)
railties (>= 6.0.0)
kgio (2.11.4)
libxml-ruby (5.0.3)
logger (1.6.0)
logger (1.6.1)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -275,12 +275,12 @@ GEM
matrix (0.4.2)
mime-types (3.5.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2024.0820)
mime-types-data (3.2024.0903)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
msgpack (1.7.2)
net-imap (0.4.15)
net-imap (0.4.16)
date
net-protocol
net-pop (0.1.2)
Expand Down Expand Up @@ -311,7 +311,7 @@ GEM
rubyzip (>= 1.3.0)
orm_adapter (0.5.0)
pdf-core (0.10.0)
pg (1.5.7)
pg (1.5.8)
prawn (2.5.0)
matrix (~> 0.4)
pdf-core (~> 0.10.0)
Expand Down Expand Up @@ -381,13 +381,12 @@ GEM
redcarpet (3.6.0)
redis (4.8.1)
regexp_parser (2.9.2)
reline (0.5.9)
reline (0.5.10)
io-console (~> 0.5)
responders (3.1.1)
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.3.6)
strscan
rexml (3.3.7)
rspreadsheet (0.5.3)
andand (>= 1.3)
rubyzip (>= 1.3)
Expand All @@ -410,7 +409,7 @@ GEM
docile (~> 1.1)
simplecov-html (~> 0.11)
simplecov_json_formatter (~> 0.1)
simplecov-html (0.12.3)
simplecov-html (0.13.1)
simplecov_json_formatter (0.1.4)
spring (4.2.1)
sprockets (4.2.1)
Expand All @@ -423,15 +422,14 @@ GEM
stimulus-rails (1.3.4)
railties (>= 6.0.0)
stringio (3.1.1)
strscan (3.1.0)
terrapin (1.0.1)
climate_control
thor (1.3.2)
tilt (2.4.0)
timeout (0.4.1)
ttfunk (1.8.0)
bigdecimal (~> 3.1)
turbo-rails (2.0.6)
turbo-rails (2.0.7)
actionpack (>= 6.0.0)
activejob (>= 6.0.0)
railties (>= 6.0.0)
Expand Down Expand Up @@ -459,7 +457,7 @@ GEM
will_paginate (3.3.1)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.17)
zeitwerk (2.6.18)

PLATFORMS
aarch64-linux
Expand Down
22 changes: 10 additions & 12 deletions app/javascript/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ import Msip__Motor from "./controllers/msip/motor"
window.Msip__Motor = Msip__Motor
Msip__Motor.iniciar() // Este se ejecuta una vez cuando se está cargando la aplicación tal vez antes que la página completa o los recursos

import L from 'leaflet'
window.L = L
import 'leaflet.markercluster'

import Sivel2Gen__Motor from "./controllers/sivel2_gen/motor"
window.Sivel2Gen__Motor = Sivel2Gen__Motor
Sivel2Gen__Motor.iniciar() // Este cargará leaflet en window.L

// Apexcharts
import ApexCharts from 'apexcharts'
window.ApexCharts = ApexCharts
Expand All @@ -28,18 +36,6 @@ Apex.chart = {

import 'gridstack'


// Leaflet
import L from 'leaflet';
import 'leaflet.markercluster';


L.Icon.Default.mergeOptions({
iconUrl: "marker-icon.png",
iconRetinaUrl: "marker-icon-2x.png",
shadowUrl: "marker-shadow.png"
});

import plotly_serietiempo_actos from './plotly_actos'

import {AutocompletaAjaxExpreg} from '@pasosdejesus/autocompleta_ajax'
Expand Down Expand Up @@ -75,6 +71,7 @@ promesaRecursosSprocketsYDocumento.then((mensaje) => {
sivel2_gen_prepara_eventos_unicos(root);

Msip__Motor.ejecutarAlCargarDocumentoYRecursos() // Este se ejecuta cada vez que se carga una página que no está en cache y tipicamente después de que se ha cargado la página completa y los recursos
Sivel2Gen__Motor.ejecutarAlCargarDocumentoYRecursos()

var p = new URL(document.URL).pathname.split('/')
var p2ult = ''
Expand All @@ -99,6 +96,7 @@ document.addEventListener('turbo:load', (e) => {

msip_ejecutarAlCargarPagina(window) // Establece puntomontaje
Msip__Motor.ejecutarAlCargarPagina()
Sivel2Gen__Motor.ejecutarAlCargarPagina()

})

Expand Down
3 changes: 0 additions & 3 deletions app/javascript/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,3 @@ application.register("sivel2-gen--filtro-avanzado", Sivel2Gen__FiltroAvanzadoCon

import Sivel2Gen__MapaosmController from "./sivel2_gen/mapaosm_controller"
application.register("sivel2-gen--mapaosm", Sivel2Gen__MapaosmController)

import Sivel2Gen__MotorController from "./sivel2_gen/motor_controller"
application.register("sivel2-gen--motor", Sivel2Gen__MotorController)
Binary file removed public/images/marker-icon-2x.png
Binary file not shown.
Binary file removed public/images/marker-icon.png
Binary file not shown.
Binary file removed public/images/marker-shadow.png
Binary file not shown.

0 comments on commit c8b8ab0

Please sign in to comment.