diff --git a/website/src/lib/assets/custom/topo.json b/website/src/lib/assets/custom/topo.json index 18e40c4d5..679bfb90f 100644 --- a/website/src/lib/assets/custom/topo.json +++ b/website/src/lib/assets/custom/topo.json @@ -6,22 +6,22 @@ "url": "https://tiles.gpx.studio/openmaptiles.json" }, "hillshading": { - "type": "vector", - "tiles": ["http://localhost:8080/hillshading/{z}/{x}/{y}.mvt"], - "minzoom": 4, - "maxzoom": 12 + "type": "vector", + "tiles": ["https://tiles.gpx.studio/hillshading/{z}/{x}/{y}.mvt"], + "minzoom": 4, + "maxzoom": 12 }, "contours_m": { - "type": "vector", - "tiles": ["http://localhost:8080/contours_m/{z}/{x}/{y}.mvt"], - "minzoom": 4, - "maxzoom": 12 + "type": "vector", + "tiles": ["https://tiles.gpx.studio/contours_m/{z}/{x}/{y}.mvt"], + "minzoom": 11, + "maxzoom": 12 }, "contours_ft": { - "type": "vector", - "tiles": ["http://localhost:8080/contours_ft/{z}/{x}/{y}.mvt"], - "minzoom": 4, - "maxzoom": 12 + "type": "vector", + "tiles": ["https://tiles.gpx.studio/contours_ft/{z}/{x}/{y}.mvt"], + "minzoom": 11, + "maxzoom": 12 } }, "sprite": "https://tiles.openfreemap.org/sprites/ofm_f384/ofm", diff --git a/website/src/lib/assets/img/home/maptiler-topo.png b/website/src/lib/assets/img/home/topo.png similarity index 100% rename from website/src/lib/assets/img/home/maptiler-topo.png rename to website/src/lib/assets/img/home/topo.png diff --git a/website/src/lib/assets/layers.ts b/website/src/lib/assets/layers.ts index ff6edbcb8..f6464e84c 100644 --- a/website/src/lib/assets/layers.ts +++ b/website/src/lib/assets/layers.ts @@ -35,10 +35,6 @@ export const maptilerKeyPlaceHolder = 'MAPTILER_KEY'; export const basemaps: { [key: string]: string | StyleSpecification } = { topo: topo as StyleSpecification, satellite: satellite as StyleSpecification, - maptilerStreets: `https://api.maptiler.com/maps/streets-v4/style.json?key=${maptilerKeyPlaceHolder}`, - maptilerTopo: `https://api.maptiler.com/maps/topo-v4/style.json?key=${maptilerKeyPlaceHolder}`, - maptilerOutdoors: `https://api.maptiler.com/maps/outdoor-v4/style.json?key=${maptilerKeyPlaceHolder}`, - maptilerSatellite: `https://api.maptiler.com/maps/hybrid-v4/style.json?key=${maptilerKeyPlaceHolder}`, esriSatellite: { version: 8, sources: { @@ -805,10 +801,6 @@ export const basemapTree: LayerTreeType = { world: { topo: true, satellite: true, - maptilerStreets: true, - maptilerTopo: true, - maptilerOutdoors: true, - maptilerSatellite: true, esriSatellite: true, openStreetMap: true, openTopoMap: true, @@ -1033,10 +1025,6 @@ export const defaultBasemapTree: LayerTreeType = { world: { topo: true, satellite: true, - maptilerStreets: true, - maptilerTopo: true, - maptilerOutdoors: true, - maptilerSatellite: true, esriSatellite: false, openStreetMap: true, openTopoMap: true, @@ -1495,14 +1483,11 @@ export const overpassQueryData: Record = { }; export const terrainSources: { [key: string]: RasterDEMSourceSpecification } = { - 'maptiler-dem': { - type: 'raster-dem', - url: `https://api.maptiler.com/tiles/terrain-rgb-v2/tiles.json?key=${maptilerKeyPlaceHolder}`, - }, mapterhorn: { type: 'raster-dem', - url: 'https://tiles.mapterhorn.com/tilejson.json', + url: 'https://tiles.gpx.studio/mapterhorn.json', + encoding: 'terrarium', }, }; -export const defaultTerrainSource = 'maptiler-dem'; +export const defaultTerrainSource = 'mapterhorn'; diff --git a/website/src/lib/components/Logo.svelte b/website/src/lib/components/Logo.svelte index c23a18bb6..77f47ea2a 100644 --- a/website/src/lib/components/Logo.svelte +++ b/website/src/lib/components/Logo.svelte @@ -8,7 +8,7 @@ ...others }: { iconOnly?: boolean; - company?: 'gpx.studio' | 'maptiler' | 'github' | 'crowdin' | 'facebook' | 'reddit'; + company?: 'gpx.studio' | 'github' | 'crowdin' | 'facebook' | 'reddit'; [key: string]: any; } = $props(); @@ -19,12 +19,6 @@ alt="Logo of gpx.studio." {...others} /> -{:else if company === 'maptiler'} - Logo of Maptiler. {:else if company === 'github'} - import maptilerTopoMap from '$lib/assets/img/home/maptiler-topo.png?enhanced'; + import topoMap from '$lib/assets/img/home/topo.png?enhanced'; import waymarkedMap from '$lib/assets/img/home/waymarked.png?enhanced';
- + 0 ? terrain : undefined; - } + const terrain = this.getCurrentTerrain(); + style.sources[terrain.source] = terrainSources[terrain.source]; + style.terrain = terrain.exaggeration > 0 ? terrain : undefined; style.layers.push(...anchorLayers); @@ -172,7 +170,6 @@ export class StyleManager { } updateTerrain() { - if (this._maptilerKey === '') return; const map_ = get(this._map); if (!map_) return; @@ -195,9 +192,6 @@ export class StyleManager { ): Promise { if (typeof styleInfo === 'string') { let styleUrl = styleInfo as string; - if (styleUrl.includes(maptilerKeyPlaceHolder)) { - styleUrl = styleUrl.replace(maptilerKeyPlaceHolder, this._maptilerKey); - } const response = await fetch(styleUrl, { cache: 'force-cache' }); if (!response.ok) { throw new Error(`HTTP error fetching style "${styleInfo}": ${response.status}`); @@ -260,10 +254,6 @@ export class StyleManager { getCurrentTerrain() { const terrain = get(terrainSource); - const source = terrainSources[terrain]; - if (source.url && source.url.includes(maptilerKeyPlaceHolder)) { - source.url = source.url.replace(maptilerKeyPlaceHolder, this._maptilerKey); - } const map_ = get(this._map); return { source: terrain, diff --git a/website/src/lib/docs/en/map-controls.mdx b/website/src/lib/docs/en/map-controls.mdx index fbb80d125..b72f7414c 100644 --- a/website/src/lib/docs/en/map-controls.mdx +++ b/website/src/lib/docs/en/map-controls.mdx @@ -59,7 +59,7 @@ Only one basemap can be displayed at a time. -Hover over the map to show the Waymarked Trails hiking overlay on top of the MapTiler Topo basemap. +Hover over the map to show the Waymarked Trails hiking overlay on top of the topographic basemap.
diff --git a/website/src/lib/docs/en/toolbar/elevation.mdx b/website/src/lib/docs/en/toolbar/elevation.mdx index fedae8c99..a2022a778 100644 --- a/website/src/lib/docs/en/toolbar/elevation.mdx +++ b/website/src/lib/docs/en/toolbar/elevation.mdx @@ -18,7 +18,7 @@ This tool allows you to add elevation data to traces and [points of interest](.. -Elevation data is provided by MapTiler. -You can learn more about its origin and accuracy in the documentation. +Elevation data is provided by Mapterhorn. +You can learn more about its origin and accuracy in the documentation. \ No newline at end of file diff --git a/website/src/lib/logic/settings.ts b/website/src/lib/logic/settings.ts index 4f808e945..e7377b159 100644 --- a/website/src/lib/logic/settings.ts +++ b/website/src/lib/logic/settings.ts @@ -210,7 +210,7 @@ type RoutingProfile = | 'motorcycle' | 'water' | 'railway'; -type TerrainSource = 'maptiler-dem' | 'mapterhorn'; +type TerrainSource = 'mapterhorn'; type StreetViewSource = 'mapillary' | 'google'; export const settings = { @@ -308,7 +308,7 @@ export const settings = { terrainSource: new Setting( 'terrainSource', defaultTerrainSource, - getValueValidator(['maptiler-dem', 'mapterhorn'], defaultTerrainSource) + getValueValidator(['mapterhorn'], defaultTerrainSource) ), directionMarkers: new Setting('directionMarkers', false), distanceMarkers: new Setting('distanceMarkers', false), diff --git a/website/src/lib/utils.ts b/website/src/lib/utils.ts index 3c9dd330d..f5bd8f362 100644 --- a/website/src/lib/utils.ts +++ b/website/src/lib/utils.ts @@ -7,7 +7,6 @@ import maplibregl from 'maplibre-gl'; import { pointToTile, pointToTileFraction } from '@mapbox/tilebelt'; import type { GPXStatisticsTree } from '$lib/logic/statistics-tree'; import { ListTrackSegmentItem } from '$lib/components/file-list/file-list'; -import { PUBLIC_MAPTILER_KEY } from '$env/static/public'; export function cn(...inputs: ClassValue[]) { return twMerge(clsx(inputs)); @@ -101,7 +100,7 @@ export function getClosestTrackSegments( export function getElevation( points: (TrackPoint | Waypoint | Coordinates)[], - ELEVATION_ZOOM: number = 13, + ELEVATION_ZOOM: number = 12, tileSize = 512 ): Promise { let coordinates = points.map((point) => @@ -122,10 +121,9 @@ export function getElevation( }; let promises = uniqueTiles.map((tile) => - fetch( - `https://api.maptiler.com/tiles/terrain-rgb-v2/${ELEVATION_ZOOM}/${tile[0]}/${tile[1]}.webp?key=${PUBLIC_MAPTILER_KEY}`, - { cache: 'force-cache' } - ) + fetch(`https://tiles.gpx.studio/mapterhorn/${ELEVATION_ZOOM}/${tile[0]}/${tile[1]}.webp`, { + cache: 'force-cache', + }) .then((response) => response.blob()) .then( (blob) => @@ -180,10 +178,10 @@ export function getElevation( _y + (_y + 1 == tileSize ? 0 : 1) ); - let ele00 = -10000 + (p00[0] * 256 * 256 + p00[1] * 256 + p00[2]) * 0.1; - let ele01 = -10000 + (p01[0] * 256 * 256 + p01[1] * 256 + p01[2]) * 0.1; - let ele10 = -10000 + (p10[0] * 256 * 256 + p10[1] * 256 + p10[2]) * 0.1; - let ele11 = -10000 + (p11[0] * 256 * 256 + p11[1] * 256 + p11[2]) * 0.1; + let ele00 = -32768 + p00[0] * 256 + p00[1] + p00[2] / 256; + let ele01 = -32768 + p01[0] * 256 + p01[1] + p01[2] / 256; + let ele10 = -32768 + p10[0] * 256 + p10[1] + p10[2] / 256; + let ele11 = -32768 + p11[0] * 256 + p11[1] + p11[2] / 256; return ( ele00 * (1 - dx) * (1 - dy) + diff --git a/website/src/locales/en.json b/website/src/locales/en.json index 8ca405557..c10c2d12a 100644 --- a/website/src/locales/en.json +++ b/website/src/locales/en.json @@ -235,7 +235,7 @@ }, "elevation": { "button": "Request elevation data", - "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from MapTiler.", + "help": "Requesting elevation data will erase the existing elevation data, if any, and replace it with data from Mapterhorn.", "help_no_selection": "Select a file item to request elevation data." }, "waypoint": { @@ -306,10 +306,6 @@ "united_states": "United States", "topo": "Topo", "satellite": "Satellite", - "maptilerStreets": "MapTiler Streets", - "maptilerTopo": "MapTiler Topo", - "maptilerOutdoors": "MapTiler Outdoors", - "maptilerSatellite": "MapTiler Satellite", "esriSatellite": "Esri Satellite", "openStreetMap": "OpenStreetMap", "openTopoMap": "OpenTopoMap", @@ -390,7 +386,6 @@ "tram-stop": "Tram Stop", "bus-stop": "Bus Stop", "ferry": "Ferry", - "maptiler-dem": "MapTiler DEM", "mapterhorn": "Mapterhorn" } }, diff --git a/website/src/routes/[[language]]/embed/+page.svelte b/website/src/routes/[[language]]/embed/+page.svelte index 4111fe6bc..55aedaa52 100644 --- a/website/src/routes/[[language]]/embed/+page.svelte +++ b/website/src/routes/[[language]]/embed/+page.svelte @@ -19,8 +19,8 @@ return; } embeddingOptions = getMergedEmbeddingOptions(options); - if (embeddingOptions.key === '' && embeddingOptions.basemap.startsWith('maptiler')) { - embeddingOptions.basemap = 'openStreetMap'; + if (embeddingOptions.key === '' && embeddingOptions.basemap === 'satellite') { + embeddingOptions.basemap = 'topo'; } }); diff --git a/website/static/maptiler-logo-dark.svg b/website/static/maptiler-logo-dark.svg deleted file mode 100644 index 2f60017f2..000000000 --- a/website/static/maptiler-logo-dark.svg +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/website/static/maptiler-logo.svg b/website/static/maptiler-logo.svg deleted file mode 100644 index 626f9f69b..000000000 --- a/website/static/maptiler-logo.svg +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -