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

umap/__init__.py

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

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/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/integration/test_import.py

@@ -494,6 +494,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.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: umap-project
-Version: 2.7.1
+Version: 2.7.2
 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-2.7.1.dist-info → umap_project-2.7.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-umap/__init__.py,sha256=9Q043H_lTm3CNUBFKtTHx5hfV_u0qzcsBuYqRMN36U4,18
+umap/__init__.py,sha256=NUyqnQWTVjbgd-Uh6a7vcIXyYuuaRt2kNMLp7-l4x_k,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
@@ -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
@@ -536,7 +536,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=AAZ3WZPgxbRQ1QhAF55RsxbmftNjT2e-ldmSyIol8zA,30256
 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 +554,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.2.dist-info/METADATA,sha256=VejupE32RcK6HSyW6zXkuXtmqDPIMo9V-oXQ8nQkpts,2888
+umap_project-2.7.2.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+umap_project-2.7.2.dist-info/entry_points.txt,sha256=gz-KDQfEsMLBae8ABOD3foJsCYGPW1tA4Y394R_1RW8,39
+umap_project-2.7.2.dist-info/licenses/LICENSE,sha256=kQtrtRKgiPhcl7aO0-lmvbrNAXu7WHyiXvPrUk-TD2Q,820
+umap_project-2.7.2.dist-info/RECORD,,