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

MAJ GeoBrun #1

Merged
merged 201 commits into from
Sep 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
201 commits
Select commit Hold shift + click to select a range
fcd44ac
first commit
mvoundy Jul 7, 2020
9988e55
removing unused import
mvoundy Jul 7, 2020
67a6b9f
gitignore update
mvoundy Jul 7, 2020
9e6705b
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages into f…
mvoundy Jul 7, 2020
f3495c3
added copyright notice option in config template
mvoundy Jul 7, 2020
8c2017a
image processing rework
mvoundy Jul 7, 2020
cbd4a2b
image processing rework
mvoundy Jul 7, 2020
ac9ebee
update img processing tests
mvoundy Jul 7, 2020
274dfe8
ftp fetch teardown update. will remove fetched files
mvoundy Jul 7, 2020
b98fc1c
refacted db and images
mvoundy Jul 7, 2020
88d376b
fixed missing import
mvoundy Jul 7, 2020
5dffbbd
readme update
mvoundy Jul 7, 2020
868b8d5
readme update
mvoundy Jul 7, 2020
cad6500
Merge pull request #85 from PnX-SI/ftpclient
HamoudaAmine Jul 8, 2020
6fdab1b
Update vuejs, bootstrap, bootstrap-vue
20cents Jul 30, 2020
b3efd06
Fix update vuejs, bootstrap, bootstrap-vue
20cents Jul 31, 2020
373c056
Update leaflet
20cents Jul 31, 2020
3667519
Update swiper
20cents Jul 31, 2020
1c640ce
Rename comparator page by site, support multiple comparators
20cents Jul 31, 2020
90dd9d0
No longer expose the whole photo object
20cents Jul 31, 2020
7782969
Update config.py.tpl
20cents Jul 31, 2020
a48bca3
Init comparator v2
20cents Jul 31, 2020
ad2ae19
Update installation.rst
Chrispnv Aug 11, 2020
2a244eb
Test compare with leaflet-side-by-side.js
20cents Aug 11, 2020
ee55c02
Update installation.rst
Chrispnv Aug 11, 2020
30d90c2
Enable comparator mode switcher
20cents Aug 11, 2020
f438d26
Update installation.rst
Chrispnv Aug 12, 2020
03fad9c
Update installation.rst
Chrispnv Aug 12, 2020
6dcfc41
Update installation.rst
Chrispnv Aug 12, 2020
97152af
Update installation.rst
Chrispnv Aug 12, 2020
74f0fab
Update installation.rst
Chrispnv Aug 12, 2020
0b73e6a
Update installation.rst
Chrispnv Aug 12, 2020
f57e312
Photos are eligible for regeneration on site update
20cents Aug 12, 2020
816564d
Fix custom link asset on page sample
20cents Aug 12, 2020
44f78fd
Minor text align fix
20cents Aug 12, 2020
8024f06
Comparator UI enhancements
20cents Aug 12, 2020
e76a893
Add loading indicator on comparator
20cents Aug 13, 2020
71ebfca
Order sites by ref
20cents Aug 13, 2020
4f42a1a
Merge branch 'master' of https://github.com/PnX-SI/GeoPaysages
20cents Aug 13, 2020
dd90c4a
Minor cleaning
20cents Aug 13, 2020
d9efc06
Comparators are now Vue components
20cents Aug 13, 2020
c75b7b1
Comparator loading no longer covers the whole page
20cents Aug 13, 2020
716d474
Comparator selector is now a component
20cents Aug 13, 2020
767546f
Enable date filter on comparator
20cents Aug 13, 2020
2047b75
WiP Comparator items pagination
20cents Aug 13, 2020
7e346f4
Update installation.rst
Chrispnv Aug 14, 2020
84deac5
Use binary search algo on photo selector
20cents Aug 14, 2020
149c7c0
RC Comparator's selector large volume compliant
20cents Aug 14, 2020
8dc02de
Import FTP - Add documentation (#79)
camillemonchicourt Aug 19, 2020
c35f6ac
Responsive enhancements on comparator
20cents Aug 26, 2020
f49f432
Merge branch 'dev' of https://github.com/PnX-SI/GeoPaysages into dev
20cents Aug 26, 2020
3d13dbe
Add captions on comparator v2
20cents Aug 31, 2020
0d1360d
Fix CSS
20cents Aug 31, 2020
9bbb275
Map page properly works without site ref
20cents Aug 31, 2020
7dd0db7
Map filters UI enhancements
20cents Aug 31, 2020
d55cc06
Site page UI enhancements
20cents Aug 31, 2020
e64506d
Update config.py.tpl
20cents Aug 31, 2020
5f9cd6c
Rename site/:id to sites/:id
20cents Aug 31, 2020
2eb74bd
Fix CSS
20cents Sep 1, 2020
9adb791
RC page last photo
20cents Sep 1, 2020
4362e90
Merge pull request #94 from PnX-SI/page-last-photo
20cents Sep 1, 2020
f4692b9
Fix site title without ref
20cents Sep 1, 2020
f8fb3c2
Revert temporarily /site api route
20cents Sep 1, 2020
0e2d20e
Display a text intro stored in in db on home page
20cents Sep 1, 2020
07cd8ce
Latest site photo enhancements
20cents Sep 1, 2020
a70b265
Fix map filters UI
20cents Sep 2, 2020
b83efd1
Minor var name change
20cents Sep 2, 2020
7ed93d3
Support home_intro_position
20cents Sep 2, 2020
722cada
App about page
20cents Sep 2, 2020
59970a1
Fix typo
20cents Sep 2, 2020
461db61
Update installation.rst
20cents Sep 2, 2020
c0bfc9b
Rename page map to sites
20cents Sep 2, 2020
9ddb48e
Some rename
20cents Sep 2, 2020
8848728
README - Remove doc dev
camillemonchicourt Sep 2, 2020
f627be0
DOC installation - Reorganisation
camillemonchicourt Sep 2, 2020
667ba62
DOC install - Review and custom CSS
camillemonchicourt Sep 2, 2020
2414549
Fix date format, minor refact
20cents Sep 16, 2020
160f89e
Merge branch 'dev' of https://github.com/PnX-SI/GeoPaysages into dev
20cents Sep 16, 2020
a36d6f4
HTML chars are no more escaped on site's page
20cents Sep 16, 2020
c4265bc
Comparator should support datetime format
20cents Sep 16, 2020
8d84de0
Comparator: stepper, ratio, zoom
20cents Oct 8, 2020
607b138
Home: rename map to sites
20cents Oct 8, 2020
215d05e
Update installation.rst
20cents Oct 8, 2020
fc9a04c
including author in copyright
mvoundy Oct 16, 2020
73e9607
path lower case and character replacements
mvoundy Oct 16, 2020
b141eef
documentation update
mvoundy Oct 18, 2020
9cb6414
missing pillow package from install
mvoundy Oct 18, 2020
de195b5
saving date as datetime
mvoundy Oct 18, 2020
c7112b6
datetime parse tokens
mvoundy Oct 18, 2020
831cd8f
minor: imports update
mvoundy Oct 18, 2020
3e5117f
unitests update regarding new features
mvoundy Oct 18, 2020
5a8c570
gitignore update
mvoundy Oct 18, 2020
b42530c
Licence and author searator update
mvoundy Oct 19, 2020
4f747a4
fixed prod install package finding
mvoundy Oct 19, 2020
a7f65de
Renommage script oppvdb.sql et variable pour le fichier de log
Oct 21, 2020
043b644
Préciser la geom de t_site
Oct 21, 2020
7ffefb5
Comparator: change photos num per page
20cents Oct 21, 2020
3025537
Comparator: Fix responsive
20cents Oct 21, 2020
b37b4c8
Comparator support dbconf comparator_zoom_control
20cents Oct 21, 2020
1bf8d29
DOC - ajustements mineurs
Oct 21, 2020
6d3ba22
Ne pas figer les versions de postgresql-postgis
Oct 21, 2020
f494623
Merge branch 'dev' of https://github.com/PnX-SI/GeoPaysages into dev
20cents Oct 21, 2020
0caa801
Add comment in config.py.tpl
Oct 21, 2020
5cb86b6
DOC - Corrections
Oct 21, 2020
b2d0ad4
Modification scripts d'install SQL - UsersHub
Oct 21, 2020
facd281
Modification install_db.sh - UsersHub
Oct 21, 2020
7a0bb52
Modification settings.ini - UsersHub
Oct 21, 2020
2d4fd69
Suppression userHubDB.sql
Oct 21, 2020
80314b0
Modification models.py - UsersHub
Oct 21, 2020
f84fbd8
Ajout commentaire PASS_METHOD
Oct 21, 2020
d85ef81
DOC - MàJ UsersHub
Oct 21, 2020
3087031
DOC - Ajustements
Oct 21, 2020
6219aed
Merge branch 'pnrp_dev_install' into pnrp_dev_users
Oct 21, 2020
bfaa835
Merge pull request #98 from xavyeah39/pnrp_dev_install
camillemonchicourt Oct 21, 2020
26be0de
Modifier la méthode d'authentification par défaut : 'hash'
Oct 22, 2020
d8b16b0
MàJ de la version par défaut de UsersHub
Oct 22, 2020
38863c1
Merge pull request #99 from xavyeah39/pnrp_dev_users
camillemonchicourt Oct 22, 2020
85fb735
Merge pull request #97 from PnX-SI/author_in_import_script
20cents Oct 27, 2020
49ac567
Utilisation de DEFAULT_SORT_SITES dans la page Galerie
Oct 29, 2020
31f8280
Ajustements mineurs CSS
Oct 29, 2020
b17ad64
MàJ de la doc et suppression d'un paramètre déprécié dans la table `c…
Oct 29, 2020
49353a0
Comparateur v2 - Ajout de variables de traduction
Oct 29, 2020
bf584ed
Comparateur v2 - Ajout d'un parammètre ``comparator_date_filter``
Oct 29, 2020
bbc50b7
Comparateur v2 - Ajout d'un parammètre ``comparator_date_steps_button``
Oct 29, 2020
6c2ed78
Comparateur v2 - Ajout d'un parammètre ``comparator_date_format``
Oct 29, 2020
fefde91
Correction d'une coquille
Nov 5, 2020
63dc200
Merge pull request #101 from xavyeah39/pnrp_dev
20cents Nov 9, 2020
b69d2a9
Merge pull request #103 from xavyeah39/pnrp_dev_comparatorv2
20cents Nov 9, 2020
1bd6abd
Comparator initialization enhancement
20cents Nov 9, 2020
36250f1
Add some translations
20cents Nov 9, 2020
43150ab
Fix - Comparator V2 : "invalid Date" with Safari and iOS
Nov 9, 2020
6c7c989
Script update enhancements
20cents Nov 10, 2020
6e68410
Merge pull request #108 from xavyeah39/pnrp_dev
20cents Nov 10, 2020
bfa5946
Update all Flask
20cents Nov 10, 2020
d1748e7
Bump Pillow
20cents Nov 10, 2020
e63c570
rm print
20cents Nov 10, 2020
0cb319f
Fix: Pillow allow truncated images
20cents Nov 10, 2020
e3b0937
Merge branch 'dev' of https://github.com/PnX-SI/GeoPaysages into upgr…
20cents Nov 10, 2020
7f6b033
Create changelog.rst
camillemonchicourt Dec 7, 2020
9860a70
Changelog 1.1.0
camillemonchicourt Dec 7, 2020
cbba5f2
Changelog 1.1.0 - Compléments
camillemonchicourt Dec 7, 2020
ffe3a44
Update UH-authentification-module #109
camillemonchicourt Jan 29, 2021
19907ed
Merge pull request #111 from PnX-SI/upgrade_py_deps
camillemonchicourt Jul 29, 2021
e57c2cb
update doc + install
TheoLechemia Jul 29, 2021
0fb6982
fix circular import
TheoLechemia Jul 29, 2021
ff22cda
comment unsed view + user usershub models
TheoLechemia Jul 29, 2021
9ce3efc
Uncomment user view
TheoLechemia Jul 29, 2021
887f08a
remove unused file
TheoLechemia Jul 29, 2021
2cbf43e
remove import
TheoLechemia Jul 29, 2021
8bbb03c
Prepa 1.1.0
camillemonchicourt Jul 29, 2021
4290f45
merge master in dev...
TheoLechemia Jul 30, 2021
9026674
clean unused import
TheoLechemia Jul 30, 2021
39c6799
Gitignore and unsample in install all custom/languages files
TheoLechemia Jul 30, 2021
5949e59
remove all try except Exception to have correct log
TheoLechemia Jul 30, 2021
2c33c5c
fix bug if no photo
TheoLechemia Jul 30, 2021
4aa185c
fix /sites
TheoLechemia Jul 30, 2021
9ad8e08
Fix update site + set trap_all_exception to False
TheoLechemia Jul 30, 2021
77e8215
Review doc installation
camillemonchicourt Jul 30, 2021
8b507a1
Update installation.rst
camillemonchicourt Jul 30, 2021
36c71ca
Update installation.rst
camillemonchicourt Jul 30, 2021
34a82fb
Changelog 1.1.0
camillemonchicourt Jul 30, 2021
a1126cc
Merge pull request #127 from PnX-SI/dev
camillemonchicourt Jul 30, 2021
9d4b0bf
Update installation.rst
camillemonchicourt Jul 30, 2021
ef4a666
Update changelog.rst
camillemonchicourt Jul 30, 2021
3b43567
Merge pull request #128 from PnX-SI/dev
camillemonchicourt Jul 30, 2021
00af470
ftpclient : add missing import
TheoLechemia Aug 2, 2021
4f4262b
add favicon in public page
TheoLechemia Aug 2, 2021
dc81e6a
Merge branch 'dev' of https://github.com/PnX-SI/GeoPaysages into dev
TheoLechemia Aug 2, 2021
253e003
add css variable
TheoLechemia Aug 2, 2021
6204c8f
remove title from header
TheoLechemia Aug 2, 2021
36d82dd
remove double scroll
TheoLechemia Aug 2, 2021
e7e2ddd
remove mandatory photo on site
TheoLechemia Aug 19, 2021
b969ca9
fix next when no main photo
TheoLechemia Aug 19, 2021
568c28e
remove redundant type date on input
TheoLechemia Nov 2, 2021
58bad54
Merge branch 'dev' of https://github.com/PnX-SI/GeoPaysages into dev
TheoLechemia Nov 2, 2021
142cb08
change main photo message
TheoLechemia Nov 5, 2021
dce00f0
doc
TheoLechemia Nov 5, 2021
76aa2d8
Synchronize current page and navigation button
TheoLechemia Nov 22, 2021
ea631bc
set current item on date picker on click
TheoLechemia Nov 22, 2021
2bd81cf
fix route latest photos
TheoLechemia Nov 22, 2021
7ba800c
doc install en md + path update dans readme
Dec 15, 2021
af0d3ba
Merge pull request #133 from NaturalSolutions/doc_en_md
camillemonchicourt Dec 15, 2021
c6b9124
Doc typo
camillemonchicourt Dec 21, 2021
33782b2
Changelog 1.2.0
camillemonchicourt Dec 21, 2021
70bc4f4
Ajout URL des portails dans README
camillemonchicourt Dec 21, 2021
e3f6c13
Révision README
camillemonchicourt Dec 21, 2021
efb474f
install_app.sh : corrections mineures
xavyeah39 Mar 10, 2022
f578e03
Merge pull request #144 from PnX-SI/xavyeah39-patch-install
camillemonchicourt Mar 16, 2022
31da9b9
Carte - Pop-up : affichage de la référence du site
xavyeah39 Mar 16, 2022
3311525
Carte - Popup : Afficher la photo principale main_photo
xavyeah39 Mar 16, 2022
93b3b9c
Carte - Popup : Afficher la photo principale main_photo
xavyeah39 Mar 16, 2022
81ededf
Doc installation - Retour de parties supprimées
camillemonchicourt Mar 16, 2022
eb280fd
update changelog 1.2.0
xavyeah39 Mar 16, 2022
2d9c1f8
BUMP version / 1.2.0
camillemonchicourt Mar 16, 2022
899c98d
Changelog 1.2.0
camillemonchicourt Mar 16, 2022
8064be0
Merge pull request #143 from PnX-SI/dev
camillemonchicourt Mar 16, 2022
c4e9e59
Fix typo
xavyeah39 Mar 24, 2022
15e2bda
Merge pull request #147 from PnX-SI/master
camillemonchicourt Mar 24, 2022
50aee12
Prepa 1.2.1
camillemonchicourt Mar 24, 2022
5f8fe77
Changelog 1.2.1
camillemonchicourt Mar 24, 2022
ff14e1b
Merge pull request #148 from PnX-SI/dev
camillemonchicourt Mar 24, 2022
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
  •  
  •  
  •  
26 changes: 25 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
backend/static/custom/images/sample.png
backend/static/custom/css/custom-style.css
backend/static/custom/css/page-style.css
backend/static/custom/logo/logo_txt_blanc.png
backend/static/custom/logo/logo_txt_color.png
backend/static/custom/logo/favicon.ico

messages.pot
messages.po
messages.mo

src/favicon.ico



# IDEs and editors
/.idea
.project
Expand Down Expand Up @@ -49,4 +64,13 @@ var/


#doc
documentation
documentation
geopaysagesftpclient/geopaysagesftpclient/tests/pt_200_400.jpg~
geopaysagesftpclient/geopaysagesftpclient/tests/pt_300_500.jpg~
geopaysagesftpclient/geopaysagesftpclient/tests/pt_400_600.jpg~
geopaysagesftpclient/config.ini
geopaysagesftpclient/pytest.ini
geopaysagesftpclient/.vscode/
geopaysagesftpclient/geopaysagesftpclient.egg-info/
geopaysagesftpclient/output/
geopaysagesftpclient/env/
31 changes: 12 additions & 19 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,25 @@

Application web permettant de publier un observatoire photographique des paysages.

## Install
Documentation d'installation : https://github.com/PnX-SI/GeoPaysages/tree/master/docs/installation.rst
## Exemples

- Créer et activer un environnement virtuel python 3.
- cd ./backend
- Exécuter pip install -r ./requirements.txt
- Dupliquer et renommer ./config.py.tpl vers ./config.py
- Editer la config
- Lancer l'app FLASK_APP=./app.py FLASK_DEBUG=1 flask run
- http://paysages.vanoise-parcnational.fr
- http://paysages.ecrins-parcnational.fr
- https://paysages.parc-naturel-pilat.fr

## Contexte
## Installation

L'Observatoire photographique des paysages de Vanoise a été mis en place en 2006 pour suivre l'évolution des paysages au sein du Parc national de la Vanoise à travers des séries de photographies reconduites, sur des sites définis, selon le même cadrage. Les gardes-moniteurs assurent régulièrement les prises de vue.
Documentation d'installation : https://github.com/PnX-SI/GeoPaysages/tree/master/docs/installation.md

## Contexte

Le site internet initial de l'OPPV a été mis hors service mi-2016 en raison du changement de plateforme internet (mutualisation de tous les sites des Parcs nationaux). Ce site était articulé sur la carte interactive avec des accès multiples, par exemple les référence des sites, mots-clés paysagers etc. Il présentait 189 sites photographiques, dont 103 sont encore suivis aujourd'hui par reconductions régulières. Il y ades données photographiques et textuelles pour l'ensemble des sites photos.
La première version de cet outil libre et générique a été développée en 2019 pour le Parc national de la Vanoise, par la société Natural Solutions.

Un nouveau site internet grand public va être mis en oeuvre pour partager au plus grand nombre le travail effectué depuis la création de l'Observatoire photographique des paysages.
Depuis, différentes évolutions ont été apportées par différentes structures utilisant cet outil.

Le projet est porté par le Parc national de la Vanoise. Le site qui sera développé courant 2018 sera sous licence libre. Dans la même lignée que GeoNature, le projet sera générique et disponible pour les autres parcs nationaux et pour d'autres structures depuis ce repository. La prestation de développement par la société Natural Solutions va débuter courant mai 2018.
L'Observatoire photographique des paysages de Vanoise a été mis en place en 2006 pour suivre l'évolution des paysages au sein du Parc national de la Vanoise à travers des séries de photographies reconduites, sur des sites définis, selon le même cadrage. Les gardes-moniteurs assurent régulièrement les prises de vue.

A suivre...
Le site internet initial de l'OPPV a été mis hors service mi-2016 en raison du changement de plateforme internet (mutualisation de tous les sites des Parcs nationaux). Ce site était articulé sur la carte interactive avec des accès multiples, par exemple les référence des sites, mots-clés paysagers etc. Il présentait 189 sites photographiques, dont 103 sont encore suivis aujourd'hui par reconductions régulières. Il y a des données photographiques et textuelles pour l'ensemble des sites photos.

![alt text](./docs/screenshot.jpg)

Expand All @@ -31,8 +29,3 @@ A suivre...
- CCTP 2017 : http://geonature.fr/documents/autres/geopaysages/2017-11-13-CDC-OPPV-PNV.pdf
- Annexe CCTP 2017 : http://geonature.fr/documents/autres/geopaysages/2017-11-24-OPPV-PNV-ANNEXES-CDC.zip
- Réflexion 2016 : http://geonature.fr/documents/autres/geopaysages/2016-11-OPP-reflexion.pdf

## DEMO

http://5.196.209.137/

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.1.dev0
1.2.1
Empty file added backend/__init__.py
Empty file.
Loading