Skip to content
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

staging -> production: version metadata fix and vector tile cache layer name fix #581

Merged
merged 7 commits into from
Aug 28, 2024
+7 −3
Merged

staging -> production: version metadata fix and vector tile cache layer name fix #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
895e27d
return error on date validation error
solomon-negusse Aug 27, 2024
c567610
Restore behaviour of naming VTC layers after dataset
dmannarino Aug 27, 2024
0064218
pass through None in validation
solomon-negusse Aug 27, 2024
7f2be86
Merge pull request #579 from wri/fix_vector_layer_names
dmannarino Aug 27, 2024
6f89964
Merge branch 'develop' into fix-version-metadata-bug
solomon-negusse Aug 27, 2024
9cadb7c
Merge pull request #580 from wri/fix-version-metadata-bug
solomon-negusse Aug 28, 2024
17112fe
Merge branch 'master' into develop
solomon-negusse Aug 28, 2024
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
7 changes: 5 additions & 2 deletions app/models/pydantic/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from typing import Any, List, Optional, Union
from uuid import UUID

from fastapi import HTTPException
from pydantic import Field, validator, BaseModel
from pydantic.utils import GetterDict

Expand Down Expand Up @@ -176,10 +177,12 @@ class VersionMetadataWithParentResponse(Response):


def _date_validator(date_str):
if isinstance(date_str, date):
if isinstance(date_str, date) or date_str is None:
return date_str

try:
return datetime.strptime(date_str, "%Y-%m-%d").date()
except (ValueError, TypeError):
return None
raise HTTPException(
status_code=422, detail="Date needs to be of the format YYYY-MM-DD"
)
3 changes: 2 additions & 1 deletion batch/scripts/create_vector_tile_cache.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ME=$(basename "$0")
. get_arguments.sh "$@"


NDJSON_FILE="data.json"
NDJSON_FILE="${DATASET}.json"

# Build an array of arguments to pass to tippecanoe
TIPPE_ARG_ARRAY=(
Expand All @@ -28,6 +28,7 @@ TIPPE_ARG_ARRAY=(
"--preserve-input-order"
"-P"
"-n" "${DATASET}"
"-l" "${DATASET}"
)

case ${TILE_STRATEGY} in
Expand Down
Loading