c2cgeoportal-geoportal 2.7.1.156__py2.py3-none-any.whl → 2.8.1.180__py2.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.
Files changed (97) hide show
  1. c2cgeoportal_geoportal/__init__.py +24 -14
  2. c2cgeoportal_geoportal/lib/authentication.py +10 -14
  3. c2cgeoportal_geoportal/lib/caching.py +8 -6
  4. c2cgeoportal_geoportal/lib/checker.py +10 -6
  5. c2cgeoportal_geoportal/lib/common_headers.py +5 -8
  6. c2cgeoportal_geoportal/lib/dbreflection.py +8 -8
  7. c2cgeoportal_geoportal/lib/filter_capabilities.py +5 -1
  8. c2cgeoportal_geoportal/lib/lingua_extractor.py +11 -12
  9. c2cgeoportal_geoportal/lib/loader.py +1 -1
  10. c2cgeoportal_geoportal/lib/oauth2.py +217 -100
  11. c2cgeoportal_geoportal/lib/wmstparsing.py +8 -12
  12. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/Dockerfile +9 -11
  13. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/development.ini +1 -1
  14. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/gunicorn.conf.py +0 -2
  15. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/requirements.txt +1 -1
  16. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.api.js +6 -4
  17. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.apps.js +1 -3
  18. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.commons.js +1 -0
  19. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/__init__.py +1 -6
  20. c2cgeoportal_geoportal/scaffolds/advance_update/{{cookiecutter.project}}/geoportal/CONST_Makefile +0 -20
  21. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml +20 -6
  22. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/update_l10n.yaml +4 -3
  23. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Dockerfile +22 -22
  24. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile +58 -2
  25. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build +48 -24
  26. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml +2 -5
  27. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/docker-compose-check +25 -0
  28. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt +1 -1
  29. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml +26 -0
  30. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml +53 -26
  31. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml +23 -0
  32. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml +0 -1
  33. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.yaml +3 -3
  34. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default +21 -2
  35. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project +9 -0
  36. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml +38 -14
  37. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/data/Readme.txt +2 -2
  38. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.conf +15 -0
  39. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.map.tmpl +2 -3
  40. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A3_Landscape.jrxml +5 -0
  41. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A3_Portrait.jrxml +5 -0
  42. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A4_Landscape.jrxml +5 -0
  43. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/A4_Portrait.jrxml +5 -0
  44. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/config.yaml.tmpl +6 -0
  45. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/pyproject.toml +4 -0
  46. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/run_alembic.sh +3 -5
  47. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup +1 -1
  48. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore +1 -1
  49. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/spell-ignore-words.txt +2 -0
  50. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/__init__.py +0 -0
  51. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.py +38 -0
  52. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml +2 -132
  53. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt +210 -1097
  54. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py +48 -0
  55. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_config-schema.yaml +17 -15
  56. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml +46 -2
  57. c2cgeoportal_geoportal/scripts/c2cupgrade.py +1 -2
  58. c2cgeoportal_geoportal/scripts/pcreate.py +8 -10
  59. c2cgeoportal_geoportal/scripts/theme2fts.py +58 -3
  60. c2cgeoportal_geoportal/views/__init__.py +1 -3
  61. c2cgeoportal_geoportal/views/dynamic.py +1 -1
  62. c2cgeoportal_geoportal/views/entry.py +2 -10
  63. c2cgeoportal_geoportal/views/fulltextsearch.py +1 -1
  64. c2cgeoportal_geoportal/views/geometry_processing.py +3 -3
  65. c2cgeoportal_geoportal/views/layers.py +10 -11
  66. c2cgeoportal_geoportal/views/login.py +63 -8
  67. c2cgeoportal_geoportal/views/mapserverproxy.py +2 -3
  68. c2cgeoportal_geoportal/views/ogcproxy.py +6 -2
  69. c2cgeoportal_geoportal/views/pdfreport.py +4 -4
  70. c2cgeoportal_geoportal/views/printproxy.py +2 -2
  71. c2cgeoportal_geoportal/views/profile.py +1 -1
  72. c2cgeoportal_geoportal/views/proxy.py +2 -4
  73. c2cgeoportal_geoportal/views/raster.py +2 -2
  74. c2cgeoportal_geoportal/views/resourceproxy.py +1 -1
  75. c2cgeoportal_geoportal/views/shortener.py +1 -2
  76. c2cgeoportal_geoportal/views/theme.py +97 -63
  77. c2cgeoportal_geoportal/views/tinyowsproxy.py +3 -12
  78. c2cgeoportal_geoportal/views/vector_tiles.py +1 -1
  79. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/METADATA +21 -15
  80. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/RECORD +96 -90
  81. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/entry_points.txt +1 -0
  82. tests/__init__.py +3 -2
  83. tests/test_cachebuster.py +3 -3
  84. tests/test_caching.py +7 -7
  85. tests/test_checker.py +1 -1
  86. tests/test_decimaljson.py +1 -1
  87. tests/test_headerstween.py +1 -1
  88. tests/test_i18n.py +1 -1
  89. tests/test_init.py +14 -15
  90. tests/test_locale_negociator.py +4 -4
  91. tests/test_mapserverproxy_route_predicate.py +1 -2
  92. tests/test_raster.py +15 -15
  93. tests/test_wmstparsing.py +10 -10
  94. tests/xmlstr.py +1 -3
  95. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/tools/extract-messages.js +0 -41
  96. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/WHEEL +0 -0
  97. {c2cgeoportal_geoportal-2.7.1.156.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/top_level.txt +0 -0
@@ -1,1160 +1,273 @@
1
1
  This file includes migration steps for each release of c2cgeoportal.
2
2
 
3
-
4
3
  =============
5
- Version 2.7.1
4
+ Version 2.8.1
6
5
  =============
7
6
 
8
7
  1. Update dependencies to use GDAL 3.7
9
8
 
10
- Use MapServer 7.6 with GDAL 3.7 (instead of 3.3) with new Ubuntu version
11
- Use QGIS server 3.28 (instead of 3.22) with GDAL 3.7
12
- Update rasterio to 1.3.9 (instead of 1.2.10)
13
- Use GDAL 3.7 as based image with new Ubuntu version (Python 3.8 => 3.10)
14
- Downgrade PyYAML to version 5.3.1 (instead of 5.4.1)
15
- Downgrade transifex-client to version 0.12.5 (instead of 0.14.4)
9
+ Use MapServer 8.0 with GDAL 3.7 (instead of 3.6)
10
+ Use QGIS server 3.28 with GDAL 3.7 (instead of 3.6)
11
+ Use GDAL 3.7 as based image (instead of 3.6)
16
12
 
17
13
  2. Docker Compose version 2
18
14
 
19
15
  Docker Compose version 2 is now supported (with the command `docker compose` instead of `docker-compose`) is now supported.
20
16
  For that an new argument `--docker-compose-version-2` is added to the `build` command, this argument should be used in the CI/CD pipeline.
21
17
 
18
+ In the `Makefile` you should replace all `docker-compose ` by `docker compose `
19
+ and remove all the argument `--no-deps` of the command `docker compose run`.
20
+
21
+ In the `project.yaml` you should add `Makefile` in the `managed_files` section.
22
+
22
23
  End of support by GitHub: https://github.blog/changelog/2024-04-10-github-hosted-runner-images-deprecation-notice-docker-compose-v1/.
23
24
 
25
+ 4. Previously the `Cache-Control` header was set to `public` when we are not authenticated to an endpoint
26
+ that use the authentication. But this didn't works in every cases, for example when we use the intranet
27
+ role and when we have a reverse proxy with cache. Now it's always set to private for all the endpoints
28
+ that use the authentication.
29
+
24
30
 
25
31
  =============
26
- Version 2.7.0
32
+ Version 2.8.0
27
33
  =============
28
34
 
29
35
  Information to know before starting the upgrade
30
36
  ===============================================
31
37
 
32
- 1. Now the simple application is the default mode for new project, to continue with the advance application
33
- mode you also should add an attribute ``advance: true`` in your ``project.yaml`` file before starting
34
- the upgrade.
35
-
36
- 2. All the files will be formatted with isort, Black and Prettier to be similar to the initial scaffolds.
37
- If you have mako files in ``.html`` files Prettier will break them, to avoid that you should create
38
- ``.prettierignore`` file with:
39
-
40
- ```
41
- *.min.js
42
- ```
43
-
44
- And the files you want to ignore.
45
-
46
- 3. The Upgrade to the Web Components started, the authentication and the LiDAR profile are migrated.
47
- In the desktop_alt we introduce a canvas component who manage the application layout and plug the
48
- components through slots.
49
- In ngeo, the sources files from contribs/gmf/src are moved in ngeo src folder.
50
-
51
- 4. When importing external WMS layers through dedicated right panel in desktop interface, now we use the URL
52
- from Capabilities/Request/GetMap/.../OnlineResource tag instead of Service/OnlineResource tag which,
53
- regarding WMS specification, should contain the website URL.
54
-
55
- Main versions updates
56
- ---------------------
57
- Node is updated from 14.19 to 16.14
58
- Npm is updated from 6.14 to 8.5
59
- GDAL is updated from 3.2 to 3.4
60
- Proj is updated from 7.2 to 8.2
61
-
62
-
63
- Python packages updates
64
- -----------------------
65
- New packages:
66
- * arrow at version 1.2
67
- * azure-core at version 1.23
68
- * azure-identity at version 1.8
69
- * azure-storage-blob at version 12.10
70
- * binaryornot at version 0.4
71
- * boto3 at version 1.21
72
- * botocore at version 1.24
73
- * cffi at version 1.15
74
- * cookiecutter at version 1.7
75
- * cryptography at version 36.0
76
- * Cython at version 0.29
77
- * Deprecated at version 1.2
78
- * greenlet at version 1.1
79
- * importlib-metadata at version 4.11
80
- * importlib-resources at version 5.4
81
- * jinja2-time at version 0.2
82
- * jmespath at version 0.10
83
- * msal at version 1.17
84
- * msal-extensions at version 0.3
85
- * msrest at version 0.6
86
- * packaging at version 21.3
87
- * portalocker at version 2.4
88
- * poyo at version 0.5
89
- * pycparser at version 2.21
90
- * PyJWT at version 2.3
91
- * python-slugify at version 6.1
92
- * requests-oauthlib at version 1.3
93
- * s3transfer at version 0.5
94
- * text-unidecode at version 1.3
95
- * tilecloud at version 1.8
96
- * typing-extensions at version 4.1
97
- * wrapt at version 1.14
98
- * zipp at version 3.7
99
-
100
- Removed packages:
101
- * python-editor
102
- * simplejson
103
-
104
- Major updates:
105
- * attrs from 20.3 to 21.4
106
- * boltons from 20.2 to 21.0
107
- * c2cwsgiutils from 4.1 to 5.0
108
- * certifi from 2020.12 to 2021.10
109
- * click from 7.1 to 8.0
110
- * cornice from 5.0 to 6.0
111
- * decorator from 4.4 to 5.1
112
- * idna from 2.10 to 3.3
113
- * iso8601 from 0.1 to 1.0
114
- * Jinja2 from 2.11 to 3.0
115
- * MarkupSafe from 1.1 to 2.1
116
- * pyparsing from 2.4 to 3.0
117
- * pyramid from 1.10 to 2.0
118
- * pyramid-multiauth from 0.9 to 1.0
119
- * redis from 3.5 to 4.1
120
- * ujson from 4.0 to 5.1
121
- * waitress from 1.4 to 2.1
122
-
123
- Minor updates:
124
- * alembic from 1.5 to 1.7
125
- * Chameleon from 3.8 to 3.9
126
- * defusedxml from 0.6 to 0.7
127
- * dogpile.cache from 1.0 to 1.1
128
- * GDAL from 3.2 to 3.4
129
- * GeoAlchemy2 from 0.8 to 0.11
130
- * graphviz from 0.16 to 0.19
131
- * gunicorn from 20.0 to 20.1
132
- * lingua from 4.14 to 4.15
133
- * lxml from 4.6 to 4.8
134
- * Mako from 1.1 to 1.2
135
- * netifaces from 0.10 to 0.11
136
- * oauthlib from 3.1 to 3.2
137
- * OWSLib from 0.22 to 0.25
138
- * passwordgenerator from 1.4 to 1.5
139
- * pbr from 5.5 to 5.8
140
- * psycopg2 from 2.8 to 2.9
141
- * psycopg2-binary from 2.8 to 2.9
142
- * pycryptodome from 3.11 to 3.14
143
- * Pygments from 2.7 to 2.11
144
- * pygraphviz from 1.7 to 1.9
145
- * pyotp from 2.5 to 2.6
146
- * pyproj from 3.0 to 3.3
147
- * pyramid-jinja2 from 2.8 to 2.9
148
- * pyramid-tm from 2.4 to 2.5
149
- * pytz from 2021.1 to 2021.3
150
- * sentry-sdk from 1.0 to 1.5
151
- * Shapely from 1.7 to 1.8
152
- * six from 1.15 to 1.16
153
- * SQLAlchemy from 1.3 to 1.4
154
- * SQLAlchemy-Utils from 0.36 to 0.38
155
- * stevedore from 3.3 to 3.5
156
- * zope.interface from 5.2 to 5.4
157
- * zope.sqlalchemy from 1.3 to 1.6
158
-
159
- Npm packages updates
160
- --------------------
161
- New packages:
162
- * @babel/plugin-proposal-class-properties at version 7.16
163
- * @babel/plugin-proposal-decorators at version 7.17
164
- * @babel/plugin-syntax-object-rest-spread at version 7.8
165
- * @babel/plugin-transform-spread at version 7.16
166
- * @babel/plugin-transform-typescript at version 7.16
167
- * @babel/preset-typescript at version 7.16
168
- * @lit/reactive-element at version 1.3
169
- * @sentry/integrations at version 6.18
170
- * @sentry/types at version 6.18
171
- * angular at version 1.8
172
- * co at version 4.6
173
- * console-control-strings at version 1.1
174
- * core-js at version 3.21
175
- * doctrine at version 3.0
176
- * eslint-plugin-jsdoc at version 38.0
177
- * glob at version 7.2
178
- * i18next-browser-languagedetector at version 6.1
179
- * i18next-parser at version 6.0
180
- * i18next-xhr-backend at version 3.2
181
- * i18next at version 21.6
182
- * jquery-mousewheel at version 3.1
183
- * jquery at version 3.6
184
- * lit-element at version 3.2
185
- * lit-html at version 2.2
186
- * lit at version 2.2
187
- * loader-utils at version 2.0
188
- * loc-i18next at version 0.1
189
- * ol-mapbox-style at version 7.1
190
- * ol at version 6.12
191
- * raw-loader at version 4.0
192
- * regenerator-runtime at version 0.13
193
- * rxjs at version 7.5
194
- * sass-loader at version 10.2
195
- * style-loader at version 2.0
196
- * terser at version 5.12
197
- * tsconfig-paths at version 3.14
198
-
199
- Removed packages:
200
- * @geoblocks/proj
201
- * eslint-config-openlayers
202
- * eslint-plugin-googshift
203
- * ng-raven
204
-
205
- Major updates:
206
- * chokidar from 2.1 to 3.5
207
- * commander from 7.0 to 9.0
208
- * d3 from 5.16 to 7.3
209
- * editorconfig-checker from 3.3 to 4.0
210
- * eslint from 7.19 to 8.11
211
- * fast-sass-loader from 1.5 to 2.0
212
- * fs-extra from 9.1 to 10.0
213
- * node-sass from 4.14 to 6.0
214
- * npm from 6.14 to 8.5
215
- * puppeteer from 5.5 to 13.5
216
- * sinon from 9.2 to 13.0
217
- * svgo-loader from 2.2 to 3.0
218
- * svgo from 1.3 to 2.8
219
- * ts-node from 9.1 to 10.7
220
-
221
- Minor updates:
222
- * @babel/core from 7.12 to 7.17
223
- * @babel/preset-env from 7.12 to 7.16
224
- * @sentry/browser from 6.2 to 6.18
225
- * @sentry/tracing from 6.2 to 6.18
226
- * css-loader from 5.0 to 5.2
227
- * jsts from 2.6 to 2.8
228
- * localforage from 1.9 to 1.10
229
- * mapillary-js from 4.0 to 4.1
230
- * proj4 from 2.7 to 2.8
231
- * webpack-merge from 5.7 to 5.8
232
38
 
233
39
  Information
234
40
  ===========
235
41
 
236
- 1. The configuration of the QGIS authentication module is simplified,
237
- now a new environment variable `GEOMAPFISH_ACCESSCONTROL_BASE_URL` is set to the base URL of
238
- qgisserver, and we search for all the OGC servers that correspond to this URL.
239
- Then the configuration file (`qgisserver/accesscontrol_config.yaml`) and the specified configuration
240
- in the `docker-compose.yaml` file can be removed.
241
- It also requires that the OGC servers are configured with an URL like that
242
- ``config://qgisserver?map=<project_file>``.
243
-
244
- 2. Some little changes in the application build:
245
-
246
- - In the ``./build`` script, we no longer call the ``docker build`` command with custom parameters,
247
- but call the ``docker-compose build`` command with two additional environment variables:
248
-
249
- * ``SIMPLE``: ``TRUE`` or ``FALSE`` if we compile a simple or advance application.
250
- * ``GIT_HASH``: the git hash of the current version.
251
-
252
- The build specification has been moved to the ``docker-compose`` files.
253
- - The ``--geoportal`` and ``--config`` arguments have been replaced by ``--service=geoportal`` and
254
- ``--service=config`` respectively.
255
- - The external images used in the composition are pulled from the Docker hub on each build, but the
256
- ``./build`` script supports a new argument ``--no-pull`` for faster rebuild during development.
257
- - ``./build`` script supports a new argument ``--fast-reload`` that will recreate all containers except
258
- Redis containers to keep the cache.
259
- - ``./build`` script supports a new argument ``--dry-run`` which only displays the ``docker`` and
260
- ``docker-compose`` commands without running them.
261
-
262
- 3. Upgrade c2cwsgiutils to version 5, see more information in the
263
- c2cwsgiutils changelog https://github.com/camptocamp/c2cwsgiutils/blob/master/CHANGELOG.md.
42
+ 1. We upgraded MapServer to version 8, then the Mapfiles should probably be updated, and we have a new
43
+ configurations file named `mapserver/mapserver.conf`.
44
+ Migration guide: https://mapserver.org/MIGRATION_GUIDE.html#mapserver-7-6-to-8-0-migration.
45
+ Deprecated element from `CLASS` removed (moved to `STYLE`)
46
+ https://mapserver.org/development/rfc/ms-rfc-133.html#rfc133.
264
47
 
265
- SQLAlchemy upgrade to version 1.4
266
- ---------------------------------
48
+ 2. We added the support of 'main_ogc_server' to WMS mapserver proxy URL.
49
+ This means that if the value 'vars/main_ogc_server' is present in the vars.yaml of the project,
50
+ that will be used as default value when no 'ogcserver' parameter is present in the request.
267
51
 
268
- SQLAlchemy has been upgraded to version 1.4 which serves as potential migration point for a more dramatic
269
- series of API changes currently planned for release 2.0 of SQLAlchemy.
52
+ 3. We switched the OpenLayers renderer to now use WegGL for WMTS. In the case of background tiles with
53
+ transparency, you should add the parameter 'ngeoTilesPreloadingLimit: 0' to the vars.yaml in 'constants'
54
+ so that background tiles are rendered correctly.
270
55
 
271
- For more details about SQLAlchemy 1.4 see: https://docs.sqlalchemy.org/en/14/changelog/migration_14.html
56
+ 4. In the `user` table, the column `deactivated` is now interpreted more strictly, `null` is now considered as `true`.
272
57
 
273
- To show SQLAlchemy deprecation warnings in your geoportal container logs, add this to your
274
- `docker-compose.override.yaml` file:
275
-
276
- ```
277
- ---
278
- version: '2.3'
279
-
280
- services:
281
- geoportal:
282
- environment:
283
- - PYTHONWARNINGS=default::DeprecationWarning
284
- - SQLALCHEMY_WARN_20=true
285
- ```
286
-
287
- For more information about Python warnings configuration see: https://docs.python.org/3/library/warnings.html#describing-warning-filters
288
-
289
-
290
- Changes to apply
291
- ================
292
-
293
- 1. For advance application:
294
-
295
- In the ``docker-compose.yaml`` file in the service ``geoportal`` you should replace
296
- ``service: geoportal`` by ``service: geoportal-advance``, and in service ``alembic`` you should replace
297
- ``service: alembic`` by ``service: alembic-advance``.
298
-
299
- 2. If you use the LiDAR profile you didn't need anymore to include your module in the controller.
300
-
301
- 3. In the tilegeneration configuration ``on``/``off`` is no more considered as boolean, it should be
302
- converted to ``true``/``false``, and the properties ``mapcache_internal`` and ``mapcache`` should be
58
+ 5. We add the `gmfPrintOptions` in the update path then the default print options are maintained in the
59
+ `CONST_vars.yaml`, especially the `hiddenAttributes`, then if you used the default value it can be
303
60
  removed.
304
61
 
305
- 4. For the LiDAR profile you should update your controller, in the interface JavaScript file:
306
-
307
- ```javascript
308
- + import panels from 'gmfapi/store/panels';
309
-
310
- ...
311
-
312
- constructor($scope, $injector) {
313
- super($scope, $injector);
314
- ...
315
- + const $timeout = $injector.get('$timeout');
316
- +
317
- + // Open the 'web-component' lidar panel
318
- + $scope.$watch(
319
- + () => this.drawLidarprofilePanelActive,
320
- + (newVal) => {
321
- + if (newVal) {
322
- + panels.openToolPanel('lidar');
323
- + } else {
324
- + panels.closeToolPanel();
325
- + }
326
- + }
327
- + );
328
- +
329
- + // Make visible the footer
330
- + panels.getActiveFooterPanel().subscribe({
331
- + next: (panel) => {
332
- + this.lidarProfileFooterActive = panel === 'lidar';
333
- + $timeout(() => {}); // this triggered on DOM click, we call $timeout to force Angular digest
334
- + },
335
- + });
336
- ...
337
- ```
338
-
339
- You should disable map interrogations when LiDAR tool is active, if missing add the following code to the controller:
340
- ```javascript
341
- + import ngeoMiscToolActivate from 'ngeo/misc/ToolActivate';
342
-
343
- + const drawLidarprofilePanelActive = new ngeoMiscToolActivate(this, 'drawLidarprofilePanelActive');
344
- + this.ngeoToolActivateMgr.registerTool('mapTools', drawLidarprofilePanelActive, false);
345
- ```
346
-
347
- The interface HTML file needs a few changes.
348
- To activate the LiDAR panel, you should makes sure to have correct ng-model attributes:
349
- {% raw %}
350
- ```html
351
- ...
352
- <button ngeo-btn class="btn btn-default" ng-model="mainCtrl.drawLidarprofilePanelActive"
353
- data-toggle="tooltip" data-placement="left" data-original-title="{{'LiDAR'|translate}}">
354
- <span class="fa fa-chart-line"></span>
355
- </button>
356
- ...
357
- ```
358
- {% endraw %}
359
-
360
- The LiDAR panel should looks like that, where other tools panels are:
361
- ```html
362
- ...
363
- + <div ng-show="mainCtrl.drawLidarprofilePanelActive" class="row">
364
- + <div class="col-sm-12">
365
- + <a class="btn close gmf-close" ng-click="mainCtrl.drawLidarprofilePanelActive = false">&times;</a>
366
- + <gmf-lidar-panel></gmf-lidar-panel>
367
- + </div>
368
- + </div>
369
- ...
370
- ```
371
-
372
- Finally the LiDAR footer in the footer balise should looks like that:
373
- ```html
374
- <footer>
375
- + <gmf-lidar-footer id="lidar-footer"></gmf-lidar-footer>
376
- <gmf-profile
377
- gmf-profile-active="profileChartActive"
378
- gmf-profile-line="mainCtrl.profileLine"
379
- ...
380
- </footer>
381
- ```
382
-
383
- 5. Here is a list of the low-level components migrated as a dependency (of other migrated components):
384
- - download/Csv
385
- - map/FeatureOverlay
386
- - map/FeatureOverlayMgr
387
- - message/Message
388
- - message/Notification
389
-
390
- All of them use the singleton pattern, which means that in general it may only need to be initialized once (when required).
391
- The component need to be imported with an 'import', not from the AngularJS dependency injector.
392
-
393
- You should take care of the custom code in that regard if one of these components is used, as it's may needs some changes to be working fully.
394
- If it is already initialized, you may need to change the code using this component in the custom component of your project.
395
- In any case, it will be different in each project and use case.
396
-
397
- 6. To access to the config in you components, previously it was injected through Angular, now you should get
398
- it with RXJS, with:
399
-
400
- ```javascript
401
- import {Configuration} from 'gmfapi/store/config';
402
-
403
- window.gmfapi.store.config.getConfig().subscribe({
404
- next: (configuration: Configuration) => {
405
- if (configuration) {
406
- ...
407
- }
408
- },
409
- })
410
- ```
411
-
412
- 7. To solve looping dependency we moved the `Cache` and `set_common_headers` function, then you should do
413
- in your custom Python views a modification like:
414
-
415
- ```diff
416
- - from c2cgeoportal_geoportal.lib.caching import Cache, set_common_headers
417
- + from c2cgeoportal_geoportal.lib.common_headers import Cache, set_common_headers
418
- ```
419
-
420
-
421
- =============
422
- Version 2.6.0
423
- =============
424
-
425
- Information to know before starting the upgrade
426
- ===============================================
427
-
428
- Direct dependencies updates
429
- ---------------------------
430
-
431
- Now we are based on the image `osgeo/gdal` (`ubuntu-small-3.2.1`) which is based on Ubuntu 20.04.
432
- Previously we were based on image `camptocamp/c2cwsgiutils` (`release_3`) which is based on Ubuntu 18.04
433
-
434
- Main version update
435
- -------------------
436
- Ubuntu is updated from 18.04.5 to 20.04.1
437
- Python is updated from 3.7.5 to 3.8.5
438
- Node is updated from 10.24.1 to 14.17.0
439
- Npm is updated from 6.14.12 to 6.14.13
440
- Postgres is updated from 13+226.pgdg18.04+1 to 13+226.pgdg20.04+1
441
-
442
- Python package update
443
- ---------------------
444
- New packages:
445
- * c2cwsgiutils at version 4.1.1
446
- * GDAL at version 3.2.1
447
- * linesman at version 0.3.2
448
- * networkx at version 1.7
449
- * oauthlib at version 3.1.0
450
- * Paste at version 3.5.0
451
- * pbr at version 5.5.1
452
- * Pillow at version 8.1.2
453
- * pipfile at version 0.0.2
454
- * pkgconfig at version 1.5.1
455
- * pygraphviz at version 1.7
456
- * pyyaml-include at version 1.2.post2
457
- * stevedore at version 3.3.0
458
- * toml at version 0.10.2
459
-
460
- Removed packages:
461
- * importlib-metadata
462
- * simplejson
463
- * typing-extensions
464
- * zipp
465
-
466
- Major updates:
467
- * attrs from 19.3.0 to 20.3.0
468
- * chardet from 3.0.4 to 4.0.0
469
- * cornice from 4.0.1 to 5.0.3
470
- * dogpile.cache from 0.9.0 to 1.0.2
471
- * Jinja2 from 3.0.0a1 to 2.11.3
472
- * MarkupSafe from 2.0.0a1 to 1.1.1
473
- * pyparsing from 3.0.0a1 to 2.4.7
474
- * pyproj from 2.6.0 to 3.0.0.post1
475
- * pytz from 2019.3 to 2021.1
476
- * sentry-sdk from 0.14.3 to 1.0.0
477
- * ujson from 2.0.3 to 4.0.2
478
-
479
- Minor updates:
480
- * alembic from 1.4.2 to 1.5.3
481
- * Babel from 2.8.0 to 2.9.0
482
- * boltons from 20.1.0 to 20.2.1
483
- * c2c.template from 2.1.0 to 2.3.0
484
- * cee-syslog-handler from 0.5.0 to 0.6.0
485
- * certifi from 2020.4.5.1 to 2020.12.5
486
- * cligj from 0.5.0 to 0.7.1
487
- * colander from 1.7.0 to 1.8.3
488
- * GeoAlchemy2 from 0.7.0 to 0.8.4
489
- * idna from 2.9 to 2.10
490
- * numpy from 1.18.3 to 1.20.0
491
- * objgraph from 3.4.1 to 3.5.0
492
- * OWSLib from 0.19.2 to 0.22.0
493
- * pipenv from 2020.5.28 to 2020.11.15
494
- * Pygments from 2.6.1 to 2.7.4
495
- * pyotp from 2.3.0 to 2.5.1
496
- * pyramid-debugtoolbar from 4.6.1 to 4.9
497
- * PyYAML from 5.3.1 to 5.4.1
498
- * rasterio from 1.1.3 to 1.2.0
499
- * redis from 3.4.1 to 3.5.3
500
- * requests from 2.23.0 to 2.25.1
501
- * six from 1.14.0 to 1.15.0
502
- * translationstring from 1.3 to 1.4
503
- * urllib3 from 1.25.9 to 1.26.4
504
- * zope.interface from 5.1.0 to 5.2.0
505
-
506
- Npm package update
507
- ------------------
508
- New packages:
509
- * @sentry/tracing at version 6.2.3
510
- * babel-plugin-angularjs-annotate at version 0.10.0
511
- * eslint at version 7.19.0
512
- * event-hooks-webpack-plugin at version 2.2.0
513
- * mapillary-js at version 2.21.0
514
- * tinycolor2 at version 1.4.2
515
-
516
- Removed packages:
517
- * @camptocamp/babel-plugin-angularjs-annotate
518
- * jsdoc
519
- * jsdoc-plugin-typescript
520
- * tsconfig-paths
521
- * typescript
522
-
523
- Major updates:
524
- * @sentry/browser from 5.15.4 to 6.2.3
525
- * commander from 5.0.0 to 7.0.0
526
- * copy-webpack-plugin from 5.1.1 to 6.4.1
527
- * css-loader from 3.5.2 to 5.0.1
528
- * expose-loader from 0.7.5 to 1.0.3
529
- * html-webpack-plugin from 3.2.0 to 4.5.1
530
- * node-sass-importer from 1.0.0 to 2.0.2
531
- * puppeteer from 2.1.1 to 5.5.0
532
- * ts-node from 8.8.2 to 9.1.1
533
- * webpack-merge from 4.2.2 to 5.7.3
534
-
535
- Minor updates:
536
- * @babel/core from 7.9.0 to 7.12.10
537
- * @babel/preset-env from 7.9.5 to 7.12.11
538
- * @fortawesome/fontawesome-free from 5.13.0 to 5.15.2
539
- * @trevoreyre/autocomplete-js from 2.1.1 to 2.2.0
540
- * angular-animate from 1.7.9 to 1.8.2
541
- * angular-mocks from 1.7.9 to 1.8.2
542
- * angular-sanitize from 1.7.9 to 1.8.2
543
- * angular-touch from 1.7.9 to 1.8.2
544
- * babel-loader from 8.1.0 to 8.2.2
545
- * bootstrap from 4.4.1 to 4.6.0
546
- * d3 from 5.15.1 to 5.16.0
547
- * ejs-loader from 0.3.6 to 0.5.0
548
- * extract-loader from 5.0.1 to 5.1.0
549
- * file-loader from 6.0.0 to 6.2.0
550
- * floatthead from 2.1.4 to 2.2.1
551
- * fs-extra from 9.0.0 to 9.1.0
552
- * jsts from 2.1.2 to 2.6.1
553
- * localforage from 1.7.3 to 1.9.0
554
- * moment from 2.24.0 to 2.29.1
555
- * node-sass from 4.13.1 to 4.14.1
556
- * ol-layerswitcher from 3.6.0 to 3.8.3
557
- * proj4 from 2.6.1 to 2.7.0
558
- * sinon from 9.0.2 to 9.2.4
559
- * terser-webpack-plugin from 4.1.0 to 4.2.3
560
- * webpack from 4.42.1 to 4.46.0
561
-
562
- Other Docker images
563
- ~~~~~~~~~~~~~~~~~~~
564
-
565
- * `camptocamp/mapfish_print` from 3.22 to 3.27.
566
- * `camptocamp/mapserver` from 7.4 to 7.6.
567
- * `camptocamp/geomapfish-qgisserver` from 3.10 to 3.16.
568
- * `camptocamp/redis` from 5 to 6.
569
- * `camptocamp/tilecloud-chain` from 1.13 to 1.15.
570
- * `camptocamp/haproxy` from 1.9 to 2.2.
571
-
572
- Main Changes
573
- ------------
574
-
575
- The migration process impacts the following:
576
- 1. Openlayers view has a default value set to `false` for the `constrainOnlyCenter` parameter.
577
- Add to the vars.yaml the following config: `constrainOnlyCenter: True` to `gmfOptions/view` if required to keep 2.5 view behavior.
578
-
579
- The migration process will also require the following UI-related changes (visible in the html diffs):
580
- 1. Right panel is movable, so the handle has to be added
581
- 2. Draw and measure panel has extra fields for arrows drawing
582
-
583
- Note: The list presented in this chapter is not exhaustive.
584
-
585
-
586
- Client application configuration
587
- --------------------------------
588
-
589
- Previous versions had configuration in the `*.html.ejs`, in the `Controler*.js`, and in the `vars.yaml` file.
590
- The goal of this change is to move this configuration to the `vars.yaml` file (with default values in
591
- the `CONST_vars.yaml`). This will make future upgrades easier and increase configuration possibilities
592
- in the simple application mode, see the documentation
593
- <https://camptocamp.github.io/c2cgeoportal/${MAIN_BRANCH}/integrator/create_application.html#simple-application>.
594
-
595
-
596
- When you apply the `ngeo.diff` you should first apply the changes in the `geoportal/vars.yaml` file.
597
-
598
- For the next step, you should consult the documentation about:
599
- - The interfaces_config documentation
600
- <https://camptocamp.github.io/c2cgeoportal/${MAIN_BRANCH}/integrator/ngeo.html?highlight=ngeo#dynamic-json-view>
601
- - GMF constants definitions <https://camptocamp.github.io/ngeo/master/jsdoc/module-contribs_gmf_src_options.html>
602
- - ngeo constants definitions <https://camptocamp.github.io/ngeo/master/jsdoc/module-src_options.html>
603
-
604
-
605
- Then configure the `vars/srid`, `vars/alternate_projections`, `vars/resolutions` and `vars/extent` they will
606
- be dispatched using `c2ctemplate` or YAML link.
607
-
608
- In the following, we show typical examples of necessary changes:
609
-
610
- Example in API
611
- ..............
612
-
613
- In the ngeo.diff:
614
- ```
615
- --- a/geoportal/cartoriviera_geoportal/static-ngeo/api/index.js
616
- +++ b/geoportal/cartoriviera_geoportal/static-ngeo/api/index.js
617
- ...
618
- -// The URL to the search service.
619
- -config.searchUrl = '{FULL_ENTRY_POINT}search?interface=api&limit=15';
620
- ```
621
-
622
- And in your `geoportal/cartoriviera_geoportal/static-ngeo/api/index.js` file:
623
- ```
624
- // The URL to the search service.
625
- onfig.searchUrl = '{FULL_ENTRY_POINT}search?interface=api&limit=15';
626
- ```
627
-
628
- We see that the project settings didn't correspond to the previous default settings, therefore you should
629
- have in your vars file something like:
630
- ```
631
- vars:
632
- interfaces_config:
633
- api:
634
- routes:
635
- searchUrl:
636
- params:
637
- limit: 15
638
-
639
- update_paths:
640
- - interfaces_config.api.routes.searchUrl # This one should already be present
641
- ```
642
-
643
- In this case, you need to change this line of the `update_paths` as follows:
644
- ```
645
- update_paths:
646
- - interfaces_config.api.routes.searchUrl.params
647
- ```
648
-
649
- This is because the default value in the
650
- `geoportal/CONST_vars.yaml` defines the searchUrl like this:
651
-
652
- ```
653
- searchUrl:
654
- name: fulltextsearch
655
- params:
656
- limit: 15
657
- partitionlimit: 5
658
- dynamic_params:
659
- interface: interface
660
- ```
661
-
662
- You won't redefine the whole `searchUrl` configuration you only want to set the params. The `update_paths`
663
- Allows you to update the one part of the configuration. Without this entry in the `update_paths`, the
664
- whole `searchUrl` configuration would have been replaced.
665
-
666
- Example in controller constructor
667
- .................................
668
-
669
- In the ngeo.diff:
670
- ```
671
- - constructor($scope, $injector) {
672
- - super({
673
- - srid: 2056,
674
- - mapViewConfig: {
675
- - center: [2632464, 1185457],
676
- - zoom: 3,
677
- - resolutions: [250, 100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05],
678
- - constrainResolution: true,
679
- - extent: [2485071.54, 175346.36, 2828515.78, 1299941.84],
680
- - }
681
- - }, $scope, $injector);
682
- ```
683
-
684
- And in your `geoportal/cartoriviera_geoportal/static-ngeo/api/index.js` file:
685
- ```
686
- constructor($scope, $injector) {
687
- super({
688
- maxTilesLoading: Infinity,
689
- srid: 2056,
690
- mapViewConfig: {
691
- center: [2559045, 1144195],
692
- zoom: 1,
693
- constrainResolution: true,
694
- resolutions: [50, 20, 10, 5, 2.5, 2, 1.5, 1, 0.5, 0.25, 0.1, 0.05, 0.025]
695
- }
696
- }, $scope, $injector);
697
- ```
698
-
699
- We see that the project settings didn't correspond to the previous default settings, therefore you should
700
- have in your vars file something like:
701
- ```
702
- vars:
703
- interfaces_config:
704
- default: # or interface name
705
- constants:
706
- gmfOptions:
707
- map:
708
- maxTilesLoading: .Inf
709
- view: &view
710
- projection: EPSG:{srid}
711
- center: [2559045, 1144195]
712
- zoom: 1
713
- resolutions: &resolutions [50, 20, 10, 5, 2.5, 2, 1.5, 1, 0.5, 0.25, 0.1, 0.05, 0.025]
714
- extent: &extent [2420000, 1030000, 2900000, 1350000]
715
- geolocalisation: True
716
- ```
717
-
718
- Standard example in controller
719
- ..............................
720
-
721
- In the ngeo.diff:
722
- ```
723
- - this.elevationLayers = ['aster', 'srtm'];
724
- ```
725
-
726
- And in your `geoportal/cartoriviera_geoportal/static-ngeo/api/index.js` file:
727
- ```
728
- this.elevationLayers = ['mns', 'mnt', 'rayglobal'];
729
- ```
730
-
731
- We see that the project settings didn't correspond to the previous default settings, therefore you should
732
- have in your vars file something like:
733
- ```
734
- vars:
735
- interfaces_config:
736
- default: # or interface name
737
- constants:
738
- gmfElevationOptions:
739
- layers: [mns, mnt, rayglobal]
740
- ```
741
-
742
- Now we can easily switch between the display of query results in a window or in a grid by using
743
- `gmfQueryGrid` configuration variable.
744
-
745
- Now you can easily switch between flush theme mode and non-flush theme mode by using
746
- `gmfTreeManagerModeFlush` configuration variable.
747
-
748
- Optional point
749
- ..............
750
-
751
- The header can be in a separate file, diff in the `*.html.ejs` file:
752
-
753
- - <header>
754
- - <div class="logo">
755
- - <span></span>
756
- - </div>
757
- - <div class="logo-right">
758
- - <span></span>
759
- - </div>
760
- - </header>
761
- + <ng-include src="'desktop_alt/header.html'"></ng-include>
762
-
763
- The content will be in the `geoportal/geomapfish_geoportal/static/header.html` file.
764
-
765
- Print
766
- -----
767
-
768
- - You can now switch easily between local print and mutualised print by setting one
769
- of `DISABLE_MUTUALIZED_PRINT` and `DISABLE_LOCAL_PRINT` environment variavle to '#' ant the other to ''.
770
- - The client timezone is added as a new attribute named `timezone`, you can use it with e.-g.:
771
- `java.time.ZonedDateTime.now().format(java.time.format.DateTimeFormatter
772
- .ofPattern("EEEE dd MMMM yyyy HH:mm")
773
- .withLocale($P{REPORT_LOCALE})
774
- .withZone(java.time.ZoneId.of($P{timezone}))`
775
- - If you use the most recent version of the `legend.jrxml` print template, you will obtain a legend with
776
- elements indented hierarchically per groups level. If you want to keep the previous legend style, keep
777
- your previous `legend.jrxml` template and add a new variable `gmfPrintOptions.legend.showGroupsTitle` in
778
- the `interfaces_config` constants of the vars file and set it to false.
779
-
780
- Editing
781
- -------
782
-
783
- - The default order column for edition enumeration lists is now the value column ("name" per
784
- default). You can set it through the new `editingEnumerations` layer metadata.
785
-
786
- QGIS server
787
- -----------
788
-
789
- - The runtime variables of the GeoMapFish configuration (geomapfish.yaml.tmpl) are now filled in the config
790
- container, previously it was in the QGIS server container.
791
-
792
- Tile generation
793
- ---------------
794
-
795
- - Some commands are added to generate the OpenLayers example,
796
- and the legend images used in the WMTS capabilities (but not used in the web application).
797
-
798
- Redis
799
- -----
800
-
801
- - Redis can be used in a scalable architecture (with sentinel), this is disabled by default.
802
-
803
- Environment
804
- -----------
805
-
806
- C2C_SECRET: Default value "c2crulez" has been removed for evident security reason.
807
-
808
- Changes to apply
809
- ================
810
-
811
- 1. All ngeo components are now configured via variables in your project variables file, in the section
812
- interfaces_config. To ease future migration, you should remove any existing custom JavaScript code which is
813
- setting such variables.
814
- There is some new documentation about the constants in ngeo
815
- https://camptocamp.github.io/ngeo/{{cookiecutter.geomapfish_main_version}}/apidoc/index.html.
816
-
817
-
818
- =============
819
- Version 2.5.0
820
- =============
821
-
822
- Information to know before starting the upgrade
823
- -----------------------------------------------
824
-
825
62
  Main versions updates
826
- .....................
827
-
828
- Ubuntu is updated from 18.04.2 to 18.04.5
829
- Python is updated from 3.6.7 to 3.7.5
830
- Node is updated from 10.15.3 to 10.24.1
831
- Npm is updated from 6.4.1 to 6.14.12
63
+ -------------------
64
+ Ubuntu is updated from 20.04.6 to 22.04.2
65
+ Python is updated from 3.8.10 to 3.10.6
66
+ Node is updated from 16.20.0 to 16.20.0
67
+ Npm is updated from 8.19.4 to 8.19.4
68
+ Postgres is updated from 15+250.pgdg20.04+1 to 15+250.pgdg22.04+1
69
+ GDAL is updated from 3.4.3, to 3.6.4,
70
+ Proj is updated from 9.0.0 to 9.1.1
832
71
 
833
72
  Python packages updates
834
- .......................
73
+ ---------------------
835
74
  New packages:
836
- * appdirs at version 1.4.4
837
- * beaker-redis at version 1.1.0
838
- * click at version 7.1.1
839
- * distlib at version 0.3.2
840
- * filelock at version 3.0.12
841
- * getitfixed at version 1.0.20
842
- * importlib-metadata at version 4.6.0
843
- * pipenv at version 2020.5.28
844
- * psycopg2 at version 2.8.5
845
- * pyotp at version 2.3.0
846
- * sentry-sdk at version 0.14.3
847
- * SQLAlchemy-Utils at version 0.36.3
848
- * typing-extensions at version 3.10.0.0
849
- * virtualenv-clone at version 0.5.4
850
- * zipp at version 3.4.1
75
+ * astroid at version 2.15.5
76
+ * bandit at version 1.7.5
77
+ * dill at version 0.3.6
78
+ * dodgy at version 0.2.1
79
+ * flake8 at version 2.3.0
80
+ * flake8-polyfill at version 1.0.2
81
+ * gitdb at version 4.0.10
82
+ * GitPython at version 3.1.31
83
+ * isort at version 5.12.0
84
+ * lazy-object-proxy at version 1.9.0
85
+ * markdown-it-py at version 2.2.0
86
+ * mccabe at version 0.7.0
87
+ * mdurl at version 0.1.2
88
+ * mypy at version 1.3.0
89
+ * mypy-extensions at version 1.0.0
90
+ * pep8 at version 1.7.1
91
+ * pep8-naming at version 0.10.0
92
+ * prospector at version 1.9.0
93
+ * pycodestyle at version 2.10.0
94
+ * pydocstyle at version 6.3.0
95
+ * pyflakes at version 2.5.0
96
+ * pylint at version 2.17.4
97
+ * pylint-celery at version 0.3
98
+ * pylint-django at version 2.5.3
99
+ * pylint-flask at version 0.6
100
+ * pylint-plugin-utils at version 0.7
101
+ * requirements-detector at version 1.2.2
102
+ * rich at version 13.4.1
103
+ * semver at version 3.0.0
104
+ * setoptconf-tmp at version 0.3.1
105
+ * shapely at version 2.0.1
106
+ * smmap at version 5.0.0
107
+ * snowballstemmer at version 2.2.0
108
+ * tomli at version 2.0.1
109
+ * tomlkit at version 0.11.8
110
+ * typing_extensions at version 4.6.2
851
111
 
852
112
  Removed packages:
853
- * alabaster
854
- * astroid
855
- * atomicwrites
856
- * awscli
857
- * beautifulsoup4
113
+ * azure-identity
858
114
  * boto3
859
115
  * botocore
860
- * c2c.cssmin
861
- * c2cgeoportal-admin
862
- * c2cgeoportal-commons
863
- * c2cgeoportal-geoportal
864
- * c2cwsgiutils
865
- * Click
866
- * codacy-coverage
867
- * codespell
868
- * colorama
869
- * coverage
870
- * cssmin
871
- * dateutils
872
- * docopt
873
- * docutils
874
- * entrypoints
875
- * flake8
876
- * flake8-copyright
877
- * flake8-mypy
878
- * flake8-polyfill
879
- * GDAL
880
- * glob2
881
- * htmlmin
882
- * imagesize
883
- * ipcalc
884
- * isort
116
+ * Cython
117
+ * Deprecated
118
+ * distlib
119
+ * filelock
120
+ * importlib-metadata
121
+ * importlib-resources
885
122
  * jmespath
886
- * JSTools
887
- * junit2html
888
- * lazy-object-proxy
889
123
  * linesman
890
- * mccabe
891
- * more-itertools
892
- * mypy
893
- * mypy-extensions
124
+ * msal
125
+ * msal-extensions
126
+ * msrest
894
127
  * networkx
895
- * packaging
896
128
  * Paste
897
- * PasteScript
898
- * pathspec
899
- * pep8
900
- * pep8-naming
901
- * Pillow
129
+ * pipenv
130
+ * pipfile
902
131
  * pkgconfig
903
- * pluggy
904
- * py
905
- * pyasn1
906
- * pycodestyle
907
- * pyflakes
132
+ * portalocker
133
+ * poyo
908
134
  * pygraphviz
909
- * pykwalify
910
- * pylint
911
- * Pympler
912
- * pytest
913
- * pytest-base-url
914
- * pytest-cov
915
- * pytest-html
916
- * pytest-metadata
917
- * pytest-selenium
918
- * pytest-variables
919
- * python-slugify
920
- * raven
921
- * rsa
135
+ * repoze.lru
922
136
  * s3transfer
923
- * selenium
924
- * snowballstemmer
925
- * Sphinx
926
- * sphinx-prompt
927
- * sphinxcontrib-websupport
928
- * tilecloud
929
- * tilecloud-chain
930
- * transifex-client
931
- * typed-ast
932
- * Unidecode
933
- * WebTest
934
- * wrapt
935
- * wsgi-lineprof
936
- * yamllint
937
- * zgitignore
137
+ * Shapely
138
+ * typing-extensions
139
+ * virtualenv
140
+ * virtualenv-clone
141
+ * zipp
938
142
 
939
143
  Major updates:
940
- * boltons from 19.0.0 to 20.1.0
941
- * certifi from 2019.3.9 to 2020.4.5.1
942
- * cornice from 3.5.1 to 4.0.1
943
- * gunicorn from 19.9.0 to 20.0.4
944
- * pyproj from 1.9.6 to 2.6.0
945
- * transaction from 2.4.0 to 3.0.0
946
- * ujson from 1.35 to 2.0.3
947
- * venusian from 1.2.0 to 3.0.0
948
- * virtualenv from 16.4.3 to 20.4.7
949
- * zope.interface from 4.6.0 to 5.1.0
144
+ * attrs from 21.4.0 to 23.1.0
145
+ * basicauth from 0.4.1 to 1.0.0
146
+ * boltons from 21.0.0 to 23.0.0
147
+ * Chameleon from 3.9.1 to 4.0.0
148
+ * chardet from 4.0.0 to 5.1.0
149
+ * charset-normalizer from 2.0.12 to 3.1.0
150
+ * colander from 1.8.3 to 2.0
151
+ * cryptography from 41.0.1 to 39.0.2
152
+ * geojson from 2.5.0 to 3.0.1
153
+ * greenlet from 1.1.3.post0 to 2.0.2
154
+ * munch from 2.5.0 to 3.0.0
155
+ * packaging from 21.3 to 23.1
156
+ * PasteDeploy from 2.1.1 to 3.0.1
157
+ * plaster-pastedeploy from 0.7 to 1.0.1
158
+ * python-slugify from 4.0.1 to 8.0.1
159
+ * pytz from 2021.3 to 2023.3
160
+ * PyYAML from 5.4.1 to 6.0
161
+ * stevedore from 3.5.2 to 5.1.0
162
+ * urllib3 from 1.26.16 to 2.0.2
163
+ * zope.deprecation from 4.4.0 to 5.0
164
+ * zope.interface from 5.4.0 to 6.0
165
+ * zope.sqlalchemy from 1.6 to 3.0
950
166
 
951
167
  Minor updates:
952
- * affine from 2.2.2 to 2.3.0
953
- * alembic from 1.0.9 to 1.4.2
954
- * attrs from 19.1.0 to 19.3.0
955
- * Babel from 2.6.0 to 2.8.0
956
- * Beaker from 1.10.1 to 1.11.0
957
- * c2cgeoform from 2.0.dev20190413 to 2.1.18
958
- * Chameleon from 3.6.1 to 3.8.1
959
- * defusedxml from 0.5.0 to 0.6.0
960
- * dogpile.cache from 0.7.1 to 0.9.0
961
- * GeoAlchemy2 from 0.6.1 to 0.7.0
962
- * geojson from 2.4.1 to 2.5.0
963
- * graphviz from 0.10.1 to 0.16
964
- * hupper from 1.6.1 to 1.10.2
965
- * idna from 2.8 to 2.9
966
- * Jinja2 from 2.10.1 to 2.11.3
967
- * lingua from 4.13 to 4.14
968
- * lxml from 4.3.1 to 4.6.3
969
- * Mako from 1.0.9 to 1.1.2
970
- * munch from 2.3.2 to 2.5.0
971
- * numpy from 1.16.3 to 1.18.3
972
- * OWSLib from 0.17.1 to 0.19.2
973
- * PasteDeploy from 2.0.1 to 2.1.0
974
- * pycryptodome from 3.8.1 to 3.9.7
975
- * Pygments from 2.3.1 to 2.6.1
976
- * pyramid from 1.9.4 to 1.10.4
977
- * pyramid-debugtoolbar from 4.5 to 4.6.1
978
- * pyramid-mako from 1.0.2 to 1.1.0
979
- * pyramid-tm from 2.2.1 to 2.4
980
- * python-dateutil from 2.6.1 to 2.8.1
981
- * pytz from 2019.1 to 2019.3
982
- * PyYAML from 5.1 to 5.4.1
983
- * rasterio from 1.0.2 to 1.1.3
984
- * redis from 3.2.1 to 3.4.1
985
- * requests from 2.21.0 to 2.23.0
986
- * Shapely from 1.6.4.post2 to 1.7.0
987
- * simplejson from 3.16.0 to 3.17.2
988
- * six from 1.11.0 to 1.14.0
989
- * urllib3 from 1.23 to 1.25.9
990
- * waitress from 1.2.1 to 1.4.3
991
- * zope.sqlalchemy from 1.1 to 1.3
168
+ * affine from 2.3.1 to 2.4.0
169
+ * alembic from 1.7.7 to 1.10.4
170
+ * azure-core from 1.26.3 to 1.27.0
171
+ * azure-storage-blob from 12.14.1 to 12.16.0
172
+ * Babel from 2.9.1 to 2.12.1
173
+ * Beaker from 1.11.0 to 1.12.1
174
+ * c2cwsgiutils from 5.0.1 to 5.2.2
175
+ * click from 8.0.4 to 8.1.3
176
+ * dogpile.cache from 1.1.8 to 1.2.0
177
+ * Fiona from 1.8.22 to 1.9.3
178
+ * GDAL from 3.4.3 to 3.6.4
179
+ * GeoAlchemy2 from 0.11.1 to 0.13.2
180
+ * graphviz from 0.19.2 to 0.20.1
181
+ * hupper from 1.10.3 to 1.12
182
+ * idna from 3.3 to 3.4
183
+ * iso8601 from 1.0.2 to 1.1.0
184
+ * Jinja2 from 3.0.3 to 3.1.2
185
+ * numpy from 1.22.4 to 1.24.3
186
+ * OWSLib from 0.28.1 to 0.29.2
187
+ * papyrus from 2.4 to 2.5
188
+ * pbr from 5.8.1 to 5.11.1
189
+ * Pillow from 9.4.0 to 9.5.0
190
+ * plaster from 1.0 to 1.1.2
191
+ * polib from 1.1.1 to 1.2.0
192
+ * pycryptodome from 3.14.1 to 3.17
193
+ * PyJWT from 2.4.0 to 2.7.0
194
+ * pyotp from 2.6.0 to 2.8.0
195
+ * pyproj from 3.3.1 to 3.5.0
196
+ * pyramid-debugtoolbar from 4.9 to 4.10
197
+ * pyramid-jinja2 from 2.9.2 to 2.10
198
+ * pyyaml-include from 1.2.post2 to 1.3
199
+ * rasterio from 1.2.10 to 1.3.6
200
+ * redis from 4.3.6 to 4.5.4
201
+ * sentry-sdk from 1.14.0 to 1.21.1
202
+ * SQLAlchemy-Utils from 0.38.3 to 0.41.1
203
+ * tilecloud from 1.8.2 to 1.9.3
204
+ * transaction from 3.0.1 to 3.1.0
205
+ * ujson from 5.4.0 to 5.7.0
206
+ * wrapt from 1.13.3 to 1.15.0
207
+ * zope.event from 4.4 to 4.6
992
208
 
993
209
  Npm packages updates
994
- ....................
210
+ ------------------
995
211
  New packages:
996
- * @sentry/browser at version 5.15.4
997
- * @trevoreyre/autocomplete-js at version 2.1.1
998
- * commander at version 5.0.0
999
- * editorconfig-checker at version 3.3.0
1000
- * jsdoc at version 3.6.4
1001
- * jsdoc-plugin-typescript at version 2.0.5
1002
- * localforage at version 1.7.3
1003
- * ng-raven at version 1.0.1
1004
- * parse-absolute-css-unit at version 1.0.2
1005
- * popper.js at version 1.16.1
1006
- * puppeteer at version 2.1.1
1007
- * qruri at version 0.0.4
1008
- * resize-observer-polyfill at version 1.5.1
1009
- * simple-html-tokenizer at version 0.5.9
1010
- * sinon at version 9.0.2
1011
- * terser-webpack-plugin at version 4.1.0
1012
- * typescript at version 3.8.3
212
+ * @snyk/protect at version 1.1094.0
213
+ * cy-mobile-commands at version 0.3.0
214
+ * cypress-browser-permissions at version 1.1.0
215
+ * cypress-real-events at version 1.7.6
216
+ * eslint-plugin-lit at version 1.8.2
217
+ * eslint-plugin-wc at version 1.4.0
218
+ * i18next-http-backend at version 2.1.1
219
+ * neat-csv at version 5.2.0
220
+ * strip-bom at version 5.0.0
1013
221
 
1014
222
  Removed packages:
1015
- * @openlayers/eslint-plugin
1016
- * @types/angular-animate
1017
- * @types/angular-dynamic-locale
1018
- * @types/angular-gettext
1019
- * @types/angular-mocks
1020
- * @types/bootstrap
1021
- * @types/cesium
1022
- * @types/d3
1023
- * @types/file-saver
1024
- * @types/googlemaps
1025
- * @types/jasmine
1026
- * @types/jquery.ui.datetimepicker
1027
- * @types/jsts
1028
- * @types/proj4
1029
- * @types/typeahead
1030
- * angular
1031
- * googshift
1032
- * html-webpack-include-assets-plugin
1033
- * ls
1034
- * ol
1035
- * ol-cesium
1036
- * phantomjs-polyfill-string-includes
1037
- * phantomjs-prebuilt
1038
- * raven-js
223
+ * @sentry/integrations
224
+ * angular-gettext-tools
225
+ * commander
226
+ * eslint
227
+ * i18next-xhr-backend
228
+ * puppeteer
1039
229
 
1040
230
  Major updates:
1041
- * css-loader from 2.1.1 to 3.5.2
1042
- * eslint-config-openlayers from 11.0.0 to 14.0.0
1043
- * extract-loader from 3.1.0 to 5.0.1
1044
- * file-loader from 3.0.1 to 6.0.0
1045
- * fs-extra from 7.0.1 to 9.0.0
231
+ * @sentry/browser from 6.18.2 to 7.35.0
232
+ * @sentry/tracing from 6.18.2 to 7.35.0
233
+ * @sentry/types from 6.18.2 to 7.35.0
234
+ * editorconfig-checker from 4.0.2 to 5.0.1
235
+ * eslint-plugin-jsdoc from 38.0.8 to 39.7.5
236
+ * fs-extra from 10.0.1 to 11.1.0
237
+ * glob from 7.2.3 to 8.1.0
238
+ * i18next-browser-languagedetector from 6.1.8 to 7.0.1
239
+ * i18next-parser from 6.0.1 to 7.6.0
240
+ * i18next from 21.6.16 to 22.4.9
241
+ * node-sass from 6.0.1 to 7.0.3
242
+ * ol-layerswitcher from 3.8.3 to 4.1.0
243
+ * ol-mapbox-style from 7.1.1 to 9.5.0
244
+ * ol from 6.12.0 to 7.2.2
245
+ * sinon from 13.0.2 to 15.0.1
246
+ * svgo from 2.8.0 to 3.0.2
247
+ * tsconfig-paths from 3.14.2 to 4.1.2
1046
248
 
1047
249
  Minor updates:
1048
- * @babel/core from 7.4.4 to 7.9.0
1049
- * @babel/preset-env from 7.4.4 to 7.9.5
1050
- * @fortawesome/fontawesome-free from 5.8.1 to 5.13.0
1051
- * angular-gettext-tools from 2.4.1 to 2.5.3
1052
- * babel-loader from 8.0.5 to 8.1.0
1053
- * bootstrap from 4.3.1 to 4.4.1
1054
- * copy-webpack-plugin from 5.0.3 to 5.1.1
1055
- * corejs-typeahead from 1.2.1 to 1.3.1
1056
- * d3 from 5.9.2 to 5.15.1
1057
- * fast-sass-loader from 1.4.7 to 1.5.0
1058
- * jsts from 2.0.4 to 2.1.2
1059
- * moment from 2.22.2 to 2.24.0
1060
- * node-sass from 4.12.0 to 4.13.1
1061
- * npm from 6.4.1 to 6.14.12
1062
- * ol-layerswitcher from 3.2.0 to 3.6.0
1063
- * proj4 from 2.5.0 to 2.6.1
1064
- * svgo from 1.2.2 to 1.3.2
1065
- * ts-node from 8.1.0 to 8.8.2
1066
- * tsconfig-paths from 3.8.0 to 3.9.0
1067
- * webpack from 4.30.0 to 4.42.1
1068
- * webpack-dev-server from 3.3.1 to 3.11.0
1069
-
1070
- Application build
1071
- .................
1072
-
1073
- In the new version the build of the application becomes more Docker friendly.
1074
- We didn't anymore have a build container that builds files in the local filesystem, now everything is done
1075
- in Docker. The only thing that runs out of docker is the `build` script (that needs Python 3.x) which runs
1076
- some `docker build`, and `docker-compose` commands.
1077
-
1078
- Main Changes
1079
- ------------
1080
-
1081
- The migration process impacts the following:
1082
- 1. Environment variables are now stored in the env.default and env.project files.
1083
- 2. .mako files are replaced by .tmpl, this means Python templating isn't possible anymore, (in .tmpl we just have template replacement).
1084
- If dynamic variables are needed, you have to write a custom script in `script/config-eval-templates` and add it to the entrypoint into the config image
1085
- 3. Functionalities in the vars file (2.4) are now stored in the database (2.5) and manageable via the administration interface.
1086
- 4. In the geoportal folder, there are `static` and `static_ngeo` sub-folders. Since version 2.5 the usage is stricter.
1087
- `static` can be used everywhere and is visible by all images, while `static_ngeo` can now only be used in the webpack build.
1088
- 5. Import of AngularJS library is required in JavaScript files using it, i.e for controllers or components: `import angular from 'angular';`.
1089
-
1090
- The migration process will also require the following UI-related changes (visible in the html diffs):
1091
- 1. Predefined values in editing form
1092
- 2. Query selection panel
1093
- 3. Loading spinners on various elements of the interfaces
1094
- 4. Geolocation on desktop (add the button)
1095
- 5. Map swipper
250
+ * @babel/core from 7.17.12 to 7.20.12
251
+ * @babel/plugin-proposal-class-properties from 7.16.7 to 7.18.6
252
+ * @babel/plugin-proposal-decorators from 7.17.12 to 7.20.13
253
+ * @babel/plugin-transform-spread from 7.16.7 to 7.20.7
254
+ * @babel/plugin-transform-typescript from 7.16.8 to 7.20.13
255
+ * @babel/preset-env from 7.16.11 to 7.20.2
256
+ * @babel/preset-typescript from 7.16.7 to 7.18.6
257
+ * @lit/reactive-element from 1.3.4 to 1.6.1
258
+ * @trevoreyre/autocomplete-js from 2.2.0 to 2.4.1
259
+ * babel-loader from 8.2.5 to 8.3.0
260
+ * core-js from 3.21.1 to 3.27.2
261
+ * d3 from 7.3.0 to 7.8.2
262
+ * jsts from 2.8.1 to 2.9.3
263
+ * lit-html from 2.2.7 to 2.6.1
264
+ * lit from 2.2.8 to 2.6.1
265
+ * rxjs from 7.5.7 to 7.8.0
266
+ * sass-loader from 10.2.1 to 10.4.1
267
+ * terser from 5.12.1 to 5.16.2
268
+ * tinycolor2 from 1.4.2 to 1.5.2
269
+ * ts-node from 10.7.0 to 10.9.1
1096
270
 
1097
- Note: The list presented in this chapter is not exhaustive.
1098
-
1099
-
1100
- Information
1101
- -----------
1102
-
1103
- 1. Basic authentication is disabled by default from this version onward.
1104
- To enable basic auth see:
1105
- https://camptocamp.github.io/c2cgeoportal/{{cookiecutter.geomapfish_main_version}}/integrator/security.html#basic-auth
1106
-
1107
- 2. We change the secret name from `GITHUB_GOPASS_CI_TOKEN` to `GOPASS_CI_GITHUB_TOKEN` because we can't
1108
- anymore create create secret started with `GITHUB_`.
1109
-
1110
- 3. Layers which have any errors are not added to the theme anymore.
1111
-
1112
- 4. If a WMS version is given in an OGC server URL, it will be used for the GetCapabilities request
1113
- Supported versions: 1.1.1 and 1.3.0
1114
271
 
1115
272
  Changes to apply
1116
- ----------------
1117
-
1118
- 1. Now we need to have PyYAML python package installed in the home,
1119
- see the documentation for more information:
1120
- https://camptocamp.github.io/c2cgeoportal/{{cookiecutter.geomapfish_main_version}}/integrator/requirements.html
1121
-
1122
- 2. The configuration vars `vars/functionalities/anonymous` and `vars/functionalities/registered` should
1123
- be moved to the new roles `anonymous` and `registered` that will be created once the database has been upgraded.
1124
-
1125
- 3. The 'INSTANCE' configuration variable is removed, it should be in the '.env' files, and also the
1126
- environment makefiles, these contents should also be moved to the '.env' files. In a multi-organization
1127
- project you can have a chain of multiple '.env' files see the build configuration documentation.
1128
-
1129
- 4. A new PostgreSQL extension is required, install it by running in psql:
1130
- `CREATE EXTENSION IF NOT EXISTS hstore;`
1131
-
1132
- 5. The static files will be moved, therefore you should replace:
1133
- `request.static_url('{{cookiecutter.package}}_geoportal:static/` by:
1134
- `request.static_url('/etc/geomapfish/static/`.
1135
-
1136
- 6. Optional, change your mapfiles according the documentation:
1137
- https://camptocamp.github.io/c2cgeoportal/{{cookiecutter.geomapfish_main_version}}/administrator/mapfile.html
1138
-
1139
-
1140
- Version 2.4.2
1141
- =============
1142
-
1143
- Information
1144
- -----------
1145
-
1146
- 1. The SVG inclusion through Webpack has changed, See ngeo SVG example for more information:
1147
- https://camptocamp.github.io/ngeo/master/examples/svg.html
1148
-
1149
- 2. The WMTS capabilities is now generated on runtime.
1150
-
1151
- 3. If not already done the 'edit' and 'routing' interfaces and their relations will be removed from the
1152
- database, If you don't want that, you should rename the interfaces before applying the alembic scripts.
1153
-
1154
- 4. If not already done the 'api' and 'iframe_api' will be created. After the database upgrade you can run
1155
- the following request to fill e.-g. the api's interfaces with the desktop interface:
1156
-
1157
- INSERT INTO main.interface_layer (interface_id, layer_id)
1158
- SELECT <api_interface_id>, layer_id FROM main.interface_layer WHERE interface_id = <other_interface_id>;
1159
- INSERT INTO main.interface_theme (interface_id, theme_id)
1160
- SELECT <api_interface_id>, theme_id FROM main.interface_theme WHERE interface_id = <other_interface_id>;
273
+ ================