Skip to content

Commit d826e84

Browse files
update (#81)
* Updated Leaflet to version 1.3, markercluster to 1.4 and providers to 1.5 * update deps and files
1 parent 3c7d3db commit d826e84

File tree

6 files changed

+64
-38
lines changed

6 files changed

+64
-38
lines changed

.npm/package/npm-shrinkwrap.json

+19-11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# ChangeLog
22

3+
## 3.2.0
4+
- upgrade to Leaflet 1.3.4
5+
- upgrade to Leaflet MarkerCluster 1.4.1
6+
- upgrade to Leaflet Providers 1.5.0
7+
- upgrade to Leaflet Spin 1.1.0
8+
39
## 3.1.1
410
- upgrade to Leaflet Spin 1.1.0
511

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ To provide a Meteor package to quickly build real-time cross-platform map apps.
1111
Meteor Leafet Demo | [GitHub](https://github.com/bevanhunt/meteor-leaflet-demo)
1212

1313
## Packaged Libraries
14-
- [Leaflet: 1.0.3](https://www.npmjs.com/package/leaflet)
15-
- [Leaflet Providers: 1.1.16](https://www.npmjs.com/package/leaflet-providers)
16-
- [Leaflet MarkerCluster: 1.0.2](https://www.npmjs.com/package/leaflet.markercluster)
14+
- [Leaflet: 1.3.4](https://www.npmjs.com/package/leaflet)
15+
- [Leaflet Providers: 1.5.0](https://www.npmjs.com/package/leaflet-providers)
16+
- [Leaflet MarkerCluster: 1.4.1](https://www.npmjs.com/package/leaflet.markercluster)
1717
- [Leaflet Spin: 1.1.0](https://www.npmjs.com/package/leaflet-spin)
1818
- [Spin.js: 2.3.2](https://www.npmjs.com/package/spin.js)
1919

images/marker-icon-2x.png

-122 Bytes
Loading

package.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ Package.describe({
33
summary: "leaflet - mobile-friendly maps.",
44
git: "https://github.com/bevanhunt/meteor-leaflet.git",
55
author: "Bevan Hunt <[email protected]> (http://bevanhunt.com)",
6-
version: "3.1.1",
6+
version: "3.2.0",
77
license: "MIT"
88
});
99

1010
Npm.depends({
11-
"leaflet": "1.0.3",
12-
"leaflet.markercluster": "1.0.2",
13-
"leaflet-providers": "1.1.16",
11+
"leaflet": "1.3.4",
12+
"leaflet.markercluster": "1.4.1",
13+
"leaflet-providers": "1.5.0",
1414
"leaflet-spin": "1.1.0",
1515
"spin.js": "2.3.2"
1616
});

styles/leaflet.css

+32-20
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
.leaflet-marker-icon,
66
.leaflet-marker-shadow,
77
.leaflet-tile-container,
8-
.leaflet-map-pane svg,
9-
.leaflet-map-pane canvas,
8+
.leaflet-pane > svg,
9+
.leaflet-pane > canvas,
1010
.leaflet-zoom-box,
1111
.leaflet-image-layer,
1212
.leaflet-layer {
@@ -43,9 +43,12 @@
4343
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
4444
.leaflet-container .leaflet-overlay-pane svg,
4545
.leaflet-container .leaflet-marker-pane img,
46+
.leaflet-container .leaflet-shadow-pane img,
4647
.leaflet-container .leaflet-tile-pane img,
47-
.leaflet-container img.leaflet-image-layer {
48+
.leaflet-container img.leaflet-image-layer,
49+
.leaflet-container .leaflet-tile {
4850
max-width: none !important;
51+
max-height: none !important;
4952
}
5053

5154
.leaflet-container.leaflet-touch-zoom {
@@ -54,11 +57,20 @@
5457
}
5558
.leaflet-container.leaflet-touch-drag {
5659
-ms-touch-action: pinch-zoom;
57-
}
58-
.leaflet-container.leaflet-touch-drag.leaflet-touch-drag {
60+
/* Fallback for FF which doesn't support pinch-zoom */
61+
touch-action: none;
62+
touch-action: pinch-zoom;
63+
}
64+
.leaflet-container.leaflet-touch-drag.leaflet-touch-zoom {
5965
-ms-touch-action: none;
6066
touch-action: none;
6167
}
68+
.leaflet-container {
69+
-webkit-tap-highlight-color: transparent;
70+
}
71+
.leaflet-container a {
72+
-webkit-tap-highlight-color: rgba(51, 181, 229, 0.4);
73+
}
6274
.leaflet-tile {
6375
filter: inherit;
6476
visibility: hidden;
@@ -97,7 +109,7 @@
97109
.lvml {
98110
/* removed this line to avoid breaking css build scripts trying to resolve path */
99111
/* behavior: url(#default#VML);*/
100-
display: inline-block;
112+
display: inline-block;
101113
position: absolute;
102114
}
103115

@@ -158,7 +170,6 @@
158170
opacity: 0;
159171
-webkit-transition: opacity 0.2s linear;
160172
-moz-transition: opacity 0.2s linear;
161-
-o-transition: opacity 0.2s linear;
162173
transition: opacity 0.2s linear;
163174
}
164175
.leaflet-fade-anim .leaflet-map-pane .leaflet-popup {
@@ -175,14 +186,12 @@
175186
.leaflet-zoom-anim .leaflet-zoom-animated {
176187
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
177188
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
178-
-o-transition: -o-transform 0.25s cubic-bezier(0,0,0.25,1);
179189
transition: transform 0.25s cubic-bezier(0,0,0.25,1);
180190
}
181191
.leaflet-zoom-anim .leaflet-tile,
182192
.leaflet-pan-anim .leaflet-tile {
183193
-webkit-transition: none;
184194
-moz-transition: none;
185-
-o-transition: none;
186195
transition: none;
187196
}
188197

@@ -199,6 +208,7 @@
199208
.leaflet-grab {
200209
cursor: -webkit-grab;
201210
cursor: -moz-grab;
211+
cursor: grab;
202212
}
203213
.leaflet-crosshair,
204214
.leaflet-crosshair .leaflet-interactive {
@@ -214,6 +224,7 @@
214224
cursor: move;
215225
cursor: -webkit-grabbing;
216226
cursor: -moz-grabbing;
227+
cursor: grabbing;
217228
}
218229

219230
/* marker & overlays interactivity */
@@ -303,7 +314,14 @@
303314
height: 30px;
304315
line-height: 30px;
305316
}
306-
317+
.leaflet-touch .leaflet-bar a:first-child {
318+
border-top-left-radius: 2px;
319+
border-top-right-radius: 2px;
320+
}
321+
.leaflet-touch .leaflet-bar a:last-child {
322+
border-bottom-left-radius: 2px;
323+
border-bottom-right-radius: 2px;
324+
}
307325

308326
/* zoom control */
309327

@@ -312,16 +330,10 @@
312330
font: bold 18px 'Lucida Console', Monaco, monospace;
313331
text-indent: 1px;
314332
}
315-
.leaflet-control-zoom-out {
316-
font-size: 20px;
317-
}
318333

319-
.leaflet-touch .leaflet-control-zoom-in {
334+
.leaflet-touch .leaflet-control-zoom-in, .leaflet-touch .leaflet-control-zoom-out {
320335
font-size: 22px;
321336
}
322-
.leaflet-touch .leaflet-control-zoom-out {
323-
font-size: 24px;
324-
}
325337

326338

327339
/* layers control */
@@ -359,6 +371,7 @@
359371
}
360372
.leaflet-control-layers-scrollbar {
361373
overflow-y: scroll;
374+
overflow-x: hidden;
362375
padding-right: 5px;
363376
}
364377
.leaflet-control-layers-selector {
@@ -377,7 +390,7 @@
377390

378391
/* Default icon URLs */
379392
.leaflet-default-icon-path {
380-
background-image: url(images/);
393+
background-image: url(images/marker-icon.png);
381394
}
382395

383396

@@ -482,7 +495,6 @@
482495
-webkit-transform: rotate(45deg);
483496
-moz-transform: rotate(45deg);
484497
-ms-transform: rotate(45deg);
485-
-o-transform: rotate(45deg);
486498
transform: rotate(45deg);
487499
}
488500
.leaflet-popup-content-wrapper,
@@ -621,4 +633,4 @@
621633
left: 0;
622634
margin-left: -12px;
623635
border-right-color: #fff;
624-
}
636+
}

0 commit comments

Comments
 (0)