Skip to content

Commit

Permalink
Merge branch main into feature/add-new-mode-for-attributions
Browse files Browse the repository at this point in the history
  • Loading branch information
dopenguin committed Jul 5, 2024
2 parents cbd3e61 + b42cbf6 commit bb020af
Show file tree
Hide file tree
Showing 117 changed files with 3,278 additions and 481 deletions.
135 changes: 135 additions & 0 deletions package-lock.json

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

4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@
"snowbox": "cd packages/clients/snowbox/ && vite --host",
"snowbox:build": "lerna run build --scope @polar/client-snowbox --stream",
"snowbox:build:serve": "http-server packages/clients/snowbox -o /dist/index.html",
"textLocator:build": "lerna run build --scope @polar/client-text-locator --stream",
"textLocator:build:serve": "http-server ./packages/clients/textLocator -o /dist/index.html",
"textLocator:dev": "cd packages/clients/textLocator/ && vite --host",
"pages:build": "rimraf ./pages/docs && npm run generic:build && bash ./scripts/buildPages.sh",
"pages:build:serve": "http-server pages -o index.html",
"clean": "lerna clean && rimraf --glob packages/**/{.cache,dist,docs} && rimraf --glob {.cache,dist} && node ./scripts/clean",
Expand All @@ -30,6 +33,7 @@
"docs:meldemichel": "node ./scripts/makeDocs ./packages/clients/meldemichel && npm run meldemichel:build && cp -r ./packages/clients/meldemichel/dist ./packages/clients/meldemichel/example ./packages/clients/meldemichel/docs",
"docs:sbom": "npx @cyclonedx/cyclonedx-npm --output-file sbom.json",
"docs:snowbox": "node ./scripts/makeDocs ./packages/clients/snowbox",
"docs:textLocator": "node ./scripts/makeDocs ./packages/clients/textLocator && npm run textLocator:build && cp -r ./packages/clients/textLocator/dist ./packages/clients/textLocator/docs",
"lint": "npx eslint . --cache --ext .js,.ts,.vue",
"lint:ci": "npx eslint . --ext .js,.ts,.vue",
"lint:fix": "npx eslint . --fix --cache --ext .js,.ts,.vue",
Expand Down
8 changes: 3 additions & 5 deletions packages/clients/dish/src/plugins/Gfi/ActionButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,12 @@

<script lang="ts">
import Vue from 'vue'
import { mapGetters } from 'vuex'
export default Vue.extend({
name: 'DishActionButton',
props: {
exportProperty: {
type: String,
default: '',
},
computed: {
...mapGetters('plugin/gfi', ['exportProperty']),
},
})
</script>
Expand Down
23 changes: 4 additions & 19 deletions packages/clients/dish/src/plugins/Gfi/Content.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-card class="dish-gfi-content">
<v-card-actions v-if="!hasWindowSize || !hasSmallWidth">
<ActionButton :export-property="exportProperty"></ActionButton>
<ActionButton></ActionButton>
<v-spacer></v-spacer>
<v-btn
icon
Expand Down Expand Up @@ -91,8 +91,7 @@
</template>

<script lang="ts">
import Vue, { PropType } from 'vue'
import { GeoJsonProperties } from 'geojson'
import Vue from 'vue'
import { mapActions, mapMutations, mapGetters } from 'vuex'
import ActionButton from './ActionButton.vue'
Expand All @@ -101,20 +100,6 @@ type GfiIndexStep = -1 | 1
export default Vue.extend({
name: 'DishGfiContent',
components: { ActionButton },
props: {
currentProperties: {
type: Object as PropType<GeoJsonProperties>,
required: true,
},
clientWidth: {
type: Number,
required: true,
},
exportProperty: {
type: String,
default: '',
},
},
data: () => ({
infoFields: [
'Kreis',
Expand All @@ -127,8 +112,9 @@ export default Vue.extend({
sachgesamtheitOpen: false,
}),
computed: {
...mapGetters(['hasSmallWidth', 'hasWindowSize']),
...mapGetters(['clientWidth', 'hasSmallWidth', 'hasWindowSize']),
...mapGetters('plugin/gfi', [
'currentProperties',
'imageLoaded',
'visibleWindowFeatureIndex',
'windowFeatures',
Expand Down Expand Up @@ -173,7 +159,6 @@ export default Vue.extend({
if (this.hasWindowSize && this.hasSmallWidth) {
this.setMoveHandleActionButton({
component: ActionButton,
props: { exportProperty: this.exportProperty },
})
}
},
Expand Down
11 changes: 11 additions & 0 deletions packages/clients/meldemichel/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# CHANGELOG

## 1.1.2

- Chore: Fix bugs via dependency updates.
- resolve filter bugs for features of unknown filter categories; they were sometimes visible

## 1.1.1

- Chore: Fix bugs via dependency updates.
- restore Safari 15 compatibility
- resolve time filter bugs where selected time frame was applied incorrectly

## 1.1.0

- Change: The search now no longer focuses on the first result after a successful search.
Expand Down
6 changes: 3 additions & 3 deletions packages/clients/meldemichel/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@polar/client-meldemichel",
"version": "1.1.0",
"version": "1.1.2",
"description": "Client Meldemichel",
"license": "EUPL-1.2",
"type": "module",
Expand Down Expand Up @@ -28,9 +28,9 @@
"@polar/lib-invisible-style": "^1.0.0",
"@polar/plugin-address-search": "^1.2.1",
"@polar/plugin-attributions": "^1.1.0",
"@polar/plugin-filter": "^1.0.0",
"@polar/plugin-filter": "^1.1.2",
"@polar/plugin-fullscreen": "^1.1.0",
"@polar/plugin-geo-location": "^1.2.0",
"@polar/plugin-geo-location": "^1.3.1",
"@polar/plugin-gfi": "^1.1.0",
"@polar/plugin-icon-menu": "^1.1.0",
"@polar/plugin-layer-chooser": "^1.1.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/clients/meldemichel/src/mapConfigurations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
PinsConfiguration,
ReverseGeocoderConfiguration,
} from '@polar/lib-custom-types'
import { MpApiParameters } from '@polar/plugin-address-search/src/types'
import { MODE, SKAT, REPORT_STATUS } from './enums'
import language from './language'
import { MeldemichelCreateMapParams } from './types'
Expand Down Expand Up @@ -88,12 +89,11 @@ const commonAttributions: Partial<AttributionsConfiguration> = {
const addressSearch: AddressSearchConfiguration = {
searchMethods: [
{
// @ts-expect-error | missing field "epsg" filled later in process
queryParameters: {
searchAddress: true,
searchStreets: true,
searchHouseNumbers: true,
},
} as MpApiParameters,
type: 'mpapi',
url: 'https://geodienste.hamburg.de/HH_WFS_GAGES?service=WFS&request=GetFeature&version=2.0.0',
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,11 @@ export default Vue.extend({
name: 'MeldemichelGfiFeatureActionButtons',
computed: {
...mapGetters('plugin/gfi', [
'showSwitchButtons',
'visibleWindowFeatureIndex',
'windowFeatures',
]),
...mapGetters(['hasSmallWidth', 'hasWindowSize']),
/** only show switch buttons if multiple property sets are available */
showSwitchButtons(): boolean {
return this.windowFeatures.length > 1
},
showSmall(): boolean {
return !this.hasWindowSize || !this.hasSmallWidth
},
Expand Down
Loading

0 comments on commit bb020af

Please sign in to comment.