c2cgeoportal-geoportal 2.6.0__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.
- c2cgeoportal_geoportal/__init__.py +245 -95
- c2cgeoportal_geoportal/lib/__init__.py +67 -43
- c2cgeoportal_geoportal/lib/authentication.py +50 -26
- c2cgeoportal_geoportal/lib/bashcolor.py +17 -13
- c2cgeoportal_geoportal/lib/cacheversion.py +16 -8
- c2cgeoportal_geoportal/lib/caching.py +65 -193
- c2cgeoportal_geoportal/lib/check_collector.py +17 -10
- c2cgeoportal_geoportal/lib/checker.py +67 -65
- c2cgeoportal_geoportal/lib/common_headers.py +167 -0
- c2cgeoportal_geoportal/lib/dbreflection.py +61 -46
- c2cgeoportal_geoportal/lib/filter_capabilities.py +126 -88
- 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 +363 -240
- c2cgeoportal_geoportal/lib/loader.py +11 -16
- c2cgeoportal_geoportal/lib/metrics.py +28 -17
- c2cgeoportal_geoportal/lib/oauth2.py +392 -206
- c2cgeoportal_geoportal/lib/wmstparsing.py +105 -84
- 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} +22 -15
- 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 +100 -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/{create/geoportal/setup.py_tmpl → advance_create/{{cookiecutter.project}}/geoportal/setup.py} +6 -7
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/tsconfig.json +8 -0
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.api.js +77 -0
- c2cgeoportal_geoportal/scaffolds/{create/geoportal/webpack.apps.js_tmpl → advance_create/{{cookiecutter.project}}/geoportal/webpack.apps.js} +29 -28
- c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/webpack.commons.js +4 -7
- c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/webpack.config.js +1 -1
- c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/__init__.py +42 -0
- 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 -27
- 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 +57 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml +46 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/update_l10n.yaml +66 -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/{{cookiecutter.project}}/Dockerfile +76 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile +70 -0
- c2cgeoportal_geoportal/scaffolds/create/{README.rst_tmpl → {{cookiecutter.project}}/README.rst} +4 -4
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build +186 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml +22 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/docker-compose-check +25 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt +1 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-db.yaml +26 -0
- c2cgeoportal_geoportal/scaffolds/create/{docker-compose-lib.yaml → {{cookiecutter.project}}/docker-compose-lib.yaml} +165 -22
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-qgis.yaml +23 -0
- 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} +20 -15
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default +101 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project +69 -0
- c2cgeoportal_geoportal/scaffolds/create/{geoportal/vars.yaml_tmpl → {{cookiecutter.project}}/geoportal/vars.yaml} +126 -36
- 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 +3 -3
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/demo.map.tmpl +224 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/mapserver.conf +15 -0
- c2cgeoportal_geoportal/scaffolds/create/{mapserver/mapserver.map.tmpl_tmpl → {{cookiecutter.project}}/mapserver/mapserver.map.tmpl} +9 -18
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A3_Landscape.jrxml +13 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A3_Portrait.jrxml +13 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A4_Landscape.jrxml +13 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A4_Portrait.jrxml +13 -8
- c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/config.yaml.tmpl +11 -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/{pyproject.toml → {{cookiecutter.project}}/pyproject.toml} +4 -0
- c2cgeoportal_geoportal/scaffolds/create/{qgisserver/pg_service.conf.tmpl_tmpl → {{cookiecutter.project}}/qgisserver/pg_service.conf.tmpl} +2 -2
- c2cgeoportal_geoportal/scaffolds/create/{run_alembic.sh → {{cookiecutter.project}}/run_alembic.sh} +3 -5
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup +110 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore +114 -0
- c2cgeoportal_geoportal/scaffolds/create/{setup.cfg_tmpl → {{cookiecutter.project}}/setup.cfg} +1 -1
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/spell-ignore-words.txt +5 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/__init__.py +0 -0
- c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tests/test_app.py +38 -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/{{cookiecutter.project}}/.upgrade.yaml +61 -0
- c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt +273 -0
- c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_create_template/tests/test_testapp.py +48 -0
- c2cgeoportal_geoportal/scaffolds/update/{geoportal → {{cookiecutter.project}}/geoportal}/CONST_config-schema.yaml +64 -17
- c2cgeoportal_geoportal/scaffolds/update/{geoportal/CONST_vars.yaml_tmpl → {{cookiecutter.project}}/geoportal/CONST_vars.yaml} +396 -19
- c2cgeoportal_geoportal/scripts/__init__.py +16 -30
- c2cgeoportal_geoportal/scripts/c2cupgrade.py +272 -234
- c2cgeoportal_geoportal/scripts/create_demo_theme.py +3 -6
- c2cgeoportal_geoportal/scripts/manage_users.py +34 -39
- c2cgeoportal_geoportal/scripts/pcreate.py +310 -0
- c2cgeoportal_geoportal/scripts/theme2fts.py +128 -24
- c2cgeoportal_geoportal/scripts/urllogin.py +19 -11
- 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 -6
- c2cgeoportal_geoportal/views/dev.py +9 -7
- c2cgeoportal_geoportal/views/dynamic.py +56 -19
- c2cgeoportal_geoportal/views/entry.py +85 -24
- c2cgeoportal_geoportal/views/fulltextsearch.py +29 -23
- c2cgeoportal_geoportal/views/geometry_processing.py +17 -9
- c2cgeoportal_geoportal/views/i18n.py +91 -9
- c2cgeoportal_geoportal/views/layers.py +166 -133
- c2cgeoportal_geoportal/views/login.py +161 -93
- c2cgeoportal_geoportal/views/mapserverproxy.py +47 -31
- c2cgeoportal_geoportal/views/memory.py +12 -12
- c2cgeoportal_geoportal/views/ogcproxy.py +52 -30
- c2cgeoportal_geoportal/views/pdfreport.py +30 -26
- c2cgeoportal_geoportal/views/printproxy.py +60 -52
- c2cgeoportal_geoportal/views/profile.py +24 -23
- c2cgeoportal_geoportal/views/proxy.py +88 -72
- c2cgeoportal_geoportal/views/raster.py +37 -26
- c2cgeoportal_geoportal/views/resourceproxy.py +13 -11
- c2cgeoportal_geoportal/views/shortener.py +27 -25
- c2cgeoportal_geoportal/views/theme.py +472 -332
- c2cgeoportal_geoportal/views/tinyowsproxy.py +42 -44
- c2cgeoportal_geoportal/views/vector_tiles.py +80 -0
- {c2cgeoportal_geoportal-2.6.0.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/METADATA +19 -8
- c2cgeoportal_geoportal-2.8.1.180.dist-info/RECORD +191 -0
- {c2cgeoportal_geoportal-2.6.0.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/WHEEL +1 -1
- {c2cgeoportal_geoportal-2.6.0.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/entry_points.txt +3 -0
- tests/__init__.py +10 -5
- tests/test_cachebuster.py +3 -5
- tests/test_caching.py +18 -26
- tests/test_checker.py +1 -3
- tests/test_decimaljson.py +5 -5
- tests/test_headerstween.py +1 -3
- tests/test_i18n.py +2 -2
- tests/test_init.py +16 -20
- tests/test_locale_negociator.py +4 -6
- tests/test_mapserverproxy_route_predicate.py +1 -4
- tests/test_raster.py +15 -17
- tests/test_wmstparsing.py +10 -12
- tests/xmlstr.py +1 -3
- 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/Dockerfile_tmpl +0 -67
- c2cgeoportal_geoportal/scaffolds/create/Makefile +0 -3
- c2cgeoportal_geoportal/scaffolds/create/build_tmpl +0 -167
- c2cgeoportal_geoportal/scaffolds/create/ci/config.yaml_tmpl +0 -23
- 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/env.default_tmpl +0 -67
- c2cgeoportal_geoportal/scaffolds/create/env.project_tmpl +0 -48
- 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/__init__.py_tmpl +0 -58
- 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/tools/extract-messages.js +0 -39
- 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/+dot+upgrade.yaml_tmpl +0 -181
- 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 → advance_create/{{cookiecutter.project}}}/geoportal/requirements.txt +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-2.6.0.dist-info → c2cgeoportal_geoportal-2.8.1.180.dist-info}/top_level.txt +0 -0
@@ -1,181 +0,0 @@
|
|
1
|
-
---
|
2
|
-
# The list (by include, exclude) of default files that will not be overwritten by the upgrade.
|
3
|
-
# That that can be extended with managed_files or reduced with unmanaged_files from the
|
4
|
-
# project.yaml file in the project root directory.
|
5
|
-
default_project_file:
|
6
|
-
include:
|
7
|
-
- geoportal/setup\.py
|
8
|
-
- geoportal/vars\.yaml
|
9
|
-
- geoportal/Makefile
|
10
|
-
- geoportal/{{package}}_geoportal/__init__\.py
|
11
|
-
- geoportal/{{package}}_geoportal/templates/.*
|
12
|
-
- geoportal/{{package}}_geoportal/locale/.*
|
13
|
-
- geoportal/{{package}}_geoportal/static/.*
|
14
|
-
- geoportal/{{package}}_geoportal/static-ngeo/.*
|
15
|
-
- print/print-apps/.*
|
16
|
-
- mapserver/.*
|
17
|
-
- tilegeneration/config\.yaml\.tmpl
|
18
|
-
- project\.yaml
|
19
|
-
- docker-compose\.yaml
|
20
|
-
- env\.project
|
21
|
-
- README\.rst
|
22
|
-
- \.github/workflows/main\.yaml
|
23
|
-
- \.github/workflows/rebuild\.yaml
|
24
|
-
exclude:
|
25
|
-
- mapserver/demo\.map\.tmpl
|
26
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/image/favicon\.ico
|
27
|
-
|
28
|
-
# Files ignored when creating the diff files => will just be left untouched.
|
29
|
-
no_diff:
|
30
|
-
- .*\.po
|
31
|
-
- CONST_.+
|
32
|
-
- .*/CONST_.+
|
33
|
-
|
34
|
-
# Files that will be present in the CONST_create_template but will not be considered in the upgrade.
|
35
|
-
# Used to provide the alt applications => does not disturb the user during upgrade.
|
36
|
-
extra:
|
37
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/desktop_alt\.html\.ejs
|
38
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/mobile_alt\.html\.ejs
|
39
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/oeedit\.html\.ejs
|
40
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/Controllerdesktop_alt\.js
|
41
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/Controllermobile_alt\.js
|
42
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/Controlleroeedit\.js
|
43
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/sass/desktop_alt\.scss
|
44
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/sass/vars_desktop_alt\.scss
|
45
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/sass/mobile_alt\.scss
|
46
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/sass/vars_mobile_alt\.scss
|
47
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/sass/oeedit\.scss
|
48
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/sass/vars_oeedit\.scss
|
49
|
-
|
50
|
-
# Automated file system operations:
|
51
|
-
# Remove some files or directories:
|
52
|
-
# - action: remove
|
53
|
-
# paths:
|
54
|
-
# - <one file or directory>
|
55
|
-
# Move a file:
|
56
|
-
# - action: move
|
57
|
-
# from: <src file>
|
58
|
-
# to: <dst file>
|
59
|
-
upgrade_files:
|
60
|
-
- action: remove
|
61
|
-
paths:
|
62
|
-
- docker-run
|
63
|
-
- .config
|
64
|
-
- docker-compose-run
|
65
|
-
- docker-compose-build.yaml
|
66
|
-
- geoportal/jsbuild/
|
67
|
-
- geoportal/{package}_geoportal/templates/api/
|
68
|
-
- geoportal/{package}_geoportal/static/lib/.gitignore
|
69
|
-
- testdb/
|
70
|
-
- vars_convert2tmpl.yaml
|
71
|
-
- CONST_convert2tmpl.mk
|
72
|
-
- CONST_config-schema.yaml
|
73
|
-
- CONST_Makefile
|
74
|
-
- CONST_vars.yaml
|
75
|
-
- project.yaml.mako
|
76
|
-
- geoportal/{{package}}_geoportal/static/apihelp/images
|
77
|
-
- action: move
|
78
|
-
from: .eslintrc
|
79
|
-
to: geoportal/.eslintrc
|
80
|
-
- action: move
|
81
|
-
from: language_mapping
|
82
|
-
to: geoportal/language_mapping
|
83
|
-
- action: move
|
84
|
-
from: lingua-client.cfg
|
85
|
-
to: geoportal/lingua-client.cfg
|
86
|
-
- action: move
|
87
|
-
from: lingua-server.cfg
|
88
|
-
to: geoportal/lingua-server.cfg
|
89
|
-
- action: move
|
90
|
-
from: vars.yaml
|
91
|
-
to: geoportal/vars.yaml
|
92
|
-
- action: move
|
93
|
-
from: geoportal/webpack.apps.js.mako
|
94
|
-
to: geoportal/webpack.apps.js
|
95
|
-
- action: move
|
96
|
-
from: geoportal/Dockerfile.mako
|
97
|
-
to: geoportal/Dockerfile
|
98
|
-
- action: move
|
99
|
-
from: geoportal/development.ini.mako
|
100
|
-
to: geoportal/development.ini
|
101
|
-
- action: move
|
102
|
-
from: geoportal/production.ini.mako
|
103
|
-
to: geoportal/production.ini
|
104
|
-
- action: move
|
105
|
-
from: .env.mako
|
106
|
-
to: .env.sample
|
107
|
-
- action: move
|
108
|
-
from: Dockerfile.mako
|
109
|
-
to: Dockerfile
|
110
|
-
- action: move
|
111
|
-
from: tools/extract-messages.js
|
112
|
-
to: geoportal/tools/extract-messages.js
|
113
|
-
- action: move
|
114
|
-
from: scripts/deploy-docker
|
115
|
-
to: scripts/publish-docker
|
116
|
-
- action: move
|
117
|
-
from: geoportal/{{package}}_geoportal/static-ngeo/api/apihelp/index.html
|
118
|
-
to: geoportal/{{package}}_geoportal/static/apihelp/index.html
|
119
|
-
- action: move
|
120
|
-
from: geoportal/{{package}}_geoportal/static-ngeo/api/apihelp/rainbow-custom.min.js
|
121
|
-
to: geoportal/{{package}}_geoportal/static/apihelp/rainbow-custom.min.js
|
122
|
-
- action: move
|
123
|
-
from: geoportal/{{package}}_geoportal/static-ngeo/api/apihelp/github.css
|
124
|
-
to: geoportal/{{package}}_geoportal/static/apihelp/github.css
|
125
|
-
- action: move
|
126
|
-
from: geoportal/{{package}}_geoportal/static-ngeo/api/apihelp/data.txt
|
127
|
-
to: geoportal/{{package}}_geoportal/static/apihelp/data.txt
|
128
|
-
- action: move
|
129
|
-
from: geoportal/{{package}}_geoportal/static-ngeo/api/apihelp/img
|
130
|
-
to: geoportal/{{package}}_geoportal/static/apihelp/img
|
131
|
-
- action: remove
|
132
|
-
paths:
|
133
|
-
- geoportal/{{package}}_geoportal/static/apihelp/track0.gpx
|
134
|
-
- geoportal/{{package}}_geoportal/static-ngeo/api/apihelp/
|
135
|
-
- action: remove
|
136
|
-
paths:
|
137
|
-
- geoportal/{{package}}_geoportal/static/css/proj.css
|
138
|
-
- geoportal/{{package}}_geoportal/static/css/proj-map.css
|
139
|
-
- geoportal/{{package}}_geoportal/static/css/proj-widgets.css
|
140
|
-
- geoportal/{{package}}_geoportal/static/js/
|
141
|
-
- action: remove
|
142
|
-
paths:
|
143
|
-
- scripts/CONST_clone_schema.sql
|
144
|
-
- action: remove
|
145
|
-
paths:
|
146
|
-
- front
|
147
|
-
- front_dev
|
148
|
-
- bin/entrypoint
|
149
|
-
- bin/eval-templates
|
150
|
-
- action: move
|
151
|
-
from: .env.sample
|
152
|
-
to: env.sample
|
153
|
-
- action: remove
|
154
|
-
paths:
|
155
|
-
- cgxp_revision
|
156
|
-
- action: remove
|
157
|
-
paths:
|
158
|
-
- .circleci/config.yml
|
159
|
-
- .travis.yml
|
160
|
-
- action: move
|
161
|
-
from: env.sample
|
162
|
-
to: env.default
|
163
|
-
- action: remove
|
164
|
-
paths:
|
165
|
-
- mapserver/CONST_example_map
|
166
|
-
- action: remove
|
167
|
-
paths:
|
168
|
-
- geoportal/{{package}}_geoportal/static-ngeo/js/apps/image/crosshair.svg
|
169
|
-
- action: move
|
170
|
-
from: geoportal/{{package}}_geoportal/static-ngeo/js/apps/image/favicon.ico
|
171
|
-
to: geoportal/{{package}}_geoportal/static/images/favicon.ico
|
172
|
-
override: True
|
173
|
-
- action: move
|
174
|
-
from: .github/workflows/ci.yaml
|
175
|
-
to: .github/workflows/main.yaml
|
176
|
-
- action: remove
|
177
|
-
paths:
|
178
|
-
- scripts/publish-docker
|
179
|
-
- action: remove
|
180
|
-
paths:
|
181
|
-
- geoportal/{{package}}_geoportal/locale/.emptyfolder
|
@@ -1,454 +0,0 @@
|
|
1
|
-
This file includes migration steps for each release of c2cgeoportal.
|
2
|
-
|
3
|
-
|
4
|
-
=============
|
5
|
-
Version 2.6.0
|
6
|
-
=============
|
7
|
-
|
8
|
-
Information to know before starting the upgrade
|
9
|
-
===============================================
|
10
|
-
|
11
|
-
Direct dependencies updates
|
12
|
-
---------------------------
|
13
|
-
|
14
|
-
Now we are based on the image `osgeo/gdal` (`ubuntu-small-3.2.1`) which is based on Ubuntu 20.04.
|
15
|
-
Previously we were based on image `camptocamp/c2cwsgiutils` (`release_3`) which is based on Ubuntu 18.04
|
16
|
-
|
17
|
-
Main version update
|
18
|
-
-------------------
|
19
|
-
Ubuntu is updated from 18.04.5 to 20.04.1
|
20
|
-
Python is updated from 3.7.5 to 3.8.5
|
21
|
-
Node is updated from 10.24.1 to 14.17.0
|
22
|
-
Npm is updated from 6.14.12 to 6.14.13
|
23
|
-
Postgres is updated from 13+226.pgdg18.04+1 to 13+226.pgdg20.04+1
|
24
|
-
|
25
|
-
Python package update
|
26
|
-
---------------------
|
27
|
-
New packages:
|
28
|
-
* c2cwsgiutils at version 4.1.1
|
29
|
-
* GDAL at version 3.2.1
|
30
|
-
* linesman at version 0.3.2
|
31
|
-
* networkx at version 1.7
|
32
|
-
* oauthlib at version 3.1.0
|
33
|
-
* Paste at version 3.5.0
|
34
|
-
* pbr at version 5.5.1
|
35
|
-
* Pillow at version 8.1.2
|
36
|
-
* pipfile at version 0.0.2
|
37
|
-
* pkgconfig at version 1.5.1
|
38
|
-
* pygraphviz at version 1.7
|
39
|
-
* pyyaml-include at version 1.2.post2
|
40
|
-
* stevedore at version 3.3.0
|
41
|
-
* toml at version 0.10.2
|
42
|
-
|
43
|
-
Removed packages:
|
44
|
-
* importlib-metadata
|
45
|
-
* simplejson
|
46
|
-
* typing-extensions
|
47
|
-
* zipp
|
48
|
-
|
49
|
-
Major updates:
|
50
|
-
* attrs from 19.3.0 to 20.3.0
|
51
|
-
* chardet from 3.0.4 to 4.0.0
|
52
|
-
* cornice from 4.0.1 to 5.0.3
|
53
|
-
* dogpile.cache from 0.9.0 to 1.0.2
|
54
|
-
* Jinja2 from 3.0.0a1 to 2.11.3
|
55
|
-
* MarkupSafe from 2.0.0a1 to 1.1.1
|
56
|
-
* pyparsing from 3.0.0a1 to 2.4.7
|
57
|
-
* pyproj from 2.6.0 to 3.0.0.post1
|
58
|
-
* pytz from 2019.3 to 2021.1
|
59
|
-
* sentry-sdk from 0.14.3 to 1.0.0
|
60
|
-
* ujson from 2.0.3 to 4.0.2
|
61
|
-
|
62
|
-
Minor updates:
|
63
|
-
* alembic from 1.4.2 to 1.5.3
|
64
|
-
* Babel from 2.8.0 to 2.9.0
|
65
|
-
* boltons from 20.1.0 to 20.2.1
|
66
|
-
* c2c.template from 2.1.0 to 2.3.0
|
67
|
-
* cee-syslog-handler from 0.5.0 to 0.6.0
|
68
|
-
* certifi from 2020.4.5.1 to 2020.12.5
|
69
|
-
* cligj from 0.5.0 to 0.7.1
|
70
|
-
* colander from 1.7.0 to 1.8.3
|
71
|
-
* GeoAlchemy2 from 0.7.0 to 0.8.4
|
72
|
-
* idna from 2.9 to 2.10
|
73
|
-
* numpy from 1.18.3 to 1.20.0
|
74
|
-
* objgraph from 3.4.1 to 3.5.0
|
75
|
-
* OWSLib from 0.19.2 to 0.22.0
|
76
|
-
* pipenv from 2020.5.28 to 2020.11.15
|
77
|
-
* Pygments from 2.6.1 to 2.7.4
|
78
|
-
* pyotp from 2.3.0 to 2.5.1
|
79
|
-
* pyramid-debugtoolbar from 4.6.1 to 4.9
|
80
|
-
* PyYAML from 5.3.1 to 5.4.1
|
81
|
-
* rasterio from 1.1.3 to 1.2.0
|
82
|
-
* redis from 3.4.1 to 3.5.3
|
83
|
-
* requests from 2.23.0 to 2.25.1
|
84
|
-
* six from 1.14.0 to 1.15.0
|
85
|
-
* translationstring from 1.3 to 1.4
|
86
|
-
* urllib3 from 1.25.9 to 1.26.4
|
87
|
-
* zope.interface from 5.1.0 to 5.2.0
|
88
|
-
|
89
|
-
Npm package update
|
90
|
-
------------------
|
91
|
-
New packages:
|
92
|
-
* @sentry/tracing at version 6.2.3
|
93
|
-
* babel-plugin-angularjs-annotate at version 0.10.0
|
94
|
-
* eslint at version 7.19.0
|
95
|
-
* event-hooks-webpack-plugin at version 2.2.0
|
96
|
-
* mapillary-js at version 2.21.0
|
97
|
-
* tinycolor2 at version 1.4.2
|
98
|
-
|
99
|
-
Removed packages:
|
100
|
-
* @camptocamp/babel-plugin-angularjs-annotate
|
101
|
-
* jsdoc
|
102
|
-
* jsdoc-plugin-typescript
|
103
|
-
* tsconfig-paths
|
104
|
-
* typescript
|
105
|
-
|
106
|
-
Major updates:
|
107
|
-
* @sentry/browser from 5.15.4 to 6.2.3
|
108
|
-
* commander from 5.0.0 to 7.0.0
|
109
|
-
* copy-webpack-plugin from 5.1.1 to 6.4.1
|
110
|
-
* css-loader from 3.5.2 to 5.0.1
|
111
|
-
* expose-loader from 0.7.5 to 1.0.3
|
112
|
-
* html-webpack-plugin from 3.2.0 to 4.5.1
|
113
|
-
* node-sass-importer from 1.0.0 to 2.0.2
|
114
|
-
* puppeteer from 2.1.1 to 5.5.0
|
115
|
-
* ts-node from 8.8.2 to 9.1.1
|
116
|
-
* webpack-merge from 4.2.2 to 5.7.3
|
117
|
-
|
118
|
-
Minor updates:
|
119
|
-
* @babel/core from 7.9.0 to 7.12.10
|
120
|
-
* @babel/preset-env from 7.9.5 to 7.12.11
|
121
|
-
* @fortawesome/fontawesome-free from 5.13.0 to 5.15.2
|
122
|
-
* @trevoreyre/autocomplete-js from 2.1.1 to 2.2.0
|
123
|
-
* angular-animate from 1.7.9 to 1.8.2
|
124
|
-
* angular-mocks from 1.7.9 to 1.8.2
|
125
|
-
* angular-sanitize from 1.7.9 to 1.8.2
|
126
|
-
* angular-touch from 1.7.9 to 1.8.2
|
127
|
-
* babel-loader from 8.1.0 to 8.2.2
|
128
|
-
* bootstrap from 4.4.1 to 4.6.0
|
129
|
-
* d3 from 5.15.1 to 5.16.0
|
130
|
-
* ejs-loader from 0.3.6 to 0.5.0
|
131
|
-
* extract-loader from 5.0.1 to 5.1.0
|
132
|
-
* file-loader from 6.0.0 to 6.2.0
|
133
|
-
* floatthead from 2.1.4 to 2.2.1
|
134
|
-
* fs-extra from 9.0.0 to 9.1.0
|
135
|
-
* jsts from 2.1.2 to 2.6.1
|
136
|
-
* localforage from 1.7.3 to 1.9.0
|
137
|
-
* moment from 2.24.0 to 2.29.1
|
138
|
-
* node-sass from 4.13.1 to 4.14.1
|
139
|
-
* ol-layerswitcher from 3.6.0 to 3.8.3
|
140
|
-
* proj4 from 2.6.1 to 2.7.0
|
141
|
-
* sinon from 9.0.2 to 9.2.4
|
142
|
-
* terser-webpack-plugin from 4.1.0 to 4.2.3
|
143
|
-
* webpack from 4.42.1 to 4.46.0
|
144
|
-
|
145
|
-
Other Docker images
|
146
|
-
~~~~~~~~~~~~~~~~~~~
|
147
|
-
|
148
|
-
* `camptocamp/mapfish_print` from 3.22 to 3.27.
|
149
|
-
* `camptocamp/mapserver` from 7.4 to 7.6.
|
150
|
-
* `camptocamp/geomapfish-qgisserver` from 3.10 to 3.16.
|
151
|
-
* `camptocamp/redis` from 5 to 6.
|
152
|
-
* `camptocamp/tilecloud-chain` from 1.13 to 1.15.
|
153
|
-
* `camptocamp/haproxy` from 1.9 to 2.2.
|
154
|
-
|
155
|
-
Client application configuration
|
156
|
-
--------------------------------
|
157
|
-
|
158
|
-
Previous versions had configuration in the `*.html.ejs`, in the `Controler*.js`, and in the `vars.yaml` file.
|
159
|
-
The goal of this change is to group all this configuration to the `vars.yaml` file (with default values in
|
160
|
-
the `CONST_vars.yaml`). This will make future upgrades easier and increase configuration possibilities
|
161
|
-
in the simple application mode, see the documentation
|
162
|
-
<https://camptocamp.github.io/c2cgeoportal/${MAIN_BRANCH}/integrator/create_application.html#simple-application>.
|
163
|
-
|
164
|
-
When you apply the `ngeo.diff` you should first apply the proposed changes concerning the
|
165
|
-
`geoportal/vars.yaml` file itself.
|
166
|
-
|
167
|
-
Then during applying the `ngeo.diff` you have to remove multiple lines of configuration from your
|
168
|
-
`*.html.ejs` and `Controler*.js` files. for each configuration that diverge from the default configuration you
|
169
|
-
have to override the default value (that are newly defined in the `geoportal/CONST_vars.yaml`) by adding
|
170
|
-
a new value in the `vars/interface_config` section of your `geoportal/vars.yaml` file.
|
171
|
-
|
172
|
-
In the `vars/interface_config` section of the `geoportal/vars.yaml` and the `geoporal/CONST_vars.yaml` files,
|
173
|
-
you define configuration per `interface`, and then mainly per `constants` and `routes` (for paths). See all
|
174
|
-
possibility in the `Dynamic.json view` part of the documentation
|
175
|
-
<https://camptocamp.github.io/c2cgeoportal/${MAIN_BRANCH}/integrator/ngeo.html?highlight=ngeo#dynamic-json-view>
|
176
|
-
|
177
|
-
You can find a list of existing options in the `geoporal/CONST_vars.yaml` and here with descriptions:
|
178
|
-
- GMF constants definitions <https://camptocamp.github.io/ngeo/master/jsdoc/module-contribs_gmf_src_options.html>
|
179
|
-
- ngeo constants definitions <https://camptocamp.github.io/ngeo/master/jsdoc/module-src_options.html>
|
180
|
-
|
181
|
-
In the following examples, we show typical examples of necessary changes:
|
182
|
-
|
183
|
-
Standard example in controller
|
184
|
-
..............................
|
185
|
-
|
186
|
-
In the ngeo.diff:
|
187
|
-
```
|
188
|
-
- this.elevationLayers = ['aster', 'srtm'];
|
189
|
-
```
|
190
|
-
|
191
|
-
But you have this custom config in your `geoportal/{{package}}_geoportal/static-ngeo/api/index.js` file:
|
192
|
-
```
|
193
|
-
this.elevationLayers = ['mns', 'mnt', 'rayglobal'];
|
194
|
-
```
|
195
|
-
|
196
|
-
We have to remove the `elevationLayers` config. And we also see that the project settings do not correspond to
|
197
|
-
the default settings, therefore you should have in your `geoportal/vars.yaml` file something like:
|
198
|
-
```
|
199
|
-
vars:
|
200
|
-
interfaces_config:
|
201
|
-
default: # or interface name
|
202
|
-
constants:
|
203
|
-
gmfElevationOptions:
|
204
|
-
layers: [mns, mnt, rayglobal]
|
205
|
-
```
|
206
|
-
|
207
|
-
Again, you can find the `gmfElevationOptions` in the `geoporal/CONST_vars.yaml` and its composition and
|
208
|
-
description in the GMF/ngeo constants definitions (see links above).
|
209
|
-
|
210
|
-
Example in API
|
211
|
-
..............
|
212
|
-
|
213
|
-
In the ngeo.diff:
|
214
|
-
```
|
215
|
-
--- a/geoportal/{{package}}_geoportal/static-ngeo/api/index.js
|
216
|
-
+++ b/geoportal/{{package}}_geoportal/static-ngeo/api/index.js
|
217
|
-
...
|
218
|
-
-// The URL to the search service.
|
219
|
-
-config.searchUrl = '{FULL_ENTRY_POINT}search?interface=api&limit=15';
|
220
|
-
```
|
221
|
-
|
222
|
-
And in your `geoportal/{{package}}_geoportal/static-ngeo/api/index.js` file:
|
223
|
-
```
|
224
|
-
// The URL to the search service.
|
225
|
-
config.searchUrl = '{FULL_ENTRY_POINT}search?interface=api&limit=15';
|
226
|
-
```
|
227
|
-
|
228
|
-
We see that the project settings didn't correspond to the previous default settings, therefore you should
|
229
|
-
have in your vars file something like:
|
230
|
-
```
|
231
|
-
vars:
|
232
|
-
interfaces_config:
|
233
|
-
api:
|
234
|
-
routes:
|
235
|
-
searchUrl:
|
236
|
-
params:
|
237
|
-
limit: 15
|
238
|
-
|
239
|
-
update_paths:
|
240
|
-
- interfaces_config.api.routes.searchUrl # This one should already be present
|
241
|
-
```
|
242
|
-
|
243
|
-
In this case you could have to add also this `update_paths`. It's because the default value in the
|
244
|
-
`geoportal/CONST_vars.yaml` define the searchUrl like this:
|
245
|
-
|
246
|
-
```
|
247
|
-
searchUrl:
|
248
|
-
name: fulltextsearch
|
249
|
-
params:
|
250
|
-
limit: 15
|
251
|
-
partitionlimit: 5
|
252
|
-
dynamic_params:
|
253
|
-
interface: interface
|
254
|
-
```
|
255
|
-
|
256
|
-
You won't redefine the whole `searchUrl` configuration you only want to set the params. The `update_paths`
|
257
|
-
Allows you to update the one part of the configuration. Without this entry in the `update_paths`, the
|
258
|
-
whole `searchUrl` configuration would have been replaced.
|
259
|
-
|
260
|
-
Example in controller constructor
|
261
|
-
.................................
|
262
|
-
|
263
|
-
In the ngeo.diff:
|
264
|
-
```
|
265
|
-
- constructor($scope, $injector) {
|
266
|
-
- super({
|
267
|
-
- srid: 2056,
|
268
|
-
- mapViewConfig: {
|
269
|
-
- center: [2632464, 1185457],
|
270
|
-
- zoom: 3,
|
271
|
-
- resolutions: [250, 100, 50, 20, 10, 5, 2, 1, 0.5, 0.25, 0.1, 0.05],
|
272
|
-
- constrainResolution: true,
|
273
|
-
- extent: [2485071.54, 175346.36, 2828515.78, 1299941.84],
|
274
|
-
- }
|
275
|
-
- }, $scope, $injector);
|
276
|
-
```
|
277
|
-
|
278
|
-
And in your `geoportal/{{package}}_geoportal/static-ngeo/api/index.js` file:
|
279
|
-
```
|
280
|
-
constructor($scope, $injector) {
|
281
|
-
super({
|
282
|
-
maxTilesLoading: Infinity,
|
283
|
-
srid: 2056,
|
284
|
-
mapViewConfig: {
|
285
|
-
center: [2559045, 1144195],
|
286
|
-
zoom: 1,
|
287
|
-
constrainResolution: true,
|
288
|
-
resolutions: [50, 20, 10, 5, 2.5, 2, 1.5, 1, 0.5, 0.25, 0.1, 0.05, 0.025]
|
289
|
-
}
|
290
|
-
}, $scope, $injector);
|
291
|
-
```
|
292
|
-
|
293
|
-
We see that the project settings didn't correspond to the previous default settings, therefore you should
|
294
|
-
have in your vars file something like:
|
295
|
-
```
|
296
|
-
vars:
|
297
|
-
interfaces_config:
|
298
|
-
default: # or interface name
|
299
|
-
constants:
|
300
|
-
gmfOptions:
|
301
|
-
map:
|
302
|
-
maxTilesLoading: .Inf
|
303
|
-
view: &view
|
304
|
-
projection: EPSG:{srid}
|
305
|
-
center: [2559045, 1144195]
|
306
|
-
zoom: 1
|
307
|
-
resolutions: &resolutions [50, 20, 10, 5, 2.5, 2, 1.5, 1, 0.5, 0.25, 0.1, 0.05, 0.025]
|
308
|
-
extent: &extent [2420000, 1030000, 2900000, 1350000]
|
309
|
-
geolocalisation: True
|
310
|
-
```
|
311
|
-
|
312
|
-
Other configuration
|
313
|
-
...................
|
314
|
-
|
315
|
-
You also have to configure the `vars/srid`, `vars/alternate_projections`, `vars/resolutions` and
|
316
|
-
`vars/extent` they will be dispatched using `c2ctemplate` or YAML link.
|
317
|
-
|
318
|
-
Now we can easily switch between the display of query results in a window or in a grid by using
|
319
|
-
`gmfQueryGrid` configuration variable.
|
320
|
-
|
321
|
-
Now you can easily switch between flush theme mode and non-flush theme mode by using
|
322
|
-
`gmfTreeManagerModeFlush` configuration variable.
|
323
|
-
|
324
|
-
Optional point
|
325
|
-
..............
|
326
|
-
|
327
|
-
The header can be in a separate file, diff in the `*.html.ejs` file:
|
328
|
-
|
329
|
-
- <header>
|
330
|
-
- <div class="logo">
|
331
|
-
- <span></span>
|
332
|
-
- </div>
|
333
|
-
- <div class="logo-right">
|
334
|
-
- <span></span>
|
335
|
-
- </div>
|
336
|
-
- </header>
|
337
|
-
+ <ng-include src="'desktop_alt/header.html'"></ng-include>
|
338
|
-
|
339
|
-
The content will be in the `geoportal/{{package}}_geoportal/static/header.html` file.
|
340
|
-
|
341
|
-
Print
|
342
|
-
-----
|
343
|
-
|
344
|
-
- You can now switch easily between local print and mutualised print by setting one
|
345
|
-
of `DISABLE_MUTUALIZED_PRINT` and `DISABLE_LOCAL_PRINT` environment variavle to '#' ant the other to ''.
|
346
|
-
- The client timezone is added as a new attribute named `timezone`, you can use it with e.-g.:
|
347
|
-
`java.time.ZonedDateTime.now().format(java.time.format.DateTimeFormatter
|
348
|
-
.ofPattern("EEEE dd MMMM yyyy HH:mm")
|
349
|
-
.withLocale($P{REPORT_LOCALE})
|
350
|
-
.withZone(java.time.ZoneId.of($P{timezone}))`
|
351
|
-
- If you use the most recent version of the `legend.jrxml` print template, you will obtain a legend with
|
352
|
-
elements indented hierarchically per groups level. If you want to keep the previous legend style, keep
|
353
|
-
your previous `legend.jrxml` template and add a new variable `gmfPrintOptions.legend.showGroupsTitle` in
|
354
|
-
the `interfaces_config` constants of the vars file and set it to false.
|
355
|
-
|
356
|
-
Editing
|
357
|
-
-------
|
358
|
-
|
359
|
-
- The default order column for edition enumeration lists is now the value column ("name" per
|
360
|
-
default). You can set it through the new `editingEnumerations` layer metadata.
|
361
|
-
|
362
|
-
QGIS server
|
363
|
-
-----------
|
364
|
-
|
365
|
-
- The runtime variables of the GeoMapFish configuration (geomapfish.yaml.tmpl) are now filled in the config
|
366
|
-
container, previously it was in the QGIS server container.
|
367
|
-
|
368
|
-
Tile generation
|
369
|
-
---------------
|
370
|
-
|
371
|
-
- Some commands are added to generate the OpenLayers example,
|
372
|
-
and the legend images used in the WMTS capabilities (but not used in the web application).
|
373
|
-
|
374
|
-
Redis
|
375
|
-
-----
|
376
|
-
|
377
|
-
- Redis can be used in a scalable architecture (with sentinel), this is disabled by default.
|
378
|
-
|
379
|
-
|
380
|
-
Changes to apply
|
381
|
-
================
|
382
|
-
|
383
|
-
1. All ngeo components are now configured via variables in your project variables file, in the section
|
384
|
-
interfaces_config. To ease future migration, you should remove any existing custom JavaScript code which is
|
385
|
-
setting such variables.
|
386
|
-
There is some new documentation about the constants in ngeo
|
387
|
-
https://camptocamp.github.io/ngeo/{{geomapfish_main_version}}/apidoc/index.html.
|
388
|
-
|
389
|
-
|
390
|
-
=============
|
391
|
-
Version 2.5.0
|
392
|
-
=============
|
393
|
-
|
394
|
-
Information
|
395
|
-
-----------
|
396
|
-
|
397
|
-
1. Basic authentication is disabled by default from this version onward.
|
398
|
-
To enable basic auth see:
|
399
|
-
https://camptocamp.github.io/c2cgeoportal/{{geomapfish_main_version}}/integrator/security.html#basic-auth
|
400
|
-
|
401
|
-
2. We change the secret name from `GITHUB_GOPASS_CI_TOKEN` to `GOPASS_CI_GITHUB_TOKEN` because we can't
|
402
|
-
anymore create create secret started with `GITHUB_`.
|
403
|
-
|
404
|
-
3. Layers which have any errors are not added to the theme anymore.
|
405
|
-
|
406
|
-
4. If a WMS version is given in an OGC server URL, it will be used for the GetCapabilities request
|
407
|
-
Supported versions: 1.1.1 and 1.3.0
|
408
|
-
|
409
|
-
Changes to apply
|
410
|
-
----------------
|
411
|
-
|
412
|
-
1. Now we need to have PyYAML python package installed in the home,
|
413
|
-
see the documentation for more information:
|
414
|
-
https://camptocamp.github.io/c2cgeoportal/{{geomapfish_main_version}}/integrator/requirements.html
|
415
|
-
|
416
|
-
2. The configuration vars `vars/functionalities/anonymous` and `vars/functionalities/registered` should
|
417
|
-
be moved to the new roles `anonymous` and `registered` that will be created once the database has been upgraded.
|
418
|
-
|
419
|
-
3. The 'INSTANCE' configuration variable is removed, it should be in the '.env' files, and also the
|
420
|
-
environment makefiles, these contents should also be moved to the '.env' files. In a multi-organization
|
421
|
-
project you can have a chain of multiple '.env' files see the build configuration documentation.
|
422
|
-
|
423
|
-
4. A new PostgreSQL extension is required, install it by running in psql:
|
424
|
-
`CREATE EXTENSION IF NOT EXISTS hstore;`
|
425
|
-
|
426
|
-
5. The static files will be moved, therefore you should replace:
|
427
|
-
`request.static_url('{{package}}_geoportal:static/` by:
|
428
|
-
`request.static_url('/etc/geomapfish/static/`.
|
429
|
-
|
430
|
-
6. Optional, change your mapfiles according the documentation:
|
431
|
-
https://camptocamp.github.io/c2cgeoportal/{{geomapfish_main_version}}/administrator/mapfile.html
|
432
|
-
|
433
|
-
|
434
|
-
Version 2.4.2
|
435
|
-
=============
|
436
|
-
|
437
|
-
Information
|
438
|
-
-----------
|
439
|
-
|
440
|
-
1. The SVG inclusion through Webpack has changed, See ngeo SVG example for more information:
|
441
|
-
https://camptocamp.github.io/ngeo/master/examples/svg.html
|
442
|
-
|
443
|
-
2. The WMTS capabilities is now generated on runtime.
|
444
|
-
|
445
|
-
3. If not already done the 'edit' and 'routing' interfaces and their relations will be removed from the
|
446
|
-
database, If you don't want that, you should rename the interfaces before applying the alembic scripts.
|
447
|
-
|
448
|
-
4. If not already done the 'api' and 'iframe_api' will be created. After the database upgrade you can run
|
449
|
-
the following request to fill e.-g. the api's interfaces with the desktop interface:
|
450
|
-
|
451
|
-
INSERT INTO main.interface_layer (interface_id, layer_id)
|
452
|
-
SELECT <api_interface_id>, layer_id FROM main.interface_layer WHERE interface_id = <other_interface_id>;
|
453
|
-
INSERT INTO main.interface_theme (interface_id, theme_id)
|
454
|
-
SELECT <api_interface_id>, theme_id FROM main.interface_theme WHERE interface_id = <other_interface_id>;
|
@@ -1,21 +0,0 @@
|
|
1
|
-
<%
|
2
|
-
import json
|
3
|
-
%>
|
4
|
-
(function() {
|
5
|
-
var module = angular.module('App${interface_name}');
|
6
|
-
% for name, value in constants.items():
|
7
|
-
module.constant('${name}', ${json.dumps(value) | n})
|
8
|
-
% endfor
|
9
|
-
|
10
|
-
% if do_redirect:
|
11
|
-
var small_screen = window.matchMedia ? window.matchMedia('(max-width: 1024px)') : false;
|
12
|
-
if (small_screen && (('ontouchstart' in window) || window.DocumentTouch && document instanceof DocumentTouch)) {
|
13
|
-
window.location = '${redirect_url | n}';
|
14
|
-
}
|
15
|
-
% endif
|
16
|
-
|
17
|
-
var gmfAbstractAppControllerModule = angular.module('GmfAbstractAppControllerModule');
|
18
|
-
% for name, value in other_constants.items():
|
19
|
-
gmfAbstractAppControllerModule.constant('${name}', ${json.dumps(value) | n})
|
20
|
-
% endfor
|
21
|
-
})();
|