c2cgeoportal-geoportal 2.5.0.100__py2.py3-none-any.whl → 2.7.1.83__py2.py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (224) hide show
  1. c2cgeoportal_geoportal/__init__.py +261 -130
  2. c2cgeoportal_geoportal/lib/__init__.py +72 -120
  3. c2cgeoportal_geoportal/lib/authentication.py +170 -21
  4. c2cgeoportal_geoportal/lib/bashcolor.py +17 -13
  5. c2cgeoportal_geoportal/lib/cacheversion.py +19 -11
  6. c2cgeoportal_geoportal/lib/caching.py +66 -160
  7. c2cgeoportal_geoportal/lib/check_collector.py +17 -10
  8. c2cgeoportal_geoportal/lib/checker.py +62 -64
  9. c2cgeoportal_geoportal/lib/common_headers.py +170 -0
  10. c2cgeoportal_geoportal/lib/dbreflection.py +70 -31
  11. c2cgeoportal_geoportal/lib/filter_capabilities.py +124 -96
  12. c2cgeoportal_geoportal/lib/fulltextsearch.py +50 -0
  13. c2cgeoportal_geoportal/lib/functionality.py +36 -21
  14. c2cgeoportal_geoportal/lib/headers.py +14 -5
  15. c2cgeoportal_geoportal/lib/i18n.py +39 -0
  16. c2cgeoportal_geoportal/lib/layers.py +29 -10
  17. c2cgeoportal_geoportal/lib/lingua_extractor.py +408 -211
  18. c2cgeoportal_geoportal/lib/loader.py +18 -16
  19. c2cgeoportal_geoportal/lib/metrics.py +29 -18
  20. c2cgeoportal_geoportal/lib/oauth2.py +1036 -0
  21. c2cgeoportal_geoportal/lib/wmstparsing.py +115 -90
  22. c2cgeoportal_geoportal/lib/xsd.py +29 -19
  23. c2cgeoportal_geoportal/resources.py +15 -9
  24. c2cgeoportal_geoportal/scaffolds/advance_create/ci/config.yaml +26 -0
  25. c2cgeoportal_geoportal/scaffolds/advance_create/cookiecutter.json +18 -0
  26. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/.dockerignore +6 -0
  27. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/.eslintrc.yaml +19 -0
  28. c2cgeoportal_geoportal/scaffolds/{create/+dot+prospector.yaml → advance_create/{{cookiecutter.project}}/geoportal/.prospector.yaml} +8 -4
  29. c2cgeoportal_geoportal/scaffolds/{create/geoportal/Dockerfile_tmpl → advance_create/{{cookiecutter.project}}/geoportal/Dockerfile} +24 -15
  30. c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/alembic.ini +1 -0
  31. c2cgeoportal_geoportal/scaffolds/{create/geoportal/alembic.yaml_tmpl → advance_create/{{cookiecutter.project}}/geoportal/alembic.yaml} +1 -1
  32. c2cgeoportal_geoportal/scaffolds/{create/geoportal/development.ini_tmpl → advance_create/{{cookiecutter.project}}/geoportal/development.ini} +34 -15
  33. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/gunicorn.conf.py +104 -0
  34. c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/lingua-client.cfg +1 -0
  35. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/production.ini +38 -0
  36. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/requirements.txt +2 -0
  37. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/setup.py +25 -0
  38. c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/tools/extract-messages.js +8 -6
  39. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/tsconfig.json +8 -0
  40. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/webpack.api.js +75 -0
  41. c2cgeoportal_geoportal/scaffolds/{create/geoportal/webpack.apps.js_tmpl → advance_create/{{cookiecutter.project}}/geoportal/webpack.apps.js} +31 -28
  42. c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/webpack.commons.js +3 -7
  43. c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/webpack.config.js +4 -4
  44. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/__init__.py +47 -0
  45. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/authentication.py +10 -0
  46. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/dev.py +14 -0
  47. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/models.py +8 -0
  48. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/multi_organization.py +7 -0
  49. c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/resources.py +4 -3
  50. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/api/index.js +12 -0
  51. c2cgeoportal_geoportal/scaffolds/advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static-ngeo/js/{{cookiecutter.package}}module.js +25 -0
  52. c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal/subscribers.py_tmpl → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/subscribers.py} +3 -6
  53. c2cgeoportal_geoportal/scaffolds/advance_update/cookiecutter.json +18 -0
  54. c2cgeoportal_geoportal/scaffolds/{update/geoportal/CONST_Makefile_tmpl → advance_update/{{cookiecutter.project}}/geoportal/CONST_Makefile} +32 -20
  55. c2cgeoportal_geoportal/scaffolds/create/cookiecutter.json +18 -0
  56. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.dockerignore +14 -0
  57. c2cgeoportal_geoportal/scaffolds/create/{+dot+editorconfig → {{cookiecutter.project}}/.editorconfig} +4 -8
  58. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/main.yaml +43 -0
  59. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/rebuild.yaml +46 -0
  60. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.github/workflows/update_l10n.yaml +65 -0
  61. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.gitignore +16 -0
  62. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierignore +1 -0
  63. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/.prettierrc.yaml +2 -0
  64. c2cgeoportal_geoportal/scaffolds/create/{Dockerfile_tmpl → {{cookiecutter.project}}/Dockerfile} +34 -24
  65. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/Makefile +14 -0
  66. c2cgeoportal_geoportal/scaffolds/create/{README.rst_tmpl → {{cookiecutter.project}}/README.rst} +4 -4
  67. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/build +158 -0
  68. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/config.yaml +25 -0
  69. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/ci/requirements.txt +1 -0
  70. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose-lib.yaml +474 -0
  71. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/docker-compose.override.sample.yaml +66 -0
  72. c2cgeoportal_geoportal/scaffolds/create/{docker-compose.yaml → {{cookiecutter.project}}/docker-compose.yaml} +43 -18
  73. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.default +82 -0
  74. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/env.project +60 -0
  75. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/vars.yaml +396 -0
  76. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/css/mobile.css +0 -0
  77. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/images/markers/marker-blue.png +0 -0
  78. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/images/markers/marker-gold.png +0 -0
  79. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/images/markers/marker-green.png +0 -0
  80. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/images/markers/marker.png +0 -0
  81. c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/data/Readme.txt +1 -1
  82. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/mapserver/demo.map.tmpl +224 -0
  83. c2cgeoportal_geoportal/scaffolds/create/{mapserver/mapserver.map.tmpl_tmpl → {{cookiecutter.project}}/mapserver/mapserver.map.tmpl} +7 -15
  84. c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A3_Landscape.jrxml +17 -9
  85. c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A3_Portrait.jrxml +17 -9
  86. c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A4_Landscape.jrxml +17 -9
  87. c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/A4_Portrait.jrxml +17 -9
  88. c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/config.yaml.tmpl +30 -27
  89. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/legend.jrxml +109 -0
  90. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/localisation.properties +4 -0
  91. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}/localisation_fr.properties +4 -0
  92. c2cgeoportal_geoportal/scaffolds/create/{project.yaml_tmpl → {{cookiecutter.project}}/project.yaml} +6 -6
  93. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/pyproject.toml +3 -0
  94. c2cgeoportal_geoportal/scaffolds/create/{qgisserver/pg_service.conf.tmpl_tmpl → {{cookiecutter.project}}/qgisserver/pg_service.conf.tmpl} +2 -2
  95. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-backup +107 -0
  96. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/scripts/db-restore +111 -0
  97. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/setup.cfg +7 -0
  98. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/spell-ignore-words.txt +3 -0
  99. c2cgeoportal_geoportal/scaffolds/create/{{cookiecutter.project}}/tilegeneration/config.yaml.tmpl +195 -0
  100. c2cgeoportal_geoportal/scaffolds/update/cookiecutter.json +18 -0
  101. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/.upgrade.yaml +191 -0
  102. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/CONST_CHANGELOG.txt +1153 -0
  103. c2cgeoportal_geoportal/scaffolds/update/{geoportal → {{cookiecutter.project}}/geoportal}/CONST_config-schema.yaml +99 -47
  104. c2cgeoportal_geoportal/scaffolds/update/{{cookiecutter.project}}/geoportal/CONST_vars.yaml +1412 -0
  105. c2cgeoportal_geoportal/scripts/__init__.py +17 -33
  106. c2cgeoportal_geoportal/scripts/c2cupgrade.py +295 -200
  107. c2cgeoportal_geoportal/scripts/create_demo_theme.py +5 -6
  108. c2cgeoportal_geoportal/scripts/manage_users.py +34 -37
  109. c2cgeoportal_geoportal/scripts/pcreate.py +312 -0
  110. c2cgeoportal_geoportal/scripts/theme2fts.py +92 -25
  111. c2cgeoportal_geoportal/scripts/urllogin.py +23 -17
  112. c2cgeoportal_geoportal/templates/login.html +88 -84
  113. c2cgeoportal_geoportal/templates/notlogin.html +62 -0
  114. c2cgeoportal_geoportal/templates/testi18n.html +6 -8
  115. c2cgeoportal_geoportal/views/__init__.py +23 -4
  116. c2cgeoportal_geoportal/views/dev.py +9 -7
  117. c2cgeoportal_geoportal/views/dynamic.py +70 -40
  118. c2cgeoportal_geoportal/views/entry.py +93 -24
  119. c2cgeoportal_geoportal/views/fulltextsearch.py +36 -29
  120. c2cgeoportal_geoportal/views/geometry_processing.py +15 -7
  121. c2cgeoportal_geoportal/views/i18n.py +91 -9
  122. c2cgeoportal_geoportal/views/layers.py +173 -134
  123. c2cgeoportal_geoportal/views/login.py +206 -87
  124. c2cgeoportal_geoportal/views/mapserverproxy.py +59 -35
  125. c2cgeoportal_geoportal/views/memory.py +13 -13
  126. c2cgeoportal_geoportal/views/ogcproxy.py +48 -30
  127. c2cgeoportal_geoportal/views/pdfreport.py +31 -27
  128. c2cgeoportal_geoportal/views/printproxy.py +67 -53
  129. c2cgeoportal_geoportal/views/profile.py +25 -24
  130. c2cgeoportal_geoportal/views/proxy.py +97 -68
  131. c2cgeoportal_geoportal/views/raster.py +47 -29
  132. c2cgeoportal_geoportal/views/resourceproxy.py +13 -11
  133. c2cgeoportal_geoportal/views/shortener.py +31 -24
  134. c2cgeoportal_geoportal/views/theme.py +475 -365
  135. c2cgeoportal_geoportal/views/tinyowsproxy.py +46 -39
  136. c2cgeoportal_geoportal/views/vector_tiles.py +80 -0
  137. {c2cgeoportal_geoportal-2.5.0.100.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/METADATA +16 -11
  138. c2cgeoportal_geoportal-2.7.1.83.dist-info/RECORD +185 -0
  139. {c2cgeoportal_geoportal-2.5.0.100.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/WHEEL +1 -1
  140. {c2cgeoportal_geoportal-2.5.0.100.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/entry_points.txt +3 -1
  141. tests/__init__.py +24 -3
  142. tests/test_cachebuster.py +1 -3
  143. tests/test_caching.py +19 -26
  144. tests/test_checker.py +2 -3
  145. tests/test_decimaljson.py +4 -4
  146. tests/test_headerstween.py +0 -3
  147. tests/test_i18n.py +31 -0
  148. tests/test_init.py +12 -27
  149. tests/test_locale_negociator.py +6 -6
  150. tests/test_mapserverproxy_route_predicate.py +0 -2
  151. tests/test_raster.py +18 -5
  152. tests/test_wmstparsing.py +7 -8
  153. c2cgeoportal_geoportal/scaffolds/__init__.py +0 -226
  154. c2cgeoportal_geoportal/scaffolds/create/+dot+dockerignore_tmpl +0 -11
  155. c2cgeoportal_geoportal/scaffolds/create/+dot+github/workflows/ci.yaml_tmpl +0 -56
  156. c2cgeoportal_geoportal/scaffolds/create/+dot+gitignore_tmpl +0 -12
  157. c2cgeoportal_geoportal/scaffolds/create/build_tmpl +0 -144
  158. c2cgeoportal_geoportal/scaffolds/create/docker-compose-lib.yaml_tmpl +0 -302
  159. c2cgeoportal_geoportal/scaffolds/create/docker-compose.override.sample.yaml_tmpl +0 -54
  160. c2cgeoportal_geoportal/scaffolds/create/env.default_tmpl +0 -49
  161. c2cgeoportal_geoportal/scaffolds/create/env.project_tmpl +0 -39
  162. c2cgeoportal_geoportal/scaffolds/create/geoportal/+dot+dockerignore_tmpl +0 -5
  163. c2cgeoportal_geoportal/scaffolds/create/geoportal/+dot+eslintrc_tmpl +0 -19
  164. c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/__init__.py_tmpl +0 -48
  165. c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/models.py_tmpl +0 -10
  166. c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/static/images/favicon.ico +0 -0
  167. c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/static/robot.txt +0 -3
  168. c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/static-ngeo/api/index.js_tmpl +0 -37
  169. c2cgeoportal_geoportal/scaffolds/create/geoportal/+package+_geoportal/static-ngeo/js/+package+module.js_tmpl +0 -22
  170. c2cgeoportal_geoportal/scaffolds/create/geoportal/production.ini_tmpl +0 -106
  171. c2cgeoportal_geoportal/scaffolds/create/geoportal/requirements.txt +0 -2
  172. c2cgeoportal_geoportal/scaffolds/create/geoportal/setup.py_tmpl +0 -18
  173. c2cgeoportal_geoportal/scaffolds/create/geoportal/tsconfig.json_tmpl +0 -9
  174. c2cgeoportal_geoportal/scaffolds/create/geoportal/vars.yaml_tmpl +0 -224
  175. c2cgeoportal_geoportal/scaffolds/create/geoportal/webpack.api.js_tmpl +0 -71
  176. c2cgeoportal_geoportal/scaffolds/create/mapserver/demo.map.tmpl_tmpl +0 -262
  177. c2cgeoportal_geoportal/scaffolds/create/mapserver/tinyows.xml +0 -36
  178. c2cgeoportal_geoportal/scaffolds/create/print/print-apps/+package+/config.yaml +0 -166
  179. c2cgeoportal_geoportal/scaffolds/create/print/print-apps/+package+/legend.jrxml +0 -27
  180. c2cgeoportal_geoportal/scaffolds/create/qgisserver/geomapfish.yaml.tmpl_tmpl +0 -29
  181. c2cgeoportal_geoportal/scaffolds/create/scripts/publish-docker +0 -124
  182. c2cgeoportal_geoportal/scaffolds/create/setup.cfg_tmpl +0 -3
  183. c2cgeoportal_geoportal/scaffolds/create/spell-ignore-words.txt +0 -1
  184. c2cgeoportal_geoportal/scaffolds/create/tilegeneration/config.yaml.tmpl_tmpl +0 -169
  185. c2cgeoportal_geoportal/scaffolds/create/yamllint.yaml +0 -11
  186. c2cgeoportal_geoportal/scaffolds/update/+dot+upgrade.yaml_tmpl +0 -171
  187. c2cgeoportal_geoportal/scaffolds/update/CONST_CHANGELOG.txt_tmpl +0 -64
  188. c2cgeoportal_geoportal/scaffolds/update/geoportal/CONST_vars.yaml_tmpl +0 -783
  189. c2cgeoportal_geoportal/templates/dynamic.js +0 -21
  190. c2cgeoportal_geoportal-2.5.0.100.dist-info/RECORD +0 -162
  191. tests/test_get_url.py +0 -96
  192. tests/test_lib.py +0 -77
  193. /c2cgeoportal_geoportal/{scaffolds/create/geoportal/+package+_geoportal/static/css/desktop.css → py.typed} +0 -0
  194. /c2cgeoportal_geoportal/scaffolds/{create/geoportal/Makefile_tmpl → advance_create/{{cookiecutter.project}}/geoportal/Makefile} +0 -0
  195. /c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/language_mapping +0 -0
  196. /c2cgeoportal_geoportal/scaffolds/{create → advance_create/{{cookiecutter.project}}}/geoportal/lingua-server.cfg +0 -0
  197. /c2cgeoportal_geoportal/scaffolds/{create/geoportal/+package+_geoportal → advance_create/{{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/views/__init__.py +0 -0
  198. /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
  199. /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal/static/css/iframe_api.css → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/css/desktop.css} +0 -0
  200. /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal/static/css/mobile.css → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal/static/css/iframe_api.css} +0 -0
  201. /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/banner_left.png +0 -0
  202. /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/banner_right.png +0 -0
  203. /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/images/blank.png +0 -0
  204. /c2cgeoportal_geoportal/scaffolds/create/{geoportal/+package+_geoportal → {{cookiecutter.project}}/geoportal/{{cookiecutter.package}}_geoportal}/static/robot.txt.tmpl +0 -0
  205. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/data/TM_EUROPE_BORDERS-0.3.sql +0 -0
  206. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Arial.ttf +0 -0
  207. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Arialbd.ttf +0 -0
  208. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Arialbi.ttf +0 -0
  209. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Ariali.ttf +0 -0
  210. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-Bold.ttf +0 -0
  211. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-BoldItalic.ttf +0 -0
  212. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-Italic.ttf +0 -0
  213. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/NotoSans-Regular.ttf +0 -0
  214. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdana.ttf +0 -0
  215. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdanab.ttf +0 -0
  216. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdanai.ttf +0 -0
  217. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts/Verdanaz.ttf +0 -0
  218. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/fonts.conf +0 -0
  219. /c2cgeoportal_geoportal/scaffolds/create/{mapserver → {{cookiecutter.project}}/mapserver}/tinyows.xml.tmpl +0 -0
  220. /c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/logo.png +0 -0
  221. /c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/north.svg +0 -0
  222. /c2cgeoportal_geoportal/scaffolds/create/{print/print-apps/+package+ → {{cookiecutter.project}}/print/print-apps/{{cookiecutter.package}}}/results.jrxml +0 -0
  223. /c2cgeoportal_geoportal/scaffolds/create/{run_alembic.sh → {{cookiecutter.project}}/run_alembic.sh} +0 -0
  224. {c2cgeoportal_geoportal-2.5.0.100.dist-info → c2cgeoportal_geoportal-2.7.1.83.dist-info}/top_level.txt +0 -0
@@ -42,7 +42,7 @@ CHANGELOG VERSION 0.2 - 1 April 2008
42
42
  CHANGELOG VERSION 0.1 - 13 March 2008
43
43
 
44
44
  - Polygons representing each country were merged into one feature
45
- - �land Islands was extracted from Finland
45
+ - Åland Islands was extracted from Finland
46
46
  - Hong Kong was extracted from China
47
47
  - Holy See (Vatican City) was added
48
48
  - Gaza Strip and West Bank was merged into "Occupied Palestinean Territory"
@@ -0,0 +1,224 @@
1
+ # This file is used to render the examples layers, it can be deleted.
2
+ # Layer without any restriction
3
+ LAYER
4
+ NAME "borders"
5
+ TYPE POLYGON
6
+ STATUS ON
7
+ TOLERANCE 10
8
+ TOLERANCEUNITS PIXELS
9
+ TEMPLATE "fooOnlyForWMSGetFeatureInfo" # For GetFeatureInfo
10
+ EXTENT -31 27 45 71 # Useful for better performance but not mandatory
11
+ CONNECTIONTYPE POSTGIS
12
+ PROCESSING "CLOSE_CONNECTION=DEFER"
13
+ CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} sslmode=${PGSSLMODE} user=${PGUSER} password=${PGPASSWORD} dbname=${PGDATABASE}"
14
+ DATA "geom FROM (SELECT geo.* FROM data.europe_borders as geo) as foo USING unique gid USING srid=4326"
15
+ PROJECTION
16
+ "init=epsg:4326"
17
+ END
18
+ METADATA
19
+ "wms_title" "Borders of Europe" # For WMS
20
+ "wms_srs" "EPSG:{{cookiecutter.srid}}" # For WMS
21
+ "wfs_enable_request" "*" # Enable WFS for this layer
22
+ "gml_include_items" "all" # For GetFeatureInfo and WFS GetFeature (QueryBuilder)
23
+ "ows_geom_type" "multipolygon" # For returning geometries in GetFeatureInfo
24
+ "ows_geometries" "geom" # For returning geometries in GetFeatureInfo
25
+ "wms_metadataurl_href" "https://www.example.com/bar" # For metadata URL
26
+ "wms_metadataurl_format" "text/html" # For metadata URL
27
+ "wms_metadataurl_type" "TC211" # For metadata URL
28
+ END
29
+ CLASS
30
+ NAME "borders"
31
+ STYLE
32
+ OUTLINECOLOR 0 0 0
33
+ END
34
+ END
35
+ END
36
+ # Layer with restriction area
37
+ LAYER
38
+ NAME "density"
39
+ TYPE POLYGON
40
+ STATUS ON
41
+ TOLERANCE 10
42
+ TOLERANCEUNITS PIXELS
43
+ TEMPLATE "fooOnlyForWMSGetFeatureInfo" # For GetFeatureInfo
44
+ EXTENT -31 27 45 71
45
+ CONNECTIONTYPE POSTGIS
46
+ PROCESSING "CLOSE_CONNECTION=DEFER"
47
+ CONNECTION "host=${PGHOST_SLAVE} port=${PGPORT_SLAVE} sslmode=${PGSSLMODE} user=${PGUSER} password=${PGPASSWORD} dbname=${PGDATABASE}"
48
+ DATA "geom FROM (SELECT geo.*, (pop2005/(area*10)) AS density FROM data.europe_borders AS geo WHERE ARRAY[%role_ids%]::integer[] && ARRAY(${MAPSERVER_DATA_NOAREA_SUBSELECT} 'density')) as foo USING unique gid USING srid=4326"
49
+ PROJECTION
50
+ "init=epsg:4326"
51
+ END
52
+ VALIDATION
53
+ "default_role_ids" ""
54
+ "role_ids" "^-?[0-9,]*$"
55
+ END
56
+ METADATA
57
+ "wms_title" "Density of population" # For WMS
58
+ "wms_srs" "EPSG:{{cookiecutter.srid}}" # For WMS
59
+ "wfs_enable_request" "*" # Enable WFS for this layer
60
+ "gml_include_items" "all" # For GetFeatureInfo and WFS GetFeature (QueryBuilder)
61
+ "ows_geom_type" "multipolygon" # For returning geometries in GetFeatureInfo
62
+ "ows_geometries" "geom" # For returning geometries in GetFeatureInfo
63
+ "wms_metadataurl_href" "https://www.example.com/bar" # For metadata URL
64
+ "wms_metadataurl_format" "text/html" # For metadata URL
65
+ "wms_metadataurl_type" "TC211" # For metadata URL
66
+ END
67
+ LABELITEM "name"
68
+ CLASS
69
+ NAME "[ 6 - 50 ["
70
+ EXPRESSION ( [density] < 49.73 )
71
+ STYLE
72
+ OUTLINECOLOR 0 0 0
73
+ COLOR 254 229 217
74
+ END
75
+ LABEL
76
+ COLOR 0 0 0
77
+ FONT "noto_bold"
78
+ TYPE TRUETYPE
79
+ SIZE 8
80
+ OUTLINEWIDTH 2
81
+ POSITION AUTO
82
+ PARTIALS FALSE
83
+ OUTLINECOLOR 253 247 244
84
+ MINFEATURESIZE 8
85
+ MINDISTANCE 1000
86
+ BUFFER 10
87
+ END
88
+ LEADER
89
+ GRIDSTEP 400 # number of pixels between positions that are tested
90
+ MAXDISTANCE 300 # distance in pixels that leader text can be drawn
91
+ STYLE
92
+ COLOR 255 255 255 # normal line styles are supported
93
+ WIDTH 3
94
+ END
95
+ END
96
+ END
97
+ CLASS
98
+ NAME "[ 50 - 92 ["
99
+ EXPRESSION ( ( [density] >= 49.73 ) AND ( [density] < 91.94 ) )
100
+ STYLE
101
+ OUTLINECOLOR 0 0 0
102
+ COLOR 252 174 145
103
+ END
104
+ LABEL
105
+ COLOR 0 0 0
106
+ FONT "noto_bold"
107
+ TYPE TRUETYPE
108
+ SIZE 8
109
+ OUTLINEWIDTH 2
110
+ POSITION AUTO
111
+ PARTIALS FALSE
112
+ OUTLINECOLOR 252 223 213
113
+ MINFEATURESIZE 8
114
+ MINDISTANCE 1000
115
+ BUFFER 10
116
+ END
117
+ LEADER
118
+ GRIDSTEP 400 # number of pixels between positions that are tested
119
+ MAXDISTANCE 300 # distance in pixels that leader text can be drawn
120
+ STYLE
121
+ COLOR 255 255 255 # normal line styles are supported
122
+ WIDTH 3
123
+ END
124
+ END
125
+ END
126
+ CLASS
127
+ NAME "[ 92 - 115 ["
128
+ EXPRESSION ( ( [density] >= 91.94 ) AND ( [density] < 115.08 ) )
129
+ STYLE
130
+ OUTLINECOLOR 0 0 0
131
+ COLOR 251 106 74
132
+ END
133
+ LABEL
134
+ COLOR 0 0 0
135
+ FONT "noto_bold"
136
+ TYPE TRUETYPE
137
+ SIZE 8
138
+ OUTLINEWIDTH 2
139
+ POSITION AUTO
140
+ PARTIALS FALSE
141
+ OUTLINECOLOR 251 220 213
142
+ MINFEATURESIZE 8
143
+ MINDISTANCE 1000
144
+ BUFFER 10
145
+ END
146
+ LEADER
147
+ GRIDSTEP 40 # number of pixels between positions that are tested
148
+ MAXDISTANCE 300 # distance in pixels that leader text can be drawn
149
+ STYLE
150
+ COLOR 255 255 255 # normal line styles are supported
151
+ WIDTH 3
152
+ END
153
+ END
154
+ END
155
+ CLASS
156
+ NAME "[ 115 - 210 ["
157
+ EXPRESSION ( ( [density] >= 115.08 ) AND ( [density] < 210.11 ) )
158
+ STYLE
159
+ OUTLINECOLOR 0 0 0
160
+ COLOR 222 45 38
161
+ END
162
+ LABEL
163
+ COLOR 0 0 0
164
+ FONT "noto_bold"
165
+ TYPE TRUETYPE
166
+ SIZE 8
167
+ OUTLINEWIDTH 2
168
+ POSITION AUTO
169
+ PARTIALS FALSE
170
+ OUTLINECOLOR 237 189 187
171
+ MINFEATURESIZE 8
172
+ MINDISTANCE 1000
173
+ BUFFER 10
174
+ END
175
+ LEADER
176
+ GRIDSTEP 40 # number of pixels between positions that are tested
177
+ MAXDISTANCE 300 # distance in pixels that leader text can be drawn
178
+ STYLE
179
+ COLOR 255 255 255 # normal line styles are supported
180
+ WIDTH 3
181
+ END
182
+ END
183
+ END
184
+ CLASS
185
+ NAME "[ 210 - 18 475 ]"
186
+ EXPRESSION ( ( [density] >= 210 ) AND ( [density] <= 18475 ) )
187
+ STYLE
188
+ OUTLINECOLOR 0 0 0
189
+ COLOR 165 15 21
190
+ END
191
+ LABEL
192
+ COLOR 0 0 0
193
+ FONT "noto_bold"
194
+ TYPE TRUETYPE
195
+ SIZE 8
196
+ OUTLINEWIDTH 2
197
+ POSITION AUTO
198
+ PARTIALS FALSE
199
+ OUTLINECOLOR 208 184 185
200
+ MINFEATURESIZE 8
201
+ MINDISTANCE 1000
202
+ BUFFER 10
203
+ END
204
+ LEADER
205
+ GRIDSTEP 40 # number of pixels between positions that are tested
206
+ MAXDISTANCE 300 # distance in pixels that leader text can be drawn
207
+ STYLE
208
+ COLOR 255 255 255 # normal line styles are supported
209
+ WIDTH 3
210
+ END
211
+ END
212
+ END
213
+ END
214
+ # Raster layer (with a tile index)
215
+ LAYER
216
+ NAME "topo"
217
+ GROUP "plan"
218
+ TYPE RASTER
219
+ STATUS ON
220
+ PROCESSING "RESAMPLE=AVERAGE"
221
+ TILEINDEX "raster/topo"
222
+ TILEITEM "LOCATION"
223
+ MINSCALEDENOM 25000
224
+ END
@@ -12,15 +12,14 @@
12
12
  # WMS GetFeatureInfo:
13
13
  # /mapserv?service=wms&version=1.1.1&request=getfeatureinfo&bbox=-180,-90,180,90&layers=countries&query_layers=countries&width=600&height=400&srs=EPSG:4326&format=image/png&x=180&y=90&info_format=application/vnd.ogc.gml
14
14
  #
15
-
16
15
  MAP
17
- NAME "{{package}}"
16
+ NAME "{{cookiecutter.package}}"
18
17
 
19
18
  # For Windows users: uncomment this line and adapt it to your
20
19
  # own mapserver's nad folder (use regular slash "/")
21
20
  # CONFIG "PROJ_LIB" "C:/path/to/ms4w/proj/nad"
22
21
 
23
- EXTENT {{extent_mapserver}} ## should be defined for better performance
22
+ EXTENT {{cookiecutter.extent_mapserver}} ## should be defined for better performance
24
23
  UNITS METERS
25
24
 
26
25
  # RESOLUTION and DEFRESOLUTION default to 96. If you
@@ -32,7 +31,6 @@ MAP
32
31
 
33
32
  # MAXSIZE should not be less than 5000 for MF print on A3
34
33
  MAXSIZE 5000
35
-
36
34
  IMAGECOLOR 255 255 255
37
35
  STATUS ON
38
36
 
@@ -45,17 +43,16 @@ MAP
45
43
  CONFIG "GDAL_DISABLE_READDIR_ON_OPEN" "TRUE"
46
44
 
47
45
  OUTPUTFORMAT
48
- NAME jpeg
46
+ NAME "jpeg"
49
47
  DRIVER "AGG/JPEG"
50
48
  MIMETYPE "image/jpeg"
51
49
  IMAGEMODE RGB
52
50
  EXTENSION "jpeg"
53
51
  FORMATOPTION "QUALITY=75,PROGRESSIVE=TRUE"
54
52
  END
55
-
56
53
  OUTPUTFORMAT
57
- NAME png
58
- DRIVER AGG/PNG
54
+ NAME "png"
55
+ DRIVER "AGG/PNG"
59
56
  MIMETYPE "image/png"
60
57
  IMAGEMODE RGBA
61
58
  EXTENSION "png"
@@ -64,24 +61,21 @@ MAP
64
61
  FORMATOPTION "QUANTIZE_FORCE=ON"
65
62
  FORMATOPTION "QUANTIZE_COLORS=256"
66
63
  END
67
-
68
64
  PROJECTION
69
- "init=epsg:{{srid}}"
65
+ "init=epsg:{{cookiecutter.srid}}"
70
66
  END
71
-
72
67
  WEB
73
68
  METADATA
74
69
  "wms_title" "changeme"
75
70
  "wms_abstract" "changeme"
76
71
  "ows_onlineresource" "${VISIBLE_WEB_PROTOCOL}://${VISIBLE_WEB_HOST}${VISIBLE_ENTRY_POINT}mapserv_proxy?ogcserver=source%20for%20image%2Fpng"
77
- "wms_srs" "EPSG:{{srid}}"
72
+ "wms_srs" "EPSG:{{cookiecutter.srid}}"
78
73
  "wms_encoding" "UTF-8"
79
74
  "wms_enable_request" "*"
80
75
  "wfs_enable_request" "!*"
81
76
  "wfs_encoding" "UTF-8"
82
77
  END
83
78
  END
84
-
85
79
  LEGEND
86
80
  LABEL
87
81
  ENCODING "UTF-8"
@@ -90,7 +84,5 @@ MAP
90
84
  SIZE 9
91
85
  END
92
86
  END
93
-
94
87
  INCLUDE "demo.map"
95
-
96
88
  END
@@ -10,6 +10,7 @@
10
10
  <parameter name="numberOfLegendRows" class="java.lang.Integer"/>
11
11
  <parameter name="scalebarSubReport" class="java.lang.String"/>
12
12
  <parameter name="northArrowSubReport" class="java.lang.String"/>
13
+ <parameter name="timezone" class="java.lang.String"/>
13
14
  <parameter name="jrDataSource" class="net.sf.jasperreports.engine.JRDataSource"/>
14
15
  <parameter name="mapContext" class="org.mapfish.print.attribute.map.MapfishMapContext"/>
15
16
  <pageHeader>
@@ -36,7 +37,14 @@
36
37
  <textElement textAlignment="Right">
37
38
  <font size="8"/>
38
39
  </textElement>
39
- <textFieldExpression><![CDATA["Le " + new SimpleDateFormat("EEEEE dd MMMMM yyyy", new Locale("fr")).format(new Date())]]></textFieldExpression>
40
+ <textFieldExpression><![CDATA[
41
+ $R{date_pre} + " " + java.time.ZonedDateTime.now().format(
42
+ java.time.format.DateTimeFormatter.
43
+ ofPattern("EEEE dd MMMM yyyy HH:mm").
44
+ withLocale($P{REPORT_LOCALE}).
45
+ withZone(java.time.ZoneId.of($P{timezone}))
46
+ )
47
+ ]]></textFieldExpression>
40
48
  </textField>
41
49
  <textField>
42
50
  <reportElement x="180" y="2" width="365" height="20" uuid="953c0d72-060f-4ed9-9b6b-9e26da551dbe">
@@ -95,7 +103,7 @@
95
103
  <textFieldExpression><![CDATA[String.format("1: %,.0f",
96
104
  $P{mapContext}.getScale().getDenominator()).replace(",","\'")]]></textFieldExpression>
97
105
  </textField>
98
- <textField isStretchWithOverflow="true">
106
+ <textField textAdjust="StretchHeight">
99
107
  <reportElement x="0" y="684" width="950" height="23" uuid="b14dbd4b-e887-454e-9dcd-293e29fb4b04"/>
100
108
  <textFieldExpression><![CDATA[$P{comments}]]></textFieldExpression>
101
109
  </textField>
@@ -145,13 +153,13 @@ $P{mapContext}.getScale().getDenominator()).replace(",","\'")]]></textFieldExpre
145
153
  </textElement>
