Zoom to features with a max scale constraint #4897

nboisteault · 2024-10-21T15:41:22Z

No description provided.

Ref: https://openlayers.org/en/latest/apidoc/module-ol_View-View.html#fit

rldhont

remove lizMap from LocateByLayer module.

rldhont · 2024-12-03T17:16:26Z

assets/src/modules/LocateByLayer.js

+    constructor() {
+        this._locateByLayerConfig = lizMap.config.locateByLayer;
+        const locateBtn = document.getElementById('button-locate');
+        if (mainLizmap.initialConfig.locateByLayer) {


Suggested change

constructor() {

this._locateByLayerConfig = lizMap.config.locateByLayer;

const locateBtn = document.getElementById('button-locate');

if (mainLizmap.initialConfig.locateByLayer) {

/**

* Build the lizmap LocateByLayer instance

* @param {LocateByLayerConfig} locateByLayer - The lizmap locateByLayer config

* @param {WfsFeatureType[]} vectorLayerFeatureTypeList - The list of WFS feature type

* @param {Map} map - OpenLayers map

* @param {object} lizmap3 - The old lizmap object

*/

constructor(locateByLayer, vectorLayerFeatureTypeList, map, lizmap3) {

this._map = map;

this._vectorLayerFeatureTypeList = vectorLayerFeatureTypeList;

this._lizmap3 = lizmap3;

this._lizmap3LocateByLayerConfig = lizmap3.config.locateByLayer;

const locateBtn = document.getElementById('button-locate');

if (locateByLayer) {

rldhont · 2024-12-03T17:17:02Z

assets/src/modules/LocateByLayer.js

+        for (var lname in this._locateByLayerConfig) {
+            if ('order' in this._locateByLayerConfig[lname])
+                locateByLayerList[this._locateByLayerConfig[lname].order] = lname;


Suggested change

for (var lname in this._locateByLayerConfig) {

if ('order' in this._locateByLayerConfig[lname])

locateByLayerList[this._locateByLayerConfig[lname].order] = lname;

for (var lname in this._lizmap3LocateByLayerConfig) {

if ('order' in this._lizmap3ocateByLayerConfig[lname])

locateByLayerList[this._lizmap3ocateByLayerConfig[lname].order] = lname;

rldhont · 2024-12-03T17:17:54Z

assets/src/modules/LocateByLayer.js

+        var locateContent = [];
+        for (var l in locateByLayerList) {
+            var lname = locateByLayerList[l];
+            var lConfig = lizMap.config.layers[lname];


Suggested change

var lConfig = lizMap.config.layers[lname];

var lConfig = this._lizmap3.config.layers[lname];

rldhont · 2024-12-03T17:18:13Z

assets/src/modules/LocateByLayer.js

+            var lname = locateByLayerList[l];
+            var lConfig = lizMap.config.layers[lname];
+            var html = '<div class="locate-layer">';
+            html += '<select id="locate-layer-' + lizMap.cleanName(lname) + '" class="label">';


Suggested change

html += '<select id="locate-layer-' + lizMap.cleanName(lname) + '" class="label">';

html += '<select id="locate-layer-' + this._lizmap3.cleanName(lname) + '" class="label">';

rldhont · 2024-12-03T17:19:05Z

assets/src/modules/LocateByLayer.js

+
+        var featureTypes = lizMap.mainLizmap.initialConfig.vectorLayerFeatureTypeList;
+        if (featureTypes.length == 0) {
+            this._locateByLayerConfig = {};


Suggested change

this._locateByLayerConfig = {};

this._lizmap3LocateByLayerConfig = {};

rldhont · 2024-12-03T17:29:18Z

assets/src/modules/LocateByLayer.js

+                this.getLocateFeature(lname);
+            }
+            $('.btn-locate-clear').click(function () {
+                lizMap.mainLizmap.map.clearHighlightFeatures();


Suggested change

lizMap.mainLizmap.map.clearHighlightFeatures();

this._map.clearHighlightFeatures();

rldhont · 2024-12-03T17:29:40Z

assets/src/modules/LocateByLayer.js

+     */
+    zoomToLocateFeature(aName) {
+        // clear highlight layer
+        lizMap.mainLizmap.map.clearHighlightFeatures();


Suggested change

lizMap.mainLizmap.map.clearHighlightFeatures();

this._map.clearHighlightFeatures();

rldhont · 2024-12-03T17:31:18Z

assets/src/modules/LocateByLayer.js

+                        lizMap.mainLizmap.map.setHighlightFeatures(data.features[0], "geojson");
+                    }).fail(function(){
+                        lizMap.mainLizmap.map.setHighlightFeatures(feat, "geojson");
+                    });
+                }
+                // zoom to extent
+                lizMap.mainLizmap.map.zoomToGeometryOrExtent(geom);


Suggested change

lizMap.mainLizmap.map.setHighlightFeatures(data.features[0], "geojson");

}).fail(function(){

lizMap.mainLizmap.map.setHighlightFeatures(feat, "geojson");

});

}

// zoom to extent

lizMap.mainLizmap.map.zoomToGeometryOrExtent(geom);

this._map.setHighlightFeatures(data.features[0], "geojson");

}).fail(function(){

this._map.setHighlightFeatures(feat, "geojson");

});

}

// zoom to extent

this._map.zoomToGeometryOrExtent(geom);

rldhont · 2024-12-03T17:33:56Z

assets/src/modules/LocateByLayer.js

+        }
+        $('#locate .menu-content').html(locateContent.join('<hr/>'));
+
+        var featureTypes = lizMap.mainLizmap.initialConfig.vectorLayerFeatureTypeList;


Suggested change

var featureTypes = lizMap.mainLizmap.initialConfig.vectorLayerFeatureTypeList;

var featureTypes = this._vectorLayerFeatureTypeList;

rldhont · 2024-12-03T17:36:01Z

assets/src/modules/Lizmap.js

@@ -167,6 +168,7 @@ export default class Lizmap {
                this.legend = new Legend();
                this.search = new Search();
                this.tooltip = new Tooltip();
+                this.locateByLayer = new LocateByLayer();


Suggested change

this.locateByLayer = new LocateByLayer();

this.locateByLayer = new LocateByLayer(

this.initialConfig.locateByLayer,

this.initialConfig.vectorLayerFeatureTypeList,

this.map,

this._lizmap3

);

nboisteault added backport release_3_9 run end2end If the PR must run end2end tests or not labels Oct 21, 2024

github-actions bot added this to the 3.10.0 milestone Oct 21, 2024

Gustry added sponsored development This development has been funded javascript Pull requests that update Javascript code labels Oct 22, 2024

nboisteault force-pushed the zoom_to_feature_max_scale branch 5 times, most recently from 69fc9de to 6fde4c4 Compare October 24, 2024 14:08

nboisteault added 2 commits November 12, 2024 10:35

API: expose a zoomToGeometryOrExtent function like OL fit() function

7fbd5fe

Ref: https://openlayers.org/en/latest/apidoc/module-ol_View-View.html#fit

Refactor LocateByLayer in a module

7ec6d79

nboisteault force-pushed the zoom_to_feature_max_scale branch from 6fde4c4 to 2ee3906 Compare November 12, 2024 09:36

nboisteault marked this pull request as ready for review November 12, 2024 10:40

Apply max scale constraint in zoomToGeometryOrExtent function

afb5933

nboisteault force-pushed the zoom_to_feature_max_scale branch from 0a4357e to 666a3f6 Compare November 12, 2024 10:59

nboisteault added 2 commits November 13, 2024 10:12

Refactor to use zoomToGeometryOrExtent and zoomToFid

afb0daf

Finish locateByLayer refactoring

e4b1946

nboisteault force-pushed the zoom_to_feature_max_scale branch from 666a3f6 to e4b1946 Compare November 13, 2024 09:12

Refactor zoomToOlFeature to use OL10 map

852d60b

nboisteault requested review from Gustry and mdouchin November 14, 2024 10:11

rldhont requested changes Dec 3, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Zoom to features with a max scale constraint #4897

Zoom to features with a max scale constraint #4897

nboisteault commented Oct 21, 2024

rldhont left a comment

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

rldhont Dec 3, 2024

-    constructor() {
-        this._locateByLayerConfig = lizMap.config.locateByLayer;
-        const locateBtn = document.getElementById('button-locate');
-        if (mainLizmap.initialConfig.locateByLayer) {
+    /**
+     * Build the lizmap LocateByLayer instance
+     * @param {LocateByLayerConfig} locateByLayer - The lizmap locateByLayer config
+     * @param {WfsFeatureType[]} vectorLayerFeatureTypeList - The list of WFS feature type
+     * @param {Map}           map           - OpenLayers map
+     * @param {object}        lizmap3       - The old lizmap object
+     */
+    constructor(locateByLayer, vectorLayerFeatureTypeList, map, lizmap3) {
+        this._map = map;
+        this._vectorLayerFeatureTypeList = vectorLayerFeatureTypeList;
+        this._lizmap3 = lizmap3;
+        this._lizmap3LocateByLayerConfig = lizmap3.config.locateByLayer;
+        const locateBtn = document.getElementById('button-locate');
+        if (locateByLayer) {

	var lConfig = lizMap.config.layers[lname];
	var lConfig = this._lizmap3.config.layers[lname];

	html += '<select id="locate-layer-' + lizMap.cleanName(lname) + '" class="label">';
	html += '<select id="locate-layer-' + this._lizmap3.cleanName(lname) + '" class="label">';

	this._locateByLayerConfig = {};
	this._lizmap3LocateByLayerConfig = {};

	lizMap.mainLizmap.map.clearHighlightFeatures();
	this._map.clearHighlightFeatures();

	var featureTypes = lizMap.mainLizmap.initialConfig.vectorLayerFeatureTypeList;
	var featureTypes = this._vectorLayerFeatureTypeList;

Zoom to features with a max scale constraint #4897

Are you sure you want to change the base?

Zoom to features with a max scale constraint #4897

Conversation

nboisteault commented Oct 21, 2024

rldhont left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment