Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: debian-gtk-gn...@lists.debian.org
[ Reason ]
User request on #990618
[ Impact ]
If #990618 is not fixed, users who have previously selected an aerial
map (which is no longer available from the web services that GNOME uses,
if I understand correctly) will be unable to use GNOME Maps with their
saved settings due to a crash on startup.
[ Tests ]
Tested manually on a Debian 11 GNOME desktop.
[ Risks ]
GNOME Maps is part of the gnome metapackage, so it might technically be
a key package.
This is an upstream stable/bug-fix release, so it should be low-risk.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
New upstream release:
- data/maps-service.json:
Update the cached copy of the list of map sources (it will be replaced
with a freshly downloaded copy from a GNOME-hosted web service if
posssible)
- po/nb.po: Translation updates
- src/mapSource.js:
Cope with having different attribution requirements for different
map sources. I think there's only one map source available at the
moment, but this might change.
- src/mapView.js:
- Don't crash if no aerial map is available (this is #990618)
- Avoid using a special background image in dark mode if wrapping around
near the International Date Line, as a workaround for a libchamplain bug
- Avoid saving a nonsense zoom level and location if the user changes the
view and then immediately exits
- src/osmConnection.js:
Fix ability to sign in to OSM
- src/placeBubble.js:
Fix a bug where place details get lost after searching again for
the same place
- src/sidebar.js:
Only grab focus onto next route entry in sidebar if it's empty.
This avoids a hang when dragging around route markers.
d/watch, d/control*, d/gbp.conf: Watch for 3.38.x releases and
target bullseye.
diffstat for gnome-maps-3.38.2 gnome-maps-3.38.6
NEWS | 49 +++
data/maps-service.json | 44 +--
data/org.gnome.Maps.appdata.xml.in | 22 +
debian/changelog | 24 +
debian/control | 2
debian/control.in | 2
debian/gbp.conf | 4
debian/watch | 2
meson.build | 2
po/nb.po | 515 +++++++++++++++++++++----------------
src/mapSource.js | 65 +++-
src/mapView.js | 54 ++-
src/osmConnection.js | 2
src/placeBubble.js | 4
src/sidebar.js | 3
15 files changed, 508 insertions(+), 286 deletions(-)
diff -Nru gnome-maps-3.38.2/data/maps-service.json gnome-maps-3.38.6/data/maps-service.json
--- gnome-maps-3.38.2/data/maps-service.json 2020-11-21 13:24:38.734244000 +0000
+++ gnome-maps-3.38.6/data/maps-service.json 2021-07-09 22:47:16.568429500 +0100
@@ -5,68 +5,68 @@
},
"tiles": {
"street": {
- "id": "mapbox.streets-v11",
- "name": "Mapbox street tiles",
+ "id": "osm.streets",
+ "name": "OpenStreetMap street tiles",
"license": "© OpenStreetMap",
"license_uri": "http://www.openstreetmap.org/copyright";,
"min_zoom_level": 0,
"max_zoom_level": 19,
- "tile_size": 512,
- "uri_format": "https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJjaXF3a3lwbXkwMDJwaTBubmZlaGk4cDZ6In0.8aukTfgjzeqATA8eNItPJA&";,
- "attribution_logo": "PHN2ZyB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI2NSIgaGVpZ2h0PSIyMCI+PGRlZnMvPjxtZXRhZGF0YT48cmRmOlJERj48Y2M6V29yayByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIvPjxkYzp0aXRsZS8+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNjEuODQ4MywtOTguNTAzOTUpIj48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0ib3BhY2l0eTowLjI1O2ZpbGw6I2ZmZmZmZjtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7c3Ryb2tlLWxpbmVjYXA6cm91bmQ7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLW9wYWNpdHk6MTtzdHJva2UtZGFzaGFycmF5Om5vbmUiPjxwYXRoIGQ9Ik0gNS4yOCAxLjUgQyA0LjU0IDEuNTYgMy45IDIuMjUgMy45MSAzIGwgMCAxMS44OCBjIDAuMDIgMC43NyAwLjcyIDEuNDcgMS41IDEuNDcgbCAxLjc1IDAgYyAwLjc4IDAgMS40OCAtMC42OSAxLjUgLTEuNDcgbCAwIC00LjI4IDAuNzIgMS4xOSBjIDAuNTMgMC44NyAyLjAzIDAuODcgMi41NiAwIGwgMC43MiAtMS4xOSAwIDQuMjggYyAwLjAyIDAuNzYgMC43IDEuNDUgMS40NyAxLjQ3IGwgMS43NSAwIGMgMC43OCAwIDEuNDggLTAuNjkgMS41IC0xLjQ3IGwgMCAtMC4xNiBjIDEuMDIgMS4xMiAyLjQ2IDEuODEgNC4wOSAxLjgxIGwgNC4wOSAwIDAgMS40NyBjIC0wIDAuNzggMC42OSAxLjQ4IDEuNDcgMS41IGwgMS43NSAwIGMgMC43OSAtMCAxLjUgLTAuNzEgMS41IC0xLjUgbCAwLjAyIC0xLjQ3IGMgMS43MiAwIDMuMDggLTAuNjQgNC4xNCAtMS42OSBsIDAgMC4xOSBjIDAgMC4zOSAwLjE2IDAuNzkgMC40NCAxLjA2IDAuMjggMC4yOCAwLjY3IDAuNDQgMS4wNiAwLjQ0IGwgMy4zMSAwIGMgMi4wMyAwIDMuODUgLTEuMDYgNC45MSAtMi42OSAxLjA1IDEuNjEgMi44NCAyLjY5IDQuODggMi42OSAxLjAzIDAgMS45OCAtMC4yNyAyLjgxIC0wLjc1IDAuMjggMC4zNSAwLjczIDAuNTcgMS4xOSAwLjU2IGwgMi4xMiAwIGMgMC40OCAwLjAxIDAuOTcgLTAuMjMgMS4yNSAtMC42MiBsIDAuOTEgLTEuMjggMC45MSAxLjI4IGMgMC4yOCAwLjM5IDAuNzQgMC42MyAxLjIyIDAuNjIgbCAyLjE2IDAgQyA2Mi42NyAxNi4zMyA2My40MiAxNC44OSA2Mi44MSAxNCBMIDYwLjIyIDEwLjM4IDYyLjYyIDcgQyA2My4yNiA2LjExIDYyLjUgNC42MiA2MS40MSA0LjYyIGwgLTIuMTYgMCBDIDU4Ljc4IDQuNjIgNTguMzEgNC44NiA1OC4wMyA1LjI1IEwgNTcuMzEgNi4yOCA1Ni41NiA1LjI1IEMgNTYuMjkgNC44NiA1NS44MiA0LjYyIDU1LjM0IDQuNjIgbCAtMi4xNiAwIGMgLTAuNDkgLTAgLTAuOTcgMC4yNSAtMS4yNSAwLjY2IC0wLjg2IC0wLjUxIC0xLjg0IC0wLjgxIC0yLjkxIC0wLjgxIC0yLjAzIDAgLTMuODMgMS4wOCAtNC44OCAyLjY5IEMgNDMuMSA1LjUzIDQxLjI3IDQuNDcgMzkuMTkgNC40NyBMIDM5LjE5IDMgQyAzOS4xOSAyLjYxIDM5LjAzIDIuMjEgMzguNzUgMS45NCAzOC40NyAxLjY2IDM4LjA4IDEuNSAzNy42OSAxLjUgbCAtMS43NSAwIGMgLTAuNzEgMCAtMS41IDAuODMgLTEuNSAxLjUgbCAwIDMuMTYgQyAzMy4zOCA1LjEgMzEuOTYgNC40NyAzMC4zOCA0LjQ3IGwgLTMuMzQgMCBjIC0wLjc3IDAuMDIgLTEuNDcgMC43MiAtMS40NyAxLjUgbCAwIDAuMzEgYyAtMS4wMiAtMS4xMiAtMi40NiAtMS44MSAtNC4wOSAtMS44MSAtMS42MyAwIC0zLjA3IDAuNyAtNC4wOSAxLjgxIEwgMTcuMzggMyBjIC0wIC0wLjc5IC0wLjcxIC0xLjUgLTEuNSAtMS41IEwgMTQuNSAxLjUgQyAxMy41NSAxLjUgMTIuMjggMS44NyAxMS42NiAyLjk0IGwgLTEgMS42OSAtMSAtMS42OSBDIDkuMDMgMS44NyA3Ljc3IDEuNSA2LjgxIDEuNSBsIC0xLjQxIDAgQyA1LjM2IDEuNSA1LjMyIDEuNSA1LjI4IDEuNSB6IG0gMTYuMTkgNy43MiBjIDAuNTMgMCAwLjk0IDAuMzUgMC45NCAxLjI4IGwgMCAxLjI4IC0wLjk0IDAgYyAtMC41MiAwIC0wLjk0IC0wLjM4IC0wLjk0IC0xLjI4IC0wIC0wLjkgMC40MiAtMS4yOCAwLjk0IC0xLjI4IHogbSA4LjgxIDAgYyAwLjgzIDAgMS4xOCAwLjY4IDEuMTkgMS4yOCAwLjAxIDAuOTQgLTAuNjIgMS4yOCAtMS4xOSAxLjI4IHogbSA4LjcyIDAgYyAwLjcyIDAgMS4zNyAwLjYgMS4zNyAxLjI4IDAgMC43NyAtMC41MSAxLjI4IC0xLjM3IDEuMjggeiBtIDEwLjAzIDAgYyAwLjU4IDAgMS4wOSAwLjUgMS4wOSAxLjI4IDAgMC43OCAtMC41MSAxLjI4IC0xLjA5IDEuMjggLTAuNTggMCAtMS4xMiAtMC41IC0xLjEyIC0xLjI4IDAgLTAuNzggMC41NCAtMS4yOCAxLjEyIC0xLjI4IHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZm9udC1zaXplOm1lZGl1bTtmb250LXN0eWxlOm5vcm1hbDtmb250LXZhcmlhbnQ6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXN0cmV0Y2g6bm9ybWFsO3RleHQtaW5kZW50OjA7dGV4dC1hbGlnbjpzdGFydDt0ZXh0LWRlY29yYXRpb246bm9uZTtsaW5lLWhlaWdodDpub3JtYWw7bGV0dGVyLXNwYWNpbmc6bm9ybWFsO3dvcmQtc3BhY2luZzpub3JtYWw7dGV4dC10cmFuc2Zvcm06bm9uZTtkaXJlY3Rpb246bHRyO2Jsb2NrLXByb2dyZXNzaW9uOnRiO3dyaXRpbmctbW9kZTpsci10Yjt0ZXh0LWFuY2hvcjpzdGFydDtiYXNlbGluZS1zaGlmdDpiYXNlbGluZTtjb2xvcjojMDAwMDAwO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7bWFya2VyOm5vbmU7dmlzaWJpbGl0eTp2aXNpYmxlO2Rpc3BsYXk6aW5saW5lO292ZXJmbG93OnZpc2libGU7ZW5hYmxlLWJhY2tncm91bmQ6YWNjdW11bGF0ZTtmb250LWZhbWlseTpTYW5zOy1pbmtzY2FwZS1mb250LXNwZWNpZmljYXRpb246U2FucyIvPjwvZz48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0iZmlsbDojZmZmZmZmIj48cGF0aCBkPSJtIDUuNDEgMyAwIDEyIDEuNzUgMCAwIC05LjkxIDMuNSA1Ljk0IDMuNDcgLTUuOTQgMCA5LjkxIDEuNzUgMCAwIC0xMiBMIDE0LjUgMyBDIDEzLjggMyAxMy4yNSAzLjE2IDEyLjk0IDMuNjkgTCAxMC42NiA3LjU5IDguMzggMy42OSBDIDguMDcgMy4xNiA3LjUxIDMgNi44MSAzIHogTSAzNiAzIGwgMCAxMi4wMyAzLjI1IDAgYyAyLjQ0IDAgNC4zOCAtMS45MSA0LjM4IC00LjUzIDAgLTIuNjIgLTEuOTMgLTQuNDcgLTQuMzggLTQuNDcgQyAzOC43IDYuMDMgMzguMzIgNiAzNy43NSA2IGwgMCAtMyB6IE0gMjEuNDcgNS45NyBjIC0yLjQ0IDAgLTQuMTkgMS45MSAtNC4xOSA0LjUzIDAgMi42MiAxLjc1IDQuNTMgNC4xOSA0LjUzIGwgNC4xOSAwIDAgLTQuNTMgYyAwIC0yLjYyIC0xLjc1IC00LjUzIC00LjE5IC00LjUzIHogbSAyNy41NiAwIGMgLTIuNDEgMCAtNC4zOCAyLjAzIC00LjM4IDQuNTMgMCAyLjUgMS45NyA0LjUzIDQuMzggNC41MyAyLjQxIDAgNC4zNCAtMi4wMyA0LjM0IC00LjUzIDAgLTIuNSAtMS45NCAtNC41MyAtNC4zNCAtNC41MyB6IG0gLTIyIDAuMDMgMCAxMiAxLjc1IDAgMCAtMi45NyBjIDAuNTcgMCAxLjA0IC0wIDEuNTkgMCAyLjQ0IDAgNC4zNCAtMS45MSA0LjM0IC00LjUzIDAgLTIuNjIgLTEuOSAtNC41IC00LjM0IC00LjUgeiBtIDI2LjE2IDAgMy4wMyA0LjM4IC0zLjE5IDQuNjIgMi4xMiAwIEwgNTcuMzEgMTEuOTEgNTkuNDQgMTUgNjEuNTkgMTUgNTguMzggMTAuMzggNjEuNDEgNiA1OS4yNSA2IDU3LjMxIDguODEgNTUuMzQgNiB6IE0gMjEuNDcgNy43MiBjIDEuNCAwIDIuNDQgMS4xOSAyLjQ0IDIuNzggbCAwIDIuNzggLTIuNDQgMCBjIC0xLjQgMCAtMi40NCAtMS4yMSAtMi40NCAtMi43OCAtMCAtMS41NyAxLjA0IC0yLjc4IDIuNDQgLTIuNzggeiBtIDI3LjU2IDAgYyAxLjQ0IDAgMi41OSAxLjI0IDIuNTkgMi43OCAwIDEuNTQgLTEuMTUgMi43OCAtMi41OSAyLjc4IC0xLjQ0IDAgLTIuNjIgLTEuMjQgLTIuNjIgLTIuNzggMCAtMS41NCAxLjE4IC0yLjc4IDIuNjIgLTIuNzggeiBtIC0yMC4yNSAwLjAzIDEuNTkgMCBjIDEuNTkgMCAyLjU5IDEuMjggMi41OSAyLjc1IDAgMS40NyAtMS4xMyAyLjc4IC0yLjU5IDIuNzggbCAtMS41OSAwIHogbSA4Ljk3IDAgMS41IDAgYyAxLjQ3IDAgMi42MiAxLjI4IDIuNjIgMi43NSAwIDEuNDcgLTEuMDQgMi43OCAtMi42MiAyLjc4IGwgLTEuNSAwIHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIi8+PC9nPjwvZz48L3N2Zz4=",
- "max_connections": 12
+ "tile_size": 256,
+ "uri_format": "https://tile.openstreetmap.org/#Z#/#X#/#Y#.png";,
+ "attribution_logo": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgd2lkdGg9IjgxLjU4NjQ4N21tIgogICBoZWlnaHQ9IjEwLjA1NjIwMm1tIgogICB2aWV3Qm94PSIwIDAgODEuNTg2NDg3IDEwLjA1NjIwMiIKICAgdmVyc2lvbj0iMS4xIgogICBpZD0ic3ZnOCIKICAgaW5rc2NhcGU6dmVyc2lvbj0iMS4wLjIgKGU4NmM4NzA4NzksIDIwMjEtMDEtMTUpIgogICBzb2RpcG9kaTpkb2NuYW1lPSJkcmF3aW5nLnN2ZyI+CiAgPGRlZnMKICAgICBpZD0iZGVmczIiIC8+CiAgPHNvZGlwb2RpOm5hbWVkdmlldwogICAgIGlkPSJiYXNlIgogICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIKICAgICBib3JkZXJjb2xvcj0iIzY2NjY2NiIKICAgICBib3JkZXJvcGFjaXR5PSIxLjAiCiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAuMCIKICAgICBpbmtzY2FwZTpwYWdlc2hhZG93PSIyIgogICAgIGlua3NjYXBlOnpvb209IjEuOTc5ODk5IgogICAgIGlua3NjYXBlOmN4PSI4Ni45MTU1MzYiCiAgICAgaW5rc2NhcGU6Y3k9Ijc4Ljc2NjQ3OSIKICAgICBpbmtzY2FwZTpkb2N1bWVudC11bml0cz0ibW0iCiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ibGF5ZXIxIgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIHNob3dncmlkPSJmYWxzZSIKICAgICBmaXQtbWFyZ2luLXRvcD0iMCIKICAgICBmaXQtbWFyZ2luLWxlZnQ9IjAiCiAgICAgZml0LW1hcmdpbi1yaWdodD0iMCIKICAgICBmaXQtbWFyZ2luLWJvdHRvbT0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjE5MjAiCiAgICAgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iMTA0MyIKICAgICBpbmtzY2FwZTp3aW5kb3cteD0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIxIiAvPgogIDxtZXRhZGF0YQogICAgIGlkPSJtZXRhZGF0YTUiPgogICAgPHJkZjpSREY+CiAgICAgIDxjYzpXb3JrCiAgICAgICAgIHJkZjphYm91dD0iIj4KICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3N2Zyt4bWw8L2RjOmZvcm1hdD4KICAgICAgICA8ZGM6dHlwZQogICAgICAgICAgIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+CiAgICAgICAgPGRjOnRpdGxlPjwvZGM6dGl0bGU+CiAgICAgIDwvY2M6V29yaz4KICAgIDwvcmRmOlJERj4KICA8L21ldGFkYXRhPgogIDxnCiAgICAgaW5rc2NhcGU6bGFiZWw9IkxheWVyIDEiCiAgICAgaW5rc2NhcGU6Z3JvdXBtb2RlPSJsYXllciIKICAgICBpZD0ibGF5ZXIxIgogICAgIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNC41MzY3MDgsLTI1LjI5NDkpIj4KICAgIDx0ZXh0CiAgICAgICB4bWw6c3BhY2U9InByZXNlcnZlIgogICAgICAgc3R5bGU9ImZvbnQtc3R5bGU6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXNpemU6MTAuNTgzM3B4O2xpbmUtaGVpZ2h0OjEuMjU7Zm9udC1mYW1pbHk6c2Fucy1zZXJpZjtsZXR0ZXItc3BhY2luZzowcHg7d29yZC1zcGFjaW5nOjBweDtmaWxsOiMwMDAwMDA7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmU7c3Ryb2tlLXdpZHRoOjAuMjY0NTgzIgogICAgICAgeD0iMjMuOTQyNDMiCiAgICAgICB5PSIzMy4xNDk2OTMiCiAgICAgICBpZD0idGV4dDEyIj48dHNwYW4KICAgICAgICAgc29kaXBvZGk6cm9sZT0ibGluZSIKICAgICAgICAgaWQ9InRzcGFuMTAiCiAgICAgICAgIHg9IjIzLjk0MjQzIgogICAgICAgICB5PSIzMy4xNDk2OTMiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOiMwMDAwMDA7c3Ryb2tlLXdpZHRoOjAuMjY0NTgzO3N0cm9rZS1vcGFjaXR5OjEiPk9wZW5TdHJlZXRNYXA8L3RzcGFuPjwvdGV4dD4KICA8L2c+Cjwvc3ZnPgo=",
+ "max_connections": 2
},
"streetDark": {
- "id": "mapbox.dark-v10",
- "name": "Mapbox street tiles",
+ "id": "mapbox.dark-v10.256",
+ "name": "Mapbox dark tiles",
"license": "© OpenStreetMap",
"license_uri": "http://www.openstreetmap.org/copyright";,
"min_zoom_level": 0,
"max_zoom_level": 19,
- "tile_size": 512,
- "uri_format": "https://api.mapbox.com/styles/v1/mapbox/dark-v10/tiles/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJjaXF3a3lwbXkwMDJwaTBubmZlaGk4cDZ6In0.8aukTfgjzeqATA8eNItPJA&";,
+ "tile_size": 256,
+ "uri_format": "https://api.mapbox.com/styles/v1/mapbox/dark-v10/tiles/256/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJja2xhMDlrc2wwYnMwMnBwOXo5MXdiNHdsIn0.0ug8gGVc6Di37Zd6Xvp1XQ";,
"attribution_logo": "PHN2ZyB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI2NSIgaGVpZ2h0PSIyMCI+PGRlZnMvPjxtZXRhZGF0YT48cmRmOlJERj48Y2M6V29yayByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIvPjxkYzp0aXRsZS8+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNjEuODQ4MywtOTguNTAzOTUpIj48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0ib3BhY2l0eTowLjI1O2ZpbGw6I2ZmZmZmZjtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7c3Ryb2tlLWxpbmVjYXA6cm91bmQ7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLW9wYWNpdHk6MTtzdHJva2UtZGFzaGFycmF5Om5vbmUiPjxwYXRoIGQ9Ik0gNS4yOCAxLjUgQyA0LjU0IDEuNTYgMy45IDIuMjUgMy45MSAzIGwgMCAxMS44OCBjIDAuMDIgMC43NyAwLjcyIDEuNDcgMS41IDEuNDcgbCAxLjc1IDAgYyAwLjc4IDAgMS40OCAtMC42OSAxLjUgLTEuNDcgbCAwIC00LjI4IDAuNzIgMS4xOSBjIDAuNTMgMC44NyAyLjAzIDAuODcgMi41NiAwIGwgMC43MiAtMS4xOSAwIDQuMjggYyAwLjAyIDAuNzYgMC43IDEuNDUgMS40NyAxLjQ3IGwgMS43NSAwIGMgMC43OCAwIDEuNDggLTAuNjkgMS41IC0xLjQ3IGwgMCAtMC4xNiBjIDEuMDIgMS4xMiAyLjQ2IDEuODEgNC4wOSAxLjgxIGwgNC4wOSAwIDAgMS40NyBjIC0wIDAuNzggMC42OSAxLjQ4IDEuNDcgMS41IGwgMS43NSAwIGMgMC43OSAtMCAxLjUgLTAuNzEgMS41IC0xLjUgbCAwLjAyIC0xLjQ3IGMgMS43MiAwIDMuMDggLTAuNjQgNC4xNCAtMS42OSBsIDAgMC4xOSBjIDAgMC4zOSAwLjE2IDAuNzkgMC40NCAxLjA2IDAuMjggMC4yOCAwLjY3IDAuNDQgMS4wNiAwLjQ0IGwgMy4zMSAwIGMgMi4wMyAwIDMuODUgLTEuMDYgNC45MSAtMi42OSAxLjA1IDEuNjEgMi44NCAyLjY5IDQuODggMi42OSAxLjAzIDAgMS45OCAtMC4yNyAyLjgxIC0wLjc1IDAuMjggMC4zNSAwLjczIDAuNTcgMS4xOSAwLjU2IGwgMi4xMiAwIGMgMC40OCAwLjAxIDAuOTcgLTAuMjMgMS4yNSAtMC42MiBsIDAuOTEgLTEuMjggMC45MSAxLjI4IGMgMC4yOCAwLjM5IDAuNzQgMC42MyAxLjIyIDAuNjIgbCAyLjE2IDAgQyA2Mi42NyAxNi4zMyA2My40MiAxNC44OSA2Mi44MSAxNCBMIDYwLjIyIDEwLjM4IDYyLjYyIDcgQyA2My4yNiA2LjExIDYyLjUgNC42MiA2MS40MSA0LjYyIGwgLTIuMTYgMCBDIDU4Ljc4IDQuNjIgNTguMzEgNC44NiA1OC4wMyA1LjI1IEwgNTcuMzEgNi4yOCA1Ni41NiA1LjI1IEMgNTYuMjkgNC44NiA1NS44MiA0LjYyIDU1LjM0IDQuNjIgbCAtMi4xNiAwIGMgLTAuNDkgLTAgLTAuOTcgMC4yNSAtMS4yNSAwLjY2IC0wLjg2IC0wLjUxIC0xLjg0IC0wLjgxIC0yLjkxIC0wLjgxIC0yLjAzIDAgLTMuODMgMS4wOCAtNC44OCAyLjY5IEMgNDMuMSA1LjUzIDQxLjI3IDQuNDcgMzkuMTkgNC40NyBMIDM5LjE5IDMgQyAzOS4xOSAyLjYxIDM5LjAzIDIuMjEgMzguNzUgMS45NCAzOC40NyAxLjY2IDM4LjA4IDEuNSAzNy42OSAxLjUgbCAtMS43NSAwIGMgLTAuNzEgMCAtMS41IDAuODMgLTEuNSAxLjUgbCAwIDMuMTYgQyAzMy4zOCA1LjEgMzEuOTYgNC40NyAzMC4zOCA0LjQ3IGwgLTMuMzQgMCBjIC0wLjc3IDAuMDIgLTEuNDcgMC43MiAtMS40NyAxLjUgbCAwIDAuMzEgYyAtMS4wMiAtMS4xMiAtMi40NiAtMS44MSAtNC4wOSAtMS44MSAtMS42MyAwIC0zLjA3IDAuNyAtNC4wOSAxLjgxIEwgMTcuMzggMyBjIC0wIC0wLjc5IC0wLjcxIC0xLjUgLTEuNSAtMS41IEwgMTQuNSAxLjUgQyAxMy41NSAxLjUgMTIuMjggMS44NyAxMS42NiAyLjk0IGwgLTEgMS42OSAtMSAtMS42OSBDIDkuMDMgMS44NyA3Ljc3IDEuNSA2LjgxIDEuNSBsIC0xLjQxIDAgQyA1LjM2IDEuNSA1LjMyIDEuNSA1LjI4IDEuNSB6IG0gMTYuMTkgNy43MiBjIDAuNTMgMCAwLjk0IDAuMzUgMC45NCAxLjI4IGwgMCAxLjI4IC0wLjk0IDAgYyAtMC41MiAwIC0wLjk0IC0wLjM4IC0wLjk0IC0xLjI4IC0wIC0wLjkgMC40MiAtMS4yOCAwLjk0IC0xLjI4IHogbSA4LjgxIDAgYyAwLjgzIDAgMS4xOCAwLjY4IDEuMTkgMS4yOCAwLjAxIDAuOTQgLTAuNjIgMS4yOCAtMS4xOSAxLjI4IHogbSA4LjcyIDAgYyAwLjcyIDAgMS4zNyAwLjYgMS4zNyAxLjI4IDAgMC43NyAtMC41MSAxLjI4IC0xLjM3IDEuMjggeiBtIDEwLjAzIDAgYyAwLjU4IDAgMS4wOSAwLjUgMS4wOSAxLjI4IDAgMC43OCAtMC41MSAxLjI4IC0xLjA5IDEuMjggLTAuNTggMCAtMS4xMiAtMC41IC0xLjEyIC0xLjI4IDAgLTAuNzggMC41NCAtMS4yOCAxLjEyIC0xLjI4IHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZm9udC1zaXplOm1lZGl1bTtmb250LXN0eWxlOm5vcm1hbDtmb250LXZhcmlhbnQ6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXN0cmV0Y2g6bm9ybWFsO3RleHQtaW5kZW50OjA7dGV4dC1hbGlnbjpzdGFydDt0ZXh0LWRlY29yYXRpb246bm9uZTtsaW5lLWhlaWdodDpub3JtYWw7bGV0dGVyLXNwYWNpbmc6bm9ybWFsO3dvcmQtc3BhY2luZzpub3JtYWw7dGV4dC10cmFuc2Zvcm06bm9uZTtkaXJlY3Rpb246bHRyO2Jsb2NrLXByb2dyZXNzaW9uOnRiO3dyaXRpbmctbW9kZTpsci10Yjt0ZXh0LWFuY2hvcjpzdGFydDtiYXNlbGluZS1zaGlmdDpiYXNlbGluZTtjb2xvcjojMDAwMDAwO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7bWFya2VyOm5vbmU7dmlzaWJpbGl0eTp2aXNpYmxlO2Rpc3BsYXk6aW5saW5lO292ZXJmbG93OnZpc2libGU7ZW5hYmxlLWJhY2tncm91bmQ6YWNjdW11bGF0ZTtmb250LWZhbWlseTpTYW5zOy1pbmtzY2FwZS1mb250LXNwZWNpZmljYXRpb246U2FucyIvPjwvZz48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0iZmlsbDojZmZmZmZmIj48cGF0aCBkPSJtIDUuNDEgMyAwIDEyIDEuNzUgMCAwIC05LjkxIDMuNSA1Ljk0IDMuNDcgLTUuOTQgMCA5LjkxIDEuNzUgMCAwIC0xMiBMIDE0LjUgMyBDIDEzLjggMyAxMy4yNSAzLjE2IDEyLjk0IDMuNjkgTCAxMC42NiA3LjU5IDguMzggMy42OSBDIDguMDcgMy4xNiA3LjUxIDMgNi44MSAzIHogTSAzNiAzIGwgMCAxMi4wMyAzLjI1IDAgYyAyLjQ0IDAgNC4zOCAtMS45MSA0LjM4IC00LjUzIDAgLTIuNjIgLTEuOTMgLTQuNDcgLTQuMzggLTQuNDcgQyAzOC43IDYuMDMgMzguMzIgNiAzNy43NSA2IGwgMCAtMyB6IE0gMjEuNDcgNS45NyBjIC0yLjQ0IDAgLTQuMTkgMS45MSAtNC4xOSA0LjUzIDAgMi42MiAxLjc1IDQuNTMgNC4xOSA0LjUzIGwgNC4xOSAwIDAgLTQuNTMgYyAwIC0yLjYyIC0xLjc1IC00LjUzIC00LjE5IC00LjUzIHogbSAyNy41NiAwIGMgLTIuNDEgMCAtNC4zOCAyLjAzIC00LjM4IDQuNTMgMCAyLjUgMS45NyA0LjUzIDQuMzggNC41MyAyLjQxIDAgNC4zNCAtMi4wMyA0LjM0IC00LjUzIDAgLTIuNSAtMS45NCAtNC41MyAtNC4zNCAtNC41MyB6IG0gLTIyIDAuMDMgMCAxMiAxLjc1IDAgMCAtMi45NyBjIDAuNTcgMCAxLjA0IC0wIDEuNTkgMCAyLjQ0IDAgNC4zNCAtMS45MSA0LjM0IC00LjUzIDAgLTIuNjIgLTEuOSAtNC41IC00LjM0IC00LjUgeiBtIDI2LjE2IDAgMy4wMyA0LjM4IC0zLjE5IDQuNjIgMi4xMiAwIEwgNTcuMzEgMTEuOTEgNTkuNDQgMTUgNjEuNTkgMTUgNTguMzggMTAuMzggNjEuNDEgNiA1OS4yNSA2IDU3LjMxIDguODEgNTUuMzQgNiB6IE0gMjEuNDcgNy43MiBjIDEuNCAwIDIuNDQgMS4xOSAyLjQ0IDIuNzggbCAwIDIuNzggLTIuNDQgMCBjIC0xLjQgMCAtMi40NCAtMS4yMSAtMi40NCAtMi43OCAtMCAtMS41NyAxLjA0IC0yLjc4IDIuNDQgLTIuNzggeiBtIDI3LjU2IDAgYyAxLjQ0IDAgMi41OSAxLjI0IDIuNTkgMi43OCAwIDEuNTQgLTEuMTUgMi43OCAtMi41OSAyLjc4IC0xLjQ0IDAgLTIuNjIgLTEuMjQgLTIuNjIgLTIuNzggMCAtMS41NCAxLjE4IC0yLjc4IDIuNjIgLTIuNzggeiBtIC0yMC4yNSAwLjAzIDEuNTkgMCBjIDEuNTkgMCAyLjU5IDEuMjggMi41OSAyLjc1IDAgMS40NyAtMS4xMyAyLjc4IC0yLjU5IDIuNzggbCAtMS41OSAwIHogbSA4Ljk3IDAgMS41IDAgYyAxLjQ3IDAgMi42MiAxLjI4IDIuNjIgMi43NSAwIDEuNDcgLTEuMDQgMi43OCAtMi42MiAyLjc4IGwgLTEuNSAwIHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIi8+PC9nPjwvZz48L3N2Zz4=",
"max_connections": 12
},
"aerial": {
- "id": "mapbox.satellite-v9",
+ "id": "mapbox.satellite-v9.256",
"name": "Mapbox aerial tiles",
"license": "© OpenStreetMap © DigitalGlobe",
"license_uri": "http://www.openstreetmap.org/copyright";,
"min_zoom_level": 0,
"max_zoom_level": 19,
- "tile_size": 512,
- "uri_format": "https://api.mapbox.com/styles/v1/mapbox/satellite-v9/tiles/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJjaXF3a3lwbXkwMDJwaTBubmZlaGk4cDZ6In0.8aukTfgjzeqATA8eNItPJA&";,
+ "tile_size": 256,
+ "uri_format": "https://api.mapbox.com/styles/v1/mapbox/satellite-v9/tiles/256/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJja2xhMDlrc2wwYnMwMnBwOXo5MXdiNHdsIn0.0ug8gGVc6Di37Zd6Xvp1XQ";,
"attribution_logo": "PHN2ZyB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI2NSIgaGVpZ2h0PSIyMCI+PGRlZnMvPjxtZXRhZGF0YT48cmRmOlJERj48Y2M6V29yayByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIvPjxkYzp0aXRsZS8+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNjEuODQ4MywtOTguNTAzOTUpIj48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0ib3BhY2l0eTowLjI1O2ZpbGw6I2ZmZmZmZjtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7c3Ryb2tlLWxpbmVjYXA6cm91bmQ7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLW9wYWNpdHk6MTtzdHJva2UtZGFzaGFycmF5Om5vbmUiPjxwYXRoIGQ9Ik0gNS4yOCAxLjUgQyA0LjU0IDEuNTYgMy45IDIuMjUgMy45MSAzIGwgMCAxMS44OCBjIDAuMDIgMC43NyAwLjcyIDEuNDcgMS41IDEuNDcgbCAxLjc1IDAgYyAwLjc4IDAgMS40OCAtMC42OSAxLjUgLTEuNDcgbCAwIC00LjI4IDAuNzIgMS4xOSBjIDAuNTMgMC44NyAyLjAzIDAuODcgMi41NiAwIGwgMC43MiAtMS4xOSAwIDQuMjggYyAwLjAyIDAuNzYgMC43IDEuNDUgMS40NyAxLjQ3IGwgMS43NSAwIGMgMC43OCAwIDEuNDggLTAuNjkgMS41IC0xLjQ3IGwgMCAtMC4xNiBjIDEuMDIgMS4xMiAyLjQ2IDEuODEgNC4wOSAxLjgxIGwgNC4wOSAwIDAgMS40NyBjIC0wIDAuNzggMC42OSAxLjQ4IDEuNDcgMS41IGwgMS43NSAwIGMgMC43OSAtMCAxLjUgLTAuNzEgMS41IC0xLjUgbCAwLjAyIC0xLjQ3IGMgMS43MiAwIDMuMDggLTAuNjQgNC4xNCAtMS42OSBsIDAgMC4xOSBjIDAgMC4zOSAwLjE2IDAuNzkgMC40NCAxLjA2IDAuMjggMC4yOCAwLjY3IDAuNDQgMS4wNiAwLjQ0IGwgMy4zMSAwIGMgMi4wMyAwIDMuODUgLTEuMDYgNC45MSAtMi42OSAxLjA1IDEuNjEgMi44NCAyLjY5IDQuODggMi42OSAxLjAzIDAgMS45OCAtMC4yNyAyLjgxIC0wLjc1IDAuMjggMC4zNSAwLjczIDAuNTcgMS4xOSAwLjU2IGwgMi4xMiAwIGMgMC40OCAwLjAxIDAuOTcgLTAuMjMgMS4yNSAtMC42MiBsIDAuOTEgLTEuMjggMC45MSAxLjI4IGMgMC4yOCAwLjM5IDAuNzQgMC42MyAxLjIyIDAuNjIgbCAyLjE2IDAgQyA2Mi42NyAxNi4zMyA2My40MiAxNC44OSA2Mi44MSAxNCBMIDYwLjIyIDEwLjM4IDYyLjYyIDcgQyA2My4yNiA2LjExIDYyLjUgNC42MiA2MS40MSA0LjYyIGwgLTIuMTYgMCBDIDU4Ljc4IDQuNjIgNTguMzEgNC44NiA1OC4wMyA1LjI1IEwgNTcuMzEgNi4yOCA1Ni41NiA1LjI1IEMgNTYuMjkgNC44NiA1NS44MiA0LjYyIDU1LjM0IDQuNjIgbCAtMi4xNiAwIGMgLTAuNDkgLTAgLTAuOTcgMC4yNSAtMS4yNSAwLjY2IC0wLjg2IC0wLjUxIC0xLjg0IC0wLjgxIC0yLjkxIC0wLjgxIC0yLjAzIDAgLTMuODMgMS4wOCAtNC44OCAyLjY5IEMgNDMuMSA1LjUzIDQxLjI3IDQuNDcgMzkuMTkgNC40NyBMIDM5LjE5IDMgQyAzOS4xOSAyLjYxIDM5LjAzIDIuMjEgMzguNzUgMS45NCAzOC40NyAxLjY2IDM4LjA4IDEuNSAzNy42OSAxLjUgbCAtMS43NSAwIGMgLTAuNzEgMCAtMS41IDAuODMgLTEuNSAxLjUgbCAwIDMuMTYgQyAzMy4zOCA1LjEgMzEuOTYgNC40NyAzMC4zOCA0LjQ3IGwgLTMuMzQgMCBjIC0wLjc3IDAuMDIgLTEuNDcgMC43MiAtMS40NyAxLjUgbCAwIDAuMzEgYyAtMS4wMiAtMS4xMiAtMi40NiAtMS44MSAtNC4wOSAtMS44MSAtMS42MyAwIC0zLjA3IDAuNyAtNC4wOSAxLjgxIEwgMTcuMzggMyBjIC0wIC0wLjc5IC0wLjcxIC0xLjUgLTEuNSAtMS41IEwgMTQuNSAxLjUgQyAxMy41NSAxLjUgMTIuMjggMS44NyAxMS42NiAyLjk0IGwgLTEgMS42OSAtMSAtMS42OSBDIDkuMDMgMS44NyA3Ljc3IDEuNSA2LjgxIDEuNSBsIC0xLjQxIDAgQyA1LjM2IDEuNSA1LjMyIDEuNSA1LjI4IDEuNSB6IG0gMTYuMTkgNy43MiBjIDAuNTMgMCAwLjk0IDAuMzUgMC45NCAxLjI4IGwgMCAxLjI4IC0wLjk0IDAgYyAtMC41MiAwIC0wLjk0IC0wLjM4IC0wLjk0IC0xLjI4IC0wIC0wLjkgMC40MiAtMS4yOCAwLjk0IC0xLjI4IHogbSA4LjgxIDAgYyAwLjgzIDAgMS4xOCAwLjY4IDEuMTkgMS4yOCAwLjAxIDAuOTQgLTAuNjIgMS4yOCAtMS4xOSAxLjI4IHogbSA4LjcyIDAgYyAwLjcyIDAgMS4zNyAwLjYgMS4zNyAxLjI4IDAgMC43NyAtMC41MSAxLjI4IC0xLjM3IDEuMjggeiBtIDEwLjAzIDAgYyAwLjU4IDAgMS4wOSAwLjUgMS4wOSAxLjI4IDAgMC43OCAtMC41MSAxLjI4IC0xLjA5IDEuMjggLTAuNTggMCAtMS4xMiAtMC41IC0xLjEyIC0xLjI4IDAgLTAuNzggMC41NCAtMS4yOCAxLjEyIC0xLjI4IHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZm9udC1zaXplOm1lZGl1bTtmb250LXN0eWxlOm5vcm1hbDtmb250LXZhcmlhbnQ6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXN0cmV0Y2g6bm9ybWFsO3RleHQtaW5kZW50OjA7dGV4dC1hbGlnbjpzdGFydDt0ZXh0LWRlY29yYXRpb246bm9uZTtsaW5lLWhlaWdodDpub3JtYWw7bGV0dGVyLXNwYWNpbmc6bm9ybWFsO3dvcmQtc3BhY2luZzpub3JtYWw7dGV4dC10cmFuc2Zvcm06bm9uZTtkaXJlY3Rpb246bHRyO2Jsb2NrLXByb2dyZXNzaW9uOnRiO3dyaXRpbmctbW9kZTpsci10Yjt0ZXh0LWFuY2hvcjpzdGFydDtiYXNlbGluZS1zaGlmdDpiYXNlbGluZTtjb2xvcjojMDAwMDAwO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7bWFya2VyOm5vbmU7dmlzaWJpbGl0eTp2aXNpYmxlO2Rpc3BsYXk6aW5saW5lO292ZXJmbG93OnZpc2libGU7ZW5hYmxlLWJhY2tncm91bmQ6YWNjdW11bGF0ZTtmb250LWZhbWlseTpTYW5zOy1pbmtzY2FwZS1mb250LXNwZWNpZmljYXRpb246U2FucyIvPjwvZz48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0iZmlsbDojZmZmZmZmIj48cGF0aCBkPSJtIDUuNDEgMyAwIDEyIDEuNzUgMCAwIC05LjkxIDMuNSA1Ljk0IDMuNDcgLTUuOTQgMCA5LjkxIDEuNzUgMCAwIC0xMiBMIDE0LjUgMyBDIDEzLjggMyAxMy4yNSAzLjE2IDEyLjk0IDMuNjkgTCAxMC42NiA3LjU5IDguMzggMy42OSBDIDguMDcgMy4xNiA3LjUxIDMgNi44MSAzIHogTSAzNiAzIGwgMCAxMi4wMyAzLjI1IDAgYyAyLjQ0IDAgNC4zOCAtMS45MSA0LjM4IC00LjUzIDAgLTIuNjIgLTEuOTMgLTQuNDcgLTQuMzggLTQuNDcgQyAzOC43IDYuMDMgMzguMzIgNiAzNy43NSA2IGwgMCAtMyB6IE0gMjEuNDcgNS45NyBjIC0yLjQ0IDAgLTQuMTkgMS45MSAtNC4xOSA0LjUzIDAgMi42MiAxLjc1IDQuNTMgNC4xOSA0LjUzIGwgNC4xOSAwIDAgLTQuNTMgYyAwIC0yLjYyIC0xLjc1IC00LjUzIC00LjE5IC00LjUzIHogbSAyNy41NiAwIGMgLTIuNDEgMCAtNC4zOCAyLjAzIC00LjM4IDQuNTMgMCAyLjUgMS45NyA0LjUzIDQuMzggNC41MyAyLjQxIDAgNC4zNCAtMi4wMyA0LjM0IC00LjUzIDAgLTIuNSAtMS45NCAtNC41MyAtNC4zNCAtNC41MyB6IG0gLTIyIDAuMDMgMCAxMiAxLjc1IDAgMCAtMi45NyBjIDAuNTcgMCAxLjA0IC0wIDEuNTkgMCAyLjQ0IDAgNC4zNCAtMS45MSA0LjM0IC00LjUzIDAgLTIuNjIgLTEuOSAtNC41IC00LjM0IC00LjUgeiBtIDI2LjE2IDAgMy4wMyA0LjM4IC0zLjE5IDQuNjIgMi4xMiAwIEwgNTcuMzEgMTEuOTEgNTkuNDQgMTUgNjEuNTkgMTUgNTguMzggMTAuMzggNjEuNDEgNiA1OS4yNSA2IDU3LjMxIDguODEgNTUuMzQgNiB6IE0gMjEuNDcgNy43MiBjIDEuNCAwIDIuNDQgMS4xOSAyLjQ0IDIuNzggbCAwIDIuNzggLTIuNDQgMCBjIC0xLjQgMCAtMi40NCAtMS4yMSAtMi40NCAtMi43OCAtMCAtMS41NyAxLjA0IC0yLjc4IDIuNDQgLTIuNzggeiBtIDI3LjU2IDAgYyAxLjQ0IDAgMi41OSAxLjI0IDIuNTkgMi43OCAwIDEuNTQgLTEuMTUgMi43OCAtMi41OSAyLjc4IC0xLjQ0IDAgLTIuNjIgLTEuMjQgLTIuNjIgLTIuNzggMCAtMS41NCAxLjE4IC0yLjc4IDIuNjIgLTIuNzggeiBtIC0yMC4yNSAwLjAzIDEuNTkgMCBjIDEuNTkgMCAyLjU5IDEuMjggMi41OSAyLjc1IDAgMS40NyAtMS4xMyAyLjc4IC0yLjU5IDIuNzggbCAtMS41OSAwIHogbSA4Ljk3IDAgMS41IDAgYyAxLjQ3IDAgMi42MiAxLjI4IDIuNjIgMi43NSAwIDEuNDcgLTEuMDQgMi43OCAtMi42MiAyLjc4IGwgLTEuNSAwIHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIi8+PC9nPjwvZz48L3N2Zz4=",
"max_connections": 12
},
"hybridAerial": {
- "id": "mapbox.satellite-streets-v11",
+ "id": "mapbox.satellite-streets-v11.256",
"name": "Mapbox aerial streets tiles",
"license": "© OpenStreetMap © DigitalGlobe",
"license_uri": "http://www.openstreetmap.org/copyright";,
"min_zoom_level": 0,
"max_zoom_level": 19,
- "tile_size": 512,
- "uri_format": "https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v11/tiles/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJjaXF3a3lwbXkwMDJwaTBubmZlaGk4cDZ6In0.8aukTfgjzeqATA8eNItPJA&";,
+ "tile_size": 256,
+ "uri_format": "https://api.mapbox.com/styles/v1/mapbox/satellite-streets-v11/tiles/256/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJja2xhMDlrc2wwYnMwMnBwOXo5MXdiNHdsIn0.0ug8gGVc6Di37Zd6Xvp1XQ";,
"attribution_logo": "PHN2ZyB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI2NSIgaGVpZ2h0PSIyMCI+PGRlZnMvPjxtZXRhZGF0YT48cmRmOlJERj48Y2M6V29yayByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIvPjxkYzp0aXRsZS8+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNjEuODQ4MywtOTguNTAzOTUpIj48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0ib3BhY2l0eTowLjI1O2ZpbGw6I2ZmZmZmZjtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7c3Ryb2tlLWxpbmVjYXA6cm91bmQ7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLW9wYWNpdHk6MTtzdHJva2UtZGFzaGFycmF5Om5vbmUiPjxwYXRoIGQ9Ik0gNS4yOCAxLjUgQyA0LjU0IDEuNTYgMy45IDIuMjUgMy45MSAzIGwgMCAxMS44OCBjIDAuMDIgMC43NyAwLjcyIDEuNDcgMS41IDEuNDcgbCAxLjc1IDAgYyAwLjc4IDAgMS40OCAtMC42OSAxLjUgLTEuNDcgbCAwIC00LjI4IDAuNzIgMS4xOSBjIDAuNTMgMC44NyAyLjAzIDAuODcgMi41NiAwIGwgMC43MiAtMS4xOSAwIDQuMjggYyAwLjAyIDAuNzYgMC43IDEuNDUgMS40NyAxLjQ3IGwgMS43NSAwIGMgMC43OCAwIDEuNDggLTAuNjkgMS41IC0xLjQ3IGwgMCAtMC4xNiBjIDEuMDIgMS4xMiAyLjQ2IDEuODEgNC4wOSAxLjgxIGwgNC4wOSAwIDAgMS40NyBjIC0wIDAuNzggMC42OSAxLjQ4IDEuNDcgMS41IGwgMS43NSAwIGMgMC43OSAtMCAxLjUgLTAuNzEgMS41IC0xLjUgbCAwLjAyIC0xLjQ3IGMgMS43MiAwIDMuMDggLTAuNjQgNC4xNCAtMS42OSBsIDAgMC4xOSBjIDAgMC4zOSAwLjE2IDAuNzkgMC40NCAxLjA2IDAuMjggMC4yOCAwLjY3IDAuNDQgMS4wNiAwLjQ0IGwgMy4zMSAwIGMgMi4wMyAwIDMuODUgLTEuMDYgNC45MSAtMi42OSAxLjA1IDEuNjEgMi44NCAyLjY5IDQuODggMi42OSAxLjAzIDAgMS45OCAtMC4yNyAyLjgxIC0wLjc1IDAuMjggMC4zNSAwLjczIDAuNTcgMS4xOSAwLjU2IGwgMi4xMiAwIGMgMC40OCAwLjAxIDAuOTcgLTAuMjMgMS4yNSAtMC42MiBsIDAuOTEgLTEuMjggMC45MSAxLjI4IGMgMC4yOCAwLjM5IDAuNzQgMC42MyAxLjIyIDAuNjIgbCAyLjE2IDAgQyA2Mi42NyAxNi4zMyA2My40MiAxNC44OSA2Mi44MSAxNCBMIDYwLjIyIDEwLjM4IDYyLjYyIDcgQyA2My4yNiA2LjExIDYyLjUgNC42MiA2MS40MSA0LjYyIGwgLTIuMTYgMCBDIDU4Ljc4IDQuNjIgNTguMzEgNC44NiA1OC4wMyA1LjI1IEwgNTcuMzEgNi4yOCA1Ni41NiA1LjI1IEMgNTYuMjkgNC44NiA1NS44MiA0LjYyIDU1LjM0IDQuNjIgbCAtMi4xNiAwIGMgLTAuNDkgLTAgLTAuOTcgMC4yNSAtMS4yNSAwLjY2IC0wLjg2IC0wLjUxIC0xLjg0IC0wLjgxIC0yLjkxIC0wLjgxIC0yLjAzIDAgLTMuODMgMS4wOCAtNC44OCAyLjY5IEMgNDMuMSA1LjUzIDQxLjI3IDQuNDcgMzkuMTkgNC40NyBMIDM5LjE5IDMgQyAzOS4xOSAyLjYxIDM5LjAzIDIuMjEgMzguNzUgMS45NCAzOC40NyAxLjY2IDM4LjA4IDEuNSAzNy42OSAxLjUgbCAtMS43NSAwIGMgLTAuNzEgMCAtMS41IDAuODMgLTEuNSAxLjUgbCAwIDMuMTYgQyAzMy4zOCA1LjEgMzEuOTYgNC40NyAzMC4zOCA0LjQ3IGwgLTMuMzQgMCBjIC0wLjc3IDAuMDIgLTEuNDcgMC43MiAtMS40NyAxLjUgbCAwIDAuMzEgYyAtMS4wMiAtMS4xMiAtMi40NiAtMS44MSAtNC4wOSAtMS44MSAtMS42MyAwIC0zLjA3IDAuNyAtNC4wOSAxLjgxIEwgMTcuMzggMyBjIC0wIC0wLjc5IC0wLjcxIC0xLjUgLTEuNSAtMS41IEwgMTQuNSAxLjUgQyAxMy41NSAxLjUgMTIuMjggMS44NyAxMS42NiAyLjk0IGwgLTEgMS42OSAtMSAtMS42OSBDIDkuMDMgMS44NyA3Ljc3IDEuNSA2LjgxIDEuNSBsIC0xLjQxIDAgQyA1LjM2IDEuNSA1LjMyIDEuNSA1LjI4IDEuNSB6IG0gMTYuMTkgNy43MiBjIDAuNTMgMCAwLjk0IDAuMzUgMC45NCAxLjI4IGwgMCAxLjI4IC0wLjk0IDAgYyAtMC41MiAwIC0wLjk0IC0wLjM4IC0wLjk0IC0xLjI4IC0wIC0wLjkgMC40MiAtMS4yOCAwLjk0IC0xLjI4IHogbSA4LjgxIDAgYyAwLjgzIDAgMS4xOCAwLjY4IDEuMTkgMS4yOCAwLjAxIDAuOTQgLTAuNjIgMS4yOCAtMS4xOSAxLjI4IHogbSA4LjcyIDAgYyAwLjcyIDAgMS4zNyAwLjYgMS4zNyAxLjI4IDAgMC43NyAtMC41MSAxLjI4IC0xLjM3IDEuMjggeiBtIDEwLjAzIDAgYyAwLjU4IDAgMS4wOSAwLjUgMS4wOSAxLjI4IDAgMC43OCAtMC41MSAxLjI4IC0xLjA5IDEuMjggLTAuNTggMCAtMS4xMiAtMC41IC0xLjEyIC0xLjI4IDAgLTAuNzggMC41NCAtMS4yOCAxLjEyIC0xLjI4IHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZm9udC1zaXplOm1lZGl1bTtmb250LXN0eWxlOm5vcm1hbDtmb250LXZhcmlhbnQ6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXN0cmV0Y2g6bm9ybWFsO3RleHQtaW5kZW50OjA7dGV4dC1hbGlnbjpzdGFydDt0ZXh0LWRlY29yYXRpb246bm9uZTtsaW5lLWhlaWdodDpub3JtYWw7bGV0dGVyLXNwYWNpbmc6bm9ybWFsO3dvcmQtc3BhY2luZzpub3JtYWw7dGV4dC10cmFuc2Zvcm06bm9uZTtkaXJlY3Rpb246bHRyO2Jsb2NrLXByb2dyZXNzaW9uOnRiO3dyaXRpbmctbW9kZTpsci10Yjt0ZXh0LWFuY2hvcjpzdGFydDtiYXNlbGluZS1zaGlmdDpiYXNlbGluZTtjb2xvcjojMDAwMDAwO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7bWFya2VyOm5vbmU7dmlzaWJpbGl0eTp2aXNpYmxlO2Rpc3BsYXk6aW5saW5lO292ZXJmbG93OnZpc2libGU7ZW5hYmxlLWJhY2tncm91bmQ6YWNjdW11bGF0ZTtmb250LWZhbWlseTpTYW5zOy1pbmtzY2FwZS1mb250LXNwZWNpZmljYXRpb246U2FucyIvPjwvZz48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0iZmlsbDojZmZmZmZmIj48cGF0aCBkPSJtIDUuNDEgMyAwIDEyIDEuNzUgMCAwIC05LjkxIDMuNSA1Ljk0IDMuNDcgLTUuOTQgMCA5LjkxIDEuNzUgMCAwIC0xMiBMIDE0LjUgMyBDIDEzLjggMyAxMy4yNSAzLjE2IDEyLjk0IDMuNjkgTCAxMC42NiA3LjU5IDguMzggMy42OSBDIDguMDcgMy4xNiA3LjUxIDMgNi44MSAzIHogTSAzNiAzIGwgMCAxMi4wMyAzLjI1IDAgYyAyLjQ0IDAgNC4zOCAtMS45MSA0LjM4IC00LjUzIDAgLTIuNjIgLTEuOTMgLTQuNDcgLTQuMzggLTQuNDcgQyAzOC43IDYuMDMgMzguMzIgNiAzNy43NSA2IGwgMCAtMyB6IE0gMjEuNDcgNS45NyBjIC0yLjQ0IDAgLTQuMTkgMS45MSAtNC4xOSA0LjUzIDAgMi42MiAxLjc1IDQuNTMgNC4xOSA0LjUzIGwgNC4xOSAwIDAgLTQuNTMgYyAwIC0yLjYyIC0xLjc1IC00LjUzIC00LjE5IC00LjUzIHogbSAyNy41NiAwIGMgLTIuNDEgMCAtNC4zOCAyLjAzIC00LjM4IDQuNTMgMCAyLjUgMS45NyA0LjUzIDQuMzggNC41MyAyLjQxIDAgNC4zNCAtMi4wMyA0LjM0IC00LjUzIDAgLTIuNSAtMS45NCAtNC41MyAtNC4zNCAtNC41MyB6IG0gLTIyIDAuMDMgMCAxMiAxLjc1IDAgMCAtMi45NyBjIDAuNTcgMCAxLjA0IC0wIDEuNTkgMCAyLjQ0IDAgNC4zNCAtMS45MSA0LjM0IC00LjUzIDAgLTIuNjIgLTEuOSAtNC41IC00LjM0IC00LjUgeiBtIDI2LjE2IDAgMy4wMyA0LjM4IC0zLjE5IDQuNjIgMi4xMiAwIEwgNTcuMzEgMTEuOTEgNTkuNDQgMTUgNjEuNTkgMTUgNTguMzggMTAuMzggNjEuNDEgNiA1OS4yNSA2IDU3LjMxIDguODEgNTUuMzQgNiB6IE0gMjEuNDcgNy43MiBjIDEuNCAwIDIuNDQgMS4xOSAyLjQ0IDIuNzggbCAwIDIuNzggLTIuNDQgMCBjIC0xLjQgMCAtMi40NCAtMS4yMSAtMi40NCAtMi43OCAtMCAtMS41NyAxLjA0IC0yLjc4IDIuNDQgLTIuNzggeiBtIDI3LjU2IDAgYyAxLjQ0IDAgMi41OSAxLjI0IDIuNTkgMi43OCAwIDEuNTQgLTEuMTUgMi43OCAtMi41OSAyLjc4IC0xLjQ0IDAgLTIuNjIgLTEuMjQgLTIuNjIgLTIuNzggMCAtMS41NCAxLjE4IC0yLjc4IDIuNjIgLTIuNzggeiBtIC0yMC4yNSAwLjAzIDEuNTkgMCBjIDEuNTkgMCAyLjU5IDEuMjggMi41OSAyLjc1IDAgMS40NyAtMS4xMyAyLjc4IC0yLjU5IDIuNzggbCAtMS41OSAwIHogbSA4Ljk3IDAgMS41IDAgYyAxLjQ3IDAgMi42MiAxLjI4IDIuNjIgMi43NSAwIDEuNDcgLTEuMDQgMi43OCAtMi42MiAyLjc4IGwgLTEuNSAwIHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIi8+PC9nPjwvZz48L3N2Zz4=",
"max_connections": 12
},
"print": {
- "id": "mapbox.streets-v11",
- "name": "Mapbox street tiles",
+ "id": "osm.print",
+ "name": "OpenStreetMap street tiles for print",
"license": "© OpenStreetMap",
"license_uri": "http://www.openstreetmap.org/copyright";,
"min_zoom_level": 0,
"max_zoom_level": 19,
- "tile_size": 512,
- "uri_format": "https://api.mapbox.com/styles/v1/mapbox/streets-v11/tiles/#Z#/#X#/#Y#?access_token=pk.eyJ1IjoiZ25vbWUtbWFwcyIsImEiOiJjaXF3a3lwbXkwMDJwaTBubmZlaGk4cDZ6In0.8aukTfgjzeqATA8eNItPJA&";,
- "attribution_logo": "PHN2ZyB4bWxuczpkYz0iaHR0cDovL3B1cmwub3JnL2RjL2VsZW1lbnRzLzEuMS8iIHhtbG5zOmNjPSJodHRwOi8vY3JlYXRpdmVjb21tb25zLm9yZy9ucyMiIHhtbG5zOnJkZj0iaHR0cDovL3d3dy53My5vcmcvMTk5OS8wMi8yMi1yZGYtc3ludGF4LW5zIyIgeG1sbnM6c3ZnPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB2ZXJzaW9uPSIxLjEiIHdpZHRoPSI2NSIgaGVpZ2h0PSIyMCI+PGRlZnMvPjxtZXRhZGF0YT48cmRmOlJERj48Y2M6V29yayByZGY6YWJvdXQ9IiI+PGRjOmZvcm1hdD5pbWFnZS9zdmcreG1sPC9kYzpmb3JtYXQ+PGRjOnR5cGUgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIvPjxkYzp0aXRsZS8+PC9jYzpXb3JrPjwvcmRmOlJERj48L21ldGFkYXRhPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNjEuODQ4MywtOTguNTAzOTUpIj48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0ib3BhY2l0eTowLjI1O2ZpbGw6I2ZmZmZmZjtzdHJva2U6IzAwMDAwMDtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7c3Ryb2tlLWxpbmVjYXA6cm91bmQ7c3Ryb2tlLWxpbmVqb2luOnJvdW5kO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLW9wYWNpdHk6MTtzdHJva2UtZGFzaGFycmF5Om5vbmUiPjxwYXRoIGQ9Ik0gNS4yOCAxLjUgQyA0LjU0IDEuNTYgMy45IDIuMjUgMy45MSAzIGwgMCAxMS44OCBjIDAuMDIgMC43NyAwLjcyIDEuNDcgMS41IDEuNDcgbCAxLjc1IDAgYyAwLjc4IDAgMS40OCAtMC42OSAxLjUgLTEuNDcgbCAwIC00LjI4IDAuNzIgMS4xOSBjIDAuNTMgMC44NyAyLjAzIDAuODcgMi41NiAwIGwgMC43MiAtMS4xOSAwIDQuMjggYyAwLjAyIDAuNzYgMC43IDEuNDUgMS40NyAxLjQ3IGwgMS43NSAwIGMgMC43OCAwIDEuNDggLTAuNjkgMS41IC0xLjQ3IGwgMCAtMC4xNiBjIDEuMDIgMS4xMiAyLjQ2IDEuODEgNC4wOSAxLjgxIGwgNC4wOSAwIDAgMS40NyBjIC0wIDAuNzggMC42OSAxLjQ4IDEuNDcgMS41IGwgMS43NSAwIGMgMC43OSAtMCAxLjUgLTAuNzEgMS41IC0xLjUgbCAwLjAyIC0xLjQ3IGMgMS43MiAwIDMuMDggLTAuNjQgNC4xNCAtMS42OSBsIDAgMC4xOSBjIDAgMC4zOSAwLjE2IDAuNzkgMC40NCAxLjA2IDAuMjggMC4yOCAwLjY3IDAuNDQgMS4wNiAwLjQ0IGwgMy4zMSAwIGMgMi4wMyAwIDMuODUgLTEuMDYgNC45MSAtMi42OSAxLjA1IDEuNjEgMi44NCAyLjY5IDQuODggMi42OSAxLjAzIDAgMS45OCAtMC4yNyAyLjgxIC0wLjc1IDAuMjggMC4zNSAwLjczIDAuNTcgMS4xOSAwLjU2IGwgMi4xMiAwIGMgMC40OCAwLjAxIDAuOTcgLTAuMjMgMS4yNSAtMC42MiBsIDAuOTEgLTEuMjggMC45MSAxLjI4IGMgMC4yOCAwLjM5IDAuNzQgMC42MyAxLjIyIDAuNjIgbCAyLjE2IDAgQyA2Mi42NyAxNi4zMyA2My40MiAxNC44OSA2Mi44MSAxNCBMIDYwLjIyIDEwLjM4IDYyLjYyIDcgQyA2My4yNiA2LjExIDYyLjUgNC42MiA2MS40MSA0LjYyIGwgLTIuMTYgMCBDIDU4Ljc4IDQuNjIgNTguMzEgNC44NiA1OC4wMyA1LjI1IEwgNTcuMzEgNi4yOCA1Ni41NiA1LjI1IEMgNTYuMjkgNC44NiA1NS44MiA0LjYyIDU1LjM0IDQuNjIgbCAtMi4xNiAwIGMgLTAuNDkgLTAgLTAuOTcgMC4yNSAtMS4yNSAwLjY2IC0wLjg2IC0wLjUxIC0xLjg0IC0wLjgxIC0yLjkxIC0wLjgxIC0yLjAzIDAgLTMuODMgMS4wOCAtNC44OCAyLjY5IEMgNDMuMSA1LjUzIDQxLjI3IDQuNDcgMzkuMTkgNC40NyBMIDM5LjE5IDMgQyAzOS4xOSAyLjYxIDM5LjAzIDIuMjEgMzguNzUgMS45NCAzOC40NyAxLjY2IDM4LjA4IDEuNSAzNy42OSAxLjUgbCAtMS43NSAwIGMgLTAuNzEgMCAtMS41IDAuODMgLTEuNSAxLjUgbCAwIDMuMTYgQyAzMy4zOCA1LjEgMzEuOTYgNC40NyAzMC4zOCA0LjQ3IGwgLTMuMzQgMCBjIC0wLjc3IDAuMDIgLTEuNDcgMC43MiAtMS40NyAxLjUgbCAwIDAuMzEgYyAtMS4wMiAtMS4xMiAtMi40NiAtMS44MSAtNC4wOSAtMS44MSAtMS42MyAwIC0zLjA3IDAuNyAtNC4wOSAxLjgxIEwgMTcuMzggMyBjIC0wIC0wLjc5IC0wLjcxIC0xLjUgLTEuNSAtMS41IEwgMTQuNSAxLjUgQyAxMy41NSAxLjUgMTIuMjggMS44NyAxMS42NiAyLjk0IGwgLTEgMS42OSAtMSAtMS42OSBDIDkuMDMgMS44NyA3Ljc3IDEuNSA2LjgxIDEuNSBsIC0xLjQxIDAgQyA1LjM2IDEuNSA1LjMyIDEuNSA1LjI4IDEuNSB6IG0gMTYuMTkgNy43MiBjIDAuNTMgMCAwLjk0IDAuMzUgMC45NCAxLjI4IGwgMCAxLjI4IC0wLjk0IDAgYyAtMC41MiAwIC0wLjk0IC0wLjM4IC0wLjk0IC0xLjI4IC0wIC0wLjkgMC40MiAtMS4yOCAwLjk0IC0xLjI4IHogbSA4LjgxIDAgYyAwLjgzIDAgMS4xOCAwLjY4IDEuMTkgMS4yOCAwLjAxIDAuOTQgLTAuNjIgMS4yOCAtMS4xOSAxLjI4IHogbSA4LjcyIDAgYyAwLjcyIDAgMS4zNyAwLjYgMS4zNyAxLjI4IDAgMC43NyAtMC41MSAxLjI4IC0xLjM3IDEuMjggeiBtIDEwLjAzIDAgYyAwLjU4IDAgMS4wOSAwLjUgMS4wOSAxLjI4IDAgMC43OCAtMC41MSAxLjI4IC0xLjA5IDEuMjggLTAuNTggMCAtMS4xMiAtMC41IC0xLjEyIC0xLjI4IDAgLTAuNzggMC41NCAtMS4yOCAxLjEyIC0xLjI4IHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZm9udC1zaXplOm1lZGl1bTtmb250LXN0eWxlOm5vcm1hbDtmb250LXZhcmlhbnQ6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXN0cmV0Y2g6bm9ybWFsO3RleHQtaW5kZW50OjA7dGV4dC1hbGlnbjpzdGFydDt0ZXh0LWRlY29yYXRpb246bm9uZTtsaW5lLWhlaWdodDpub3JtYWw7bGV0dGVyLXNwYWNpbmc6bm9ybWFsO3dvcmQtc3BhY2luZzpub3JtYWw7dGV4dC10cmFuc2Zvcm06bm9uZTtkaXJlY3Rpb246bHRyO2Jsb2NrLXByb2dyZXNzaW9uOnRiO3dyaXRpbmctbW9kZTpsci10Yjt0ZXh0LWFuY2hvcjpzdGFydDtiYXNlbGluZS1zaGlmdDpiYXNlbGluZTtjb2xvcjojMDAwMDAwO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtmaWxsLXJ1bGU6bm9uemVybztzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MTcuMjAwMDIzNjU7bWFya2VyOm5vbmU7dmlzaWJpbGl0eTp2aXNpYmxlO2Rpc3BsYXk6aW5saW5lO292ZXJmbG93OnZpc2libGU7ZW5hYmxlLWJhY2tncm91bmQ6YWNjdW11bGF0ZTtmb250LWZhbWlseTpTYW5zOy1pbmtzY2FwZS1mb250LXNwZWNpZmljYXRpb246U2FucyIvPjwvZz48ZyB0cmFuc2Zvcm09Im1hdHJpeCgwLjE3NDQxODM2LDAsMCwwLjE3NDQxODM2LDIyMC41MjI4MiwyOS4yMjkzNDIpIiBzdHlsZT0iZmlsbDojZmZmZmZmIj48cGF0aCBkPSJtIDUuNDEgMyAwIDEyIDEuNzUgMCAwIC05LjkxIDMuNSA1Ljk0IDMuNDcgLTUuOTQgMCA5LjkxIDEuNzUgMCAwIC0xMiBMIDE0LjUgMyBDIDEzLjggMyAxMy4yNSAzLjE2IDEyLjk0IDMuNjkgTCAxMC42NiA3LjU5IDguMzggMy42OSBDIDguMDcgMy4xNiA3LjUxIDMgNi44MSAzIHogTSAzNiAzIGwgMCAxMi4wMyAzLjI1IDAgYyAyLjQ0IDAgNC4zOCAtMS45MSA0LjM4IC00LjUzIDAgLTIuNjIgLTEuOTMgLTQuNDcgLTQuMzggLTQuNDcgQyAzOC43IDYuMDMgMzguMzIgNiAzNy43NSA2IGwgMCAtMyB6IE0gMjEuNDcgNS45NyBjIC0yLjQ0IDAgLTQuMTkgMS45MSAtNC4xOSA0LjUzIDAgMi42MiAxLjc1IDQuNTMgNC4xOSA0LjUzIGwgNC4xOSAwIDAgLTQuNTMgYyAwIC0yLjYyIC0xLjc1IC00LjUzIC00LjE5IC00LjUzIHogbSAyNy41NiAwIGMgLTIuNDEgMCAtNC4zOCAyLjAzIC00LjM4IDQuNTMgMCAyLjUgMS45NyA0LjUzIDQuMzggNC41MyAyLjQxIDAgNC4zNCAtMi4wMyA0LjM0IC00LjUzIDAgLTIuNSAtMS45NCAtNC41MyAtNC4zNCAtNC41MyB6IG0gLTIyIDAuMDMgMCAxMiAxLjc1IDAgMCAtMi45NyBjIDAuNTcgMCAxLjA0IC0wIDEuNTkgMCAyLjQ0IDAgNC4zNCAtMS45MSA0LjM0IC00LjUzIDAgLTIuNjIgLTEuOSAtNC41IC00LjM0IC00LjUgeiBtIDI2LjE2IDAgMy4wMyA0LjM4IC0zLjE5IDQuNjIgMi4xMiAwIEwgNTcuMzEgMTEuOTEgNTkuNDQgMTUgNjEuNTkgMTUgNTguMzggMTAuMzggNjEuNDEgNiA1OS4yNSA2IDU3LjMxIDguODEgNTUuMzQgNiB6IE0gMjEuNDcgNy43MiBjIDEuNCAwIDIuNDQgMS4xOSAyLjQ0IDIuNzggbCAwIDIuNzggLTIuNDQgMCBjIC0xLjQgMCAtMi40NCAtMS4yMSAtMi40NCAtMi43OCAtMCAtMS41NyAxLjA0IC0yLjc4IDIuNDQgLTIuNzggeiBtIDI3LjU2IDAgYyAxLjQ0IDAgMi41OSAxLjI0IDIuNTkgMi43OCAwIDEuNTQgLTEuMTUgMi43OCAtMi41OSAyLjc4IC0xLjQ0IDAgLTIuNjIgLTEuMjQgLTIuNjIgLTIuNzggMCAtMS41NCAxLjE4IC0yLjc4IDIuNjIgLTIuNzggeiBtIC0yMC4yNSAwLjAzIDEuNTkgMCBjIDEuNTkgMCAyLjU5IDEuMjggMi41OSAyLjc1IDAgMS40NyAtMS4xMyAyLjc4IC0yLjU5IDIuNzggbCAtMS41OSAwIHogbSA4Ljk3IDAgMS41IDAgYyAxLjQ3IDAgMi42MiAxLjI4IDIuNjIgMi43NSAwIDEuNDcgLTEuMDQgMi43OCAtMi42MiAyLjc4IGwgLTEuNSAwIHoiIHRyYW5zZm9ybT0ibWF0cml4KDUuNzMzMzQxNCwwLDAsNS43MzMzNDE0LDIzNi45MzMwOCwzOTcuMTc0OTgpIiBzdHlsZT0iZmlsbDojZmZmZmZmO2ZpbGwtb3BhY2l0eToxO2ZpbGwtcnVsZTpub256ZXJvO3N0cm9rZTpub25lIi8+PC9nPjwvZz48L3N2Zz4=",
- "max_connections": 12
+ "tile_size": 256,
+ "uri_format": "https://tile.openstreetmap.org/#Z#/#X#/#Y#.png";,
+ "attribution_logo": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgeG1sbnM6c29kaXBvZGk9Imh0dHA6Ly9zb2RpcG9kaS5zb3VyY2Vmb3JnZS5uZXQvRFREL3NvZGlwb2RpLTAuZHRkIgogICB4bWxuczppbmtzY2FwZT0iaHR0cDovL3d3dy5pbmtzY2FwZS5vcmcvbmFtZXNwYWNlcy9pbmtzY2FwZSIKICAgd2lkdGg9IjgxLjU4NjQ4N21tIgogICBoZWlnaHQ9IjEwLjA1NjIwMm1tIgogICB2aWV3Qm94PSIwIDAgODEuNTg2NDg3IDEwLjA1NjIwMiIKICAgdmVyc2lvbj0iMS4xIgogICBpZD0ic3ZnOCIKICAgaW5rc2NhcGU6dmVyc2lvbj0iMS4wLjIgKGU4NmM4NzA4NzksIDIwMjEtMDEtMTUpIgogICBzb2RpcG9kaTpkb2NuYW1lPSJkcmF3aW5nLnN2ZyI+CiAgPGRlZnMKICAgICBpZD0iZGVmczIiIC8+CiAgPHNvZGlwb2RpOm5hbWVkdmlldwogICAgIGlkPSJiYXNlIgogICAgIHBhZ2Vjb2xvcj0iI2ZmZmZmZiIKICAgICBib3JkZXJjb2xvcj0iIzY2NjY2NiIKICAgICBib3JkZXJvcGFjaXR5PSIxLjAiCiAgICAgaW5rc2NhcGU6cGFnZW9wYWNpdHk9IjAuMCIKICAgICBpbmtzY2FwZTpwYWdlc2hhZG93PSIyIgogICAgIGlua3NjYXBlOnpvb209IjEuOTc5ODk5IgogICAgIGlua3NjYXBlOmN4PSI4Ni45MTU1MzYiCiAgICAgaW5rc2NhcGU6Y3k9Ijc4Ljc2NjQ3OSIKICAgICBpbmtzY2FwZTpkb2N1bWVudC11bml0cz0ibW0iCiAgICAgaW5rc2NhcGU6Y3VycmVudC1sYXllcj0ibGF5ZXIxIgogICAgIGlua3NjYXBlOmRvY3VtZW50LXJvdGF0aW9uPSIwIgogICAgIHNob3dncmlkPSJmYWxzZSIKICAgICBmaXQtbWFyZ2luLXRvcD0iMCIKICAgICBmaXQtbWFyZ2luLWxlZnQ9IjAiCiAgICAgZml0LW1hcmdpbi1yaWdodD0iMCIKICAgICBmaXQtbWFyZ2luLWJvdHRvbT0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3ctd2lkdGg9IjE5MjAiCiAgICAgaW5rc2NhcGU6d2luZG93LWhlaWdodD0iMTA0MyIKICAgICBpbmtzY2FwZTp3aW5kb3cteD0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3cteT0iMCIKICAgICBpbmtzY2FwZTp3aW5kb3ctbWF4aW1pemVkPSIxIiAvPgogIDxtZXRhZGF0YQogICAgIGlkPSJtZXRhZGF0YTUiPgogICAgPHJkZjpSREY+CiAgICAgIDxjYzpXb3JrCiAgICAgICAgIHJkZjphYm91dD0iIj4KICAgICAgICA8ZGM6Zm9ybWF0PmltYWdlL3N2Zyt4bWw8L2RjOmZvcm1hdD4KICAgICAgICA8ZGM6dHlwZQogICAgICAgICAgIHJkZjpyZXNvdXJjZT0iaHR0cDovL3B1cmwub3JnL2RjL2RjbWl0eXBlL1N0aWxsSW1hZ2UiIC8+CiAgICAgICAgPGRjOnRpdGxlPjwvZGM6dGl0bGU+CiAgICAgIDwvY2M6V29yaz4KICAgIDwvcmRmOlJERj4KICA8L21ldGFkYXRhPgogIDxnCiAgICAgaW5rc2NhcGU6bGFiZWw9IkxheWVyIDEiCiAgICAgaW5rc2NhcGU6Z3JvdXBtb2RlPSJsYXllciIKICAgICBpZD0ibGF5ZXIxIgogICAgIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yNC41MzY3MDgsLTI1LjI5NDkpIj4KICAgIDx0ZXh0CiAgICAgICB4bWw6c3BhY2U9InByZXNlcnZlIgogICAgICAgc3R5bGU9ImZvbnQtc3R5bGU6bm9ybWFsO2ZvbnQtd2VpZ2h0Om5vcm1hbDtmb250LXNpemU6MTAuNTgzM3B4O2xpbmUtaGVpZ2h0OjEuMjU7Zm9udC1mYW1pbHk6c2Fucy1zZXJpZjtsZXR0ZXItc3BhY2luZzowcHg7d29yZC1zcGFjaW5nOjBweDtmaWxsOiMwMDAwMDA7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOm5vbmU7c3Ryb2tlLXdpZHRoOjAuMjY0NTgzIgogICAgICAgeD0iMjMuOTQyNDMiCiAgICAgICB5PSIzMy4xNDk2OTMiCiAgICAgICBpZD0idGV4dDEyIj48dHNwYW4KICAgICAgICAgc29kaXBvZGk6cm9sZT0ibGluZSIKICAgICAgICAgaWQ9InRzcGFuMTAiCiAgICAgICAgIHg9IjIzLjk0MjQzIgogICAgICAgICB5PSIzMy4xNDk2OTMiCiAgICAgICAgIHN0eWxlPSJmaWxsOiNmZmZmZmY7ZmlsbC1vcGFjaXR5OjE7c3Ryb2tlOiMwMDAwMDA7c3Ryb2tlLXdpZHRoOjAuMjY0NTgzO3N0cm9rZS1vcGFjaXR5OjEiPk9wZW5TdHJlZXRNYXA8L3RzcGFuPjwvdGV4dD4KICA8L2c+Cjwvc3ZnPgo=",
+ "max_connections": 2
}
},
"graphHopperGeocode": {
diff -Nru gnome-maps-3.38.2/data/org.gnome.Maps.appdata.xml.in gnome-maps-3.38.6/data/org.gnome.Maps.appdata.xml.in
--- gnome-maps-3.38.2/data/org.gnome.Maps.appdata.xml.in 2020-11-21 13:24:38.734244000 +0000
+++ gnome-maps-3.38.6/data/org.gnome.Maps.appdata.xml.in 2021-07-09 22:47:16.568429500 +0100
@@ -42,6 +42,28 @@
</screenshot>
</screenshots>
<releases>
+ <release date="2021-07-09" version="3.38.6">
+ <ul>
+ <li>Fix regression when signing in for OSM editing</li>
+ </ul>
+ </release>
+ <release date="2021-06-04" version="3.38.5">
+ <ul>
+ <li>Fix crashes when no aerial tile definition is available</li>
+ </ul>
+ </release>
+ <release date="2021-02-12" version="3.38.4">
+ <ul>
+ <li>Fix a bug resulting in writing a broken last view position on exit in some circumstances</li>
+ <li>Fix a bug preventing wrapping around at the date line with dark tiles</li>
+ <li>Fix a bug causing hanging in cases when dragging around route markers</li>
+ </ul>
+ </release>
+ <release date="2021-01-09" version="3.38.3">
+ <ul>
+ <li>Fix a bug where place details gets lost after searching again for the same place</li>
+ </ul>
+ </release>
<release date="2020-11-21" version="3.38.2">
<ul>Translation updates</ul>
</release>
diff -Nru gnome-maps-3.38.2/debian/changelog gnome-maps-3.38.6/debian/changelog
--- gnome-maps-3.38.2/debian/changelog 2020-12-13 13:10:56.000000000 +0000
+++ gnome-maps-3.38.6/debian/changelog 2021-09-19 17:41:02.000000000 +0100
@@ -1,3 +1,27 @@
+gnome-maps (3.38.6-0+deb11u1) bullseye; urgency=medium
+
+ * d/control.in, d/gbp.conf, d/watch: Target 3.38.x for bullseye
+ * New upstream stable release
+ - Fix a bug where place details get lost after searching again for
+ the same place
+ - Avoid dark-mode background pattern when wrapping around from
+ -180 to 180 degrees longitude, working around a libchamplain bug
+ - Only grab focus onto next route entry in sidebar if it's empty.
+ This avoids a hang when dragging around route markers.
+ - Don't save an invalid location when moving the view and immediately
+ quitting the app
+ - Fix handling of different attribution logos, which is necessary
+ now that street and aerial maps come from different providers
+ - Update fallback file used if details of map providers cannot be
+ downloaded
+ - Don't try to set aerial tiles if not available. This avoids a crash
+ if aerial maps were saved as the last-used map type in GSettings,
+ and at next startup the service has dropped support. (Closes: #990618)
+ - Fix a regression when signing in for Open Street Map editing
+ - Translation update: nb
+
+ -- Simon McVittie <s...@debian.org> Sun, 19 Sep 2021 17:41:02 +0100
+
gnome-maps (3.38.2-1) unstable; urgency=medium
* Team upload
diff -Nru gnome-maps-3.38.2/debian/control gnome-maps-3.38.6/debian/control
--- gnome-maps-3.38.2/debian/control 2020-12-13 13:10:56.000000000 +0000
+++ gnome-maps-3.38.6/debian/control 2021-09-19 17:41:02.000000000 +0100
@@ -40,7 +40,7 @@
Standards-Version: 4.5.1
X-Ubuntu-Use-Langpack: yes
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-maps
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git -b debian/bullseye
Homepage: https://wiki.gnome.org/Apps/Maps
Package: gnome-maps
diff -Nru gnome-maps-3.38.2/debian/control.in gnome-maps-3.38.6/debian/control.in
--- gnome-maps-3.38.2/debian/control.in 2020-12-13 13:10:56.000000000 +0000
+++ gnome-maps-3.38.6/debian/control.in 2021-09-19 17:41:02.000000000 +0100
@@ -36,7 +36,7 @@
Standards-Version: 4.5.1
X-Ubuntu-Use-Langpack: yes
Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-maps
-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git
+Vcs-Git: https://salsa.debian.org/gnome-team/gnome-maps.git -b debian/bullseye
Homepage: https://wiki.gnome.org/Apps/Maps
Package: gnome-maps
diff -Nru gnome-maps-3.38.2/debian/gbp.conf gnome-maps-3.38.6/debian/gbp.conf
--- gnome-maps-3.38.2/debian/gbp.conf 2020-12-13 13:10:56.000000000 +0000
+++ gnome-maps-3.38.6/debian/gbp.conf 2021-09-19 17:41:02.000000000 +0100
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/bullseye
+upstream-branch = upstream/3.38.x
[buildpackage]
sign-tags = True
diff -Nru gnome-maps-3.38.2/debian/watch gnome-maps-3.38.6/debian/watch
--- gnome-maps-3.38.2/debian/watch 2020-12-13 13:10:56.000000000 +0000
+++ gnome-maps-3.38.6/debian/watch 2021-09-19 17:41:02.000000000 +0100
@@ -1,3 +1,3 @@
version=4
-https://download.gnome.org/sources/@PACKAGE@/([\d\.]+)/ \
+https://download.gnome.org/sources/@PACKAGE@/3.38/ \
@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@
diff -Nru gnome-maps-3.38.2/meson.build gnome-maps-3.38.6/meson.build
--- gnome-maps-3.38.2/meson.build 2020-11-21 13:24:38.762241600 +0000
+++ gnome-maps-3.38.6/meson.build 2021-07-09 22:47:16.616425500 +0100
@@ -1,5 +1,5 @@
project('gnome-maps', 'c',
- version: '3.38.2',
+ version: '3.38.6',
license: 'GPL2+'
)
diff -Nru gnome-maps-3.38.2/NEWS gnome-maps-3.38.6/NEWS
--- gnome-maps-3.38.2/NEWS 2020-11-21 13:24:38.726244700 +0000
+++ gnome-maps-3.38.6/NEWS 2021-07-09 22:47:16.564429800 +0100
@@ -1,3 +1,52 @@
+3.38.6 - Jul 9, 2021
+=========================
+
+Changes since 3.38.5
+ - Fix regression when signing in for OSM editing
+
+All contributors to this release
+Marcus Lundblad <m...@update.uu.se>
+
+3.38.5 - Jun 4, 2021
+=========================
+
+Changes since 3.38.4
+ - Fix a crash when starting up with last-used map type being aerial, and
+ no aerial tile definition is found
+
+All contributors to this release
+Marcus Lundblad <m...@update.uu.se>
+
+3.38.4 - Feb 12, 2021
+=========================
+
+Changes since 3.38.3
+ - Fix a bug resulting in writing a broken last view position on exit in
+ some circumstances
+ - Fix a bug preventing wrapping around at the date line with dark tiles
+ - Fix a bug causing hanging in cases when dragging around route markers
+
+Added/updated/fixed translations
+ - Norwegian Bokmål
+
+All contributors to this release
+Kjartan Maraas <kmar...@gnome.org>
+Marcus Lundblad <m...@update.uu.se>
+
+3.38.3 - Jan 9, 2021
+=========================
+
+Changes since 3.38.2
+ - Fix a bug where place details gets lost after searching again for the same
+ place
+
+Added/updated/fixed translations
+ - Norwegian Bokmål
+
+All contributors to this release
+Kjartan Maraas <kmar...@gnome.org>
+Marcus Lundblad <m...@update.uu.se>
+
3.38.2 - Nov 21, 2020
=========================
diff -Nru gnome-maps-3.38.2/po/nb.po gnome-maps-3.38.6/po/nb.po
--- gnome-maps-3.38.2/po/nb.po 2020-11-21 13:24:38.786239600 +0000
+++ gnome-maps-3.38.6/po/nb.po 2021-07-09 22:47:16.632424000 +0100
@@ -7,10 +7,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: gnome-maps 3.36.x\n"
+"Project-Id-Version: gnome-maps 3.38.x\n"
"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/gnome-maps/issues\n";
-"POT-Creation-Date: 2020-01-30 20:30+0000\n"
-"PO-Revision-Date: 2020-03-09 18:18+0100\n"
+"POT-Creation-Date: 2021-01-15 22:25+0000\n"
+"PO-Revision-Date: 2021-01-25 15:53+0100\n"
"Last-Translator: Kjartan Maraas <kmar...@gnome.org>\n"
"Language-Team: Norwegian bokmål <i18n...@lister.ping.uio.no>\n"
"Language: nb\n"
@@ -57,7 +57,7 @@
"Du kan også søke etter en bestemt type sted, som f.eks. «Pub nær Main "
"Street, Boston» eller «Hoteller nær Alexanderplatz, Berlin»."
-#: data/org.gnome.Maps.appdata.xml.in:92
+#: data/org.gnome.Maps.appdata.xml.in:182
msgid "The GNOME Project"
msgstr "GNOME prosjektet"
@@ -69,8 +69,8 @@
#. * overview.
#.
#. Translators: This is the program name.
-#: data/org.gnome.Maps.desktop.in:4 data/ui/main-window.ui:30
-#: src/application.js:81 src/mainWindow.js:141 src/mainWindow.js:550
+#: data/org.gnome.Maps.desktop.in:4 data/ui/main-window.ui:34
+#: src/application.js:81 src/mainWindow.js:129 src/mainWindow.js:567
msgid "Maps"
msgstr "Kart"
@@ -221,6 +221,22 @@
msgid "Last used transportation type for routing"
msgstr "Sist brukte transporttype for ruting"
+#: data/org.gnome.Maps.gschema.xml:86
+msgid "Night mode"
+msgstr "Nattmodus"
+
+#: data/org.gnome.Maps.gschema.xml:87
+msgid "Whether the application is in night mode."
+msgstr "Hvorvidt programmet vises i nattmodus."
+
+#: data/org.gnome.Maps.gschema.xml:91
+msgid "Use hybrid aerial tiles"
+msgstr ""
+
+#: data/org.gnome.Maps.gschema.xml:92
+msgid "Whether aerial tiles should use hybrid style (with labels)."
+msgstr ""
+
#: data/ui/check-in-dialog.ui:250 data/ui/check-in-dialog.ui:299
msgid "Visibility"
msgstr "Synlighet"
@@ -307,6 +323,41 @@
msgid "Include route and markers"
msgstr "Ta med rute og markører"
+#. Translators: This is a tooltip
+#: data/ui/headerbar-left.ui:15
+msgid "Go to current location"
+msgstr "Gå til gjeldende posisjon"
+
+#. Translators: This is a tooltip
+#: data/ui/headerbar-left.ui:36
+msgid "Choose map type"
+msgstr "Velg karttype"
+
+#. Translators: This is a tooltip
+#: data/ui/headerbar-left.ui:61
+msgid "Zoom out"
+msgstr "Zoom ut"
+
+#. Translators: This is a tooltip
+#: data/ui/headerbar-left.ui:77
+msgid "Zoom in"
+msgstr "Zoom inn"
+
+#. Translators: This is a tooltip
+#: data/ui/headerbar-right.ui:16
+msgid "Toggle route planner"
+msgstr "Slå av/på ruteplanlegger"
+
+#. Translators: This is a tooltip
+#: data/ui/headerbar-right.ui:37
+msgid "Toggle favorites"
+msgstr "Slå av/på favoritter"
+
+#. Translators: This is a tooltip
+#: data/ui/headerbar-right.ui:57
+msgid "Print Route"
+msgstr "Skriv ut rute"
+
#: data/ui/help-overlay.ui:14
msgctxt "shortcut window"
msgid "General"
@@ -337,48 +388,57 @@
msgid "Quit"
msgstr "Avslutt"
-#: data/ui/help-overlay.ui:55
+#: data/ui/help-overlay.ui:53
+msgctxt "shortcut window"
+msgid "Open main menu"
+msgstr "Åpne hovedmeny"
+
+#: data/ui/help-overlay.ui:62
msgctxt "shortcut window"
msgid "Map View"
msgstr "Kartvisning"
-#: data/ui/help-overlay.ui:59
+#: data/ui/help-overlay.ui:66
msgctxt "shortcut window"
msgid "Zoom in"
msgstr "Zoom inn"
-#: data/ui/help-overlay.ui:66
+#: data/ui/help-overlay.ui:73
msgctxt "shortcut window"
msgid "Zoom out"
msgstr "Zoom ut"
-#: data/ui/help-overlay.ui:73
+#: data/ui/help-overlay.ui:80
msgctxt "shortcut window"
msgid "Toggle scale"
msgstr "Slå av/på skala"
-#: data/ui/help-overlay.ui:80
+#: data/ui/help-overlay.ui:87
msgctxt "shortcut window"
msgid "Go to current location"
msgstr "Gå til gjeldende posisjon"
-#: data/ui/help-overlay.ui:87
+#: data/ui/help-overlay.ui:94
msgctxt "shortcut window"
msgid "Switch to street view"
msgstr "Bytt til gatevisning"
-#: data/ui/help-overlay.ui:94
+#: data/ui/help-overlay.ui:101
msgctxt "shortcut window"
msgid "Switch to aerial view"
msgstr "Bytt til flyvisning"
-#: data/ui/help-overlay.ui:101
+#: data/ui/help-overlay.ui:108
msgctxt "shortcut window"
msgid "Open shape layer"
msgstr "Åpne formlag"
+#: data/ui/layers-popover.ui:65
+msgid "Show Labels"
+msgstr "Vis etiketter"
+
#. Translators: This string uses ellipsis character
-#: data/ui/layers-popover.ui:69
+#: data/ui/layers-popover.ui:102
msgid "Open Shape Layer…"
msgstr "Åpne formlag …"
@@ -396,61 +456,34 @@
msgstr "Posisjonsinnstillinger"
#: data/ui/main-window.ui:8
+msgid "Night Mode"
+msgstr "Nattmodus"
+
+#: data/ui/main-window.ui:12
msgid "Set up OpenStreetMap Account"
msgstr "Sett opp konto på OpenStreetMap"
-#: data/ui/main-window.ui:12
+#: data/ui/main-window.ui:16
msgid "Export as Image"
msgstr "Eksporter som bilde"
-#: data/ui/main-window.ui:17
+#: data/ui/main-window.ui:21
msgid "_Keyboard Shortcuts"
msgstr "_Tastatursnarveier"
-#: data/ui/main-window.ui:22
+#: data/ui/main-window.ui:26
msgid "About Maps"
msgstr "Om Kart"
-#. Translators: This is a tooltip
-#: data/ui/main-window.ui:45
-msgid "Go to current location"
-msgstr "Gå til gjeldende posisjon"
-
-#. Translators: This is a tooltip
-#: data/ui/main-window.ui:66
-msgid "Choose map type"
-msgstr "Velg karttype"
-
-#. Translators: This is a tooltip
-#: data/ui/main-window.ui:91
-msgid "Zoom out"
-msgstr "Zoom ut"
-
-#. Translators: This is a tooltip
-#: data/ui/main-window.ui:107
-msgid "Zoom in"
-msgstr "Zoom inn"
-
-#. Translators: This is a tooltip
-#: data/ui/main-window.ui:146
-msgid "Toggle route planner"
-msgstr "Slå av/på ruteplanlegger"
-
-#. Translators: This is a tooltip
-#: data/ui/main-window.ui:167
-msgid "Toggle favorites"
-msgstr "Slå av/på favoritter"
+#: data/ui/main-window.ui:52
+msgid "Open main menu"
+msgstr "Åpne hovedmeny"
-#. Translators: This is a tooltip
-#: data/ui/main-window.ui:187
-msgid "Print Route"
-msgstr "Skriv ut rute"
-
-#: data/ui/main-window.ui:250
+#: data/ui/main-window.ui:114
msgid "Maps is offline!"
msgstr "Kart er frakoblet!"
-#: data/ui/main-window.ui:260
+#: data/ui/main-window.ui:123
msgid ""
"Maps need an active internet connection to function properly, but one can’t "
"be found."
@@ -458,7 +491,7 @@
"Kart trenger en aktiv internettforbindelse for å fungere, men ingen ble "
"funnet."
-#: data/ui/main-window.ui:269
+#: data/ui/main-window.ui:131
msgid "Check your connection and proxy settings."
msgstr "Sjekk tilkobling og innstillinger for proxy."
@@ -508,15 +541,15 @@
msgstr "Passord"
#: data/ui/osm-account-dialog.ui:125
+msgid "Sign up"
+msgstr "Registrer deg"
+
+#: data/ui/osm-account-dialog.ui:139
msgid "Sign In"
msgstr "Logg inn"
-#: data/ui/osm-account-dialog.ui:146
-msgid "Don’t have an account?"
-msgstr "Har du ikke en konto?"
-
#. The label should contain the link to the OSM reset password page with a translated title
-#: data/ui/osm-account-dialog.ui:159
+#: data/ui/osm-account-dialog.ui:162
msgid ""
"Sorry, that didn’t work. Please try again, or visit\n"
"<a href=\"https://www.openstreetmap.org/user/forgot-password";
@@ -526,27 +559,27 @@
"<a href=\"https://www.openstreetmap.org/user/forgot-password";
"\">OpenStreetMap</a> for å nullstille passordet ditt."
-#: data/ui/osm-account-dialog.ui:172
+#: data/ui/osm-account-dialog.ui:175
msgid "The verification code didn’t match, please try again."
msgstr "Verifiseringskoden var ikke riktig. Vennligst prøv igjen."
-#: data/ui/osm-account-dialog.ui:209
+#: data/ui/osm-account-dialog.ui:201
msgid "Enter verification code shown above"
msgstr "Oppgi verifikasjonskoden som vises over"
-#: data/ui/osm-account-dialog.ui:232
+#: data/ui/osm-account-dialog.ui:224
msgid "Verify"
msgstr "Verifiser"
-#: data/ui/osm-account-dialog.ui:262
+#: data/ui/osm-account-dialog.ui:254
msgid "<span weight=\"bold\" size=\"x-large\">Signed In</span>"
msgstr "<span weight=\"bold\" size=\"x-large\">Logget inn</span>"
-#: data/ui/osm-account-dialog.ui:275
+#: data/ui/osm-account-dialog.ui:267
msgid "Your OpenStreetMap account is active."
msgstr "Din OpenStreetMap-konto er aktiv."
-#: data/ui/osm-account-dialog.ui:309
+#: data/ui/osm-account-dialog.ui:301
msgid "Sign Out"
msgstr "Logg ut"
@@ -600,7 +633,7 @@
msgid "Edit on OpenStreetMap"
msgstr "Rediger på OpenStreetMap"
-#: data/ui/osm-edit-dialog.ui:310 src/osmEditDialog.js:512
+#: data/ui/osm-edit-dialog.ui:310 src/osmEditDialog.js:513
msgid "Next"
msgstr "Neste"
@@ -618,6 +651,11 @@
msgid "No results found"
msgstr "Ingen resultater funnet"
+#: data/ui/place-popover.ui:66 src/checkInDialog.js:280 src/checkIn.js:162
+#: src/osmEditDialog.js:550
+msgid "An error has occurred"
+msgstr "Det har oppstått en feil"
+
#. Translators: This is a tooltip
#: data/ui/route-entry.ui:20
msgid "Drag to change order of the route"
@@ -668,8 +706,11 @@
"Rutetabeller for offentlig transport tilbys av tredjepartstjenester\n"
"\n"
"GNOME kan ikke garantere riktighet for rutetabellene og tidsplanene.\n"
-"Merk at enkelte tilbydere ikke alltid inkluderer alle mulige typer transport. F.eks. vil noen aktører ikke ta med flyselskaper, mens en lokal tilbyder kanskje utelater regionstog.\n"
-"Navn og merker som vises skal anses som registrerte varemerker når det er relevant."
+"Merk at enkelte tilbydere ikke alltid inkluderer alle mulige typer "
+"transport. F.eks. vil noen aktører ikke ta med flyselskaper, mens en lokal "
+"tilbyder kanskje utelater regionstog.\n"
+"Navn og merker som vises skal anses som registrerte varemerker når det er "
+"relevant."
#: data/ui/social-place-more-results-row.ui:8
msgid "Show more results"
@@ -758,18 +799,26 @@
msgid "Could not find OSM element"
msgstr "Fant ikke OSM-element"
-#: src/application.js:94
+#: src/application.js:95
msgid "A path to a local tiles directory structure"
msgstr "En sti til en lokal katalogstruktur med fliser"
-#: src/application.js:98
+#: src/application.js:101
+msgid "Tile size for local tiles directory"
+msgstr "Størrelse på fliser i lokal katalogstruktur med fliser"
+
+#: src/application.js:105
msgid "Show the version of the program"
msgstr "Vis programmets versjon"
-#: src/application.js:104
+#: src/application.js:111
msgid "Ignore network availability"
msgstr "Overse nettverkstilgjengelighet"
+#: src/application.js:121 src/application.js:122
+msgid "[FILE…|URI]"
+msgstr "[FIL…|URI]"
+
#: src/checkInDialog.js:167
msgid "Select an account"
msgstr "Velg en konto"
@@ -812,10 +861,6 @@
msgid "Write an optional message to check in to %s."
msgstr "Skriv en valgfri melding for å sjekke inn ved %s."
-#: src/checkInDialog.js:280 src/checkIn.js:162 src/osmEditDialog.js:549
-msgid "An error has occurred"
-msgstr "Det har oppstått en feil"
-
#. Translators: %s is the place name that user wanted to check-in
#: src/checkIn.js:144
#, javascript-format
@@ -887,15 +932,15 @@
msgid "unknown geometry"
msgstr "ukjent geometri"
-#: src/graphHopper.js:112 src/transitPlan.js:192
+#: src/graphHopper.js:112 src/transitPlan.js:201
msgid "Route request failed."
msgstr "Forespørsel om rute feilet."
-#: src/graphHopper.js:119 src/transitPlan.js:184
+#: src/graphHopper.js:119 src/transitPlan.js:193
msgid "No route found."
msgstr "Ingen rute funnet."
-#: src/graphHopper.js:207 src/transitplugins/openTripPlanner.js:1100
+#: src/graphHopper.js:207 src/transitplugins/openTripPlanner.js:1111
msgid "Start!"
msgstr "Start!"
@@ -903,25 +948,25 @@
msgid "All Layer Files"
msgstr "Alle lagfiler"
-#: src/mainWindow.js:451
+#: src/mainWindow.js:470
msgid "Failed to connect to location service"
msgstr "Klarte ikke å koble til posisjonstjeneste"
-#: src/mainWindow.js:548
+#: src/mainWindow.js:565
msgid "translator-credits"
msgstr ""
"haarek <haarektr...@gmail.com>, Kjartan Maraas <kmar...@gnome.org>, Åka "
"Sikrom <a4nospampleasethank...@hush.com>"
-#: src/mainWindow.js:551
+#: src/mainWindow.js:568
msgid "A map application for GNOME"
msgstr "Et kartprogram for GNOME"
-#: src/mainWindow.js:562
+#: src/mainWindow.js:579
msgid "Copyright © 2011 – 2019 Red Hat, Inc. and The GNOME Maps authors"
msgstr "Opphavsrett © 2011 - 2019 Red Hat, Inc. og GNOME kart utviklerene"
-#: src/mainWindow.js:582
+#: src/mainWindow.js:599
#, javascript-format
msgid "Map data by %s and contributors"
msgstr "Kartdata av %s og bidragsytere"
@@ -931,7 +976,7 @@
#. * the bare name of the tile provider, or a linkified URL if one
#. * is available
#.
-#: src/mainWindow.js:598
+#: src/mainWindow.js:615
#, javascript-format
msgid "Map tiles provided by %s"
msgstr "Kartfliser av %s"
@@ -945,20 +990,20 @@
#. * (i.e. "%2$s ... %1$s ..." for positioning the project URL
#. * before the provider).
#.
-#: src/mainWindow.js:627
+#: src/mainWindow.js:644
#, javascript-format
msgid "Search provided by %s using %s"
msgstr "Søk tilbys av %s ved bruk av %s"
-#: src/mapView.js:375
+#: src/mapView.js:478
msgid "File type is not supported"
msgstr "Filtypen er ikke støttet"
-#: src/mapView.js:382
+#: src/mapView.js:485
msgid "Failed to open layer"
msgstr "Klarte ikke å åpne lag"
-#: src/mapView.js:418
+#: src/mapView.js:521
msgid "Failed to open GeoURI"
msgstr "Klarte ikke å åpne GeoURI"
@@ -992,23 +1037,23 @@
msgid "Way or relation refers to non-existing children"
msgstr ""
-#: src/osmEditDialog.js:105
+#: src/osmEditDialog.js:106
msgid "Name"
msgstr "Navn"
-#: src/osmEditDialog.js:108
+#: src/osmEditDialog.js:109
msgid "The official name. This is typically what appears on signs."
msgstr "Det offisielle navnet. Dette er typisk det som vises på skilt."
-#: src/osmEditDialog.js:111
+#: src/osmEditDialog.js:112
msgid "Address"
msgstr "Adresse"
-#: src/osmEditDialog.js:119
+#: src/osmEditDialog.js:120
msgid "Website"
msgstr "Nettsted"
-#: src/osmEditDialog.js:122
+#: src/osmEditDialog.js:123
msgid ""
"The official website. Try to use the most basic form of a URL i.e. http://";
"example.com instead of http://example.com/index.html.";
@@ -1016,11 +1061,11 @@
"Det offisielle nettstedet. Prøv å bruke den mest grunnleggende formen av en "
"URL. F.eks. http://eksempel.no i stedet for http://eksempel.no/index.html.";
-#: src/osmEditDialog.js:127
+#: src/osmEditDialog.js:128
msgid "Phone"
msgstr "Telefon"
-#: src/osmEditDialog.js:131
+#: src/osmEditDialog.js:132
msgid ""
"Phone number. Use the international format, starting with a + sign. Beware "
"of local privacy laws, especially for private phone numbers."
@@ -1029,196 +1074,196 @@
"Vær observant på lokale lover om personvern, spesielt for private "
"telefonnummer."
-#: src/osmEditDialog.js:136 src/placeBubble.js:191
+#: src/osmEditDialog.js:137 src/placeBubble.js:197
msgid "Wikipedia"
msgstr "Wikipedia"
-#: src/osmEditDialog.js:140
+#: src/osmEditDialog.js:141
msgid ""
"The format used should include the language code and the article title like "
"“en:Article title”."
msgstr ""
-#: src/osmEditDialog.js:144
+#: src/osmEditDialog.js:145
msgid "Opening hours"
msgstr "Åpningstider"
-#: src/osmEditDialog.js:149
+#: src/osmEditDialog.js:150
msgid "See the link in the label for help on format."
msgstr "Se lenken i etiketten for hjelp om format."
-#: src/osmEditDialog.js:152
+#: src/osmEditDialog.js:153
msgid "Population"
msgstr "Folketall"
-#: src/osmEditDialog.js:157
+#: src/osmEditDialog.js:158
msgid "Altitude"
msgstr "Høyde"
-#: src/osmEditDialog.js:160
+#: src/osmEditDialog.js:161
msgid "Elevation (height above sea level) of a point in metres."
msgstr "Høyde over have for et punkt i meter."
-#: src/osmEditDialog.js:163
+#: src/osmEditDialog.js:164
msgid "Wheelchair access"
msgstr "Rullestolvennlig"
-#: src/osmEditDialog.js:166 src/osmEditDialog.js:175 src/osmEditDialog.js:213
+#: src/osmEditDialog.js:167 src/osmEditDialog.js:176 src/osmEditDialog.js:214
msgid "Yes"
msgstr "Ja"
-#: src/osmEditDialog.js:167 src/osmEditDialog.js:176 src/osmEditDialog.js:214
+#: src/osmEditDialog.js:168 src/osmEditDialog.js:177 src/osmEditDialog.js:215
msgid "No"
msgstr "Nei"
-#: src/osmEditDialog.js:168
+#: src/osmEditDialog.js:169
msgid "Limited"
msgstr "Begrenset"
-#: src/osmEditDialog.js:169
+#: src/osmEditDialog.js:170
msgid "Designated"
msgstr "Spesialtilpasset"
-#: src/osmEditDialog.js:172
+#: src/osmEditDialog.js:173
msgid "Internet access"
msgstr "Internett-tilgang"
#. Translators:
#. * This means a WLAN Hotspot, also know as wireless, wifi or Wi-Fi.
#.
-#: src/osmEditDialog.js:177 src/translations.js:340
+#: src/osmEditDialog.js:178 src/translations.js:340
msgid "Wi-Fi"
msgstr "Trådløst"
-#: src/osmEditDialog.js:178
+#: src/osmEditDialog.js:179
msgid "Wired"
msgstr "Trådbundet"
-#: src/osmEditDialog.js:179
+#: src/osmEditDialog.js:180
msgid "Terminal"
msgstr "Terminal"
-#: src/osmEditDialog.js:180
+#: src/osmEditDialog.js:181
msgid "Service"
msgstr "Tjeneste"
-#: src/osmEditDialog.js:183
+#: src/osmEditDialog.js:184
msgid "Religion"
msgstr "Religion"
-#: src/osmEditDialog.js:186 src/translations.js:363
+#: src/osmEditDialog.js:187 src/translations.js:363
msgid "Animism"
msgstr "Animisme"
-#: src/osmEditDialog.js:187
+#: src/osmEditDialog.js:188
msgid "Bahá’í"
msgstr "Bahá’í"
-#: src/osmEditDialog.js:188 src/translations.js:365
+#: src/osmEditDialog.js:189 src/translations.js:365
msgid "Buddhism"
msgstr "Buddisme"
-#: src/osmEditDialog.js:189 src/translations.js:366
+#: src/osmEditDialog.js:190 src/translations.js:366
msgid "Caodaism"
msgstr "Caodaisme"
-#: src/osmEditDialog.js:190 src/translations.js:367
+#: src/osmEditDialog.js:191 src/translations.js:367
msgid "Christianity"
msgstr "Kristendom"
-#: src/osmEditDialog.js:191 src/translations.js:368
+#: src/osmEditDialog.js:192 src/translations.js:368
msgid "Confucianism"
msgstr "Konfusianisme"
-#: src/osmEditDialog.js:192 src/translations.js:369
+#: src/osmEditDialog.js:193 src/translations.js:369
msgid "Hinduism"
msgstr "Hinduisme"
-#: src/osmEditDialog.js:193 src/translations.js:370
+#: src/osmEditDialog.js:194 src/translations.js:370
msgid "Jainism"
msgstr "Jainisme"
-#: src/osmEditDialog.js:194 src/translations.js:371
+#: src/osmEditDialog.js:195 src/translations.js:371
msgid "Judaism"
msgstr "Jødedom"
-#: src/osmEditDialog.js:195 src/translations.js:372
+#: src/osmEditDialog.js:196 src/translations.js:372
msgid "Islam"
msgstr "Islam"
-#: src/osmEditDialog.js:196 src/translations.js:373
+#: src/osmEditDialog.js:197 src/translations.js:373
msgid "Multiple Religions"
msgstr "Flere religioner"
-#: src/osmEditDialog.js:197 src/translations.js:374
+#: src/osmEditDialog.js:198 src/translations.js:374
msgid "Paganism"
msgstr "Paganisme"
-#: src/osmEditDialog.js:198 src/translations.js:375
+#: src/osmEditDialog.js:199 src/translations.js:375
msgid "Pastafarianism"
msgstr "Pastafarianisme"
-#: src/osmEditDialog.js:199 src/translations.js:376
+#: src/osmEditDialog.js:200 src/translations.js:376
msgid "Scientology"
msgstr "Scientologi"
-#: src/osmEditDialog.js:200 src/translations.js:377
+#: src/osmEditDialog.js:201 src/translations.js:377
msgid "Shinto"
msgstr "Shinto"
-#: src/osmEditDialog.js:201 src/translations.js:378
+#: src/osmEditDialog.js:202 src/translations.js:378
msgid "Sikhism"
msgstr "Sikdom"
-#: src/osmEditDialog.js:202 src/translations.js:379
+#: src/osmEditDialog.js:203 src/translations.js:379
msgid "Spiritualism"
msgstr "Spiritualisme"
-#: src/osmEditDialog.js:203 src/translations.js:380
+#: src/osmEditDialog.js:204 src/translations.js:380
msgid "Taoism"
msgstr "Taoisme"
-#: src/osmEditDialog.js:204 src/translations.js:381
+#: src/osmEditDialog.js:205 src/translations.js:381
msgid "Unitarian Universalism"
-msgstr ""
+msgstr "Unitarisk universalisme"
-#: src/osmEditDialog.js:205 src/translations.js:382
+#: src/osmEditDialog.js:206 src/translations.js:382
msgid "Voodoo"
msgstr "Voodo"
-#: src/osmEditDialog.js:206 src/translations.js:383
+#: src/osmEditDialog.js:207 src/translations.js:383
msgid "Yazidism"
msgstr "Jesidisme"
-#: src/osmEditDialog.js:207 src/translations.js:384
+#: src/osmEditDialog.js:208 src/translations.js:384
msgid "Zoroastrianism"
msgstr "Zoroastrisme"
-#: src/osmEditDialog.js:210
+#: src/osmEditDialog.js:211
msgid "Toilets"
msgstr "Toaletter"
-#: src/osmEditDialog.js:217
+#: src/osmEditDialog.js:218
msgid "Note"
msgstr "Merknad"
-#: src/osmEditDialog.js:220
+#: src/osmEditDialog.js:221
msgid ""
"Information used to inform other mappers about non-obvious information about "
"an element, the author’s intent when creating it, or hints for further "
"improvement."
msgstr ""
-#: src/osmEditDialog.js:325
+#: src/osmEditDialog.js:326
msgctxt "dialog title"
msgid "Add to OpenStreetMap"
msgstr "Legg til på OpenStreetMap"
-#: src/osmEditDialog.js:379
+#: src/osmEditDialog.js:380
msgid "Select Type"
msgstr "Velg type"
-#: src/osmEditDialog.js:496
+#: src/osmEditDialog.js:497
msgid "Done"
msgstr "Ferdig"
@@ -1226,39 +1271,45 @@
msgid "Unnamed place"
msgstr "Sted uten navn"
-#: src/placeBubble.js:143
+#. TODO: this is a bit of a work-around to re-interpret the population,
+#. * stored as a string into an integer to convert back to a locale-
+#. * formatted string. Ideally it should be kept as an integer value
+#. * in the Place class. But this will also need to be handled by the
+#. * PlaceStore, possible in a backwards-compatible way
+#.
+#: src/placeBubble.js:149
msgid "Population:"
msgstr "Folketall:"
-#: src/placeBubble.js:149
+#: src/placeBubble.js:155
msgid "Altitude:"
msgstr "Høyde:"
-#: src/placeBubble.js:154
+#: src/placeBubble.js:160
msgid "Opening hours:"
msgstr "Åpningstider:"
-#: src/placeBubble.js:159
+#: src/placeBubble.js:165
msgid "Internet access:"
msgstr "Internettaksess:"
-#: src/placeBubble.js:164
+#: src/placeBubble.js:170
msgid "Religion:"
msgstr "Religion:"
-#: src/placeBubble.js:169
+#: src/placeBubble.js:175
msgid "Toilets:"
msgstr "Toaletter:"
-#: src/placeBubble.js:174
+#: src/placeBubble.js:180
msgid "Wheelchair access:"
msgstr "Rullestolvennlig:"
-#: src/placeBubble.js:180 src/placeBubble.js:184
+#: src/placeBubble.js:186 src/placeBubble.js:190
msgid "Phone:"
msgstr "Telefon:"
-#: src/placeEntry.js:209
+#: src/placeEntry.js:212
msgid "Failed to parse Geo URI"
msgstr "Klarte ikke å tolke Geo-URI"
@@ -1371,12 +1422,12 @@
msgstr "klarte ikke å laste fil"
#. Translators: %s is a time expression with the format "%f h" or "%f min"
-#: src/sidebar.js:296
+#: src/sidebar.js:358
#, javascript-format
msgid "Estimated time: %s"
msgstr "Estimert tid: %s"
-#: src/sidebar.js:352
+#: src/sidebar.js:414
#, javascript-format
msgid "Itineraries provided by %s"
msgstr "Ruteplaner tilbys av %s"
@@ -1413,7 +1464,7 @@
msgid "Arrive at %s"
msgstr "Ankom ved %s"
-#: src/transit.js:77 src/transitplugins/openTripPlanner.js:1113
+#: src/transit.js:77 src/transitplugins/openTripPlanner.js:1124
msgid "Arrive"
msgstr "Ankom"
@@ -1445,16 +1496,16 @@
#. * Translators: this is a format string giving the equivalent to
#. * "may 29" according to the current locale's convensions.
#.
-#: src/transitOptionsPanel.js:143
+#: src/transitOptionsPanel.js:140
msgctxt "month-day-date"
msgid "%b %e"
msgstr "%b %e"
-#: src/transitPlan.js:188
+#: src/transitPlan.js:197
msgid "No timetable data found for this route."
msgstr "Ingen ruteinformasjon funnet for denne ruten."
-#: src/transitPlan.js:196
+#: src/transitPlan.js:205
msgid "No provider found for this route."
msgstr "Ingen tilbyder funnet for denne ruten."
@@ -1463,7 +1514,7 @@
#. * "12:00 – 13:03" where the placeholder %s are the actual times,
#. * these could be rearranged if needed.
#.
-#: src/transitPlan.js:313
+#: src/transitPlan.js:322
#, javascript-format
msgid "%s – %s"
msgstr "%s – %s"
@@ -1472,34 +1523,34 @@
#. * less than an hour, with only the minutes part, using plural forms
#. * as appropriate
#.
-#: src/transitPlan.js:340
+#: src/transitPlan.js:351
#, javascript-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minutt"
-msgstr[1] "%d minutter"
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s minutt"
+msgstr[1] "%s minutter"
#. translators: this is an indication for a trip duration,
#. * where the duration is an exact number of hours (i.e. no
#. * minutes part), using plural forms as appropriate
#.
-#: src/transitPlan.js:351
+#: src/transitPlan.js:363
#, javascript-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d time"
-msgstr[1] "%d timer"
+msgid "%s hour"
+msgid_plural "%s hours"
+msgstr[0] "%s time"
+msgstr[1] "%s timer"
#. translators: this is an indication for a trip duration
#. * where the duration contains an hour and minute part, it's
#. * pluralized on the hours part
#.
-#: src/transitPlan.js:357
+#: src/transitPlan.js:371
#, javascript-format
-msgid "%d:%02d hour"
-msgid_plural "%d:%02d hours"
-msgstr[0] "%d:%02d time"
-msgstr[1] "%d:%02d timer"
+msgid "%s:%s hour"
+msgid_plural "%s:%s hours"
+msgstr[0] "%s:%s time"
+msgstr[1] "%s:%s timer"
#. Translators: this is a format string for showing a departure and
#. * arrival time in a more compact manner to show in the instruction
@@ -1507,7 +1558,7 @@
#. * "12:00–13:03" where the placeholder %s are the actual times,
#. * these could be rearranged if needed.
#.
-#: src/transitPlan.js:750
+#: src/transitPlan.js:764
#, javascript-format
msgid "%s–%s"
msgstr "%s–%s"
@@ -1667,154 +1718,184 @@
msgstr "Nøyaktighet: %s"
#. Translators: Accuracy of user location information
-#: src/utils.js:229
+#: src/utils.js:248
msgid "Unknown"
msgstr "Ukjent"
#. Translators: Accuracy of user location information
-#: src/utils.js:232
+#: src/utils.js:251
msgid "Exact"
msgstr "Nøyaktig"
-#: src/utils.js:290
+#. Translators: this is a duration with only hours, using
+#. * an abbreviation for hours, corresponding to 'h' in English
+#.
+#: src/utils.js:332
+#, javascript-format
+msgid "%s h"
+msgstr "%s t"
+
+#. Translators: this is a duration with hours and minutes parts
+#. * using abbreviations for hours and minutes, correspoding to 'h'
+#. * and 'min' in English. The minutes has appropriate plural variations
+#.
+#: src/utils.js:338
#, javascript-format
-msgid "%f h"
-msgstr "%f t"
+msgid "%s h %s min"
+msgid_plural "%s h %s min"
+msgstr[0] "%s t %s min"
+msgstr[1] "%s t %s min"
-#: src/utils.js:292
+#. Translators: this is a duration with minutes part
+#. * using abbreviation for minutes, corresponding to 'min' in English
+#. * with appropriate plural variations
+#.
+#: src/utils.js:345
#, javascript-format
-msgid "%f min"
-msgstr "%f min"
+msgid "%s min"
+msgid_plural "%s min"
+msgstr[0] "%s min"
+msgstr[1] "%s min"
-#: src/utils.js:294
+#. Translators: this is a duration of less than one minute
+#. * with seconds using an abbreviation for seconds, corresponding to
+#. * 's' in English with appropriate plural forms
+#.
+#: src/utils.js:351
#, javascript-format
-msgid "%f s"
-msgstr "%f s"
+msgid "%s s"
+msgid_plural "%s s"
+msgstr[0] "%s s"
+msgstr[1] "%s s"
#. Translators: This is a distance measured in kilometers
-#: src/utils.js:305
+#: src/utils.js:362
#, javascript-format
msgid "%s km"
msgstr "%s km"
#. Translators: This is a distance measured in meters
-#: src/utils.js:308
+#: src/utils.js:365
#, javascript-format
msgid "%s m"
msgstr "%s m"
#. Translators: This is a distance measured in miles
-#: src/utils.js:316
+#: src/utils.js:373
#, javascript-format
msgid "%s mi"
msgstr "%s mi"
#. Translators: This is a distance measured in feet
-#: src/utils.js:319
+#: src/utils.js:376
#, javascript-format
msgid "%s ft"
msgstr "%s ft"
-#: src/transitplugins/openTripPlanner.js:1174
+#: src/transitplugins/goMetro.js:60
+msgid "This plugin doesn't support latest arrival"
+msgstr "Dette tillegget støtter ikke siste ankomst"
+
+#: src/transitplugins/openTripPlanner.js:1185
#, javascript-format
msgid "Continue on %s"
msgstr "Fortsett på %s"
-#: src/transitplugins/openTripPlanner.js:1176
+#: src/transitplugins/openTripPlanner.js:1187
msgid "Continue"
msgstr "Fortsett"
-#: src/transitplugins/openTripPlanner.js:1179
+#: src/transitplugins/openTripPlanner.js:1190
#, javascript-format
msgid "Turn left on %s"
msgstr "Sving til venstre på %s"
-#: src/transitplugins/openTripPlanner.js:1181
+#: src/transitplugins/openTripPlanner.js:1192
msgid "Turn left"
msgstr "Sving til venstre"
-#: src/transitplugins/openTripPlanner.js:1184
+#: src/transitplugins/openTripPlanner.js:1195
#, javascript-format
msgid "Turn slightly left on %s"
msgstr "Sving svakt til venstre på %s"
-#: src/transitplugins/openTripPlanner.js:1186
+#: src/transitplugins/openTripPlanner.js:1197
msgid "Turn slightly left"
msgstr "Sving svakt til venstre"
-#: src/transitplugins/openTripPlanner.js:1189
+#: src/transitplugins/openTripPlanner.js:1200
#, javascript-format
msgid "Turn sharp left on %s"
msgstr "Sving hardt til venstre på %s"
-#: src/transitplugins/openTripPlanner.js:1191
+#: src/transitplugins/openTripPlanner.js:1202
msgid "Turn sharp left"
msgstr "Sving hardt til venstre"
-#: src/transitplugins/openTripPlanner.js:1194
+#: src/transitplugins/openTripPlanner.js:1205
#, javascript-format
msgid "Turn right on %s"
msgstr "Sving til høyre på %s"
-#: src/transitplugins/openTripPlanner.js:1196
+#: src/transitplugins/openTripPlanner.js:1207
msgid "Turn right"
msgstr "Sving til høyre"
-#: src/transitplugins/openTripPlanner.js:1199
+#: src/transitplugins/openTripPlanner.js:1210
#, javascript-format
msgid "Turn slightly right on %s"
msgstr "Sving svakt til høyre på %s"
-#: src/transitplugins/openTripPlanner.js:1201
+#: src/transitplugins/openTripPlanner.js:1212
msgid "Turn slightly right"
msgstr "Sving svakt til høyre"
-#: src/transitplugins/openTripPlanner.js:1204
+#: src/transitplugins/openTripPlanner.js:1215
#, javascript-format
msgid "Turn sharp right on %s"
msgstr "Sving hardt til høyre på %s"
-#: src/transitplugins/openTripPlanner.js:1206
+#: src/transitplugins/openTripPlanner.js:1217
msgid "Turn sharp right"
msgstr "Sving hardt til høyre"
-#: src/transitplugins/openTripPlanner.js:1212
+#: src/transitplugins/openTripPlanner.js:1223
#, javascript-format
msgid "In the roundabout, take exit %s"
msgstr "Ta avkjørsel %s i rundkjøringen"
-#: src/transitplugins/openTripPlanner.js:1214
+#: src/transitplugins/openTripPlanner.js:1225
#, javascript-format
msgid "In the roundabout, take exit to %s"
msgstr "Ta avkjørsel til %s i rundkjøringen"
-#: src/transitplugins/openTripPlanner.js:1216
+#: src/transitplugins/openTripPlanner.js:1227
msgid "Take the roundabout"
msgstr "Kjør gjennom rundkjøringen"
-#: src/transitplugins/openTripPlanner.js:1220
+#: src/transitplugins/openTripPlanner.js:1231
#, javascript-format
msgid "Take the elevator and get off at %s"
msgstr "Ta heisen og gå av i %s"
-#: src/transitplugins/openTripPlanner.js:1222
+#: src/transitplugins/openTripPlanner.js:1233
msgid "Take the elevator"
msgstr "Ta heisen"
-#: src/transitplugins/openTripPlanner.js:1226
+#: src/transitplugins/openTripPlanner.js:1237
#, javascript-format
msgid "Make a left u-turn onto %s"
-msgstr ""
+msgstr "Ta en u-sving til venstre inn på %s"
-#: src/transitplugins/openTripPlanner.js:1228
+#: src/transitplugins/openTripPlanner.js:1239
msgid "Make a left u-turn"
-msgstr ""
+msgstr "Ta en u-sving til venstre"
-#: src/transitplugins/openTripPlanner.js:1231
+#: src/transitplugins/openTripPlanner.js:1242
#, javascript-format
msgid "Make a right u-turn onto %s"
-msgstr ""
+msgstr "Ta en u-sving til høyre inn på %s"
-#: src/transitplugins/openTripPlanner.js:1233
+#: src/transitplugins/openTripPlanner.js:1244
msgid "Make a right u-turn"
-msgstr ""
+msgstr "Ta en u-sving til høyre"
diff -Nru gnome-maps-3.38.2/src/mapSource.js gnome-maps-3.38.6/src/mapSource.js
--- gnome-maps-3.38.2/src/mapSource.js 2020-11-21 13:24:38.810237600 +0000
+++ gnome-maps-3.38.6/src/mapSource.js 2021-07-09 22:47:16.640423500 +0100
@@ -30,7 +30,7 @@
const Service = imports.service;
const Utils = imports.utils;
-let _attributionImage = null;
+let _attributionImages = [];
const _FILE_CACHE_SIZE_LIMIT = (10 * 1024 * 1024); /* 10Mb */
const _MEMORY_CACHE_SIZE_LIMIT = 100; /* number of tiles */
@@ -46,31 +46,49 @@
_init(view) {
super._init();
- if (_attributionImage)
- this.contents = _attributionImage;
- else
- return;
-
+ this._view = view;
this._rtl = Gtk.get_locale_direction() === Gtk.TextDirection.RTL;
- view.connect('notify::width', () => this._updatePosition(view));
- view.connect('notify::height', () => this._updatePosition(view));
+ view.connect('notify::width', () => this._updatePosition());
+ view.connect('notify::height', () => this._updatePosition());
this._updatePosition(view);
}
- _updatePosition(view) {
- let width = _attributionImage.pixbuf.width;
- let height = _attributionImage.pixbuf.height;
- let x = view.width - width - _LOGO_PADDING_X;
- /* TODO: ideally the attribution logo should be aligned to the left
- * side in RTL locales, but I couldn't get that working with Clutter
- * actor positioning, so adjust the padding to fit above the scale
- * for now
- */
- let y = view.height - height -
- (this._rtl ? _LOGO_PADDING_Y_RTL : _LOGO_PADDING_Y);
+ setSource(source) {
+ this._id = source.get_id();
+
+ let bin = this.get_widget();
+
+ if (bin.get_child())
+ bin.remove(bin.get_child());
+
+ if (_attributionImages[source.get_id()]) {
+ bin.add(_attributionImages[source.get_id()]);
+ bin.visible = true;
+ } else {
+ bin.visible = false;
+ }
+
+ this._updatePosition();
+ }
+
+ _updatePosition() {
+ let image = _attributionImages[this._id];
+
+ if (image) {
+ let width = image.pixbuf.width;
+ let height = image.pixbuf.height;
+ let x = this._view.width - width - _LOGO_PADDING_X;
+ /* TODO: ideally the attribution logo should be aligned to the left
+ * side in RTL locales, but I couldn't get that working with Clutter
+ * actor positioning, so adjust the padding to fit above the scale
+ * for now
+ */
+ let y = this._view.height - height -
+ (this._rtl ? _LOGO_PADDING_Y_RTL : _LOGO_PADDING_Y);
- this.set_position(x, y);
+ this.set_position(x, y);
+ }
}
});
@@ -78,12 +96,13 @@
if (!source.attribution_logo || source.attribution_logo === "")
return;
- if (!_attributionImage)
- _attributionImage = new Gtk.Image();
+ if (!_attributionImages[source.id])
+ _attributionImages[source.id] = new Gtk.Image({ visible: true });
let data = GLib.base64_decode(source.attribution_logo);
let stream = Gio.MemoryInputStream.new_from_bytes(GLib.Bytes.new(data));
- _attributionImage.pixbuf = GdkPixbuf.Pixbuf.new_from_stream(stream, null);
+ _attributionImages[source.id].pixbuf =
+ GdkPixbuf.Pixbuf.new_from_stream(stream, null);
}
function _createTileSource(source) {
diff -Nru gnome-maps-3.38.2/src/mapView.js gnome-maps-3.38.6/src/mapView.js
--- gnome-maps-3.38.2/src/mapView.js 2020-11-21 13:24:38.810237600 +0000
+++ gnome-maps-3.38.6/src/mapView.js 2021-07-09 22:47:16.640423500 +0100
@@ -164,6 +164,9 @@
Application.geoclue.connect('notify::state',
this._updateUserLocation.bind(this));
this._connectRouteSignals();
+
+ // set dark background if we start up in dark theme
+ this._setBackgroundPatternIfNeeded();
}
_initScale(view) {
@@ -192,6 +195,8 @@
view.horizontal_wrap = true;
view.connect('notify::latitude', this._onViewMoved.bind(this));
+ view.connect('notify::longitude',
+ () => this._setBackgroundPatternIfNeeded());
// switching map type will set view min-zoom-level from map source
view.connect('notify::min-zoom-level', () => {
if (view.min_zoom_level < MapMinZoom) {
@@ -214,12 +219,6 @@
this._gtkSettings = Gtk.Settings.get_default();
this._gtkSettings.connect('notify::gtk-application-prefer-dark-theme',
this._onPreferDarkThemeChanged.bind(this));
- // set dark background if we start up in dark theme
- if (this._gtkSettings.gtk_application_prefer_dark_theme) {
- if (!this._darkBackgroud)
- this._createDarkBackground();
- view.set_background_pattern(this._darkBackground);
- }
this._initScale(view);
return view;
@@ -246,16 +245,29 @@
this._darkBackground.invalidate();
}
- _onPreferDarkThemeChanged() {
- if (this._gtkSettings.gtk_application_prefer_dark_theme) {
+ _isWrappingAround() {
+ let bbox = this.view.get_bounding_box();
+
+ return bbox.left > bbox.right;
+ }
+
+ _setBackgroundPatternIfNeeded() {
+ if (this._gtkSettings.gtk_application_prefer_dark_theme &&
+ !this._isWrappingAround()) {
if (!this._darkBackgroud)
this._createDarkBackground();
this.view.set_background_pattern(this._darkBackground);
- } else {
+ this._customBackgroundSet = true;
+ } else if (this._customBackgroundSet) {
this.view.background_pattern = null;
+ this._customBackgroundSet = false;
}
}
+ _onPreferDarkThemeChanged() {
+ this._setBackgroundPatternIfNeeded();
+ }
+
_onNightModeChanged() {
if (this._mapType === MapType.STREET) {
let overlay_sources = this.view.get_overlay_sources();
@@ -401,15 +413,17 @@
this._mapType = mapType;
if (mapType !== MapType.LOCAL) {
- if (mapType === MapType.AERIAL) {
- if (Service.getService().tiles.hybridAerial &&
+ let tiles = Service.getService().tiles;
+
+ if (mapType === MapType.AERIAL && tiles.aerial) {
+ if (tiles.hybridAerial &&
Application.settings.get('hybrid-aerial')) {
this.view.map_source = MapSource.createHybridAerialSource();
} else {
this.view.map_source = MapSource.createAerialSource();
}
} else {
- if (Service.getService().tiles.streetDark &&
+ if (tiles.streetDark &&
Application.settings.get('night-mode')) {
this.view.map_source = MapSource.createStreetDarkSource();
} else {
@@ -421,6 +435,8 @@
this.view.add_child(this._attribution);
}
+ this._attribution.setSource(this.view.map_source);
+
Application.settings.set('map-type', mapType);
} else {
let renderer = new Champlain.ImageRenderer();
@@ -578,9 +594,19 @@
}
_storeLocation() {
- Application.settings.set('zoom-level', this.view.zoom_level);
+ let zoom = this.view.zoom_level;
let location = [this.view.latitude, this.view.longitude];
- Application.settings.set('last-viewed-location', location);
+
+ /* protect agains situations where the Champlain view was already
+ * disposed, in this case zoom will be set to the GObject property
+ * getter
+ */
+ if (!isNaN(zoom)) {
+ Application.settings.set('zoom-level', zoom);
+ Application.settings.set('last-viewed-location', location);
+ } else {
+ Utils.debug('Failed to extract location to store');
+ }
}
_goToStoredLocation() {
diff -Nru gnome-maps-3.38.2/src/osmConnection.js gnome-maps-3.38.6/src/osmConnection.js
--- gnome-maps-3.38.2/src/osmConnection.js 2020-11-21 13:24:38.810237600 +0000
+++ gnome-maps-3.38.6/src/osmConnection.js 2021-07-09 22:47:16.640423500 +0100
@@ -317,7 +317,7 @@
oauth_token: this._oauthToken,
oauth_callback: '',
authenticity_token: token,
- allow_write_api: 'yes',
+ allow_write_api: '1',
commit: 'Save changes'
});
let requestHeaders = msg.request_headers;
diff -Nru gnome-maps-3.38.2/src/placeBubble.js gnome-maps-3.38.6/src/placeBubble.js
--- gnome-maps-3.38.2/src/placeBubble.js 2020-11-21 13:24:38.810237600 +0000
+++ gnome-maps-3.38.6/src/placeBubble.js 2021-07-09 22:47:16.640423500 +0100
@@ -98,8 +98,8 @@
if (Application.placeStore.isStale(this.place)) {
overpass.addInfo(this.place);
} else {
- let place = Application.placeStore.get(this.place);
- this._populate(place);
+ this._place = Application.placeStore.get(this.place);
+ this._populate(this.place);
}
} else if (this.place.store && !this.place.prefilled) {
overpass.addInfo(this.place);
diff -Nru gnome-maps-3.38.2/src/sidebar.js gnome-maps-3.38.6/src/sidebar.js
--- gnome-maps-3.38.2/src/sidebar.js 2020-11-21 13:24:38.814237400 +0000
+++ gnome-maps-3.38.6/src/sidebar.js 2021-07-09 22:47:16.644423200 +0100
@@ -257,7 +257,8 @@
let nextPlaceEntry =
this._entryList.get_row_at_index(index + 1).get_child().entry;
- nextPlaceEntry.grab_focus();
+ if (!nextPlaceEntry.place)
+ nextPlaceEntry.grab_focus();
}
}
![https://tile.openstreetmap.org/#Z#/#X#/#Y#.png"](https://tile.openstreetmap.org/#Z#/#X#/#Y#.png"){kind=link}