umap-project 2.9.0b0__py3-none-any.whl → 2.9.1__py3-none-any.whl

umap/tests/integration/test_import.py

@@ -17,15 +17,15 @@ pytestmark = pytest.mark.django_db
 def test_layers_list_is_updated(live_server, tilelayer, page):
     page.goto(f"{live_server.url}/map/new/")
     modifier = "Cmd" if platform.system() == "Darwin" else "Ctrl"
-    page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
+    page.get_by_role("button", name=f"Import data ({modifier}+I)").click()
     # Should work
     page.locator("[name=layer-id]").select_option(label="Import in a new layer")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Add a layer").click()
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("foobar")
     page.wait_for_timeout(300)  # Time for the input debounce.
-    page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
+    page.get_by_role("button", name=f"Import data ({modifier}+I)").click()
     # Should still work
     page.locator("[name=layer-id]").select_option(label="Import in a new layer")
     # Now layer should be visible in the options
@@ -76,7 +76,7 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_role("button", name="Open browser").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("umap")
@@ -111,7 +111,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.json"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("geojson")
@@ -136,7 +136,7 @@ def test_import_invalid_data(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     textarea.fill("invalid data")
     for format in ["geojson", "csv", "gpx", "kml", "georss", "osm", "umap"]:
         page.locator('select[name="format"]').select_option(format)
@@ -156,7 +156,7 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.kml"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("kml")
@@ -180,7 +180,7 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page, settings):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.gpx"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("gpx")
@@ -237,7 +237,7 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data_osm.json"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("osm")
@@ -257,7 +257,7 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
@@ -276,7 +276,7 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
@@ -297,7 +297,7 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
@@ -318,7 +318,7 @@ def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
     expect(layers).to_have_count(1)
     page.get_by_role("button", name="Edit").click()
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator("select[name=format]").select_option("csv")
@@ -364,7 +364,7 @@ def test_should_remove_dot_in_property_names(live_server, page, settings, tilela
     }
     page.goto(f"{live_server.url}/map/new/")
     page.get_by_title("Import data").click()
-    textarea = page.locator(".umap-upload textarea")
+    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()
@@ -425,7 +425,7 @@ def test_import_geometry_collection(live_server, page, tilelayer):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    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()
@@ -459,7 +459,7 @@ def test_import_multipolygon(live_server, page, tilelayer):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    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()
@@ -491,7 +491,7 @@ def test_import_multipolyline(live_server, page, tilelayer):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    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()
@@ -500,13 +500,77 @@ def test_import_multipolyline(live_server, page, tilelayer):
     expect(paths).to_have_count(1)
 
 
+def test_should_not_import_empty_coordinates(live_server, page, tilelayer):
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "An empty polygon"},
+                "geometry": {
+                    "type": "Polygon",
+                    "coordinates": [],
+                },
+            },
+            {
+                "type": "Feature",
+                "properties": {"name": "An empty linestring"},
+                "geometry": {
+                    "type": "LineString",
+                    "coordinates": [],
+                },
+            },
+            {
+                "type": "Feature",
+                "properties": {"name": "An empty point"},
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": [],
+                },
+            },
+            {
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": [6.922931671142578, 47.481161607175736],
+                },
+                "type": "Feature",
+                "properties": {"name": "A point"},
+            },
+            {
+                "geometry": {
+                    "type": "LineString",
+                    "coordinates": [
+                        [2.4609375, 48.88639177703194],
+                        [2.48291015625, 48.76343113791796],
+                        [2.164306640625, 48.719961222646276],
+                    ],
+                },
+                "type": "Feature",
+                "properties": {
+                    "name": "A linestring",
+                },
+            },
+        ],
+    }
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_title("Open browser").click()
+    page.get_by_title("Import data").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()
+    page.locator("#map").click(button="right")
+    page.get_by_role("button", name="browse data").click()
+    expect(page.locator("li.feature")).to_have_count(2)
+
+
 def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
     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 = page.locator(".umap-import textarea")
     textarea.fill("a,b,c\n12.23,48.34,mypoint\n12.23,48.34,mypoint2")
     page.locator('select[name="format"]').select_option("csv")
     page.get_by_role("button", name="Import data", exact=True).click()
