umap-project 2.2.2__py3-none-any.whl → 2.3.1__py3-none-any.whl

umap/static/umap/locale/zh_TW.js

@@ -83,7 +83,6 @@ const locale = {
     "color": "色彩",
     "Comma separated list of numbers, including min and max values.": "用逗號分隔數字，包括最小與最大值。",
     "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.": "用逗號分隔屬性清單來排序圖徵。要保存排序，在槊面加上減號 (-1)，例如 mykey,-otherkey。",
-    "Comma separated list of properties to use when filtering features": "以逗號分開列出篩選時要使用的屬性",
     "Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.": "使用逗號、定位鍵或是分號分隔的地理數據。預設座標系為 SRS WGS84。只會匯入地理座標點。匯入時抓取 «lat» 與 «lon» 開頭的欄位資料，不分大小寫。其他欄位則歸入屬性資料。",
     "Congratulations, your map has been created!": "恭喜您的地圖已經新增完成",
     "Continue line": "連續線段",
@@ -96,7 +95,6 @@ const locale = {
     "Custom background": "自訂背景",
     "Custom overlay": "客制套疊",
     "dash array": "虛線排列",
-    "Data browser": "資料檢視器",
     "Data is browsable": "資料是可檢視的",
     "Datalayers": "資料圖層",
     "Default interaction options": "預設互動選項",
@@ -165,16 +163,12 @@ const locale = {
     "Exit Fullscreen": "結束全螢幕模式",
     "expanded": "展開",
     "Extract shape to separate feature": "由外形分離出圖徵",
-    "Facet keys": "方面鍵",
-    "Facet search": "方面搜尋",
     "Feature identifier key": "Feature identifier key",
     "Feature properties": "圖徵屬性",
     "Fetch data each time map view changes.": "每次地圖檢視改變時截取資料。",
     "fill color": "填入色彩",
     "fill opacity": "填入不透明度",
     "fill": "填入",
-    "Filter keys": "篩選鍵",
-    "Filter": "篩選器",
     "Fit all data": "檢視所有資料",
     "Format": "格式",
     "From zoom": "由縮放大小",
@@ -267,7 +261,6 @@ const locale = {
     "NM": "NM",
     "No cache": "沒有快取内容",
     "No licence has been set": "尚未設定授權條例",
-    "No results for these facets": "各方面沒有結果",
     "No results": "沒有結果",
     "no": "否",
     "No.": "無。",
@@ -332,7 +325,6 @@ const locale = {
     "See layers": "See layers",
     "See full screen": "觀看全螢幕",
     "See on OpenStreetMap": "在開放街圖檢視",
-    "Select data": "Select data",
     "Send me the link": "寄送連結給我",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "設定為假時，在幻燈片時、資料檢視器和彈出式導航中可將此圖層隱藏...",
     "settings": "設定",
@@ -434,9 +426,7 @@ const locale = {
     "Edit map details": "Edit map details",
     "Back to browser": "Back to browser",
     "Toggle size": "Toggle size",
-    "Layers": "Layers",
     "Display the caption control": "Display the caption control",
-    "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
     "<empty value>": "<empty value>",
     "Min": "Min",
     "Max": "Max",
@@ -446,8 +436,17 @@ const locale = {
     "Edit in OpenStreetMap": "Edit in OpenStreetMap",
     "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns.",
     "Back to layers": "Back to layers",
-    "Data": "Data",
-    "Filters": "Filters"
+    "Filters": "Filters",
+    "Comma separated list of properties to use when filtering features by text input": "Comma separated list of properties to use when filtering features by text input",
+    "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
+    "Search keys": "Search keys",
+    "Filters keys": "Filters keys",
+    "Filter data": "Filter data",
+    "Search map features…": "Search map features…",
+    "Reset all": "Reset all",
+    "Browser in data mode": "Browser in data mode",
+    "Browser in layers mode": "Browser in layers mode",
+    "Browser in filters mode": "Browser in filters mode"
 }
 L.registerLocale("zh_TW", locale)
 L.setLocale("zh_TW")

umap/static/umap/locale/zh_TW.json

@@ -83,7 +83,6 @@
     "color": "色彩",
     "Comma separated list of numbers, including min and max values.": "用逗號分隔數字，包括最小與最大值。",
     "Comma separated list of properties to use for sorting features. To reverse the sort, put a minus sign (-) before. Eg. mykey,-otherkey.": "用逗號分隔屬性清單來排序圖徵。要保存排序，在槊面加上減號 (-1)，例如 mykey,-otherkey。",
-    "Comma separated list of properties to use when filtering features": "以逗號分開列出篩選時要使用的屬性",
     "Comma, tab or semi-colon separated values. SRS WGS84 is implied. Only Point geometries are imported. The import will look at the column headers for any mention of «lat» and «lon» at the begining of the header, case insensitive. All other column are imported as properties.": "使用逗號、定位鍵或是分號分隔的地理數據。預設座標系為 SRS WGS84。只會匯入地理座標點。匯入時抓取 «lat» 與 «lon» 開頭的欄位資料，不分大小寫。其他欄位則歸入屬性資料。",
     "Congratulations, your map has been created!": "恭喜您的地圖已經新增完成",
     "Continue line": "連續線段",
@@ -96,7 +95,6 @@
     "Custom background": "自訂背景",
     "Custom overlay": "客制套疊",
     "dash array": "虛線排列",
-    "Data browser": "資料檢視器",
     "Data is browsable": "資料是可檢視的",
     "Datalayers": "資料圖層",
     "Default interaction options": "預設互動選項",
@@ -165,16 +163,12 @@
     "Exit Fullscreen": "結束全螢幕模式",
     "expanded": "展開",
     "Extract shape to separate feature": "由外形分離出圖徵",
-    "Facet keys": "方面鍵",
-    "Facet search": "方面搜尋",
     "Feature identifier key": "Feature identifier key",
     "Feature properties": "圖徵屬性",
     "Fetch data each time map view changes.": "每次地圖檢視改變時截取資料。",
     "fill color": "填入色彩",
     "fill opacity": "填入不透明度",
     "fill": "填入",
-    "Filter keys": "篩選鍵",
-    "Filter": "篩選器",
     "Fit all data": "檢視所有資料",
     "Format": "格式",
     "From zoom": "由縮放大小",
@@ -267,7 +261,6 @@
     "NM": "NM",
     "No cache": "沒有快取内容",
     "No licence has been set": "尚未設定授權條例",
-    "No results for these facets": "各方面沒有結果",
     "No results": "沒有結果",
     "no": "否",
     "No.": "無。",
@@ -332,7 +325,6 @@
     "See layers": "See layers",
     "See full screen": "觀看全螢幕",
     "See on OpenStreetMap": "在開放街圖檢視",
-    "Select data": "Select data",
     "Send me the link": "寄送連結給我",
     "Set it to false to hide this layer from the slideshow, the data browser, the popup navigation…": "設定為假時，在幻燈片時、資料檢視器和彈出式導航中可將此圖層隱藏...",
     "settings": "設定",
@@ -434,9 +426,7 @@
     "Edit map details": "Edit map details",
     "Back to browser": "Back to browser",
     "Toggle size": "Toggle size",
-    "Layers": "Layers",
     "Display the caption control": "Display the caption control",
-    "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for facet search (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
     "<empty value>": "<empty value>",
     "Min": "Min",
     "Max": "Max",
@@ -446,6 +436,15 @@
     "Edit in OpenStreetMap": "Edit in OpenStreetMap",
     "Cannot determine latitude and longitude columns.": "Cannot determine latitude and longitude columns.",
     "Back to layers": "Back to layers",
-    "Data": "Data",
-    "Filters": "Filters"
+    "Filters": "Filters",
+    "Comma separated list of properties to use when filtering features by text input": "Comma separated list of properties to use when filtering features by text input",
+    "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.": "Comma separated list of properties to use for filters (eg.: mykey,otherkey). To control label, add it after a | (eg.: mykey|My Key,otherkey|Other Key). To control input field type, add it after another | (eg.: mykey|My Key|checkbox,otherkey|Other Key|datetime). Allowed values for the input field type are checkbox (default), radio, number, date and datetime.",
+    "Search keys": "Search keys",
+    "Filters keys": "Filters keys",
+    "Filter data": "Filter data",
+    "Search map features…": "Search map features…",
+    "Reset all": "Reset all",
+    "Browser in data mode": "Browser in data mode",
+    "Browser in layers mode": "Browser in layers mode",
+    "Browser in filters mode": "Browser in filters mode"
 }

umap/static/umap/map.css

@@ -888,10 +888,10 @@ a.umap-control-caption,
 .umap-browser .datalayer i {
     cursor: pointer;
 }
-.umap-browser ul {
+.umap-browser .datalayer ul {
     display: none;
 }
-.show-list ul {
+.umap-browser .show-list ul {
     display: block;
 }
 
@@ -982,6 +982,21 @@ a.umap-control-caption,
 .umap-browser .show-list .datalayer-toggle-list {
     background-position: -145px -45px;
 }
+.umap-browser .filters summary {
+    background: none;
+    border: 1px solid var(--color-lightGray);
+    width: fit-content;
+    padding: 0 10px;
+    margin-bottom: var(--block-margin);
+}
+.umap-browser .filters summary {
+    list-style: none;
+    display: inline-block;
+}
+.umap-browser details[open].filters summary {
+    margin-bottom: -1px;
+    border-bottom: 1px solid var(--background-color);
+}
 .datalayer-name {
     cursor: pointer;
 }

umap/static/umap/unittests/utils.js

@@ -185,6 +185,13 @@ describe('Utils', function () {
       assert.equal(Utils.escapeHTML('<a href="geo:1,2"></a>'), '<a href="geo:1,2"></a>')
     })
 
+    it('should not escape dir and title attributes', function () {
+      assert.equal(
+        Utils.escapeHTML('<a title="Title" dir="rtl"></a>'),
+        '<a dir="rtl" title="Title"></a>'
+      )
+    })
+
     it('should not fail with int value', function () {
       assert.equal(Utils.escapeHTML(25), '25')
     })

umap/static/umap/vars.css

@@ -4,6 +4,13 @@
     --color-darkBlue: #263B58;
     --color-lightGray: #ddd;
     --color-darkGray: #323737;
+    --color-light: white;
+    --color-limeGreen: #b9f5d2;
+    --color-brightCyan: #46ece6;
+    --color-lightCyan: #d4fbf9;
+
+    --background-color: var(--color-light);
+    --color-accent: var(--color-brightCyan);
 
     /* Buttons. */
     --button-primary-background: var(--color-waterMint);
@@ -20,3 +27,6 @@
     --footer-height: 46px;
     --control-size: 36px;
 }
+.dark {
+    --background-color: var(--color-darkGray);
+}

umap/static/umap/vendors/dompurify/purify.es.js

@@ -1,4 +1,4 @@
-/*! @license DOMPurify 3.1.0 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.0/LICENSE */
+/*! @license DOMPurify 3.1.3 | (c) Cure53 and other contributors | Released under the Apache license 2.0 and Mozilla Public License 2.0 | github.com/cure53/DOMPurify/blob/3.1.3/LICENSE */
 
 const {
   entries,
@@ -48,6 +48,7 @@ const stringTrim = unapply(String.prototype.trim);
 const objectHasOwnProperty = unapply(Object.prototype.hasOwnProperty);
 const regExpTest = unapply(RegExp.prototype.test);
 const typeErrorCreate = unconstruct(TypeError);
+const numberIsNaN = unapply(Number.isNaN);
 
 /**
  * Creates a new function that calls the given function with a specified thisArg and arguments.
@@ -231,6 +232,24 @@ var EXPRESSIONS = /*#__PURE__*/Object.freeze({
   CUSTOM_ELEMENT: CUSTOM_ELEMENT
 });
 
+// https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeType
+const NODE_TYPE = {
+  element: 1,
+  attribute: 2,
+  text: 3,
+  cdataSection: 4,
+  entityReference: 5,
+  // Deprecated
+  entityNode: 6,
+  // Deprecated
+  progressingInstruction: 7,
+  comment: 8,
+  document: 9,
+  documentType: 10,
+  documentFragment: 11,
+  notation: 12 // Deprecated
+};
+
 const getGlobal = function getGlobal() {
   return typeof window === 'undefined' ? null : window;
 };
@@ -282,14 +301,14 @@ function createDOMPurify() {
    * Version label, exposed for easier checks
    * if DOMPurify is up to date or not
    */
-  DOMPurify.version = '3.1.0';
+  DOMPurify.version = '3.1.3';
 
   /**
    * Array of elements that DOMPurify removed during sanitation.
    * Empty if nothing was removed.
    */
   DOMPurify.removed = [];
-  if (!window || !window.document || window.document.nodeType !== 9) {
+  if (!window || !window.document || window.document.nodeType !== NODE_TYPE.document) {
     // Not running in a browser, provide a factory function
     // so that you can pass your own Window
     DOMPurify.isSupported = false;
@@ -515,6 +534,9 @@ function createDOMPurify() {
   /* Keep a reference to config to pass to hooks */
   let CONFIG = null;
 
+  /* Specify the maximum element nesting depth to prevent mXSS */
+  const MAX_NESTING_DEPTH = 255;
+
   /* Ideally, do not touch anything below this line */
   /* ______________________________________________ */
 
@@ -701,7 +723,7 @@ function createDOMPurify() {
     CONFIG = cfg;
   };
   const MATHML_TEXT_INTEGRATION_POINTS = addToSet({}, ['mi', 'mo', 'mn', 'ms', 'mtext']);
-  const HTML_INTEGRATION_POINTS = addToSet({}, ['foreignobject', 'desc', 'title', 'annotation-xml']);
+  const HTML_INTEGRATION_POINTS = addToSet({}, ['foreignobject', 'annotation-xml']);
 
   // Certain elements are allowed in both SVG and HTML
   // namespace. We need to specify them explicitly
@@ -925,7 +947,11 @@ function createDOMPurify() {
    * @return {Boolean} true if clobbered, false if safe
    */
   const _isClobbered = function _isClobbered(elm) {
-    return elm instanceof HTMLFormElement && (typeof elm.nodeName !== 'string' || typeof elm.textContent !== 'string' || typeof elm.removeChild !== 'function' || !(elm.attributes instanceof NamedNodeMap) || typeof elm.removeAttribute !== 'function' || typeof elm.setAttribute !== 'function' || typeof elm.namespaceURI !== 'string' || typeof elm.insertBefore !== 'function' || typeof elm.hasChildNodes !== 'function');
+    return elm instanceof HTMLFormElement && (
+    // eslint-disable-next-line unicorn/no-typeof-undefined
+    typeof elm.__depth !== 'undefined' && typeof elm.__depth !== 'number' ||
+    // eslint-disable-next-line unicorn/no-typeof-undefined
+    typeof elm.__removalCount !== 'undefined' && typeof elm.__removalCount !== 'number' || typeof elm.nodeName !== 'string' || typeof elm.textContent !== 'string' || typeof elm.removeChild !== 'function' || !(elm.attributes instanceof NamedNodeMap) || typeof elm.removeAttribute !== 'function' || typeof elm.setAttribute !== 'function' || typeof elm.namespaceURI !== 'string' || typeof elm.insertBefore !== 'function' || typeof elm.hasChildNodes !== 'function');
   };
 
   /**
@@ -993,13 +1019,13 @@ function createDOMPurify() {
     }
 
     /* Remove any ocurrence of processing instructions */
-    if (currentNode.nodeType === 7) {
+    if (currentNode.nodeType === NODE_TYPE.progressingInstruction) {
       _forceRemove(currentNode);
       return true;
     }
 
     /* Remove any kind of possibly harmful comments */
-    if (SAFE_FOR_XML && currentNode.nodeType === 8 && regExpTest(/<[/\w]/g, currentNode.data)) {
+    if (SAFE_FOR_XML && currentNode.nodeType === NODE_TYPE.comment && regExpTest(/<[/\w]/g, currentNode.data)) {
       _forceRemove(currentNode);
       return true;
     }
@@ -1023,7 +1049,9 @@ function createDOMPurify() {
         if (childNodes && parentNode) {
           const childCount = childNodes.length;
           for (let i = childCount - 1; i >= 0; --i) {
-            parentNode.insertBefore(cloneNode(childNodes[i], true), getNextSibling(currentNode));
+            const childClone = cloneNode(childNodes[i], true);
+            childClone.__removalCount = (currentNode.__removalCount || 0) + 1;
+            parentNode.insertBefore(childClone, getNextSibling(currentNode));
           }
         }
       }
@@ -1044,7 +1072,7 @@ function createDOMPurify() {
     }
 
     /* Sanitize element content to be template-safe */
-    if (SAFE_FOR_TEMPLATES && currentNode.nodeType === 3) {
+    if (SAFE_FOR_TEMPLATES && currentNode.nodeType === NODE_TYPE.text) {
       /* Get the element's text content */
       content = currentNode.textContent;
       arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], expr => {
@@ -1074,7 +1102,7 @@ function createDOMPurify() {
   // eslint-disable-next-line complexity
   const _isValidAttribute = function _isValidAttribute(lcTag, lcName, value) {
     /* Make sure attribute cannot clobber */
-    if (SANITIZE_DOM && (lcName === 'id' || lcName === 'name') && (value in document || value in formElement)) {
+    if (SANITIZE_DOM && (lcName === 'id' || lcName === 'name') && (value in document || value in formElement || value === '__depth' || value === '__removalCount')) {
       return false;
     }
 
@@ -1178,6 +1206,12 @@ function createDOMPurify() {
         continue;
       }
 
+      /* Work around a security issue with comments inside attributes */
+      if (SAFE_FOR_XML && regExpTest(/((--!?|])>)|<\/(style|title)/i, value)) {
+        _removeAttribute(name, currentNode);
+        continue;
+      }
+
       /* Sanitize attribute content to be template-safe */
       if (SAFE_FOR_TEMPLATES) {
         arrayForEach([MUSTACHE_EXPR, ERB_EXPR, TMPLIT_EXPR], expr => {
@@ -1228,7 +1262,11 @@ function createDOMPurify() {
           /* Fallback to setAttribute() for browser-unrecognized namespaces e.g. "x-schema". */
           currentNode.setAttribute(name, value);
         }
-        arrayPop(DOMPurify.removed);
+        if (_isClobbered(currentNode)) {
+          _forceRemove(currentNode);
+        } else {
+          arrayPop(DOMPurify.removed);
+        }
       } catch (_) {}
     }
 
@@ -1255,9 +1293,32 @@ function createDOMPurify() {
       if (_sanitizeElements(shadowNode)) {
         continue;
       }
+      const parentNode = getParentNode(shadowNode);
+
+      /* Set the nesting depth of an element */
+      if (shadowNode.nodeType === NODE_TYPE.element) {
+        if (parentNode && parentNode.__depth) {
+          /*
+            We want the depth of the node in the original tree, which can
+            change when it's removed from its parent.
+          */
+          shadowNode.__depth = (shadowNode.__removalCount || 0) + parentNode.__depth + 1;
+        } else {
+          shadowNode.__depth = 1;
+        }
+      }
+
+      /*
+       * Remove an element if nested too deeply to avoid mXSS
+       * or if the __depth might have been tampered with
+       */
+      if (shadowNode.__depth >= MAX_NESTING_DEPTH || shadowNode.__depth < 0 || numberIsNaN(shadowNode.__depth)) {
+        _forceRemove(shadowNode);
+      }
 
       /* Deep shadow DOM detected */
       if (shadowNode.content instanceof DocumentFragment) {
+        shadowNode.content.__depth = shadowNode.__depth;
         _sanitizeShadowDOM(shadowNode.content);
       }
 
@@ -1333,7 +1394,7 @@ function createDOMPurify() {
          elements being stripped by the parser */
       body = _initDocument('<!---->');
       importedNode = body.ownerDocument.importNode(dirty, true);
-      if (importedNode.nodeType === 1 && importedNode.nodeName === 'BODY') {
+      if (importedNode.nodeType === NODE_TYPE.element && importedNode.nodeName === 'BODY') {
         /* Node is already a body, use as is */
         body = importedNode;
       } else if (importedNode.nodeName === 'HTML') {
@@ -1373,9 +1434,32 @@ function createDOMPurify() {
       if (_sanitizeElements(currentNode)) {
         continue;
       }
+      const parentNode = getParentNode(currentNode);
+
+      /* Set the nesting depth of an element */
+      if (currentNode.nodeType === NODE_TYPE.element) {
+        if (parentNode && parentNode.__depth) {
+          /*
+            We want the depth of the node in the original tree, which can
+            change when it's removed from its parent.
+          */
+          currentNode.__depth = (currentNode.__removalCount || 0) + parentNode.__depth + 1;
+        } else {
+          currentNode.__depth = 1;
+        }
+      }
+
+      /*
+       * Remove an element if nested too deeply to avoid mXSS
+       * or if the __depth might have been tampered with
+       */
+      if (currentNode.__depth >= MAX_NESTING_DEPTH || currentNode.__depth < 0 || numberIsNaN(currentNode.__depth)) {
+        _forceRemove(currentNode);
+      }
 
       /* Shadow DOM detected, sanitize it */
       if (currentNode.content instanceof DocumentFragment) {
+        currentNode.content.__depth = currentNode.__depth;
         _sanitizeShadowDOM(currentNode.content);
       }