umap-project 2.1.1__py3-none-any.whl → 2.1.3__py3-none-any.whl

umap/tests/integration/test_tableeditor.py

@@ -0,0 +1,27 @@
+import json
+import re
+from pathlib import Path
+
+from playwright.sync_api import expect
+
+from umap.models import DataLayer
+
+
+def test_table_editor(live_server, openmap, datalayer, page):
+    page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
+    page.get_by_role("link", name="Manage layers").click()
+    page.locator("#umap-ui-container").get_by_title(
+        "Edit properties in a table"
+    ).click()
+    page.once("dialog", lambda dialog: dialog.accept(prompt_text="newprop"))
+    page.get_by_text("Add a new property").click()
+    page.locator('input[name="newprop"]').fill("newvalue")
+    page.once("dialog", lambda dialog: dialog.accept())
+    page.hover(".umap-table-editor .tcell")
+    page.get_by_title("Delete this property on all").first.click()
+    with page.expect_response(re.compile(r".*/datalayer/update/.*")):
+        page.get_by_role("button", name="Save").click()
+    saved = DataLayer.objects.last()
+    data = json.loads(Path(saved.geojson.path).read_text())
+    assert data["features"][0]["properties"]["newprop"] == "newvalue"
+    assert "name" not in data["features"][0]["properties"]

umap/tests/test_datalayer.py

@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 import pytest
 from django.core.files.base import ContentFile
@@ -60,30 +61,43 @@ def test_clone_should_clone_geojson_too(datalayer):
     assert clone.geojson.path != datalayer.geojson.path
 
 
-def test_should_remove_old_versions_on_save(datalayer, map, settings):
+def test_should_remove_old_versions_on_save(map, settings):
+    datalayer = DataLayerFactory(uuid="0f1161c0-c07f-4ba4-86c5-8d8981d8a813", old_id=17)
     settings.UMAP_KEEP_VERSIONS = 3
-    root = datalayer.storage_root()
+    root = Path(datalayer.storage_root())
     before = len(datalayer.geojson.storage.listdir(root)[1])
-    newer = f"{root}/{datalayer.pk}_1440924889.geojson"
-    medium = f"{root}/{datalayer.pk}_1440923687.geojson"
-    older = f"{root}/{datalayer.pk}_1440918637.geojson"
-    other = f"{root}/123456_1440918637.geojson"
-    for path in [medium, newer, older, other]:
-        datalayer.geojson.storage.save(path, ContentFile("{}"))
-        datalayer.geojson.storage.save(path + ".gz", ContentFile("{}"))
-    assert len(datalayer.geojson.storage.listdir(root)[1]) == 8 + before
+    newer = f"{datalayer.pk}_1440924889.geojson"
+    medium = f"{datalayer.pk}_1440923687.geojson"
+    older = f"{datalayer.pk}_1440918637.geojson"
+    with_old_id = f"{datalayer.old_id}_1440918537.geojson"
+    other = "123456_1440918637.geojson"
+    for path in [medium, newer, older, with_old_id, other]:
+        datalayer.geojson.storage.save(root / path, ContentFile("{}"))
+        datalayer.geojson.storage.save(root / f"{path}.gz", ContentFile("{}"))
+    assert len(datalayer.geojson.storage.listdir(root)[1]) == 10 + before
+    files = datalayer.geojson.storage.listdir(root)[1]
+    # Those files should be present before save, which will purge them
+    assert older in files
+    assert older + ".gz" in files
+    assert with_old_id in files
+    assert with_old_id + ".gz" in files
     datalayer.save()
     files = datalayer.geojson.storage.listdir(root)[1]
     # Flat + gz files, but not latest gz, which is created at first datalayer read.
+    # older and with_old_id should have been removed
     assert len(files) == 5
-    assert os.path.basename(newer) in files
-    assert os.path.basename(medium) in files
-    assert os.path.basename(datalayer.geojson.path) in files
+    assert newer in files
+    assert medium in files
+    assert Path(datalayer.geojson.path).name in files
     # File from another datalayer, purge should have impacted it.
