umap-project 2.9.3__py3-none-any.whl → 3.0.0__py3-none-any.whl

umap/static/umap/locale/zh_TW.js

@@ -27,10 +27,7 @@ const locale = {
     "Allow scroll wheel zoom?": "允許捲動放大？",
     "always": "經常",
     "Animated transitions": "動畫轉換",
-    "Are you sure you want to cancel your changes?": "您確定要取消您所做的變更？",
     "Are you sure you want to clone this map and all its datalayers?": "您確定要複製此地圖及所有資料圖層？",
-    "Are you sure you want to delete the feature?": "您確定要刪除該圖徵？",
-    "Are you sure you want to delete this layer?": "你確定要刪除這個圖層嗎？",
     "Are you sure you want to delete this map?": "您確定要刪除此地圖？",
     "Are you sure you want to delete this property on all the features?": "您確定要刪除所有圖徵中的此項屬性？",
     "Are you sure you want to restore this version?": "您確定要回復此一版本嗎？",
@@ -46,7 +43,6 @@ const locale = {
     "Browse data": "瀏覽資料",
     "by": "由",
     "Cache proxied request": "快取代理請求",
-    "Cancel edits": "取消編輯",
     "Caption": "標題",
     "Center map on your location": "將您的位置設為地圖中心",
     "Change map background": "更改地圖背景",
@@ -524,16 +520,25 @@ const locale = {
     "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "無法用網址 \"{url}\" 為圖層 \"{layer}\" 解析遠端資料",
     "Import failed: invalid data": "匯入失敗：無效的資料",
     "Anonymous": "暱名",
-    "created at {date}": "created at {date}",
-    "modified at {date}": "modified at {date}",
-    "Default zoom": "Default zoom",
-    "Default latitude": "Default latitude",
-    "Default longitude": "Default longitude",
-    "Edit map default view": "Edit map default view",
-    "Use current center and zoom": "Use current center and zoom",
-    "Layer permalink": "Layer permalink",
-    "Save this geometry as a new feature": "Save this geometry as a new feature",
-    "Save this place as a new feature": "Save this place as a new feature"
+    "created at {date}": "在 {date} 創建",
+    "modified at {date}": "在 {date} 變更",
+    "Default zoom": "預設縮放大小",
+    "Default latitude": "預設緯度",
+    "Default longitude": "預設經度",
+    "Edit map default view": "編輯地圖預設檢視",
+    "Use current center and zoom": "使用目前中心與縮放大小",
+    "Layer permalink": "圖層永久連結",
+    "Back to home": "Back to home",
+    "Home logo": "Home logo",
+    "Add this geometry to my map": "Add this geometry to my map",
+    "Add this place to my map": "Add this place to my map",
+    "Cancel last edit": "Cancel last edit",
+    "Redo last edit": "Redo last edit",
+    "Links": "Links",
+    "Images": "Images",
+    "Iframes": "Iframes",
+    "Tags": "Tags",
+    "Geocode": "Geocode"
 }
 L.registerLocale("zh_TW", locale)
 L.setLocale("zh_TW")

umap/static/umap/locale/zh_TW.json

@@ -27,10 +27,7 @@
     "Allow scroll wheel zoom?": "允許捲動放大？",
     "always": "經常",
     "Animated transitions": "動畫轉換",
-    "Are you sure you want to cancel your changes?": "您確定要取消您所做的變更？",
     "Are you sure you want to clone this map and all its datalayers?": "您確定要複製此地圖及所有資料圖層？",
-    "Are you sure you want to delete the feature?": "您確定要刪除該圖徵？",
-    "Are you sure you want to delete this layer?": "你確定要刪除這個圖層嗎？",
     "Are you sure you want to delete this map?": "您確定要刪除此地圖？",
     "Are you sure you want to delete this property on all the features?": "您確定要刪除所有圖徵中的此項屬性？",
     "Are you sure you want to restore this version?": "您確定要回復此一版本嗎？",
@@ -46,7 +43,6 @@
     "Browse data": "瀏覽資料",
     "by": "由",
     "Cache proxied request": "快取代理請求",
-    "Cancel edits": "取消編輯",
     "Caption": "標題",
     "Center map on your location": "將您的位置設為地圖中心",
     "Change map background": "更改地圖背景",
@@ -524,14 +520,23 @@
     "Cannot parse remote data for layer \"{layer}\" with url \"{url}\"": "無法用網址 \"{url}\" 為圖層 \"{layer}\" 解析遠端資料",
     "Import failed: invalid data": "匯入失敗：無效的資料",
     "Anonymous": "暱名",
-    "created at {date}": "created at {date}",
-    "modified at {date}": "modified at {date}",
-    "Default zoom": "Default zoom",
-    "Default latitude": "Default latitude",
-    "Default longitude": "Default longitude",
-    "Edit map default view": "Edit map default view",
-    "Use current center and zoom": "Use current center and zoom",
-    "Layer permalink": "Layer permalink",
-    "Save this geometry as a new feature": "Save this geometry as a new feature",
-    "Save this place as a new feature": "Save this place as a new feature"
+    "created at {date}": "在 {date} 創建",
+    "modified at {date}": "在 {date} 變更",
+    "Default zoom": "預設縮放大小",
+    "Default latitude": "預設緯度",
+    "Default longitude": "預設經度",
+    "Edit map default view": "編輯地圖預設檢視",
+    "Use current center and zoom": "使用目前中心與縮放大小",
+    "Layer permalink": "圖層永久連結",
+    "Back to home": "Back to home",
+    "Home logo": "Home logo",
+    "Add this geometry to my map": "Add this geometry to my map",
+    "Add this place to my map": "Add this place to my map",
+    "Cancel last edit": "Cancel last edit",
+    "Redo last edit": "Redo last edit",
+    "Links": "Links",
+    "Images": "Images",
+    "Iframes": "Iframes",
+    "Tags": "Tags",
+    "Geocode": "Geocode"
 }

umap/static/umap/map.css

@@ -37,7 +37,6 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     background-color: var(--color-lightGray);
 }
 
