Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump waitress from 1.2.1 to 2.1.1 in /geoportal #2873

Closed
wants to merge 442 commits into from
Closed
Changes from 2 commits
Commits
Show all changes
442 commits
Select commit Hold shift + click to select a range
f876793
Set ZIndex for all background layers
llienher Apr 22, 2021
b794b89
Fix print controller iterating over the mask layer
llienher Apr 22, 2021
54ccc33
Set zIndex for measure vector layer
llienher Apr 22, 2021
0d868fd
fix: use env variable for ES config
tonio Apr 23, 2021
cdcd775
debug ES env variable
tonio Apr 23, 2021
0be8a30
Use last ol-cesium version
llienher Apr 27, 2021
e237231
Create blank layer with VectorLayer instead of TileLayer
llienher Apr 29, 2021
6e27a37
Do not show print or offline mask in the layer manager
llienher Apr 29, 2021
70e7a02
Fix blank layer (hide mapbox canvas)
llienher May 3, 2021
1d54b1b
Override login view to not check user from database
llienher May 3, 2021
b5a30e5
Do not check login cookies in the front-end, check on the getUserInfo…
llienher May 5, 2021
fea8cb0
Remove unused injected appAuthtktCookieName variable
llienher May 5, 2021
182635c
Fix scale selector and constraint zoom to integer values
llienher May 18, 2021
b824521
Use correct attribute to get the role from a user object
llienher May 19, 2021
883bb8c
Set gunicorn limit-request-line to 8190 bytes
llienher May 19, 2021
21f4d41
Remove artifact on background for mvt topo layers
llienher May 20, 2021
5328219
Fix login to admin interface
llienher May 20, 2021
183fb91
Fix bootstrap redirect url to be null as it is not used
llienher May 20, 2021
b005052
Enable jsapi
gberaudo May 26, 2021
0ecd5ef
Reactivate jsdoc for jsapi
llienher May 26, 2021
12461f7
Fix loading the app with a feature written in permalink
llienher May 26, 2021
7755e20
Fix jsapi to use Theme class instead of Entry
llienher May 27, 2021
3ce442f
Re-enable last commented lines for jsapi
llienher May 27, 2021
2cc0646
Fix api documentation
llienher May 28, 2021
5a02f0b
Override is_mixed method from theme.py
llienher Jun 4, 2021
55d969a
Upgrade to GeoMapFish 2.5.0.139
llienher Jun 4, 2021
9934e87
Add missing available metadatas
llienher Jun 10, 2021
92c3a7c
Move methods from jsapi python to luxtheme as it was misplaced
llienher Jun 14, 2021
eec0864
Do not show offline mask in the layertree when the mask is active
llienher Jun 15, 2021
71dd3f9
rebase
rmichaelis Jun 23, 2021
8761cf8
rebase
rmichaelis Jun 29, 2021
9e852ac
Merge remote-tracking branch 'origin/master' into upgrade_c2cgeoporta…
rmichaelis Jul 26, 2021
2a9e11a
merge master
rmichaelis Jul 27, 2021
0d6d3a5
Merge remote-tracking branch 'origin/master' into upgrade_c2cgeoporta…
rmichaelis Jul 28, 2021
3089527
Merge remote-tracking branch 'origin/master' into upgrade_c2cgeoporta…
rmichaelis Aug 3, 2021
5ac8bbf
Wrong path
rmichaelis Aug 3, 2021
7190e17
Install transifex
rmichaelis Aug 3, 2021
4bcd833
Wrong path for lang files
rmichaelis Aug 3, 2021
080ecd8
Not needed
rmichaelis Aug 4, 2021
cf031c4
Add all the language files
rmichaelis Aug 4, 2021
387cd12
install vim
rmichaelis Aug 4, 2021
cc2219d
log error
rmichaelis Aug 4, 2021
5e95e7e
Fix the es version
rmichaelis Aug 4, 2021
a3ec562
Role property name has been changed
rmichaelis Aug 4, 2021
54988c4
Imagemagik is needed to visualize the measurements
rmichaelis Aug 4, 2021
7768484
Fix weazyprint version
rmichaelis Aug 5, 2021
857d25c
temporaty api files
rmichaelis Aug 5, 2021
0dc245f
Wrong version of owncloud
rmichaelis Aug 5, 2021
0eda7b3
backward compatibility
rmichaelis Aug 5, 2021
1f1141d
backward compatibility
rmichaelis Aug 5, 2021
be8bd29
Manage internal layers
rmichaelis Aug 6, 2021
b650b27
remove duplicate
rmichaelis Aug 6, 2021
6d24009
Do not remove the wrong layer
rmichaelis Aug 6, 2021
3c27dd0
Do not encode this value
rmichaelis Aug 9, 2021
ae63ee0
Fix drawings not visible when print panel openes
rmichaelis Aug 10, 2021
f80097b
Activate the pan during drawing
rmichaelis Aug 11, 2021
903a6d9
Migrate pot creation
rmichaelis Aug 12, 2021
88c87af
Add missing webfonts
rmichaelis Aug 12, 2021
536d01a
Format date
rmichaelis Aug 12, 2021
8c83c80
utc to localtime
rmichaelis Aug 12, 2021
5840e1c
bring the drawing layer to the top
rmichaelis Aug 30, 2021
a44b701
Remove artifact on background for mvt topo layers
rmichaelis Sep 1, 2021
046e08f
Merge pull request #2766 from Geoportail-Luxembourg/upgrade_c2cgeopor…
rmichaelis Sep 6, 2021
ebbc59c
Hack to support utc+1 datetime format
rmichaelis Sep 7, 2021
d1e954e
Merge pull request #2769 from Geoportail-Luxembourg/fix_uas
rmichaelis Sep 7, 2021
9cd935f
Wrong default value
rmichaelis Sep 8, 2021
5dcae4a
Merge pull request #2771 from Geoportail-Luxembourg/fix_uas
rmichaelis Sep 8, 2021
e3fd15c
Manage cookie orejime
rmichaelis Sep 9, 2021
3b9a810
remove unused function
rmichaelis Sep 9, 2021
0fd7fa3
Merge pull request #2772 from Geoportail-Luxembourg/fix_jsapi_cookies
rmichaelis Sep 9, 2021
c34aac2
c2cgeoportal new function signature
rmichaelis Sep 9, 2021
8666f23
Merge pull request #2773 from Geoportail-Luxembourg/fix_print
rmichaelis Sep 9, 2021
05091f2
Manage cookie isPublicWebsite
rmichaelis Sep 10, 2021
28d2e41
Merge pull request #2774 from Geoportail-Luxembourg/fix_jsapi_cookies
rmichaelis Sep 10, 2021
db73d08
feedback mail
rmichaelis Sep 10, 2021
07781f3
Merge pull request #2775 from Geoportail-Luxembourg/fix_reorder
rmichaelis Sep 10, 2021
6bb4580
Compute area and length
rmichaelis Sep 15, 2021
9db4d77
Webservice to convert geojson
rmichaelis Sep 15, 2021
4aa4f71
Merge pull request #2776 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 16, 2021
6497db2
Count features
rmichaelis Sep 17, 2021
b9a07c2
Merge pull request #2777 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 17, 2021
c292907
Properly catch errors
rmichaelis Sep 17, 2021
3968556
Merge pull request #2778 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 17, 2021
03c787b
error
rmichaelis Sep 17, 2021
ec4085d
Merge pull request #2779 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 17, 2021
d65ea47
error
rmichaelis Sep 17, 2021
40c2bfe
Merge pull request #2780 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 17, 2021
9bdc3a3
count results
rmichaelis Sep 20, 2021
d461c6f
Merge pull request #2781 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 20, 2021
cd59db7
Fix config.yaml path
rmichaelis Sep 20, 2021
8da1f65
Merge pull request #2782 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 20, 2021
668a50b
Remove layerV1 reference
rmichaelis Sep 20, 2021
c9014d8
Merge pull request #2783 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 20, 2021
4af06a4
Do not count when download url
rmichaelis Sep 20, 2021
8502391
Merge pull request #2784 from Geoportail-Luxembourg/fix_api
rmichaelis Sep 20, 2021
0ba547f
It allows to download shapefile of a mymaps
rmichaelis Sep 23, 2021
3934fe6
Merge pull request #2786 from Geoportail-Luxembourg/export_shape
rmichaelis Sep 23, 2021
7d0c126
Use LUREF instead of WGS84
rmichaelis Sep 23, 2021
5d11399
Merge pull request #2787 from Geoportail-Luxembourg/export_shape
rmichaelis Sep 23, 2021
18c7951
Reorder when print mask is open
rmichaelis Sep 24, 2021
bb036ca
Merge pull request #2788 from Geoportail-Luxembourg/fix_reorder
rmichaelis Sep 24, 2021
ed7544a
ngeo sort not working properly with ng-if
rmichaelis Sep 27, 2021
f343642
Merge pull request #2789 from Geoportail-Luxembourg/fix_reorder
rmichaelis Sep 27, 2021
fe877ad
Update npour_poi.html
rmichaelis Sep 29, 2021
f9dfaee
Merge pull request #2790 from Geoportail-Luxembourg/rmichaelis-patch-5
rmichaelis Sep 29, 2021
98dd760
template
rmichaelis Sep 29, 2021
cf5088b
Merge pull request #2791 from Geoportail-Luxembourg/fix_query
rmichaelis Sep 29, 2021
d14d537
template
rmichaelis Sep 29, 2021
75f2c5c
Merge pull request #2792 from Geoportail-Luxembourg/fix_query
rmichaelis Sep 29, 2021
07fab16
use _nl for lux language
rmichaelis Sep 29, 2021
3fb66ff
Merge pull request #2793 from Geoportail-Luxembourg/fix_query
rmichaelis Sep 29, 2021
de00f26
Allow to use a different srs
rmichaelis Sep 30, 2021
4d598e9
Merge pull request #2794 from Geoportail-Luxembourg/fix_srs
rmichaelis Sep 30, 2021
e02e022
Replace wrong DPI value
rmichaelis Oct 4, 2021
fb95b47
Merge pull request #2795 from Geoportail-Luxembourg/fix_scale
rmichaelis Oct 4, 2021
5922841
Replace wrong DPI value
rmichaelis Oct 4, 2021
fc2109e
Merge pull request #2796 from Geoportail-Luxembourg/fix_scale
rmichaelis Oct 4, 2021
07eb308
Do not clip the menu
rmichaelis Oct 5, 2021
55ab523
Merge pull request #2797 from Geoportail-Luxembourg/fix_menu
rmichaelis Oct 5, 2021
8348b81
Fix certificate issue
rmichaelis Oct 7, 2021
e7aa1f5
Merge pull request #2798 from Geoportail-Luxembourg/fix_certificate
rmichaelis Oct 7, 2021
7afc496
Fix certificate issue
rmichaelis Oct 7, 2021
3635658
Merge pull request #2799 from Geoportail-Luxembourg/fix_certificate
rmichaelis Oct 7, 2021
4220838
shortner for the url
rmichaelis Oct 12, 2021
edb2d56
Merge pull request #2801 from Geoportail-Luxembourg/fix_api_print
rmichaelis Oct 12, 2021
14602bc
Manage esri polygon with holes
rmichaelis Oct 13, 2021
18e6a18
Merge pull request #2802 from Geoportail-Luxembourg/fix_api_print
rmichaelis Oct 13, 2021
8dbbb0a
Use wms
rmichaelis Oct 13, 2021
e126994
Merge pull request #2803 from Geoportail-Luxembourg/fix_api_print
rmichaelis Oct 13, 2021
aed84a3
remove link mobility and add link to cyclomedia
rmichaelis Oct 19, 2021
417bccb
Merge pull request #2804 from Geoportail-Luxembourg/cyclomedia
rmichaelis Oct 19, 2021
f1c8555
Open in the same window
rmichaelis Oct 19, 2021
3a748ba
Merge pull request #2805 from Geoportail-Luxembourg/cyclomedia
rmichaelis Oct 19, 2021
93d714b
same external target link for both link
rmichaelis Oct 20, 2021
b641caf
Merge pull request #2806 from Geoportail-Luxembourg/cyclomedia
rmichaelis Oct 20, 2021
b6570c0
Also available for commune
rmichaelis Oct 20, 2021
3040fa9
Merge pull request #2807 from Geoportail-Luxembourg/cyclomedia
rmichaelis Oct 20, 2021
38b1e6d
Merge pull request #2765 from Geoportail-Luxembourg/cleanup
fredj Oct 22, 2021
c1839c0
Update tracing.html
geoportallux Oct 25, 2021
3a1b99c
new event name with new version of OL
rmichaelis Oct 27, 2021
a3797a4
Merge pull request #2810 from Geoportail-Luxembourg/fix_slider
rmichaelis Oct 27, 2021
1298e31
check if the result is ok
rmichaelis Oct 29, 2021
5d1465f
Merge pull request #2811 from Geoportail-Luxembourg/fix_lingua
rmichaelis Oct 29, 2021
c3b9027
Manage wrong values
rmichaelis Oct 29, 2021
b93a5da
Merge pull request #2812 from Geoportail-Luxembourg/fix_lingua
rmichaelis Oct 29, 2021
d44c580
Update theme.less
geoportallux Nov 2, 2021
f0c93fe
Update Theme.js
geoportallux Nov 2, 2021
7ff7401
Merge pull request #2813 from Geoportail-Luxembourg/geosciences
geoportallux Nov 2, 2021
6e34fdb
theme geologie
rmichaelis Nov 4, 2021
f6f29d3
Geologie
rmichaelis Nov 4, 2021
a30b5a7
Merge pull request #2814 from Geoportail-Luxembourg/icon
rmichaelis Nov 4, 2021
f2be0d2
use area of the polygon on projected plane
rmichaelis Nov 4, 2021
3b6d113
Merge pull request #2815 from Geoportail-Luxembourg/area
rmichaelis Nov 4, 2021
da7d775
Manage other encoding type of geometry for filter
rmichaelis Nov 8, 2021
ea21d6e
Merge pull request #2816 from Geoportail-Luxembourg/geometry_type
rmichaelis Nov 8, 2021
4989148
Remove the 'select' interaction when layer is removed
rmichaelis Nov 11, 2021
4b92640
Merge pull request #2817 from Geoportail-Luxembourg/fix_jsapi
rmichaelis Nov 11, 2021
e13b061
quick fix new sentry url for js
rmichaelis Nov 16, 2021
2b14d8d
Merge pull request #2819 from Geoportail-Luxembourg/rmichaelis-patch-5
rmichaelis Nov 16, 2021
5b5409f
Performance issue
rmichaelis Nov 18, 2021
4e440c2
Merge pull request #2821 from Geoportail-Luxembourg/fix_geojson
rmichaelis Nov 18, 2021
765179d
Do not sent error 400 in case of empty resultset
rmichaelis Nov 19, 2021
6bf7576
Merge pull request #2822 from Geoportail-Luxembourg/fix_gfi
rmichaelis Nov 19, 2021
fa3970a
dpi as parameter
rmichaelis Nov 24, 2021
5bc6f7c
Merge pull request #2825 from Geoportail-Luxembourg/fix_dpi
rmichaelis Nov 24, 2021
dee3f7b
Encode the string
rmichaelis Nov 24, 2021
44c6115
Merge pull request #2826 from Geoportail-Luxembourg/fix_geocode
rmichaelis Nov 24, 2021
192251a
check if none
rmichaelis Nov 24, 2021
6693ace
Merge pull request #2827 from Geoportail-Luxembourg/fix_geocode
rmichaelis Nov 24, 2021
c4e8b79
be sure that the result exists
rmichaelis Nov 24, 2021
ac88bed
Merge pull request #2828 from Geoportail-Luxembourg/fix_geocode
rmichaelis Nov 24, 2021
4f2e41f
fit to an extent
rmichaelis Nov 25, 2021
2bd48fc
Merge pull request #2829 from Geoportail-Luxembourg/fix_fit
rmichaelis Nov 25, 2021
ebaf8d4
Fit using all vector layers
rmichaelis Nov 26, 2021
8060412
Merge pull request #2830 from Geoportail-Luxembourg/fix_fit
rmichaelis Nov 26, 2021
f69838e
Do not call callback function with no features
rmichaelis Nov 29, 2021
1cbde8c
Merge pull request #2831 from Geoportail-Luxembourg/fix_fit
rmichaelis Nov 29, 2021
54480c5
Fit on all layers
rmichaelis Dec 1, 2021
9d522f4
Merge pull request #2834 from Geoportail-Luxembourg/fix_api
rmichaelis Dec 1, 2021
8e14675
new template
rmichaelis Dec 14, 2021
1917524
Merge pull request #2835 from Geoportail-Luxembourg/print_template
rmichaelis Dec 14, 2021
6c3c45f
disable parameter goodnessoffit because When a label for a polygon g…
rmichaelis Dec 14, 2021
1ef13f0
Merge pull request #2836 from Geoportail-Luxembourg/print_template
rmichaelis Dec 14, 2021
6d9fd2b
use srs with crossair parameter
rmichaelis Dec 14, 2021
8d23456
Merge pull request #2837 from Geoportail-Luxembourg/print_template
rmichaelis Dec 14, 2021
8ab170d
check self intersect issue
rmichaelis Dec 15, 2021
339638f
Merge pull request #2838 from Geoportail-Luxembourg/print_template
rmichaelis Dec 15, 2021
c5ecbf6
Update map.js
rmichaelis Dec 17, 2021
cdddd03
Merge pull request #2839 from Geoportail-Luxembourg/rmichaelis-patch-1
rmichaelis Dec 17, 2021
fd9c443
If no srs is defined, then use the default one
rmichaelis Dec 23, 2021
2b9865a
Merge pull request #2840 from Geoportail-Luxembourg/fix_srs
rmichaelis Dec 23, 2021
4e3fb25
If no srs is defined, then use the default one
rmichaelis Dec 23, 2021
a531d42
Merge pull request #2841 from Geoportail-Luxembourg/fix_srs
rmichaelis Dec 23, 2021
8165f2a
add id locality in response
rmichaelis Jan 4, 2022
556a46c
Merge pull request #2842 from Geoportail-Luxembourg/add_caclr_loca
rmichaelis Jan 4, 2022
eeb8f04
show the geometry even if a feature is selected
rmichaelis Jan 13, 2022
4a24803
Merge pull request #2844 from Geoportail-Luxembourg/fix_showgeom
rmichaelis Jan 13, 2022
3a8b428
remove app specific parameters when sharing
rmichaelis Jan 17, 2022
bf5e613
Merge pull request #2845 from Geoportail-Luxembourg/fix_shorturl
rmichaelis Jan 17, 2022
37e20bd
Do not show the popup when no feature is returned
rmichaelis Jan 21, 2022
7b87c6d
Merge pull request #2846 from Geoportail-Luxembourg/fix_pag_tooltips
rmichaelis Jan 21, 2022
2c3eb17
Add north arrow and scale
rmichaelis Jan 26, 2022
5ee0783
Remove measurement type and date
rmichaelis Jan 28, 2022
a0fca60
Merge pull request #2847 from Geoportail-Luxembourg/fix_print_template
rmichaelis Jan 28, 2022
21b7e77
map should continue to work even when webgl is deactivated
rmichaelis Feb 1, 2022
192fa4d
Merge pull request #2848 from Geoportail-Luxembourg/fix_webgl
rmichaelis Feb 2, 2022
0d4a9f3
remove lang cache
rmichaelis Feb 17, 2022
2b0d487
Merge pull request #2849 from Geoportail-Luxembourg/fix_lang
rmichaelis Feb 17, 2022
b5f168f
use dedicated wms
rmichaelis Feb 18, 2022
311e2d7
Merge pull request #2850 from Geoportail-Luxembourg/fix_print
rmichaelis Feb 18, 2022
cdf6e8c
iframe to display graph
rmichaelis Feb 22, 2022
cc7c20b
Merge pull request #2851 from Geoportail-Luxembourg/fix_iframe
rmichaelis Feb 22, 2022
7efbcf2
If main account does not have the right, then check if the child user…
rmichaelis Feb 24, 2022
d85f141
Merge pull request #2852 from Geoportail-Luxembourg/fix_download
rmichaelis Feb 24, 2022
18de54b
Each feature should be included. Not only the first one.
rmichaelis Feb 25, 2022
5dd268e
Merge pull request #2853 from Geoportail-Luxembourg/fix_download
rmichaelis Feb 25, 2022
983bd06
Build the response
rmichaelis Feb 25, 2022
5c51576
Merge pull request #2854 from Geoportail-Luxembourg/fix_print_thumbnail
rmichaelis Feb 25, 2022
100812a
add id attribute
rmichaelis Feb 28, 2022
7a7690a
Merge pull request #2855 from Geoportail-Luxembourg/fix_jsapi
rmichaelis Feb 28, 2022
a76bbef
fallback when the role does not exist
rmichaelis Feb 28, 2022
4be41b2
Merge pull request #2856 from Geoportail-Luxembourg/auth_fallback
rmichaelis Feb 28, 2022
27f523b
layer legend order. Bg should be the last one
rmichaelis Mar 1, 2022
476d0b0
Merge pull request #2857 from Geoportail-Luxembourg/fix_legend
rmichaelis Mar 1, 2022
776fee0
new tooltip
rmichaelis Mar 2, 2022
0d6d68a
Merge pull request #2858 from Geoportail-Luxembourg/fix_legend
rmichaelis Mar 2, 2022
47f7d06
new url
rmichaelis Mar 2, 2022
60e9b94
Merge pull request #2859 from Geoportail-Luxembourg/3d_tiles
rmichaelis Mar 2, 2022
b83cae0
Remove id when it's null
rmichaelis Mar 4, 2022
46e47c4
Merge pull request #2860 from Geoportail-Luxembourg/fix_id
rmichaelis Mar 4, 2022
00b8ab4
Chargy attributes
rmichaelis Mar 4, 2022
7943c68
Merge pull request #2861 from Geoportail-Luxembourg/fix_chargy
rmichaelis Mar 4, 2022
e4c1f19
Split chargy response in many tooltips
rmichaelis Mar 4, 2022
6572dbe
import at top of the file
rmichaelis Mar 4, 2022
1215ad6
Merge pull request #2862 from Geoportail-Luxembourg/fix_chargy
rmichaelis Mar 4, 2022
9c9f1d7
Get the legend for a layer
rmichaelis Mar 4, 2022
f83a6cb
Merge pull request #2863 from Geoportail-Luxembourg/fix_chargy
rmichaelis Mar 4, 2022
63d7d5a
return a valid empty response
rmichaelis Mar 8, 2022
129159c
Merge pull request #2864 from Geoportail-Luxembourg/fix_catalog
rmichaelis Mar 8, 2022
ddc68b3
The map should not be broken when piwik is not loaded
rmichaelis Mar 9, 2022
7a55e8c
Merge pull request #2865 from Geoportail-Luxembourg/fix_piwik
rmichaelis Mar 9, 2022
b6ad8fa
Search by layer id if is available
rmichaelis Mar 10, 2022
da70f40
Merge pull request #2866 from Geoportail-Luxembourg/fix_ghost_layers
rmichaelis Mar 10, 2022
766c029
add arcgis config
rmichaelis Mar 15, 2022
b4c9037
Merge pull request #2868 from Geoportail-Luxembourg/fix_config
rmichaelis Mar 15, 2022
ceb8043
Disable systematic token check
rmichaelis Mar 15, 2022
1d2f5f9
Merge pull request #2869 from Geoportail-Luxembourg/fix_config
rmichaelis Mar 15, 2022
1ee3197
use always graphhopper
rmichaelis Mar 21, 2022
db2250c
Merge pull request #2872 from Geoportail-Luxembourg/fix_graphhopper
rmichaelis Mar 21, 2022
6786b4b
Bump waitress from 1.2.1 to 2.1.1 in /geoportal
dependabot[bot] Mar 21, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion geoportal/jsapi/src/printmanager.js
Original file line number Diff line number Diff line change
@@ -106,7 +106,8 @@ lux.PrintManager.LAYOUTS = [
'A1 landscape',
'A1 portrait',
'A0 landscape',
'A0 portrait'
'A0 portrait',
'a4_landscape_notext'
];

