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 c3p0 from 0.9.5.2 to 0.9.5.4 in /sen2agri-services #27

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
02d2717
Re-enable absolute amplitude SAR features
lnicola May 30, 2019
2bfe643
Support MAJA L2A products in crop type runner
lnicola Jun 4, 2019
ca58dbf
Avoid reprojection in the SAR Composite app, since it doesn't work wi…
lnicola Jun 4, 2019
871e1f4
Update crop type classification script
lnicola Jun 5, 2019
7548e1d
Use PaMIN instead of hard-coded 30
lnicola Jun 5, 2019
8cbc02a
Add licenses for new deps
lnicola Jun 6, 2019
ea90619
Fix holding id computation
lnicola Jun 6, 2019
280e09c
Rename columns for crop type classification
lnicola Jun 6, 2019
d548c64
Save temporary file with parcel info
lnicola Jun 6, 2019
d744d2b
Remove unused code
lnicola Jun 7, 2019
572be06
Save prj files during export
lnicola Jun 7, 2019
fea2782
Set pixel counts to 0 if null
lnicola Jun 11, 2019
85fc2c1
Add processor.lpis.path config key
lnicola Jun 11, 2019
0b5bb35
Insert the LPIS product into the database
lnicola Jun 11, 2019
1a94cf1
Export ETRS89/LAEA reprojection output
lnicola Jun 11, 2019
7edcbc9
Run the export script after the LPIS import
lnicola Jun 12, 2019
1fc35b3
Use the correct output directory in export-lpis.py
lnicola Jun 12, 2019
1234c88
Convert LUT ctnum to int
lnicola Jun 12, 2019
e515036
Add product details tables
lnicola Jun 12, 2019
ab8c5c1
Add scripts to import products to the database, then export them back
lnicola Jun 12, 2019
23cf622
Split L4C export by agricultural practice
lnicola Jun 12, 2019
030dccd
Add crop diversification use case script
lnicola Jun 13, 2019
cd88908
Samll cleanup
lnicola Jun 13, 2019
d11f023
Enable red edge bands
lnicola Jun 13, 2019
55c8a35
Remove filtering by LC, S1Pix and S2Pix
lnicola Jun 13, 2019
c279ab2
Export the parcel list for L4A at the end
lnicola Jun 13, 2019
6080449
Install more of the Python scripts
lnicola Jun 13, 2019
d36a9e7
Export parcel attributes as CSV during data preparation
lnicola Jun 14, 2019
1d362f8
Fix the LPIS PK name
lnicola Jun 14, 2019
6b9eee6
Fix command name
lnicola Jun 14, 2019
3512234
Clear out the old LPIS during import
lnicola Jun 14, 2019
4ef4b18
Bump c3p0 from 0.9.5.2 to 0.9.5.4 in /sen2agri-services
dependabot[bot] Oct 10, 2019
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
4 changes: 4 additions & 0 deletions database/03-tables/sen4cap/agricultural_practice.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
create table agricultural_practice(
id int not null primary key,
name text not null
);
10 changes: 10 additions & 0 deletions database/03-tables/sen4cap/product_details_l4a.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
create table product_details_l4a(
product_id int not null references product(id),
"NewID" int not null,
"CT_decl" int,
"CT_pred_1" int,
"CT_conf_1" real,
"CT_pred_2" int,
"CT_conf_2" real,
constraint product_details_l4a_pkey primary key(product_id, "NewID")
);
37 changes: 37 additions & 0 deletions database/03-tables/sen4cap/product_details_l4c.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
create table product_details_l4c(
product_id int not null references product(id),
"NewID" int not null,
practice_id int not null references agricultural_practice(id),
orig_id text not null,
country text not null,
year int not null,
main_crop text not null,
veg_start text not null,
h_start text not null,
h_end text not null,
practice text not null,
p_type text not null,
p_start text not null,
p_end text not null,
l_week text not null,
m1 text not null,
m2 text not null,
m3 text not null,
m4 text not null,
m5 text not null,
h_week text not null,
h_w_start text not null,
h_w_end text not null,
h_w_s1 text not null,
m6 text not null,
m7 text not null,
m8 text not null,
m9 text not null,
m10 text not null,
c_index text not null,
s1_pix text not null,
s1_gaps text not null,
h_s1_gaps text not null,
p_s1_gaps text not null,
constraint product_details_l4c_pkey primary key(product_id, "NewID")
);
4 changes: 1 addition & 3 deletions database/07-data/sen4cap/01.config_category.sql
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ INSERT INTO config_category VALUES (16, 'Demmaccs', 13, false);
INSERT INTO config_category VALUES (17, 'Site', 14, false);
INSERT INTO config_category VALUES (19, 'L4B Grassland Mowing', 15, true);
INSERT INTO config_category VALUES (20, 'L4B Grassland Mowing', 16, true);



INSERT INTO config_category VALUES (21, 'LPIS', 17, true);
2 changes: 2 additions & 0 deletions database/07-data/sen4cap/09.config.sql
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ INSERT INTO config(key, site_id, value, last_updated) VALUES ('processor.s4c_l4c
INSERT INTO config(key, site_id, value, last_updated) VALUES ('processor.s4c_l4b.config_path', NULL, '/usr/share/sen2agri/S4C_L4B_Configurations/S4C_L4B_Config.cfg', '2019-02-18 15:27:41.861613+02');
INSERT INTO config(key, site_id, value, last_updated) VALUES ('processor.s4c_l4c.config_path', NULL, '/usr/share/sen2agri/S4C_L4C_Configurations/S4C_L4C_Config_NLD.cfg', '2019-02-18 15:27:41.861613+02');

INSERT INTO config(key, site_id, value, last_updated) VALUES ('processor.lpis.path', NULL, '/mnt/archive/lpis/{site}', '2019-06-11 16:15:00.0+02');

INSERT INTO config(key, site_id, value, last_updated) VALUES ('resources.working-mem', NULL, '1024', '2015-09-08 11:03:21.87284+03');

INSERT INTO config(key, site_id, value, last_updated) VALUES ('s1.enabled', NULL, 'false', '2017-10-24 14:56:57.501918+02');
Expand Down
1 change: 1 addition & 0 deletions database/07-data/sen4cap/10.config_metadata.sql
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ INSERT INTO config_metadata VALUES ('processor.s4c_l4c.input_ndvi', 'The list of
INSERT INTO config_metadata VALUES ('processor.s4c_l4b.config_path', 'The default configuration files for all L4B processors', 'file', FALSE, 19);
INSERT INTO config_metadata VALUES ('processor.s4c_l4c.config_path', 'The default configuration files for all L4C processors', 'file', FALSE, 20);

INSERT INTO config_metadata VALUES ('processor.lpis.path', 'The path to the pre-processed LPIS products', 'string', false, 21);

INSERT INTO config_metadata VALUES ('resources.working-mem', 'OTB applications working memory (MB)', 'int', true, 14);

Expand Down
6 changes: 6 additions & 0 deletions database/07-data/sen4cap/agricultural_practice.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
insert into agricultural_practice
values
(1, 'NA'),
(2, 'CatchCrop'),
(3, 'NFC'),
(4, 'Fallow');
30 changes: 30 additions & 0 deletions licenses/NumPy/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Copyright (c) 2005-2019, NumPy Developers.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

* Neither the name of the NumPy Developers nor the names of any
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Loading