umap-project 1.10.0__py3-none-any.whl → 1.11.1__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of umap-project might be problematic. Click here for more details.
- umap/__init__.py +1 -1
- umap/admin.py +7 -3
- umap/autocomplete.py +3 -5
- umap/bin/__init__.py +2 -5
- umap/decorators.py +4 -5
- umap/forms.py +5 -5
- umap/locale/en/LC_MESSAGES/django.po +23 -23
- umap/locale/fr/LC_MESSAGES/django.mo +0 -0
- umap/locale/fr/LC_MESSAGES/django.po +28 -27
- umap/management/commands/generate_js_locale.py +9 -11
- umap/management/commands/import_pictograms.py +49 -28
- umap/managers.py +5 -3
- umap/middleware.py +2 -3
- umap/migrations/0001_initial.py +204 -56
- umap/migrations/0002_tilelayer_tms.py +3 -4
- umap/migrations/0003_add_tilelayer.py +13 -9
- umap/migrations/0004_add_licence.py +3 -6
- umap/migrations/0005_remove_map_tilelayer.py +3 -4
- umap/migrations/0006_auto_20190407_0719.py +6 -5
- umap/migrations/0007_auto_20190416_1757.py +13 -5
- umap/migrations/0008_alter_map_settings.py +0 -1
- umap/migrations/0009_star.py +27 -8
- umap/migrations/0010_alter_map_edit_status_alter_map_share_status.py +20 -8
- umap/migrations/0011_alter_map_edit_status_alter_map_share_status.py +21 -8
- umap/migrations/0014_map_created_at.py +1 -1
- umap/migrations/0015_alter_pictogram_pictogram.py +17 -0
- umap/migrations/0016_pictogram_category.py +17 -0
- umap/models.py +9 -7
- umap/settings/base.py +1 -4
- umap/static/umap/base.css +59 -20
- umap/static/umap/content.css +2 -13
- umap/static/umap/favicons/apple-touch-icon.png +0 -0
- umap/static/umap/favicons/favicon.ico +0 -0
- umap/static/umap/favicons/icon-192.png +0 -0
- umap/static/umap/favicons/icon-512.png +0 -0
- umap/static/umap/favicons/icon.svg +5 -0
- umap/static/umap/img/16-white.svg +20 -9
- umap/static/umap/img/24-white.svg +2 -2
- umap/static/umap/img/source/16-white.svg +25 -13
- umap/static/umap/img/source/24-white.svg +5 -5
- umap/static/umap/js/umap.controls.js +15 -23
- umap/static/umap/js/umap.core.js +33 -24
- umap/static/umap/js/umap.features.js +24 -2
- umap/static/umap/js/umap.forms.js +182 -84
- umap/static/umap/js/umap.icon.js +19 -14
- umap/static/umap/js/umap.js +14 -32
- umap/static/umap/js/umap.layer.js +13 -2
- umap/static/umap/js/umap.popup.js +21 -0
- umap/static/umap/locale/am_ET.js +9 -4
- umap/static/umap/locale/am_ET.json +9 -4
- umap/static/umap/locale/ar.js +9 -4
- umap/static/umap/locale/ar.json +9 -4
- umap/static/umap/locale/ast.js +9 -4
- umap/static/umap/locale/ast.json +9 -4
- umap/static/umap/locale/bg.js +9 -4
- umap/static/umap/locale/bg.json +9 -4
- umap/static/umap/locale/br.js +20 -15
- umap/static/umap/locale/br.json +20 -15
- umap/static/umap/locale/ca.js +9 -4
- umap/static/umap/locale/ca.json +9 -4
- umap/static/umap/locale/cs_CZ.js +9 -4
- umap/static/umap/locale/cs_CZ.json +9 -4
- umap/static/umap/locale/da.js +9 -4
- umap/static/umap/locale/da.json +9 -4
- umap/static/umap/locale/de.js +9 -4
- umap/static/umap/locale/de.json +9 -4
- umap/static/umap/locale/el.js +9 -4
- umap/static/umap/locale/el.json +9 -4
- umap/static/umap/locale/en.js +9 -4
- umap/static/umap/locale/en.json +9 -4
- umap/static/umap/locale/en_US.json +9 -4
- umap/static/umap/locale/es.js +15 -10
- umap/static/umap/locale/es.json +15 -10
- umap/static/umap/locale/et.js +9 -4
- umap/static/umap/locale/et.json +9 -4
- umap/static/umap/locale/fa_IR.js +9 -4
- umap/static/umap/locale/fa_IR.json +9 -4
- umap/static/umap/locale/fi.js +9 -4
- umap/static/umap/locale/fi.json +9 -4
- umap/static/umap/locale/fr.js +10 -5
- umap/static/umap/locale/fr.json +10 -5
- umap/static/umap/locale/gl.js +9 -4
- umap/static/umap/locale/gl.json +9 -4
- umap/static/umap/locale/he.js +9 -4
- umap/static/umap/locale/he.json +9 -4
- umap/static/umap/locale/hr.js +9 -4
- umap/static/umap/locale/hr.json +9 -4
- umap/static/umap/locale/hu.js +64 -59
- umap/static/umap/locale/hu.json +64 -59
- umap/static/umap/locale/id.js +9 -4
- umap/static/umap/locale/id.json +9 -4
- umap/static/umap/locale/is.js +9 -4
- umap/static/umap/locale/is.json +9 -4
- umap/static/umap/locale/it.js +9 -4
- umap/static/umap/locale/it.json +9 -4
- umap/static/umap/locale/ja.js +9 -4
- umap/static/umap/locale/ja.json +9 -4
- umap/static/umap/locale/ko.js +9 -4
- umap/static/umap/locale/ko.json +9 -4
- umap/static/umap/locale/lt.js +9 -4
- umap/static/umap/locale/lt.json +9 -4
- umap/static/umap/locale/ms.js +15 -10
- umap/static/umap/locale/ms.json +15 -10
- umap/static/umap/locale/nl.js +9 -4
- umap/static/umap/locale/nl.json +9 -4
- umap/static/umap/locale/no.js +9 -4
- umap/static/umap/locale/no.json +9 -4
- umap/static/umap/locale/pl.js +9 -4
- umap/static/umap/locale/pl.json +9 -4
- umap/static/umap/locale/pl_PL.json +9 -4
- umap/static/umap/locale/pt.js +9 -4
- umap/static/umap/locale/pt.json +9 -4
- umap/static/umap/locale/pt_BR.js +9 -4
- umap/static/umap/locale/pt_BR.json +9 -4
- umap/static/umap/locale/pt_PT.js +9 -4
- umap/static/umap/locale/pt_PT.json +9 -4
- umap/static/umap/locale/ro.js +9 -4
- umap/static/umap/locale/ro.json +9 -4
- umap/static/umap/locale/ru.js +9 -4
- umap/static/umap/locale/ru.json +9 -4
- umap/static/umap/locale/si.js +55 -20
- umap/static/umap/locale/si.json +55 -20
- umap/static/umap/locale/sk_SK.js +9 -4
- umap/static/umap/locale/sk_SK.json +9 -4
- umap/static/umap/locale/sl.js +9 -4
- umap/static/umap/locale/sl.json +9 -4
- umap/static/umap/locale/sr.js +9 -4
- umap/static/umap/locale/sr.json +9 -4
- umap/static/umap/locale/sv.js +9 -4
- umap/static/umap/locale/sv.json +9 -4
- umap/static/umap/locale/th_TH.js +9 -4
- umap/static/umap/locale/th_TH.json +9 -4
- umap/static/umap/locale/tr.js +9 -4
- umap/static/umap/locale/tr.json +9 -4
- umap/static/umap/locale/uk_UA.js +9 -4
- umap/static/umap/locale/uk_UA.json +9 -4
- umap/static/umap/locale/vi.js +9 -4
- umap/static/umap/locale/vi.json +9 -4
- umap/static/umap/locale/vi_VN.json +9 -4
- umap/static/umap/locale/zh.js +9 -4
- umap/static/umap/locale/zh.json +9 -4
- umap/static/umap/locale/zh_CN.json +9 -4
- umap/static/umap/locale/zh_TW.Big5.json +9 -4
- umap/static/umap/locale/zh_TW.js +9 -4
- umap/static/umap/locale/zh_TW.json +9 -4
- umap/static/umap/map.css +104 -21
- umap/static/umap/nav.css +0 -1
- umap/static/umap/test/Controls.js +0 -1
- umap/static/umap/test/Feature.js +29 -0
- umap/static/umap/test/Map.Export.js +2 -127
- umap/static/umap/test/Util.js +10 -0
- umap/static/umap/test/_pre.js +2 -3
- umap/static/umap/vendors/formbuilder/Leaflet.FormBuilder.js +13 -2
- umap/static/umap/vendors/leaflet/leaflet-src.js +7144 -7144
- umap/templates/auth/user_form.html +2 -2
- umap/templates/base.html +11 -0
- umap/templates/umap/map_table.html +3 -3
- umap/templatetags/umap_tags.py +32 -34
- umap/tests/base.py +4 -4
- umap/tests/conftest.py +3 -6
- umap/tests/fixtures/circle.svg +4 -0
- umap/tests/fixtures/star.svg +4 -0
- umap/tests/integration/test_export_map.py +5 -18
- umap/tests/integration/test_picto.py +217 -0
- umap/tests/integration/test_slideshow.py +70 -0
- umap/tests/settings.py +11 -5
- umap/tests/test_datalayer.py +7 -6
- umap/tests/test_map.py +6 -5
- umap/tests/test_map_views.py +82 -10
- umap/tests/test_tilelayer.py +17 -11
- umap/tests/test_views.py +36 -9
- umap/urls.py +27 -4
- umap/utils.py +1 -2
- umap/views.py +67 -35
- umap/wsgi.py +2 -2
- {umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/METADATA +11 -9
- {umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/RECORD +180 -170
- umap/static/favicon.ico +0 -0
- {umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/WHEEL +0 -0
- {umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/entry_points.txt +0 -0
- {umap_project-1.10.0.dist-info → umap_project-1.11.1.dist-info}/licenses/LICENSE +0 -0
umap/migrations/0001_initial.py
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
# Generated by Django 2.0.5 on 2018-05-19 09:27
|
|
2
2
|
|
|
3
|
-
from django.conf import settings
|
|
4
3
|
import django.contrib.gis.db.models.fields
|
|
5
|
-
from django.db import migrations, models
|
|
6
4
|
import django.db.models.deletion
|
|
5
|
+
from django.conf import settings
|
|
6
|
+
from django.db import migrations, models
|
|
7
|
+
|
|
7
8
|
import umap.fields
|
|
8
9
|
import umap.models
|
|
9
10
|
|
|
10
11
|
|
|
11
12
|
class Migration(migrations.Migration):
|
|
12
|
-
|
|
13
13
|
initial = True
|
|
14
14
|
|
|
15
15
|
dependencies = [
|
|
@@ -18,90 +18,238 @@ class Migration(migrations.Migration):
|
|
|
18
18
|
|
|
19
19
|
operations = [
|
|
20
20
|
migrations.CreateModel(
|
|
21
|
-
name=
|
|
21
|
+
name="DataLayer",
|
|
22
22
|
fields=[
|
|
23
|
-
(
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
(
|
|
24
|
+
"id",
|
|
25
|
+
models.AutoField(
|
|
26
|
+
auto_created=True,
|
|
27
|
+
primary_key=True,
|
|
28
|
+
serialize=False,
|
|
29
|
+
verbose_name="ID",
|
|
30
|
+
),
|
|
31
|
+
),
|
|
32
|
+
("name", models.CharField(max_length=200, verbose_name="name")),
|
|
33
|
+
(
|
|
34
|
+
"description",
|
|
35
|
+
models.TextField(blank=True, null=True, verbose_name="description"),
|
|
36
|
+
),
|
|
37
|
+
(
|
|
38
|
+
"geojson",
|
|
39
|
+
models.FileField(
|
|
40
|
+
blank=True, null=True, upload_to=umap.models.upload_to
|
|
41
|
+
),
|
|
42
|
+
),
|
|
43
|
+
(
|
|
44
|
+
"display_on_load",
|
|
45
|
+
models.BooleanField(
|
|
46
|
+
default=False,
|
|
47
|
+
help_text="Display this layer on load.",
|
|
48
|
+
verbose_name="display on load",
|
|
49
|
+
),
|
|
50
|
+
),
|
|
51
|
+
("rank", models.SmallIntegerField(default=0)),
|
|
29
52
|
],
|
|
30
53
|
options={
|
|
31
|
-
|
|
54
|
+
"ordering": ("rank",),
|
|
32
55
|
},
|
|
33
56
|
),
|
|
34
57
|
migrations.CreateModel(
|
|
35
|
-
name=
|
|
58
|
+
name="Licence",
|
|
36
59
|
fields=[
|
|
37
|
-
(
|
|
38
|
-
|
|
39
|
-
|
|
60
|
+
(
|
|
61
|
+
"id",
|
|
62
|
+
models.AutoField(
|
|
63
|
+
auto_created=True,
|
|
64
|
+
primary_key=True,
|
|
65
|
+
serialize=False,
|
|
66
|
+
verbose_name="ID",
|
|
67
|
+
),
|
|
68
|
+
),
|
|
69
|
+
("name", models.CharField(max_length=200, verbose_name="name")),
|
|
70
|
+
(
|
|
71
|
+
"details",
|
|
72
|
+
models.URLField(
|
|
73
|
+
help_text="Link to a page where the licence is detailed.",
|
|
74
|
+
verbose_name="details",
|
|
75
|
+
),
|
|
76
|
+
),
|
|
40
77
|
],
|
|
41
78
|
options={
|
|
42
|
-
|
|
43
|
-
|
|
79
|
+
"ordering": ("name",),
|
|
80
|
+
"abstract": False,
|
|
44
81
|
},
|
|
45
82
|
),
|
|
46
83
|
migrations.CreateModel(
|
|
47
|
-
name=
|
|
84
|
+
name="Map",
|
|
48
85
|
fields=[
|
|
49
|
-
(
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
(
|
|
59
|
-
(
|
|
60
|
-
(
|
|
61
|
-
|
|
62
|
-
|
|
86
|
+
(
|
|
87
|
+
"id",
|
|
88
|
+
models.AutoField(
|
|
89
|
+
auto_created=True,
|
|
90
|
+
primary_key=True,
|
|
91
|
+
serialize=False,
|
|
92
|
+
verbose_name="ID",
|
|
93
|
+
),
|
|
94
|
+
),
|
|
95
|
+
("name", models.CharField(max_length=200, verbose_name="name")),
|
|
96
|
+
("slug", models.SlugField()),
|
|
97
|
+
(
|
|
98
|
+
"description",
|
|
99
|
+
models.TextField(blank=True, null=True, verbose_name="description"),
|
|
100
|
+
),
|
|
101
|
+
(
|
|
102
|
+
"center",
|
|
103
|
+
django.contrib.gis.db.models.fields.PointField(
|
|
104
|
+
geography=True, srid=4326, verbose_name="center"
|
|
105
|
+
),
|
|
106
|
+
),
|
|
107
|
+
("zoom", models.IntegerField(default=7, verbose_name="zoom")),
|
|
108
|
+
(
|
|
109
|
+
"locate",
|
|
110
|
+
models.BooleanField(
|
|
111
|
+
default=False,
|
|
112
|
+
help_text="Locate user on load?",
|
|
113
|
+
verbose_name="locate",
|
|
114
|
+
),
|
|
115
|
+
),
|
|
116
|
+
("modified_at", models.DateTimeField(auto_now=True)),
|
|
117
|
+
(
|
|
118
|
+
"edit_status",
|
|
119
|
+
models.SmallIntegerField(
|
|
120
|
+
choices=[
|
|
121
|
+
(1, "Everyone can edit"),
|
|
122
|
+
(2, "Only editors can edit"),
|
|
123
|
+
(3, "Only owner can edit"),
|
|
124
|
+
],
|
|
125
|
+
default=3,
|
|
126
|
+
verbose_name="edit status",
|
|
127
|
+
),
|
|
128
|
+
),
|
|
129
|
+
(
|
|
130
|
+
"share_status",
|
|
131
|
+
models.SmallIntegerField(
|
|
132
|
+
choices=[
|
|
133
|
+
(1, "everyone (public)"),
|
|
134
|
+
(2, "anyone with link"),
|
|
135
|
+
(3, "editors only"),
|
|
136
|
+
],
|
|
137
|
+
default=1,
|
|
138
|
+
verbose_name="share status",
|
|
139
|
+
),
|
|
140
|
+
),
|
|
141
|
+
(
|
|
142
|
+
"settings",
|
|
143
|
+
umap.fields.DictField(
|
|
144
|
+
blank=True, null=True, verbose_name="settings"
|
|
145
|
+
),
|
|
146
|
+
),
|
|
147
|
+
(
|
|
148
|
+
"editors",
|
|
149
|
+
models.ManyToManyField(
|
|
150
|
+
blank=True, to=settings.AUTH_USER_MODEL, verbose_name="editors"
|
|
151
|
+
),
|
|
152
|
+
),
|
|
153
|
+
(
|
|
154
|
+
"licence",
|
|
155
|
+
models.ForeignKey(
|
|
156
|
+
default=umap.models.get_default_licence,
|
|
157
|
+
help_text="Choose the map licence.",
|
|
158
|
+
on_delete=django.db.models.deletion.SET_DEFAULT,
|
|
159
|
+
to="umap.Licence",
|
|
160
|
+
verbose_name="licence",
|
|
161
|
+
),
|
|
162
|
+
),
|
|
163
|
+
(
|
|
164
|
+
"owner",
|
|
165
|
+
models.ForeignKey(
|
|
166
|
+
blank=True,
|
|
167
|
+
null=True,
|
|
168
|
+
on_delete=django.db.models.deletion.PROTECT,
|
|
169
|
+
related_name="owned_maps",
|
|
170
|
+
to=settings.AUTH_USER_MODEL,
|
|
171
|
+
verbose_name="owner",
|
|
172
|
+
),
|
|
173
|
+
),
|
|
63
174
|
],
|
|
64
175
|
options={
|
|
65
|
-
|
|
66
|
-
|
|
176
|
+
"ordering": ("name",),
|
|
177
|
+
"abstract": False,
|
|
67
178
|
},
|
|
68
179
|
),
|
|
69
180
|
migrations.CreateModel(
|
|
70
|
-
name=
|
|
181
|
+
name="Pictogram",
|
|
71
182
|
fields=[
|
|
72
|
-
(
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
183
|
+
(
|
|
184
|
+
"id",
|
|
185
|
+
models.AutoField(
|
|
186
|
+
auto_created=True,
|
|
187
|
+
primary_key=True,
|
|
188
|
+
serialize=False,
|
|
189
|
+
verbose_name="ID",
|
|
190
|
+
),
|
|
191
|
+
),
|
|
192
|
+
("name", models.CharField(max_length=200, verbose_name="name")),
|
|
193
|
+
("attribution", models.CharField(max_length=300)),
|
|
194
|
+
("pictogram", models.ImageField(upload_to="pictogram")),
|
|
76
195
|
],
|
|
77
196
|
options={
|
|
78
|
-
|
|
79
|
-
|
|
197
|
+
"ordering": ("name",),
|
|
198
|
+
"abstract": False,
|
|
80
199
|
},
|
|
81
200
|
),
|
|
82
201
|
migrations.CreateModel(
|
|
83
|
-
name=
|
|
202
|
+
name="TileLayer",
|
|
84
203
|
fields=[
|
|
85
|
-
(
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
204
|
+
(
|
|
205
|
+
"id",
|
|
206
|
+
models.AutoField(
|
|
207
|
+
auto_created=True,
|
|
208
|
+
primary_key=True,
|
|
209
|
+
serialize=False,
|
|
210
|
+
verbose_name="ID",
|
|
211
|
+
),
|
|
212
|
+
),
|
|
213
|
+
("name", models.CharField(max_length=200, verbose_name="name")),
|
|
214
|
+
(
|
|
215
|
+
"url_template",
|
|
216
|
+
models.CharField(
|
|
217
|
+
help_text="URL template using OSM tile format", max_length=200
|
|
218
|
+
),
|
|
219
|
+
),
|
|
220
|
+
("minZoom", models.IntegerField(default=0)),
|
|
221
|
+
("maxZoom", models.IntegerField(default=18)),
|
|
222
|
+
("attribution", models.CharField(max_length=300)),
|
|
223
|
+
(
|
|
224
|
+
"rank",
|
|
225
|
+
models.SmallIntegerField(
|
|
226
|
+
blank=True,
|
|
227
|
+
help_text="Order of the tilelayers in the edit box",
|
|
228
|
+
null=True,
|
|
229
|
+
),
|
|
230
|
+
),
|
|
92
231
|
],
|
|
93
232
|
options={
|
|
94
|
-
|
|
233
|
+
"ordering": ("rank", "name"),
|
|
95
234
|
},
|
|
96
235
|
),
|
|
97
236
|
migrations.AddField(
|
|
98
|
-
model_name=
|
|
99
|
-
name=
|
|
100
|
-
field=models.ForeignKey(
|
|
237
|
+
model_name="map",
|
|
238
|
+
name="tilelayer",
|
|
239
|
+
field=models.ForeignKey(
|
|
240
|
+
blank=True,
|
|
241
|
+
null=True,
|
|
242
|
+
on_delete=django.db.models.deletion.PROTECT,
|
|
243
|
+
related_name="maps",
|
|
244
|
+
to="umap.TileLayer",
|
|
245
|
+
verbose_name="background",
|
|
246
|
+
),
|
|
101
247
|
),
|
|
102
248
|
migrations.AddField(
|
|
103
|
-
model_name=
|
|
104
|
-
name=
|
|
105
|
-
field=models.ForeignKey(
|
|
249
|
+
model_name="datalayer",
|
|
250
|
+
name="map",
|
|
251
|
+
field=models.ForeignKey(
|
|
252
|
+
on_delete=django.db.models.deletion.CASCADE, to="umap.Map"
|
|
253
|
+
),
|
|
106
254
|
),
|
|
107
255
|
]
|
|
@@ -4,15 +4,14 @@ from django.db import migrations, models
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
class Migration(migrations.Migration):
|
|
7
|
-
|
|
8
7
|
dependencies = [
|
|
9
|
-
(
|
|
8
|
+
("umap", "0001_initial"),
|
|
10
9
|
]
|
|
11
10
|
|
|
12
11
|
operations = [
|
|
13
12
|
migrations.AddField(
|
|
14
|
-
model_name=
|
|
15
|
-
name=
|
|
13
|
+
model_name="tilelayer",
|
|
14
|
+
name="tms",
|
|
16
15
|
field=models.BooleanField(default=False),
|
|
17
16
|
),
|
|
18
17
|
]
|
|
@@ -5,22 +5,26 @@ from django.db import migrations
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
def add_tilelayer(apps, *args):
|
|
8
|
-
TileLayer = apps.get_model(
|
|
8
|
+
TileLayer = apps.get_model("umap", "TileLayer")
|
|
9
9
|
if TileLayer.objects.count():
|
|
10
10
|
return
|
|
11
11
|
TileLayer(
|
|
12
|
-
name=
|
|
13
|
-
url_template=(
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
12
|
+
name="Positron",
|
|
13
|
+
url_template=(
|
|
14
|
+
"https://cartodb-basemaps-{s}.global.ssl.fastly.net/"
|
|
15
|
+
"light_all/{z}/{x}/{y}.png"
|
|
16
|
+
),
|
|
17
|
+
attribution=(
|
|
18
|
+
"© [[http://www.openstreetmap.org/copyright|"
|
|
19
|
+
"OpenStreetMap]] contributors, © "
|
|
20
|
+
"[[https://carto.com/attributions|CARTO]]"
|
|
21
|
+
),
|
|
22
|
+
).save()
|
|
18
23
|
|
|
19
24
|
|
|
20
25
|
class Migration(migrations.Migration):
|
|
21
|
-
|
|
22
26
|
dependencies = [
|
|
23
|
-
(
|
|
27
|
+
("umap", "0002_tilelayer_tms"),
|
|
24
28
|
]
|
|
25
29
|
|
|
26
30
|
operations = [
|
|
@@ -5,18 +5,15 @@ from django.db import migrations
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
def add_licence(apps, *args):
|
|
8
|
-
Licence = apps.get_model(
|
|
8
|
+
Licence = apps.get_model("umap", "Licence")
|
|
9
9
|
if Licence.objects.count():
|
|
10
10
|
return
|
|
11
|
-
Licence(
|
|
12
|
-
name='ODbL',
|
|
13
|
-
details='http://opendatacommons.org/licenses/odbl/').save()
|
|
11
|
+
Licence(name="ODbL", details="http://opendatacommons.org/licenses/odbl/").save()
|
|
14
12
|
|
|
15
13
|
|
|
16
14
|
class Migration(migrations.Migration):
|
|
17
|
-
|
|
18
15
|
dependencies = [
|
|
19
|
-
(
|
|
16
|
+
("umap", "0003_add_tilelayer"),
|
|
20
17
|
]
|
|
21
18
|
|
|
22
19
|
operations = [
|
|
@@ -4,14 +4,13 @@ from django.db import migrations
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
class Migration(migrations.Migration):
|
|
7
|
-
|
|
8
7
|
dependencies = [
|
|
9
|
-
(
|
|
8
|
+
("umap", "0004_add_licence"),
|
|
10
9
|
]
|
|
11
10
|
|
|
12
11
|
operations = [
|
|
13
12
|
migrations.RemoveField(
|
|
14
|
-
model_name=
|
|
15
|
-
name=
|
|
13
|
+
model_name="map",
|
|
14
|
+
name="tilelayer",
|
|
16
15
|
),
|
|
17
16
|
]
|
|
@@ -5,15 +5,16 @@ from django.db import migrations
|
|
|
5
5
|
|
|
6
6
|
|
|
7
7
|
class Migration(migrations.Migration):
|
|
8
|
-
|
|
9
8
|
dependencies = [
|
|
10
|
-
(
|
|
9
|
+
("umap", "0005_remove_map_tilelayer"),
|
|
11
10
|
]
|
|
12
11
|
|
|
13
12
|
operations = [
|
|
14
13
|
migrations.AlterField(
|
|
15
|
-
model_name=
|
|
16
|
-
name=
|
|
17
|
-
field=django.contrib.postgres.fields.jsonb.JSONField(
|
|
14
|
+
model_name="map",
|
|
15
|
+
name="settings",
|
|
16
|
+
field=django.contrib.postgres.fields.jsonb.JSONField(
|
|
17
|
+
blank=True, default=dict, null=True, verbose_name="settings"
|
|
18
|
+
),
|
|
18
19
|
),
|
|
19
20
|
]
|
|
@@ -4,15 +4,23 @@ from django.db import migrations, models
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
class Migration(migrations.Migration):
|
|
7
|
-
|
|
8
7
|
dependencies = [
|
|
9
|
-
(
|
|
8
|
+
("umap", "0006_auto_20190407_0719"),
|
|
10
9
|
]
|
|
11
10
|
|
|
12
11
|
operations = [
|
|
13
12
|
migrations.AlterField(
|
|
14
|
-
model_name=
|
|
15
|
-
name=
|
|
16
|
-
field=models.SmallIntegerField(
|
|
13
|
+
model_name="map",
|
|
14
|
+
name="share_status",
|
|
15
|
+
field=models.SmallIntegerField(
|
|
16
|
+
choices=[
|
|
17
|
+
(1, "everyone (public)"),
|
|
18
|
+
(2, "anyone with link"),
|
|
19
|
+
(3, "editors only"),
|
|
20
|
+
(9, "blocked"),
|
|
21
|
+
],
|
|
22
|
+
default=1,
|
|
23
|
+
verbose_name="share status",
|
|
24
|
+
),
|
|
17
25
|
),
|
|
18
26
|
]
|
umap/migrations/0009_star.py
CHANGED
|
@@ -1,25 +1,44 @@
|
|
|
1
1
|
# Generated by Django 4.1.7 on 2023-05-05 18:02
|
|
2
2
|
|
|
3
|
+
import django.db.models.deletion
|
|
3
4
|
from django.conf import settings
|
|
4
5
|
from django.db import migrations, models
|
|
5
|
-
import django.db.models.deletion
|
|
6
6
|
|
|
7
7
|
|
|
8
8
|
class Migration(migrations.Migration):
|
|
9
|
-
|
|
10
9
|
dependencies = [
|
|
11
10
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
|
12
|
-
(
|
|
11
|
+
("umap", "0008_alter_map_settings"),
|
|
13
12
|
]
|
|
14
13
|
|
|
15
14
|
operations = [
|
|
16
15
|
migrations.CreateModel(
|
|
17
|
-
name=
|
|
16
|
+
name="Star",
|
|
18
17
|
fields=[
|
|
19
|
-
(
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
18
|
+
(
|
|
19
|
+
"id",
|
|
20
|
+
models.AutoField(
|
|
21
|
+
auto_created=True,
|
|
22
|
+
primary_key=True,
|
|
23
|
+
serialize=False,
|
|
24
|
+
verbose_name="ID",
|
|
25
|
+
),
|
|
26
|
+
),
|
|
27
|
+
("at", models.DateTimeField(auto_now=True)),
|
|
28
|
+
(
|
|
29
|
+
"by",
|
|
30
|
+
models.ForeignKey(
|
|
31
|
+
on_delete=django.db.models.deletion.CASCADE,
|
|
32
|
+
related_name="stars",
|
|
33
|
+
to=settings.AUTH_USER_MODEL,
|
|
34
|
+
),
|
|
35
|
+
),
|
|
36
|
+
(
|
|
37
|
+
"map",
|
|
38
|
+
models.ForeignKey(
|
|
39
|
+
on_delete=django.db.models.deletion.CASCADE, to="umap.map"
|
|
40
|
+
),
|
|
41
|
+
),
|
|
23
42
|
],
|
|
24
43
|
),
|
|
25
44
|
]
|
|
@@ -4,20 +4,32 @@ from django.db import migrations, models
|
|
|
4
4
|
|
|
5
5
|
|
|
6
6
|
class Migration(migrations.Migration):
|
|
7
|
-
|
|
8
7
|
dependencies = [
|
|
9
|
-
(
|
|
8
|
+
("umap", "0009_star"),
|
|
10
9
|
]
|
|
11
10
|
|
|
12
11
|
operations = [
|
|
13
12
|
migrations.AlterField(
|
|
14
|
-
model_name=
|
|
15
|
-
name=
|
|
16
|
-
field=models.SmallIntegerField(
|
|
13
|
+
model_name="map",
|
|
14
|
+
name="edit_status",
|
|
15
|
+
field=models.SmallIntegerField(
|
|
16
|
+
choices=[(1, "Everyone"), (2, "Editors only"), (3, "Owner only")],
|
|
17
|
+
default=3,
|
|
18
|
+
verbose_name="edit status",
|
|
19
|
+
),
|
|
17
20
|
),
|
|
18
21
|
migrations.AlterField(
|
|
19
|
-
model_name=
|
|
20
|
-
name=
|
|
21
|
-
field=models.SmallIntegerField(
|
|
22
|
+
model_name="map",
|
|
23
|
+
name="share_status",
|
|
24
|
+
field=models.SmallIntegerField(
|
|
25
|
+
choices=[
|
|
26
|
+
(1, "Everyone (public)"),
|
|
27
|
+
(2, "Anyone with link"),
|
|
28
|
+
(3, "Editors only"),
|
|
29
|
+
(9, "Blocked"),
|
|
30
|
+
],
|
|
31
|
+
default=1,
|
|
32
|
+
verbose_name="share status",
|
|
33
|
+
),
|
|
22
34
|
),
|
|
23
35
|
]
|
|
@@ -1,24 +1,37 @@
|
|
|
1
1
|
# Generated by Django 4.2.2 on 2023-08-07 06:07
|
|
2
2
|
|
|
3
3
|
from django.db import migrations, models
|
|
4
|
+
|
|
4
5
|
import umap.models
|
|
5
6
|
|
|
6
7
|
|
|
7
8
|
class Migration(migrations.Migration):
|
|
8
|
-
|
|
9
9
|
dependencies = [
|
|
10
|
-
(
|
|
10
|
+
("umap", "0010_alter_map_edit_status_alter_map_share_status"),
|
|
11
11
|
]
|
|
12
12
|
|
|
13
13
|
operations = [
|
|
14
14
|
migrations.AlterField(
|
|
15
|
-
model_name=
|
|
16
|
-
name=
|
|
17
|
-
field=models.SmallIntegerField(
|
|
15
|
+
model_name="map",
|
|
16
|
+
name="edit_status",
|
|
17
|
+
field=models.SmallIntegerField(
|
|
18
|
+
choices=[(1, "Everyone"), (2, "Editors only"), (3, "Owner only")],
|
|
19
|
+
default=umap.models.get_default_edit_status,
|
|
20
|
+
verbose_name="edit status",
|
|
21
|
+
),
|
|
18
22
|
),
|
|
19
23
|
migrations.AlterField(
|
|
20
|
-
model_name=
|
|
21
|
-
name=
|
|
22
|
-
field=models.SmallIntegerField(
|
|
24
|
+
model_name="map",
|
|
25
|
+
name="share_status",
|
|
26
|
+
field=models.SmallIntegerField(
|
|
27
|
+
choices=[
|
|
28
|
+
(1, "Everyone (public)"),
|
|
29
|
+
(2, "Anyone with link"),
|
|
30
|
+
(3, "Editors only"),
|
|
31
|
+
(9, "Blocked"),
|
|
32
|
+
],
|
|
33
|
+
default=umap.models.get_default_share_status,
|
|
34
|
+
verbose_name="share status",
|
|
35
|
+
),
|
|
23
36
|
),
|
|
24
37
|
]
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# Generated by Django 4.2.2 on 2023-10-30 11:27
|
|
2
|
+
|
|
3
|
+
from django.db import migrations, models
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
class Migration(migrations.Migration):
|
|
7
|
+
dependencies = [
|
|
8
|
+
("umap", "0014_map_created_at"),
|
|
9
|
+
]
|
|
10
|
+
|
|
11
|
+
operations = [
|
|
12
|
+
migrations.AlterField(
|
|
13
|
+
model_name="pictogram",
|
|
14
|
+
name="pictogram",
|
|
15
|
+
field=models.FileField(upload_to="pictogram"),
|
|
16
|
+
),
|
|
17
|
+
]
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
# Generated by Django 4.2.2 on 2023-10-30 17:22
|
|
2
|
+
|
|
3
|
+
from django.db import migrations, models
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
class Migration(migrations.Migration):
|
|
7
|
+
dependencies = [
|
|
8
|
+
("umap", "0015_alter_pictogram_pictogram"),
|
|
9
|
+
]
|
|
10
|
+
|
|
11
|
+
operations = [
|
|
12
|
+
migrations.AddField(
|
|
13
|
+
model_name="pictogram",
|
|
14
|
+
name="category",
|
|
15
|
+
field=models.CharField(blank=True, max_length=300, null=True),
|
|
16
|
+
),
|
|
17
|
+
]
|