/**
3 changes: 2 additions & 1 deletion print/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM camptocamp/mapfish_print:3.18.4
COPY --from=camptocamp/geoportailv3-config:latest /usr/local/tomcat/webapps/ROOT/print-apps /usr/local/tomcat/webapps/ROOT/print-apps
#COPY --from=camptocamp/geoportailv3-config:latest /usr/local/tomcat/webapps/ROOT/print-apps /usr/local/tomcat/webapps/ROOT/print-apps
COPY print-apps /usr/local/tomcat/webapps/ROOT/print-apps
RUN sed -i 's/Connector port=\"8080\"/Connector port=\"8080\" maxPostSize = \"26214400\"/g' /usr/local/tomcat/conf/server.xml
RUN sed -i 's/1048576/26214400/g' webapps/ROOT/WEB-INF/web.xml

Empty file modified print/print-apps/geoportailv3/NorthArrow_10.svg
100644 → 100755
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified print/print-apps/geoportailv3/a0_landscape.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a0_portrait.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a1_landscape.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a1_portrait.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a2_landscape.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a2_portrait.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a3_landscape.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a3_portrait.jrxml
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/a4_landscape.jrxml
100644 → 100755
Empty file.
60 changes: 60 additions & 0 deletions print/print-apps/geoportailv3/a4_landscape_notext.jrxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Created with Jaspersoft Studio version 6.11.0.final using JasperReports Library version 6.11.0-0c4056ccaa4d25a5a8c45672d2f764ea3498bebb -->
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="716" leftMargin="70" rightMargin="56" topMargin="56" bottomMargin="34" isSummaryNewPage="true" uuid="9a3e59f5-6675-48cf-ad74-9c42b5a5b290">
<property name="com.jaspersoft.studio.unit." value="pixel"/>
<property name="com.jaspersoft.studio.unit.pageHeight" value="cm"/>
<property name="com.jaspersoft.studio.unit.pageWidth" value="cm"/>
<property name="com.jaspersoft.studio.unit.topMargin" value="mm"/>
<property name="com.jaspersoft.studio.unit.bottomMargin" value="mm"/>
<property name="com.jaspersoft.studio.unit.leftMargin" value="mm"/>
<property name="com.jaspersoft.studio.unit.rightMargin" value="mm"/>
<parameter name="mapSubReport" class="java.lang.String"/>
<parameter name="scalebarSubReport" class="java.lang.String"/>
<parameter name="northArrowSubReport" class="java.lang.String"/>
<parameter name="disclaimer" class="java.lang.String"/>
<parameter name="dateText" class="java.lang.String"/>
<parameter name="scaleTitle" class="java.lang.String"/>
<parameter name="appTitle" class="java.lang.String"/>
<parameter name="name" class="java.lang.String"/>
<parameter name="scale" class="java.lang.String">
<defaultValueExpression><![CDATA[5000]]></defaultValueExpression>
</parameter>
<parameter name="url" class="java.lang.String">
<defaultValueExpression><![CDATA["http://g-o.lu/start"]]></defaultValueExpression>
</parameter>
<parameter name="qrimage" class="java.lang.String">
<defaultValueExpression><![CDATA["http://dev.geoportail.lu/shorten/qr?url=http%3A%2F%2Fdevv3.geoportail.lu%2Fmain"]]></defaultValueExpression>
</parameter>
<parameter name="dataOwner" class="java.lang.String">
<defaultValueExpression><![CDATA[""]]></defaultValueExpression>
</parameter>
<field name="table" class="net.sf.jasperreports.engine.data.JRMapCollectionDataSource"/>
<field name="displayName" class="java.lang.String"/>
<field name="reportTemplate" class="java.lang.String"/>
<title>
<band height="505" splitType="Stretch">
<property name="local_mesure_unitheight" value="mm"/>
<property name="com.jaspersoft.studio.unit.height" value="mm"/>
<subreport>
<reportElement x="0" y="0" width="715" height="505" uuid="fa145068-76a5-4834-98ed-ce65b1976b3d">
<property name="local_mesure_unitwidth" value="pixel"/>
<property name="local_mesure_unitheight" value="pixel"/>
<property name="com.jaspersoft.studio.unit.height" value="px"/>
<property name="local_mesure_unity" value="pixel"/>
<property name="com.jaspersoft.studio.unit.y" value="px"/>
</reportElement>
<subreportExpression><![CDATA[$P{mapSubReport}]]></subreportExpression>
</subreport>
<textField pattern="dd/MM/yyyy HH:mm">
<reportElement key="" x="-10" y="250" width="10" height="200" uuid="8fc2886b-89fa-42b6-a724-e737557966bc">
<property name="com.jaspersoft.studio.unit.width" value="pixel"/>
<property name="com.jaspersoft.studio.unit.height" value="pixel"/>
</reportElement>
<textElement textAlignment="Left" verticalAlignment="Middle" rotation="Left">
<font fontName="Serif" size="6"/>
</textElement>
<textFieldExpression><![CDATA[$P{dateText}+(new SimpleDateFormat("dd/MM/yyyy HH:mm")).format(new java.util.Date())]]></textFieldExpression>
</textField>
</band>
</title>
</jasperReport>
Empty file modified print/print-apps/geoportailv3/a4_portrait.jrxml
100644 → 100755
Empty file.
241 changes: 241 additions & 0 deletions print/print-apps/geoportailv3/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,241 @@
---
pdfConfig: !pdfConfig
compressed: false
author: "Jeff Konnen"
subject: "map.geoportail.lu Print"
creator: "Mapfish Print"

throwErrorOnExtraParameters: true


templates:
A4 portrait: !template
pdfConfig: !pdfConfig
title: "A4 Portrait by geoportail.lu"
keywords: ["map"]
reportTemplate: a4_portrait.jrxml
attributes: &attributes
name: !string
default: ""
scale: !string
default: ""
url: !string
default: ""
qrimage: !string
default: ""
dataOwner: !string
default: ""
queryResults: !string
default: ""
disclaimer: !string
default: ""
dateText: !string
default: ""
scaleTitle: !string
default: ""
appTitle: !string
default: ""
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 470
height: 650
lang: !string
default: ""
legend: !datasource
attributes:
name: !string {}
restUrl: !string {default: ''}
legendUrl: !string {default: ''}
legendTitle: !string {default: ''}
default: []
scalebar: !scalebar
width: 150
height: 30
northArrow: !northArrow
size: 40
default:
graphic: "file://NorthArrow_10.svg"
backgroundColor: "rgba(214, 214, 214, 0)"
processors: &processors
- !reportBuilder # compile all reports in current directory
directory: '.'
- !configureHttpRequests
httpProcessors:
- !mapUri # Rule to rewrite the local dev queries
mapping:
http://localhost:8080/(.*): "http://geoportal:8080/$1"
- !forwardHeaders # Rule to forward the referer
headers:
- Referer
- X-Request-ID
- !createMap
inputMapper: {map: map}
outputMapper: {mapSubReport: mapSubReport}
- !createScalebar {}
- !createNorthArrow {}
A4 landscape: !template
pdfConfig: !pdfConfig
title: "A4 Landscape by geoportail.lu"
keywords: ["map"]
reportTemplate: a4_landscape.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 715
height: 395
scalebar: !scalebar
width: 150
height: 30
processors: *processors
A3 portrait: !template
pdfConfig: !pdfConfig
title: "A3 Portrait by geoportail.lu"
keywords: ["map"]
reportTemplate: a3_portrait.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 715
height: 975
scalebar: !scalebar
width: 230
height: 40
processors: *processors
A3 landscape: !template
pdfConfig: !pdfConfig
title: "A3 Landscape by geoportail.lu"
keywords: ["map"]
reportTemplate: a3_landscape.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 1064
height: 640
scalebar: !scalebar
width: 230
height: 40
processors: *processors
A2 portrait: !template
pdfConfig: !pdfConfig
title: "A2 Portrait by geoportail.lu"
keywords: ["map"]
reportTemplate: a2_portrait.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 1064
height: 1475
scalebar: !scalebar
width: 230
height: 40
processors: *processors
A2 landscape: !template
pdfConfig: !pdfConfig
title: "A2 Landscape by geoportail.lu"
keywords: ["map"]
reportTemplate: a2_landscape.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 1558
height: 985
scalebar: !scalebar
width: 230
height: 40
processors: *processors
A1 portrait: !template
pdfConfig: !pdfConfig
title: "A1 Portrait by geoportail.lu"
keywords: ["map"]
reportTemplate: a1_portrait.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 1558
height: 2175
scalebar: !scalebar
width: 230
height: 40
processors: *processors
A1 landscape: !template
pdfConfig: !pdfConfig
title: "A1 Landscape by geoportail.lu"
keywords: ["map"]
reportTemplate: a1_landscape.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 2255
height: 1482
scalebar: !scalebar
width: 230
height: 40
processors: *processors
A0 portrait: !template
pdfConfig: !pdfConfig
title: "A0 Portrait by geoportail.lu"
keywords: ["map"]
reportTemplate: a0_portrait.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 2254
height: 3155
scalebar: !scalebar
width: 230
height: 40
processors: *processors
A0 landscape: !template
pdfConfig: !pdfConfig
title: "A0 Landscape by geoportail.lu"
keywords: ["map"]
reportTemplate: a0_landscape.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 3241
height: 2173
scalebar: !scalebar
width: 230
height: 40
processors: *processors
thumbnail: !template
reportTemplate: thumbnail.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 470
height: 650
processors: *processors
a4_landscape_notext: !template
reportTemplate: a4_landscape_notext.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 715
height: 505
processors: *processors

10 changes: 10 additions & 0 deletions print/print-apps/geoportailv3/config.yaml.tmpl
100644 → 100755
Original file line number Diff line number Diff line change
@@ -228,3 +228,13 @@ templates:
width: 470
height: 650
processors: *processors
a4_landscape_notext: !template
reportTemplate: a4_landscape_notext.jrxml
attributes:
<<: *attributes
map: !map
maxDpi: 400
dpiSuggestions: [72, 91, 128, 254, 300, 400]
width: 715
height: 505
processors: *processors
Empty file modified print/print-apps/geoportailv3/requestData.json
100644 → 100755
Empty file.
Empty file modified print/print-apps/geoportailv3/thumbnail.jrxml
100644 → 100755
Empty file.