Skip to content

Commit

Permalink
Merge pull request #4662 from UNDP-Data/release/develop-to-main
Browse files Browse the repository at this point in the history
[RELEASE] Merge develop to main
  • Loading branch information
JinIgarashi authored Dec 19, 2024
2 parents 44dd9b5 + 50ef65a commit 2fc3038
Show file tree
Hide file tree
Showing 9 changed files with 132 additions and 30 deletions.
2 changes: 1 addition & 1 deletion documentation/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mkdocs==1.6.1
mkdocs-material==9.5.48
mkdocs-material==9.5.49
importlib-metadata==8.5.0
mkdocs-video==1.5.0
pillow ==11.0.0
Expand Down
2 changes: 1 addition & 1 deletion packages/style-switcher/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@sveltejs/package": "^2.3.7",
"@sveltejs/vite-plugin-svelte": "^4.0.0",
"@types/json-stable-stringify": "^1.1.0",
"@typescript-eslint/eslint-plugin": "8.18.0",
"@typescript-eslint/eslint-plugin": "8.18.1",
"@typescript-eslint/parser": "^8.12.2",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/svelte-undp-design/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@sveltejs/vite-plugin-svelte": "^3.1.2",
"@testing-library/svelte": "^5.2.3",
"@testing-library/user-event": "^14.5.2",
"@typescript-eslint/eslint-plugin": "8.18.0",
"@typescript-eslint/eslint-plugin": "8.18.1",
"@typescript-eslint/parser": "^8.8.0",
"@undp-data/undp-bulma": "workspace:^",
"@vitest/coverage-istanbul": "^2.1.1",
Expand Down
117 changes: 111 additions & 6 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions sites/geohub/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# geohub

## 1.22.25

### Patch Changes

- 9baaa43: fix: allow unsigned users to access stac product api to get information.

## 1.22.24

### Patch Changes

- 61d95f4: fix: use /tiles/WebMercatorQuad/{z}/{x}/{y}.png in Electricity Dashboard

## 1.22.23

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions sites/geohub/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "geohub",
"version": "1.22.23",
"version": "1.22.25",
"description": "GeoHub is a geospatial visualization data portal built by UNDP using sveltekit",
"scripts": {
"dev": "pnpm prebuild && vite dev",
Expand Down Expand Up @@ -64,7 +64,7 @@
"@types/pg": "^8.11.10",
"@types/pngjs": "^6.0.5",
"@types/uuid": "^10.0.0",
"@typescript-eslint/eslint-plugin": "8.18.0",
"@typescript-eslint/eslint-plugin": "8.18.1",
"@typescript-eslint/parser": "^8.8.0",
"@undp-data/cgaz-admin-tool": "workspace:*",
"@undp-data/style-switcher": "workspace:*",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
const layerSource: SourceSpecification = {
type: 'raster',
tiles: [`${titilerUrl}/tiles/{z}/{x}/{y}.png?${apiUrlParams.toString()}`],
tiles: [`${titilerUrl}/tiles/WebMercatorQuad/{z}/{x}/{y}.png?${apiUrlParams.toString()}`],
tileSize: 256,
// bounds: layerInfo['bounds'],
attribution:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
import { error, type RequestHandler } from '@sveltejs/kit';
import { type RequestHandler } from '@sveltejs/kit';
import { db } from '$lib/server/db';
import { sql } from 'drizzle-orm';
import { stacCollectionProductInGeohub } from '$lib/server/schema';

export const GET: RequestHandler = async ({ locals, params }) => {
const session = await locals.auth();
if (!session) {
error(403, { message: 'Permission error' });
}

export const GET: RequestHandler = async ({ params }) => {
const products = await db
.select({
stac_id: stacCollectionProductInGeohub.stacId,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,7 @@ import { db } from '$lib/server/db';
import { productInGeohub, stacCollectionProductInGeohub } from '$lib/server/schema';
import { eq, sql } from 'drizzle-orm';

export const GET: RequestHandler = async ({ locals, params }) => {
// get product details
/**
* get product details
* Needs to be logged in to get product details
*/
const session = await locals.auth();
if (!session) {
error(403, { message: 'Permission error' });
}

export const GET: RequestHandler = async ({ params }) => {
const productDetails = await db
.select({
stac_id: stacCollectionProductInGeohub.stacId,
Expand Down

0 comments on commit 2fc3038

Please sign in to comment.