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