umap-project 3.3.6__py3-none-any.whl → 3.4.0b1__py3-none-any.whl

umap/static/umap/js/modules/facets.js

@@ -1,164 +0,0 @@
-import { DomEvent, DomUtil } from '../../vendors/leaflet/leaflet-src.esm.js'
-import { translate } from './i18n.js'
-import * as Utils from './utils.js'
-
-export default class Facets {
-  constructor(umap) {
-    this._umap = umap
-    this.selected = {}
-  }
-
-  compute(names, defined) {
-    const properties = {}
-    let selected
-
-    for (const name of names) {
-      const type = defined.get(name).type
-      properties[name] = { type: type }
-      selected = this.selected[name] || {}
-      selected.type = type
-      if (!['date', 'datetime', 'number'].includes(type)) {
-        properties[name].choices = []
-        selected.choices = selected.choices || []
-      }
-      this.selected[name] = selected
-    }
-
-    this._umap.datalayers.browsable().map((datalayer) => {
-      datalayer.features.forEach((feature) => {
-        for (const name of names) {
-          let value = feature.properties[name]
-          const type = defined.get(name).type
-          const parser = this.getParser(type)
-          value = parser(value)
-          switch (type) {
-            case 'date':
-            case 'datetime':
-            case 'number':
-              if (!Number.isNaN(value)) {
-                // Special cases where we want to be lousy when checking isNaN without
-                // coercing to a Number first because we handle multiple types.
-                // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/
-                // Reference/Global_Objects/Number/isNaN
-                // biome-ignore lint/suspicious/noGlobalIsNan: see above.
-                if (isNaN(properties[name].min) || properties[name].min > value) {
-                  properties[name].min = value
-                }
-                // biome-ignore lint/suspicious/noGlobalIsNan: see above.
-                if (isNaN(properties[name].max) || properties[name].max < value) {
-                  properties[name].max = value
-                }
-              }
-              break
-            default:
-              value = value || translate('<empty value>')
-              if (!properties[name].choices.includes(value)) {
-                properties[name].choices.push(value)
-              }
-          }
-        }
-      })
-    })
-    return properties
-  }
-
-  isActive() {
-    for (const { type, min, max, choices } of Object.values(this.selected)) {
-      if (min !== undefined || max !== undefined || choices?.length) {
-        return true
-      }
-    }
-    return false
-  }
-
-  build() {
-    const defined = this.getDefined()
-    const names = [...defined.keys()]
-    const facetProperties = this.compute(names, defined)
-
-    const fields = names.map((name) => {
-      const criteria = facetProperties[name]
-      let handler = 'FacetSearchChoices'
-      switch (criteria.type) {
-        case 'number':
-          handler = 'FacetSearchNumber'
-          break
-        case 'date':
-          handler = 'FacetSearchDate'
-          break
-        case 'datetime':
-          handler = 'FacetSearchDateTime'
-          break
-      }
-      const label = defined.get(name).label
-      return [
-        `selected.${name}`,
-        {
-          criteria: criteria,
-          handler: handler,
-          label: label,
-        },
-      ]
-    })
-
-    return fields
-  }
-
-  getDefined() {
-    const defaultType = 'checkbox'
-    const allowedTypes = [defaultType, 'radio', 'number', 'date', 'datetime']
-    const defined = new Map()
-    if (!this._umap.properties.facetKey) return defined
-    return (this._umap.properties.facetKey || '').split(',').reduce((acc, curr) => {
-      let [name, label, type] = curr.split('|')
-      type = allowedTypes.includes(type) ? type : defaultType
-      acc.set(name, { label: label || name, type: type })
-      return acc
-    }, defined)
-  }
-
-  getParser(type) {
-    switch (type) {
-      case 'number':
-        return Number.parseFloat
-      case 'datetime':
-        return (v) => new Date(v)
-      case 'date':
-        return Utils.parseNaiveDate
-      default:
-        return (v) => String(v || '')
-    }
-  }
-
-  dumps(parsed) {
-    const dumped = []
-    for (const [property, { label, type }] of parsed) {
-      dumped.push([property, label, type].filter(Boolean).join('|'))
-    }
-    const oldValue = this._umap.properties.facetKey
-    this._umap.properties.facetKey = dumped.join(',')
-    this._umap.sync.update(
-      'properties.facetKey',
-      this._umap.properties.facetKey,
-      oldValue
-    )
-  }
-
-  has(property) {
-    return this.getDefined().has(property)
-  }
-
-  add(property, label, type) {
-    const defined = this.getDefined()
-    if (!defined.has(property)) {
-      defined.set(property, { label, type })
-      this.dumps(defined)
-    }
-  }
-
-  remove(property) {
-    const defined = this.getDefined()
-    defined.delete(property)
-    this.dumps(defined)
-  }
-}