@@ -523,7 +587,7 @@ def test_import_csv_with_commas_in_latlon(tilelayer, live_server, page, settings
     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 = page.locator(".umap-import 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()
@@ -571,14 +635,14 @@ def test_create_remote_data(page, live_server, tilelayer):
     page.route("*/**/ajax-proxy/**", handle)
     page.goto(f"{live_server.url}/map/new/")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_placeholder("Provide an URL here").click()
     page.get_by_placeholder("Provide an URL here").fill("https://remote.org/data.json")
     page.locator("[name=format]").select_option("geojson")
     page.get_by_role("radio", name="Link to the layer as remote data").click()
     page.get_by_role("button", name="Import data", exact=True).click()
     expect(page.locator(".leaflet-marker-icon")).to_be_visible()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Edit", exact=True).click()
     page.locator("summary").filter(has_text="Remote data").click()
     expect(page.locator('.panel input[name="url"]')).to_have_value(
@@ -608,14 +672,14 @@ def test_import_geojson_from_url(page, live_server, tilelayer):
     page.route("https://remote.org/data.json", handle)
     page.goto(f"{live_server.url}/map/new/")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_placeholder("Provide an URL here").click()
     page.get_by_placeholder("Provide an URL here").fill("https://remote.org/data.json")
     page.locator("[name=format]").select_option("geojson")
     page.get_by_role("radio", name="Copy into the layer").click()
     page.get_by_role("button", name="Import data", exact=True).click()
     expect(page.locator(".leaflet-marker-icon")).to_be_visible()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Edit", exact=True).click()
     page.locator("summary").filter(has_text="Remote data").click()
     expect(page.locator('.panel input[name="url"]')).to_have_value("")
@@ -626,7 +690,7 @@ def test_overpass_import_with_bbox(page, live_server, tilelayer, settings):
         "overpass": {"url": "https://my.overpass.io/interpreter"}
     }
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_role("button", name="Import helpers").click()
     page.get_by_role("button", name="Overpass").click()
     page.get_by_placeholder("amenity=drinking_water").fill("building")
@@ -677,7 +741,7 @@ def test_overpass_import_retains_boundary(page, live_server, tilelayer, settings
     # Intercept the route
     page.route(re.compile("https://foobar.io/api.*"), handle)
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_role("button", name="Import data").click()
     page.get_by_role("button", name="Import helpers").click()
     page.get_by_role("button", name="Overpass").click()
     page.get_by_placeholder("amenity=drinking_water").fill("building")
@@ -732,7 +796,7 @@ def test_import_from_datasets(page, live_server, tilelayer, settings):
     page.route("https://remote.org/data.json", handle)
     page.goto(f"{live_server.url}/map/new/")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
-    page.get_by_role("link", name="Import data").click()
+    page.get_by_title("Import data").click()
     page.get_by_role("button", name="Import helpers").click()
     page.get_by_role("button", name="Datasets").click()
     page.get_by_role("dialog").get_by_role("combobox").select_option(
@@ -740,7 +804,7 @@ def test_import_from_datasets(page, live_server, tilelayer, settings):
     )
     page.get_by_role("button", name="Choose this dataset").click()
     page.get_by_label("Copy into the layer").check()
-    page.get_by_role("button", name="Import data").click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     expect(page.locator(".leaflet-marker-icon")).to_be_visible()
     page.get_by_role("button", name="Open browser").click()
     expect(page.locator("h5").get_by_text("Good data")).to_be_visible()
@@ -758,7 +822,7 @@ def test_import_osm_relation(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     file_path = Path(__file__).parent.parent / "fixtures/test_import_osm_relation.json"
     textarea.fill(file_path.read_text())
     page.locator('select[name="format"]').select_option("osm")
@@ -778,7 +842,7 @@ def test_import_georss_from_textarea(tilelayer, live_server, page):
     button = page.get_by_title("Import data")
     expect(button).to_be_visible()
     button.click()
-    textarea = page.locator(".umap-upload textarea")
+    textarea = page.locator(".umap-import textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_georss.xml"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("georss")

umap/tests/integration/test_owned_map.py

@@ -239,7 +239,7 @@ def test_can_delete_datalayer(live_server, map, login, datalayer):
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(1)
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel.right").get_by_title("Delete layer").click()
     page.get_by_role("button", name="OK").click()
     with page.expect_response(re.compile(r".*/datalayer/delete/.*")):

umap/tests/integration/test_save.py

@@ -5,7 +5,7 @@ def test_reseting_map_would_remove_from_save_queue(
     live_server, openmap, page, datalayer
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.get_by_role("link", name="Edit map name and caption").click()
+    page.get_by_role("button", name="Edit map name and caption").click()
     requests = []
 
     def register_request(request):
@@ -20,7 +20,7 @@ def test_reseting_map_would_remove_from_save_queue(
     page.get_by_role("button", name="OK").click()
     page.wait_for_timeout(500)
     page.get_by_role("button", name="Edit").click()
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.get_by_role("button", name="Edit", exact=True).click()
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("new datalayer name")

umap/tests/integration/test_tableeditor.py

@@ -67,7 +67,7 @@ DATALAYER_DATA = {
 
 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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     page.get_by_text("Add a new property").click()
     page.locator("dialog").locator("input").fill("newprop")
@@ -89,7 +89,7 @@ def test_table_editor(live_server, openmap, datalayer, page):
 
 def test_cannot_add_existing_property_name(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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     page.get_by_text("Add a new property").click()
     page.locator("dialog").locator("input").fill("name")
@@ -102,7 +102,7 @@ def test_cannot_add_existing_property_name(live_server, openmap, datalayer, page
 
 def test_cannot_add_property_with_a_dot(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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     page.get_by_text("Add a new property").click()
     page.locator("dialog").locator("input").fill("foo.bar")
@@ -115,7 +115,7 @@ def test_cannot_add_property_with_a_dot(live_server, openmap, datalayer, page):
 
 def test_rename_property(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.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("table th button[data-property=name]")).to_have_count(1)
     page.locator("thead button[data-property=name]").click()
@@ -129,7 +129,7 @@ def test_rename_property(live_server, openmap, datalayer, page):
 def test_delete_selected_rows(live_server, openmap, page):
     DataLayerFactory(map=openmap, data=DATALAYER_DATA)
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("tbody tr")).to_have_count(4)
     expect(page.locator(".leaflet-marker-icon")).to_have_count(4)
@@ -143,7 +143,7 @@ def test_delete_selected_rows(live_server, openmap, page):
 def test_delete_all_rows(live_server, openmap, page):
     DataLayerFactory(map=openmap, data=DATALAYER_DATA)
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(page.locator("tbody tr")).to_have_count(4)
     expect(page.locator(".leaflet-marker-icon")).to_have_count(4)
@@ -159,7 +159,7 @@ def test_filter_and_delete_rows(live_server, openmap, page):
     panel = page.locator(".panel.left.on")
     table = page.locator(".panel.full table")
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit#6/48.093/1.890")
-    page.get_by_role("link", name="Manage layers").click()
+    page.get_by_role("button", name="Manage layers").click()
     page.locator(".panel").get_by_title("Edit properties in a table").click()
     expect(table.locator("tbody tr")).to_have_count(4)
     expect(page.locator(".leaflet-marker-icon")).to_have_count(4)

umap/tests/integration/test_view_marker.py

@@ -181,3 +181,13 @@ def test_only_visible_markers_are_added_to_dom(live_server, map, page):
     )
     expect(markers).to_have_count(1)
     expect(tooltips).to_have_count(1)
+
+
+def test_should_display_tooltip_on_hover(live_server, map, page, bootstrap):
+    map.settings["properties"]["showLabel"] = None
+    map.settings["properties"]["labelKey"] = "Foo {name}"
+    map.save()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_text("Foo test marker")).to_be_hidden()
+    page.locator(".leaflet-marker-icon").hover()
+    expect(page.get_by_text("Foo test marker")).to_be_visible()