Skip to content

Commit

Permalink
mbTiles & Styles
Browse files Browse the repository at this point in the history
  • Loading branch information
docuracy committed Dec 30, 2024
1 parent d06266b commit cc16bfd
Show file tree
Hide file tree
Showing 7 changed files with 129 additions and 7 deletions.
4 changes: 2 additions & 2 deletions tileserver/docker/api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ CMD ["sh", "-c", "fastapi run api/main.py --port ${PORT}"]
## In the project root, build the Docker image:
#sudo systemctl restart docker
#docker login
#docker build -t worldhistoricalgazetteer/tileapi ./tileserver/docker/api
#docker push worldhistoricalgazetteer/tileapi:0.0.1
#docker build -t worldhistoricalgazetteer/tileapi:0.0.2 ./tileserver/docker/api
#docker push worldhistoricalgazetteer/tileapi:0.0.2
3 changes: 2 additions & 1 deletion tileserver/docker/api/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ pydantic>=2.7.0,<3.0.0
ijson>=3.2,<4.0
kubernetes>=26.1.0,<27.0.0
httpx>=0.24.0,<0.25.0
requests>=2.31.0,<3.0.0
requests>=2.31.0,<3.0.0
mbutil>=0.3.0,<0.4.0
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"ecoregions": {
"type": "vector",
"maxzoom": 10,
"url": "mbtiles://{ecoregions}"
"url": "mbtiles://{wwf-ecoregions}"
}
},
"glyphs": "{fontstack}/{range}.pbf",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
"ecoregions": {
"type": "vector",
"maxzoom": 10,
"url": "mbtiles://{ecoregions}"
"url": "mbtiles://{wwf-ecoregions}"
}
},
"glyphs": "{fontstack}/{range}.pbf",
Expand Down
2 changes: 1 addition & 1 deletion tileserver/repository/assets/styles/whg-portal/style.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"ecoregions": {
"type": "vector",
"maxzoom": 10,
"url": "mbtiles://{ecoregions}"
"url": "mbtiles://{wwf-ecoregions}"
}
},
"terrain": {
Expand Down
121 changes: 121 additions & 0 deletions tileserver/repository/reconfiguration/backup-config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
{
"options": {
"paths": {
"root": "../",
"fonts": "./assets/fonts",
"sprites": "./assets/sprites",
"icons": "./assets/icons",
"styles": "./assets/styles",
"mbtiles": "./tiles",
"files": "./mapdata",
"images": "/usr/src/app/public/resources/images"
}
},
"serveAllFonts": true,
"serveAllStyles": true,
"serveStaticMaps": true,
"styles": {
"WHG": {
"style": "WHG/style.json",
"serve_rendered": false,
"serve_data": true
},
"OSM": {
"style": "OSM/style.json",
"serve_rendered": false,
"serve_data": true
},
"Satellite": {
"style": "satellite/style.json",
"serve_rendered": false,
"serve_data": true
},
"whg-portal": {
"style": "whg-portal/style.json",
"serve_rendered": false,
"serve_data": true
},
"whg-prototype": {
"style": "whg-prototype/style.json",
"serve_rendered": false,
"serve_data": true
},
"whg-basic-light": {
"style": "whg-basic-light/style.json",
"serve_rendered": false,
"serve_data": true
},
"whg-basic-dark": {
"style": "whg-basic-dark/style.json",
"serve_rendered": false,
"serve_data": true
},
"whg-enhanced": {
"style": "whg-enhanced/style.json",
"serve_rendered": false,
"serve_data": true
}
},
"data": {
"wwf-ecoregions": {
"mbtiles": "wwf-ecoregions.mbtiles",
"tilejson": {
"attribution": "Ecoregions: <a href='https://www.worldwildlife.org/publications/terrestrial-ecoregions-of-the-world'>WWF</a>"
}
},
"natural-earth-1-landcover": {
"mbtiles": "NE1_HR_LC.raster.mbtiles",
"tilejson": {
"attribution": "Basemap: <a href=\"https://www.naturalearthdata.com/\" target=\"_blank\">&copy; Natural Earth</a>"
}
},
"natural-earth-2-landcover": {
"mbtiles": "NE2_HR_LC.raster.mbtiles",
"tilejson": {
"attribution": "Basemap: <a href=\"https://www.naturalearthdata.com/\" target=\"_blank\">&copy; Natural Earth</a>"
}
},
"natural-earth-hypsometric-noshade": {
"mbtiles": "HYP_HR.raster.mbtiles",
"tilejson": {
"attribution": "Basemap: <a href=\"https://www.naturalearthdata.com/\" target=\"_blank\">&copy; Natural Earth</a>"
}
},
"NE1_HR_LC.raster": {
"mbtiles": "NE1_HR_LC.raster.mbtiles",
"tilejson": {
"attribution": "Basemap: <a href=\"https://www.naturalearthdata.com/\" target=\"_blank\">&copy; Natural Earth</a>"
}
},
"NE2_HR_LC_SR_W": {
"mbtiles": "NE2_HR_LC_SR_W.mbtiles",
"tilejson": {
"attribution": "Basemap: <a href=\"https://www.naturalearthdata.com/\" target=\"_blank\">&copy; Natural Earth</a>"
}
},
"NE2_HR_LC_SR_W_DR": {
"mbtiles": "NE2_HR_LC_SR_W_DR.mbtiles",
"tilejson": {
"attribution": "Basemap: <a href=\"https://www.naturalearthdata.com/\" target=\"_blank\">&copy; Natural Earth</a>"
}
},
"NE2_HR_LC.raster": {
"mbtiles": "NE2_HR_LC.raster.mbtiles",
"tilejson": {
"attribution": "Basemap: <a href=\"https://www.naturalearthdata.com/\" target=\"_blank\">&copy; Natural Earth</a>"
}
},
"open-map-tiles": {
"mbtiles": "open-map-tiles.mbtiles",
"tilejson": {
"attribution": "<a href=\"https://www.maptiler.com/copyright/\" target=\"_blank\">&copy; MapTiler</a> <a href=\"https://www.openstreetmap.org/copyright\" target=\"_blank\">&copy; OpenStreetMap contributors</a>"
}
},
"terrarium": {
"mbtiles": "terrarium.mbtiles",
"tilejson": {
"attribution": "Terrain: <a href='https://github.com/tilezen/joerd/blob/master/docs/data-sources.md'>Mapzen</a>"
}
}
}
}
2 changes: 1 addition & 1 deletion tileserver/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ replicaCount: 1

tileapi:
image: "worldhistoricalgazetteer/tileapi"
imageTag: "0.0.4"
imageTag: "0.0.5"
imagePullPolicy: "IfNotPresent"
# port: 8081
# servicePort: 81
Expand Down

0 comments on commit cc16bfd

Please sign in to comment.