Skip to content

AB#32128: Remove deprecated v2 endpoints #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
e-halinen wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

AB#32128: Remove deprecated v2 endpoints #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
24f9eaf
AB#32128: Remove deprecated v2 endpoints
e-halinen Feb 10, 2025
a418002
Remove data-fetcher
e-halinen Feb 13, 2025
4dd43d0
Remove data-fetcher autorun since it's not needed anymore
e-halinen Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ RUN wget https://hslstoragekarttatuotanto.blob.core.windows.net/openmaptiles/til
EXPOSE 8080

CMD \
yarn run data-fetcher && \
(Xorg -dpi 96 -nolisten tcp -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./10.log -config ./xorg.conf :10 & \
DISPLAY=":10" yarn forever start --spinSleepTime 60000 --minUptime 30000 -c "node ${NODE_OPTS}" \
node_modules/tessera/bin/tessera.js --port 8080 --config config.js --multiprocess \
Expand Down
367 changes: 1 addition & 366 deletions config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,6 @@ const sourcesUrl = "http://localhost:8080/";
const rasterHeaders = { "headers": { "Cache-Control": "public,max-age=604800" } };
const vectorHeaders = { "headers": { "Cache-Control": "public,max-age=43200" } };

// Common defaults for vector data layers.
const geojsonSourceProps = {
"protocol": "geojson:",
"query": {},
"minzoom": 5,
"maxzoom": 20,
"bounds": [18, 58, 32, 71],
};

// Center data to give hint for clients where to zoom.
const hslCenter = [24.9, 60.1, 14];
const finlandCenter = [26, 63, 8];

module.exports = {
// v3 endpoints

Expand Down Expand Up @@ -244,357 +231,5 @@ module.exports = {
})
},
...rasterHeaders,
},


// V2 endpoints
// Will be deprecated soon.

// Vector endpoints

// New v2 endpoint. Uses OpenMapTiles schema.
"/map/v2/hsl-vector-map": {
"source": `mbtiles://${DATA_DIR}/finland.mbtiles`,
...vectorHeaders,
},

// Citybike maps
"/map/v2/hsl-citybike-map": {
"source": {
...geojsonSourceProps,
"center": hslCenter,
"name": "HSL Citybikes",
"sources": [{
"id": "stations",
"file": `${DATA_DIR}/hsl-citybikes.geojson`,
}]
},
...vectorHeaders,
},
"/map/v2/waltti-citybike-map": {
"source": {
...geojsonSourceProps,
"center": finlandCenter,
"name": "Waltti Citybikes",
"maxzoom": 20,
"sources": [{
"id": "stations",
"file": `${DATA_DIR}/waltti-citybikes.geojson`,
}]
},
...vectorHeaders,
},
"/map/v2/finland-citybike-map": {
"source": {
...geojsonSourceProps,
"center": finlandCenter,
"name": "Finland Citybikes",
"sources": [{
"id": "stations",
"file": `${DATA_DIR}/finland-citybikes.geojson`,
}]
},
...vectorHeaders,
},

// Stop maps
"/map/v2/hsl-stop-map": {
"source": {
...geojsonSourceProps,
"center": hslCenter,
"name": "Stops",
"sources": [{
"id": "stops",
"file": `${DATA_DIR}/hsl-stops.geojson`,
}, {
"id": "stations",
"file": `${DATA_DIR}/hsl-stations.geojson`,
}]
},
...vectorHeaders,

},
"/map/v2/finland-stop-map": {
"source": {
...geojsonSourceProps,
"center": finlandCenter,
"name": "Stops",
"sources": [{
"id": "stops",
"file": `${DATA_DIR}/finland-stops.geojson`,
}, {
"id": "stations",
"file": `${DATA_DIR}/finland-stations.geojson`,
}]
},
...vectorHeaders,

},
"/map/v2/waltti-stop-map": {
"source": {
...geojsonSourceProps,
"center": finlandCenter,
"name": "Stops",
"sources": [{
"id": "stops",
"file": `${DATA_DIR}/waltti-stops.geojson`,
}, {
"id": "stations",
"file": `${DATA_DIR}/waltti-stations.geojson`,
}]
},
...vectorHeaders,

},

