Merge branch 'master' into develop

This commit is contained in:
pietervdvn 2021-03-22 01:32:47 +01:00
commit f176b92a9c
2 changed files with 1 additions and 3 deletions

View file

@ -172,8 +172,6 @@ export default class AvailableBaseLayers {
l("Stamen.TonerLite", "Toner Lite (by Stamen)"), l("Stamen.TonerLite", "Toner Lite (by Stamen)"),
l("Stamen.TonerBackground", "Toner Background - no labels (by Stamen)"), l("Stamen.TonerBackground", "Toner Background - no labels (by Stamen)"),
l("Stamen.Watercolor", "Watercolor (by Stamen)"), l("Stamen.Watercolor", "Watercolor (by Stamen)"),
l("Stadia.AlidadeSmooth", "Alidade Smooth (by Stadia)"),
l("Stadia.AlidadeSmoothDark", "Alidade Smooth Dark (by Stadia)"),
l("Stadia.OSMBright", "Osm Bright (by Stadia)"), l("Stadia.OSMBright", "Osm Bright (by Stadia)"),
l("CartoDB.Positron", "Positron (by CartoDB)"), l("CartoDB.Positron", "Positron (by CartoDB)"),
l("CartoDB.PositronNoLabels", "Positron - no labels (by CartoDB)"), l("CartoDB.PositronNoLabels", "Positron - no labels (by CartoDB)"),

View file

@ -24,7 +24,7 @@
"startZoom": 1, "startZoom": 1,
"widenFactor": 0.05, "widenFactor": 0.05,
"socialImage": "", "socialImage": "",
"defaultBackgroundId": "Stadia.AlidadeSmoothDark", "defaultBackgroundId": "osm",
"layers": [ "layers": [
"direction", "direction",
"surveillance_cameras" "surveillance_cameras"