umap/tests/integration/test_facets_browser.py

@@ -1,279 +0,0 @@
-import copy
-import re
-
-import pytest
-from playwright.sync_api import expect
-
-from ..base import DataLayerFactory
-
-pytestmark = pytest.mark.django_db
-
-
-DATALAYER_DATA1 = {
-    "type": "FeatureCollection",
-    "features": [
-        {
-            "type": "Feature",
-            "properties": {
-                "mytype": "even",
-                "name": "Point 2",
-                "mynumber": 10,
-                "mydate": "2024/04/14 12:19:17",
-            },
-            "geometry": {"type": "Point", "coordinates": [0.065918, 48.385442]},
-        },
-        {
-            "type": "Feature",
-            "properties": {
-                "mytype": "odd",
-                "name": "Point 1",
-                "mynumber": 12,
-                "mydate": "2024/03/13 12:20:20",
-            },
-            "geometry": {"type": "Point", "coordinates": [3.55957, 49.767074]},
-        },
-    ],
-    "_umap_options": {
-        "name": "Calque 1",
-    },
-}
-
-
-DATALAYER_DATA2 = {
-    "type": "FeatureCollection",
-    "features": [
-        {
-            "type": "Feature",
-            "properties": {
-                "mytype": "even",
-                "name": "Point 4",
-                "mynumber": 10,
-                "mydate": "2024/08/18 13:14:15",
-            },
-            "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
-        },
-        {
-            "type": "Feature",
-            "properties": {
-                "mytype": "odd",
-                "name": "Point 3",
-                "mynumber": 14,
-                "mydate": "2024-04-14T10:19:17.000Z",
-            },
-            "geometry": {"type": "Point", "coordinates": [4.372559, 47.945786]},
-        },
-    ],
-    "_umap_options": {
-        "name": "Calque 2",
-    },
-}
-
-
-DATALAYER_DATA3 = {
-    "type": "FeatureCollection",
-    "features": [
-        {
-            "type": "Feature",
-            "properties": {"name": "a polygon"},
-            "geometry": {
-                "type": "Polygon",
-                "coordinates": [
-                    [
-                        [2.12, 49.57],
-                        [1.08, 49.02],
-                        [2.51, 47.55],
-                        [3.19, 48.77],
-                        [2.12, 49.57],
-                    ]
-                ],
-            },
-        },
-    ],
-    "_umap_options": {"name": "Calque 2", "browsable": False},
-}
-
-
-def test_simple_facet_search(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "datafilters"
-    map.settings["properties"]["facetKey"] = "mytype|My type,mynumber|My Number|number"
-    map.settings["properties"]["showLabel"] = True
-    map.save()
-    DataLayerFactory(map=map, data=DATALAYER_DATA1)
-    DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    DataLayerFactory(map=map, data=DATALAYER_DATA3)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.948/1.670")
-    panel = page.locator(".panel.left.on")
-    expect(panel).to_have_class(re.compile(".*expanded.*"))
-    expect(panel.locator(".umap-browser")).to_be_visible()
-    # From a non browsable datalayer, should not be impacted
-    paths = page.locator(".leaflet-overlay-pane path")
-    expect(paths).to_be_visible()
-    expect(panel).to_be_visible()
-    # Facet name
-    expect(page.get_by_text("My type")).to_be_visible()
-    # Facet values
-    oven = page.get_by_text("even")
-    odd = page.get_by_text("odd")
-    expect(oven).to_be_visible()
-    expect(odd).to_be_visible()
-    expect(paths).to_be_visible()
-    markers = page.locator(".leaflet-marker-icon")
-    expect(markers).to_have_count(4)
-    # Tooltips
-    expect(page.get_by_role("tooltip", name="Point 1")).to_be_visible()
-    expect(page.get_by_role("tooltip", name="Point 2")).to_be_visible()
-    expect(page.get_by_role("tooltip", name="Point 3")).to_be_visible()
-    expect(page.get_by_role("tooltip", name="Point 4")).to_be_visible()
-
-    # Datalist
-    expect(panel.get_by_text("Point 1")).to_be_visible()
-    expect(panel.get_by_text("Point 2")).to_be_visible()
-    expect(panel.get_by_text("Point 3")).to_be_visible()
-    expect(panel.get_by_text("Point 4")).to_be_visible()
-
-    # Now let's filter
-    odd.click()
-    expect(markers).to_have_count(2)
-    expect(page.get_by_role("tooltip", name="Point 2")).to_be_hidden()
-    expect(page.get_by_role("tooltip", name="Point 4")).to_be_hidden()
-    expect(page.get_by_role("tooltip", name="Point 1")).to_be_visible()
-    expect(page.get_by_role("tooltip", name="Point 3")).to_be_visible()
-    expect(panel.get_by_text("Point 2")).to_be_hidden()
-    expect(panel.get_by_text("Point 4")).to_be_hidden()
-    expect(panel.get_by_text("Point 1")).to_be_visible()
-    expect(panel.get_by_text("Point 3")).to_be_visible()
-    expect(paths).to_be_visible
-    # Now let's filter
-    odd.click()
-    expect(markers).to_have_count(4)
-    expect(paths).to_be_visible()
-
-    # Let's filter using the number facet
-    expect(page.get_by_text("My Number")).to_be_visible()
-    expect(page.get_by_label("Min")).to_have_value("10")
-    expect(page.get_by_label("Max")).to_have_value("14")
-    page.get_by_label("Min").fill("11")
-    page.keyboard.press("Tab")  # Move out of the input, so the "change" event is sent
-    expect(markers).to_have_count(2)
-    expect(paths).to_be_visible()
-    page.get_by_label("Max").fill("13")
-    page.keyboard.press("Tab")
-    expect(markers).to_have_count(1)
-
-    # Now let's combine
-    page.get_by_label("Min").fill("10")
-    page.keyboard.press("Tab")
-    expect(markers).to_have_count(3)
-    odd.click()
-    expect(markers).to_have_count(1)
-    expect(paths).to_be_visible()
-
-
-def test_date_facet_search(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "datafilters"
-    map.settings["properties"]["facetKey"] = "mydate|Date filter|date"
-    map.save()
-    DataLayerFactory(map=map, data=DATALAYER_DATA1)
-    DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
-    markers = page.locator(".leaflet-marker-icon")
-    expect(markers).to_have_count(4)
-    expect(page.get_by_text("Date Filter")).to_be_visible()
-    expect(page.get_by_label("From")).to_have_value("2024-03-13")
-    expect(page.get_by_label("Until")).to_have_value("2024-08-18")
-    page.get_by_label("From").fill("2024-03-14")
-    expect(markers).to_have_count(3)
-    page.get_by_label("Until").fill("2024-08-17")
-    expect(markers).to_have_count(2)
-
-
-def test_choice_with_empty_value(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "datafilters"
-    map.settings["properties"]["facetKey"] = "mytype|My type"
-    map.save()
-    data = copy.deepcopy(DATALAYER_DATA1)
-    data["features"][0]["properties"]["mytype"] = ""
-    del data["features"][1]["properties"]["mytype"]
-    DataLayerFactory(map=map, data=data)
-    DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
-    expect(page.get_by_text("<empty value>")).to_be_visible()
-    markers = page.locator(".leaflet-marker-icon")
-    expect(markers).to_have_count(4)
-    page.get_by_text("<empty value>").click()
-    expect(markers).to_have_count(2)
-
-
-def test_number_with_zero_value(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "datafilters"
-    map.settings["properties"]["facetKey"] = "mynumber|Filter|number"
-    map.save()
-    data = copy.deepcopy(DATALAYER_DATA1)
-    data["features"][0]["properties"]["mynumber"] = 0
-    DataLayerFactory(map=map, data=data)
-    DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/47.5/-1.5")
-    expect(page.get_by_label("Min")).to_have_value("0")
-    expect(page.get_by_label("Max")).to_have_value("14")
-    page.get_by_label("Min").fill("1")
-    page.keyboard.press("Tab")  # Move out of the input, so the "change" event is sent
-    markers = page.locator(".leaflet-marker-icon")
-    expect(markers).to_have_count(3)
-
-
-def test_facets_search_are_persistent_when_closing_panel(live_server, page, map):
-    map.settings["properties"]["onLoadPanel"] = "datafilters"
-    map.settings["properties"]["facetKey"] = "mytype|My type,mynumber|My Number|number"
-    map.save()
-    DataLayerFactory(map=map, data=DATALAYER_DATA1)
-    DataLayerFactory(map=map, data=DATALAYER_DATA2)
-    page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.948/1.670")
-    panel = page.locator(".panel.left")
-
-    # Facet values
-    odd = page.get_by_label("odd")
-    markers = page.locator(".leaflet-marker-icon")
-    expect(markers).to_have_count(4)
-
-    # Datalist in the browser
-    expect(panel.get_by_text("Point 1")).to_be_visible()
-    expect(panel.get_by_text("Point 2")).to_be_visible()
-    expect(panel.get_by_text("Point 3")).to_be_visible()
-    expect(panel.get_by_text("Point 4")).to_be_visible()
-
-    # Now let's filter
-    odd.click()
-    expect(page.locator(".filters summary")).to_have_attribute("data-badge", " ")
-    expect(page.locator(".umap-control-browse")).to_have_attribute("data-badge", " ")
-    expect(markers).to_have_count(2)
-    expect(panel.get_by_text("Point 2")).to_be_hidden()
-    expect(panel.get_by_text("Point 4")).to_be_hidden()
-    expect(panel.get_by_text("Point 1")).to_be_visible()
-    expect(panel.get_by_text("Point 3")).to_be_visible()
-
-    # Let's filter using the number facet
-    expect(panel.get_by_label("Min")).to_have_value("10")
-    expect(panel.get_by_label("Max")).to_have_value("14")
-    page.get_by_label("Min").fill("13")
-    page.keyboard.press("Tab")  # Move out of the input, so the "change" event is sent
-    expect(panel.get_by_label("Min")).to_have_attribute("data-modified", "true")
-    expect(markers).to_have_count(1)
-    expect(panel.get_by_text("Point 2")).to_be_hidden()
-    expect(panel.get_by_text("Point 4")).to_be_hidden()
-    expect(panel.get_by_text("Point 1")).to_be_hidden()
-    expect(panel.get_by_text("Point 3")).to_be_visible()
-
-    # Close panel
-    expect(panel.locator(".filters summary")).to_have_attribute("data-badge", " ")
-    expect(page.locator(".umap-control-browse")).to_have_attribute("data-badge", " ")
-    panel.get_by_role("button", name="Close").click()
-    page.get_by_role("button", name="Open browser").click()
-    expect(panel.get_by_label("Min")).to_have_value("13")
-    expect(panel.get_by_label("Min")).to_have_attribute("data-modified", "true")
-    expect(panel.get_by_label("odd")).to_be_checked()
-
-    # Datalist in the browser should be inchanged
-    expect(panel.get_by_text("Point 2")).to_be_hidden()
-    expect(panel.get_by_text("Point 4")).to_be_hidden()
-    expect(panel.get_by_text("Point 1")).to_be_hidden()
-    expect(panel.get_by_text("Point 3")).to_be_visible()