From 5977424a5fc82cdfa0adbf105239bf02e59426c8 Mon Sep 17 00:00:00 2001 From: dbauszus-glx Date: Fri, 26 Jan 2024 18:33:44 +0000 Subject: [PATCH 1/7] Check whether a plugin string endsWith some value from an array --- lib/utils/loadPlugins.mjs | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/lib/utils/loadPlugins.mjs b/lib/utils/loadPlugins.mjs index 67b6134c28..c855ae8b82 100644 --- a/lib/utils/loadPlugins.mjs +++ b/lib/utils/loadPlugins.mjs @@ -1,26 +1,28 @@ -export default plugins => { +export default (plugins, endsWith = ['.js','.mjs']) => { if (!Array.isArray(plugins)) return; - - return new Promise(resolveAll=>{ - const promises = plugins.map( - plugin => - new Promise((resolve, reject) => - import(plugin) - .then(mod=> { - resolve(mod) - }) - .catch(()=> { - reject() - }))) + return new Promise(resolveAll => { + + const promises = plugins + .filter(plugin => endsWith.some(_this => plugin.endsWith(_this))) + .map( + plugin => + new Promise((resolve, reject) => + import(plugin) + .then(mod => { + resolve(mod) + }) + .catch(() => { + reject() + }))) Promise .allSettled(promises) - .then(()=>{ + .then(() => { resolveAll() }) - .catch(err=>{ + .catch(err => { console.error(err) resolveAll() }) From 879988b9ded9c2dcc6072ff7919fb79fe7d7c396 Mon Sep 17 00:00:00 2001 From: dbauszus-glx Date: Mon, 29 Jan 2024 10:22:14 +0000 Subject: [PATCH 2/7] Replace custom clone util with structuredClone --- lib/layer/Style.mjs | 4 ++-- lib/layer/themes/graduated.mjs | 2 +- lib/utils/_utils.mjs | 4 ---- lib/utils/clone.mjs | 25 ------------------------- 4 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 lib/utils/clone.mjs diff --git a/lib/layer/Style.mjs b/lib/layer/Style.mjs index 0be9781eac..d7420f7d75 100644 --- a/lib/layer/Style.mjs +++ b/lib/layer/Style.mjs @@ -52,7 +52,7 @@ export default layer => { } // Assign default style as feature.style. - feature.style = { ...mapp.utils.clone(layer.style.default), ...layer.style.theme?.style } + feature.style = { ...structuredClone(layer.style.default), ...layer.style.theme?.style } // Check whether feature is in lookup. if (Array.isArray(layer.featureLookup)) { @@ -75,7 +75,7 @@ export default layer => { if (feature.geometryType === 'Point') { // The style must be cloned as icon if not otherwise defined to prevent circular reference - feature.style.icon ??= mapp.utils.clone(feature.style) + feature.style.icon ??= structuredClone(feature.style) // Assign cluster style. if (feature.properties.count > 1 && layer.style.cluster) { diff --git a/lib/layer/themes/graduated.mjs b/lib/layer/themes/graduated.mjs index 1126fc93ad..aad39dd4e2 100644 --- a/lib/layer/themes/graduated.mjs +++ b/lib/layer/themes/graduated.mjs @@ -19,7 +19,7 @@ export default function(theme, feature) { if (catValue <= parseFloat(theme.cat_arr[i].value)) break; // Set cat_style to current cat style after value check. - var catStyle = mapp.utils.clone(theme.cat_arr[i].style || theme.cat_arr[i]) + var catStyle = structuredClone(theme.cat_arr[i].style || theme.cat_arr[i]) delete catStyle.label } diff --git a/lib/utils/_utils.mjs b/lib/utils/_utils.mjs index 7857c273db..8bcdf902d1 100644 --- a/lib/utils/_utils.mjs +++ b/lib/utils/_utils.mjs @@ -5,9 +5,6 @@ import * as stats from 'simple-statistics' const areSetsEqual = (a, b) => a.size === b.size && [...a].every(value => b.has(value)) -// local import -import clone from './clone.mjs' - import csvDownload from './csvDownload.mjs' const compose = (...fns) => { @@ -69,7 +66,6 @@ export default { svg, convert, areSetsEqual, - clone, compose, copyToClipboard, csvDownload, diff --git a/lib/utils/clone.mjs b/lib/utils/clone.mjs deleted file mode 100644 index 1d270b7ce8..0000000000 --- a/lib/utils/clone.mjs +++ /dev/null @@ -1,25 +0,0 @@ -export default function clone(target, map = new WeakMap()) { - - // Return the value if target is not an object or null - if (target === null - || typeof target !== 'object' - || typeof target === 'function' - || target instanceof HTMLElement) { - return target - } - - // Check whether target is an array. - let cloneTarget = Array.isArray(target) ? [] : {}; - - // Use WeakMap to prevent circular references. - if (map.get(target)) { - return map.get(target); - } - map.set(target, cloneTarget); - - for (const key in target) { - cloneTarget[key] = clone(target[key], map); - } - - return cloneTarget; -}; \ No newline at end of file From 7b91407b2f7dd422733bc1b338ce9e8c68ff7369 Mon Sep 17 00:00:00 2001 From: dbauszus-glx Date: Mon, 29 Jan 2024 12:48:49 +0000 Subject: [PATCH 3/7] Add map-attribution to mapview --- lib/mapview/_mapview.mjs | 34 ++++------------------------------ lib/mapview/attribution.mjs | 34 ++++++++++++++++++++++++++++++++++ public/css/_mapp.css | 12 ++++++++++++ public/css/mapp.css | 11 +++++++++++ public/views/_default.html | 26 ++++++-------------------- public/views/_default.js | 6 ++++-- 6 files changed, 71 insertions(+), 52 deletions(-) create mode 100644 lib/mapview/attribution.mjs diff --git a/lib/mapview/_mapview.mjs b/lib/mapview/_mapview.mjs index 85b2ecd2b6..d097f69093 100644 --- a/lib/mapview/_mapview.mjs +++ b/lib/mapview/_mapview.mjs @@ -1,3 +1,5 @@ +import attribution from './attribution.mjs' + import addLayer from './addLayer.mjs' import fitView from './fitView.mjs' @@ -185,36 +187,8 @@ export default (mapview) => { units: mapview.locale.ScaleLine === 'imperial' ? 'imperial' : 'metric', })) - // Attribution - if (mapview.attribution) { - - if (typeof mapview.attribution !== 'object') { - mapview.attribution = {} - } - - mapview.attribution.target = mapview.attribution.target - || mapview.Map.getTargetElement() - .appendChild(mapp.utils.html.node` -
`) - - mapview.attribution.check = () => { - - const o = Object.assign({}, mapview.attribution.links || {}) - - // Iterate through layers to check whether attribution should be displayed. - Object.values(mapview.layers).forEach(layer => { - layer.display && layer.attribution && Object.assign( - o, layer.attribution) - }) - - // Render the layer attribution links into the placeholder. - mapp.utils.render(mapview.attribution.target, - mapp.utils.html`${Object.entries(o) - .map(entry => mapp.utils.html` - ${entry[0]}`)}`) - - } - } + // Create mapview attribution. + attribution(mapview) // Events diff --git a/lib/mapview/attribution.mjs b/lib/mapview/attribution.mjs new file mode 100644 index 0000000000..c41df27451 --- /dev/null +++ b/lib/mapview/attribution.mjs @@ -0,0 +1,34 @@ +export default function attribution(mapview) { + + if (typeof mapview.attribution !== 'object') return; + + if (!mapview.attribution.target) { + + mapview.attribution.node = mapview.target.appendChild( + mapp.utils.html.node`
+ ${mapview.attribution.logo}`) + + mapview.attribution.target = mapview.attribution.node + .appendChild(mapp.utils.html.node`
`) + } + + mapview.attribution.links ??= {} + + mapview.attribution.check = () => { + + const links = structuredClone(mapview.attribution.links) + + // Iterate through layers to check whether attribution should be displayed. + Object.values(mapview.layers) + .filter(layer => !!layer.display) + .filter(layer => !!layer.attribution) + .forEach(layer => Object.assign(links, layer.attribution)) + + // Render the layer attribution links into the placeholder. + mapp.utils.render(mapview.attribution.target, + mapp.utils.html`${Object.entries(links) + .map(entry => mapp.utils.html` + ${entry[0]}`)}`) + + } +} \ No newline at end of file diff --git a/public/css/_mapp.css b/public/css/_mapp.css index 1bbfed114b..f2a243bc9d 100644 --- a/public/css/_mapp.css +++ b/public/css/_mapp.css @@ -142,6 +142,18 @@ a > img { height: 100%; } +.map-attribution { + position: absolute; + display: flex; + justify-content: space-between; + align-items: end; + bottom: 0; + right: 0; + width: 100%; + padding: 5px; + pointer-events: none; +} + .attribution-links { z-index: 999; text-align: right; diff --git a/public/css/mapp.css b/public/css/mapp.css index 511a0706fb..282bd46570 100644 --- a/public/css/mapp.css +++ b/public/css/mapp.css @@ -135,6 +135,17 @@ body { a > img { height: 100%; } +.map-attribution { + position: absolute; + display: flex; + justify-content: space-between; + align-items: end; + bottom: 0; + right: 0; + width: 100%; + padding: 5px; + pointer-events: none; +} .attribution-links { z-index: 999; text-align: right; diff --git a/public/views/_default.html b/public/views/_default.html index 2f4272caf6..ce7dfcca71 100644 --- a/public/views/_default.html +++ b/public/views/_default.html @@ -44,19 +44,7 @@ position: fixed; } - #Attribution { - position: absolute; - display: flex; - justify-content: space-between; - align-items: end; - bottom: 0; - right: 0; - width: 100%; - padding: 5px; - pointer-events: none; - } - - #Attribution > .logo { + .map-attribution > .logo { pointer-events: auto; height: 1em; } @@ -155,7 +143,7 @@ position: absolute; } - #Attribution { + .map-attribution { padding-left: 4em; } @@ -293,14 +281,12 @@
- +
-
diff --git a/public/views/_default.js b/public/views/_default.js index de6966d920..4732125175 100644 --- a/public/views/_default.js +++ b/public/views/_default.js @@ -296,12 +296,14 @@ window.onload = async () => { hooks: true, scrollWheelZoom: true, attribution: { - target: document.querySelector('#Attribution > .attribution-links'), + logo: mapp.utils.html.node` + ${entry[0]}`) + // Render all links into mapview.attribution.target. - mapp.utils.render(mapview.attribution.target, - mapp.utils.html`${Object.entries(links) - .map(entry => mapp.utils.html` - ${entry[0]}`)}`) + mapp.utils.render( + mapview.attribution.target, + mapp.utils.html.node`${elements}`) } } \ No newline at end of file From 63b4e7dbe7df8701a22ea5dd912ed232e0ee8d2c Mon Sep 17 00:00:00 2001 From: dbauszus-glx Date: Mon, 29 Jan 2024 14:50:24 +0000 Subject: [PATCH 7/7] Remove unnecessary checks --- mod/workspace/_workspace.js | 12 +++--------- mod/workspace/getLocale.js | 4 +--- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/mod/workspace/_workspace.js b/mod/workspace/_workspace.js index c31f547852..36d592299a 100644 --- a/mod/workspace/_workspace.js +++ b/mod/workspace/_workspace.js @@ -91,15 +91,9 @@ async function locale(req, res) { } if (locale instanceof Error) { - return res.status(400).send('Failed to access locale.') + return res.status(400).send(locale.message) } - const roles = req.params.user?.roles || [] - - if (!Roles.check(locale, roles)) { - return res.status(403).send('Role access denied.') - } - // Subtitutes ${*} with process.env.SRC_* key values. locale = JSON.parse( JSON.stringify(locale).replace(/\$\{(.*?)\}/g, @@ -114,11 +108,11 @@ async function locale(req, res) { for (const key of Object.keys(locale.layers)) { const layer = await getLayer({ - locale: req.params.locale, + ...req.params, layer: key }) - if (!Roles.check(layer, roles)) continue; + if (layer instanceof Error) continue; layers.push(layer) } diff --git a/mod/workspace/getLocale.js b/mod/workspace/getLocale.js index 483fc3cf3a..1ce734949a 100644 --- a/mod/workspace/getLocale.js +++ b/mod/workspace/getLocale.js @@ -20,9 +20,7 @@ module.exports = async (params) => { let locale = workspace.locales[params.locale] - const roles = params.user?.roles || [] - - if (!Roles.check(locale, roles)) { + if (!Roles.check(locale, params.user?.roles)) { return new Error('Role access denied.') }