146
154
  <text><![CDATA[Detail band 3]]></text>
147
155
  </staticText>
148
- <staticText>
156
+ <textField>
149
157
  <reportElement x="0" y="1" width="460" height="20" forecolor="#424242" uuid="385742e7-a286-4456-b687-395a1a540023"/>
150
158
  <textElement>
151
159
  <font size="16" isBold="true"/>
152
160
  </textElement>
153
- <text><![CDATA[LÉGENDE]]></text>
154
- </staticText>
161
+ <textFieldExpression><![CDATA[$R{legend}]]></textFieldExpression>
162
+ </textField>
155
163
  <subreport>
156
164
  <reportElement stretchType="RelativeToTallestObject" x="0" y="26" width="1150" height="56" uuid="6a01e0f0-7ebb-40f6-97eb-2979e6fff149"/>
157
165
  <dataSourceExpression><![CDATA[$P{legendDataSource}]]></dataSourceExpression>
@@ -175,14 +183,14 @@ $P{mapContext}.getScale().getDenominator()).replace(",","\'")]]></textFieldExpre
175
183
  </textElement>
176
184
  <text><![CDATA[Pied de page, sur chaque page]]></text>
177
185
  </staticText>
178
- <staticText>
186
+ <textField>
179
187
  <reportElement x="0" y="1" width="300" height="14" uuid="54e7e518-a3ee-41f1-b000-9550cad968e1"/>
