umap-project 3.1.2__py3-none-any.whl → 3.3.0__py3-none-any.whl

umap/tests/integration/test_draw_route.py

@@ -0,0 +1,178 @@
+import pytest
+from playwright.sync_api import expect
+
+pytestmark = pytest.mark.django_db
+
+
+def test_route_button_is_hidden(page, live_server, tilelayer, settings):
+    page.goto(f"{live_server.url}/en/map/new/#14/47.7591/2.4134")
+    expect(page.get_by_role("button", name="Draw along routes")).to_be_hidden()
+
+
+def test_draw_route(page, live_server, tilelayer, settings):
+    settings.OPENROUTESERVICE_APIKEY = "FOOBAR="
+    cycling_response = {
+        "type": "FeatureCollection",
+        "bbox": [2.367278, 47.768019, 2.375744, 47.774736],
+        "features": [
+            {
+                "bbox": [2.367278, 47.768019, 2.375744, 47.774736],
+                "type": "Feature",
+                "properties": {
+                    "way_points": [0, 31],
+                    "summary": {"distance": 1228.2, "duration": 308.4},
+                },
+                "geometry": {
+                    "coordinates": [
+                        [2.367419, 47.77416],
+                        [2.367278, 47.774736],
+                        [2.367914, 47.774734],
+                        [2.367982, 47.774676],
+                        [2.368261, 47.774569],
+                        [2.368397, 47.774488],
+                        [2.368517, 47.774396],
+                        [2.368745, 47.77417],
+                        [2.368963, 47.773917],
+                        [2.369246, 47.773728],
+                        [2.369376, 47.773669],
+                        [2.37024, 47.773401],
+                        [2.370303, 47.773393],
+                        [2.370277, 47.7733],
+                        [2.37047, 47.77325],
+                        [2.371473, 47.772904],
+                        [2.371666, 47.772883],
+                        [2.371669, 47.772587],
+                        [2.37161, 47.772529],
+                        [2.371584, 47.772466],
+                        [2.371589, 47.772401],
+                        [2.371672, 47.772301],
+                        [2.371801, 47.77225],
+                        [2.371875, 47.772172],
+                        [2.371966, 47.771983],
+                        [2.372052, 47.77171],
+                        [2.373877, 47.768035],
+                        [2.374129, 47.768118],
+                        [2.374149, 47.768088],
+                        [2.374132, 47.768019],
+                        [2.375642, 47.768538],
+                        [2.375744, 47.768386],
+                    ],
+                    "type": "LineString",
+                },
+            }
+        ],
+        "metadata": {
+            "attribution": "openrouteservice.org | OpenStreetMap contributors",
+            "service": "routing",
+            "timestamp": 1753716213909,
+            "query": {
+                "coordinates": [[2.367039, 47.774118], [2.375622, 47.768349]],
+                "profile": "cycling-regular",
+                "profileName": "cycling-regular",
+                "preference": "recommended",
+                "format": "geojson",
+                "geometry_simplify": True,
+            },
+            "engine": {
+                "version": "9.3.0",
+                "build_date": "2025-06-06T15:39:25Z",
+                "graph_date": "2025-06-22T07:54:02Z",
+                "osm_date": "1970-01-01T00:00:00Z",
+            },
+        },
+    }
+
+    car_response = {
+        "type": "FeatureCollection",
+        "bbox": [2.367278, 47.768035, 2.375458, 47.774736],
+        "features": [
+            {
+                "bbox": [2.367278, 47.768035, 2.375458, 47.774736],
+                "type": "Feature",
+                "properties": {
+                    "way_points": [0, 17],
+                    "summary": {"distance": 1283.8, "duration": 160.8},
+                },
+                "geometry": {
+                    "coordinates": [
+                        [2.367419, 47.77416],
+                        [2.367278, 47.774736],
+                        [2.367476, 47.774736],
+                        [2.367495, 47.774429],
+                        [2.367601, 47.773963],
+                        [2.367799, 47.773307],
+                        [2.368261, 47.772056],
+                        [2.370046, 47.772198],
+                        [2.371213, 47.772406],
+                        [2.371469, 47.772383],
+                        [2.371625, 47.772341],
+                        [2.371672, 47.772301],
+                        [2.371801, 47.77225],
+                        [2.371875, 47.772172],
+                        [2.371966, 47.771983],
+                        [2.372052, 47.77171],
+                        [2.373877, 47.768035],
+                        [2.375458, 47.768569],
+                    ],
+                    "type": "LineString",
+                },
+            }
+        ],
+        "metadata": {
+            "attribution": "openrouteservice.org | OpenStreetMap contributors",
+            "service": "routing",
+            "timestamp": 1753717466321,
+            "query": {
+                "coordinates": [[2.367039, 47.774118], [2.375622, 47.768349]],
+                "profile": "driving-car",
+                "profileName": "driving-car",
+                "preference": "recommended",
+                "format": "geojson",
+                "geometry_simplify": True,
+            },
+            "engine": {
+                "version": "9.3.0",
+                "build_date": "2025-06-06T15:39:25Z",
+                "graph_date": "2025-06-23T11:47:36Z",
+                "osm_date": "1970-01-01T00:00:00Z",
+            },
+        },
+    }
+
+    def handle_cycling(route):
+        route.fulfill(json=cycling_response)
+
+    def handle_car(route):
+        route.fulfill(json=car_response)
+
+    # Intercept the route
+    page.route(
+        "https://api.openrouteservice.org/v2/directions/cycling-regular/geojson",
+        handle_cycling,
+    )
+    page.route(
+        "https://api.openrouteservice.org/v2/directions/driving-car/geojson",
+        handle_car,
+    )
+    page.goto(f"{live_server.url}/en/map/new/#14/47.7591/2.4134")
+    expect(page.locator("path")).to_be_hidden()
+    expect(page.locator(".leaflet-vertex-icon")).to_be_hidden()
+    page.get_by_role("button", name="Draw along routes").click()
+    page.locator('select[name="profile"]').select_option("cycling-regular")
+    page.get_by_role("button", name="OK").click()
+    page.locator("#map").click(position={"x": 100, "y": 100})
+    page.locator("#map").click(position={"x": 200, "y": 200})
+    page.locator("#map").click(position={"x": 200, "y": 200})
+    expect(page.locator("path")).to_be_visible()
+    expect(page.locator(".leaflet-vertex-icon")).to_have_count(2)
+    page.get_by_text("Advanced actions").click()
+    page.get_by_role("button", name="Transform to regular line").click()
+    expect(page.locator(".leaflet-vertex-icon")).to_have_count(32)
+    page.get_by_text("Advanced actions").click()
+    page.get_by_role("button", name="Restore route").click()
+    expect(page.locator(".leaflet-vertex-icon")).to_have_count(2)
+    page.locator('#edit-route select[name="profile"]').select_option("driving-car")
+    page.get_by_role("button", name="Compute route").click()
+    page.get_by_text("Advanced actions").click()
+    page.get_by_role("button", name="Transform to regular line").click()
+    expect(page.locator(".leaflet-vertex-icon")).to_have_count(18)

