Merge branch 'master' into feature/166-metadata-viz

Author: claire-simpson

.gitignore

@@ -1,4 +1,4 @@
-.PHONY: deploy deploy-staging sync-on-prod fetch-nginx-config clipping-service env-clip ckan-dev
+.PHONY: deploy deploy-staging sync-on-prod fetch-nginx-config clipping-service env-clip ckan-dev tileserver
 
 GIT_DIR := /opt/ckan-catalog/data.naturalcapitalproject.stanford.edu
 CKAN_PROD_URL := https://data.naturalcapitalproject.stanford.edu
@@ -38,7 +38,10 @@ env-clip:
 	@echo ">> make clipping-service"
 
 clipping-service:
-	python -m gunicorn --chdir ./clipping-service/app app:app --reload
+	python -m gunicorn --chdir ./clipping-service/app app:app --timeout 180 --reload
+
+tileserver:
+	python -m gunicorn --chdir ./tileserver/app main:app --timeout 180 --reload
 
 ckan-dev:
 	docker compose -f docker-compose.dev.yml build