umap-project 2.3.1__py3-none-any.whl → 2.4.0__py3-none-any.whl

umap/tests/integration/test_datalayer.py

@@ -27,7 +27,7 @@ def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
     layers_off = page.locator(".umap-browser .datalayer.off")
     expect(layers).to_have_count(1)
     expect(layers_off).to_have_count(1)
-    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("button", name="Open browser").click()
     page.get_by_label("Zoom in").click()
     expect(markers).to_be_hidden()
     page.get_by_title("Show/hide layer").click()
@@ -41,7 +41,7 @@ def test_should_honour_fromZoom(live_server, map, datalayer, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_hidden()
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.55/14.68")
-    markers = page.locator(".leaflet-marker-icon")
+    page.wait_for_timeout(500)
     expect(markers).to_be_visible()
     page.get_by_label("Zoom out").click()
     expect(markers).to_be_hidden()
@@ -57,7 +57,6 @@ def test_should_honour_toZoom(live_server, map, datalayer, page):
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_hidden()
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.55/14.68")
-    markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_visible()
     page.get_by_label("Zoom out").click()
     expect(markers).to_be_visible()

umap/tests/integration/test_edit_datalayer.py

@@ -54,7 +54,7 @@ def test_cancel_deleting_datalayer_should_restore(
     live_server, openmap, datalayer, page
 ):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
@@ -63,7 +63,7 @@ def test_cancel_deleting_datalayer_should_restore(
     page.once("dialog", lambda dialog: dialog.accept())
     page.locator(".panel.right").get_by_title("Delete layer").click()
     expect(markers).to_have_count(0)
-    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("button", name="Open browser").click()
     expect(page.get_by_text("test datalayer")).to_be_hidden()
     page.once("dialog", lambda dialog: dialog.accept())
     page.get_by_role("button", name="Cancel edits").click()
@@ -73,7 +73,7 @@ def test_cancel_deleting_datalayer_should_restore(
 
 def test_can_clone_datalayer(live_server, openmap, login, datalayer, page):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)
@@ -191,7 +191,7 @@ def test_deleting_datalayer_should_remove_from_browser_and_layers_list(
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
     panel = page.locator(".panel.left")
     edit_panel = page.locator(".panel.right")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     page.get_by_role("link", name="Manage layers").click()
     expect(panel.get_by_text("test datalayer")).to_be_visible()
     expect(edit_panel.get_by_text("test datalayer")).to_be_visible()

umap/tests/integration/test_edit_map.py

@@ -170,7 +170,7 @@ def test_sortkey_impacts_datalayerindex(map, live_server, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
 
     # By default, features are sorted by name  (Third, Second, First)
-    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("button", name="Open browser").click()
     page.get_by_role("heading", name="Show/hide layer").locator("i").click()
 
     first_listed_feature = page.locator(".umap-browser .datalayer ul > li").nth(0)

umap/tests/integration/test_facets_browser.py

@@ -228,7 +228,7 @@ def test_facets_search_are_persistent_when_closing_panel(live_server, page, map)
     DataLayerFactory(map=map, data=DATALAYER_DATA1)
     DataLayerFactory(map=map, data=DATALAYER_DATA2)
     page.goto(f"{live_server.url}{map.get_absolute_url()}#6/48.948/1.670")
-    panel = page.locator(".umap-browser")
+    panel = page.locator(".panel.left")
 
     # Facet values
     odd = page.get_by_label("odd")
@@ -266,8 +266,8 @@ def test_facets_search_are_persistent_when_closing_panel(live_server, page, map)
     # Close panel
     expect(panel.locator("summary")).to_have_attribute("data-badge", " ")
     expect(page.locator(".umap-control-browse")).to_have_attribute("data-badge", " ")
-    page.get_by_role("listitem", name="Close").click()
-    page.get_by_role("button", name="See layers").click()
+    panel.get_by_role("button", name="Close").click()
+    page.get_by_role("button", name="Open browser").click()
     expect(panel.get_by_label("Min")).to_have_value("13")
     expect(panel.get_by_label("Min")).to_have_attribute("data-modified", "true")
     expect(panel.get_by_label("odd")).to_be_checked()

umap/tests/integration/test_import.py

@@ -17,20 +17,22 @@ def test_layers_list_is_updated(live_server, tilelayer, page):
     modifier = "Cmd" if platform.system() == "Darwin" else "Ctrl"
     page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
     # Should work
-    page.get_by_label("Choose the layer to import").select_option(
-        label="Import in a new layer"
-    )
+    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="Add a layer").click()
     page.locator('input[name="name"]').click()
     page.locator('input[name="name"]').fill("foobar")
     page.get_by_role("link", name=f"Import data ({modifier}+I)").click()
     # Should still work
-    page.get_by_label("Choose the layer to import").select_option(
-        label="Import in a new layer"
-    )
+    page.locator("[name=layer-id]").select_option(label="Import in a new layer")
     # Now layer should be visible in the options
-    page.get_by_label("Choose the layer to import").select_option(label="foobar")
+    page.locator("[name=layer-id]").select_option(label="foobar")
+    expect(
+        page.get_by_role("button", name="Import full map data", exact=True)
+    ).to_be_hidden()
+    expect(
+        page.get_by_role("button", name="Link to the layer as remote data", exact=True)
+    ).to_be_hidden()
 
 
 def test_umap_import_from_file(live_server, tilelayer, page):
@@ -42,9 +44,13 @@ def test_umap_import_from_file(live_server, tilelayer, page):
     file_chooser = fc_info.value
     path = Path(__file__).parent.parent / "fixtures/display_on_load.umap"
     file_chooser.set_files(path)
-    button = page.get_by_role("button", name="Import", exact=True)
-    expect(button).to_be_visible()
-    button.click()
+    expect(
+        page.get_by_role("button", name="Copy into the layer", exact=True)
+    ).to_be_hidden()
+    expect(
+        page.get_by_role("button", name="Link to the layer as remote data", exact=True)
+    ).to_be_hidden()
+    page.get_by_role("button", name="Import data", exact=True).click()
     assert file_input.input_value()
     # Close the import panel
     page.keyboard.press("Escape")
@@ -55,7 +61,7 @@ def test_umap_import_from_file(live_server, tilelayer, page):
     expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
         "Carte sans nom"
     )
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     expect(layers).to_have_count(2)
     nonloaded = page.locator(".umap-browser .datalayer.off")
@@ -65,13 +71,13 @@ def test_umap_import_from_file(live_server, tilelayer, page):
 def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
     settings.UMAP_ALLOW_ANONYMOUS = True
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_role("button", name="See layers").click()
+    page.get_by_role("button", name="Open browser").click()
     page.get_by_title("Import data").click()
     textarea = page.locator(".umap-upload textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.umap"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("umap")
-    page.get_by_role("button", name="Import", exact=True).click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     layers = page.locator(".umap-browser .datalayer")
     expect(layers).to_have_count(2)
     expect(page.locator(".umap-main-edit-toolbox .map-name")).to_have_text(
@@ -92,7 +98,7 @@ def test_umap_import_from_textarea(live_server, tilelayer, page, settings):
 
 def test_import_geojson_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
@@ -106,9 +112,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.json"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("geojson")
-    button = page.get_by_role("button", name="Import", exact=True)
-    expect(button).to_be_visible()
-    button.click()
+    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(2)
@@ -117,7 +121,7 @@ def test_import_geojson_from_textarea(tilelayer, live_server, page):
 
 def test_import_kml_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
@@ -131,9 +135,7 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.kml"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("kml")
-    button = page.get_by_role("button", name="Import", exact=True)
-    expect(button).to_be_visible()
-    button.click()
+    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)
@@ -142,7 +144,7 @@ def test_import_kml_from_textarea(tilelayer, live_server, page):
 
 def test_import_gpx_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
@@ -156,9 +158,7 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page):
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.gpx"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("gpx")
-    button = page.get_by_role("button", name="Import", exact=True)
-    expect(button).to_be_visible()
-    button.click()
+    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)
@@ -167,7 +167,7 @@ def test_import_gpx_from_textarea(tilelayer, live_server, page):
 
 def test_import_osm_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    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)
