mirror of
https://github.com/umap-project/umap.git
synced 2025-05-06 14:31:50 +02:00
Compare commits
16 commits
f32529b022
...
dd1e0ee63c
Author | SHA1 | Date | |
---|---|---|---|
![]() |
dd1e0ee63c | ||
![]() |
8e5f46eb95 | ||
![]() |
0f8ebcdf9a | ||
![]() |
177a4edc1d | ||
![]() |
31c8bf95ba | ||
![]() |
d9998efc0f | ||
![]() |
30d9e43cd4 | ||
![]() |
c29df404c8 | ||
![]() |
3f24563a05 | ||
![]() |
64f0926e2d | ||
![]() |
3aa0c8fc82 | ||
![]() |
9e2b207dfd | ||
![]() |
35b541f200 | ||
![]() |
8624209e1b | ||
![]() |
998bf87a0b | ||
![]() |
4bd7bd7d48 |
6 changed files with 20 additions and 18 deletions
|
@ -1,5 +1,5 @@
|
||||||
# Force rtfd to use a recent version of mkdocs
|
# Force rtfd to use a recent version of mkdocs
|
||||||
mkdocs==1.6.1
|
mkdocs==1.6.1
|
||||||
pymdown-extensions==10.12
|
pymdown-extensions==10.12
|
||||||
mkdocs-material==9.5.44
|
mkdocs-material==9.5.47
|
||||||
mkdocs-static-i18n==1.2.3
|
mkdocs-static-i18n==1.2.3
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
# Force rtfd to use a recent version of mkdocs
|
# Force rtfd to use a recent version of mkdocs
|
||||||
mkdocs==1.6.1
|
mkdocs==1.6.1
|
||||||
pymdown-extensions==10.12
|
pymdown-extensions==10.12
|
||||||
mkdocs-material==9.5.44
|
mkdocs-material==9.5.47
|
||||||
mkdocs-static-i18n==1.2.3
|
mkdocs-static-i18n==1.2.3
|
||||||
|
|
|
@ -44,10 +44,10 @@ dependencies = [
|
||||||
[project.optional-dependencies]
|
[project.optional-dependencies]
|
||||||
dev = [
|
dev = [
|
||||||
"hatch==1.13.0",
|
"hatch==1.13.0",
|
||||||
"ruff==0.7.4",
|
"ruff==0.8.1",
|
||||||
"djlint==1.36.1",
|
"djlint==1.36.1",
|
||||||
"mkdocs==1.6.1",
|
"mkdocs==1.6.1",
|
||||||
"mkdocs-material==9.5.44",
|
"mkdocs-material==9.5.47",
|
||||||
"mkdocs-static-i18n==1.2.3",
|
"mkdocs-static-i18n==1.2.3",
|
||||||
"vermin==1.6.0",
|
"vermin==1.6.0",
|
||||||
"pymdown-extensions==10.12",
|
"pymdown-extensions==10.12",
|
||||||
|
@ -58,7 +58,7 @@ test = [
|
||||||
"playwright>=1.39",
|
"playwright>=1.39",
|
||||||
"pytest==8.3.3",
|
"pytest==8.3.3",
|
||||||
"pytest-django==4.9.0",
|
"pytest-django==4.9.0",
|
||||||
"pytest-playwright==0.5.2",
|
"pytest-playwright==0.6.2",
|
||||||
"pytest-rerunfailures==14.0",
|
"pytest-rerunfailures==14.0",
|
||||||
"pytest-xdist>=3.5.0,<4",
|
"pytest-xdist>=3.5.0,<4",
|
||||||
]
|
]
|
||||||
|
@ -68,8 +68,8 @@ docker = [
|
||||||
sync = [
|
sync = [
|
||||||
"channels==4.2.0",
|
"channels==4.2.0",
|
||||||
"daphne==4.1.2",
|
"daphne==4.1.2",
|
||||||
"pydantic==2.9.2",
|
"pydantic==2.10.2",
|
||||||
"websockets==13.1",
|
"websockets==14.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[project.scripts]
|
[project.scripts]
|
||||||
|
|
|
@ -65,7 +65,9 @@ body.login header {
|
||||||
.login-grid .login-openstreetmap-oauth2 {
|
.login-grid .login-openstreetmap-oauth2 {
|
||||||
background-image: url("./openstreetmap.png");
|
background-image: url("./openstreetmap.png");
|
||||||
}
|
}
|
||||||
|
.login-grid .login-keycloak {
|
||||||
|
background-image: url("./keycloak.png");
|
||||||
|
}
|
||||||
|
|
||||||
/* **************************** */
|
/* **************************** */
|
||||||
/* home */
|
/* home */
|
||||||
|
|
|
@ -537,10 +537,10 @@ export default class Umap extends ServerStored {
|
||||||
this._leafletMap.editTools.startPolyline()
|
this._leafletMap.editTools.startPolyline()
|
||||||
break
|
break
|
||||||
case 'i':
|
case 'i':
|
||||||
this._leafletMap.importer.open()
|
this.importer.open()
|
||||||
break
|
break
|
||||||
case 'o':
|
case 'o':
|
||||||
this._leafletMap.importer.openFiles()
|
this.importer.openFiles()
|
||||||
break
|
break
|
||||||
case 'h':
|
case 'h':
|
||||||
this.help.showGetStarted()
|
this.help.showGetStarted()
|
||||||
|
@ -596,7 +596,7 @@ export default class Umap extends ServerStored {
|
||||||
const panes = this._leafletMap.getPane('overlayPane')
|
const panes = this._leafletMap.getPane('overlayPane')
|
||||||
|
|
||||||
this.datalayersIndex = []
|
this.datalayersIndex = []
|
||||||
for (const pane of panes) {
|
for (const pane of panes.children) {
|
||||||
if (!pane.dataset || !pane.dataset.id) continue
|
if (!pane.dataset || !pane.dataset.id) continue
|
||||||
this.datalayersIndex.push(this.datalayers[pane.dataset.id])
|
this.datalayersIndex.push(this.datalayers[pane.dataset.id])
|
||||||
}
|
}
|
||||||
|
@ -1425,13 +1425,13 @@ export default class Umap extends ServerStored {
|
||||||
row.dataset.id = stamp(datalayer)
|
row.dataset.id = stamp(datalayer)
|
||||||
})
|
})
|
||||||
const onReorder = (src, dst, initialIndex, finalIndex) => {
|
const onReorder = (src, dst, initialIndex, finalIndex) => {
|
||||||
const layer = this.datalayers[src.dataset.id]
|
const movedLayer = this.datalayers[src.dataset.id]
|
||||||
const other = this.datalayers[dst.dataset.id]
|
const targetLayer = this.datalayers[dst.dataset.id]
|
||||||
const minIndex = Math.min(layer.getRank(), other.getRank())
|
const minIndex = Math.min(movedLayer.getRank(), targetLayer.getRank())
|
||||||
const maxIndex = Math.max(layer.getRank(), other.getRank())
|
const maxIndex = Math.max(movedLayer.getRank(), targetLayer.getRank())
|
||||||
if (finalIndex === 0) layer.bringToTop()
|
if (finalIndex === 0) movedLayer.bringToTop()
|
||||||
else if (finalIndex > initialIndex) layer.insertBefore(other)
|
else if (finalIndex > initialIndex) movedLayer.insertBefore(targetLayer)
|
||||||
else layer.insertAfter(other)
|
else movedLayer.insertAfter(targetLayer)
|
||||||
this.eachDataLayerReverse((datalayer) => {
|
this.eachDataLayerReverse((datalayer) => {
|
||||||
if (datalayer.getRank() >= minIndex && datalayer.getRank() <= maxIndex)
|
if (datalayer.getRank() >= minIndex && datalayer.getRank() <= maxIndex)
|
||||||
datalayer.isDirty = true
|
datalayer.isDirty = true
|
||||||
|
|
BIN
umap/static/umap/keycloak.png
Normal file
BIN
umap/static/umap/keycloak.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
Loading…
Reference in a new issue