-
 /* *********** */
 /* Structure   */
 /* *********** */
@@ -94,6 +93,8 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
     background-image: url('./img/24.svg');
     text-indent: -9999px;
     margin-bottom: 0;
+    background-color: white;
+    min-height: initial;
 }
 .leaflet-control.display-on-more,
 .umap-control-less {
@@ -247,7 +248,19 @@ html[dir="rtl"] .leaflet-tooltip-pane > * {
 .leaflet-iconLayers:hover .leaflet-iconLayers-layerCell-plus {
     display: block;
 }
-
+.home-button {
+    cursor: pointer;
+    line-height: 0;
+    border: 1px solid var(--color-darkBlue);
+    border-radius: 50%;
+    background-color: var(--background-color);
+}
+.home-button:hover {
+    background-color: var(--color-lighterGray);
+}
+.umap-edit-enabled .home-button {
+    display: none;
+}
 
 
 
@@ -263,18 +276,30 @@ ul.photon-autocomplete {
 .photon-autocomplete li {
     min-height: 40px;
     line-height: 1em;
-    padding: 5px 10px;
+    padding-inline-start: 10px;
     overflow: hidden;
     white-space: nowrap;
     font-size: 1em;
-    border-inline-start: 4px solid #efefef;
+    border-inline-start: 4px solid var(--color-lightGray);
 }
 .photon-autocomplete li strong {
     display: block;
+    margin-top: 5px;
+}
+.photon-autocomplete button {
+    margin: 0;
+}
+.photon-autocomplete button:hover {
+    background-color: var(--color-darkCyan);
+}
+.photon-autocomplete button:hover i {
+    /* TODO deal with this in icon.css  */
+    background-image: url('./img/16-white.svg');
 }
 .photon-autocomplete li.on {
-    border-inline-start: 4px solid #2980b9;
+    border-inline-start: 4px solid var(--color-darkCyan);
     cursor: pointer;
+    background-color: var(--color-lightCyan);
 }
 .photon-autocomplete li.photon-no-result {
     text-align: center;
@@ -292,7 +317,13 @@ ul.photon-autocomplete {
 }
 .search-result-tools {
     float: inline-end;
-    display: block;
+    display: none;
+}
+.search-result-tools button {
+    padding: 8px;
+}
+.umap-edit-enabled .photon-autocomplete li.on .search-result-tools {
+    display: flex;
 }
 
 
@@ -419,7 +450,7 @@ ul.photon-autocomplete {
     display: inline-block;
     width: 16px;
     height: 16px;
-    margin-inline-start: 5px;
+    margin-inline-start: 2px;
     background-position: 2px -4px;
     background-repeat: no-repeat;
     background-image: url('./img/16.svg');
@@ -440,27 +471,12 @@ ul.photon-autocomplete {
 }
 .umap-getstarted button {
     width: 100%;
+    margin-bottom: var(--text-margin);
 }
 .umap-help {
     font-style: italic;
 }
 
-
-
-.umap-datalayer-version {
-    padding: 5px 0;
-    border-bottom: 1px solid #202425;
-}
-.umap-datalayer-version button {
-    display: inline-block;
-    width: 24px;
-    min-height: 24px;
-    background-position: -122px -73px;
-    background-repeat: no-repeat;
-    background-image: url('./img/16-white.svg');
-    margin-inline-end: 10px;
-}
-
 .leaflet-toolbar-tip {
     background-color: var(--color-darkGray);
 }
@@ -646,9 +662,9 @@ a.umap-control-caption,
 .umap-caption .header i.icon {
     flex-shrink: 0;
 }
-.umap-caption hgroup p,
-.umap-caption hgroup button {
-    margin: 0;
+.umap-caption button {
+    background-color: var(--background-color);
+    color: var(--text-color);
 }
 .umap-browser .main-toolbox {
     padding-left: 4px; /* Align with toolbox below  */
@@ -882,7 +898,21 @@ a.umap-control-caption,
 .umap-edit-enabled .readonly {
     cursor: not-allowed;
 }
-
+.leaflet-container .umap-raw-icon img {
+    max-height: 48px !important;
+    max-width: 48px !important;
+}
+.umap-raw-icon {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    align-content: center;
+    overflow: hidden;
+}
+.umap-raw-icon.umap-icon-active {
+    box-shadow: var(--block-shadow);
+}
 
 /* ********************************* */
 /*         Ajax loader               */
@@ -976,7 +1006,7 @@ a.umap-control-caption,
     .umap-main-edit-toolbox .umap-user span,
     .leaflet-container .leaflet-control-edit-save span,
     .leaflet-container .leaflet-control-edit-disable span,
-    .leaflet-container .leaflet-control-edit-cancel span {
+    .leaflet-container .edit-cancel span {
         display: none;
     }
     .umap-main-edit-toolbox .umap-help-button {

umap/static/umap/unittests/sync.js

@@ -49,63 +49,6 @@ describe('#dispatch', () => {
   })
 })
 
-describe('Updaters', () => {
-  describe('BaseUpdater', () => {
-    let updater
-    let map
-    let obj
-
-    beforeEach(() => {
-      map = {}
-      updater = new MapUpdater(map)
-      obj = {}
-    })
-    it('should be able to set object properties', () => {
-      let obj = {}
-      updater.updateObjectValue(obj, 'foo', 'foo')
-      expect(obj).deep.equal({ foo: 'foo' })
-    })
-
-    it('should be able to set object properties recursively on existing objects', () => {
-      let obj = { foo: {} }
-      updater.updateObjectValue(obj, 'foo.bar', 'foo')
-      expect(obj).deep.equal({ foo: { bar: 'foo' } })
-    })
-
-    it('should be able to set object properties recursively on deep objects', () => {
-      let obj = { foo: { bar: { baz: {} } } }
-      updater.updateObjectValue(obj, 'foo.bar.baz.test', 'value')
-      expect(obj).deep.equal({ foo: { bar: { baz: { test: 'value' } } } })
-    })
-
-    it('should be able to replace object properties recursively on deep objects', () => {
-      let obj = { foo: { bar: { baz: { test: 'test' } } } }
-      updater.updateObjectValue(obj, 'foo.bar.baz.test', 'value')
-      expect(obj).deep.equal({ foo: { bar: { baz: { test: 'value' } } } })
-    })
-
-    it('should not set object properties recursively on non-existing objects', () => {
-      let obj = { foo: {} }
-      updater.updateObjectValue(obj, 'bar.bar', 'value')
-
-      expect(obj).deep.equal({ foo: {} })
-    })
-
-    it('should delete keys for undefined values', () => {
-      let obj = { foo: 'foo' }
-      updater.updateObjectValue(obj, 'foo', undefined)
-
-      expect(obj).deep.equal({})
-    })
-
-    it('should delete keys for undefined values, recursively', () => {
-      let obj = { foo: { bar: 'bar' } }
-      updater.updateObjectValue(obj, 'foo.bar', undefined)
-
-      expect(obj).deep.equal({ foo: {} })
-    })
-  })
-})
 
 describe('Operations', () => {
   describe('haveSameContext', () => {

umap/static/umap/unittests/utils.js

@@ -862,4 +862,51 @@ describe('Utils', () => {
       assert.equal(Utils.isObject(''), false)
     })
   })
+
+  describe('setObjectValue', () => {
+    it('should be able to set object properties', () => {
+      let obj = {}
+      Utils.setObjectValue(obj, 'foo', 'foo')
+      expect(obj).deep.equal({ foo: 'foo' })
+    })
+
+    it('should be able to set object properties recursively on existing objects', () => {
+      let obj = { foo: {} }
+      Utils.setObjectValue(obj, 'foo.bar', 'foo')
+      expect(obj).deep.equal({ foo: { bar: 'foo' } })
+    })
+
+    it('should be able to set object properties recursively on deep objects', () => {
+      let obj = { foo: { bar: { baz: {} } } }
+      Utils.setObjectValue(obj, 'foo.bar.baz.test', 'value')
+      expect(obj).deep.equal({ foo: { bar: { baz: { test: 'value' } } } })
+    })
+
+    it('should be able to replace object properties recursively on deep objects', () => {
+      let obj = { foo: { bar: { baz: { test: 'test' } } } }
+      Utils.setObjectValue(obj, 'foo.bar.baz.test', 'value')
+      expect(obj).deep.equal({ foo: { bar: { baz: { test: 'value' } } } })
+    })
+
+    it('should not set object properties recursively on non-existing objects', () => {
+      let obj = { foo: {} }
+      Utils.setObjectValue(obj, 'bar.bar', 'value')
+
+      expect(obj).deep.equal({ foo: {} })
+    })
+
+    it('should delete keys for undefined values', () => {
+      let obj = { foo: 'foo' }
+      Utils.setObjectValue(obj, 'foo', undefined)
+
+      expect(obj).deep.equal({})
+    })
+
+    it('should delete keys for undefined values, recursively', () => {
+      let obj = { foo: { bar: 'bar' } }
+      Utils.setObjectValue(obj, 'foo.bar', undefined)
+
+      expect(obj).deep.equal({ foo: {} })
+    })
+  })
 })

umap/static/umap/vars.css

@@ -1,6 +1,5 @@
 :root {
     /* Colors. */
-    --color-waterMint: #B9F5D2;
     --color-darkBlue: #263B58;
     --color-lighterGray: #f6f6f6;
     --color-lightGray: #ddd;
@@ -12,15 +11,17 @@
     --color-limeGreen: #b9f5d2;
     --color-brightCyan: #46ece6;
     --color-lightCyan: #d4fbf9;
+    --color-darkCyan: #009099;
     --color-red: #c60f13;
     --color-darkRed: #5b2a2a;
 
     --background-color: var(--color-light);
     --color-accent: var(--color-brightCyan);
     --text-color: var(--color-dark);
+    --link-color: var(--color-darkCyan);
 
     /* Buttons. */
-    --button-primary-background: var(--color-waterMint);
+    --button-primary-background: var(--color-limeGreen);
     --button-primary-color: var(--color-darkBlue);
     --button-neutral-background: var(--color-lightGray);
     --button-neutral-color: var(--color-darkGray);
@@ -43,6 +44,8 @@
     --small-box-padding: 4px;
     --box-margin: 14px;
     --text-margin: 7px;
+    --dialog-width: 40vw;
+    --map-fragment-height: 210px;
 
     /* z-indexes (leaflet CSS sets the map at 400 by default) */
     --zindex-alert: 500;

umap/static/umap/vendors/photon/leaflet.photon.js

@@ -258,6 +258,9 @@ L.PhotonBaseSearch = L.PhotonBase.extend({
         if (feature.properties.city && feature.properties.city !== feature.properties.name) {
             details.push(feature.properties.city);
         }
+        if (feature.properties.state && feature.properties.state !== feature.properties.name) {
+            details.push(feature.properties.state);
+        }
         if (feature.properties.country) details.push(feature.properties.country);
         detailsContainer.innerHTML = details.join(', ');
     },

umap/sync/payloads.py

@@ -1,4 +1,4 @@
-from typing import Literal, Optional, Union
+from typing import List, Literal, Optional, Union
 
 from pydantic import BaseModel, Field, RootModel
 
@@ -14,10 +14,11 @@ class OperationMessage(BaseModel):
     """Message sent from one peer to all the others"""
 
     kind: Literal["OperationMessage"] = "OperationMessage"
-    verb: Literal["upsert", "update", "delete"]
+    verb: Literal["upsert", "update", "delete", "batch"]
     subject: Literal["map", "datalayer", "feature"]
     metadata: Optional[dict] = None
     key: Optional[str] = None
+    operations: Optional[List] = None
 
 
 class PeerMessage(BaseModel):

umap/templates/auth/user_detail.html

@@ -13,7 +13,7 @@
     </h2>
   </div>
   <div class="wrapper">
-    <div class="map_list row">
+    <div class="row grid-container">
       {% if maps %}
         {% include "umap/map_list.html" %}
       {% else %}

umap/templates/auth/user_stars.html

@@ -13,7 +13,7 @@
     </h2>
   </div>
   <div class="wrapper">
-    <div class="map_list row">
+    <div class="grid-container row">
       {% if maps %}
         {% include "umap/map_list.html" %}
       {% else %}

umap/templates/umap/content.html

@@ -43,22 +43,27 @@
   <script type="text/javascript">
     window.addEventListener('DOMContentLoaded', event => {
       const server = new U.ServerRequest()
-      const getMore = async function (e) {
-        L.DomEvent.stop(e)
-        const [{html}, response, error] = await server.get(this.href)
+      const getMore = async function (link) {
+        const container = link.parentNode
+        container.removeChild(link)
+        const [{html}, response, error] = await server.get(link.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 template = document.createElement('template')
+          template.innerHTML = html
+          container.appendChild(template.content)
+          listenForMore()
         }
       }
-      const more = document.querySelector('.more_button')
-      if (more) {
-        L.DomEvent.on(more, 'click', getMore, more)
+      const listenForMore = () => {
+        const more = document.querySelector('.more_button')
+        if (more) {
+          L.DomEvent.on(more, 'click', (e) => {
+            L.DomEvent.stop(e)
+            getMore(more)
+          })
+        }
       }
+      listenForMore()
     })
   </script>
 {% endblock bottom_js %}

umap/templates/umap/home.html

@@ -20,11 +20,13 @@
   {% endif %}
   <div class="wrapper">
     {% if maps %}
-      <h2 class="section">
-        {% blocktrans %}Get inspired, browse maps{% endblocktrans %}
-      </h2>
-      <div class="map_list row">
-        {% include "umap/map_list.html" %}
+      <div class="row">
+        <h2 class="section">
+          {% blocktrans %}Get inspired, browse maps{% endblocktrans %}
+        </h2>
+        <div class="grid-container">
+          {% include "umap/map_list.html" %}
+        </div>
       </div>
     {% endif %}
   </div>

umap/templates/umap/map_fragment.html

@@ -1,6 +1,6 @@
 {% load umap_tags %}
 
-<umap-fragment data-settings='{{ map_settings|escape }}'>
+<umap-fragment data-settings='{{ map_settings|escape }}' inert>
 <div id="{{ unique_id }}" class="map_fragment">
 </div>
 </umap-fragment>

umap/templates/umap/map_list.html

@@ -1,22 +1,29 @@
 {% load umap_tags i18n %}
 
 {% for map_inst in maps %}
-  <hr />
-  <div class="col wide">
+  <div class="card">
     {% map_fragment map_inst prefix=prefix page=request.GET.p %}
-    <div class="legend">
-      <a href="{{ map_inst.get_absolute_url }}">{{ map_inst.name }}</a>
-      {% with author=map_inst.get_author %}
-        {% if author %}
-          <em>{% trans "by" %} <a href="{{ author.get_url }}">{{ author }}</a></em>
+    <hgroup>
+      <div>
+        {% if map_inst.tags %}
+          <ul class="tag-list">
+            {% for tag, label in map_inst.get_tags_display %}
+              <li><a href="{% url 'search' %}?tags={{ tag }}">{{ label }}</a></li>
+            {% endfor %}
+          </ul>
         {% endif %}
-      {% endwith %}
-    </div>
+        <h3>{{ map_inst.name }}</h3>
+        {% with author=map_inst.get_author %}
+          {% if author %}
+            <p>{% trans "by" %} <a href="{{ author.get_url }}">{{ author }}</a></p>
+          {% endif %}
+        {% endwith %}
+      </div>
+      <a class="main" href="{{ map_inst.get_absolute_url }}">{% translate "See the map" %}</a>
+    </hgroup>
   </div>
 {% endfor %}
 {% 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>
+  <a href="?{% paginate_querystring maps.next_page_number %}"
+     class="button more_button neutral">{% trans "More" %}</a>
 {% endif %}

umap/templates/umap/search.html

@@ -12,7 +12,7 @@
 {% block maincontent %}
   {% include "umap/search_bar.html" %}
   <div class="wrapper">
-    <div class="map_list row">
+    <div class="row">
       {% if request.GET.q %}
         {% if maps %}
           <h2>
@@ -22,7 +22,9 @@
               {{ count }} maps found:
             {% endblocktranslate %}
           </h2>
-          {% include "umap/map_list.html" with prefix="search_map" %}
+          <div class="grid-container">
+            {% include "umap/map_list.html" with prefix="search_map" %}
+          </div>
         {% else %}
           <h2>
             {% trans "No map found." %}
@@ -32,7 +34,9 @@
         <h2>
           {% trans "Latest created maps" %}
         </h2>
-        {% include "umap/map_list.html" with prefix="search_map" %}
+        <div class="grid-container">
+          {% include "umap/map_list.html" with prefix="search_map" %}
+        </div>
       {% endif %}
     </div>
   </div>

umap/templates/umap/search_bar.html

@@ -4,17 +4,19 @@
 {% trans "Search maps" as default_placeholder %}
 <div class="wrapper search_wrapper">
   <div class="row">
-    <form action="{% firstof action search_url %}" method="get">
-      <div class="col two-third mwide">
-        <input name="q"
-               type="search"
-               placeholder="{% firstof placeholder default_placeholder %}"
-               aria-label="{% firstof placeholder default_placeholder %}"
-               value="{{ request.GET.q|default:"" }}" />
-      </div>
-      <div class="col third mwide">
-        <input type="submit" value="{% trans "Search" %}" class="neutral" />
-      </div>
+    <form class="search-form flex-break" action="{% firstof action search_url %}" method="get">
+      <input name="q"
+             type="search"
+             placeholder="{% firstof placeholder default_placeholder %}"
+             aria-label="{% firstof placeholder default_placeholder %}"
+             value="{{ request.GET.q|default:"" }}" />
+      <select name="tags">
+        <option value="">{% trans "Any category" %}</option>
+        {% for value, label in UMAP_TAGS %}
+        <option value="{{ value }}" {% if request.GET.tags == value %}selected{% endif %}>{{ label }}</option>
+        {% endfor %}
+      </select>
+      <input type="submit" value="{% trans "Search" %}" />
     </form>
   </div>
 </div>

umap/templates/umap/team_detail.html

@@ -18,7 +18,7 @@
           {% endif %}
         </div>
     </div>
-    <div class="map_list row">
+    <div class="grid-container row">
     {% if maps %}
       {% include "umap/map_list.html" %}
     {% else %}