umap-project 2.7.2__py3-none-any.whl → 2.8.0__py3-none-any.whl

umap/static/umap/js/modules/urls.js

@@ -25,8 +25,8 @@ export default class URLs {
   }
 
   // Update the layer if pk is passed, create otherwise.
-  datalayer_save({ map_id, pk }, ...options) {
-    if (pk) return this.get('datalayer_update', { map_id, pk }, ...options)
+  datalayer_save({ map_id, pk, created }, ...options) {
+    if (created) return this.get('datalayer_update', { map_id, pk }, ...options)
     return this.get('datalayer_create', { map_id, pk }, ...options)
   }
 }

umap/static/umap/js/modules/utils.js

@@ -25,6 +25,14 @@ export function checkId(string) {
   return /^[A-Za-z0-9]{5}$/.test(string)
 }
 
+function _getPropertyName(field) {
+  const filtered_field = ['options.', 'properties.'].reduce(
+    (acc, prefix) => acc.replace(prefix, ''),
+    field
+  )
+  return filtered_field.split('.')[0]
+}
+
 /**
  * Compute the impacts for a given list of fields.
  *
@@ -41,7 +49,7 @@ export function getImpactsFromSchema(fields, schema) {
       // remove the option prefix for fields
       // And only keep the first part in case of a subfield
       // (e.g "options.limitBounds.foobar" will just return "limitBounds")
-      return field.replace('options.', '').split('.')[0]
+      return _getPropertyName(field)
     })
     .reduce((acc, field) => {
       // retrieve the "impacts" field from the schema
@@ -66,7 +74,7 @@ export function getImpactsFromSchema(fields, schema) {
 export function fieldInSchema(field, schema) {
   const current_schema = schema || U.SCHEMA
   if (typeof field !== 'string') return false
-  const field_name = field.replace('options.', '').split('.')[0]
+  const field_name = _getPropertyName(field)
   return current_schema[field_name] !== undefined
 }
 
@@ -107,6 +115,8 @@ export function escapeHTML(s) {
       'span',
       'dt',
       'dd',
+      'b',
+      'i',
     ],
     ADD_ATTR: [
       'target',
@@ -166,15 +176,15 @@ export function toHTML(r, options) {
 
   // iframe
   r = r.replace(
-    /{{{(h_t_t_ps?[^ |{]*)}}}/g,
+    /{{{(h_t_t_ps?[^|{]*)}}}/g,
     '<div><iframe frameborder="0" src="$1" width="100%" height="300px"></iframe></div>'
   )
   r = r.replace(
-    /{{{(h_t_t_ps?[^ |{]*)\|(\d*)(px)?}}}/g,
+    /{{{(h_t_t_ps?[^|{]*)\|(\d*)(px)?}}}/g,
     '<div><iframe frameborder="0" src="$1" width="100%" height="$2px"></iframe></div>'
   )
   r = r.replace(
-    /{{{(h_t_t_ps?[^ |{]*)\|(\d*)(px)?\*(\d*)(px)?}}}/g,
+    /{{{(h_t_t_ps?[^|{]*)\|(\d*)(px)?\*(\d*)(px)?}}}/g,
     '<div><iframe frameborder="0" src="$1" width="$4px" height="$2px"></iframe></div>'
   )
 
@@ -284,7 +294,7 @@ export function naturalSort(a, b, lang) {
 }
 
 export function sortFeatures(features, sortKey, lang) {
-  const sortKeys = (sortKey || 'name').split(',')
+  const sortKeys = sortKey.split(',')
 
   const sort = (a, b, i) => {
     let sortKey = sortKeys[i]
@@ -430,3 +440,9 @@ export function deepEqual(object1, object2) {
 export function slugify(str) {
   return (str || 'data').replace(/[^a-z0-9]/gi, '_').toLowerCase()
 }
+
+export function eachElement(selector, callback) {
+  for (const el of document.querySelectorAll(selector)) {
+    callback(el)
+  }
+}