// Park and ride map (Liityntäpysäköinti)
"/map/v2/hsl-parkandride-map": {
"source": {
...geojsonSourceProps,
"center": hslCenter,
"name": "HSL Park & Ride",
"sources": [{
"id": "facilities",
"file": `${DATA_DIR}/hsl-parkandride-facilities.geojson`,
}, {
"id": "hubs",
"file": `${DATA_DIR}/hsl-parkandride-hubs.geojson`,
}, {
"id": "facility-points",
"file": `${DATA_DIR}/hsl-parkandride-facility-points.geojson`,
}]
},
...vectorHeaders,
},

// Ticket sales point map
"/map/v2/hsl-ticket-sales-map": {
"source": {
...geojsonSourceProps,
"center": hslCenter,
"name": "Ticket sales",
"sources": [{
"id": "ticket-sales",
"file": `${DATA_DIR}/hsl-ticket-sales.geojson`,
}]
},
...vectorHeaders,
},

// Raster endpoints
// Default layer tile is 512x512 pixels, but 256x256 layers are defined separately.

// The main map. Reittiopas style.
"/map/v2/hsl-map": {
"source": {
"protocol": "gl:",
"query": { bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},
"/map/v2/hsl-map-256": {
"source": {
"protocol": "gl:",
"query": { layerTileSize: 256, bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},

// Swedish map style
"/map/v2/hsl-map-sv": {
"source": {
"protocol": "gl:",
"query": { bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text_sv: { enabled: true },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},
"/map/v2/hsl-map-sv-256": {
"source": {
"protocol": "gl:",
"query": { layerTileSize: 256, bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text_sv: { enabled: true },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},

// English map style
"/map/v2/hsl-map-en": {
"source": {
"protocol": "gl:",
"query": { bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text_en: { enabled: true },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},
"/map/v2/hsl-map-en-256": {
"source": {
"protocol": "gl:",
"query": { layerTileSize: 256, bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text_en: { enabled: true },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},

// Bilingual map style
"/map/v2/hsl-map-fi-sv": {
"source": {
"protocol": "gl:",
"query": { bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text_fisv: { enabled: true },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},
"/map/v2/hsl-map-fi-sv-256": {
"source": {
"protocol": "gl:",
"query": { layerTileSize: 256, bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text_fisv: { enabled: true },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},

// Map with no texts
"/map/v2/hsl-map-no-text": {
"source": {
"protocol": "gl:",
"query": {},
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text: { enabled: false },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},
"/map/v2/hsl-map-no-text-256": {
"source": {
"protocol": "gl:",
"query": { layerTileSize: 256 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text: { enabled: false },
simplified: { enabled: true }
}
})
},
...rasterHeaders,
},

// Greyscale map
"/map/v2/hsl-map-greyscale": {
"source": {
"protocol": "gl:",
"query": { bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
greyscale: { enabled: true },
simplified: { enabled: true },
municipal_borders: { enabled: true }
}
})
},
...rasterHeaders,
},
"/map/v2/hsl-map-greyscale-256": {
"source": {
"protocol": "gl:",
"query": { layerTileSize: 256, bufferWidth: 8 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
greyscale: { enabled: true },
simplified: { enabled: true },
municipal_borders: { enabled: true }
}
})
},
...rasterHeaders,
},

// Greyscale map without texts
"/map/v2/hsl-map-greyscale-no-text": {
"source": {
"protocol": "gl:",
"query": {},
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text: { enabled: false },
greyscale: { enabled: true },
simplified: { enabled: true },
municipal_borders: { enabled: true }
}
})
},
...rasterHeaders,
},
"/map/v2/hsl-map-greyscale-256-no-text": {
"source": {
"protocol": "gl:",
"query": { layerTileSize: 256 },
"style": hslMapStyle.generateStyle({
sourcesUrl,
components: {
text: { enabled: false },
greyscale: { enabled: true },
simplified: { enabled: true },
municipal_borders: { enabled: true }
}
})
},
...rasterHeaders,
},
}
};
Loading