@@ -179,7 +179,7 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
     path = Path(__file__).parent.parent / "fixtures/test_upload_data_osm.json"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("osm")
-    page.get_by_role("button", name="Import", exact=True).click()
+    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(2)
@@ -187,7 +187,7 @@ def test_import_osm_from_textarea(tilelayer, live_server, page):
 
 def test_import_csv_from_textarea(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    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)
@@ -199,7 +199,7 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
-    page.get_by_role("button", name="Import", exact=True).click()
+    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(2)
@@ -207,7 +207,7 @@ def test_import_csv_from_textarea(tilelayer, live_server, page):
 
 def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
@@ -218,7 +218,9 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
-    page.get_by_role("button", name="Import", exact=True).click()
+    page.locator('select[name="layer-id"]').select_option(datalayer.name)
+    expect(page.locator("input[name=layer-name]")).to_be_hidden()
+    page.get_by_role("button", name="Import data", exact=True).click()
     # No layer has been created
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(3)
@@ -226,7 +228,7 @@ def test_can_import_in_existing_datalayer(live_server, datalayer, page, openmap)
 
 def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
@@ -237,8 +239,9 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
     page.locator('select[name="format"]').select_option("csv")
+    page.locator('select[name="layer-id"]').select_option(datalayer.name)
     page.get_by_label("Replace layer content").check()
