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

Upgrade c2cgeoportal gslux 333 #2766

Merged
merged 335 commits into from
Sep 6, 2021
Merged
Changes from 1 commit
Commits
Show all changes
335 commits
Select commit Hold shift + click to select a range
6cc7653
fix: toolbar in mobile version
tonio Oct 6, 2020
29d8243
Merge pull request #2563 from Geoportail-Luxembourg/fix-i18n
Oct 6, 2020
38c1682
fix: env testing order
tonio Oct 7, 2020
2990021
fix: mobile button overflow
tonio Oct 7, 2020
1de37b8
Re-add MockProvider to fix disappearing permalink
llienher Oct 7, 2020
75e06e9
fix: BS migration breakpoints values
tonio Oct 7, 2020
be4cee1
fix: header on mobile
tonio Oct 7, 2020
64941dc
current status; problem with vendor module
mki-c2c Oct 9, 2020
bb2628e
fix: remove API generation that overrides vendor.js file
tonio Oct 13, 2020
365eddd
fix: path to vendor file
tonio Oct 13, 2020
e8e3f41
fix: target for generating api
tonio Oct 13, 2020
ffe2410
Merge pull request #2575 from Geoportail-Luxembourg/mobile_fix
tonio Oct 14, 2020
f7c0038
Merge pull request #2569 from Geoportail-Luxembourg/GSLUX-361_fix-per…
llienher Oct 14, 2020
de1acaa
remove docker-compose-dev and Makefile
Oct 15, 2020
748cc26
Fix various small issues with frontend css/html
llienher Oct 15, 2020
69ac0d6
Fix target make build
arnaud-morvan Oct 26, 2020
4058fa5
Add CONST_create_template
arnaud-morvan Oct 26, 2020
a515492
Update docker-compose-lib.yaml
arnaud-morvan Oct 26, 2020
e97ab3e
Update .gitognore
arnaud-morvan Oct 26, 2020
2064a41
Add default print
arnaud-morvan Oct 26, 2020
8449369
Move config to root folder (except print)
arnaud-morvan Oct 26, 2020
6940002
Remove docker-run script
arnaud-morvan Oct 26, 2020
bbafc15
Update env.default
arnaud-morvan Oct 26, 2020
cae9c4e
Update geoportal/.dockerignore
arnaud-morvan Oct 26, 2020
548d363
Update geoportal/CONST_config-schema.yaml
arnaud-morvan Oct 26, 2020
09696aa
Update geoportal/alembic.ini
arnaud-morvan Oct 26, 2020
154bf19
Update geoportal/development.ini
arnaud-morvan Oct 26, 2020
5282c1c
Update geoportal/production.ini
arnaud-morvan Oct 26, 2020
d5185a8
Update geoportal/geoportailv3_geoportal/resources.py
arnaud-morvan Oct 26, 2020
3a61a55
Update geoportal/geoportailv3_geoportal/subscribers.py
arnaud-morvan Oct 26, 2020
9f22cbb
Remove old cgxp api files
arnaud-morvan Oct 26, 2020
3b0065b
Update geoportal/geoportailv3_geoportal/views/__init__.py
arnaud-morvan Oct 26, 2020
5ae05f6
Update geoportal/tools/extract-messages.js
arnaud-morvan Oct 26, 2020
508b8b9
Upgrade CONST_create_template to 2.5.0.88
arnaud-morvan Oct 26, 2020
efdfdcc
Update docker-compose-lib.yaml
arnaud-morvan Oct 26, 2020
34ba94f
Add managed_files in project.yaml
arnaud-morvan Oct 26, 2020
4769e93
Update geoportal/webpack.apps.js
arnaud-morvan Oct 26, 2020
20c2bbb
Update Dockerfile
arnaud-morvan Oct 26, 2020
42dfb01
Start update of Dockerfile and package.json
arnaud-morvan Oct 27, 2020
692b6e8
Add default geoportal/vars.yaml
arnaud-morvan Oct 27, 2020
2d6098f
Add default geoportal/requirements.txt
arnaud-morvan Oct 27, 2020
5bf4d64
Add default .prospector.yaml
arnaud-morvan Oct 27, 2020
f078ffa
Update yamllint.yaml
arnaud-morvan Oct 27, 2020
74efcc9
Update geoportal/.eslintrc
arnaud-morvan Oct 27, 2020
ab2bfc7
Add default geoportal/tsconfig.json
arnaud-morvan Oct 27, 2020
201cdf0
fix: path not created
tonio Oct 27, 2020
c0ad915
fix: requirements are in luxembourg_requirements
tonio Oct 27, 2020
95f7e24
fix: disable check, use customized eval-tempaltes (for JSAPI)
tonio Oct 27, 2020
8b83ad0
Reconfigure geoportal/vars.yaml
arnaud-morvan Oct 27, 2020
f6e020e
Remove geoportal/ls.js
arnaud-morvan Oct 27, 2020
57cde42
Remove bge.mk
arnaud-morvan Oct 27, 2020
f162a14
Add missing PGPORT_SLAVE in env.project
arnaud-morvan Oct 28, 2020
a85eb52
Use internal print
arnaud-morvan Oct 28, 2020
6e5810d
Disable checkers for mapserverproxy
arnaud-morvan Oct 28, 2020
4cfd1a8
Build lb lang in config Dockerfile
arnaud-morvan Oct 28, 2020
d58133c
Set url to config://proxywms in Internal WMS
arnaud-morvan Oct 28, 2020
f0c677f
Customize the checkers
arnaud-morvan Oct 28, 2020
0f6bed6
Restore custom print config and templates
arnaud-morvan Oct 29, 2020
5be8804
Configure print checker
arnaud-morvan Oct 29, 2020
28292d6
GMF proxy now use requests instead of httplib2
arnaud-morvan Oct 29, 2020
492a4dc
fix: reenable api generation
tonio Oct 28, 2020
7f82f14
chore: disable progress in npm
tonio Oct 29, 2020
b8c162e
chore: temporary disable API generation
tonio Oct 29, 2020
8fe24e8
fix: switch to a ngeo with downgraded angular
tonio Oct 29, 2020
97bdfc3
Add db to composition
Oct 30, 2020
697ecc4
Merge pull request #2593 from Geoportail-Luxembourg/add-db-to-composi…
Nov 3, 2020
743df2a
fix: set group to use as background in theme query
tonio Nov 2, 2020
74fcf66
fix: bg selector images broken in dev mode
tonio Nov 3, 2020
e2a6ada
Merge branch 'gmf2.5_amn' into upgrade_c2cgeoportal_GSLUX-333
tonio Nov 3, 2020
0ae1be5
Merge pull request #2584 from Geoportail-Luxembourg/fix-frontend-styles
llienher Nov 4, 2020
e7dbf41
fix: avoid errors due to ngeo update
tonio Nov 4, 2020
2d13b63
Fix themes.json with internal WMS
arnaud-morvan Nov 30, 2020
65d6361
Merge pull request #2621 from arnaud-morvan/fix-themes-for-internal-wms2
tonio Dec 1, 2020
14144b9
fix: tabs in layers panel
tonio Nov 20, 2020
61fd4c3
fix: update tab switching programatic triggering
tonio Nov 24, 2020
69d2d62
refactor: simplify catalog code
tonio Dec 1, 2020
61c4ae2
refactor: use for/of loop
tonio Dec 1, 2020
2b89bf0
fix: error when drawing azimuth
tonio Dec 1, 2020
8dc1704
fix: ci fails building docker images
tonio Dec 1, 2020
c5ada63
Merge remote-tracking branch 'origin/upgrade_c2cgeoportal_GSLUX-333' …
tonio Dec 3, 2020
f968e59
fix: webpack build, still to find out differences with modes
tonio Dec 10, 2020
34b5a8b
fix: avoid wrong $ remplacement in main file
tonio Dec 14, 2020
372f159
Bump cesium and fix bugs
Dec 15, 2020
08cc067
fix: collapsed catalog at launch
tonio Dec 15, 2020
a2e7682
Proxy config is required
rmichaelis Dec 15, 2020
2e864c9
Merge pull request #2647 from Geoportail-Luxembourg/rmichaelis-patch-…
rmichaelis Dec 15, 2020
0d03843
proxy is required
rmichaelis Dec 15, 2020
a462796
Merge pull request #2648 from Geoportail-Luxembourg/rmichaelis-patch-…
rmichaelis Dec 15, 2020
001fb6b
Fix eval-template and files right.
Dec 16, 2020
8b9edd3
Fix palette icon for download style button in vector style editor
llienher Dec 18, 2020
44acb30
Fix right click panel image width
llienher Dec 21, 2020
420a321
Fix print and share html
llienher Dec 21, 2020
4aee108
Move button download offline data out of the overlay
llienher Dec 21, 2020
2645d22
Merge remote-tracking branch 'origin/c2cnextprod' into merge_nextprod_25
tonio Dec 24, 2020
59115e1
fix: import after merge
tonio Jan 4, 2021
98c2d8e
fix: less syntax in sass files
tonio Jan 4, 2021
c194dab
fix: missing python dependency
tonio Jan 4, 2021
3ac15b7
fix: add missing mapbox legacy
tonio Jan 4, 2021
9185629
fix: unused? wmts url params
tonio Jan 4, 2021
ca89fd6
fix: bad rebase in template
tonio Jan 4, 2021
ac9535a
fix: ngeo BC
tonio Jan 4, 2021
72f211d
fix: config moved to vars
tonio Jan 4, 2021
0d1b33b
update to all alembic heads lince branchpoint is present at version 1…
mki-c2c Jan 5, 2021
7633970
fix: broken header/footer layout
tonio Jan 5, 2021
d23cdd5
fix: missing import
tonio Jan 5, 2021
fb2630f
fix: missing piece of 9185629371
tonio Jan 5, 2021
b6ba4df
fix: undeclared var
tonio Jan 5, 2021
b48bd46
fix: avoid error on missing metadata
tonio Jan 5, 2021
ecb1f66
fix: avoid error with mask layer
tonio Jan 6, 2021
561ce8d
fix: BC in c2cgeoportal proxy
tonio Jan 6, 2021
0315d43
fix bug in getuserinfo
mki-c2c Jan 8, 2021
c338c5f
update cookie settings for workaround, check security implications of…
mki-c2c Jan 8, 2021
885b136
modify docker override file so that it does not overwrite translation…
mki-c2c Jan 8, 2021
4918f44
Fix user role id reference in mymaps.py
llienher Jan 11, 2021
9a4b536
fix internal WMS layers
mki-c2c Jan 11, 2021
b5b8a35
add path for raster source file to make profile work
mki-c2c Jan 11, 2021
f226905
fix profile calculator (check if fast_json supports decimal and if th…
mki-c2c Jan 11, 2021
02ee30a
fix dbsession in ligua_extractor
mki-c2c Jan 11, 2021
e04236f
fix translation build
mki-c2c Jan 11, 2021
c70ee3e
fix: more robust metadata testing
tonio Jan 12, 2021
7ae55fd
fix: more robust check to avoid side effects
tonio Jan 13, 2021
290a541
fix: dropdown wrongly positioned
tonio Jan 13, 2021
2ff0cf1
fix: dropdown list appearance
tonio Jan 13, 2021
b4e629d
fix: mymaps custom dropdown
tonio Jan 13, 2021
7344fc2
Use proxy settings
rmichaelis Jan 18, 2021
93e86c1
Use proxy settings
rmichaelis Jan 18, 2021
4a6aa60
Use proxy settings
rmichaelis Jan 18, 2021
9209606
Use proxy settings
rmichaelis Jan 18, 2021
8ab3dd0
missing policy
rmichaelis Jan 20, 2021
cb95a09
fix: avoid scrollbar (on windows)
tonio Feb 4, 2021
76d1693
Update vars.yaml
rmichaelis Feb 4, 2021
ba7b155
Merge pull request #2664 from Geoportail-Luxembourg/fix_migration
rmichaelis Feb 4, 2021
7568896
fix: disable CSP to check out what it breaks
tonio Feb 8, 2021
ef528c2
fix: avoid merging with gmf default headers
tonio Feb 9, 2021
7f4a6c6
fix: override headers to avoid GMF defaults
tonio Feb 10, 2021
c1b263a
Merge remote-tracking branch 'origin/master' into upgrade_c2cgeoporta…
tonio Feb 17, 2021
33cb538
Use 2.5.0-lux.4
llienher Feb 17, 2021
0cf51aa
copy files from 2.3
tonio Mar 16, 2021
32f2a26
update build from 2.3
tonio Mar 16, 2021
194b8ad
replug dynamic.json
tonio Mar 16, 2021
f1ce69b
fix: wmtsurl injection
tonio Mar 16, 2021
67ad59e
fix: build path
tonio Mar 16, 2021
616e83f
fix: load background layers in theme
tonio Mar 16, 2021
c0c5695
fix: add missing files
tonio Mar 16, 2021
99101ec
update front with latest 2.3
tonio Mar 17, 2021
1293e48
reapply front fix
tonio Mar 17, 2021
1db842e
add missing route in vars
tonio Mar 17, 2021
83d3022
chore: upgrade ol/olcs/cesium
tonio Mar 17, 2021
1e14f15
fix: adapt to ol changes
tonio Mar 17, 2021
2dd9c52
fix: build paths
tonio Mar 17, 2021
78fd3d3
use local copy of ngeo
tonio Mar 18, 2021
df25d84
use 2.3 lux version
tonio Mar 18, 2021
fd23376
chore: update ngeo for ol 6.5 (step1: build)
tonio Mar 18, 2021
30f38d2
chore: update app for ol 6.5 (step1: build)
tonio Mar 18, 2021
ba261fe
chore: force up-to-date ngeo
tonio Mar 18, 2021
dc5844e
chore: fix app upgrade
tonio Mar 19, 2021
270c452
chore: fix ngeo upgrade
tonio Mar 19, 2021
dda11bc
fix: remove log
tonio Mar 19, 2021
128583a
fix: ol babel rules, inheritance with olObservable
tonio Mar 25, 2021
86dd50f
Re-use MapboxLayer geoblock
llienher Mar 25, 2021
222a495
Fix LocationControl button
llienher Mar 25, 2021
efcafc6
Fix some javascript errors
llienher Mar 29, 2021
ca9e196
Missing options in constructor
llienher Mar 29, 2021
950de54
Fix
llienher Mar 29, 2021
be82f25
fix: avoid re-adding same layer
tonio Mar 31, 2021
838fb28
fix: layer can't be added AND setMap'
tonio Mar 31, 2021
56ad638
Fix handleEvent error
llienher Mar 31, 2021
df7c6ad
Fix feature popup
llienher Mar 31, 2021
f2cc075
Fix drawnFeatures file
llienher Apr 6, 2021
9e2cbc3
Fix mvt background layer not being detected as such
llienher Apr 6, 2021
a64ea1f
Fix measure errors on handleEvent
llienher Apr 6, 2021
a4101e7
Fix measure tool errors
llienher Apr 6, 2021
58491b2
Fix CustomEvent type property not being initialized
llienher Apr 7, 2021
c852e71
Removed unused files from old background layer component
llienher Apr 7, 2021
6826243
Fix routesOrder error
llienher Apr 7, 2021
70652dc
Removed old exports
llienher Apr 8, 2021
a05dbfc
Fix webpack dev server
llienher Apr 8, 2021
a5414b3
Remove exports in measure azimut file
llienher Apr 8, 2021
6266d47
Fix print scale selector
llienher Apr 8, 2021
a50d2c8
chore: identify vector layer for debug
tonio Apr 13, 2021
5bdfe87
fix unexpected error
tonio Apr 14, 2021
61ac06f
fix: FINALLY \o/ fix style of selected feature
tonio Apr 14, 2021
defded7
Introduce a mask layer for offline
llienher Apr 21, 2021
026765f
Introduce a new mask for the print
llienher Apr 21, 2021
8726666
Move print mask to correct folder (ngeo src)
llienher Apr 21, 2021
c4d82de
Fix errors on .filter() condition
llienher Apr 21, 2021
063b793
Adapt print mask and controller to work with 2.3 export syntax
llienher Apr 21, 2021
cb3aa66
Fix location control button position
llienher Apr 21, 2021
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
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
Original file line number Diff line number Diff line change
@@ -493,21 +493,25 @@ exports.prototype.print = function(format) {
}
var curLang = this.gettextCatalog.currentLanguage;
var url = this.getHtmlLegendUrl;
this.layers_.forEach(function(layer) {

// We remove the mask from the array
const layersArray_ = this.layers_.filter(l => l instanceof MaskLayer === false);

layersArray_.forEach((layer) => {
var curMetadata = layer.get('metadata');
var metaMaxDpi = curMetadata.max_dpi;
var metaMaxDpi = curMetadata['max_dpi'];
if (metaMaxDpi !== undefined) {
var maxDpi = parseInt(metaMaxDpi, 10);
if (dpi > maxDpi) {
dpi = maxDpi;
}
}
var name = curMetadata.legend_name;
var name = curMetadata['legend_name'];
if (name !== undefined) {
legend.push({ 'name': name });
} else {
var id = layer.get('queryable_id');
var isExternalWms = curMetadata.isExternalWms;
var isExternalWms = curMetadata['isExternalWms'];
if (isExternalWms) {
var legendUrl = curMetadata['legendUrl'];
var accessConstraints = curMetadata['legendAccessConstraints'];