umap-project 2.5.1__py3-none-any.whl → 2.6.0__py3-none-any.whl

umap/templates/umap/map_table.html

@@ -1,15 +1,30 @@
 {% load umap_tags i18n %}
+
 <div class="table-wrapper">
   <table>
     <thead>
       <tr>
-        <th>{% blocktrans %}Name{% endblocktrans %}</th>
-        <th>{% blocktrans %}Preview{% endblocktrans %}</th>
-        <th>{% blocktrans %}Who can see{% endblocktrans %}</th>
-        <th>{% blocktrans %}Who can edit{% endblocktrans %}</th>
-        <th>{% blocktrans %}Last save{% endblocktrans %}</th>
-        <th>{% blocktrans %}Owner{% endblocktrans %}</th>
-        <th>{% blocktrans %}Actions{% endblocktrans %}</th>
+        <th>
+          {% blocktrans %}Name{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Preview{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Who can see{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Who can edit{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Last save{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Owner{% endblocktrans %}
+        </th>
+        <th>
+          {% blocktrans %}Actions{% endblocktrans %}
+        </th>
       </tr>
     </thead>
     <tbody>
@@ -29,16 +44,25 @@
               </button>
               <dialog>
                 <form method="dialog">
-                  <div id="{{ unique_id }}_target" class="map_fragment"></div>
+                  <div id="{{ unique_id }}_target" class="map_fragment">
+                  </div>
                   <p class="close-dialog">
-                    <button class="button" type="submit">Close</button>
+                    <button class="button" type="submit">
+                      Close
+                    </button>
                   </p>
                 </form>
               </dialog>
             </td>
-            <td>{{ map_inst.get_share_status_display }}</td>
-            <td>{{ map_inst.get_edit_status_display }}</td>
-            <td>{{ map_inst.modified_at }}</td>
+            <td>
+              {{ map_inst.get_share_status_display }}
+            </td>
+            <td>
+              {{ 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>

umap/templates/umap/messages.html

@@ -1,7 +1,6 @@
 {% load i18n %}
 
 {% include "umap/components/alerts/alert.html" %}
-
 {% for message in messages %}
   <script type="module" defer>
     U.Alert.success("{{ message }}")

umap/templates/umap/navigation.html

@@ -1,4 +1,5 @@
 {% load i18n %}
+
 <nav class="umap-nav">
   <section>
     {% include "umap/branding.html" %}
@@ -21,7 +22,7 @@
         <a href="{% url "about" %}">{% trans "About" %}</a>
       </li>
       <li>
-        <a href="{{ UMAP_FEEDBACK_LINK }}">{% trans "Help" %}</a>
+        <a href="{{ UMAP_HELP_URL }}">{% trans "Help" %}</a>
       </li>
       {% if user.is_authenticated %}
         {% if user.has_usable_password %}

umap/templates/umap/password_change.html

@@ -1,7 +1,11 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block content %}
-  <h2 class="section">{% trans "Password change" %}</h2>
+  <h2 class="section">
+    {% trans "Password change" %}
+  </h2>
   <p>
     {% trans "Please enter your old password, for security's sake, and then enter your new password twice so we can verify you typed it in correctly." %}
   </p>

umap/templates/umap/password_change_done.html

@@ -1,8 +1,14 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block content %}
-  <h2 class="section">{% trans "Password change successful" %}</h2>
-  <p>{% trans "Your password was changed." %}</p>
+  <h2 class="section">
+    {% trans "Password change successful" %}
+  </h2>
+  <p>
+    {% trans "Your password was changed." %}
+  </p>
   <p>
     <a href="{% url 'home' %}">Home</a>
   </p>

umap/templates/umap/search.html

@@ -1,5 +1,7 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block messages %}
   {# We don't want maps from the results list to display errors in the main page. #}
 {% endblock messages %}
@@ -18,10 +20,14 @@
           </h2>
           {% include "umap/map_list.html" with prefix="search_map" %}
         {% else %}
-          <h2>{% trans "No map found." %}</h2>
+          <h2>
+            {% trans "No map found." %}
+          </h2>
         {% endif %}
       {% else %}
-        <h2>{% trans "Latest created maps" %}</h2>
+        <h2>
+          {% trans "Latest created maps" %}
+        </h2>
         {% include "umap/map_list.html" with prefix="search_map" %}
       {% endif %}
     </div>

umap/templates/umap/search_bar.html

@@ -1,4 +1,5 @@
 {% load i18n %}
+
 {% url "search" as search_url %}
 {% trans "Search maps" as default_placeholder %}
 <div class="wrapper search_wrapper">

umap/templates/umap/team_confirm_delete.html

@@ -0,0 +1,19 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  {% include "umap/dashboard_menu.html" with selected="teams" %}
+  <div class="wrapper">
+    <div class="row">
+      <form method="post">
+        {% csrf_token %}
+        <p>
+          Are you sure you want to delete "{{ object }}"?
+        </p>
+        {{ form }}
+        <input type="submit" value="Confirm">
+      </form>
+    </div>
+  </div>
+{% endblock maincontent %}

umap/templates/umap/team_detail.html

@@ -0,0 +1,27 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  <div class="wrapper">
+      <div class="row">
+        <div class="col wide">
+          <h2 class="section">
+            {% blocktrans %}Browse {{ current_team }}'s maps{% endblocktrans %}
+          </h2>
+          {% if current_team.description %}
+            <p>{{ current_team.description }}</p>
+          {% endif %}
+        </div>
+    </div>
+    <div class="map_list row">
+    {% if maps %}
+      {% include "umap/map_list.html" %}
+    {% else %}
+      <div>
+        {% blocktrans %}{{ current_team }} has no public maps.{% endblocktrans %}
+      </div>
+    {% endif %}
+    </div>
+  </div>
+{% endblock maincontent %}

umap/templates/umap/team_form.html

@@ -0,0 +1,60 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  {% include "umap/dashboard_menu.html" with selected="teams" %}
+  <div class="wrapper">
+    <div class="row">
+      {% if form.non_field_errors %}
+        <ul class="form-errors">
+          {% for error in form.non_field_errors %}
+            <li>
+              {{ error }}
+            </li>
+          {% endfor %}
+        </ul>
+      {% endif %}
+      <form id="team_form" method="post">
+        {% csrf_token %}
+        {{ form }}
+        <input type="submit" value="{% trans "Save" %}" />
+      </form>
+      {% if team.users.count == 1 %}
+        <a href="{% url 'team_delete' team.pk %}">{% trans "Delete this team" %}</a>
+      {% endif %}
+    </div>
+  </div>
+  <script type="module" defer>
+    const form = document.querySelector("#team_form")
+    const select = form.querySelector('#id_members')
+    if (select) {
+      function onSelect({item: {value, label}}) {
+        const option = document.createElement('option')
+        option.value = value
+        option.textContent = label
+        option.selected = "selected"
+        select.appendChild(option)
+      }
+      function onUnselect({item: {value, label}}) {
+        const option = select.querySelector(`[value="${value}"]`)
+        select.removeChild(option)
+      }
+      const options = {
+        className: 'edit-team-members',
+        on_select: onSelect,
+        on_unselect: onUnselect,
+        placeholder: "{% trans "Add user" %}"
+      }
+      const autocomplete = new U.AjaxAutocompleteMultiple(form, options)
+      for (const option of select.options) {
+        autocomplete.displaySelected({
+          item: { value: option.value, label: option.textContent },
+        })
+      }
+      const submit = form.querySelector('input[type="submit"]')
+      // Move it after the autocomplete widget.
+      form.appendChild(submit)
+    }
+  </script>
+{% endblock maincontent %}

umap/templates/umap/user_dashboard.html

@@ -1,23 +1,21 @@
 {% extends "umap/content.html" %}
+
 {% load i18n %}
+
 {% block head_title %}
   {{ SITE_NAME }} - {% trans "My Dashboard" %}
 {% endblock head_title %}
 {% block maincontent %}
   {% trans "Search my maps" as placeholder %}
-  <div class="row">
-    <h2 class="section tabs">
-      <a class="selected" href="{% url 'user_dashboard' %}">{% blocktranslate with count=maps.paginator.count %}My Maps ({{ count }}){% endblocktranslate %}
-      </a>
-      <a href="{% url 'user_profile' %}">{% trans "My profile" %}</a>
-    </h2>
-  </div>
+  {% include "umap/dashboard_menu.html" with selected="maps" %}
   <div class="wrapper">
     <div class="row">
       <div class="table-header">
         <form action="{{ request.get_full_path }}" method="get">
           <span>
-            <label class="sr-only" for="q">{% translate "Map’s title" %}</label>
+            <label class="sr-only" for="q">
+              {% translate "Map’s title" %}
+            </label>
             <input id="q"
                    name="q"
                    type="search"
@@ -55,7 +53,7 @@
           const button = event.target.closest('button')
           button.nextElementSibling.showModal()
           const mapId = button.dataset.mapId
-          if (!document.querySelector(`#${mapId}_target`).hasChildNodes()) {
+          if (!document.querySelector(`#${mapId}_target`).children.length) {
             const previewSettings = JSON.parse(document.getElementById(mapId).textContent)
             const map = new U.Map(`${mapId}_target`, previewSettings)
             CACHE[mapId] = map

umap/templates/umap/user_teams.html

@@ -0,0 +1,51 @@
+{% extends "umap/content.html" %}
+
+{% load i18n %}
+
+{% block maincontent %}
+  {% include "umap/dashboard_menu.html" with selected="teams" %}
+  <div class="wrapper">
+    <div class="row">
+      <div class="table-wrapper">
+        <table>
+          <thead>
+            <tr>
+              <th>
+                {% blocktrans %}Name{% endblocktrans %}
+              </th>
+              <th>
+                {% blocktrans %}Users{% endblocktrans %}
+              </th>
+              <th>
+                {% blocktrans %}Actions{% endblocktrans %}
+              </th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for team in teams %}
+              <tr>
+                <th scope="row">
+                  <a href="{% url 'team_maps' team.pk %}">{{ team }}</a>
+                </th>
+                <td>
+                  {% for user in team.users.all %}
+                    {{ user }}{% if not forloop.last %}, {% endif %}
+                  {% endfor %}
+                </td>
+                <td>
+                  <a href="{% url 'team_update' team.pk %}"
+                     class="icon-link"
+                     title="{% translate "Edit" %}">
+                    <span class="icon-dashboard icon-edit"></span>
+                    <span class="sr-only">{% translate "Edit" %}</span>
+                  </a>
+                </td>
+              </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      </div>
+      <a class="button" href="{% url 'team_new' %}">{% trans "New team" %}</a>
+    </div>
+  </div>
+{% endblock maincontent %}

umap/tests/base.py

@@ -7,7 +7,7 @@ from django.core.files.base import ContentFile
 from django.urls import reverse
 
 from umap.forms import DEFAULT_CENTER
-from umap.models import DataLayer, Licence, Map, TileLayer
+from umap.models import DataLayer, Licence, Map, Team, TileLayer
 
 User = get_user_model()
 
@@ -58,6 +58,13 @@ class UserFactory(factory.django.DjangoModelFactory):
         model = User
 
 
+class TeamFactory(factory.django.DjangoModelFactory):
+    name = "Awesome Team"
+
+    class Meta:
+        model = Team
+
+
 class MapFactory(factory.django.DjangoModelFactory):
     name = "test map"
     slug = "test-map"

umap/tests/conftest.py

@@ -11,6 +11,7 @@ from .base import (
     DataLayerFactory,
     LicenceFactory,
     MapFactory,
+    TeamFactory,
     TileLayerFactory,
     UserFactory,
 )
@@ -29,6 +30,11 @@ def pytest_runtest_teardown():
     cache.clear()
 
 
+@pytest.fixture
+def team():
+    return TeamFactory()
+
+
 @pytest.fixture
 def user():
     return UserFactory(password="123123")

umap/tests/fixtures/test_circles_layer.geojson

@@ -0,0 +1,219 @@
+{
+    "type": "FeatureCollection",
+    "features": [
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5869228,
+                    47.1988448
+                ]
+            },
+            "properties": {
+                "@id": "node/8371195387",
+                "access": "private",
+                "amenity": "bicycle_parking",
+                "covered": "yes",
+                "fee": "no",
+                "name": "station with unknown capacity"
+            },
+            "id": "capa0"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5567325,
+                    47.2223201
+                ]
+            },
+            "properties": {
+                "@id": "node/3750335624",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "2",
+                "check_date:capacity": "2021-05-12",
+                "covered": "no",
+                "material": "metal",
+                "name": "tiny station with 2"
+            },
+            "id": "capa2"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5293571,
+                    47.2285598
+                ]
+            },
+            "properties": {
+                "@id": "node/7149702104",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "wall_loops",
+                "covered": "yes",
+                "capacity": "2",
+                "name": "tiny station with 3"
+            },
+            "id": "capa3"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5613176,
+                    47.2223468
+                ]
+            },
+            "properties": {
+                "@id": "node/5206704322",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "4",
+                "name": "small station with 4"
+            },
+            "id": "capa4"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5465724,
+                    47.2074831
+                ]
+            },
+            "properties": {
+                "@id": "node/10539987424",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "6",
+                "covered": "no",
+                "material": "metal",
+                "name": "small station with 6"
+            },
+            "id": "capa6"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5877882,
+                    47.2179441
+                ]
+            },
+            "properties": {
+                "@id": "node/10239046793",
+                "amenity": "bicycle_parking",
+                "capacity": 8
+            },
+            "id": "capa8"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5406938,
+                    47.2312451
+                ]
+            },
+            "properties": {
+                "@id": "node/5176046494",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "rack",
+                "capacity": "27",
+                "name": "middle station with 27"
+            },
+            "id": "cap27"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5344658,
+                    47.1988441
+                ]
+            },
+            "properties": {
+                "@id": "node/4126326089",
+                "access": "private",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "building",
+                "capacity": "64",
+                "covered": "yes",
+                "material": "metal",
+                "name": "middle station with 64"
+            },
+            "id": "cap64"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5433176,
+                    47.2172633
+                ]
+            },
+            "properties": {
+                "@id": "way/1001063092",
+                "access": "yes",
+                "amenity": "bicycle_parking",
+                "architect": "Forma 6;Phytolab",
+                "bicycle_parking": "shed",
+                "building": "roof",
+                "building:architecture": "contemporary",
+                "capacity": "676",
+                "capacity:cargo_bike": "22",
+                "capacity:motorcycle": "33",
+                "covered": "yes",
+                "fee": "no",
+                "name": "big station with 676",
+                "start_date": "2021-11-15",
+                "@geometry": "center"
+            },
+            "id": "ca676"
+        },
+        {
+            "type": "Feature",
+            "geometry": {
+                "type": "Point",
+                "coordinates": [
+                    -1.5291998,
+                    47.259166
+                ]
+            },
+            "properties": {
+                "@id": "node/11141117088",
+                "amenity": "bicycle_parking",
+                "bicycle_parking": "stands",
+                "capacity": "1160",
+                "temporary": "yes",
+                "temporary:date_off": "2023-10-28",
+                "temporary:date_on": "2023-09-08",
+                "name": "huge station with 1160"
+            },
+            "id": "c1160"
+        }
+    ],
+    "_umap_options": {
+        "displayOnLoad": true,
+        "inCaption": true,
+        "browsable": true,
+        "editMode": "advanced",
+        "name": "Calque 1",
+        "remoteData": {},
+        "type": "Circles",
+        "circles": {
+            "radius": {"min": 2, "max": 40},
+            "property": "capacity"
+        }
+    }
+}

