@geogirafe/lib-geoportal 1.0.2248777413 → 1.0.2250838105
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/drawing/component.d.ts +1 -1
- package/components/drawing/component.js +2 -0
- package/components/edit/component.js +2 -0
- package/components/map/component.js +1 -1
- package/package.json +1 -1
- package/templates/public/about.json +1 -1
- package/tools/layers/snapmanager.d.ts +5 -1
- package/tools/layers/snapmanager.js +41 -10
- package/tools/state/layersConfig.d.ts +1 -0
- package/tools/state/layersConfig.js +1 -0
|
@@ -36,7 +36,7 @@ export default class DrawingComponent extends GirafeHTMLElement implements IGira
|
|
|
36
36
|
batchCreateMode: boolean;
|
|
37
37
|
constructor(name?: string);
|
|
38
38
|
render(): void;
|
|
39
|
-
renderComponent
|
|
39
|
+
private renderComponent;
|
|
40
40
|
refreshRender(): void;
|
|
41
41
|
registerEvents(): void;
|
|
42
42
|
unregisterEvents(): void;
|
|
@@ -82,9 +82,11 @@ input{border:1px solid var(--bkg-color-grad1);width:inherit;background-color:var
|
|
|
82
82
|
super.render();
|
|
83
83
|
if (this.isPanelVisible) {
|
|
84
84
|
this.renderComponent();
|
|
85
|
+
this.state.layers.isSnappingActive = true;
|
|
85
86
|
}
|
|
86
87
|
else {
|
|
87
88
|
this.hide();
|
|
89
|
+
this.state.layers.isSnappingActive = false;
|
|
88
90
|
}
|
|
89
91
|
super.girafeTranslate();
|
|
90
92
|
}
|
|
@@ -56,9 +56,11 @@ export default class EditComponent extends GirafeHTMLElement {
|
|
|
56
56
|
super.render();
|
|
57
57
|
if (this.isPanelVisible) {
|
|
58
58
|
this.renderComponent();
|
|
59
|
+
this.state.layers.isSnappingActive = true;
|
|
59
60
|
}
|
|
60
61
|
else {
|
|
61
62
|
this.renderEmptyComponent();
|
|
63
|
+
this.state.layers.isSnappingActive = false;
|
|
62
64
|
}
|
|
63
65
|
super.girafeTranslate();
|
|
64
66
|
}
|
|
@@ -46,7 +46,7 @@ export default class MapComponent extends GirafeHTMLElement {
|
|
|
46
46
|
return uHtml `<style>
|
|
47
47
|
*{font-family:Arial,sans-serif}.hidden{display:none!important}.gg-rotate90{transform:rotate(90deg)}.gg-rotate180{transform:rotate(180deg)}.gg-rotate270{transform:rotate(270deg)}img{filter:var(--svg-filter)}img.legend-image{filter:var(--svg-map-filter);background:var(--svg-legend-bkg)}div{scrollbar-width:thin}a,a:visited{color:var(--link-color)}@keyframes spin{0%{transform:rotate(0)}to{transform:rotate(360deg)}}@keyframes spin-wait{0%{transform:rotate(0)}7%{transform:rotate(360deg)}to{transform:rotate(360deg)}}.gg-spin{animation-name:spin;animation-duration:2s;animation-timing-function:linear;animation-iteration-count:infinite}.gg-spin-wait{animation-name:spin-wait;animation-duration:10s;animation-timing-function:linear;animation-iteration-count:infinite}::-webkit-scrollbar{width:5px}::-webkit-scrollbar-thumb{background:#999}.gg-button,.gg-select,.gg-input,.gg-textarea{background-color:var(--bkg-color);color:var(--text-color);border:var(--app-standard-border);box-sizing:border-box;cursor:pointer;border-radius:3px;outline:0;margin:0;padding:0 0 0 .5rem;display:inline-block}.gg-label{background-color:var(--bkg-color);color:var(--text-color);border:none;align-items:center;margin:0;padding:0;display:flex}.gg-button,.gg-select,.gg-input,.gg-label{min-height:calc(var(--app-standard-height)/1.5)}.gg-textarea{max-height:initial;resize:vertical;height:6rem;padding:.5rem;line-height:1.3rem}.gg-input{cursor:text}.gg-checkbox{accent-color:var(--text-color);width:1.2rem}.gg-range{accent-color:var(--text-color)}.gg-button{padding:0 .5rem}.gg-button.active{border:solid 1px var(--text-color-grad2);background-color:var(--text-color-grad2);color:var(--bkg-color)}.gg-button:disabled{color:gray;cursor:not-allowed;background-color:#d3d3d3;border:none}.gg-input:disabled,.gg-select:disabled,.gg-textarea:disabled{color:gray;cursor:not-allowed;background-color:#d3d3d3}.gg-button>img{vertical-align:middle}.gg-icon-button{color:var(--text-color);cursor:pointer;background-color:#0000;border:none;flex-direction:column;justify-content:center;align-items:center;padding:0;display:flex}.gg-icon{justify-content:center;align-items:center;display:flex}.gg-big,.gg-big-withtext{min-width:var(--app-standard-height);min-height:var(--app-standard-height);max-height:var(--app-standard-height)}.gg-big img,.gg-big-withtext img{width:calc(var(--app-standard-height) - 1.5rem);margin:0}.gg-big-withtext span{font-variant:small-caps;padding:0 1rem;font-size:.9rem}.gg-medium,.gg-medium-withtext{min-width:calc(var(--app-standard-height)/1.2);min-height:calc(var(--app-standard-height)/1.2);max-height:calc(var(--app-standard-height)/1.2);flex-direction:row}.gg-medium img{width:calc(var(--app-standard-height)/2.4);margin:0}.gg-medium-withtext img{width:calc(var(--app-standard-height)/2.4);margin-left:.5rem}.gg-medium-withtext span{padding:0 1rem 0 .5rem;font-size:.9rem}.gg-small,.gg-small-withtext{min-width:calc(var(--app-standard-height)/2);min-height:calc(var(--app-standard-height)/2);max-height:calc(var(--app-standard-height)/2);flex-direction:row}.gg-small img{width:calc(var(--app-standard-height)/3);margin:0}.gg-small-withtext img{width:calc(var(--app-standard-height)/3);margin-left:.5rem}.gg-small-withtext span{padding:0 .5rem 0 .3rem;font-size:.9rem}.gg-button:hover,.gg-select:hover,.gg-input:hover,.gg-textarea:hover,.gg-icon-button:hover{background-color:var(--bkg-color-grad1)}.gg-opacity{opacity:.5}.gg-opacity:hover{opacity:1;background-color:#0000}.gg-tabs{cursor:pointer;grid-auto-flow:column;padding-bottom:1rem;font-size:1rem;display:grid}.gg-tab{border:none;border-bottom:var(--app-standard-border);cursor:pointer;color:var(--text-color);background:0 0;padding:.5rem}.gg-tab.active{border-bottom:solid 1px var(--text-color)}.girafe-button-big,.girafe-button-large,.girafe-button-small,.girafe-button-tiny{color:var(--text-color);background-color:#0000;border:none;flex-direction:column;display:flex}.girafe-button-big:hover,.girafe-button-large:hover,.girafe-button-small:hover,.girafe-button-tiny:hover{background-color:var(--bkg-color-grad1);cursor:pointer}.girafe-button-big.dark,.girafe-button-large.dark,.girafe-button-small.dark,.girafe-button-tiny.dark{background-color:var(--bkg-color);filter:invert()}.girafe-button-big{width:var(--app-standard-height);height:var(--app-standard-height);align-items:center;padding:1rem}.girafe-button-big img{overflow:hidden}.girafe-button-large{flex-direction:row}.girafe-button-large img{height:2rem;margin:.3rem}.girafe-button-large span{height:2rem;margin:.3rem;line-height:2rem}.girafe-button-small{min-width:calc(var(--app-standard-height)/2);height:calc(var(--app-standard-height)/2);align-items:center;padding:.5rem}.girafe-button-small img{overflow:hidden}.girafe-button-small span{text-align:left;text-overflow:ellipsis;width:100%;overflow:hidden}.girafe-button-tiny{align-items:center;width:1rem;height:1rem;padding:0}.girafe-button-tiny img{overflow:hidden}
|
|
48
48
|
</style><style>
|
|
49
|
-
#container,#ol-map{background-color:var(--bkg-color);width:100%;height:100%;position:relative}#ol-map.darkmap canvas{filter:invert()hue-rotate(180deg)}.hidden{display:none}.center{text-align:center;margin:10px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}.loading span{color:var(--text-color);margin-top:1rem;font-weight:600;display:block}.loading span.quote{font-style:italic;font-weight:300}#cs-map{background-color:var(--bkg-color);border-left:3px solid #444;height:100%;display:none;position:absolute;overflow:hidden}.ol-control{background-color:#0000;border:none;box-shadow:0 1px 4px #0000004d;right:2rem!important;left:unset!important}.ol-zoom{top:2rem!important}.ol-rotate{top:9.3rem!important}.ol-location{top:7rem!important}.img-location{width:55%;height:auto}.ol-zoom-in,.ol-zoom-out,.btn-location,.ol-rotate-reset{cursor:pointer;background-color:#fff;width:2rem!important;height:2rem!important;font-size:1.2rem!important}.ol-scale-line{bottom:.5rem!important;right:1rem!important;left:unset!important}.ol-popup{background-color:var(--bkg-color);color:var(--text-color);box-shadow:0 1px 4px var(--bx-shdw);border:1px solid var(--text-color-grad1);border-radius:10px;min-width:140px;padding:15px;position:absolute;bottom:12px;left:-50px}.ol-popup:after,.ol-popup:before{content:" ";pointer-events:none;border:solid #0000;width:0;height:0;position:absolute;top:100%}.ol-popup:after{border-top-color:var(--bkg-color);border-width:10px;margin-left:-10px;left:48px}.ol-popup:before{border-top-color:var(--text-color-grad1);border-width:11px;margin-left:-11px;left:48px}.ol-popup-closer{background-color:var(--bkg-color);color:var(--text-color);cursor:pointer;text-decoration:none;position:absolute;top:2px;right:8px}.ol-popup-closer:after{content:"✖"}#swiper{width:
|
|
49
|
+
#container,#ol-map{background-color:var(--bkg-color);width:100%;height:100%;position:relative}#ol-map.darkmap canvas{filter:invert()hue-rotate(180deg)}.hidden{display:none}.center{text-align:center;margin:10px;position:absolute;top:50%;left:50%;transform:translate(-50%,-50%)}.loading span{color:var(--text-color);margin-top:1rem;font-weight:600;display:block}.loading span.quote{font-style:italic;font-weight:300}#cs-map{background-color:var(--bkg-color);border-left:3px solid #444;height:100%;display:none;position:absolute;overflow:hidden}.ol-control{background-color:#0000;border:none;box-shadow:0 1px 4px #0000004d;right:2rem!important;left:unset!important}.ol-zoom{top:2rem!important}.ol-rotate{top:9.3rem!important}.ol-location{top:7rem!important}.img-location{width:55%;height:auto}.ol-zoom-in,.ol-zoom-out,.btn-location,.ol-rotate-reset{cursor:pointer;background-color:#fff;width:2rem!important;height:2rem!important;font-size:1.2rem!important}.ol-scale-line{bottom:.5rem!important;right:1rem!important;left:unset!important}.ol-popup{background-color:var(--bkg-color);color:var(--text-color);box-shadow:0 1px 4px var(--bx-shdw);border:1px solid var(--text-color-grad1);border-radius:10px;min-width:140px;padding:15px;position:absolute;bottom:12px;left:-50px}.ol-popup:after,.ol-popup:before{content:" ";pointer-events:none;border:solid #0000;width:0;height:0;position:absolute;top:100%}.ol-popup:after{border-top-color:var(--bkg-color);border-width:10px;margin-left:-10px;left:48px}.ol-popup:before{border-top-color:var(--text-color-grad1);border-width:11px;margin-left:-11px;left:48px}.ol-popup-closer{background-color:var(--bkg-color);color:var(--text-color);cursor:pointer;text-decoration:none;position:absolute;top:2px;right:8px}.ol-popup-closer:after{content:"✖"}#swiper{width:100%;height:0;margin:0;display:none;position:absolute;top:50%}input[type=range]{-webkit-appearance:none;width:100%}input[type=range]::-webkit-slider-runnable-track{height:0}input[type=range]::-webkit-slider-thumb{-webkit-appearance:none;background:var(--bkg-color);cursor:ew-resize;border:2px solid #444;width:6px;height:0;margin-top:-1000px;padding-top:1000px;padding-bottom:1000px}input[type=range]::-moz-range-thumb{background:var(--bkg-color);cursor:ew-resize;border:2px solid #444;width:3px;height:0;padding-top:1000px;padding-bottom:1000px}.close-swiper{--button-size:2rem;transform:translateX(calc(-1*var(--button-size)/2));width:var(--button-size);height:var(--button-size);background-color:var(--bkg-color);color:var(--text-color);cursor:pointer;border-width:1px;border-radius:4px;display:none;position:absolute;top:0}.close-swiper:hover,.close-swiper:focus{outline:1px solid var(--text-color);color:var(--text-color-grad1)}.ol-viewport .tooltip{color:#fff;opacity:.7;white-space:nowrap;background:#00000080;border-radius:0;padding:.32rem .62rem;position:relative}@media screen and (hover:none){.ol-zoom,.ol-rotate,.ol-location{display:none!important}}.contextmenu{background-color:var(--bkg-color);color:var(--text-color);border:1px solid #ccc;box-shadow:1px 3px 4px #0006;& .hidden{display:none}& .menu-entry{cursor:pointer;padding:10px}& .menu-entry:hover{background-color:var(--bkg-color-grad1)}& .menu-entry[aria-disabled=true]{pointer-events:none;color:var(--text-color-grad1)}}
|
|
50
50
|
</style>
|
|
51
51
|
<link rel="stylesheet" href="lib/ol/ol.css"><div id="container"><div id="ol-map"></div><div class="ol-location ol-unselectable ol-control"><button onclick="${() => this.locateUser()}" class="btn-location"><img class="img-location" alt="location-icon" src="icons/adjust.svg"></button></div><div id="cs-map"><div class="${this.loading ? 'loading center' : 'loading hidden'}"><img alt="loading-icon" src="icons/loading.svg" class="gg-spin"> <span i18n="Loading cesium...">Loading cesium...</span> <span class="quote" i18n="cesium-loading-quote">Please be patient, like a giraffe reaching for the tastiest leaves.</span></div></div><input id="swiper" type="range" min="0" max="1000" step="1"> <button tip="Hide Swiper" id="close-swiper" class="close-swiper">×</button></div>`;
|
|
52
52
|
};
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":"1.0.
|
|
1
|
+
{"version":"1.0.2250838105", "build":"2250838105", "date":"08/01/2026"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
1
|
import GirafeSingleton from '../../base/GirafeSingleton.js';
|
|
2
2
|
declare class SnapManager extends GirafeSingleton {
|
|
3
|
-
private readonly
|
|
3
|
+
private readonly activeSnapLayers;
|
|
4
|
+
private inactiveSnapLayers;
|
|
4
5
|
private get olMap();
|
|
6
|
+
private get state();
|
|
5
7
|
initializeSingleton(): void;
|
|
6
8
|
private mapInteractionsChanged;
|
|
9
|
+
private activateSnappingForAllLayers;
|
|
10
|
+
private deactivateSnappingForAllLayers;
|
|
7
11
|
private layerUpdated;
|
|
8
12
|
private createSnapOptions;
|
|
9
13
|
private registerLayer;
|
|
@@ -4,10 +4,14 @@ import SelectionParam from '../../models/selectionparam.js';
|
|
|
4
4
|
import Snap from 'ol/interaction/Snap.js';
|
|
5
5
|
import { Collection } from 'ol';
|
|
6
6
|
class SnapManager extends GirafeSingleton {
|
|
7
|
-
|
|
7
|
+
activeSnapLayers = new Map();
|
|
8
|
+
inactiveSnapLayers = [];
|
|
8
9
|
get olMap() {
|
|
9
10
|
return this.context.mapManager.getMap();
|
|
10
11
|
}
|
|
12
|
+
get state() {
|
|
13
|
+
return this.context.stateManager.state;
|
|
14
|
+
}
|
|
11
15
|
initializeSingleton() {
|
|
12
16
|
this.context.stateManager.subscribe(/layers\.layersList\..*\.activeState/, (_oldActive, _newActive, layer) => {
|
|
13
17
|
this.layerUpdated(layer);
|
|
@@ -15,19 +19,41 @@ class SnapManager extends GirafeSingleton {
|
|
|
15
19
|
this.context.stateManager.subscribe(/layers\.layersList\..*\.snapActive/, (_oldSnap, _newSnap, layer) => {
|
|
16
20
|
this.layerUpdated(layer);
|
|
17
21
|
});
|
|
22
|
+
this.context.stateManager.subscribe('layers.isSnappingActive', (_, isSnappingActive) => {
|
|
23
|
+
if (isSnappingActive) {
|
|
24
|
+
this.activateSnappingForAllLayers();
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
this.deactivateSnappingForAllLayers();
|
|
28
|
+
}
|
|
29
|
+
});
|
|
18
30
|
this.olMap
|
|
19
31
|
.getInteractions()
|
|
20
32
|
.on('add', (event) => this.mapInteractionsChanged(event.element));
|
|
21
33
|
}
|
|
22
34
|
mapInteractionsChanged(interaction) {
|
|
23
35
|
if (!(interaction instanceof Snap)) {
|
|
24
|
-
this.
|
|
36
|
+
for (const options of this.activeSnapLayers.values()) {
|
|
25
37
|
// Snapping interactions have to be removed and readded, because they mut be the last ones in the list of interactions
|
|
26
38
|
// This is a limitation of OpenLayers. Otherwise the drawing interaction will prevail to the snapping one
|
|
27
39
|
// And snapping won't work when the drawing tool is changed.
|
|
28
40
|
this.olMap.removeInteraction(options.snapInteraction);
|
|
29
41
|
this.olMap.addInteraction(options.snapInteraction);
|
|
30
|
-
}
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
activateSnappingForAllLayers() {
|
|
46
|
+
for (const layer of this.inactiveSnapLayers) {
|
|
47
|
+
const snapOptions = this.createSnapOptions(layer);
|
|
48
|
+
this.registerLayer(layer, snapOptions);
|
|
49
|
+
}
|
|
50
|
+
this.inactiveSnapLayers = [];
|
|
51
|
+
}
|
|
52
|
+
deactivateSnappingForAllLayers() {
|
|
53
|
+
const layersToDeactivate = Array.from(this.activeSnapLayers.keys());
|
|
54
|
+
for (const layer of layersToDeactivate) {
|
|
55
|
+
this.unregisterLayer(layer);
|
|
56
|
+
this.inactiveSnapLayers.push(layer);
|
|
31
57
|
}
|
|
32
58
|
}
|
|
33
59
|
layerUpdated(layer) {
|
|
@@ -36,8 +62,13 @@ class SnapManager extends GirafeSingleton {
|
|
|
36
62
|
return;
|
|
37
63
|
}
|
|
38
64
|
if (layer.active && layer.snapActive) {
|
|
39
|
-
|
|
40
|
-
|
|
65
|
+
if (this.state.layers.isSnappingActive) {
|
|
66
|
+
const snapOptions = this.createSnapOptions(layer);
|
|
67
|
+
this.registerLayer(layer, snapOptions);
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
this.inactiveSnapLayers.push(layer);
|
|
71
|
+
}
|
|
41
72
|
}
|
|
42
73
|
else {
|
|
43
74
|
this.unregisterLayer(layer);
|
|
@@ -60,7 +91,7 @@ class SnapManager extends GirafeSingleton {
|
|
|
60
91
|
return snapOptions;
|
|
61
92
|
}
|
|
62
93
|
registerLayer(layer, snapOptions) {
|
|
63
|
-
this.
|
|
94
|
+
this.activeSnapLayers.set(layer, snapOptions);
|
|
64
95
|
this.loadFeaturesForLayer(layer, snapOptions);
|
|
65
96
|
snapOptions.snapInteraction.setActive(true);
|
|
66
97
|
this.olMap.addInteraction(snapOptions.snapInteraction);
|
|
@@ -68,23 +99,23 @@ class SnapManager extends GirafeSingleton {
|
|
|
68
99
|
this.olMap.getView().on('change', this.reloadFeatures.bind(this));
|
|
69
100
|
}
|
|
70
101
|
unregisterLayer(layer) {
|
|
71
|
-
const snapOptions = this.
|
|
102
|
+
const snapOptions = this.activeSnapLayers.get(layer);
|
|
72
103
|
if (snapOptions) {
|
|
73
104
|
snapOptions.snapInteraction.setActive(false);
|
|
74
105
|
snapOptions.snapFeatures.clear();
|
|
75
106
|
this.olMap.removeInteraction(snapOptions.snapInteraction);
|
|
76
|
-
this.
|
|
107
|
+
this.activeSnapLayers.delete(layer);
|
|
77
108
|
}
|
|
78
109
|
}
|
|
79
110
|
reloadFeatures() {
|
|
80
|
-
for (const [layer, options] of this.
|
|
111
|
+
for (const [layer, options] of this.activeSnapLayers) {
|
|
81
112
|
this.loadFeaturesForLayer(layer, options);
|
|
82
113
|
}
|
|
83
114
|
}
|
|
84
115
|
async loadFeaturesForLayer(layer, options) {
|
|
85
116
|
const client = this.context.wfsManager.getClient(layer.ogcServer);
|
|
86
117
|
const extent = this.olMap.getView().getViewStateAndExtent().extent;
|
|
87
|
-
const selectionParam = new SelectionParam(layer.ogcServer, [layer], this.
|
|
118
|
+
const selectionParam = new SelectionParam(layer.ogcServer, [layer], this.state.projection, extent);
|
|
88
119
|
const features = await client.getFeature(selectionParam);
|
|
89
120
|
options.snapFeatures.extend(features);
|
|
90
121
|
}
|