Skip to content

Commit

Permalink
Arregla mapa. Closes #298
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Aug 31, 2024
1 parent faac266 commit 94f15e0
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 11 deletions.
9 changes: 4 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ GIT

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

GIT
remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
revision: 697b45ca42e51c8ed7666af30493d9dcb1a3cf7b
revision: edaa3c5187823e98080e49fba083b6e4b0cd827b
branch: main
specs:
sivel2_gen (2.3.0.alfa2)
Expand Down Expand Up @@ -424,15 +424,14 @@ GEM
rspreadsheet (0.5.3)
andand (>= 1.3)
rubyzip (>= 1.3)
rubocop (1.65.1)
rubocop (1.66.0)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-ast (>= 1.32.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.1)
Expand Down
11 changes: 9 additions & 2 deletions app/javascript/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,15 @@ import 'gridstack'


// Leaflet
var L = require('leaflet');
var mc= require('leaflet.markercluster');
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'

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
"is-svg": "^4.2.2",
"jquery": "^3.7.1",
"jquery-ui": "^1.12.1",
"leaflet": "^1.6.0",
"leaflet.markercluster": "^1.4.1",
"leaflet": "1.9.4",
"leaflet.markercluster": "1.5.3",
"mini-css-extract-plugin": "^2.4.3",
"popper.js": "^2.0.0-next.4",
"postcss": "^8.2.10",
Expand Down
Binary file added public/images/marker-icon-2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/marker-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/marker-shadow.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2515,12 +2515,12 @@ kleur@^3.0.3:
resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==

leaflet.markercluster@^1.4.1:
leaflet.markercluster@1.5.3:
version "1.5.3"
resolved "https://registry.yarnpkg.com/leaflet.markercluster/-/leaflet.markercluster-1.5.3.tgz#9cdb52a4eab92671832e1ef9899669e80efc4056"
integrity sha512-vPTw/Bndq7eQHjLBVlWpnGeLa3t+3zGiuM7fJwCkiMFq+nmRuG3RI3f7f4N4TDX7T4NpbAXpR2+NTRSEGfCSeA==

leaflet@^1.6.0:
leaflet@1.9.4:
version "1.9.4"
resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.9.4.tgz#23fae724e282fa25745aff82ca4d394748db7d8d"
integrity sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==
Expand Down

0 comments on commit 94f15e0

Please sign in to comment.