-    page.get_by_role("button", name="Import", exact=True).click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     # No layer has been created
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(2)
@@ -246,7 +249,7 @@ def test_can_replace_datalayer_data(live_server, datalayer, page, openmap):
 
 def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_have_count(1)
@@ -256,14 +259,14 @@ def test_can_import_in_new_datalayer(live_server, datalayer, page, openmap):
     textarea = page.locator(".umap-upload textarea")
     path = Path(__file__).parent.parent / "fixtures/test_upload_data.csv"
     textarea.fill(path.read_text())
-    page.locator('select[name="format"]').select_option("csv")
-    page.get_by_label("Choose the layer to import").select_option(
-        label="Import in a new layer"
-    )
-    page.get_by_role("button", name="Import", exact=True).click()
+    page.locator("select[name=format]").select_option("csv")
+    page.locator("[name=layer-id]").select_option(label="Import in a new layer")
+    page.locator("[name=layer-name]").fill("My new layer name")
+    page.get_by_role("button", name="Import data", exact=True).click()
     # A new layer has been created
     expect(layers).to_have_count(2)
     expect(markers).to_have_count(3)
+    expect(page.get_by_text("My new layer name")).to_be_visible()
 
 
 def test_should_remove_dot_in_property_names(live_server, page, settings, tilelayer):
@@ -302,7 +305,7 @@ def test_should_remove_dot_in_property_names(live_server, page, settings, tilela
     textarea = page.locator(".umap-upload textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
-    page.get_by_role("button", name="Import", exact=True).click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     with page.expect_response(re.compile(r".*/datalayer/create/.*")):
         page.get_by_role("button", name="Save").click()
     datalayer = DataLayer.objects.last()
@@ -350,7 +353,7 @@ def test_import_geometry_collection(live_server, page, tilelayer):
         ],
     }
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     paths = page.locator("path")
@@ -363,7 +366,7 @@ def test_import_geometry_collection(live_server, page, tilelayer):
     textarea = page.locator(".umap-upload textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
-    page.get_by_role("button", name="Import", exact=True).click()
+    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)
@@ -386,7 +389,7 @@ def test_import_multipolygon(live_server, page, tilelayer):
         },
     }
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     paths = page.locator("path")
     expect(paths).to_have_count(0)
@@ -397,7 +400,7 @@ def test_import_multipolygon(live_server, page, tilelayer):
     textarea = page.locator(".umap-upload textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
-    page.get_by_role("button", name="Import", exact=True).click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     # A layer has been created
     expect(layers).to_have_count(1)
     expect(paths).to_have_count(1)
@@ -418,7 +421,7 @@ def test_import_multipolyline(live_server, page, tilelayer):
         ],
     }
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     paths = page.locator("path")
     expect(paths).to_have_count(0)
@@ -429,7 +432,7 @@ def test_import_multipolyline(live_server, page, tilelayer):
     textarea = page.locator(".umap-upload textarea")
     textarea.fill(json.dumps(data))
     page.locator('select[name="format"]').select_option("geojson")
-    page.get_by_role("button", name="Import", exact=True).click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     # A layer has been created
     expect(layers).to_have_count(1)
     expect(paths).to_have_count(1)