180
- <text><![CDATA[Développé par Camptocamp SA, info@camptocamp.com]]></text>
181
- </staticText>
188
+ <textFieldExpression><![CDATA[$R{info}]]></textFieldExpression>
189
+ </textField>
182
190
  <textField>
183
191
  <reportElement x="1087" y="21" width="38" height="30" uuid="7db93d89-f1a1-4135-8143-661152955717"/>
184
192
  <textElement textAlignment="Right" verticalAlignment="Bottom"/>
185
- <textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER}]]></textFieldExpression>
193
+ <textFieldExpression><![CDATA[$R{page} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
186
194
  </textField>
187
195
  <textField evaluationTime="Report">
188
196
  <reportElement x="1125" y="21" width="22" height="30" uuid="c3450c45-a812-40a4-9a5e-c62dd7cef852"/>
@@ -10,6 +10,7 @@
10
10
  <parameter name="numberOfLegendRows" class="java.lang.Integer"/>
11
11
  <parameter name="scalebarSubReport" class="java.lang.String"/>
12
12
  <parameter name="northArrowSubReport" class="java.lang.String"/>
13
+ <parameter name="timezone" class="java.lang.String"/>
13
14
  <parameter name="jrDataSource" class="net.sf.jasperreports.engine.JRDataSource"/>
14
15
  <pageHeader>
15
16
  <band height="28">
@@ -38,7 +39,14 @@
38
39
  <textElement textAlignment="Right">
39
40
  <font size="8"/>
40
41
  </textElement>
41
- <textFieldExpression><![CDATA["Le " + new SimpleDateFormat("EEEEE dd MMMMM yyyy", new Locale("fr")).format(new Date())]]></textFieldExpression>
42
+ <textFieldExpression><![CDATA[
43
+ $R{date_pre} + " " + java.time.ZonedDateTime.now().format(
44
+ java.time.format.DateTimeFormatter.
45
+ ofPattern("EEEE dd MMMM yyyy HH:mm").
46
+ withLocale($P{REPORT_LOCALE}).
47
+ withZone(java.time.ZoneId.of($P{timezone}))
48
+ )
49
+ ]]></textFieldExpression>
42
50
  </textField>
43
51
  <line>
44
52
  <reportElement x="0" y="25" width="800" height="1" forecolor="#FA7500" uuid="ce77e4cd-7737-4406-bb3e-8186f123125e">
@@ -80,7 +88,7 @@
80
88
  <reportElement x="5" y="650" width="150" height="20" uuid="756bf319-bd30-49bd-9e3d-631b5b6f2b6b"/>
81
89
  <subreportExpression><![CDATA[$P{scalebarSubReport}]]></subreportExpression>
82
90
  </subreport>
83
- <textField isStretchWithOverflow="true">
91
+ <textField textAdjust="StretchHeight">
84
92
  <reportElement x="0" y="680" width="798" height="37" uuid="ea3e251d-bbb2-48ac-b144-4505165208e0"/>
85
93
  <textFieldExpression><![CDATA[$P{comments}]]></textFieldExpression>
86
94
  </textField>
@@ -119,13 +127,13 @@
119
127
  </textElement>
120
128
  <text><![CDATA[Detail band 3]]></text>
121
129
  </staticText>
122
- <staticText>
130
+ <textField>
123
131
  <reportElement x="0" y="2" width="460" height="20" forecolor="#424242" uuid="29fb8881-15f4-4235-8d78-003175bd408f"/>
124
132
  <textElement>
125
133
  <font size="16" isBold="true"/>
126
134
  </textElement>
127
- <text><![CDATA[LÉGENDE]]></text>
128
- </staticText>
135
+ <textFieldExpression><![CDATA[$R{legend}]]></textFieldExpression>
136
+ </textField>
129
137
  <subreport>
130
138
  <reportElement stretchType="RelativeToTallestObject" x="0" y="26" width="800" height="56" uuid="4c32d050-9b4f-448e-97f0-072a4606c164">
131
139
  <property name="local_mesure_unitwidth" value="pixel"/>
@@ -153,14 +161,14 @@
153
161
  </textElement>
154
162
  <text><![CDATA[Pied de page, sur chaque page]]></text>
155
163
  </staticText>
156
- <staticText>
164
+ <textField>
157
165
  <reportElement x="0" y="1" width="300" height="14" uuid="323e51d1-9bf3-4a1b-961f-69c339a07d28"/>
158
- <text><![CDATA[Développé par Camptocamp SA, info@camptocamp.com]]></text>
159
- </staticText>
166
+ <textFieldExpression><![CDATA[$R{info}]]></textFieldExpression>
167
+ </textField>
160
168
  <textField>
161
169
  <reportElement x="738" y="21" width="38" height="30" uuid="e0567a18-8d1d-4e04-9658-0eb2fb648f2f"/>
162
170
  <textElement textAlignment="Right" verticalAlignment="Bottom"/>
163
- <textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER}]]></textFieldExpression>
171
+ <textFieldExpression><![CDATA[$R{page} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
164
172
  </textField>
165
173
  <textField evaluationTime="Report">
166
174
  <reportElement x="776" y="21" width="22" height="30" uuid="4574386a-cbc9-4529-896b-c402fb4236c1"/>
@@ -12,6 +12,7 @@
12
12
  <parameter name="numberOfLegendRows" class="java.lang.Integer"/>
13
13
  <parameter name="scalebarSubReport" class="java.lang.String"/>
14
14
  <parameter name="northArrowSubReport" class="java.lang.String"/>
15
+ <parameter name="timezone" class="java.lang.String"/>
15
16
  <parameter name="jrDataSource" class="net.sf.jasperreports.engine.JRDataSource"/>
16
17
  <pageHeader>
17
18
  <band height="28">
@@ -36,7 +37,14 @@
36
37
  <textElement textAlignment="Right">
37
38
  <font size="8"/>
38
39
  </textElement>
39
- <textFieldExpression><![CDATA["Le " + new SimpleDateFormat("EEEEE dd MMMMM yyyy", new Locale("fr")).format(new Date())]]></textFieldExpression>
40
+ <textFieldExpression><![CDATA[
41
+ $R{date_pre} + " " + java.time.ZonedDateTime.now().format(
42
+ java.time.format.DateTimeFormatter.
43
+ ofPattern("EEEE dd MMMM yyyy HH:mm").
44
+ withLocale($P{REPORT_LOCALE}).
45
+ withZone(java.time.ZoneId.of($P{timezone}))
46
+ )
47
+ ]]></textFieldExpression>
40
48
  </textField>
41
49
  <textField>
42
50
  <reportElement x="180" y="2" width="365" height="20" uuid="953c0d72-060f-4ed9-9b6b-9e26da551dbe">
@@ -133,13 +141,13 @@
133
141
  </textElement>
134
142
  <text><![CDATA[Detail band 3]]></text>
135
143
  </staticText>
136
- <staticText>
144
+ <textField>
137
145
  <reportElement x="0" y="1" width="460" height="20" forecolor="#424242" uuid="385742e7-a286-4456-b687-395a1a540023"/>
138
146
  <textElement>
139
147
  <font size="16" isBold="true"/>
140
148
  </textElement>
141
- <text><![CDATA[LÉGENDE]]></text>
142
- </staticText>
149
+ <textFieldExpression><![CDATA[$R{legend}]]></textFieldExpression>
150
+ </textField>
143
151
  <subreport>
144
152
  <reportElement stretchType="RelativeToTallestObject" x="0" y="26" width="580" height="56" uuid="6a01e0f0-7ebb-40f6-97eb-2979e6fff149"/>
145
153
  <dataSourceExpression><![CDATA[$P{legendDataSource}]]></dataSourceExpression>
@@ -149,7 +157,7 @@
149
157
  </detail>
150
158
  <pageFooter>
151
159
  <band height="56">
152
- <textField isStretchWithOverflow="true">
160
+ <textField textAdjust="StretchHeight">
153
161
  <reportElement x="0" y="-171" width="805" height="22" uuid="b14dbd4b-e887-454e-9dcd-293e29fb4b04"/>
154
162
  <textFieldExpression><![CDATA[$P{comments}]]></textFieldExpression>
155
163
  </textField>
@@ -171,17 +179,17 @@
171
179
  <textField>
172
180
  <reportElement x="741" y="21" width="38" height="30" uuid="b2c857a3-3a9d-42ec-8d90-7d315106ff48"/>
173
181
  <textElement textAlignment="Right" verticalAlignment="Bottom"/>
174
- <textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER}]]></textFieldExpression>
182
+ <textFieldExpression><![CDATA[$R{page} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
175
183
  </textField>
176
184
  <textField evaluationTime="Report">
177
185
  <reportElement x="779" y="21" width="22" height="30" uuid="8202adcc-191c-4c6c-9bf4-aba39ca0c12a"/>
178
186
  <textElement verticalAlignment="Bottom"/>
179
187
  <textFieldExpression><![CDATA[" / " + $V{PAGE_NUMBER}]]></textFieldExpression>
180
188
  </textField>
181
- <staticText>
189
+ <textField>
182
190
  <reportElement x="0" y="1" width="300" height="14" uuid="dc102ea9-973f-4717-a872-0d24d4de1e17"/>
183
- <text><![CDATA[Développé par Camptocamp SA, info@camptocamp.com]]></text>
184
- </staticText>
191
+ <textFieldExpression><![CDATA[$R{info}]]></textFieldExpression>
192
+ </textField>
185
193
  </band>
186
194
  </pageFooter>
187
195
  </jasperReport>
@@ -9,6 +9,7 @@
9
9
  <parameter name="numberOfLegendRows" class="java.lang.Integer"/>
10
10
  <parameter name="scalebarSubReport" class="java.lang.String"/>
11
11
  <parameter name="northArrowSubReport" class="java.lang.String"/>
12
+ <parameter name="timezone" class="java.lang.String"/>
12
13
  <parameter name="jrDataSource" class="net.sf.jasperreports.engine.JRDataSource"/>
13
14
  <pageHeader>
14
15
  <band height="28">
@@ -37,7 +38,14 @@
37
38
  <textElement textAlignment="Right">
38
39
  <font size="8"/>
39
40
  </textElement>
40
- <textFieldExpression><![CDATA["Le " + new SimpleDateFormat("EEEEE dd MMMMM yyyy", new Locale("fr")).format(new Date())]]></textFieldExpression>
41
+ <textFieldExpression><![CDATA[
42
+ $R{date_pre} + " " + java.time.ZonedDateTime.now().format(
43
+ java.time.format.DateTimeFormatter.
44
+ ofPattern("EEEE dd MMMM yyyy HH:mm").
45
+ withLocale($P{REPORT_LOCALE}).
46
+ withZone(java.time.ZoneId.of($P{timezone}))
47
+ )
48
+ ]]></textFieldExpression>
41
49
  </textField>
42
50
  <line>
43
51
  <reportElement x="0" y="25" width="555" height="1" forecolor="#FA7500"/>
@@ -70,7 +78,7 @@
70
78
  <reportElement x="5" y="650" width="150" height="20"/>
71
79
  <subreportExpression><![CDATA[$P{scalebarSubReport}]]></subreportExpression>
72
80
  </subreport>
73
- <textField isStretchWithOverflow="true">
81
+ <textField textAdjust="StretchHeight">
74
82
  <reportElement x="0" y="680" width="555" height="37"/>
75
83
  <textFieldExpression><![CDATA[$P{comments}]]></textFieldExpression>
76
84
  </textField>
@@ -110,13 +118,13 @@
110
118
  </textElement>
111
119
  <text><![CDATA[Detail band 3]]></text>
112
120
  </staticText>
113
- <staticText>
121
+ <textField>
114
122
  <reportElement x="0" y="2" width="460" height="20" forecolor="#424242"/>
115
123
  <textElement>
116
124
  <font size="16" isBold="true"/>
117
125
  </textElement>
118
- <text><![CDATA[LÉGENDE]]></text>
119
- </staticText>
126
+ <textFieldExpression><![CDATA[$R{legend}]]></textFieldExpression>
127
+ </textField>
120
128
  <subreport>
121
129
  <reportElement stretchType="RelativeToTallestObject" x="0" y="26" width="255" height="56"/>
122
130
  <dataSourceExpression><![CDATA[$P{legendDataSource}]]></dataSourceExpression>
@@ -138,14 +146,14 @@
138
146
  </textElement>
139
147
  <text><![CDATA[Pied de page, sur chaque page]]></text>
140
148
  </staticText>
141
- <staticText>
149
+ <textField>
142
150
  <reportElement x="0" y="1" width="300" height="14"/>
143
- <text><![CDATA[Développé par Camptocamp SA, info@camptocamp.com]]></text>
144
- </staticText>
151
+ <textFieldExpression><![CDATA[$R{info}]]></textFieldExpression>
152
+ </textField>
145
153
  <textField>
146
154
  <reportElement x="496" y="21" width="38" height="30"/>
147
155
  <textElement textAlignment="Right" verticalAlignment="Bottom"/>
148
- <textFieldExpression><![CDATA["Page " + $V{PAGE_NUMBER}]]></textFieldExpression>
156
+ <textFieldExpression><![CDATA[$R{page} + " " + $V{PAGE_NUMBER}]]></textFieldExpression>
149
157
  </textField>
150
158
  <textField evaluationTime="Report">
151
159
  <reportElement x="534" y="21" width="22" height="30"/>