umap-project 1.12.1__py3-none-any.whl → 1.13.0__py3-none-any.whl

umap/static/umap/vendors/toolbar/leaflet.toolbar-src.js

@@ -362,4 +362,4 @@ L.toolbar.popup = function(options) {
 };
 
 
-})(window, document);
+})(window, document);

umap/templates/auth/user_form.html

@@ -3,7 +3,7 @@
 {% block maincontent %}
   <div class="col wide">
     <h2 class="section tabs">
-      <a href="{% url "user_dashboard" %}">{% trans "My Dashboard" %}</a> | {% trans "My Profile" %}
+      <a href="{% url "user_dashboard" %}">{% trans "My Dashboard" %}</a> | <a class="selected" href="{% url 'user_profile' %}">{% trans "My Profile" %}</a>
     </h2>
   </div>
   <div class="wrapper">

umap/templates/umap/content.html

@@ -67,7 +67,7 @@
             const container = this.parentNode
             container.innerHTML = data
             Array.prototype.forEach.call(
-              container.querySelectorAll('script'),
+              container.querySelectorAll('script:not([type="application/json"])'),
               function (item) {
                 eval(item.firstChild.textContent)
               }

umap/templates/umap/js.html

@@ -45,6 +45,7 @@
   <script src="{{ STATIC_URL }}umap/js/umap.tableeditor.js"></script>
   <script src="{{ STATIC_URL }}umap/js/umap.browser.js"></script>
   <script src="{{ STATIC_URL }}umap/js/umap.importer.js"></script>
+  <script src="{{ STATIC_URL }}umap/js/umap.share.js"></script>
   <script src="{{ STATIC_URL }}umap/js/umap.js"></script>
   <script src="{{ STATIC_URL }}umap/js/umap.ui.js"></script>
 {% endcompress %}

umap/templates/umap/map_list.html

@@ -1,4 +1,4 @@
-{% load umap_tags umap_tags i18n %}
+{% load umap_tags i18n %}
 {% for map_inst in maps %}
   <hr />
   <div class="col wide">

umap/templates/umap/map_table.html

@@ -1,41 +1,73 @@
-{% load umap_tags umap_tags i18n %}
+{% load umap_tags i18n %}
 <table class="maps">
-  {% if not is_ajax %}
-    <thead>
-      <tr>
-        <th>{% blocktrans %}Map{% endblocktrans %}</th>
-        <th>{% blocktrans %}Name{% endblocktrans %}</th>
-        <th>{% blocktrans %}Who can see / edit{% endblocktrans %}</th>
-        <th>{% blocktrans %}Last save{% endblocktrans %}</th>
-        <th>{% blocktrans %}Owner{% endblocktrans %}</th>
-        <th>{% blocktrans %}Actions{% endblocktrans %}</th>
-      </tr>
-    </thead>
-  {% endif %}
+  <thead>
+    <tr>
+      <th>{% blocktrans %}Name{% endblocktrans %}</th>
+      <th>{% blocktrans %}Preview{% endblocktrans %}</th>
+      <th>{% blocktrans %}Who can see / edit{% endblocktrans %}</th>
+      <th>{% blocktrans %}Last save{% endblocktrans %}</th>
+      <th>{% blocktrans %}Owner{% endblocktrans %}</th>
+      <th>{% blocktrans %}Actions{% endblocktrans %}</th>
+    </tr>
+  </thead>
   <tbody>
     {% for map_inst in maps %}
-      <tr>
-        <td>{% map_fragment map_inst prefix=prefix page=request.GET.p %}</td>
-        <td>
-          <a href="{{ map_inst.get_absolute_url }}">{{ map_inst.name }}</a>
-        </td>
-        <td>{{ map_inst.get_share_status_display }} / {{ map_inst.get_edit_status_display }}</td>
-        <td>{{ map_inst.modified_at }}</td>
-        <td>
-          <a href="{{ map_inst.owner.get_url }}">{{ map_inst.owner }}</a>
-        </td>
-        <td>
-          <a href="{{ map_inst.get_absolute_url }}?share">{% translate "Share" %}</a> |
-          <a href="{{ map_inst.get_absolute_url }}?edit">{% translate "Edit" %}</a> |
-          <a href="{% url 'map_download' map_inst.pk %}">{% translate "Download" %}</a>
-        </td>
-      </tr>
+      {% with unique_id="map_"|addstr:map_inst.pk %}
+        {{ map_inst.preview_settings|json_script:unique_id }}
+        <tr>
+          <td>
+            <a href="{{ map_inst.get_absolute_url }}">{{ map_inst.name }}</a>
+          </td>
+          <td>
+            <button class="button map-opener neutral" data-map-id="{{ unique_id }}">{% blocktranslate %}Open preview{% endblocktranslate %}</button>
+            <dialog>
+              <form method="dialog">
+                <div id="{{ unique_id }}_target" class="map_fragment"></div>
+                <p class="close-dialog">
+                  <button class="button" type="submit">Close</button>
+                </p>
+              </form>
+            </dialog>
+          </td>
+          <td>{{ map_inst.get_share_status_display }} / {{ map_inst.get_edit_status_display }}</td>
+          <td>{{ map_inst.modified_at }}</td>
+          <td>
+            <a href="{{ map_inst.owner.get_url }}">{{ map_inst.owner }}</a>
+          </td>
+          <td>
+            <a href="{{ map_inst.get_absolute_url }}?share">{% translate "Share" %}</a> |
+            <a href="{{ map_inst.get_absolute_url }}?edit">{% translate "Edit" %}</a> |
+            <a href="{% url 'map_download' map_inst.pk %}">{% translate "Download" %}</a>
+          </td>
+        </tr>
+      {% endwith %}
     {% endfor %}
   </tbody>
 </table>
-{% if maps.has_next %}
-  <div class="col wide">
-    <a href="?{% paginate_querystring maps.next_page_number %}"
-       class="button more_button neutral">{% trans "More" %}</a>
-  </div>
-{% endif %}
+<div class="pagination">
+  {% if maps.has_previous %}
+    <a href="?p=1{% if q %}&q={{ q }}{% endif %}">« {% translate "first" %}</a>
+    <a href="?p={{ maps.previous_page_number }}{% if q %}&q={{ q }}{% endif %}">‹ {% translate "previous" %}</a>
+  {% else %}
+    {# djlint:off #}
+    <span></span>
+    <span></span>
+    {# djlint:on #}
+  {% endif %}
+
+  <span class="current">
+    {% blocktranslate with maps_number=maps.number num_pages=maps.paginator.num_pages %}
+      Page {{ maps_number }} of {{ num_pages }}
+    {% endblocktranslate %}
+  </span>
+
+  {% if maps.has_next %}
+    <a href="?p={{ maps.next_page_number }}{% if q %}&q={{ q }}{% endif %}">{% translate "next" %} ›</a>
+    <a href="?p={{ maps.paginator.num_pages }}{% if q %}&q={{ q }}{% endif %}">{% translate "last" %} »</a>
+  {% else %}
+    {# djlint:off #}
+    <span></span>
+    <span></span>
+    {# djlint:on #}
+  {% endif %}
+</div>

umap/templates/umap/user_dashboard.html

@@ -7,7 +7,7 @@
   {% trans "Search my maps" as placeholder %}
   <div class="col wide">
     <h2 class="section tabs">
-      {% trans "My Dashboard" %} | <a href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
+      <a class="selected" href="{% url 'user_dashboard' %}">{% trans "My Dashboard" %}</a> | <a href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
     </h2>
     {% include "umap/search_bar.html" with action=request.get_full_path placeholder=placeholder %}
   </div>
@@ -23,3 +23,25 @@
     </div>
   </div>
 {% endblock maincontent %}
+
+{% block bottom_js %}
+  {{ block.super }}
+  <script type="text/javascript">
+    !(function () {
+      const CACHE = {}
+      for (const mapOpener of document.querySelectorAll("button.map-opener")) {
+        mapOpener.addEventListener('click', (event) => {
+          event.target.nextElementSibling.showModal()
+          const mapId = event.target.dataset.mapId
+          if (!document.querySelector(`#${mapId}_target`).hasChildNodes()) {
+            const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
+            const map = new L.U.Map(`${mapId}_target`, previewSettings)
+            CACHE[mapId] = map
+          } else {
+            CACHE[mapId].invalidateSize()
+          }
+        })
+      }
+    })()
+  </script>
+{% endblock bottom_js %}

umap/templatetags/umap_tags.py

@@ -4,9 +4,6 @@ from copy import copy
 from django import template
 from django.conf import settings
 
-from ..models import DataLayer, TileLayer
-from ..views import _urls_for_js
-
 register = template.Library()
 
 
@@ -22,30 +19,7 @@ def umap_js(locale=None):
 
 @register.inclusion_tag("umap/map_fragment.html")
 def map_fragment(map_instance, **kwargs):
-    layers = DataLayer.objects.filter(map=map_instance)
-    datalayer_data = [c.metadata() for c in layers]
-    map_settings = map_instance.settings
-    if "properties" not in map_settings:
-        map_settings["properties"] = {}
-    map_settings["properties"].update(
-        {
-            "tilelayers": [TileLayer.get_default().json],
-            "datalayers": datalayer_data,
-            "urls": _urls_for_js(),
-            "STATIC_URL": settings.STATIC_URL,
-            "editMode": "disabled",
-            "hash": False,
-            "attributionControl": False,
-            "scrollWheelZoom": False,
-            "umapAttributionControl": False,
-            "noControl": True,
-            "umap_id": map_instance.pk,
-            "onLoadPanel": "none",
-            "captionBar": False,
-            "default_iconUrl": "%sumap/img/marker.png" % settings.STATIC_URL,
-            "slideshow": {},
-        }
-    )
+    map_settings = map_instance.preview_settings
     map_settings["properties"].update(kwargs)
     prefix = kwargs.pop("prefix", None) or "map"
     page = kwargs.pop("page", None) or ""
@@ -86,3 +60,9 @@ def ipdb(what):
 
     ipdb.set_trace()
     return ""
+
+
+@register.filter
+def addstr(arg1, arg2):
+    # Necessity: https://stackoverflow.com/a/23783666
+    return str(arg1) + str(arg2)

umap/tests/integration/test_edit_datalayer.py

@@ -0,0 +1,45 @@
+from playwright.sync_api import expect
+
+
+def test_should_have_fieldset_for_layer_type_properties(page, live_server, tilelayer):
+    page.goto(f"{live_server.url}/en/map/new/")
+
+    # Open DataLayers list
+    button = page.get_by_title("Manage Layers")
+    expect(button).to_be_visible()
+    button.click()
+
+    edit = page.locator("#umap-ui-container").get_by_title("Edit", exact=True)
+    expect(edit).to_be_visible()
+    edit.click()
+
+    select = page.locator("#umap-ui-container .umap-field-type select")
+    expect(select).to_be_visible()
+
+    choropleth_header = page.get_by_text("Choropleth: settings")
+    heat_header = page.get_by_text("Heatmap: settings")
+    cluster_header = page.get_by_text("Clustered: settings")
+    expect(choropleth_header).to_be_hidden()
+    expect(heat_header).to_be_hidden()
+    expect(cluster_header).to_be_hidden()
+
+    # Switching to Choropleth should add a dedicated fieldset
+    select.select_option("Choropleth")
+    expect(choropleth_header).to_be_visible()
+    expect(heat_header).to_be_hidden()
+    expect(cluster_header).to_be_hidden()
+
+    select.select_option("Heat")
+    expect(heat_header).to_be_visible()
+    expect(choropleth_header).to_be_hidden()
+    expect(cluster_header).to_be_hidden()
+
+    select.select_option("Cluster")
+    expect(cluster_header).to_be_visible()
+    expect(choropleth_header).to_be_hidden()
+    expect(heat_header).to_be_hidden()
+
+    select.select_option("Default")
+    expect(choropleth_header).to_be_hidden()
+    expect(heat_header).to_be_hidden()
+    expect(cluster_header).to_be_hidden()

umap/tests/integration/test_export_map.py

@@ -9,7 +9,7 @@ pytestmark = pytest.mark.django_db
 
 def test_umap_export(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
-    link = page.get_by_role("link", name="Download full data")
+    link = page.get_by_role("link", name="full backup")
     expect(link).to_be_visible()
     with page.expect_download() as download_info:
         link.click()
@@ -73,9 +73,8 @@ def test_umap_export(map, live_server, datalayer, page):
 
 def test_csv_export(map, live_server, datalayer, page):
     page.goto(f"{live_server.url}{map.get_absolute_url()}?share")
-    button = page.get_by_role("button", name="Download data")
+    button = page.get_by_role("button", name="csv")
     expect(button).to_be_visible()
-    page.locator('select[name="format"]').select_option("csv")
     with page.expect_download() as download_info:
         button.click()
     download = download_info.value

umap/tests/integration/test_facets_browser.py

@@ -0,0 +1,86 @@
+import pytest
+from playwright.sync_api import expect
+
+from ..base import DataLayerFactory
+
+pytestmark = pytest.mark.django_db
+
+
+DATALAYER_DATA1 = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {"mytype": "even", "name": "Point 2"},
+            "geometry": {"type": "Point", "coordinates": [0.065918, 48.385442]},
+        },
+        {
+            "type": "Feature",
+            "properties": {"mytype": "odd", "name": "Point 1"},
+            "geometry": {"type": "Point", "coordinates": [3.55957, 49.767074]},
+        },
+    ],
+    "_umap_options": {
+        "name": "Calque 1",
+    },
+}
+
+
+DATALAYER_DATA2 = {
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "properties": {"mytype": "even", "name": "Point 4"},
+            "geometry": {"type": "Point", "coordinates": [0.856934, 45.290347]},
+        },
+        {
+            "type": "Feature",
+            "properties": {"mytype": "odd", "name": "Point 3"},
+            "geometry": {"type": "Point", "coordinates": [4.372559, 47.945786]},
+        },
+    ],
+    "_umap_options": {
+        "name": "Calque 2",
+    },
+}
+
+
+@pytest.fixture
+def bootstrap(map, live_server):
+    map.settings["properties"]["onLoadPanel"] = "facet"
+    map.settings["properties"]["facetKey"] = "mytype|My type"
+    map.settings["properties"]["showLabel"] = True
+    map.save()
+    DataLayerFactory(map=map, data=DATALAYER_DATA1)
+    DataLayerFactory(map=map, data=DATALAYER_DATA2)
+
+
+def test_simple_facet_search(live_server, page, bootstrap, map):
+    page.goto(f"{live_server.url}{map.get_absolute_url()}")
+    panel = page.locator(".umap-facet-search")
+    expect(panel).to_be_visible()
+    # Facet name
+    expect(page.get_by_text("My type")).to_be_visible()
+    # Facet values
+    oven = page.get_by_text("even")
+    odd = page.get_by_text("odd")
+    expect(oven).to_be_visible()
+    expect(odd).to_be_visible()
+    markers = page.locator(".leaflet-marker-icon")
+    expect(markers).to_have_count(4)
+    # Tooltips
+    expect(page.get_by_text("Point 1")).to_be_visible()
+    expect(page.get_by_text("Point 2")).to_be_visible()
+    expect(page.get_by_text("Point 3")).to_be_visible()
+    expect(page.get_by_text("Point 4")).to_be_visible()
+    # Now let's filter
+    odd.click()
+    expect(markers).to_have_count(2)
+    expect(page.get_by_text("Point 2")).to_be_hidden()
+    expect(page.get_by_text("Point 4")).to_be_hidden()
+    expect(page.get_by_text("Point 1")).to_be_visible()
+    expect(page.get_by_text("Point 3")).to_be_visible()
+    # Now let's filter
+    odd.click()
+    expect(markers).to_have_count(4)

umap/utils.py

@@ -1,9 +1,26 @@
 import gzip
 import os
 
+from django.conf import settings
 from django.urls import URLPattern, URLResolver, get_resolver
 
 
+def _urls_for_js(urls=None):
+    """
+    Return templated URLs prepared for javascript.
+    """
+    if urls is None:
+        # prevent circular import
+        from .urls import i18n_urls, urlpatterns
+
+        urls = [
+            url.name for url in urlpatterns + i18n_urls if getattr(url, "name", None)
+        ]
+    urls = dict(zip(urls, [get_uri_template(url) for url in urls]))
+    urls.update(getattr(settings, "UMAP_EXTRA_URLS", {}))
+    return urls
+
+
 def get_uri_template(urlname, args=None, prefix=""):
     """
     Utility function to return an URI Template from a named URL in django

umap/views.py

@@ -62,7 +62,7 @@ from .forms import (
     UserProfileForm,
 )
 from .models import DataLayer, Licence, Map, Pictogram, Star, TileLayer
-from .utils import ConflictError, get_uri_template, gzip_file, is_ajax, merge_features
+from .utils import ConflictError, _urls_for_js, gzip_file, is_ajax, merge_features
 
 User = get_user_model()
 
@@ -270,7 +270,12 @@ class UserDashboard(PaginatorMixin, DetailView, SearchMixin):
 
     def get_context_data(self, **kwargs):
         kwargs.update(
-            {"maps": self.paginate(self.get_maps(), settings.UMAP_MAPS_PER_PAGE_OWNER)}
+            {
+                "q": self.request.GET.get("q"),
+                "maps": self.paginate(
+                    self.get_maps(), settings.UMAP_MAPS_PER_PAGE_OWNER
+                ),
+            }
         )
         return super().get_context_data(**kwargs)
 
@@ -390,22 +395,6 @@ ajax_proxy = AjaxProxy.as_view()
 # ############## #
 
 
-def _urls_for_js(urls=None):
-    """
-    Return templated URLs prepared for javascript.
-    """
-    if urls is None:
-        # prevent circular import
-        from .urls import i18n_urls, urlpatterns
-
-        urls = [
-            url.name for url in urlpatterns + i18n_urls if getattr(url, "name", None)
-        ]
-    urls = dict(zip(urls, [get_uri_template(url) for url in urls]))
-    urls.update(getattr(settings, "UMAP_EXTRA_URLS", {}))
-    return urls
-
-
 def simple_json_response(**kwargs):
     return HttpResponse(json.dumps(kwargs), content_type="application/json")
 

{umap_project-1.12.1.dist-info → umap_project-1.13.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: umap-project
-Version: 1.12.1
+Version: 1.13.0
 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>
@@ -48,19 +48,12 @@ Requires-Dist: pytest-xdist<4,>=3.5.0; extra == 'test'
 Requires-Dist: pytest==6.2.5; extra == 'test'
 Description-Content-Type: text/markdown
 
-
 # uMap project
 
-[![Requirements Status](https://requires.io/github/umap-project/umap/requirements.svg?branch=master)](https://requires.io/github/umap-project/umap/requirements/?branch=master)
-[![Join the chat at https://gitter.im/umap-project/umap](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/umap-project/umap?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Documentation Status](https://readthedocs.org/projects/umap-project/badge/?version=latest)](http://umap-project.readthedocs.io/en/master/?badge=latest)[![Build Status](https://travis-ci.org/umap-project/umap.svg?branch=master)](https://travis-ci.org/umap-project/umap)
-
-## About
-
 uMap lets you create maps with OpenStreetMap layers in a minute and embed them in your site.
 *Because we think that the more OSM will be used, the more OSM will be improved.*
 Built on top of Django and Leaflet.
 
-
-## Installation and configuration
-
-See [developer documentation](https://umap-project.readthedocs.io/en/master/install/).
+- Have a look at [our website](https://umap-project.org) for an introduction
+- See [our docs](https://docs.umap-project.org/) for technical information
+- Come [chat with us on matrix.org](https://app.element.io/#/room/#umap:matrix.org), or join [the mailing-list](https://lists.openstreetmap.org/listinfo/umap)