umap-project 3.6.0__py3-none-any.whl → 3.6.1__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "3.6.0"
+VERSION = "3.6.1"

umap/static/umap/js/modules/rules.js

@@ -69,7 +69,7 @@ class Rule {
     }
     // TODO: deal with legacy rules on non typed fields
     else {
-      this.cast = this.field.parse
+      this.cast = (value) => this.field.parse(value)
       if (
         // Special cases where we want to be lousy when checking isNaN without
         // coercing to a Number first because we handle multiple types.

umap/tests/fixtures/test_upload_data_with_enum.umap

@@ -0,0 +1,151 @@
+{
+  "type": "umap",
+  "geometry": {
+    "type": "Point",
+    "coordinates": [
+      2.243270874023438,
+      47.61958693358351
+    ]
+  },
+  "properties": {
+    "name": "Map with Enum",
+    "tags": [
+      "tourism",
+      "cycling"
+    ],
+    "zoom": 10,
+    "center": {
+      "lat": 47.61958693358351,
+      "lng": 2.243270874023438
+    }
+  },
+  "layers": [
+    {
+      "type": "FeatureCollection",
+      "features": [
+        {
+          "type": "Feature",
+          "geometry": {
+            "coordinates": [
+              4.492482,
+              47.539039
+            ],
+            "type": "Point"
+          },
+          "properties": {
+            "name": "I'm a foo",
+            "toilets": true,
+            "features": "foo"
+          },
+          "id": "tAuzC"
+        },
+        {
+          "type": "Feature",
+          "geometry": {
+            "type": "Point",
+            "coordinates": [
+              3.496243506779722,
+              47.86537360504818,
+              133.827948907274
+            ]
+          },
+          "properties": {
+            "name": "I'm a bar",
+            "toilets": false,
+            "features": "bar"
+          },
+          "id": "tAuzD"
+        },
+        {
+          "type": "Feature",
+          "geometry": {
+            "type": "Point",
+            "coordinates": [
+              0.7150469999999999,
+              49.23001199999999,
+              0
+            ]
+          },
+          "properties": {
+            "name": "I'm another foo",
+            "toilets": false,
+            "features": "foo"
+          },
+          "id": "tAuzE"
+        },
+        {
+          "type": "Feature",
+          "geometry": {
+            "coordinates": [
+              4.931327,
+              48.022719
+            ],
+            "type": "Point"
+          },
+          "properties": {
+            "name": "I've no features"
+          },
+          "id": "RTaA8"
+        }
+      ],
+      "_umap_options": {
+        "name": "van.spots",
+        "rank": 0,
+        "color": "DodgerBlue",
+        "rules": [
+          {
+            "name": "has toilets",
+            "condition": "toilets=true",
+            "properties": {
+              "color": "green"
+            }
+          },
+          {
+            "name": "has foo",
+            "condition": "features=foo",
+            "properties": {
+              "color": "MediumOrchid"
+            }
+          },
+          {
+            "name": "has bar",
+            "condition": "features=bar",
+            "properties": {
+              "color": "red"
+            }
+          }
+        ],
+        "fields": [
+          {
+            "key": "name",
+            "type": "String"
+          },
+          {
+            "key": "toilets",
+            "type": "Boolean"
+          },
+          {
+            "key": "features",
+            "type": "Enum"
+          }
+        ],
+        "weight": 12,
+        "filters": [
+          {
+            "widget": "Switch",
+            "fieldKey": "toilets"
+          },
+          {
+            "widget": "Checkbox",
+            "fieldKey": "features"
+          }
+        ],
+        "editMode": "advanced",
+        "browsable": true,
+        "iconClass": "LargeCircle",
+        "inCaption": true,
+        "remoteData": {}
+      }
+    }
+  ]
+}

umap/tests/integration/test_import.py

@@ -1123,3 +1123,17 @@ def test_umap_import_with_iconurl(live_server, tilelayer, page):
             'img[src="https://umap.incubateur.anct.gouv.fr/uploads/pictogram/car-24.png"]'
         )
     ).to_have_count(2)
+
+
+def test_umap_import_with_enum_and_filter(live_server, tilelayer, page):
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Import data").click()
+    file_input = page.locator("input[type='file']")
+    with page.expect_file_chooser() as fc_info:
+        file_input.click()
+    file_chooser = fc_info.value
+    path = Path(__file__).parent.parent / "fixtures/test_upload_data_with_enum.umap"
+    file_chooser.set_files(path)
+    page.get_by_role("button", name="Import data", exact=True).click()
+    markers = page.locator(".umap-large-circle-icon")
+    expect(markers).to_have_count(4)

