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.

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

GSLUX-756: Display feature info in info panel #171

Draft
wants to merge 17 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
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
3 changes: 2 additions & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ VITE_USE_PROXYURL=true
VITE_PROXYURL_WMS="/ogcproxywms"
VITE_PROXYURL_REMOTE="/httpsproxy"

# Urls for metadata, metadata links and legends
# Urls for metadata, metadata links, legends, feature info
VITE_GEONETWORK_URL="https://geocatalogue.geoportail.lu/geonetwork/srv"
VITE_GET_LEGENDS_URL="/legends/get_html"
VITE_GET_METADATA_URL="/getMetadata"
VITE_GET_INFO_SERVICE_URL="/getfeatureinfo"

# Paths for symbols
VITE_SYMBOL_ICONS_URL="/mymaps"
Expand Down
3 changes: 2 additions & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ VITE_USE_PROXYURL=true
VITE_PROXYURL_WMS="https://migration.geoportail.lu/ogcproxywms"
VITE_PROXYURL_REMOTE="https://migration.geoportail.lu/httpsproxy"

# Urls for metadata, metadata links and legends
# Urls for metadata, metadata links, legends, feature info
VITE_GEONETWORK_URL="https://geocatalogue.geoportail.lu/geonetwork/srv"
VITE_GET_LEGENDS_URL="https://migration.geoportail.lu/legends/get_html"
VITE_GET_METADATA_URL="https://migration.geoportail.lu/getMetadata"
VITE_GET_INFO_SERVICE_URL="https://migration.geoportail.lu/getfeatureinfo"

# Paths for symbols
VITE_SYMBOL_ICONS_URL="https://map.geoportail.lu/mymaps" # !!! use prod because of CORS
Expand Down
3 changes: 2 additions & 1 deletion .env.e2e
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ VITE_USE_PROXYURL=true
VITE_PROXYURL_WMS="https://map.geoportail.lu/ogcproxywms"
VITE_PROXYURL_REMOTE="https://map.geoportail.lu/httpsproxy"

# Urls for metadata, metadata links and legends
# Urls for metadata, metadata links, legends, feature info
VITE_GEONETWORK_URL="https://geocatalogue.geoportail.lu/geonetwork/srv"
VITE_GET_LEGENDS_URL="https://migration.geoportail.lu/legends/get_html"
VITE_GET_METADATA_URL="https://migration.geoportail.lu/getMetadata"
VITE_GET_INFO_SERVICE_URL="https://migration.geoportail.lu/getfeatureinfo"

# Paths for symbols
VITE_SYMBOL_ICONS_URL="https://map.geoportail.lu/mymaps" # !!! use prod because of CORS
Expand Down
3 changes: 2 additions & 1 deletion .env.staging
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ VITE_USE_PROXYURL=true
VITE_PROXYURL_WMS="https://migration.geoportail.lu/ogcproxywms"
VITE_PROXYURL_REMOTE="https://migration.geoportail.lu/httpsproxy"

# Urls for metadata, metadata links and legends
# Urls for metadata, metadata links, legends, feature info
VITE_GEONETWORK_URL="https://geocatalogue.geoportail.lu/geonetwork/srv"
VITE_GET_LEGENDS_URL="https://migration.geoportail.lu/legends/get_html"
VITE_GET_METADATA_URL="https://migration.geoportail.lu/getMetadata"
VITE_GET_INFO_SERVICE_URL="https://migration.geoportail.lu/getfeatureinfo"

# Paths for symbols
VITE_SYMBOL_ICONS_URL="https://migration.geoportail.lu/mymaps"
Expand Down
6 changes: 6 additions & 0 deletions package-lock.json

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

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
"bundle/*"
],
"dependencies": {
"@braintree/sanitize-url": "^7.1.0",
"@camptocamp/ogc-client": "^0.3.4",
"d3-array": "^3.2.4",
"d3-axis": "^3.0.0",
Expand Down
4 changes: 3 additions & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import { statePersistorMyMapService } from '@/services/state-persistor/state-per
import { useAppStore } from '@/stores/app.store'
import useMap from '@/composables/map/map.composable'
import useMvtStyles from '@/composables/mvt-styles/mvt-styles.composable'
import { statePersistorFeatureInfoService } from '@/services/state-persistor/state-persistor-featureinfo.service'

const appStore = useAppStore()
const mvtStyleService = useMvtStyles()
Expand All @@ -37,6 +38,7 @@ statePersistorAppService.bootstrap()
statePersistorStyleService.bootstrap()
statePersistorBgLayerService.bootstrap()
mvtStyleService.initBackgroundsConfigs()
statePersistorFeatureInfoService.bootstrap()

const {
embedded,
Expand Down Expand Up @@ -87,7 +89,7 @@ onUnmounted(() => window.removeEventListener('resize', map.resize))
</div>
</main>

<footer-bar class="fixed bottom-5 sm:static z-20" />
<footer-bar class="fixed bottom-5 sm:static" />
<alert-notifications />
</template>

Expand Down
Binary file added src/assets/images/featureinfo/solarkataster_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions src/assets/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,26 @@
.lux-legend hr {
@apply my-2;
}

.lux-poi-title {
@apply text-title-xl mt-[22px] mb-[11px];
}
.lux-poi-feature {
@apply bg-white bg-opacity-50 m-[5px] p-[10px];
}
.lux-poi-feature h4 {
@apply my-[11px] text-[20px];
}
.lux-poi-feature label {
@apply font-bold mb-[5px];
}
.lux-poi-feature a {
@apply text-black underline;
}

.lux-solarkataster-button {
@apply bg-solarkataster w-[200px] h-[100px] bg-[length:196px_96px] bg-no-repeat;
}
}

.fa-solid {
Expand Down
7 changes: 4 additions & 3 deletions src/components/footer/button-icon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const props = defineProps<{
label: string
icon: string
active?: boolean
displayStar?: boolean
}>()
</script>

Expand All @@ -15,8 +16,8 @@ const props = defineProps<{
class="block text-[1.7rem] sm:text-[2rem] -mt-1.5 -mb-3 after:font-icons"
:class="props.active ? 'lux-close-cross' : `after:content-${props.icon}`"
></span>
<span class="block text-[13px] sm:text-base uppercase">{{
props.label
}}</span>
<span class="block text-[13px] sm:text-base uppercase"
>{{ props.label }}<span v-if="props.displayStar">(*)</span></span
>
</button>
</template>
13 changes: 12 additions & 1 deletion src/components/footer/footer-bar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import ButtonLink from './button-link.vue'
import ToolbarDraw from './toolbar-draw.vue'
import { useTranslation } from 'i18next-vue'
import { useAppStore } from '@/stores/app.store'
import { useFeatureInfoStore } from '@/stores/feature-info.store'

const { t, i18next } = useTranslation()
const appStore = useAppStore()
Expand Down Expand Up @@ -38,6 +39,15 @@ function onClickLayersIcon() {

themeGridOpen.value = false
}

const featureInfoStore = useFeatureInfoStore()
const { infoPanelHidden } = storeToRefs(featureInfoStore)
const { setInfoPanelHidden } = featureInfoStore

function onClickInfoIcon() {
toggleInfoOpen()
setInfoPanelHidden(false)
}
</script>
<template>
<footer
Expand Down Expand Up @@ -75,7 +85,8 @@ function onClickLayersIcon() {
:label="t('Infos', { ns: 'client' })"
icon="infos"
:active="infoOpen"
@click="() => toggleInfoOpen()"
:display-star="infoPanelHidden"
@click="onClickInfoIcon"
>
</button-icon>
</li>
Expand Down
Loading