Skip to content

JS: Remove import from legacy #5953

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

Closed
wants to merge 1 commit into from
Closed

JS: Remove import from legacy #5953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions assets/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import executeJSFromServer from './modules/ExecuteJSFromServer.js';

import olDep from './dependencies/ol.js';
import litHTMLDep from './dependencies/lit-html.js';
import DOMPurify from 'dompurify';
import proj4 from 'proj4';

/**
Expand Down Expand Up @@ -86,6 +87,7 @@ const definedCustomElements = () => {
const initLizmapApp = () => {
lizMap.ol = olDep;
lizMap.litHTML = litHTMLDep;
lizMap.DOMPurify = DOMPurify;
lizMap.proj4 = proj4;

lizMap.events.on({
Expand Down
9 changes: 3 additions & 6 deletions assets/src/legacy/atlas.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
* @license MPL-2.0
*/

import DOMPurify from 'dompurify';
import { getCenter } from 'ol/extent.js';

(function () {

lizMap.events.on({
Expand Down Expand Up @@ -204,7 +201,7 @@ import { getCenter } from 'ol/extent.js';
}
}

$('#liz-atlas-select').html(DOMPurify.sanitize(options));
$('#liz-atlas-select').html(lizMap.DOMPurify.sanitize(options));
// reset val
$('#liz-atlas-select').val(val);
// get popup
Expand Down Expand Up @@ -403,7 +400,7 @@ import { getCenter } from 'ol/extent.js';
// Get Atlas home
var home = getAtlasHome(lizAtlasConfig);

$("#atlas-content").html(DOMPurify.sanitize(home));
$("#atlas-content").html(lizMap.DOMPurify.sanitize(home));

// Add events
activateAtlasTrigger(lizAtlasConfig);
Expand Down Expand Up @@ -566,7 +563,7 @@ import { getCenter } from 'ol/extent.js';
if (lizAtlasConfig['zoom']) {
if (lizAtlasConfig['zoom'].toLowerCase() == 'center') {
// center
const center = getCenter(olFeature.getGeometry().getExtent());
const center = lizMap.ol.extent.getCenter(olFeature.getGeometry().getExtent());
lizMap.map.setCenter(center);
}
else {
Expand Down
4 changes: 1 addition & 3 deletions assets/src/legacy/attributeTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
* @license MPL-2.0
*/

import DOMPurify from 'dompurify';

var lizAttributeTable = function() {

const intRegex = /^[0-9]+$/;
Expand Down Expand Up @@ -1927,7 +1925,7 @@ var lizAttributeTable = function() {
continue;
var prop = feat.properties[idx];
if (typeof prop == 'string') {
prop = DOMPurify.sanitize(prop, {
prop = lizMap.DOMPurify.sanitize(prop, {
ADD_ATTR: ['target']
});
}
Expand Down
4 changes: 1 addition & 3 deletions assets/src/legacy/filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
* @license MPL-2.0
*/

import DOMPurify from 'dompurify';

var lizLayerFilterTool = function () {

lizMap.events.on({
Expand Down Expand Up @@ -528,7 +526,7 @@ var lizLayerFilterTool = function () {
}

for (const feat of result) {
globalThis['filterConfig'][field_item.order]['items'][DOMPurify.sanitize(feat['v'].toString())] = feat['c'];
globalThis['filterConfig'][field_item.order]['items'][lizMap.DOMPurify.sanitize(feat['v'].toString())] = feat['c'];
}

var dhtml = '';
Expand Down
24 changes: 8 additions & 16 deletions assets/src/legacy/map.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@
* @license MPL-2.0
*/

import { extend } from 'ol/extent.js';

import WFS from '../modules/WFS.js';
import WMS from '../modules/WMS.js';
import { Utils } from '../modules/Utils.js';

window.lizMap = function() {
/**
* PRIVATE Property: config
Expand Down Expand Up @@ -2082,7 +2076,7 @@ window.lizMap = function() {
// Download file
document.querySelectorAll('.exportLayer').forEach(el => el.disabled = true);
mAddMessage(lizDict['layer.export.started'], 'info', true).addClass('export-in-progress');
Utils.downloadFile(getFeatureUrlData['url'], getFeatureUrlData['options'], () => {
lizMap.mainLizmap.utils.downloadFile(getFeatureUrlData['url'], getFeatureUrlData['options'], () => {
document.querySelectorAll('.exportLayer').forEach(el => el.disabled = false);
document.querySelector('#message .export-in-progress button').click();
});
Expand Down Expand Up @@ -2301,8 +2295,8 @@ window.lizMap = function() {
types: aConfig['types']
};

const wfs = new WFS();
wfs.getFeature(getFeatureUrlData['options']).then(data => {
// get the data
lizMap.mainLizmap.wfs.getFeature(getFeatureUrlData['options']).then(data => {
aConfig['featureCrs'] = 'EPSG:4326';

if (aConfig?.['alias'] && aConfig?.['types']) {
Expand Down Expand Up @@ -2522,7 +2516,7 @@ window.lizMap = function() {

// Query the server
$.post(globalThis['lizUrls'].service, wmsOptions, function(data) {
aCallback(Utils.sanitizeGFIContent(data));
aCallback(lizMap.mainLizmap.utils.sanitizeGFIContent(data));
});
}

Expand Down Expand Up @@ -2596,7 +2590,7 @@ window.lizMap = function() {
// Query the server
$.post(globalThis['lizUrls'].service, wmsOptions, function(data) {
if (aCallback) {
aCallback(globalThis['lizUrls'].service, wmsOptions, Utils.sanitizeGFIContent(data));
aCallback(globalThis['lizUrls'].service, wmsOptions, lizMap.mainLizmap.utils.sanitizeGFIContent(data));
}
});
}
Expand Down Expand Up @@ -3249,25 +3243,23 @@ window.lizMap = function() {
if(layerName && filter){

// Feature extent
const wfs = new WFS();
const wfsParams = {
TYPENAME: layerName,
EXP_FILTER: filter
};

featureExtentRequest = wfs.getFeature(wfsParams);
featureExtentRequest = lizMap.mainLizmap.wfs.getFeature(wfsParams);

// Feature info
if(urlParameters.get('popup') === 'true'){
const wms = new WMS();
const wmsParams = {
QUERY_LAYERS: layerName,
LAYERS: layerName,
FEATURE_COUNT: 50, // TODO: get this value from config after it has been loaded?
FILTER: `${layerName}:${filter}`,
};

getFeatureInfoRequest = wms.getFeatureInfo(wmsParams);
getFeatureInfoRequest = lizMap.mainLizmap.wms.getFeatureInfo(wmsParams);
}
}

Expand Down Expand Up @@ -3302,7 +3294,7 @@ window.lizMap = function() {

if(featuresExtent){
for (const feature of startupFeatures) {
featuresExtent = extend(featuresExtent, feature.bbox);
featuresExtent = lizMap.ol.extent.extend(featuresExtent, feature.bbox);
}
}

Expand Down
Loading