schnabu/maputnik
1
0
Fork 0
mirror of https://github.com/a-nyx/maputnik-with-pmtiles.git synced 2024-11-10 12:47:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #508 from pathmapper/master

Browse source 
Change Maptiler URLs
This commit is contained in:
pathmapper 2019-04-08 10:13:16 +02:00 committed by GitHub
commit ad505378ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/App.jsx
View file

@ -51,8 +51,9 @@ function normalizeSourceURL (url, apiToken="") {
function setFetchAccessToken(url, mapStyle) {
const matchesTilehosting = url.match(/\.tilehosting\.com/);
const matchesMaptiler = url.match(/\.maptiler\.com/);
const matchesThunderforest = url.match(/\.thunderforest\.com/);
if (matchesTilehosting) {
if (matchesTilehosting || matchesMaptiler) {
const accessToken = style.getAccessToken("openmaptiles", mapStyle, {allowFallback: true})
if (accessToken) {
return url.replace('{key}', accessToken)

2
src/config/tilesets.json
View file

@ -1,7 +1,7 @@
{
"openmaptiles": {
"type": "vector",
"url": "https://maps.tilehosting.com/data/v3.json?key={key}",
"url": "https://api.maptiler.com/tiles/v3/tiles.json?key={key}",
"title": "OpenMapTiles"
},
"thunderforest_transport": {

2
src/libs/style.js
View file

@ -101,7 +101,7 @@ function replaceAccessTokens(mapStyle, opts={}) {
changedStyle = replaceSourceAccessToken(changedStyle, sourceName, opts);
})
if (mapStyle.glyphs && mapStyle.glyphs.match(/\.tilehosting\.com/)) {
if (mapStyle.glyphs && (mapStyle.glyphs.match(/\.tilehosting\.com/) || mapStyle.glyphs.match(/\.maptiler\.com/))) {
const newAccessToken = getAccessToken("openmaptiles", mapStyle, opts);
if (newAccessToken) {
changedStyle = {