umap-project 2.7.1__py3-none-any.whl → 2.7.3__py3-none-any.whl

umap/__init__.py

@@ -1 +1 @@
-VERSION = "2.7.1"
+VERSION = "2.7.3"

umap/static/umap/js/modules/formatter.js

@@ -81,6 +81,8 @@ export class Formatter {
       {
         delimiter: 'auto',
         includeLatLon: false,
+        sexagesimal: false,
+        parseLatLon: (raw) => Number.parseFloat(raw.toString().replace(',', '.')),
       },
       (err, result) => {
         // csv2geojson fallback to null geometries when it cannot determine
@@ -115,7 +117,9 @@ export class Formatter {
   }
 
   async fromGeoRSS(str) {
-    const GeoRSSToGeoJSON = await import('../../vendors/georsstogeojson/GeoRSSToGeoJSON.js')
+    const GeoRSSToGeoJSON = await import(
+      '../../vendors/georsstogeojson/GeoRSSToGeoJSON.js'
+    )
     return GeoRSSToGeoJSON.parse(this.toDom(str))
   }
 

umap/static/umap/js/modules/ui/dialog.js

@@ -78,7 +78,6 @@ export default class Dialog extends WithTemplate {
         event.preventDefault()
         this.dialog.returnValue = 'accept'
         this.close()
-        this.dialog.returnValue = undefined
       })
     }
     this.dialog.addEventListener('keydown', (e) => {
@@ -143,6 +142,7 @@ export default class Dialog extends WithTemplate {
 
   close() {
     this.toggle(false)
+    this.dialog.returnValue = undefined
   }
 
   toggle(open = false) {

umap/static/umap/vendors/csv2geojson/csv2geojson.js

@@ -81,6 +81,8 @@ function csv2geojson(x, options, callback) {
     }
 
     options.delimiter = options.delimiter || ',';
+    options.parseLatLon = options.parseLatLon || parseFloat;
+    options.sexagesimal = options.sexagesimal !== false;
 
     var latfield = options.latfield || '',
         lonfield = options.lonfield || '',
@@ -129,6 +131,7 @@ function csv2geojson(x, options, callback) {
 
     if (!latfield) latfield = guessLatHeader(parsed[0]);
     if (!lonfield) lonfield = guessLonHeader(parsed[0]);
+
     var noGeometry = (!latfield || !lonfield);
 
     if (noGeometry) {
@@ -152,13 +155,15 @@ function csv2geojson(x, options, callback) {
                 lonf, latf,
                 a;
 
-            a = sexagesimal(lonk, 'EW');
-            if (a) lonk = a;
-            a = sexagesimal(latk, 'NS');
-            if (a) latk = a;
+            if (options.sexagesimal) {
+                a = sexagesimal(lonk, 'EW');
+                if (a) lonk = a;
+                a = sexagesimal(latk, 'NS');
+                if (a) latk = a;
+            }
 
-            lonf = parseFloat(lonk);
-            latf = parseFloat(latk);
+            lonf = options.parseLatLon(lonk);
+            latf = options.parseLatLon(latk);
 
             if (isNaN(lonf) ||
                 isNaN(latf)) {
@@ -179,8 +184,8 @@ function csv2geojson(x, options, callback) {
                     geometry: {
                         type: 'Point',
                         coordinates: [
-                            parseFloat(lonf),
-                            parseFloat(latf)
+                            lonf,
+                            latf
                         ]
                     }
                 });

umap/tests/base.py

@@ -1,5 +1,6 @@
 import copy
 import json
+from pathlib import Path
 
 import factory
 from django.contrib.auth import get_user_model
@@ -40,7 +41,7 @@ class LicenceFactory(factory.django.DjangoModelFactory):
 
 class TileLayerFactory(factory.django.DjangoModelFactory):
     name = "Test zoom layer"
-    url_template = "http://{s}.test.org/{z}/{x}/{y}.png"
+    url_template = "https://{s}.test.org/osmfr/{z}/{x}/{y}.png"
     attribution = "Test layer attribution"
 
     class Meta:
@@ -150,3 +151,8 @@ def login_required(response):
     redirect_url = reverse("login")
     assert j["login_required"] == redirect_url
     return True
+
+
+def mock_tiles(route):
+    path = Path(__file__).parent / "fixtures/empty_tile.png"
+    route.fulfill(path=path)

umap/tests/integration/conftest.py

@@ -6,6 +6,8 @@ from pathlib import Path
 import pytest
 from playwright.sync_api import expect
 
+from ..base import mock_tiles
+
 
 @pytest.fixture(scope="session")
 def browser_context_args(browser_context_args):
@@ -23,7 +25,7 @@ def set_timeout(context):
 @pytest.fixture(autouse=True)
 def mock_osm_tiles(page):
     if not bool(os.environ.get("PWDEBUG", False)):
-        page.route("*/**/osmfr/**", lambda route: route.fulfill())
+        page.route("*/**/osmfr/**", mock_tiles)
 
 
 @pytest.fixture

umap/tests/integration/test_import.py

@@ -1,5 +1,4 @@
 import json
-import os
 import platform
 import re
 from pathlib import Path
@@ -10,6 +9,7 @@ from playwright.sync_api import expect
 
 from umap.models import DataLayer
 
+from ..base import mock_tiles
 from .helpers import save_and_get_json
 
 pytestmark = pytest.mark.django_db
@@ -72,6 +72,8 @@ def test_umap_import_from_file(live_server, tilelayer, page):
 
 
 def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
+    page.route("https://tile.openstreetmap.fr/hot/**", mock_tiles)
+
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_role("button", name="Open browser").click()
@@ -494,6 +496,39 @@ def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
     expect(page.locator('umap-alert div[data-level="error"]')).to_be_visible()
 
 
+def test_import_csv_with_commas_in_latlon(tilelayer, live_server, page, settings):
+    settings.UMAP_ALLOW_ANONYMOUS = True
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Open browser").click()
+    layers = page.locator(".umap-browser .datalayer")
+    markers = page.locator(".leaflet-marker-icon")
+    page.get_by_title("Import data").click()
+    textarea = page.locator(".umap-upload textarea")
+    textarea.fill("lat;lon;foobar\n12,24;48,34;mypoint\n12,23;48,35;mypoint2")
+    page.locator('select[name="format"]').select_option("csv")
+    page.get_by_role("button", name="Import data", exact=True).click()
+    expect(layers).to_have_count(1)
+    expect(markers).to_have_count(2)
+    with page.expect_response(re.compile(r".*/datalayer/create/.*")):
+        page.get_by_role("button", name="Save").click()
+    datalayer = DataLayer.objects.last()
+    saved_data = json.loads(Path(datalayer.geojson.path).read_text())
+    assert saved_data["features"][0]["geometry"] == {
+        "coordinates": [
+            48.35,
+            12.23,
+        ],
+        "type": "Point",
+    }
+    assert saved_data["features"][1]["geometry"] == {
+        "coordinates": [
+            48.34,
+            12.24,
+        ],
+        "type": "Point",
+    }
+
+
 def test_create_remote_data(page, live_server, tilelayer):
     def handle(route):
         route.fulfill(

{umap_project-2.7.1.dist-info → umap_project-2.7.3.dist-info}/METADATA

@@ -1,10 +1,9 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.7.1
+Version: 2.7.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>
-License-File: LICENSE
 Keywords: django,geodjango,leaflet,map,openstreetmap
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers

{umap_project-2.7.1.dist-info → umap_project-2.7.3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=9Q043H_lTm3CNUBFKtTHx5hfV_u0qzcsBuYqRMN36U4,18
+umap/__init__.py,sha256=zIpjG_2UB2HkyYPrqLS6Yqc8i-nJHx9wup2trY-yyOQ,18
 umap/admin.py,sha256=LoQytPGK6pLBqZ5QgQ9DIPAxhTG31cTtHOCqO9BY5S4,2645
 umap/apps.py,sha256=5ssKqPUuNJlapaBmr4LY_HDb7J1NFCT3wzythxQOOfs,109
 umap/asgi.py,sha256=CuVSNBwNb4AvuaD_Ha3ehtvf-c46ijZoVOSoP6WhXp8,432
@@ -227,7 +227,7 @@ umap/static/umap/js/modules/browser.js,sha256=FXM-Dau0gxqFj77k9FUPBuf6gvrcN6ezsf
 umap/static/umap/js/modules/caption.js,sha256=WVesRXhlIlr5SAiKDv7nOquihvq1pv-dDHsG6i3nQeU,4041
 umap/static/umap/js/modules/dompurify.js,sha256=SOmoM-pTgYCKCKXFo6-znemWPLiLsFgR4lxM_moWaA8,328
 umap/static/umap/js/modules/facets.js,sha256=K4qfnCtgIK7oMkL4YvAvPovHfaCK_aRyW5rl7nAFqK0,4677
-umap/static/umap/js/modules/formatter.js,sha256=rdOA_HQ89euI1ttLm2CXCUdphMc5-oU-69qeV3hk1Rk,4473
+umap/static/umap/js/modules/formatter.js,sha256=AgRVx9mX_ZYmz7H0AgtJBBp6cPbMhv7KMqia0-uEcIY,4596
 umap/static/umap/js/modules/global.js,sha256=8s61zn5EKFfZi7j8Ek1-QOpb1D3uRsTEtb3Uv47IQVU,2005
 umap/static/umap/js/modules/help.js,sha256=k0gUpRf8ik9_okGH7Jv4JOjveNbbvSdk1yV_oZ3kSkQ,9870
 umap/static/umap/js/modules/i18n.js,sha256=dEpjsWoEZa-Tr5_MDO0tuWkt7kLL3crxXqhttyP-khU,1387
@@ -264,7 +264,7 @@ umap/static/umap/js/modules/sync/updaters.js,sha256=WP6hB2gyQKF18hOCy1Ll3UBeYRe2
 umap/static/umap/js/modules/sync/websocket.js,sha256=1UtvsTAm-gkfpBRcLPykPvDyax3mQSxG0KOjWhqnAIU,647
 umap/static/umap/js/modules/ui/base.js,sha256=8PN8TRIBqTANRufwVvV0XzOdaYQuRCnlWGbTGq8FZiM,2491
 umap/static/umap/js/modules/ui/contextmenu.js,sha256=VzC94uGUt8DkzC60Gcbz-MxivfSITEqUC91Fkpq1gjk,2550
-umap/static/umap/js/modules/ui/dialog.js,sha256=fP51HDkucZpXnx1v0h5eAckj77RsADZO_CzPRbjeKSU,5407
+umap/static/umap/js/modules/ui/dialog.js,sha256=Jh2jb4qjxx_eTGAU9cRZHwWhtyk2HFVg7dkP8eCtBLQ,5403
 umap/static/umap/js/modules/ui/panel.js,sha256=aPogrO5AkxHTwtjw6oQri21eyIwDlOKNKp79ZPp2Ogs,3121
 umap/static/umap/js/modules/ui/tooltip.js,sha256=M2KBb5CA4AvaA-6QgfpUKMYQuGXzTqx4ZVA9fkMRBEs,1642
 umap/static/umap/locale/am_ET.js,sha256=oNSeVIZMKnxigBUVokMJSzYjLFGs5u4n2zzNjAtOV0A,33119
@@ -381,7 +381,7 @@ umap/static/umap/unittests/hlc.js,sha256=GvpBaBSgfMs0Zym0_zOs2QldUOcbFNVIKweBhuw
 umap/static/umap/unittests/sync.js,sha256=JSyT4ZwuRF1mMUzLLJzjIs_6iZz8S2iF1imJGLpSdwQ,12751
 umap/static/umap/unittests/utils.js,sha256=oVckWaCK26yR8nX9NlVEL_eVKf0i8Z-UNnK5K9xY9t0,25609
 umap/static/umap/vendors/colorbrewer/colorbrewer.js,sha256=wEHf7UslhI09j7tfzC1V9FLgTbZELDbbtGiL2x0y9vY,23051
-umap/static/umap/vendors/csv2geojson/csv2geojson.js,sha256=Cb88gwY7oibx7WL1Y3bfxc_Cur6yo62nLGaEmzP7Fbw,15530
+umap/static/umap/vendors/csv2geojson/csv2geojson.js,sha256=FARwXdqk_yf3ttJmSyrJ204B9glI2YaZ2vuhaQPmhVk,15712
 umap/static/umap/vendors/dompurify/purify.es.js,sha256=z-0CPcG0TCk11WMdauq46gDt65U61y_i-ltN5dKc500,64057
 umap/static/umap/vendors/dompurify/purify.es.mjs.map,sha256=wzzJMafObQYxw2FUcIM4AJShakCHU1hiEm1MotxK79g,123512
 umap/static/umap/vendors/editable/Leaflet.Editable.js,sha256=5-RlyT7RhocenG85yKIhSPdCvUrpxH2o-lvWS9St5uA,69568
@@ -479,7 +479,7 @@ umap/templates/umap/components/alerts/alert.html,sha256=eQRALES_PzIP3qs16eXq9SGz
 umap/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 umap/templatetags/umap_tags.py,sha256=OumX1AI9uWzNP3zbjexTz7lGp10FweW0NRFSsdQ_cuU,1759
 umap/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-umap/tests/base.py,sha256=VsyFT-cqXEL0scSI69WKUdItfagqOZ3t2omINyVpb1M,4471
+umap/tests/base.py,sha256=gR0wgPfTy6rqFLqAGSG2rHkQiRSbVsg1Qqs5CrSQIQg,4618
 umap/tests/conftest.py,sha256=KQCZanCTl1ABLIKOuyxS_cpBoXGiwjDc29jsLBiSWxY,1633
 umap/tests/settings.py,sha256=tY70LMFXyo_WijswqGyeWai7vBzM62k7IA8pkkbc9y4,816
 umap/tests/test_clean_tilelayer.py,sha256=wGTd_AHOTmQ4QMswAyc-1_lJmQOSyhY3OahLAusEIdA,2515
@@ -500,6 +500,7 @@ umap/tests/fixtures/categorized_highway.geojson,sha256=p7QHOd8nXi7yVq37gY6Ca8BXk
 umap/tests/fixtures/choropleth_region_chomage.geojson,sha256=mVVbYlf92Sr3wWH9ETm43FdHz1U3zjsn91HuU5H5r4Y,21325
 umap/tests/fixtures/circle.svg,sha256=P37vV2PhFPecAtY8qR3VlRuB79_wFaMeqKm2tX-2tkA,254
 umap/tests/fixtures/display_on_load.umap,sha256=eo4ecB3QUeCVu1u7COp7mZ8sCPkf2j4gGERE7N1v8GU,1845
+umap/tests/fixtures/empty_tile.png,sha256=HHezSHZcZimfhpKaSSVOPm14k9OTAyL_eHndptkHGJk,103
 umap/tests/fixtures/star.svg,sha256=zIi-j16L1Fzxtqz2rV2NDDm1NDHBWQfM5O6MIeoxgEU,256
 umap/tests/fixtures/test_circles_layer.geojson,sha256=8S_zh4MA-5qqm43ETKfGz0hw84vuN2cXB1vTz9Syu3k,6454
 umap/tests/fixtures/test_import_osm_relation.json,sha256=SjZFqZ-qnxcrUnVkb43jI9iMBF8Il3-OPqxh62nNH9o,4249
@@ -514,7 +515,7 @@ umap/tests/fixtures/test_upload_georss.xml,sha256=lfmVA0qGDakCG48jjsLmSIE1U6iZ9y
 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=bo-ndi3ARHnkwRGo8fGi6lqTd_LdXWSOpgNyXEMcO0I,2436
+umap/tests/integration/conftest.py,sha256=BQOBTX83QcF_M75ufbEm96cmIUSHn-REAmv3gKdrHaE,2448
 umap/tests/integration/helpers.py,sha256=vvGX5b-DS2fMVDdeXz1lH2IleZkRHjyL7DVvatJU8Do,344
 umap/tests/integration/test_anonymous_owned_map.py,sha256=d7YBsnO79NHRHgdYCYqmyALzeHtV__9dWObtvEfv0VM,10673
 umap/tests/integration/test_basics.py,sha256=_aURyfOJen41AQtTvjQ2pHP5GNc1KVV6NRSspSuxKL0,3760
@@ -536,7 +537,7 @@ umap/tests/integration/test_edit_polygon.py,sha256=JeIW6NcBltIl958uJ_T-0dRCT5gOo
 umap/tests/integration/test_export_map.py,sha256=jH0BXm-7Ov26OEkve9-xKMfRwXwR73zRrZLIQusyUOY,12112
 umap/tests/integration/test_facets_browser.py,sha256=J--y2rpI__0RIPzcTx4Kn2UwuurFdh-6i_Y4c6GxUyY,10658
 umap/tests/integration/test_features_id_generation.py,sha256=e99_8AxeMAi53JjVGlsI32zlrXGAU19FHJfTuYdiBVQ,1511
-umap/tests/integration/test_import.py,sha256=k_lrh8HhMLGtpuzYxREyCi_fAQTZboeq6Wd34_MkgV4,28995
+umap/tests/integration/test_import.py,sha256=uD-gSQmlqYv1-htuuadGBE-VWfA_915o0ToSTaLrNhA,30344
 umap/tests/integration/test_map.py,sha256=2ZO54RFVycJKGczfioX0nU1oCu29FVC9hR6wbT4s1NE,8736
 umap/tests/integration/test_map_list.py,sha256=l1FImKnJkY7DupYX8waKaUZqhnORR20L8dzaqu-eF8E,1280
 umap/tests/integration/test_map_preview.py,sha256=kP0vkEiUN7EJNCvZgNeUAzrrXfgwpU0S2UnmOBV4P5A,3540
@@ -554,8 +555,8 @@ umap/tests/integration/test_view_marker.py,sha256=f_WqtVe0ZfDX_SOeNXFh54ubvhJWeu
 umap/tests/integration/test_view_polygon.py,sha256=NMJC6Nt9VpQ8FIU9Pqq2OspHv49xsWlsoXCr8iBa0VA,2060
 umap/tests/integration/test_view_polyline.py,sha256=n1QVIdl-Xg9yN9o-Jc6VnPhFAuUspsgY0odiUe_jJC4,1598
 umap/tests/integration/test_websocket_sync.py,sha256=pcEoXgEFvLBdmQA_rGa5BcHE2eBe3P0qZ6X3j4goRzQ,12764
-umap_project-2.7.1.dist-info/METADATA,sha256=F5SItQUyySWPv1tWPgUcYWX6msZwnFSLyeYhfBqDBbY,2888
-umap_project-2.7.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-umap_project-2.7.1.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
-umap_project-2.7.1.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
-umap_project-2.7.1.dist-info/RECORD,,
+umap_project-2.7.3.dist-info/METADATA,sha256=Kf1Y2qkgxEHGHAZoAEfNtkNU240TvT3x7pV3gyDSsIw,2866
+umap_project-2.7.3.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+umap_project-2.7.3.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-2.7.3.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-2.7.3.dist-info/RECORD,,

{umap_project-2.7.1.dist-info → umap_project-2.7.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.24.2
+Generator: hatchling 1.26.3
 Root-Is-Purelib: true
 Tag: py3-none-any