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

Maintenance v1.2.0 #325

Merged
merged 7 commits into from
Mar 27, 2023
Merged

Maintenance v1.2.0 #325

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
0757d94
Fix key indexing of background layer list.
fschmenger Oct 20, 2022
3d71163
Remove workarounds in attribute table to adjust the map size. This is…
fschmenger Dec 20, 2022
64f4354
Fix positioning of SampleModule when located on the sidebar.
fschmenger Dec 21, 2022
382d98e
Remove unit tests for attribute table for no longer existent resize w…
fschmenger Mar 14, 2023
6739c6c
Added a brief unit test for ModuleCard 'closable' property.
fschmenger Mar 14, 2023
3c7a17e
Update version number in package-lock.json.
fschmenger Mar 14, 2023
35f82ef
Update the template configurations to set "crossOrigin":"anonymous" f…
fschmenger Mar 23, 2023
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
2 changes: 1 addition & 1 deletion app-starter/components/SampleModule.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default {
<!-- Here we do the styling of our module -->
<style scoped>
/* our module has the class '.sample-module' and we reference it here */
.sample-module {
.sample-module.wgu-floating {
left: auto !important;
top: 300px !important;
right: 10px;
Expand Down
6 changes: 4 additions & 2 deletions app-starter/static/app-conf-sidebar.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@
"visible": false,
"displayInLayerList": true,
"legend": true,
"opacityControl": true
"opacityControl": true,
"crossOrigin": "anonymous"
},
{
"type": "IMAGEWMS",
Expand All @@ -181,7 +182,8 @@
"isBaseLayer": false,
"visible": false,
"displayInLayerList": true,
"opacityControl": true
"opacityControl": true,
"crossOrigin": "anonymous"
},
{
"type": "VECTORTILE",
Expand Down
6 changes: 4 additions & 2 deletions app-starter/static/app-conf.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,8 @@
"visible": false,
"displayInLayerList": true,
"legend": true,
"opacityControl": true
"opacityControl": true,
"crossOrigin": "anonymous"
},
{
"type": "IMAGEWMS",
Expand All @@ -172,7 +173,8 @@
"isBaseLayer": false,
"visible": false,
"displayInLayerList": true,
"opacityControl": true
"opacityControl": true,
"crossOrigin": "anonymous"
},
{
"type": "VECTORTILE",
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

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

26 changes: 1 addition & 25 deletions src/components/attributeTable/AttributeTableWin.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:moduleName="moduleName"
class="wgu-attributetable-win"
:icon="icon"
v-on:visibility-change="show">
>

<template v-slot:wgu-win-toolbar>
<v-select
Expand All @@ -29,7 +29,6 @@

<wgu-attributetable
v-if="selLayer"
v-resize="onResize"
:layerId="selLayer.get('lid')"
:syncTableMapSelection="syncTableMapSelection"
>
Expand Down Expand Up @@ -65,29 +64,6 @@ export default {
'wgu-attributetable': AttributeTable
},
methods: {
show () {
// resize map properly after closing
// the AttributeTable
this.resizeOlMap()
},
onResize () {
// change map size when window is changing
this.resizeOlMap()
},

/**
* Update the OpenLayers map size.
*
* Necessary because the map does not automatically
* notice when its size is changed externally.
*/
resizeOlMap () {
this.$nextTick(() => {
// must be within '$nextTick' to take effect
this.map.updateSize();
})
},

/**
* This function is executed, after the map is bound (see mixins/Mapable).
* Bind to the layers from the OpenLayers map.
Expand Down
2 changes: 1 addition & 1 deletion src/components/bglayerswitcher/BgLayerList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
>
<v-slide-item
v-for="layer in displayedLayers"
:key="layer.lid"
:key="layer.get('lid')"
:value="layer"
v-slot:default="{ active, toggle }"
>
Expand Down
2 changes: 0 additions & 2 deletions test/unit/specs/components/attributeTable/AttributeTableWin.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,6 @@ describe('attributeTable/AttributeTableWin.vue', () => {
});

it('are implemented', () => {
expect(vm.onResize).to.be.a('function');
expect(vm.resizeOlMap).to.be.a('function');
expect(vm.onMapBound).to.be.a('function');
});
});
Expand Down
1 change: 1 addition & 0 deletions test/unit/specs/components/modulecore/ModuleCard.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ describe('modulecore/ModuleCard.vue', () => {

it('has correct default props', () => {
expect(comp.vm.minimizable).to.equal(false);
expect(comp.vm.closable).to.equal(true);
expect(comp.vm.backgroundImage).to.be.undefined;
expect(comp.vm.draggable).to.equal(true);
expect(comp.vm.visible).to.equal(false);
Expand Down