umap/tests/integration/test_edit_datalayer.py

@@ -221,7 +221,7 @@ def test_deleting_datalayer_should_remove_from_caption(
 def test_can_edit_datalayer_name_in_list(live_server, openmap, datalayer, page):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     page.get_by_role("button", name="Manage layers").click()
-    page.get_by_text("test datalayer").click()
+    page.get_by_text("test datalayer").dblclick()
     page.get_by_text("test datalayer").fill("test datalayer foobar")
     page.get_by_role("button", name="Open browser").click()
     expect(

umap/tests/integration/test_edit_map.py

@@ -99,7 +99,7 @@ def test_map_color_impacts_data(live_server, page, tilelayer):
     page.get_by_title("Lime", exact=True).click()
 
     # Assert the new color was used
-    marker_style = page.locator(".leaflet-marker-icon .icon_container").get_attribute(
+    marker_style = page.locator(".leaflet-marker-icon .icon-container").get_attribute(
         "style"
     )
     assert "lime" in marker_style

umap/tests/integration/test_edit_marker.py

@@ -47,11 +47,11 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     page.locator(".panel").get_by_title("Edit", exact=True).click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-color .define").click()
-    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+    expect(page.locator(".leaflet-marker-icon .icon-container")).to_have_css(
         "background-color", "rgb(0, 0, 139)"
     )
     page.get_by_title("DarkRed").first.click()
-    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+    expect(page.locator(".leaflet-marker-icon .icon-container")).to_have_css(
         "background-color", "rgb(139, 0, 0)"
     )
 
@@ -60,7 +60,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     page.get_by_text("Shape properties").click()
     page.locator("#umap-feature-shape-properties").get_by_text("define").first.click()
     page.get_by_title("GoldenRod", exact=True).click()
-    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+    expect(page.locator(".leaflet-marker-icon .icon-container")).to_have_css(
         "background-color", "rgb(218, 165, 32)"
     )
 
@@ -70,14 +70,14 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-color input").click()
     page.get_by_title("DarkViolet").first.click()
-    expect(page.locator(".leaflet-marker-icon .icon_container")).to_have_css(
+    expect(page.locator(".leaflet-marker-icon .icon-container")).to_have_css(
         "background-color", "rgb(218, 165, 32)"
     )
 
 
 def test_should_open_an_edit_toolbar_on_click(live_server, openmap, page, bootstrap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.locator(".leaflet-marker-icon").click()
+    page.locator(".leaflet-marker-icon").click(button="right")
     expect(page.get_by_role("button", name="Toggle edit mode")).to_be_visible()
     expect(page.get_by_role("button", name="Delete this feature")).to_be_visible()
 
@@ -111,10 +111,10 @@ def test_should_follow_datalayer_style_when_changing_datalayer(
         },
     )
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    marker = page.locator(".leaflet-marker-icon .icon_container")
+    marker = page.locator(".leaflet-marker-icon .icon-container")
     expect(marker).to_have_css("background-color", "rgb(0, 139, 139)")
     # Change datalayer
-    marker.click()
+    marker.click(button="right")
     page.get_by_role("button", name="Toggle edit mode (⇧+Click)").click()
     page.locator(".umap-field-datalayer select").select_option(label="other datalayer")
     expect(marker).to_have_css("background-color", "rgb(148, 0, 211)")
@@ -125,7 +125,7 @@ def test_add_property_from_feature_properties_panel(
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     page.locator(".leaflet-marker-icon").click(modifiers=["Shift"])
-    page.get_by_role("button", name="Add a new property").click()
+    page.get_by_role("button", name="Add a new field").click()
     page.locator('input[name="prompt"]').fill("newprop")
     page.get_by_role("button", name="OK").click()
     expect(page.locator(".panel.right").get_by_text("newprop")).to_be_visible()

umap/tests/integration/test_edit_polygon.py

@@ -87,7 +87,7 @@ def test_marker_style_should_have_precedence(live_server, openmap, page, bootstr
 
 def test_should_open_an_edit_toolbar_on_click(live_server, openmap, page, bootstrap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.locator("path").click()
+    page.locator("path").click(button="right")
     expect(page.get_by_role("button", name="Toggle edit mode")).to_be_visible()
     expect(page.get_by_role("button", name="Delete this feature")).to_be_visible()
 
@@ -97,7 +97,7 @@ def test_can_remove_stroke(live_server, openmap, page, bootstrap):
     expect(page.locator(".leaflet-overlay-pane path[stroke='DarkBlue']")).to_have_count(
         1
     )
-    page.locator("path").click()
+    page.locator("path").click(button="right")
     page.get_by_role("button", name="Toggle edit mode").click()
     page.get_by_text("Shape properties").click()
     page.locator(".umap-field-stroke .define").first.click()

umap/tests/integration/test_export_map.py

@@ -38,7 +38,7 @@ DATALAYER_DATA = {
                 "_umap_options": {
                     "color": "OliveDrab",
                 },
-                "name": "test",
+                "name": "test one",
                 "description": "Some description",
             },
             "id": "QwNjg",
@@ -54,7 +54,7 @@ DATALAYER_DATA = {
                     "fill": False,
                     "opacity": 0.6,
                 },
-                "name": "test",
+                "name": "test two",
             },
             "id": "YwMTM",
             "geometry": {
@@ -104,6 +104,16 @@ def test_umap_export(map, live_server, bootstrap, page):
                     "browsable": True,
                     "displayOnLoad": True,
                     "name": "test datalayer",
+                    "fields": [
+                        {
+                            "key": "name",
+                            "type": "String",
+                        },
+                        {
+                            "key": "description",
+                            "type": "Text",
+                        },
+                    ],
                 },
                 "features": [
                     {
@@ -133,7 +143,7 @@ def test_umap_export(map, live_server, bootstrap, page):
                         "id": "QwNjg",
                         "properties": {
                             "_umap_options": {"color": "OliveDrab"},
-                            "name": "test",
+                            "name": "test one",
                             "description": "Some description",
                         },
                         "type": "Feature",
@@ -154,7 +164,7 @@ def test_umap_export(map, live_server, bootstrap, page):
                         "id": "YwMTM",
                         "properties": {
                             "_umap_options": {"fill": False, "opacity": 0.6},
-                            "name": "test",
+                            "name": "test two",
                         },
                         "type": "Feature",
                     },
@@ -200,8 +210,8 @@ def test_csv_export(map, live_server, bootstrap, page):
         path.read_text()
         == """name,Latitude,Longitude,description
 name poly,53.0072070131872,12.182431646910137,
-test,52.57635,-0.274658,Some description
-test,53.725145179688646,2.9700064980570517,"""
+test one,52.57635,-0.274658,Some description
+test two,53.725145179688646,2.9700064980570517,"""
     )
 
 
@@ -218,7 +228,7 @@ def test_gpx_export(map, live_server, bootstrap, page):
     download.save_as(path)
     assert (
         path.read_text()
-        == """<?xml version="1.0" encoding="UTF-8"?><gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="@dwayneparton/geojson-to-gpx"><wpt lat="52.57635" lon="-0.274658"><name>test</name><desc>Some description</desc></wpt><trk><name>test</name><trkseg><trkpt lat="54.476422" lon="-0.571289"/><trkpt lat="54.610255" lon="0.439453"/><trkpt lat="53.448807" lon="1.724854"/><trkpt lat="53.988395" lon="4.163818"/><trkpt lat="53.533778" lon="5.306396"/><trkpt lat="53.709714" lon="6.591797"/><trkpt lat="53.350551" lon="7.042236"/></trkseg></trk></gpx>"""
+        == """<?xml version="1.0" encoding="UTF-8"?><gpx xmlns="http://www.topografix.com/GPX/1/1" version="1.1" creator="@dwayneparton/geojson-to-gpx"><wpt lat="52.57635" lon="-0.274658"><name>test one</name><desc>Some description</desc></wpt><trk><name>test two</name><trkseg><trkpt lat="54.476422" lon="-0.571289"/><trkpt lat="54.610255" lon="0.439453"/><trkpt lat="53.448807" lon="1.724854"/><trkpt lat="53.988395" lon="4.163818"/><trkpt lat="53.533778" lon="5.306396"/><trkpt lat="53.709714" lon="6.591797"/><trkpt lat="53.350551" lon="7.042236"/></trkseg></trk></gpx>"""
     )
 
 
@@ -234,7 +244,7 @@ def test_kml_export(map, live_server, bootstrap, page):
     download.save_as(path)
     assert (
         path.read_text()
-        == """<kml xmlns="http://www.opengis.net/kml/2.2"><Document>\n<Placemark id="gyNzM">\n<name>name poly</name><ExtendedData></ExtendedData>\n  <Polygon>\n<outerBoundaryIs>\n  <LinearRing><coordinates>11.25,53.585984\n10.151367,52.975108\n12.689209,52.167194\n14.084473,53.199452\n12.634277,53.618579\n11.25,53.585984\n11.25,53.585984</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark>\n<Placemark id="QwNjg">\n<name>test</name><description>Some description</description><ExtendedData>\n  <Data name="_umap_options"><value>{"color":"OliveDrab"}</value></Data></ExtendedData>\n  <Point><coordinates>-0.274658,52.57635</coordinates></Point></Placemark>\n<Placemark id="YwMTM">\n<name>test</name><ExtendedData>\n  <Data name="_umap_options"><value>{"fill":false,"opacity":0.6}</value></Data></ExtendedData>\n  <LineString><coordinates>-0.571289,54.476422\n0.439453,54.610255\n1.724854,53.448807\n4.163818,53.988395\n5.306396,53.533778\n6.591797,53.709714\n7.042236,53.350551</coordinates></LineString></Placemark></Document></kml>"""
+        == """<kml xmlns="http://www.opengis.net/kml/2.2"><Document>\n<Placemark id="gyNzM">\n<name>name poly</name><ExtendedData></ExtendedData>\n  <Polygon>\n<outerBoundaryIs>\n  <LinearRing><coordinates>11.25,53.585984\n10.151367,52.975108\n12.689209,52.167194\n14.084473,53.199452\n12.634277,53.618579\n11.25,53.585984\n11.25,53.585984</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark>\n<Placemark id="QwNjg">\n<name>test one</name><description>Some description</description><ExtendedData>\n  <Data name="_umap_options"><value>{"color":"OliveDrab"}</value></Data></ExtendedData>\n  <Point><coordinates>-0.274658,52.57635</coordinates></Point></Placemark>\n<Placemark id="YwMTM">\n<name>test two</name><ExtendedData>\n  <Data name="_umap_options"><value>{"fill":false,"opacity":0.6}</value></Data></ExtendedData>\n  <LineString><coordinates>-0.571289,54.476422\n0.439453,54.610255\n1.724854,53.448807\n4.163818,53.988395\n5.306396,53.533778\n6.591797,53.709714\n7.042236,53.350551</coordinates></LineString></Placemark></Document></kml>"""
     )
 
 
@@ -274,7 +284,58 @@ def test_geojson_export(map, live_server, bootstrap, page):
                 "id": "QwNjg",
                 "properties": {
                     "_umap_options": {"color": "OliveDrab"},
-                    "name": "test",
+                    "name": "test one",
+                    "description": "Some description",
+                },
+                "type": "Feature",
+            },
+            {
+                "geometry": {
+                    "coordinates": [
+                        [-0.571289, 54.476422],
+                        [0.439453, 54.610255],
+                        [1.724854, 53.448807],
+                        [4.163818, 53.988395],
+                        [5.306396, 53.533778],
+                        [6.591797, 53.709714],
+                        [7.042236, 53.350551],
+                    ],
+                    "type": "LineString",
+                },
+                "id": "YwMTM",
+                "properties": {
+                    "_umap_options": {"fill": False, "opacity": 0.6},
+                    "name": "test two",
+                },
+                "type": "Feature",
+            },
+        ],
+        "type": "FeatureCollection",
+    }
+
+
+def test_export_should_respect_filters(map, live_server, bootstrap, page):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    page.locator("summary").filter(has_text="Filters").locator("i").click()
+    page.get_by_role("textbox", name="Search map features…").fill("test")
+    page.wait_for_timeout(300)  # Wait for debounce
+    page.get_by_role("button", name="Share and download").click()
+    button = page.get_by_role("button", name="geojson")
+    expect(button).to_be_visible()
+    with page.expect_download() as download_info:
+        button.click()
+    download = download_info.value
+    assert download.suggested_filename == "test_map.geojson"
+    path = Path("/tmp/") / download.suggested_filename
+    download.save_as(path)
+    assert json.loads(path.read_text()) == {
+        "features": [
+            {
+                "geometry": {"coordinates": [-0.274658, 52.57635], "type": "Point"},
+                "id": "QwNjg",
+                "properties": {
+                    "_umap_options": {"color": "OliveDrab"},
+                    "name": "test one",
                     "description": "Some description",
                 },
                 "type": "Feature",
@@ -295,10 +356,23 @@ def test_geojson_export(map, live_server, bootstrap, page):
                 "id": "YwMTM",
                 "properties": {
                     "_umap_options": {"fill": False, "opacity": 0.6},
-                    "name": "test",
+                    "name": "test two",
                 },
                 "type": "Feature",
             },
         ],
         "type": "FeatureCollection",
     }
+
+
+def test_png_export(map, live_server, bootstrap, page):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?share#6/53.406/6.757")
+    page.get_by_role("button", name="png").click()
+    with page.expect_download() as download_info:
+        page.get_by_role("button", name="Download", exact=True).click()
+    download = download_info.value
+    assert download.suggested_filename == "test_map.png"
+    path = Path("/tmp/") / download.suggested_filename
+    download.save_as(path)
+    # Something has been saved…
+    assert path.read_bytes()

umap/tests/integration/test_import.py

@@ -557,6 +557,38 @@ def test_import_multipolyline(live_server, page, tilelayer):
     expect(paths).to_have_count(1)
 
 
+def test_import_false_multipoint(live_server, page, tilelayer):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "geometry": {
+                    "coordinates": [[1.43661447777346, 43.59853484073553]],
+                    "type": "MultiPoint",
+                },
+                "properties": {"name": "foo bar"},
+            }
+        ],
+    }
+    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")
+    expect(markers).to_have_count(0)
+    expect(layers).to_have_count(0)
+    button = page.get_by_title("Import data")
+    expect(button).to_be_visible()
+    button.click()
+    textarea = page.locator(".umap-import textarea")
+    textarea.fill(json.dumps(data))
+    page.locator('select[name="format"]').select_option("geojson")
+    page.get_by_role("button", name="Import data", exact=True).click()
+    # A layer has been created
+    expect(layers).to_have_count(1)
+    expect(markers).to_have_count(1)
+
+
 def test_should_not_import_empty_coordinates(live_server, page, tilelayer):
     data = {
         "type": "FeatureCollection",
@@ -670,6 +702,114 @@ def test_import_csv_with_commas_in_latlon(tilelayer, live_server, page, settings
     }
 
 
+def test_import_csv_with_wkt_geom(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")
+    paths = page.locator("path")
+    page.get_by_title("Import data").click()
+    textarea = page.locator(".umap-import textarea")
+    textarea.fill(
+        "geom;foobar\nPOLYGON ((-64.8 32.3, -65.5 18.3, -80.3 25.2, -64.8 32.3));mypoly\nPOINT(48.35 12.23);mypoint"
+    )
+    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(1)
+    expect(paths).to_have_count(1)
+    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": [
+            [
+                [
+                    -64.8,
+                    32.3,
+                ],
+                [
+                    -65.5,
+                    18.3,
+                ],
+                [
+                    -80.3,
+                    25.2,
+                ],
+                [
+                    -64.8,
+                    32.3,
+                ],
+            ],
+        ],
+        "type": "Polygon",
+    }
+
+
+def test_import_csv_with_geojson_geom(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")
+    paths = page.locator("path")
+    page.get_by_title("Import data").click()
+    textarea = page.locator(".umap-import textarea")
+    textarea.fill(
+        "geojson;foobar\n"
+        '{"coordinates": [[[-64.8,32.3],[-65.5,18.3],[-80.3,25.2],[-64.8,32.3]]],"type": "Polygon"};mypoly\n'
+        '{"coordinates": [48.35,12.23],"type": "Point"};mypoint'
+    )
+    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(1)
+    expect(paths).to_have_count(1)
+    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": [
+            [
+                [
+                    -64.8,
+                    32.3,
+                ],
+                [
+                    -65.5,
+                    18.3,
+                ],
+                [
+                    -80.3,
+                    25.2,
+                ],
+                [
+                    -64.8,
+                    32.3,
+                ],
+            ],
+        ],
+        "type": "Polygon",
+    }
+
+
 def test_create_remote_data(page, live_server, tilelayer):
     def handle(route):
         route.fulfill(

umap/tests/integration/test_map_preview.py

@@ -104,7 +104,7 @@ def test_map_preview_can_load_csv_in_querystring(page, live_server, tilelayer):
 
 def test_map_preview_can_change_styling_from_querystring(page, live_server, tilelayer):
     page.goto(f"{live_server.url}/map/?data={quote(json.dumps(GEOJSON))}&color=DarkRed")
-    markers = page.locator(".leaflet-marker-icon .icon_container")
+    markers = page.locator(".leaflet-marker-icon .icon-container")
     expect(markers).to_have_count(1)
     expect(markers).to_have_css("background-color", "rgb(139, 0, 0)")