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

update of offline data #2824

Draft
wants to merge 355 commits into
base: integration
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
355 commits
Select commit Hold shift + click to select a range
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
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
0648f58
temporary update of offline download dialog for testing purpose. Each…
mki-c2c Nov 22, 2021
880cfdb
adapt interface to updated restful API and to corrected resource names
mki-c2c Nov 22, 2021
bc88ff5
open status window directly
mki-c2c Nov 22, 2021
8de0f3e
fix resource names for tiles packages (-lu suffix needed)
mki-c2c Nov 26, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 11 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*
!bin/
!mapserver/
!qgisserver/
!tilegeneration/
!print/print-apps/
!geoportal/vars*.yaml
!geoportal/CONST_vars.yaml
!geoportal/CONST_config-schema.yaml
!geoportal/geoportailv3_geoportal/static
!geoportal/geoportailv3_geoportal/locale
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,11 @@ trim_trailing_whitespace = true
[*.js]
indent_size = 2

[*.yaml]
indent_size = 2

[*.yml]
indent_size = 2

[Makefile]
indent_style = tab
23 changes: 7 additions & 16 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,16 @@
*~
*.pyc
*.pyo
__pycache__/
/.env
/geoportal/.venv/
/geoportal/dist/
/geoportal/build/
/geoportal/geoportailv3_geoportal/static-ngeo/build/
/geoportal/geoportailv3_geoportal.egg-info/
/geoportal/geoportailv3_geoportal/locale/*/LC_MESSAGES/*.mo
/geoportal/c2cgeoportal/
/geoportal/node_modules/
/docker-compose.override.yaml
/upgrade
/.upgrade.yaml
/.UPGRADE*
/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-client.pot
/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-server.pot
/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-tooltips.pot
/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-legends.pot
/geoportal/geoportailv3_geoportal/locale/ngeo.pot
/.build/
/node_modules/
/geoportailv3/
/apache/
/print/WEB-INF/
/geoportailv3.egg-info/
/geoportal/jsapi/node_modules/

# Generated with dev mode
/geoportal/geoportailv3_geoportal/static/apihelp/index.html
22 changes: 22 additions & 0 deletions .prospector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
strictness: veryhigh

pep8:
options:
max-line-length: 110
disable:
- E203

pylint:
options:
max-line-length: 110
disable:
- too-many-locals
- too-many-statements
- too-many-branches

mccabe:
run: false

mypy:
run: true
67 changes: 67 additions & 0 deletions CONST_CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
This file includes migration steps for each release of c2cgeoportal.


Version 2.5.0
=============

Information
-----------

1. Basic authentication is disabled by default from this version onward.
To enable basic auth see:
https://camptocamp.github.io/c2cgeoportal/2.5/integrator/security.html#basic-auth

2. We change the secret name from `GITHUB_GOPASS_CI_TOKEN` to `GOPASS_CI_GITHUB_TOKEN` because we can't
anymore create create secret started with `GITHUB_`.

3. Layers which have any errors are not added to the theme anymore.

4. If a WMS version is given in an OGC server URL, it will be used for the GetCapabilities request
Supported versions: 1.1.1 and 1.3.0

Changes to apply
----------------

1. Now we need to have PyYAML python package installed in the home,
see the documentation for more information:
https://camptocamp.github.io/c2cgeoportal/2.5/integrator/requirements.html

2. The configuration vars `vars/functionalities/anonymous` and `vars/functionalities/registered` should
be moved to the new roles `anonymous` and `registered` that will be created once the database has been upgraded.

3. The 'INSTANCE' configuration variable is removed, it should be in the '.env' files, and also the
environment makefiles, these contents should also be moved to the '.env' files. In a multi-organisation
project you can have a chain of multiple '.env' files see the build configuration documentation.

4. A new PostgreSQL extension is required, install it by running in psql:
`CREATE EXTENSION IF NOT EXISTS hstore;`

5. The static files will be moved, therefore you should replace:
`request.static_url('geoportailv3_geoportal:static/` by:
`request.static_url('/etc/geomapfish/static/`.

6. Optional, change your mapfiles according the documentation:
https://camptocamp.github.io/c2cgeoportal/2.5/administrator/mapfile.html


Version 2.4.2
=============

Information
-----------

1. The SVG inclusion through Webpack has changed, See ngeo SVG example for more information:
https://camptocamp.github.io/ngeo/master/examples/svg.html

2. The WMTS capabilities is now generated on runtime.

3. If not already done the 'edit' and 'routing' interfaces and their relations will be removed from the
database, If you don't want that, you should rename the interfaces before applying the alembic scripts.

4. If not already done the 'api' and 'iframe_api' will be created. After the database upgrade you can run
the following request to fill e.-g. the api's interfaces with the desktop interface:

INSERT INTO main.interface_layer (interface_id, layer_id)
SELECT <api_interface_id>, layer_id FROM main.interface_layer WHERE interface_id = <other_interface_id>;
INSERT INTO main.interface_theme (interface_id, theme_id)
SELECT <api_interface_id>, theme_id FROM main.interface_theme WHERE interface_id = <other_interface_id>;
11 changes: 11 additions & 0 deletions CONST_create_template/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
*
!bin/
!mapserver/
!qgisserver/
!tilegeneration/
!print/print-apps/
!geoportal/vars*.yaml
!geoportal/CONST_vars.yaml
!geoportal/CONST_config-schema.yaml
!geoportal/geoportailv3_geoportal/static
!geoportal/geoportailv3_geoportal/locale
21 changes: 21 additions & 0 deletions CONST_create_template/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
root = true

[*]
end_of_line = lf
insert_final_newline = true
charset = utf-8
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.js]
indent_size = 2

[*.yaml]
indent_size = 2

[*.yml]
indent_size = 2

[Makefile]
indent_style = tab
56 changes: 56 additions & 0 deletions CONST_create_template/.github/workflows/ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
---
name: Continuous integration

on:
push:

env:
PROJECT: geoportailv3
# Requires CI_GPG_PRIVATE_KEY and GOPASS_CI_GITHUB_TOKEN secrets.
# OPENSHIFT_PROJECT: gs-gmf-geoportailv3
# HELM_RELEASE_NAMES: # List of branch that should be deployed on helm
PATH: /bin:/usr/bin:/usr/local/bin:/home/runner/.local/bin
SUMMON_PROVIDER: /usr/local/bin/gopass

jobs:
config:
runs-on: ubuntu-18.04
name: Config
timeout-minutes: 10

steps:
- uses: actions/checkout@v1

- name: Build config
run: ./build --config

- uses: camptocamp/initialise-gopass-summon-action@v1
with:
ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
if: "env.HELM_RELEASE_NAMES != ''"
- run: scripts/publish-docker --image=config --no-trigger
if: "env.HELM_RELEASE_NAMES != ''"
- run: scripts/publish-docker --image=config --service=github
if: "env.HELM_RELEASE_NAMES != ''"

geoportal:
runs-on: ubuntu-18.04
name: Geoportal
timeout-minutes: 10

steps:
- uses: actions/checkout@v1

- name: Build geoportal
run: ./build --geoportal

- uses: camptocamp/initialise-gopass-summon-action@v1
with:
ci-gpg-private-key: ${{secrets.CI_GPG_PRIVATE_KEY}}
github-gopass-ci-token: ${{secrets.GOPASS_CI_GITHUB_TOKEN}}
if: "env.HELM_RELEASE_NAMES != ''"
- run: scripts/publish-docker --image=geoportal --no-trigger
if: "env.HELM_RELEASE_NAMES != ''"
- run: scripts/publish-docker --image=geoportal --service=github
if: "env.HELM_RELEASE_NAMES != ''"
13 changes: 13 additions & 0 deletions CONST_create_template/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
*.pyc
*.pyo
__pycache__/
/.env
/docker-compose.override.yaml
/upgrade
/.upgrade.yaml
/.UPGRADE*
/geoportal/geoportailv3_geoportal/locale/geoportailv3_geoportal-client.pot
/env.personal

# Generated with dev mode
/geoportal/geoportailv3_geoportal/static/apihelp/index.html
22 changes: 22 additions & 0 deletions CONST_create_template/.prospector.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
strictness: veryhigh

pep8:
options:
max-line-length: 110
disable:
- E203

pylint:
options:
max-line-length: 110
disable:
- too-many-locals
- too-many-statements
- too-many-branches

mccabe:
run: false

mypy:
run: true
66 changes: 66 additions & 0 deletions CONST_create_template/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
FROM camptocamp/geomapfish-tools:2.5.0.139 as builder

ENV LANGUAGES="en fr de"
ENV VARS_FILE=vars.yaml
ENV CONFIG_VARS sqlalchemy.url sqlalchemy.pool_recycle sqlalchemy.pool_size sqlalchemy.max_overflow \
sqlalchemy.use_batch_mode sqlalchemy_slave.url sqlalchemy_slave.pool_recycle sqlalchemy_slave.pool_size \
sqlalchemy_slave.max_overflow sqlalchemy_slave.use_batch_mode schema schema_static enable_admin_interface \
default_locale_name servers layers available_locale_names cache admin_interface getitfixed functionalities \
raster shortener hide_capabilities tinyowsproxy resourceproxy print_url print_get_redirect \
checker check_collector default_max_age package srid \
reset_password fulltextsearch global_headers headers authorized_referers hooks stats db_chooser \
dbsessions urllogin host_forward_host smtp c2c.base_path welcome_email \
lingua_extractor interfaces_config interfaces devserver_url api authentication intranet metrics pdfreport

COPY . /tmp/config/

RUN \
for lang in ${LANGUAGES}; \
do \
node /usr/bin/compile-catalog \
/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal/locale/${lang}/LC_MESSAGES/ngeo.po \
/opt/c2cgeoportal/geoportal/c2cgeoportal_geoportal/locale/${lang}/LC_MESSAGES/gmf.po \
/tmp/config/geoportal/geoportailv3_geoportal/locale/${lang}/LC_MESSAGES/geoportailv3_geoportal-client.po \
> /tmp/config/geoportal/geoportailv3_geoportal/static/${lang}.json; \
done && \
rm -rf /tmp/config/geoportal/geoportailv3_geoportal/locale

RUN \
cd /tmp/config/geoportal/ && \
c2c-template --vars ${VARS_FILE} \
--get-config geoportailv3_geoportal/config.yaml \
${CONFIG_VARS} && \
pykwalify --data-file geoportailv3_geoportal/config.yaml \
--schema-file CONST_config-schema.yaml && \
rm CONST_* vars.yaml

###############################################################################

FROM camptocamp/geomapfish-config:2.5.0.139

ARG PGSCHEMA
ENV PGSCHEMA=$PGSCHEMA

COPY --from=builder /tmp/config/ /tmp/config/

RUN \
if [ -e /tmp/config/mapserver ]; then mv /tmp/config/mapserver /etc/; fi && \
if [ -e /tmp/config/tilegeneration ]; then mv /tmp/config/tilegeneration /etc/; fi && \
if [ -e /tmp/config/qgisserver ]; then mv /tmp/config/qgisserver /etc/qgisserver; fi && \
mkdir --parent /usr/local/tomcat/webapps/ROOT/ && \
if [ -e /tmp/config/print ]; then mv /tmp/config/print/print-apps /usr/local/tomcat/webapps/ROOT/; fi && \
mv /tmp/config/geoportal/geoportailv3_geoportal/ /etc/geomapfish/ && \
chmod g+w -R /etc /usr/local/tomcat/webapps && \
adduser www-data root && \
sed 's#bind :80#bind *:443 ssl crt /etc/haproxy_dev/localhost.pem#g' /etc/haproxy/haproxy.cfg.tmpl \
> /etc/haproxy_dev/haproxy.cfg.tmpl && \
echo ' http-request set-header X-Forwarded-Proto https' >> /etc/haproxy_dev/haproxy.cfg.tmpl

VOLUME /etc/geomapfish \
/etc/mapserver \
/etc/qgisserver \
/etc/tilegeneration \
/usr/local/tomcat/webapps/ROOT/print-apps \
/etc/gunicorn \
/etc/haproxy_dev \
/etc/haproxy
29 changes: 29 additions & 0 deletions CONST_create_template/README.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
geoportailv3 project
===================

Read the `Documentation <https://camptocamp.github.io/c2cgeoportal/2.5/>`_

Checkout
--------

.. code::

git clone [email protected]:camptocamp/geoportailv3.git

cd geoportailv3

Build
-----

.. code::

./build

Run
---

.. code::

docker-compose up -d

.. Feel free to add project-specific things.
Loading