Skip to content

feat: initial token support #112

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

Draft
totev wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: initial token support #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 16 additions & 4 deletions src/components/Data/Layer/WorkspaceVectorLayerListingItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,28 @@
<span class="capitalize">{{ cleanLayerName }}</span>
</template>
<template #subtitle v-if="layerDetail && layerDetail?.featureType.abstract?.length > 0">
<span class="line-clamp-3 hover:line-clamp-none xl:line-clamp-none">{{ layerDetail.featureType.abstract }}</span></template>
<span class="line-clamp-3 hover:line-clamp-none xl:line-clamp-none">{{ layerDetail.featureType.abstract
}}</span></template>
<template #content v-if="layerDetail">
<div class="grid grid-cols-4 w-full pt-1">
<span class="font-bold lg:col-span-2 2xl:col-span-2 3xl:col-span-2 4xl:col-span-1 self-center">Keywords:</span>
<span
class="font-bold lg:col-span-2 2xl:col-span-2 3xl:col-span-2 4xl:col-span-1 self-center">Keywords:</span>
<span class="lg:col-span-2 2xl:col-span-2 3xl:col-span-2 4xl:col-span-3 pl-1">
<Tag class="mb-1 mr-1 last:mr-0" severity="primary" v-for="(keyword,index) in layerDetail.featureType.keywords.string" :key="index" :value="keyword"></Tag>
<Tag class="mb-1 mr-1 last:mr-0" severity="primary"
v-for="(keyword,index) in layerDetail.featureType.keywords.string" :key="index"
:value="keyword"></Tag>
</span>
</div>
<div class="grid grid-cols-4 w-full pt-1" v-if="dataType">
<span class="font-bold lg:col-span-2 2xl:col-span-1">Data Type:</span>
<span class="lg:col-span-2 2xl:col-span-3 pl-1">{{ dataType }}</span>
</div>
<div class="grid grid-cols-4 w-full pt-1" v-if="dataType">
<span class="font-bold lg:col-span-2 2xl:col-span-1">Access Token:</span>
<span class="lg:col-span-2 2xl:col-span-3 pl-1"> <input type="text" v-model="token" class="w-full"
placeholder="Enter token" /></span>
</div>

</template>
<template #footer>
<Button size="small" @click="add2Map">Add to map</button>
Expand Down Expand Up @@ -55,6 +65,7 @@ const cleanLayerName = computed(() => {
const geoserver = useGeoserverStore()
const layerDetail = ref<GeoServerVectorTypeLayerDetail>()
const layerStyling = ref<LayerStyleOptions>()
const token = ref<string>("")
geoserver.getLayerInformation(props.item, props.workspace).then((response) => {
// Currently we are just picking styles which has include mbstyle in name. Further optimization needed after some period
// TODO: remove mbstyle selector
Expand Down Expand Up @@ -112,7 +123,8 @@ function add2Map(): void{
workspaceName:props.workspace,
layer:layerDetail.value!,
sourceDataType:"vector",
sourceProtocol:"wmts"
sourceProtocol: "wmts",
token:token.value
}
mapStore.addMapDataSource(sourceParams).then(() => {
if (!isNullOrEmpty(dataType) && !isNullOrEmpty(layerDetail.value)) {
Expand Down
19 changes: 12 additions & 7 deletions src/store/map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export interface GeoServerSourceParams extends BaseDataSourceParams {
layer: GeoServerVectorTypeLayerDetail|GeoserverRasterTypeLayerDetail;
sourceDataType: "vector" | "raster";
sourceProtocol?: "wms" | "wmts";
token?: string;
}
export interface GeoJSONSourceParams extends BaseDataSourceParams {
sourceType: "geojson";
Expand Down Expand Up @@ -198,19 +199,23 @@ export const useMapStore = defineStore("map", () => {
}
if (params.sourceDataType === "vector") {
map.value.addSource(identifier, {
type: "vector",
tiles: [
`${import.meta.env.VITE_GEOSERVER_BASE_URL}/gwc/service/wmts
type: "vector",
tiles: [
`${import.meta.env.VITE_GEOSERVER_BASE_URL}/gwc/service/wmts
?REQUEST=GetTile&SERVICE=WMTS&VERSION=1.0.0
&LAYER=${params.workspaceName}:${(params.layer as GeoServerVectorTypeLayerDetail).featureType.name}
&LAYER=${params.workspaceName}:${
(params.layer as GeoServerVectorTypeLayerDetail).featureType
.name
}
&STYLE=
&TILEMATRIX=EPSG:900913:{z}
&TILEMATRIXSET=EPSG:900913
&TILECOL={x}
&TILEROW={y}
&format=application/vnd.mapbox-vector-tile`,
],
});
&format=application/vnd.mapbox-vector-tile
&access_token=${params.token}`,
],
});
}
}
}
Expand Down