@@ -437,15 +440,148 @@ def test_import_multipolyline(live_server, page, tilelayer):
 
 def test_import_csv_without_valid_latlon_headers(tilelayer, live_server, page):
     page.goto(f"{live_server.url}/map/new/")
-    page.get_by_title("See layers").click()
+    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("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", exact=True).click()
+    page.get_by_role("button", name="Import data", exact=True).click()
     # FIXME do not create a layer
     expect(layers).to_have_count(1)
     expect(markers).to_have_count(0)
-    expect(page.locator(".umap-alert")).to_be_visible()
+    expect(page.locator('umap-alert div[data-level="error"]')).to_be_visible()
+
+
+def test_create_remote_data(page, live_server, tilelayer):
+    def handle(route):
+        route.fulfill(
+            json={
+                "type": "FeatureCollection",
+                "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {},
+                        "geometry": {
+                            "type": "Point",
+                            "coordinates": [4.3375, 51.2707],
+                        },
+                    }
+                ],
+            }
+        )
+
+    # Intercept the route to the proxy
+    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 (Ctrl+I)").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="Edit", exact=True).click()
+    page.locator("summary").filter(has_text="Remote data").click()
+    expect(page.locator('.panel input[name="url"]')).to_have_value(
+        "https://remote.org/data.json"
+    )
+
+
+def test_import_geojson_from_url(page, live_server, tilelayer):
+    def handle(route):
+        route.fulfill(
+            json={
+                "type": "FeatureCollection",
+                "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {},
+                        "geometry": {
+                            "type": "Point",
+                            "coordinates": [4.3375, 51.2707],
+                        },
+                    }
+                ],
+            }
+        )
+
+    # Intercept the route
+    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 (Ctrl+I)").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="Edit", exact=True).click()
+    page.locator("summary").filter(has_text="Remote data").click()
+    expect(page.locator('.panel input[name="url"]')).to_have_value("")
+
+
+def test_overpass_import_with_bbox(page, live_server, tilelayer, settings):
+    settings.UMAP_IMPORTERS = {
+        "overpass": {"url": "https://my.overpass.io/interpreter"}
+    }
+    page.goto(f"{live_server.url}/map/new/")
+    page.get_by_role("link", name="Import data (Ctrl+I)").click()
+    page.get_by_role("button", name="Overpass").click()
+    page.get_by_placeholder("amenity=drinking_water").fill("building")
+    page.get_by_role("button", name="Choose this data").click()
+    expect(page.get_by_placeholder("Provide an URL here")).to_have_value(
+        "https://my.overpass.io/interpreter?data=[out:json];nwr[building]({south},{west},{north},{east});out geom;"
+    )
+
+
+def test_import_from_datasets(page, live_server, tilelayer, settings):
+    settings.UMAP_IMPORTERS = {
+        "datasets": {
+            "choices": [
+                {
+                    "url": "https://remote.org/data.json",
+                    "label": "Good data",
+                    "format": "geojson",
+                }
+            ]
+        }
+    }
+
+    def handle(route):
+        route.fulfill(
+            json={
+                "type": "FeatureCollection",
+                "features": [
+                    {
+                        "type": "Feature",
+                        "properties": {},
+                        "geometry": {
+                            "type": "Point",
+                            "coordinates": [4.3375, 51.2707],
+                        },
+                    }
+                ],
+            }
+        )
+
+    # Intercept the route
+    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 (Ctrl+I)").click()
+    page.get_by_role("button", name="Datasets").click()
+    page.get_by_role("dialog").get_by_role("combobox").select_option(
+        "https://remote.org/data.json"
+    )
+    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()
+    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()

umap/tests/integration/test_map.py

@@ -169,7 +169,7 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features(
     }
     datalayer.save()
     page.goto(f"{live_server.url}{openmap.get_absolute_url()}?edit")
-    toggle = page.get_by_role("button", name="See layers")
+    toggle = page.get_by_role("button", name="Open browser")
     expect(toggle).to_be_visible()
     toggle.click()
     layers = page.locator(".umap-browser .datalayer h5")
@@ -184,7 +184,7 @@ def test_remote_layer_should_not_be_used_as_datalayer_for_created_features(
     expect(marker).to_have_count(1)
     # A new datalayer has been created to host this created feature
     # given the remote one cannot accept new features
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     expect(layers).to_have_count(2)
 
 
@@ -204,3 +204,32 @@ def test_zoom_control_on_load(map, live_server, page):
     map.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}")
     expect(page.locator(".leaflet-control-zoom")).to_be_hidden()