-    assert os.path.basename(other) in files
-    assert os.path.basename(other + ".gz") in files
-    assert os.path.basename(older) not in files
-    assert os.path.basename(older + ".gz") not in files
+    assert other in files
+    assert other + ".gz" in files
+    assert older not in files
+    assert older + ".gz" not in files
+    assert with_old_id not in files
+    assert with_old_id + ".gz" not in files
+    names = [v["name"] for v in datalayer.versions]
+    assert names == [Path(datalayer.geojson.name).name, newer, medium]
 
 
 def test_anonymous_cannot_edit_in_editors_mode(datalayer):

umap/views.py

@@ -1073,7 +1073,8 @@ class DataLayerUpdate(FormLessEditMixin, GZipMixin, UpdateView):
         """
 
         # Use the provided info to find the correct version in our storage.
-        for name in self.object.get_versions():
+        for version in self.object.versions:
+            name = version["name"]
             path = Path(settings.MEDIA_ROOT) / self.object.get_version_path(name)
             if reference_version == self.read_version(path):
                 with open(path) as f:

{umap_project-2.1.1.dist-info → umap_project-2.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 2.1.1
+Version: 2.1.3
 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>
@@ -31,10 +31,10 @@ Provides-Extra: dev
 Requires-Dist: djlint==1.34.1; extra == 'dev'
 Requires-Dist: hatch==1.9.4; extra == 'dev'
 Requires-Dist: isort==5.13.2; extra == 'dev'
-Requires-Dist: mkdocs-material==9.5.14; extra == 'dev'
+Requires-Dist: mkdocs-material==9.5.15; extra == 'dev'
 Requires-Dist: mkdocs==1.5.3; extra == 'dev'
 Requires-Dist: pymdown-extensions==10.7.1; extra == 'dev'
-Requires-Dist: ruff==0.3.3; extra == 'dev'
+Requires-Dist: ruff==0.3.4; extra == 'dev'
 Requires-Dist: vermin==1.6.0; extra == 'dev'
 Provides-Extra: docker
 Requires-Dist: uwsgi==2.0.24; extra == 'docker'
@@ -44,7 +44,7 @@ Requires-Dist: playwright>=1.39; extra == 'test'
 Requires-Dist: pytest-django==4.8.0; extra == 'test'
 Requires-Dist: pytest-playwright==0.4.4; extra == 'test'
 Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
-Requires-Dist: pytest==8.0.2; extra == 'test'
+Requires-Dist: pytest==8.1.1; extra == 'test'
 Description-Content-Type: text/markdown
 
 # uMap project

{umap_project-2.1.1.dist-info → umap_project-2.1.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=phT4pPgO2cSrjTzTxIPA2PX-q_QkUfGy8kd_ZEIi4AA,18
+umap/__init__.py,sha256=quW0BmC9Yqv06BNR-W3csWrRaFrAXIft7Gu-vCG69z0,18
 umap/admin.py,sha256=gL6zrexmDbIKIqOKHCuAM5wtqr8FIQkRtjbcXcNyBrs,749
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/autocomplete.py,sha256=WUsbsVBl_KzzEzxB4g3rAoS5-eEvCZGtelVzXeOFV90,444
@@ -8,11 +8,11 @@ umap/fields.py,sha256=c32tKWKF8aThrCXDJblwo0n9n2ET6hxBYzEupfr0B4o,900
 umap/forms.py,sha256=bpNLMSsB1sHUcaf24MmUpwVdEz_SHy_ohfhQMoKwDzI,3128
 umap/managers.py,sha256=-lBK0xYFRDfX76qDRdLnZOA8jEPYseEwIj8QOiHVM4w,243
 umap/middleware.py,sha256=p8EPW_gYW8Wh2lk0DNIAkZQbYlBZugW7Yq4iiA7L4aE,514
-umap/models.py,sha256=Ol1AqtsSwNXCU67yJxCyWxF8EVpHIWLjZy4rcHPHZn0,17180
+umap/models.py,sha256=HZjDiK46y6D6ZRzKlqqJMBmv20a6M_pn_W6ubYDTrG0,17583
 umap/storage.py,sha256=bdjjdn768fZJYsyDNBxgwLvSu6rhde_Cc6yzyZZDmSg,2282
 umap/urls.py,sha256=frMCdfDQ2QB39xxqI8I12EeT-yChn5KDwDp-kQxp930,6876
 umap/utils.py,sha256=19i8ibi-1IXxafT4k_yOHMhD-DsPH74Ll9qw-UrUkM4,5856
-umap/views.py,sha256=Rveo68dTNeu08PZ5KQO-OTKzuH5HulxrqU-AphHL6lw,41043
+umap/views.py,sha256=N2J9BOP5Yq6ClTy2K_11l34pRIgCL4jwvU_n2K_wM8c,41075
 umap/wsgi.py,sha256=IopIgnDZbCus3XpSetTHnra9VyzWi0Y2tJo-CmfTWCY,1132
 umap/bin/__init__.py,sha256=iA3ON4A6NCpenrn3q2OgefUKF5QRFIQS-FtS0pxruI8,234
 umap/locale/am_ET/LC_MESSAGES/django.mo,sha256=xdPMnJ3Z0fkxocaO7IKexPyomuWUKak01D2T6pVruco,5457
@@ -186,15 +186,15 @@ umap/static/umap/img/source/16.svg,sha256=OHwbeoiEMXfGLSzCauzOdBEkNzCr_sC4sNB1sT
 umap/static/umap/img/source/24-white.svg,sha256=31n0rwyxcoJ69Mm2hvSAifQV0x00px0z-Jkf__UetnA,29369
 umap/static/umap/img/source/24.svg,sha256=rocP2xyMQdigy8noiipCM8hJNOc9tvF4uoXUPFBAjxY,38901
 umap/static/umap/js/umap.autocomplete.js,sha256=h3Ap9towVTChGSSZaMCrhWjQUPCrGcvW6fD46dD3pTs,7740
-umap/static/umap/js/umap.controls.js,sha256=LnfUQ4bGc5NojBx9o-BzAjPCvCE_8NuJ_RZYs7hQjxA,43967
+umap/static/umap/js/umap.controls.js,sha256=1LWARSx_CzxOAfMoyg8FfwW5vOV8xKKPoWoWgATnChU,44898
 umap/static/umap/js/umap.core.js,sha256=aiTfkNI8Z13OiblpYEis6YrRNOObhVn70uikgBkkCIc,26116
 umap/static/umap/js/umap.datalayer.permissions.js,sha256=kpGb7sZKdcSj0QhmGZ56LFtubysc68S48e3YzeXQNNs,1947
-umap/static/umap/js/umap.features.js,sha256=S6WYoRy63H5cvDpxOESWu6xkGksWpSYGbYyOXkWNuUQ,34677
+umap/static/umap/js/umap.features.js,sha256=iMsmunpxNWFITEzVFBm3lqI5r1fuFHMod-6JWf-gMxs,34680
 umap/static/umap/js/umap.forms.js,sha256=KOtUkqVA7rmwi7O5PPqj_t3QusCqkRRbEbc2lcIENY0,26940
 umap/static/umap/js/umap.icon.js,sha256=woRRVru2jSOl0Ah5DAl2vZCTg3rsPeNSoTt57IIcUOg,7546
-umap/static/umap/js/umap.importer.js,sha256=B4kzV0VWrQK7ovIb2LDDdyaDK6tY7Q6TQejXtR8IakM,5305
-umap/static/umap/js/umap.js,sha256=TjWMc3Ardf7wjr895lKM7ZmvoVG8F78_FhtF8VC2rt0,55950
-umap/static/umap/js/umap.layer.js,sha256=nvAihcDr6XFIZ-eSWgKkqXM5GJWmOeuKZBJnL28lkS4,47423
+umap/static/umap/js/umap.importer.js,sha256=1tNOyFguvH4Q9f2WBvmndVYJa-9wocKqrCaDxmpT4a0,5375
+umap/static/umap/js/umap.js,sha256=XbabOc0tBc2sNujYg7IntXwFENuiH-VBZCALs_n15D4,55572
+umap/static/umap/js/umap.layer.js,sha256=ZRdb90lR8fvp4Kq07qWGla6eZAA8SeTfiCKOt_CvSIg,47538
 umap/static/umap/js/umap.permissions.js,sha256=d7M3aoQ4QliSD7lFnCWgoUN4pHax1-6JnerH8BjvubY,6097
 umap/static/umap/js/umap.popup.js,sha256=jZzwRbH3iIJlq35XiZa5Ugnw3KkplWckEgJmW7CAOWY,10108
 umap/static/umap/js/umap.share.js,sha256=36IjZW9Gd_b-1OMD95-hJaKc2etPazILCDNS4iZJqCA,7774
@@ -206,7 +206,7 @@ umap/static/umap/js/modules/browser.js,sha256=-RPyTmnd8_d9FhkmL4wP3DlQHkaoA9QIAd
 umap/static/umap/js/modules/global.js,sha256=tp8tCmAqKlSVNPi7w3n9wiMTb5Wh-DVh_XedZz_Lo60,454
 umap/static/umap/js/modules/i18n.js,sha256=5EmqVuxda24BvXPZb8uOXNc21vHs7Rx8RF9fVZsnTR8,1207
 umap/static/umap/js/modules/leaflet-configure.js,sha256=P3aD8iNGxuVNv-xW4Di4txAjNmnlpKtCCzDvPaKEdQ8,243
-umap/static/umap/js/modules/request.js,sha256=7qMUuC5Q2Ql0U8bbojUMSdGMsWrvyqM364j3uF0sLZs,4001
+umap/static/umap/js/modules/request.js,sha256=v10pLYqFcKeQeMTcjC1Vm9wlp5ehRFKQ65HfT7VrYLY,4007
 umap/static/umap/js/modules/schema.js,sha256=vP60-MU4rRowRrRQzWRQbT9vu4Klrp5sRTAy_ZgYyxQ,8926
 umap/static/umap/js/modules/urls.js,sha256=isqV_dslYuNQIErzf5Wgq-oZqORRK4as6e78sfQgaUo,1308
 umap/static/umap/js/modules/utils.js,sha256=sjCXiF3fb86evhDDJBDSRHjXTYTcKtjeC7SoNpFl680,558
@@ -310,18 +310,14 @@ umap/static/umap/locale/zh_TW.Big5.json,sha256=d4VV9je7iQ8Qz4-gD71uGFHMte4Y26uc8
 umap/static/umap/locale/zh_TW.js,sha256=ulTuzsMAtFe44WMJEzyhnza0Q0qU00_gEl4xSYEhk-A,25141
 umap/static/umap/locale/zh_TW.json,sha256=yBJE01xj58EXPwVZXndmH4lJOae6sbiJZoh5-LdUqOc,24580
 umap/static/umap/test/.eslintrc,sha256=lsy_EQL70iOehznbw1QtRqN858VT9vQAZXg9h2aTX2w,444
-umap/static/umap/test/Choropleth.js,sha256=3iTkpcmaXhfSQzf3A4wZTKITOVBBkpXEHve0aGObV8U,5266
-umap/static/umap/test/DataLayer.js,sha256=8dOWcOAg1N-Q7ppN9PatFxk43NbdSB1vXAF8CBgSSdM,14224
 umap/static/umap/test/Feature.js,sha256=NIW3FD156wwo6UZHbKf56lQfQ3dG9fHBWGPc1DN_XAE,11766
-umap/static/umap/test/Map.js,sha256=7VrgxQ_0uS7kLQe5TsCn7qSDwwDKJ_zYsE7Y_7xwOKc,17448
+umap/static/umap/test/Map.js,sha256=LWCyIKxgUXBM61i3QIPkDubTXGlRhy6N2NdlAnaM_mQ,919
 umap/static/umap/test/Marker.js,sha256=pzMBY-l1xD35OgVCd2FNxEDrBMAhafAyZPAFsV2Gd34,4111
-umap/static/umap/test/Permissions.js,sha256=D2zw97L1bqIwZSG30r0NnbS1YLxGiCNQIKWmRuYuSGM,2239
-umap/static/umap/test/Polygon.js,sha256=3g0pdU05ITImNb7PrS6v1ZorwG-pT7AQEbE_82inaEI,12094
-umap/static/umap/test/Polyline.js,sha256=P3NNlyHYv2wvhreSfI7TWawetPMgiBqA3l1iRQf-FJM,13964
-umap/static/umap/test/TableEditor.js,sha256=NXjGGNzVa5A6SQHuY_uhvu1_EqAFEftFp4cODBSJhMo,3192
+umap/static/umap/test/Polygon.js,sha256=Jrflfe76wmfu8_E3bDLMGG11w-iUmrgL9Oiv4CcCsb8,2320
+umap/static/umap/test/Polyline.js,sha256=5VxRW-b6bnNgyIzDsHM6g5lPci-Td1wY5VPg_umpId0,9374
 umap/static/umap/test/Util.js,sha256=yhcmnlugm-D7ECvyw_RVdsn7sFdnR1XHnMgNiNCZ-XI,17972
 umap/static/umap/test/_pre.js,sha256=O3qaQf-M2SLQ6c7AGIrRwdPm3iULiSTt-KkmAIQnAGg,12960
-umap/static/umap/test/index.html,sha256=24lW8t4Trr1T33bKKmSVivckJ2NxKni4qphlT5BMWCQ,6803
+umap/static/umap/test/index.html,sha256=kWkQbao_Hb1XW23PDzlKn-oTMV6lGgTIsaW5X3COaQE,6685
 umap/static/umap/unittests/URLs.js,sha256=IOifAKSNuCTtmEGdfV6lHBkg6CT0LftgxWlXWLa5_1U,1886
 umap/static/umap/vendors/colorbrewer/colorbrewer.js,sha256=FebyRte_vQrD_CLC8Xjc2cI_bR694S6hDSIu26tDnZ8,24622
 umap/static/umap/vendors/contextmenu/leaflet.contextmenu.min.css,sha256=_pRTmdgpDxfu1Oxb7DnP_DTdA44G-k3kf0otWP8gEnc,990
@@ -427,9 +423,9 @@ umap/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 umap/templatetags/umap_tags.py,sha256=2eOMT_6lGHRNSarfUpVTXggg6E0SN_rjrJKDCt__gF8,1671
 umap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/tests/base.py,sha256=WcrRnmgcTvx9hHekIJsGyVhFwvyNrgT7PYQ6DPwuAZU,4200
-umap/tests/conftest.py,sha256=hlUPzNq7JakJnT2k5LOp7a8CKhHBWhz3v9EwioPOVUg,1367
+umap/tests/conftest.py,sha256=yLFE5sqz61tw_EoZp1nrH-8S49_aStA5Lt1JtZXd-Hg,1498
 umap/tests/settings.py,sha256=qzKYcWzVXUVYxNdv8m7lLV-xkNrV8A8-LWliTJagHOE,716
-umap/tests/test_datalayer.py,sha256=1C2z0VACCime11CMbp9ehbj-knLpW8r6j72EQ_hKLU4,6322
+umap/tests/test_datalayer.py,sha256=HJYSQ11LVQe47nnsXdFeX5Ny4WMDPUYg3frnM5G1IzQ,6888
 umap/tests/test_datalayer_views.py,sha256=AJ-0YBorAgKZaKGd8rSYDguqy8acrz54EaQdfkNOH48,22111
 umap/tests/test_licence.py,sha256=BxNY3gdKhIoc2u5OPmAkmjCp0jJN-Jm-uPOfAZlpOHA,339
 umap/tests/test_map.py,sha256=nX2eE1HJY3bjycXulglK2SY1ybcnjDVgr0yntX6OgyA,3836
@@ -442,38 +438,45 @@ umap/tests/fixtures/choropleth_region_chomage.geojson,sha256=mVVbYlf92Sr3wWH9ETm
 umap/tests/fixtures/circle.svg,sha256=P37vV2PhFPecAtY8qR3VlRuB79_wFaMeqKm2tX-2tkA,254
 umap/tests/fixtures/display_on_load.umap,sha256=eo4ecB3QUeCVu1u7COp7mZ8sCPkf2j4gGERE7N1v8GU,1845
 umap/tests/fixtures/star.svg,sha256=zIi-j16L1Fzxtqz2rV2NDDm1NDHBWQfM5O6MIeoxgEU,256
-umap/tests/fixtures/test_upload_data.csv,sha256=b4RQw68ixs9UMj8TlTucV5YSfbactWhLLuE1yCKUTAY,109
+umap/tests/fixtures/test_upload_data.csv,sha256=KZOO-DcXhdTgx2FrIYZz_ZNZAKOp8zpN_jCyfDw3PcQ,186
 umap/tests/fixtures/test_upload_data.gpx,sha256=sIfeKEGxYikzg121qBdkBIVTFpuYh8q2-yWZOZwbu38,674
 umap/tests/fixtures/test_upload_data.json,sha256=t4PmJtVDhyI1x-E1a36jD8YVSa87T-Vtg8eBmHfQ4KQ,5650
 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_empty_coordinates.json,sha256=-mJ_1orzUAROfE4PXchHXyqxjS-q4tDfvEFPllJiHFU,786
 umap/tests/fixtures/test_upload_missing_name.json,sha256=klSMHb6laTghzU4AdIG1_p5UZ1LbAJCCKnJea0qEFAI,4566
 umap/tests/fixtures/test_upload_non_linear_ring.json,sha256=WOR0NnJHNUUW6VKzZyIxU7WL1llnAmEVJwCWla6XOds,1525
 umap/tests/integration/__init__.py,sha256=nqQ2miDnSZOKDuFhQ5saFN3qQuK73Cs6xL9Od-mEKG4,57
-umap/tests/integration/conftest.py,sha256=XuOKbABI1ugTJyPlJzjSK-6L-_vSs3NaQJdYJbyU-6k,607
-umap/tests/integration/test_anonymous_owned_map.py,sha256=dfx4SQ-K7Un98H1fyeSvv4T573VKgh5gP2Oyvk1ZIIQ,8415
+umap/tests/integration/conftest.py,sha256=yV16s_9uzsMt-myJ4nhzbCzCcefElApCq68daQTjxmw,703
+umap/tests/integration/test_anonymous_owned_map.py,sha256=OMieSBsR5yvB_Wk-cxB6G5NxJy72mHOHmDjmXJtp8E0,8628
 umap/tests/integration/test_basics.py,sha256=1FesSkjNBWi5pEqN0MQlC3kIXTFZzuILq7A5ac9L-3g,1598
-umap/tests/integration/test_browser.py,sha256=p1MvBuojYRh2k2sqVPGEiVKHxo5CbG1PE-ZcALc4Et4,14076
-umap/tests/integration/test_collaborative_editing.py,sha256=KsGmfVt4bkTc5uCOibnXIWlxIudn7wUYE_hy9v8Kiik,9493
+umap/tests/integration/test_browser.py,sha256=YF2U5f0g4RQPCaBFBTrBaLy0dDusy3gQG3dRDORQvaQ,13929
+umap/tests/integration/test_choropleth.py,sha256=6zeqgY6JTtFF7K5vIVXuE37zuN6JJPn_1ccAZLGZZew,3803
+umap/tests/integration/test_collaborative_editing.py,sha256=auvyoGbUJ-xe3HpITrQoCby_X_OZC5tQKUsXASJwtqc,10959
 umap/tests/integration/test_dashboard.py,sha256=k--MGBZsek4ebjCoHbUyv-XNkPbc55aOwxH6a7WuIL0,1173
-umap/tests/integration/test_drawing.py,sha256=tgtUcvHEwbSbC1Up9OtkVguJYmQKZMxXH3CgZmz8jBQ,8825
-umap/tests/integration/test_edit_datalayer.py,sha256=TouE4gFzUuA3tMLSi5tUpvtz0kpGyHXf_feD4UdKQI4,1621
+umap/tests/integration/test_datalayer.py,sha256=ttoR41XDlEfS1z4fZtpHAi0SHnnFD6N_8g-9BRHm8fk,5136
+umap/tests/integration/test_edit_datalayer.py,sha256=LHGaHoAbztnilLytV8c2cTqxk2om9fKT4WfdxZ-2uNU,7872
+umap/tests/integration/test_edit_map.py,sha256=fOc95CtjYNDZuu6hiId9MAP3GizYS75AE96y1fmASRc,500
 umap/tests/integration/test_export_map.py,sha256=Y_sgsT7ZTrrDCx5dLegioJ40GN_PtzK7yRFHTxtIb-4,12738
-umap/tests/integration/test_facets_browser.py,sha256=wRh5h2kQg-ORfHqZKoumeNJ-JSC8CtgNZG7EvJW5SLc,2670
+umap/tests/integration/test_facets_browser.py,sha256=w-7wCLzkcDgzxKfDBekVMl33ajvi3WzjGbede01bydE,3579
 umap/tests/integration/test_features_id_generation.py,sha256=e99_8AxeMAi53JjVGlsI32zlrXGAU19FHJfTuYdiBVQ,1511
-umap/tests/integration/test_import.py,sha256=ufbJl0M5rqGVGmHBZjMhioI9uVETSajevtpnQNJCFOI,2005
-umap/tests/integration/test_map.py,sha256=IY7J47cDhPSylaEh35k9LPx_K8U2Tll_J1JXtyBQPJs,8764
+umap/tests/integration/test_import.py,sha256=2XDbzCxrBMqvwkGEMB44E7QbiU2SHEFwZk_Il5BHzpE,15481
+umap/tests/integration/test_map.py,sha256=Ekj1I7d1y14pkoCrtq8OEhoxXsBNjmyNIAs4E4q07m8,8088
 umap/tests/integration/test_map_preview.py,sha256=4rPQF1zfiwqN7PvwFeB3OagR1wLEMbug0Omcd6zQShQ,2702
-umap/tests/integration/test_owned_map.py,sha256=3Ls3vnHgYtHVsUkeWuS71GtuQCD7nA_12hncWSn5n4A,9029
-umap/tests/integration/test_picto.py,sha256=PKZ7R0XQnNzJodNtmx2R7iDqq0xD2ArHRV8eD6o96k0,9348
+umap/tests/integration/test_owned_map.py,sha256=E5J7wNPkYuWJMkbbTpVCheyRgJ9NVtBzE5SZNDZZiyw,9905
+umap/tests/integration/test_picto.py,sha256=ShQnpiA1yHTYd_BV9kmG3VZ2p2v2COi4Vf3xNwKC_8M,9034
+umap/tests/integration/test_polygon.py,sha256=sL4sOpNAs1h09W455NY8UunVHQHDogS_eGWWfHqOT9s,14335
+umap/tests/integration/test_polyline.py,sha256=FNMXL4a67Qo-Yhr1V0XCGl6kWsiAJLsoFlJJAg7mOxE,12426
 umap/tests/integration/test_querystring.py,sha256=zTEs6S01G7t4MYrxmMyZqS7G8LmDoUAjmkhYeSV32h8,2649
 umap/tests/integration/test_share.py,sha256=gDna-wFedwJ_-8HLBw_G5IO3zA3l96p1FGBSZ15g_7g,1813
 umap/tests/integration/test_slideshow.py,sha256=uLPw4SyhLgpqU4-jrTu5vKSqYuZG7hXjfY8JlEt1JkM,2020
 umap/tests/integration/test_star.py,sha256=icB5SbFbXe4KYp3DIJ0xAwCrSQS2rweqIaQTAng3CfY,842
 umap/tests/integration/test_statics.py,sha256=UqaN2O56yHwn1tEE9I8B1lGnyztDLC0p7_rG6J7vLIs,1494
+umap/tests/integration/test_tableeditor.py,sha256=QIxuMmb1YtibJEgaY92s5Q4Yf7q1Jo974IWsHBord5U,1124
 umap/tests/integration/test_tilelayer.py,sha256=3Jn1KdOM39DuDkLG-P3heDrsCiYvD6_FEnt0EKGjj5g,4141
-umap_project-2.1.1.dist-info/METADATA,sha256=Fsye7JF3PY2Rtm7IiUW3B6RhkoOMIClhr-N0eJs5jJw,2559
-umap_project-2.1.1.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
-umap_project-2.1.1.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-2.1.1.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-2.1.1.dist-info/RECORD,,
+umap_project-2.1.3.dist-info/METADATA,sha256=ia2_saR7oUpY52jT0joF8VL8Q7vFazXJnCmCgp2XM_E,2559
+umap_project-2.1.3.dist-info/WHEEL,sha256=mRYSEL3Ih6g5a_CVMIcwiF__0Ae4_gLYh01YFNwiq1k,87
+umap_project-2.1.3.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-2.1.3.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-2.1.3.dist-info/RECORD,,

umap/static/umap/test/Choropleth.js

@@ -1,245 +0,0 @@
-const POLYGONS = {
-  _umap_options: defaultDatalayerData(),
-  type: 'FeatureCollection',
-  features: [
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 1',
-        value: 45,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [0, 49],
-            [-2, 47],
-            [1, 46],
-            [3, 47],
-            [0, 49],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 2',
-        value: 87,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [0, 49],
-            [2, 50],
-            [6, 49],
-            [4, 47],
-            [0, 49],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 3',
-        value: 673,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [4, 47],
-            [6, 49],
-            [11, 47],
-            [9, 45],
-            [4, 47],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 4',
-        value: 674,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [2, 46],
-            [4, 47],
-            [8, 45],
-            [6, 43],
-            [2, 46],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 5',
-        value: 839,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [-2, 47],
-            [1, 46],
-            [0, 44],
-            [-4, 45],
-            [-2, 47],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 6',
-        value: 3829,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [1, 45],
-            [5, 43],
-            [4, 42],
-            [0, 44],
-            [1, 45],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 7',
-        value: 4900,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [9, 45],
-            [12, 47],
-            [15, 45],
-            [13, 43],
-            [9, 45],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 8',
-        value: 4988,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [7, 43],
-            [9, 45],
-            [12, 43],
-            [10, 42],
-            [7, 43],
-          ],
-        ],
-      },
-    },
-    {
-      type: 'Feature',
-      properties: {
-        name: 'number 9',
-        value: 9898,
-      },
-      geometry: {
-        type: 'Polygon',
-        coordinates: [
-          [
-            [4, 42],
-            [6, 43],
-            [9, 41],
-            [7, 40],
-            [4, 42],
-          ],
-        ],
-      },
-    },
-  ],
-}
-
-describe('U.Choropleth', () => {
-  let path = '/map/99/datalayer/edit/62/',
-    poly1,
-    poly4,
-    poly9,
-    map,
-    datalayer
-
-  before(async () => {
-    fetchMock.mock(/\/datalayer\/62\/\?.*/, JSON.stringify(POLYGONS))
-    map = initMap({ umap_id: 99 })
-    const datalayer_options = defaultDatalayerData()
-    await map.initDataLayers([datalayer_options])
-    datalayer = map.getDataLayerByUmapId(62)
-    datalayer.options.type = 'Choropleth'
-    datalayer.options.choropleth = {
-      property: 'value',
-    }
-    enableEdit()
-    datalayer.eachLayer(function (layer) {
-      if (layer.properties.name === 'number 1') {
-        poly1 = layer
-      } else if (layer.properties.name === 'number 4') {
-        poly4 = layer
-      } else if (layer.properties.name === 'number 9') {
-        poly9 = layer
-      }
-    })
-  })
-  after(() => {
-    fetchMock.restore()
-    resetMap()
-  })
-
-  describe('#init()', () => {
-    it('datalayer should have 9 features', () => {
-      assert.equal(datalayer._index.length, 9)
-    })
-  })
-  describe('#compute()', () => {
-    it('choropleth should compute default colors', () => {
-      datalayer.resetLayer(true)
-      assert.deepEqual(
-        datalayer.layer.options.breaks,
-        [45, 673, 3829, 4900, 9898, 9898]
-      )
-      assert.equal(poly1._path.attributes.fill.value, '#eff3ff')
-      assert.equal(poly4._path.attributes.fill.value, '#bdd7e7')
-      assert.equal(poly9._path.attributes.fill.value, '#3182bd')
-    })
-    it('can change brewer scheme', () => {
-      datalayer.options.choropleth.brewer = 'Reds'
-      datalayer.resetLayer(true)
-      assert.equal(poly1._path.attributes.fill.value, '#fee5d9')
-      assert.equal(poly4._path.attributes.fill.value, '#fcae91')
-      assert.equal(poly9._path.attributes.fill.value, '#de2d26')
-    })
-    it('choropleth should allow to change steps', () => {
-      datalayer.options.choropleth.brewer = 'Blues'
-      datalayer.options.choropleth.classes = 6
-      datalayer.resetLayer(true)
-      assert.equal(poly1._path.attributes.fill.value, '#eff3ff')
-      assert.equal(poly4._path.attributes.fill.value, '#c6dbef')
-      assert.equal(poly9._path.attributes.fill.value, '#3182bd')
-    })
-  })
-})