umap/tests/fixtures/test_upload_georss.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:creativeCommons="http://cyber.law.harvard.edu/rss/creativeCommonsRssModule.html" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:flickr="urn:flickr:user" xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" xmlns:georss="http://www.georss.org/georss" xmlns:media="http://search.yahoo.com/mrss/" xmlns:woe="http://where.yahooapis.com/v1/schema.rng">
+    <channel>
+        <title>Test stream</title>
+        <link>http://www.pouet.fr/link/</link>
+        <description/>
+        <pubDate>Sun, 13 Apr 2014 09:20:36 -0700</pubDate>
+        <lastBuildDate>Sun, 13 Apr 2014 09:20:36 -0700</lastBuildDate>
+        <generator>http://www.pouet.com/</generator>
+        <item>
+            <title>Title 1</title>
+            <link>http://link.com</link>
+            <description>Description 1</description>
+            <pubDate>Sun, 13 Apr 2014 09:20:36 -0700</pubDate>
+            <geo:lat>53.443324</geo:lat>
+            <geo:long>-2.218337</geo:long>
+            <enclosure url="http://farm4.staticflickr.com/3758/13906321891_faa9be0b8e_b.jpg" type="image/jpeg" />
+        </item>
+    </channel>
+</rss>

umap/tests/integration/conftest.py

@@ -27,10 +27,24 @@ def mock_osm_tiles(page):
 
 
 @pytest.fixture
-def page(context):
-    page = context.new_page()
-    page.on("console", lambda msg: print(msg.text) if msg.type != "warning" else None)
-    return page
+def new_page(context):
+    def make_page(prefix="console"):
+        page = context.new_page()
+        page.on(
+            "console",
+            lambda msg: print(f"{prefix}: {msg.text}")
+            if msg.type != "warning"
+            else None,
+        )
+        page.on("pageerror", lambda exc: print(f"{prefix} uncaught exception: {exc}"))
+        return page
+
+    yield make_page
+
+
+@pytest.fixture
+def page(new_page):
+    return new_page()
 
 
 @pytest.fixture