+
+
+def test_feature_in_query_string_has_precedence_over_onloadpanel(
+    map, live_server, page
+):
+    map.settings["properties"]["onLoadPanel"] = "caption"
+    map.name = "This is my map"
+    map.save()
+    data = {
+        "type": "FeatureCollection",
+        "features": [
+            {
+                "type": "Feature",
+                "properties": {"name": "FooBar"},
+                "geometry": {
+                    "type": "Point",
+                    "coordinates": [2.12, 49.57],
+                },
+            }
+        ],
+        "_umap_options": {"popupShape": "Panel"},
+    }
+    DataLayerFactory(map=map, data=data)
+    page.goto(f"{live_server.url}{map.get_absolute_url()}?feature=FooBar")
+    expect(page.get_by_role("heading", name="FooBar")).to_be_visible()
+    expect(page.get_by_role("heading", name="This is my map")).to_be_hidden()
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    expect(page.get_by_role("heading", name="FooBar")).to_be_hidden()
+    expect(page.get_by_role("heading", name="This is my map")).to_be_visible()

umap/tests/integration/{test_collaborative_editing.py → test_optimistic_merge.py}

@@ -5,16 +5,16 @@ from time import sleep
 
 from playwright.sync_api import expect
 
-from umap.models import DataLayer, Map
+from umap.models import DataLayer
 
 from ..base import DataLayerFactory, MapFactory
 
 DATALAYER_UPDATE = re.compile(r".*/datalayer/update/.*")
 
 
-def test_collaborative_editing_create_markers(context, live_server, tilelayer):
+def test_created_markers_are_merged(context, live_server, tilelayer):
     # Let's create a new map with an empty datalayer
-    map = MapFactory(name="collaborative editing")
+    map = MapFactory(name="server-side merge")
     datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
 
     # Now navigate to this map and create marker
@@ -146,7 +146,7 @@ def test_collaborative_editing_create_markers(context, live_server, tilelayer):
 
 def test_empty_datalayers_can_be_merged(context, live_server, tilelayer):
     # Let's create a new map with an empty datalayer
-    map = MapFactory(name="collaborative editing")
+    map = MapFactory(name="server-side merge")
     DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
 
     # Open two tabs at the same time, on the same empty map
@@ -202,7 +202,7 @@ def test_empty_datalayers_can_be_merged(context, live_server, tilelayer):
 
 def test_same_second_edit_doesnt_conflict(context, live_server, tilelayer):
     # Let's create a new map with an empty datalayer
-    map = MapFactory(name="collaborative editing")
+    map = MapFactory(name="server-side merge")
     datalayer = DataLayerFactory(map=map, edit_status=DataLayer.ANONYMOUS, data={})
 
     # Open the created map on two pages.
@@ -288,9 +288,9 @@ def test_should_display_alert_on_conflict(context, live_server, datalayer, openm
     saved = DataLayer.objects.last()
     data = json.loads(Path(saved.geojson.path).read_text())
     assert data["features"][0]["properties"]["name"] == "new name"
-    expect(page_two.get_by_text("Woops! Someone else seems to")).to_be_visible()
+    expect(page_two.get_by_text("Whoops! Other contributor(s) changed")).to_be_visible()
     with page_two.expect_response(re.compile(r".*/datalayer/update/.*")):
-        page_two.get_by_role("button", name="Save anyway").click()
+        page_two.get_by_text("Keep your changes and loose theirs").click()
     saved = DataLayer.objects.last()
     data = json.loads(Path(saved.geojson.path).read_text())
     assert data["features"][0]["properties"]["name"] == "custom name"

umap/tests/integration/test_owned_map.py

@@ -236,7 +236,7 @@ def test_can_change_owner(map, live_server, login, user):
 def test_can_delete_datalayer(live_server, map, login, datalayer):
     page = login(map.owner)
     page.goto(f"{live_server.url}{map.get_absolute_url()}?edit")
-    page.get_by_title("See layers").click()
+    page.get_by_title("Open browser").click()
     layers = page.locator(".umap-browser .datalayer")
     markers = page.locator(".leaflet-marker-icon")
     expect(layers).to_have_count(1)