umap-project 3.3.5__tar.gz → 3.3.6__tar.gz

{umap_project-3.3.5 → umap_project-3.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: umap-project
-Version: 3.3.5
+Version: 3.3.6
 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>

umap_project-3.3.6/umap/__init__.py

@@ -0,0 +1 @@
+VERSION = "3.3.6"

{umap_project-3.3.5 → umap_project-3.3.6}/umap/static/umap/js/modules/browser.js

@@ -252,7 +252,7 @@ export default class Browser {
       if (datalayer.isVisible()) allHidden = false
     })
     this._umap.datalayers.browsable().map((datalayer) => {
-      datalayer._forcedVisibility = true
+      datalayer.autoLoaded = false
       if (allHidden) {
         datalayer.show()
       } else {

{umap_project-3.3.5 → umap_project-3.3.6}/umap/static/umap/js/modules/data/layer.js

@@ -225,17 +225,27 @@ export class DataLayer {
   }
 
   showAtLoad() {
-    return this.autoLoaded() && this.showAtZoom()
+    return this.autoLoaded && this.showAtZoom()
   }
 
-  autoLoaded() {
-    if (!this._umap.datalayersFromQueryString) return this.properties.displayOnLoad
-    const datalayerIds = this._umap.datalayersFromQueryString
-    let loadMe = datalayerIds.includes(this.id.toString())
-    if (this.properties.old_id) {
-      loadMe = loadMe || datalayerIds.includes(this.properties.old_id.toString())
+  get autoLoaded() {
+    if (this._autoLoaded === undefined) {
+      if (this._umap.datalayersFromQueryString) {
+        const datalayerIds = this._umap.datalayersFromQueryString
+        this._autoLoaded = datalayerIds.includes(this.id.toString())
+        if (this.properties.old_id) {
+          this._autoLoaded =
+            this._autoLoaded || datalayerIds.includes(this.properties.old_id.toString())
+        }
+      } else {
+        this._autoLoaded = this.properties.displayOnLoad
+      }
     }
-    return loadMe
+    return this._autoLoaded
+  }
+
+  set autoLoaded(value) {
+    this._autoLoaded = value
   }
 
   insertBefore(other) {
@@ -1213,7 +1223,7 @@ export class DataLayer {
     // From now on, do not try to how/hide
     // automatically this layer, as user
     // has taken control on this.
-    this._forcedVisibility = true
+    this.autoLoaded = false
     let display = force
     if (force === undefined) {
       if (!this.isVisible()) display = true

{umap_project-3.3.5 → umap_project-3.3.6}/umap/static/umap/js/modules/managers.js

@@ -59,6 +59,7 @@ export class FeatureManager extends Map {
     if (this.has(feature.id)) {
       console.error('Duplicate id', feature, this.get(feature.id))
       feature.id = Utils.generateId()
+      feature.datalayer._found_duplicate_id = true
     }
     this.set(feature.id, feature)
   }

{umap_project-3.3.5 → umap_project-3.3.6}/umap/static/umap/js/modules/rendering/layers/base.js

@@ -53,7 +53,7 @@ export const LayerMixin = {
   },
 
   onZoomEnd() {
-    if (this.datalayer._forcedVisibility) return
+    if (!this.datalayer.autoLoaded) return
     if (!this.datalayer.showAtZoom() && this.datalayer.isVisible()) {
       this.datalayer.hide()
     }

{umap_project-3.3.5 → umap_project-3.3.6}/umap/static/umap/js/modules/umap.js

@@ -1269,6 +1269,18 @@ export default class Umap {
     this.drop.enable()
     this.fire('edit:enabled')
     this.initSyncEngine()
+    this.datalayers.active().forEach((datalayer) => {
+      if (!datalayer.isReadOnly() && datalayer._found_duplicate_id) {
+        datalayer._found_duplicate_id = false
+        // Force user to resave those datalayers
+        datalayer.sync.update(
+          'properties.name',
+          datalayer.properties.name,
+          datalayer.properties.name
+        )
+        Alert.info(translate('Layer has been migrated, please save the map.'))
+      }
+    })
   }
 
   disableEdit() {

{umap_project-3.3.5 → umap_project-3.3.6}/umap/static/umap/locale/zh_TW.js

@@ -595,7 +595,6 @@ const locale = {
     "Transform to regular line": "轉換為普通線條",
     "Transform to route": "轉換為路線",
     "Restore route": "恢復路線",
-    "Compute elevation": "計畫等高線",
     "Profile": "設定檔案",
     "Compute elevations": "計算等高線。",
     "Route preference": "路線偏好設定",
@@ -615,7 +614,8 @@ const locale = {
     "Loss:": "減少：",
     "Altitude:": "海拔：",
     "Right-click to edit": "按右鍵來編輯",
-    "Draw along routes": "沿著路線繪製"
+    "Draw along routes": "沿著路線繪製",
+    "Skipping invalid geometry": "略過無效的地理空間"
 }
 L.registerLocale("zh_TW", locale)
 L.setLocale("zh_TW")

{umap_project-3.3.5 → umap_project-3.3.6}/umap/static/umap/locale/zh_TW.json

@@ -595,7 +595,6 @@
     "Transform to regular line": "轉換為普通線條",
     "Transform to route": "轉換為路線",
     "Restore route": "恢復路線",
-    "Compute elevation": "計畫等高線",
     "Profile": "設定檔案",
     "Compute elevations": "計算等高線。",
     "Route preference": "路線偏好設定",
@@ -615,5 +614,6 @@
     "Loss:": "減少：",
     "Altitude:": "海拔：",
     "Right-click to edit": "按右鍵來編輯",
-    "Draw along routes": "沿著路線繪製"
+    "Draw along routes": "沿著路線繪製",
+    "Skipping invalid geometry": "略過無效的地理空間"
 }

{umap_project-3.3.5 → umap_project-3.3.6}/umap/tests/integration/test_datalayer.py

@@ -1,8 +1,6 @@
-import json
 import re
 
 import pytest
-from django.core.files.base import ContentFile
 from playwright.sync_api import expect
 
 from ..base import DataLayerFactory
@@ -10,17 +8,9 @@ from ..base import DataLayerFactory
 pytestmark = pytest.mark.django_db
 
 
-def set_options(datalayer, **options):
-    # For now we need to change both the DB and the FS…
-    datalayer.settings.update(options)
-    data = json.load(datalayer.geojson.file)
-    data["_umap_options"].update(**options)
-    datalayer.geojson = ContentFile(json.dumps(data), "foo.json")
-    datalayer.save()
-
-
 def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
-    set_options(datalayer, displayOnLoad=False)
+    datalayer.settings.update(displayOnLoad=False)
+    datalayer.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}?onLoadPanel=datalayers")
     expect(page.locator(".leaflet-marker-icon")).to_be_hidden()
     layers = page.locator(".umap-browser .datalayer")
@@ -30,14 +20,17 @@ def test_honour_displayOnLoad_false(map, live_server, datalayer, page):
     expect(layers_off).to_have_count(1)
     page.get_by_role("button", name="Open browser").click()
     page.get_by_label("Zoom in").click()
+    page.wait_for_timeout(300)
     expect(markers).to_be_hidden()
-    page.get_by_title("Show/hide layer").click()
+    with page.expect_response(re.compile(rf".*/datalayer/{map.pk}/{datalayer.pk}/.*")):
+        page.get_by_title("Show/hide layer").click()
     expect(layers_off).to_have_count(0)
     expect(markers).to_be_visible()
 
 
 def test_should_honour_fromZoom(live_server, map, datalayer, page):
-    set_options(datalayer, displayOnLoad=True, fromZoom=6)
+    datalayer.settings.update(displayOnLoad=True, fromZoom=6)
+    datalayer.save()
     page.goto(f"{live_server.url}{map.get_absolute_url()}#5/48.55/14.68")
     markers = page.locator(".leaflet-marker-icon")
     expect(markers).to_be_hidden()
@@ -55,7 +48,8 @@ def test_should_honour_fromZoom(live_server, map, datalayer, page):
 
 
 def test_should_honour_toZoom(live_server, map, datalayer, page, new_page):
-    set_options(datalayer, displayOnLoad=True, toZoom=6)
+    datalayer.settings.update(displayOnLoad=True, toZoom=6)
+    datalayer.save()
     # Loading at zoom 7 should not show the marker
     page.goto(f"{live_server.url}{map.get_absolute_url()}#7/48.55/14.68")
     markers = page.locator(".leaflet-marker-icon")
@@ -123,7 +117,6 @@ def test_datalayers_in_query_string(live_server, datalayer, map, page):
     map.settings["properties"]["onLoadPanel"] = "datalayers"
     map.save()
     with_old_id = DataLayerFactory(old_id=134, map=map, name="with old id")
-    set_options(with_old_id, name="with old id")
     visible = page.locator(".umap-browser .datalayer:not(.off) .datalayer-name")
     hidden = page.locator(".umap-browser .datalayer.off .datalayer-name")
     page.goto(f"{live_server.url}{map.get_absolute_url()}")

umap_project-3.3.5/umap/__init__.py

@@ -1 +0,0 @@
-VERSION = "3.3.5"