Skip to content

Commit 49d74af

Browse files
JaWeilBaumJaWeilBaum
authored
Version 0.8.3 - Leaflet update to 1.9.3 (#46)
* Bumped version of leaflet from 1.7.1 to 1.9.3 * Bumped version number of pyqtlet2 to 0.8.3
1 parent 10afd45 commit 49d74af

File tree

12 files changed

+68
-75
lines changed

12 files changed

+68
-75
lines changed

‎pyqtlet2/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"""
44

55
__author__ = 'Leon Friedmann <leon.friedmann@tum.de>'
6-
__version__ = '0.8.2'
6+
__version__ = '0.8.3'
77

88
from .mapwidget import MapWidget
99
from .leaflet import L

‎pyqtlet2/web/map.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
<meta charset="utf-8" />
66
<meta name="viewport" content="width=device-width, initial-scale=1.0">
77
<!-- Leaflet CSS -->
8-
<link rel="stylesheet" href="modules/leaflet_171/leaflet.css"/>
8+
<link rel="stylesheet" href="modules/leaflet_193/leaflet.css"/>
99
<link rel="stylesheet" href="modules/leaflet_draw_414/leaflet.draw.css"/>
1010
<!-- QWebChannel -->
1111
<script src="qrc:///qtwebchannel/qwebchannel.js"></script>
1212
</head>
1313
<body style="margin: 0px">
1414
<div id="map" style="width: 100vw; height: 100vh;"></div>
1515
<!-- Leaflet JS -->
16-
<script src='modules/leaflet_171/leaflet.js'></script>
16+
<script src='modules/leaflet_193/leaflet.js'></script>
1717
<script src='modules/leaflet_draw_414/leaflet.draw.js'></script>
1818
<script src='modules/leaflet_rotatedMarker_020/leaflet.rotatedMarker.js'></script>
1919
<!-- Custom JS -->

‎pyqtlet2/web/modules/leaflet_171/LICENSE‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎pyqtlet2/web/modules/leaflet_171/leaflet.js‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎pyqtlet2/web/modules/leaflet_193/images/layers-2x.png‎

1.23 KB
Loading

‎pyqtlet2/web/modules/leaflet_193/images/layers.png‎

696 Bytes
Loading

pyqtlet2/web/modules/leaflet_171/images/marker-icon-2x.png renamed to pyqtlet2/web/modules/leaflet_193/images/marker-icon-2x.png

File renamed without changes.

pyqtlet2/web/modules/leaflet_171/images/marker-icon.png renamed to pyqtlet2/web/modules/leaflet_193/images/marker-icon.png

File renamed without changes.

pyqtlet2/web/modules/leaflet_171/images/marker-shadow.png renamed to pyqtlet2/web/modules/leaflet_193/images/marker-shadow.png

File renamed without changes.

pyqtlet2/web/modules/leaflet_171/leaflet.css renamed to pyqtlet2/web/modules/leaflet_193/leaflet.css

Lines changed: 58 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,19 @@
4545
}
4646
/* .leaflet-container svg: reset svg max-width decleration shipped in Joomla! (joomla.org) 3.x */
4747
/* .leaflet-container img: map is broken in FF if you have max-width: 100% on tiles */
48-
.leaflet-container .leaflet-overlay-pane svg,
48+
.leaflet-container .leaflet-overlay-pane svg {
49+
max-width: none !important;
50+
max-height: none !important;
51+
}
4952
.leaflet-container .leaflet-marker-pane img,
5053
.leaflet-container .leaflet-shadow-pane img,
5154
.leaflet-container .leaflet-tile-pane img,
5255
.leaflet-container img.leaflet-image-layer,
5356
.leaflet-container .leaflet-tile {
5457
max-width: none !important;
5558
max-height: none !important;
59+
width: auto;
60+
padding: 0;
5661
}
5762

5863
.leaflet-container.leaflet-touch-zoom {
@@ -166,9 +171,6 @@
166171

167172
/* zoom and fade animations */
168173

169-
.leaflet-fade-anim .leaflet-tile {
170-
will-change: opacity;
171-
}
172174
.leaflet-fade-anim .leaflet-popup {
173175
opacity: 0;
174176
-webkit-transition: opacity 0.2s linear;
@@ -183,9 +185,10 @@
183185
-ms-transform-origin: 0 0;
184186
transform-origin: 0 0;
185187
}
186-
.leaflet-zoom-anim .leaflet-zoom-animated {
188+
svg.leaflet-zoom-animated {
187189
will-change: transform;
188-
}
190+
}
191+
189192
.leaflet-zoom-anim .leaflet-zoom-animated {
190193
-webkit-transition: -webkit-transform 0.25s cubic-bezier(0,0,0.25,1);
191194
-moz-transition: -moz-transform 0.25s cubic-bezier(0,0,0.25,1);
@@ -251,14 +254,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
251254

252255
.leaflet-container {
253256
background: #ddd;
254-
outline: 0;
257+
outline-offset: 1px;
255258
}
256259
.leaflet-container a {
257260
color: #0078A8;
258261
}
259-
.leaflet-container a.leaflet-active {
260-
outline: 2px solid orange;
261-
}
262262
.leaflet-zoom-box {
263263
border: 2px dotted #38f;
264264
background: rgba(255,255,255,0.5);
@@ -267,7 +267,10 @@ svg.leaflet-image-layer.leaflet-interactive path {
267267

268268
/* general typography */
269269
.leaflet-container {
270-
font: 12px/1.5 "Helvetica Neue", Arial, Helvetica, sans-serif;
270+
font-family: "Helvetica Neue", Arial, Helvetica, sans-serif;
271+
font-size: 12px;
272+
font-size: 0.75rem;
273+
line-height: 1.5;
271274
}
272275

273276

@@ -277,8 +280,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
277280
box-shadow: 0 1px 5px rgba(0,0,0,0.65);
278281
border-radius: 4px;
279282
}
280-
.leaflet-bar a,
281-
.leaflet-bar a:hover {
283+
.leaflet-bar a {
282284
background-color: #fff;
283285
border-bottom: 1px solid #ccc;
284286
width: 26px;
@@ -295,7 +297,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
295297
background-repeat: no-repeat;
296298
display: block;
297299
}
298-
.leaflet-bar a:hover {
300+
.leaflet-bar a:hover,
301+
.leaflet-bar a:focus {
299302
background-color: #f4f4f4;
300303
}
301304
.leaflet-bar a:first-child {
@@ -385,6 +388,8 @@ svg.leaflet-image-layer.leaflet-interactive path {
385388
}
386389
.leaflet-control-layers label {
387390
display: block;
391+
font-size: 13px;
392+
font-size: 1.08333em;
388393
}
389394
.leaflet-control-layers-separator {
390395
height: 0;
@@ -393,7 +398,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
393398
}
394399

395400
/* Default icon URLs */
396-
.leaflet-default-icon-path {
401+
.leaflet-default-icon-path { /* used only in path-guessing heuristic, see L.Icon.Default */
397402
background-image: url(images/marker-icon.png);
398403
}
399404

@@ -402,23 +407,27 @@ svg.leaflet-image-layer.leaflet-interactive path {
402407

403408
.leaflet-container .leaflet-control-attribution {
404409
background: #fff;
405-
background: rgba(255, 255, 255, 0.7);
410+
background: rgba(255, 255, 255, 0.8);
406411
margin: 0;
407412
}
408413
.leaflet-control-attribution,
409414
.leaflet-control-scale-line {
410415
padding: 0 5px;
411416
color: #333;
417+
line-height: 1.4;
412418
}
413419
.leaflet-control-attribution a {
414420
text-decoration: none;
415421
}
416-
.leaflet-control-attribution a:hover {
422+
.leaflet-control-attribution a:hover,
423+
.leaflet-control-attribution a:focus {
417424
text-decoration: underline;
418425
}
419-
.leaflet-container .leaflet-control-attribution,
420-
.leaflet-container .leaflet-control-scale {
421-
font-size: 11px;
426+
.leaflet-attribution-flag {
427+
display: inline !important;
428+
vertical-align: baseline !important;
429+
width: 1em;
430+
height: 0.6669em;
422431
}
423432
.leaflet-left .leaflet-control-scale {
424433
margin-left: 5px;
@@ -431,14 +440,11 @@ svg.leaflet-image-layer.leaflet-interactive path {
431440
border-top: none;
432441
line-height: 1.1;
433442
padding: 2px 5px 1px;
434-
font-size: 11px;
435443
white-space: nowrap;
436-
overflow: hidden;
437444
-moz-box-sizing: border-box;
438445
box-sizing: border-box;
439-
440-
background: #fff;
441-
background: rgba(255, 255, 255, 0.5);
446+
background: rgba(255, 255, 255, 0.8);
447+
text-shadow: 1px 1px #fff;
442448
}
443449
.leaflet-control-scale-line:not(:first-child) {
444450
border-top: 2px solid #777;
@@ -474,17 +480,22 @@ svg.leaflet-image-layer.leaflet-interactive path {
474480
border-radius: 12px;
475481
}
476482
.leaflet-popup-content {
477-
margin: 13px 19px;
478-
line-height: 1.4;
483+
margin: 13px 24px 13px 20px;
484+
line-height: 1.3;
485+
font-size: 13px;
486+
font-size: 1.08333em;
487+
min-height: 1px;
479488
}
480489
.leaflet-popup-content p {
481-
margin: 18px 0;
490+
margin: 17px 0;
491+
margin: 1.3em 0;
482492
}
483493
.leaflet-popup-tip-container {
484494
width: 40px;
485495
height: 20px;
486496
position: absolute;
487497
left: 50%;
498+
margin-top: -1px;
488499
margin-left: -20px;
489500
overflow: hidden;
490501
pointer-events: none;
@@ -495,6 +506,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
495506
padding: 1px;
496507

497508
margin: -10px auto 0;
509+
pointer-events: auto;
498510

499511
-webkit-transform: rotate(45deg);
500512
-moz-transform: rotate(45deg);
@@ -511,24 +523,21 @@ svg.leaflet-image-layer.leaflet-interactive path {
511523
position: absolute;
512524
top: 0;
513525
right: 0;
514-
padding: 4px 4px 0 0;
515526
border: none;
516527
text-align: center;
517-
width: 18px;
518-
height: 14px;
519-
font: 16px/14px Tahoma, Verdana, sans-serif;
520-
color: #c3c3c3;
528+
width: 24px;
529+
height: 24px;
530+
font: 16px/24px Tahoma, Verdana, sans-serif;
531+
color: #757575;
521532
text-decoration: none;
522-
font-weight: bold;
523533
background: transparent;
524534
}
525-
.leaflet-container a.leaflet-popup-close-button:hover {
526-
color: #999;
535+
.leaflet-container a.leaflet-popup-close-button:hover,
536+
.leaflet-container a.leaflet-popup-close-button:focus {
537+
color: #585858;
527538
}
528539
.leaflet-popup-scrolled {
529540
overflow: auto;
530-
border-bottom: 1px solid #ddd;
531-
border-top: 1px solid #ddd;
532541
}
533542

534543
.leaflet-oldie .leaflet-popup-content-wrapper {
@@ -541,9 +550,6 @@ svg.leaflet-image-layer.leaflet-interactive path {
541550
-ms-filter: "progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678)";
542551
filter: progid:DXImageTransform.Microsoft.Matrix(M11=0.70710678, M12=0.70710678, M21=-0.70710678, M22=0.70710678);
543552
}
544-
.leaflet-oldie .leaflet-popup-tip-container {
545-
margin-top: -1px;
546-
}
547553

548554
.leaflet-oldie .leaflet-control-zoom,
549555
.leaflet-oldie .leaflet-control-layers,
@@ -578,7 +584,7 @@ svg.leaflet-image-layer.leaflet-interactive path {
578584
pointer-events: none;
579585
box-shadow: 0 1px 3px rgba(0,0,0,0.4);
580586
}
581-
.leaflet-tooltip.leaflet-clickable {
587+
.leaflet-tooltip.leaflet-interactive {
582588
cursor: pointer;
583589
pointer-events: auto;
584590
}
@@ -638,3 +644,13 @@ svg.leaflet-image-layer.leaflet-interactive path {
638644
margin-left: -12px;
639645
border-right-color: #fff;
640646
}
647+
648+
/* Printing */
649+
650+
@media print {
651+
/* Prevent printers from removing background-images of controls. */
652+
.leaflet-control {
653+
-webkit-print-color-adjust: exact;
654+
print-color-adjust: exact;
655+
}
656+
}

0 commit comments

Comments
 (0)