umap-project 1.14.0a5__py3-none-any.whl → 2.0.0a1__py3-none-any.whl

umap/static/umap/test/Polyline.js

@@ -1,4 +1,4 @@
-describe('L.U.Polyline', function () {
+describe('U.Polyline', function () {
   var p2ll, map
 
   before(function () {
@@ -22,7 +22,7 @@ describe('L.U.Polyline', function () {
 
   describe('#isMulti()', function () {
     it('should return false for basic Polyline', function () {
-      var layer = new L.U.Polyline(
+      var layer = new U.Polyline(
         this.map,
         [
           [1, 2],
@@ -35,7 +35,7 @@ describe('L.U.Polyline', function () {
     })
 
     it('should return false for nested basic Polyline', function () {
-      var layer = new L.U.Polyline(
+      var layer = new U.Polyline(
         this.map,
         [
           [
@@ -66,7 +66,7 @@ describe('L.U.Polyline', function () {
           ],
         ],
       ]
-      var layer = new L.U.Polyline(this.map, latLngs, { datalayer: this.datalayer })
+      var layer = new U.Polyline(this.map, latLngs, { datalayer: this.datalayer })
       assert.ok(layer.isMulti())
     })
   })
@@ -83,7 +83,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 100), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -92,7 +92,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to remove shape when not multi', function () {
         var latlngs = [[p2ll(100, 100), p2ll(100, 200)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -101,7 +101,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to isolate shape when not multi', function () {
         var latlngs = [[p2ll(100, 100), p2ll(100, 200)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -113,7 +113,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 150), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -125,7 +125,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 150), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -134,7 +134,7 @@ describe('L.U.Polyline', function () {
 
       it('should allow to transform to polygon when not multi', function () {
         var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -142,7 +142,7 @@ describe('L.U.Polyline', function () {
       })
 
       it('should not allow to transfer shape when not editedFeature', function () {
-        var layer = new L.U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
+        var layer = new U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -150,10 +150,10 @@ describe('L.U.Polyline', function () {
       })
 
       it('should not allow to transfer shape when editedFeature is not a line', function () {
-        var layer = new L.U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
+        var layer = new U.Polyline(this.map, [p2ll(100, 150), p2ll(100, 200)], {
             datalayer: this.datalayer,
           }).addTo(this.datalayer),
-          other = new L.U.Polygon(
+          other = new U.Polygon(
             this.map,
             [p2ll(200, 300), p2ll(300, 200), p2ll(200, 100)],
             { datalayer: this.datalayer }
@@ -164,12 +164,12 @@ describe('L.U.Polyline', function () {
       })
 
       it('should allow to transfer shape when another line is edited', function () {
-        var layer = new L.U.Polyline(
+        var layer = new U.Polyline(
             this.map,
             [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
             { datalayer: this.datalayer }
           ).addTo(this.datalayer),
-          other = new L.U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
+          other = new U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         other.edit()
@@ -184,7 +184,7 @@ describe('L.U.Polyline', function () {
             [p2ll(100, 100), p2ll(100, 200)],
             [p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)],
           ],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -193,7 +193,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to merge lines when not multi', function () {
         var latlngs = [[p2ll(100, 100), p2ll(100, 200)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         happen.once(layer._path, { type: 'contextmenu' })
@@ -202,7 +202,7 @@ describe('L.U.Polyline', function () {
 
       it('should allow to split lines when clicking on vertex', function () {
         var latlngs = [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         layer.enableEdit()
@@ -212,7 +212,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to split lines when clicking on first vertex', function () {
         var latlngs = [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         layer.enableEdit()
@@ -223,7 +223,7 @@ describe('L.U.Polyline', function () {
 
       it('should not allow to split lines when clicking on last vertex', function () {
         var latlngs = [[p2ll(300, 350), p2ll(350, 400), p2ll(400, 300)]],
-          layer = new L.U.Polyline(this.map, latlngs, {
+          layer = new U.Polyline(this.map, latlngs, {
             datalayer: this.datalayer,
           }).addTo(this.datalayer)
         layer.enableEdit()
@@ -240,7 +240,7 @@ describe('L.U.Polyline', function () {
     })
 
     it('"add shape" control should be visible when editing a Polyline', function () {
-      var layer = new L.U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
+      var layer = new U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
         datalayer: this.datalayer,
       }).addTo(this.datalayer)
       layer.edit()
@@ -248,7 +248,7 @@ describe('L.U.Polyline', function () {
     })
 
     it('"add shape" control should extend the same multi', function () {
-      var layer = new L.U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
+      var layer = new U.Polyline(this.map, [p2ll(100, 100), p2ll(100, 200)], {
         datalayer: this.datalayer,
       }).addTo(this.datalayer)
       layer.edit()
@@ -267,10 +267,10 @@ describe('L.U.Polyline', function () {
   describe('#transferShape', function () {
     it('should transfer simple line shape to another line', function () {
       var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer),
-        other = new L.U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
+        other = new U.Polyline(this.map, [p2ll(200, 300), p2ll(300, 200)], {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.ok(this.map.hasLayer(layer))
@@ -285,10 +285,10 @@ describe('L.U.Polyline', function () {
           [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
           [p2ll(200, 300), p2ll(300, 200)],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer),
-        other = new L.U.Polyline(this.map, [p2ll(250, 300), p2ll(350, 200)], {
+        other = new U.Polyline(this.map, [p2ll(250, 300), p2ll(350, 200)], {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.ok(this.map.hasLayer(layer))
@@ -312,7 +312,7 @@ describe('L.U.Polyline', function () {
             [0, 2],
           ],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       layer.mergeShapes()
@@ -336,7 +336,7 @@ describe('L.U.Polyline', function () {
             [0, 1],
           ],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       layer.mergeShapes()
@@ -352,7 +352,7 @@ describe('L.U.Polyline', function () {
   describe('#isolateShape', function () {
     it('should not allow to isolate simple line', function () {
       var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.equal(this.datalayer._index.length, 1)
@@ -367,7 +367,7 @@ describe('L.U.Polyline', function () {
           [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
           [[p2ll(200, 300), p2ll(300, 200)]],
         ],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.equal(this.datalayer._index.length, 1)
@@ -386,7 +386,7 @@ describe('L.U.Polyline', function () {
   describe('#clone', function () {
     it('should clone polyline', function () {
       var latlngs = [p2ll(100, 150), p2ll(100, 200), p2ll(200, 100)],
-        layer = new L.U.Polyline(this.map, latlngs, {
+        layer = new U.Polyline(this.map, latlngs, {
           datalayer: this.datalayer,
         }).addTo(this.datalayer)
       assert.equal(this.datalayer._index.length, 1)

umap/static/umap/test/TableEditor.js

@@ -1,50 +1,54 @@
-describe('L.TableEditor', function () {
-  var path = '/map/99/datalayer/edit/62/'
+describe('L.TableEditor', () => {
+  let path = '/map/99/datalayer/edit/62/',
+    datalayer
 
-  before(function () {
-    this.server = sinon.fakeServer.create()
-    this.server.respondWith(
+  before(async  () => {
+    await fetchMock.mock(
       /\/datalayer\/62\/\?.*/,
       JSON.stringify(RESPONSES.datalayer62_GET)
     )
-    this.map = initMap({ umap_id: 99 })
-    this.datalayer = this.map.getDataLayerByUmapId(62)
-    this.server.respond()
+    this.options = {
+      umap_id: 99,
+    }
+    map = initMap({ umap_id: 99 })
+    const datalayer_options = defaultDatalayerData()
+    await map.initDataLayers([datalayer_options])
+    datalayer = map.getDataLayerByUmapId(62)
     enableEdit()
   })
-  after(function () {
+  after(() => {
+    fetchMock.restore()
     clickCancel()
-    this.server.restore()
     resetMap()
   })
 
-  describe('#open()', function () {
+  describe('#open()', () => {
     var button
 
-    it('should exist table click on edit mode', function () {
+    it('should exist table click on edit mode', () => {
       button = qs(
-        '#browse_data_toggle_' + L.stamp(this.datalayer) + ' .layer-table-edit'
+        '#browse_data_toggle_' + L.stamp(datalayer) + ' .layer-table-edit'
       )
       expect(button).to.be.ok
     })
 
-    it('should open table button click', function () {
+    it('should open table button click', () => {
       happen.click(button)
       expect(qs('#umap-ui-container div.table')).to.be.ok
       expect(qsa('#umap-ui-container div.table form').length).to.eql(3) // One per feature.
       expect(qsa('#umap-ui-container div.table input').length).to.eql(3) // One per feature and per property.
     })
   })
-  describe('#properties()', function () {
+  describe('#properties()', () => {
     var feature
 
-    before(function () {
-      var firstIndex = this.datalayer._index[0]
-      feature = this.datalayer._layers[firstIndex]
+    before(() => {
+      var firstIndex = datalayer._index[0]
+      feature = datalayer._layers[firstIndex]
     })
 
-    it('should create new property column', function () {
-      var newPrompt = function () {
+    it('should create new property column', () => {
+      var newPrompt = () => {
         return 'newprop'
       }
       var oldPrompt = window.prompt
@@ -56,7 +60,7 @@ describe('L.TableEditor', function () {
       window.prompt = oldPrompt
     })
 
-    it('should populate feature property on fill', function () {
+    it('should populate feature property on fill', () => {
       var input = qs(
         'form#umap-feature-properties_' + L.stamp(feature) + ' input[name=newprop]'
       )
@@ -64,8 +68,8 @@ describe('L.TableEditor', function () {
       expect(feature.properties.newprop).to.eql('the value')
     })
 
-    it('should update property name on update click', function () {
-      var newPrompt = function () {
+    it('should update property name on update click', () => {
+      var newPrompt = () => {
         return 'newname'
       }
       var oldPrompt = window.prompt
@@ -79,9 +83,9 @@ describe('L.TableEditor', function () {
       window.prompt = oldPrompt
     })
 
-    it('should update property on delete click', function () {
+    it('should update property on delete click', () => {
       var oldConfirm,
-        newConfirm = function () {
+        newConfirm = () => {
           return true
         }
       oldConfirm = window.confirm

umap/static/umap/test/_pre.js

@@ -132,7 +132,7 @@ function initMap(options) {
         map_update_permissions: '/map/{map_id}/update/permissions/',
         map_download: '/map/{map_id}/download/',
       },
-      default_iconUrl: '../src/img/marker.png',
+      default_iconUrl: '../src/img/marker.svg',
       zoom: 6,
       share_statuses: [
         [1, 'Tout le monde (public)'],
@@ -213,14 +213,13 @@ function initMap(options) {
       },
     },
   }
-  default_options.properties.datalayers.push(defaultDatalayerData())
   options = options || {}
   options.properties = L.extend({}, default_options.properties, options)
   options.geometry = {
     type: 'Point',
     coordinates: [5.0592041015625, 52.05924589011585],
   }
-  return new L.U.Map('map', options)
+  return new U.Map('map', options)
 }
 
 var RESPONSES = {
@@ -386,10 +385,6 @@ var RESPONSES = {
   },
 }
 
-sinon.fakeServer.flush = function () {
-  this.responses = []
-}
-
 var kml_example =
   '<?xml version="1.0" encoding="UTF-8"?>' +
   '<kml xmlns="http://www.opengis.net/kml/2.2">' +

umap/static/umap/test/index.html

@@ -35,7 +35,6 @@
     <script src="../js/umap.core.js" defer></script>
     <script src="../js/umap.autocomplete.js" defer></script>
     <script src="../js/umap.popup.js" defer></script>
-    <script src="../js/umap.xhr.js" defer></script>
     <script src="../js/umap.forms.js" defer></script>
     <script src="../js/umap.icon.js" defer></script>
     <script src="../js/umap.features.js" defer></script>
@@ -45,7 +44,6 @@
     <script src="../js/umap.controls.js" defer></script>
     <script src="../js/umap.slideshow.js" defer></script>
     <script src="../js/umap.tableeditor.js" defer></script>
-    <script src="../js/umap.browser.js" defer></script>
     <script src="../js/umap.importer.js" defer></script>
     <script src="../js/umap.share.js" defer></script>
     <script src="../js/umap.js" defer></script>
@@ -76,6 +74,10 @@
     <script src="../../../../node_modules/chai/chai.js"></script>
     <script src="../../../../node_modules/happen/happen.js"></script>
     <link rel="stylesheet" href="../../../../node_modules/mocha/mocha.css" />
+    <script type="module">
+      import fetchMock from '../../../../node_modules/fetch-mock/esm/client.js';
+      window.fetchMock = fetchMock
+    </script>
     <script type="text/javascript">
       mocha.setup({
         ui: 'bdd',
@@ -86,7 +88,6 @@
     </script>
     <script src="./_pre.js" defer></script>
     <script src="./Map.js" defer></script>
-    <script src="./Map.Init.js" defer></script>
     <script src="./Map.Export.js" defer></script>
     <script src="./DataLayer.js" defer></script>
     <script src="./TableEditor.js" defer></script>
@@ -95,7 +96,6 @@
     <script src="./Polyline.js" defer></script>
     <script src="./Polygon.js" defer></script>
     <script src="./Util.js" defer></script>
-    <script src="./Controls.js" defer></script>
     <script src="./Permissions.js" defer></script>
     <script src="./Choropleth.js" defer></script>
     <script type="module" src="./URLs.js" defer></script>

umap/storage.py

@@ -41,6 +41,8 @@ class UmapManifestStaticFilesStorage(ManifestStaticFilesStorage):
     def post_process(self, paths, **options):
         collected = super().post_process(paths, **options)
         for original_path, processed_path, processed in collected:
+            if not processed_path:
+                print("Unused or missing file?", original_path)
             if processed_path.endswith(".js"):
                 path = Path(settings.STATIC_ROOT) / processed_path
                 initial = path.read_text()

umap/templates/auth/user_form.html

@@ -1,9 +1,10 @@
 {% extends "umap/content.html" %}
 {% load i18n %}
 {% block maincontent %}
-  <div class="col wide">
+  <div class="row">
     <h2 class="section tabs">
-      <a href="{% url "user_dashboard" %}">{% trans "My Dashboard" %}</a> | <a class="selected" href="{% url 'user_profile' %}">{% trans "My Profile" %}</a>
+      <a href="{% url "user_dashboard" %}">{% trans "My Maps" %}</a>
+      <a class="selected" href="{% url 'user_profile' %}">{% trans "My Profile" %}</a>
     </h2>
   </div>
   <div class="wrapper">

umap/templates/base.html

@@ -12,6 +12,7 @@
           content="{% trans "uMap lets you create maps with OpenStreetMap layers in a minute and embed them in your site." %}">
     <meta name="keywords" content="map, umap">
     {% block extra_head %}
+      {% include "umap/header.html" %}
     {% endblock extra_head %}
     <meta name="viewport"
           content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />

umap/templates/registration/login.html

@@ -1,37 +1,52 @@
-{% load i18n %}
-{% if ENABLE_ACCOUNT_LOGIN %}
-  <h5>{% trans "Please log in with your account" %}</h5>
-  <div>
-    {% if form.non_field_errors %}
-      <ul class="form-errors">
-        {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+{% extends "base.html" %}
+{% load umap_tags i18n %}
+{% block extra_head %}
+  {% umap_css %}
+  {{ block.super }}
+{% endblock extra_head %}
+{% block body_class %}
+  login
+{% endblock body_class %}
+{% block content %}
+<section>
+  <header class="umap-nav">
+    {% include "umap/branding.html" %}
+  </header>
+  {% if ENABLE_ACCOUNT_LOGIN %}
+    <h2>{% trans "Please log in with your account" %}</h2>
+    <div>
+      {% if form.non_field_errors %}
+        <ul class="form-errors">
+          {% for error in form.non_field_errors %}<li>{{ error }}</li>{% endfor %}
+        </ul>
+      {% endif %}
+      <form id="login_form" action="{% url "login" %}" method="post">
+        {% csrf_token %}
+        {{ form.username.errors }}
+        <input type="text"
+               name="username"
+               placeholder="{% trans "Username" %}"
+               autofocus />
+        {{ form.password.errors }}
+        <input type="password" name="password" placeholder="{% trans "Password" %}" />
+        <input type="submit" value="{% trans "Login" %}" />
+      </form>
+    </div>
+  {% endif %}
+  {% if backends.backends|length %}
+    <h2>{% trans "Please choose a provider" %}</h2>
+    <div>
+      <ul class="login-grid block-grid">
+        {% for name in backends.backends %}
+          <li>
+            <a rel="nofollow"
+               href="{% url "social:begin" name %}"
+               class="umap-login-popup login-{{ name }}"
+               title="{{ name|title }}"></a>
+          </li>
+        {% endfor %}
       </ul>
-    {% endif %}
-    <form id="login_form" action="{% url "login" %}" method="post">
-      {% csrf_token %}
-      {{ form.username.errors }}
-      <input type="text"
-             name="username"
-             placeholder="{% trans "Username" %}"
-             autofocus />
-      {{ form.password.errors }}
-      <input type="password" name="password" placeholder="{% trans "Password" %}" />
-      <input type="submit" value="{% trans "Login" %}" />
-    </form>
-  </div>
-{% endif %}
-{% if backends.backends|length %}
-  <h5>{% trans "Please choose a provider" %}</h5>
-  <div>
-    <ul class="login-grid block-grid">
-      {% for name in backends.backends %}
-        <li>
-          <a rel="nofollow"
-             href="{% url "social:begin" name %}"
-             class="umap-login-popup login-{{ name }}"
-             title="{{ name|title }}"></a>
-        </li>
-      {% endfor %}
-    </ul>
-  </div>
-{% endif %}
+    </div>
+  {% endif %}
+</section>
+{% endblock content %}

umap/templates/umap/about_summary.html

@@ -45,7 +45,7 @@
       {% spaceless %}
         <div class="button-bar {% if demo_map %}half{% endif %}">
           {% if not UMAP_READONLY %}
-            <a href="{% url 'map_new' %}" class="button half">{% trans "Create a map" %}</a>
+            <a href="{% url 'map_new' %}" class="button button-primary half">{% trans "Create a map" %}</a>
           {% endif %}
           {% if demo_map %}
             <a href="{{ demo_map.get_absolute_url }}" class="button half neutral">{% trans "Play with the demo" %}</a>

umap/templates/umap/branding.html

@@ -0,0 +1,3 @@
+<h1>
+  <a href="{% url "home" %}">{{ SITE_NAME }}</a>
+</h1>

umap/templates/umap/content.html

@@ -5,6 +5,7 @@
 {% endblock body_class %}
 {% block extra_head %}
   {% umap_css %}
+  {{ block.super }}
   {% umap_js %}
 {% endblock extra_head %}
 {% block header %}
@@ -36,51 +37,26 @@
 {% block bottom_js %}
   {{ block.super }}
   <script type="text/javascript">
-    window.addEventListener('DOMContentLoaded', (event => {
-      
-    !(function () {
-      const ui = new L.U.UI(document.querySelector('header'))
-      const xhr = new L.U.Xhr(ui)
-      const login = document.querySelector('a.login')
-      if (login) {
-        L.DomEvent.on(login, 'click', function (e) {
-          L.DomEvent.stop(e)
-          xhr.login({
-            login_required: this.getAttribute('href'),
-            redirect: '/',
-          })
-        })
-      }
-      const logout = document.querySelector('a.logout')
-      if (logout) {
-        L.DomEvent.on(logout, 'click', function (e) {
-          L.DomEvent.stop(e)
-          xhr.logout(this.getAttribute('href'))
-        })
-      }
-      const getMore = function (e) {
+    window.addEventListener('DOMContentLoaded', event => {
+      const ui = new U.UI(document.querySelector('header'))
+      const server = new U.ServerRequest(ui)
+      const getMore = async function (e) {
         L.DomEvent.stop(e)
-        xhr._ajax({
-          uri: this.href,
-          verb: 'GET',
-          callback: function (data) {
-            const container = this.parentNode
-            container.innerHTML = data
-            const more = document.querySelector('.more_button')
-            if (more) {
-              L.DomEvent.on(more, 'click', getMore, more)
-            }
-          },
-          context: this,
-        })
+        const [{html}, response, error] = await server.get(this.href)
+        if (!error) {
+          const container = this.parentNode
+          container.innerHTML = html
+          const more = document.querySelector('.more_button')
+          if (more) {
+            L.DomEvent.on(more, 'click', getMore, more)
+          }
+        }
       }
       const more = document.querySelector('.more_button')
       if (more) {
         L.DomEvent.on(more, 'click', getMore, more)
       }
-    })(this)
-    }
-    ))
+    })
   </script>
 {% endblock bottom_js %}
 {% block footer %}

umap/templates/umap/home.html

@@ -10,7 +10,9 @@
     </div>
   {% endif %}
   <div class="wrapper">
-    <h2 class="section">{% blocktrans %}Get inspired, browse maps{% endblocktrans %}</h2>
-    <div class="map_list row">{% include "umap/map_list.html" %}</div>
+    {% if maps %}
+      <h2 class="section">{% blocktrans %}Get inspired, browse maps{% endblocktrans %}</h2>
+      <div class="map_list row">{% include "umap/map_list.html" %}</div>
+    {% endif %}
   </div>
 {% endblock maincontent %}