{umap_project-3.6.0.dist-info → umap_project-3.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.6.0
+Version: 3.6.1
 Summary: Create maps with OpenStreetMap layers in a minute and embed them in your site.
 Author-email: Yohan Boniface <yb@enix.org>
 Maintainer-email: David Larlet <david@larlet.fr>

{umap_project-3.6.0.dist-info → umap_project-3.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=hT6veETpVNpRqhpKNh8-nn9DTHHxeJX2gMeYNPF1jGk,18
+umap/__init__.py,sha256=37OYpJUHRvLjldqeNdOMaDCSbtPoVQINs3afAvFR3LQ,18
 umap/admin.py,sha256=YlK4CgEWb2eFYRKiklsKouxeiQ8z_b-H2Fv2XCaiGFQ,3014
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/asgi.py,sha256=sJkGqDLgMoPkq2nMRyRE_Hz3ZLJm1X5lgXiQJu6rYt0,660
@@ -257,7 +257,7 @@ umap/static/umap/js/modules/orderable.js,sha256=zDtcElZ_MVPoGba8Iv9bxOzk4vuN7C-5
 umap/static/umap/js/modules/permissions.js,sha256=PKQrlyFRxwfdkF2hcKThVnWKsJD0TnMNmBO5FkheXoM,9299
 umap/static/umap/js/modules/printer.js,sha256=fvb44tLBiYR7TyBdXJdroYsjQOrnbzw7-6F0dBCUEGg,3607
 umap/static/umap/js/modules/request.js,sha256=9GRJoOPbdkHL9OFP6Joaf5wzsJckPyiG2O7AxQciTik,3885
-umap/static/umap/js/modules/rules.js,sha256=GVxnWN8VH8LDQdrozFPzG4t8RMlXRlHjp3UyRbOH3Nk,10113
+umap/static/umap/js/modules/rules.js,sha256=yKPeJ9XurW43ecsNj9GtQfy1pZ9walWfLQfIK97oiP4,10131
 umap/static/umap/js/modules/schema.js,sha256=hTWHwdnWkEWZrpI1cJMdYqtEnub-40DnL3VG_8OCHNU,15299
 umap/static/umap/js/modules/share.js,sha256=vlDQbGLtsvHy95Z3oDk-5vU-NHgullO7t13mAToA3iA,7071
 umap/static/umap/js/modules/slideshow.js,sha256=hnxFW4vzya9ddZ-eUTvTSQZjnKhv7s_EAlrQERANXqo,3590
@@ -545,6 +545,7 @@ umap/tests/fixtures/test_upload_data.json,sha256=t4PmJtVDhyI1x-E1a36jD8YVSa87T-V
 umap/tests/fixtures/test_upload_data.kml,sha256=t66ms8oNI3999bhRJx01mn-UuHeqWoVY5LfXnChBaP8,1102
 umap/tests/fixtures/test_upload_data.umap,sha256=WUmcwcQ4o5_rYw0SOqjnszbk2TOzfynrK3psyApSWsk,5463
 umap/tests/fixtures/test_upload_data_osm.json,sha256=ekOwBHdp7qHQ-JUGlb-kGUXcVepdMsBqr7k51pVaCbA,916
+umap/tests/fixtures/test_upload_data_with_enum.umap,sha256=V-Rm8o5i-pdDI4_bESY30X0C3CYDwX8lN3fCsmA83RM,3251
 umap/tests/fixtures/test_upload_data_with_iconurl.umap,sha256=eMjat_diYHMCPRyOF5Br1bJWNi9vNsKJerfehIjwILo,3334
 umap/tests/fixtures/test_upload_empty_coordinates.json,sha256=-mJ_1orzUAROfE4PXchHXyqxjS-q4tDfvEFPllJiHFU,786
 umap/tests/fixtures/test_upload_georss.xml,sha256=lfmVA0qGDakCG48jjsLmSIE1U6iZ9yyFuqqX6Srt8Js,1160
@@ -578,7 +579,7 @@ umap/tests/integration/test_fields.py,sha256=Rx197Q49-XGUPQ9Jakcp3pkAf2Q9Gtxs6wm
 umap/tests/integration/test_filters.py,sha256=LdIW1uYNxfKzy7EnNVphhJFA_nXpm3V5Z6xWGzCOWfw,25383
 umap/tests/integration/test_heatmap.py,sha256=N4CH5cRrI8tNsCOqQAqhQR2eKV0bHV2uwF5apml_DCs,1627
 umap/tests/integration/test_iframe.py,sha256=fwwX9QVBR_zaMHAvfKQSiNGzFJ4Lu3BJlH8asz1nIUc,901
-umap/tests/integration/test_import.py,sha256=kao40VbF3qxS8eb8ccgOkD1yROqGT8UDBxfYmeOo9Lk,44035
+umap/tests/integration/test_import.py,sha256=tf7dqrEUBP7CRq657LU2YOqa2OwTWez5Oys6ggf9BKQ,44640
 umap/tests/integration/test_map.py,sha256=cZSDVVK7e6WB2IBscyKWx2MH-UG5gyRiPtVIYDHU2Ag,8787
 umap/tests/integration/test_map_list.py,sha256=l1FImKnJkY7DupYX8waKaUZqhnORR20L8dzaqu-eF8E,1280
 umap/tests/integration/test_map_preview.py,sha256=lmHiF7lk_2qkgXlhTHUkAWrUEEGzzbi80_QR7Xuqwho,3541
@@ -602,8 +603,8 @@ umap/tests/integration/test_view_marker.py,sha256=NFCwNez__E_WsE1DuW5RuB0HVKDP4C
 umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
 umap/tests/integration/test_view_polyline.py,sha256=aJoXKmLhJaN0yhPdDCVskZNGx3q3mLDkjVPhZ30cadA,13959
 umap/tests/integration/test_websocket_sync.py,sha256=WEJQL7FU28UFxz7YfA0kOQFDqV_-dofxqF7D955iIM0,29790
-umap_project-3.6.0.dist-info/METADATA,sha256=pQnzV4hRZRXiMIuP4tuHOenOI9esNRLXWHivPCeO3XQ,6039
-umap_project-3.6.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-umap_project-3.6.0.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-3.6.0.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-3.6.0.dist-info/RECORD,,
+umap_project-3.6.1.dist-info/METADATA,sha256=rn_G1hDEVAIuCVWXKs6594ABW8xFw_gKMXulwXzOG8M,6039
+umap_project-3.6.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+umap_project-3.6.1.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-3.6.1.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-3.6.1.dist-info/RECORD,,