diff --git a/Manifest.toml b/Manifest.toml
index 77e1ea942f8e57ff6e71771d55f68d5898c4d270..878b00255991f7cabb3d4cfdcbd986d76a7c92b0 100644
--- a/Manifest.toml
+++ b/Manifest.toml
@@ -2,7 +2,7 @@
julia_version = "1.9.3"
manifest_format = "2.0"
-project_hash = "ce171af7d57f8fcad6d5ea123349f467345ec803"
+project_hash = "ba06f527c3b60c5d5c4950e08943bcf1017cc1e3"
[[deps.AbstractFFTs]]
deps = ["LinearAlgebra"]
diff --git a/Project.toml b/Project.toml
index d98f00147cb13e44bc808d17c4e95bb83956246c..ff8ac78b99c36f25ca5abcc2d478cbf757cd26f2 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
name = "Persefone"
uuid = "039acd1d-2a07-4b33-b082-83a1ff0fd136"
authors = ["Daniel Vedder <daniel.vedder@idiv.de>"]
-version = "0.2.0"
+version = "0.3.0"
[deps]
Agents = "46ada45e-f475-11e8-01d0-f70cc89e6671"
@@ -18,12 +18,14 @@ ImageMagick = "6218d12a-5da1-5696-b52f-db25d2ecc6d1"
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
LoggingExtras = "e6f89c97-d47a-5376-807f-9c37f3926c36"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
+PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+TiffImages = "731e570b-9d59-4bfa-96dc-6df516fadf69"
[compat]
Agents = ">= 5.6"
diff --git a/docs/persefonejl_logo_v3_icon.svg b/docs/persefonejl_logo_v3_icon.svg
index 017e42201d3667e3f400e114fb327c499ce95f1e..97d3d25a6e33672e6a5e5ca9d417fd24cc510601 100644
--- a/docs/persefonejl_logo_v3_icon.svg
+++ b/docs/persefonejl_logo_v3_icon.svg
@@ -8,10 +8,10 @@
version="1.1"
id="svg8"
inkscape:version="1.3 (1:1.3+202307231459+0e150ed6c4)"
- sodipodi:docname="persefonejl_logo_v3.svg"
+ sodipodi:docname="persefonejl_logo_v3_icon.svg"
inkscape:export-filename="persefonejl_logo_v3.png"
- inkscape:export-xdpi="300"
- inkscape:export-ydpi="300"
+ inkscape:export-xdpi="40.639999"
+ inkscape:export-ydpi="40.639999"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
diff --git a/docs/persefonejl_logo_v3_splash.png b/docs/persefonejl_logo_v3_splash.png
index b68e7d5114de670a81e9fc50eb4d1322e3cefad4..c2ec0ece3a50394ac3dafa2f5baa0250846a7c61 100644
Binary files a/docs/persefonejl_logo_v3_splash.png and b/docs/persefonejl_logo_v3_splash.png differ
diff --git a/docs/persefonejl_logo_v3_splash.svg b/docs/persefonejl_logo_v3_splash.svg
index 0dcef59b8ac617da02619eadcb350e88690339f6..ad9caa9d31a3e03c09b448ef1ccd1477b343f741 100644
--- a/docs/persefonejl_logo_v3_splash.svg
+++ b/docs/persefonejl_logo_v3_splash.svg
@@ -2,13 +2,13 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
- width="1230"
- height="530"
- viewBox="0 0 325.43752 140.22917"
+ width="1200"
+ height="500"
+ viewBox="0 0 317.50002 132.29167"
version="1.1"
id="svg8"
inkscape:version="1.3 (1:1.3+202307231459+0e150ed6c4)"
- sodipodi:docname="persefonejl_logo_v3c_splash.svg"
+ sodipodi:docname="persefonejl_logo_v3_splash.svg"
inkscape:export-filename="persefonejl_logo_v3_splash.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
@@ -141,7 +141,7 @@
y1="198.09007"
x2="226.88667"
y2="116.29728"
- gradientTransform="matrix(2.6876258,0,0,1.1198441,-484.29147,78.917396)" />
+ gradientTransform="matrix(5.3752518,0,0,2.2396883,-970.1104,-60.516806)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient28"
@@ -464,121 +464,124 @@
</g>
</g>
<rect
- style="fill:url(#linearGradient2);fill-opacity:1;stroke:none;stroke-width:2.35798;stroke-linecap:round;stroke-linejoin:round;filter:url(#filter21-0)"
+ style="fill:url(#linearGradient2);fill-opacity:1;stroke:none;stroke-width:4.71596;stroke-linecap:round;stroke-linejoin:round"
id="rect2"
- width="158.75"
- height="66.145836"
- x="0.76371318"
- y="217.6758"
+ width="317.5"
+ height="132.29167"
+ x="-2.5979219e-14"
+ y="217"
rx="0"
- ry="0"
- transform="matrix(1.9865669,0,0,1.9865669,1.4979545,-212.12684)" />
- <rect
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.794627;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.7"
- id="rect1-1"
- width="95.0028"
- height="95.0028"
- x="207.44629"
- y="102.01922"
- rx="16.603968"
- transform="rotate(44.999998)" />
- <path
- id="path3-2"
- style="fill:#ffffff;fill-opacity:1;stroke-width:2.55343;stroke-linecap:round;stroke-linejoin:round"
- d="m 51.114032,249.98132 v 40.42592 35.02085 c 11.471022,0.27599 25.829089,-7.50195 25.829089,-35.02085 h 10.76101 c 7.221328,8e-5 13.894199,-3.85233 17.505039,-10.10608 3.61066,-6.25391 3.61066,-13.95905 0,-20.21294 -3.61063,-6.25407 -10.283534,-10.10682 -17.505039,-10.1069 h -10.76101 z m 31.626421,8.71803 c 2.078585,1.2745 0.217271,2.85942 3.004639,1.2484 2.164438,-1.25102 3.75064,8.9414 1.827717,10.68369 2.146521,0.31084 3.753179,1.96325 3.277257,3.49257 -1.974999,6.3464 -5.759369,5.80256 -8.683111,5.19888 0.145,0.49118 0.871779,1.67231 -0.02493,1.60747 -3.509616,-0.25384 -3.854593,-2.60631 -5.312767,-2.88163 -0.105388,-0.0201 -0.19677,0.7563 -0.0266,1.24923 0.284047,0.82274 0.06782,1.17146 -0.226074,1.48027 -0.145973,0.15356 0.273074,-0.89369 0.124677,-0.99902 -0.224959,-0.15972 -0.147145,-1.34713 -0.266804,-1.44624 -0.01967,0.1776 -0.567258,-0.44589 -0.576823,-0.0465 -0.01649,0.68739 -0.09708,1.74423 -0.173706,1.23759 -0.252937,-1.67219 -0.602398,-1.75149 -0.743055,-1.56754 -0.357954,0.46814 0.220719,2.81195 -0.206959,2.98633 -0.135225,0.0546 0.08713,-0.47203 -0.123842,-1.3872 -0.09067,-0.39326 0.02833,-0.82278 -0.08562,-1.3689 -0.02799,-0.1343 -0.604807,-0.77049 -0.671577,-0.86523 -0.06506,-0.0924 -0.75032,-0.0463 -0.925081,0.45961 -0.119373,0.3456 0.217275,1.11786 0.184513,1.45619 -0.0891,0.92014 0.0592,1.49942 -0.09641,1.60165 -0.09458,0.0622 -0.154357,-0.49243 -0.216101,-1.44207 -0.04847,-0.74566 -0.228666,-1.74371 -0.222752,-1.82853 0.04766,-0.6834 -0.181254,-0.91851 -0.362386,-0.91428 -0.316851,0.008 -0.912875,0.0272 -0.905131,0.4139 0.002,0.10032 0.30226,0.57684 0.27262,1.33235 -0.0564,1.43746 0.292368,2.00145 0.176209,1.89421 -0.525135,-0.48472 -0.166057,-1.66055 -0.798745,-3.3396 -0.111248,-0.29518 1.172984,-0.75118 1.135365,-0.8594 -0.363065,-1.04442 -0.302205,-0.7259 -0.69485,-1.69641 -0.453062,0.0179 -1.386478,-1.41607 -0.101394,-2.66468 0,0 0.437941,0.41652 0.692356,0.2535 0.09828,-0.0632 -1.958387,-0.91483 -3.977927,-1.67646 -2.932787,-1.10602 -3.684525,-1.80277 -3.684525,-1.80277 -0.02644,-0.46049 3.693929,1.76453 6.21291,2.40535 0.810241,0.20615 1.88462,0.95987 1.918314,0.9409 0.381393,-0.21481 0.534703,-0.12297 0.890171,-0.10648 1.756713,-3.09537 4.843415,-9.89296 9.39043,-13.04918 z" />
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.8213px;line-height:25%;font-family:Comfortaa;-inkscape-font-specification:'Comfortaa, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.291159"
- x="106.36923"
- y="305.95401"
- id="text4"><tspan
- sodipodi:role="line"
- id="tspan4"
- style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:27.9512px;font-family:Comfortaa;-inkscape-font-specification:'Comfortaa, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;fill:#ffffff;fill-opacity:1;stroke-width:0.291159"
- x="106.36923"
- y="305.95401">ERS<tspan
+ ry="0" />
+ <g
+ id="g1"
+ transform="translate(-6.8647422)">
+ <rect
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.794627;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.7"
+ id="rect1-1"
+ width="95.0028"
+ height="95.0028"
+ x="209.95099"
+ y="95.474915"
+ rx="16.603968"
+ transform="rotate(44.999998)" />
+ <path
+ id="path3-2"
+ style="fill:#ffffff;fill-opacity:1;stroke-width:2.55343;stroke-linecap:round;stroke-linejoin:round"
+ d="m 57.512644,247.12489 v 40.42592 35.02085 c 11.471022,0.27599 25.829089,-7.50195 25.829089,-35.02085 h 10.76101 c 7.221327,8e-5 13.894197,-3.85233 17.505037,-10.10608 3.61066,-6.25391 3.61066,-13.95905 0,-20.21294 -3.61063,-6.25407 -10.28353,-10.10682 -17.505037,-10.1069 h -10.76101 z m 31.626421,8.71803 c 2.078585,1.2745 0.217271,2.85942 3.004639,1.2484 2.164438,-1.25102 3.75064,8.9414 1.827717,10.68369 2.146521,0.31084 3.753179,1.96325 3.277257,3.49257 -1.974999,6.3464 -5.759369,5.80256 -8.683111,5.19888 0.145,0.49118 0.871779,1.67231 -0.02493,1.60747 -3.509616,-0.25384 -3.854593,-2.60631 -5.312767,-2.88163 -0.105388,-0.0201 -0.19677,0.7563 -0.0266,1.24923 0.284047,0.82274 0.06782,1.17146 -0.226074,1.48027 -0.145973,0.15356 0.273074,-0.89369 0.124677,-0.99902 -0.224959,-0.15972 -0.147145,-1.34713 -0.266804,-1.44624 -0.01967,0.1776 -0.567258,-0.44589 -0.576823,-0.0465 -0.01649,0.68739 -0.09708,1.74423 -0.173706,1.23759 -0.252937,-1.67219 -0.602398,-1.75149 -0.743055,-1.56754 -0.357954,0.46814 0.220719,2.81195 -0.206959,2.98633 -0.135225,0.0546 0.08713,-0.47203 -0.123842,-1.3872 -0.09067,-0.39326 0.02833,-0.82278 -0.08562,-1.3689 -0.02799,-0.1343 -0.604807,-0.77049 -0.671577,-0.86523 -0.06506,-0.0924 -0.75032,-0.0463 -0.925081,0.45961 -0.119373,0.3456 0.217275,1.11786 0.184513,1.45619 -0.0891,0.92014 0.0592,1.49942 -0.09641,1.60165 -0.09458,0.0622 -0.154357,-0.49243 -0.216101,-1.44207 -0.04847,-0.74566 -0.228666,-1.74371 -0.222752,-1.82853 0.04766,-0.6834 -0.181254,-0.91851 -0.362386,-0.91428 -0.316851,0.008 -0.912875,0.0272 -0.905131,0.4139 0.002,0.10032 0.30226,0.57684 0.27262,1.33235 -0.0564,1.43746 0.292368,2.00145 0.176209,1.89421 -0.525135,-0.48472 -0.166057,-1.66055 -0.798745,-3.3396 -0.111248,-0.29518 1.172984,-0.75118 1.135365,-0.8594 -0.363065,-1.04442 -0.302205,-0.7259 -0.69485,-1.69641 -0.453062,0.0179 -1.386478,-1.41607 -0.101394,-2.66468 0,0 0.437941,0.41652 0.692356,0.2535 0.09828,-0.0632 -1.958387,-0.91483 -3.977927,-1.67646 -2.932787,-1.10602 -3.684525,-1.80277 -3.684525,-1.80277 -0.02644,-0.46049 3.693929,1.76453 6.21291,2.40535 0.810241,0.20615 1.88462,0.95987 1.918314,0.9409 0.381393,-0.21481 0.534703,-0.12297 0.890171,-0.10648 1.756713,-3.09537 4.843415,-9.89296 9.39043,-13.04918 z" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:38.8213px;line-height:25%;font-family:Comfortaa;-inkscape-font-specification:'Comfortaa, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.291159"
+ x="112.76785"
+ y="303.09756"
+ id="text4"><tspan
+ sodipodi:role="line"
+ id="tspan4"
+ style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:27.9512px;font-family:Comfortaa;-inkscape-font-specification:'Comfortaa, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;fill:#ffffff;fill-opacity:1;stroke-width:0.291159"
+ x="112.76785"
+ y="303.09756">ERS<tspan
id="tspan2"
style="letter-spacing:1.4558px;stroke-width:0.291159">E</tspan><tspan
id="tspan3"
style="letter-spacing:-0.873478px;stroke-width:0.291159">FO</tspan>NE.jl</tspan></text>
- <text
- xml:space="preserve"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.5285px;line-height:125%;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.291159"
- x="191.49658"
- y="326.30753"
- id="text8"><tspan
- sodipodi:role="line"
- style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13.9756px;line-height:125%;font-family:Comfortaa;-inkscape-font-specification:'Comfortaa, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.291159"
- x="191.49658"
- y="326.30753"
- id="tspan8">agriculture and ecosystems</tspan></text>
- <g
- transform="matrix(-0.35530132,0,0,0.35530132,277.84991,183.77298)"
- id="g10"
- inkscape:label="Layer 1"
- style="fill:#ffffff;fill-opacity:1">
- <path
- inkscape:connector-curvature="0"
- style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.138792;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="m 78.855469,77.976562 c -0.635598,-0.03015 -1.315188,0.03375 -2,0.230469 0.105322,0.306393 1.535179,0.170343 1.248047,0.197266 -2.295867,0.215278 0.19293,0.388768 -0.101563,0.513672 -2.513092,1.065873 -0.18984,0.571913 -0.595703,0.802734 -1.901667,1.08151 -2.473831,3.296241 -3.185547,5.132813 -0.220787,0.46224 -3.756505,1.54953 -3.871094,2.02539 -7.894114,4.666119 -5.334722,6.536016 -12.322265,10.416016 -3.553869,1.5158 -5.740615,2.392753 -2.384766,1.916016 1.142195,-0.162262 -3.933811,3.791972 -6.902344,6.179682 0,0 -0.07405,0.72416 0.775391,0.33985 0.763882,-0.34561 2.051683,-1.24132 2.154297,-1.16211 0.133971,0.10341 -1.332101,0.96452 -1.857422,1.36133 -0.217059,0.16396 -0.153692,0.50379 0.0332,0.38867 2.920756,-1.79904 0.278843,0.30001 0.371094,0.4082 0.200029,0.2346 3.146459,-1.6011 6.451172,-4.11718 4.546315,-2.700683 5.313164,-4.031834 10.373047,-3.17188 0.03454,0.0059 0.1497,0.50876 0.892578,0.99023 0.92652,0.6005 3.365669,1.62008 3.919922,2.97266 0,0 -1.048441,0.27539 -1.953125,0.58984 h 2.101562 c 0.13984,-0.0391 0.395356,-0.0939 0.492188,-0.125 0.115144,-0.037 0.06435,0.3651 1.433593,0.37891 1.193787,0.012 2.647691,0.87444 2.802735,0.75781 0.0035,-0.003 0.0013,-0.009 0.0039,-0.0117 1.194184,-0.43283 1.653161,1.27146 1.714844,1.21289 0.164943,-0.1566 -0.0032,-1.45566 -1.322266,-1.89453 -0.345965,-0.1151 0.460862,0.11119 0.626953,0.20703 0.472653,0.27276 0.939146,1.21657 1.251953,0.89063 0.606832,-0.63231 1.113541,0.2639 1.382813,1.24023 -0.01397,-1.56287 -0.124874,-1.47052 -1.576172,-2.18554 -0.368434,-0.18152 -0.14641,-0.31642 -0.550781,-0.60742 -0.323064,-0.2325 -0.800385,-0.002 -1.16211,-0.27149 -2.024542,-1.50955 -4.746992,-3.7812 -4.255859,-3.873046 5.210607,-0.974432 7.803945,-4.281449 8.931641,-7.28125 0.955157,-2.668658 1.506401,-3.736781 0.335937,-7.046875 -0.05994,-2.272971 3.920376,-3.116721 4.808594,-3.263671 0.351963,-0.05823 -0.203025,-0.726504 -0.585938,-0.857422 -4.513731,-0.926915 -1.939307,-0.744294 -4.865234,-2.542969 -0.618478,-0.380201 -1.553952,-0.689977 -2.613281,-0.740235 z m -9.236328,21.962891 c 0.434892,0.0031 2.737252,1.697147 4.626953,3.134767 -0.08369,-0.0253 -0.144989,-0.0299 -0.164063,0.002 0,0 -4.430714,-1.96398 -4.53125,-3.0664 -0.0043,-0.04744 0.01904,-0.07067 0.06836,-0.07032 z"
- transform="matrix(-4.3230106,0,0,4.3230106,378.46884,-167.26742)"
- id="path10" />
- </g>
- <path
- id="rect12"
- style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.794627;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.7"
- d="m 85.729273,229.18874 c 6.524676,-5.08923 15.917097,-4.63017 21.924437,1.37719 v 0 l 43.69556,43.69555 c 6.50439,6.50438 6.50439,16.97718 0,23.48156 l -43.69556,43.69557 c -6.00733,6.00734 -15.399745,6.46641 -21.924445,1.37719" />
- <g
- id="g70"
- transform="matrix(1.9865669,0,0,1.9865669,1.4979545,-212.12684)">
- <path
- d="m 92.526265,274.16371 c -0.02771,0 -0.0551,0.001 -0.08211,0.004 -0.02696,0.002 -0.05355,0.007 -0.07971,0.0121 -0.02609,0.006 -0.05182,0.0119 -0.07695,0.0197 -0.0251,0.008 -0.04971,0.0168 -0.07366,0.0269 -0.04798,0.0202 -0.0935,0.0449 -0.136111,0.0737 -0.04258,0.0288 -0.0823,0.0615 -0.118495,0.0977 -0.0362,0.0362 -0.06894,0.0759 -0.09768,0.1185 -0.02876,0.0426 -0.05343,0.0881 -0.07366,0.13611 -0.0101,0.024 -0.01909,0.0485 -0.02684,0.0737 -0.0078,0.0251 -0.01432,0.0508 -0.01965,0.0769 -0.0056,0.0261 -0.0094,0.0527 -0.01209,0.0797 -0.0025,0.027 -0.0043,0.0544 -0.0043,0.0821 v 2.47474 h -2.175735 l -1.394122,-3.0271 c -0.02355,-0.051 -0.0569,-0.0969 -0.09812,-0.13504 -0.04128,-0.0382 -0.08963,-0.0678 -0.14234,-0.0873 -0.05269,-0.0194 -0.10872,-0.0283 -0.164847,-0.0261 -0.05609,0.002 -0.111255,0.0154 -0.162268,0.0389 -0.06822,0.0314 -0.126974,0.0802 -0.170357,0.14154 -0.04339,0.0613 -0.06986,0.13295 -0.07677,0.20773 -0.0069,0.0748 0.0062,0.15008 0.03738,0.21831 l 0.134771,0.29268 v 0.86231 c 1.9e-5,0.0228 0.0091,0.0447 0.02529,0.0609 0.01612,0.0161 0.03806,0.0252 0.06087,0.0252 0.02281,10e-6 0.04469,-0.009 0.06087,-0.0252 0.01612,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.48858 l 0.185307,0.40238 v 0.843 c 0,0.0228 0.0091,0.0447 0.02517,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02287,1e-5 0.04481,-0.009 0.06093,-0.0253 0.01612,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.46919 l 0.184955,0.40158 v 0.82449 c -7e-6,0.0228 0.009,0.0447 0.02517,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02281,-2e-5 0.04469,-0.009 0.06087,-0.0253 0.01618,-0.0161 0.02523,-0.038 0.02529,-0.0609 v -0.45068 l 0.185214,0.4022 v 0.80501 c 1.9e-5,0.0228 0.0091,0.0448 0.02529,0.0609 0.01612,0.0161 0.03806,0.0252 0.06087,0.0252 0.02281,0 0.04469,-0.009 0.06087,-0.0252 0.01611,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.43128 l 0.184954,0.40166 v 0.78651 c 1.9e-5,0.0228 0.0091,0.0447 0.02529,0.0609 0.01612,0.0161 0.03806,0.0252 0.06087,0.0252 0.02281,1e-5 0.04469,-0.009 0.06087,-0.0252 0.01612,-0.0161 0.02517,-0.038 0.02517,-0.0609 v -0.41278 l 0.185308,0.40237 v 0.76721 c -3.1e-5,0.0229 0.009,0.0448 0.02516,0.0609 0.01618,0.0161 0.03806,0.0252 0.06087,0.0252 0.02287,3e-5 0.04475,-0.009 0.06093,-0.0252 0.01612,-0.0162 0.02523,-0.0381 0.02517,-0.0609 V 279.316 l 0.184948,0.40157 v 0.74835 c 0,0.0228 0.0091,0.0447 0.02517,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02281,-2e-5 0.04469,-0.009 0.06087,-0.0253 0.01618,-0.0161 0.02523,-0.038 0.02529,-0.0609 v -0.37453 l 0.185221,0.4021 v 0.72931 c 1.8e-5,0.0228 0.0091,0.0448 0.02529,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02281,-2e-5 0.04475,-0.009 0.06087,-0.0253 0.01612,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.39321 c 0.02616,0.0472 0.06099,0.0891 0.102664,0.12339 0.06136,0.0434 0.133073,0.0698 0.207901,0.0767 0.07483,0.007 0.150162,-0.006 0.218401,-0.0376 0.02262,-0.0104 0.04426,-0.0228 0.06467,-0.037 0.02045,-0.0142 0.03961,-0.0302 0.05727,-0.0477 0.01767,-0.0175 0.03384,-0.0366 0.04822,-0.057 0.01438,-0.0203 0.0269,-0.0419 0.03756,-0.0644 0.0106,-0.0225 0.01928,-0.0459 0.02579,-0.0699 0.0066,-0.024 0.01103,-0.0485 0.01333,-0.0733 0.0025,-0.0249 0.0025,-0.0498 3.66e-4,-0.0746 -0.0019,-0.0248 -0.0063,-0.0494 -0.01265,-0.0735 -0.0063,-0.0241 -0.01475,-0.0475 -0.02517,-0.0702 l -1.229189,-2.66893 h 2.030197 v 2.47464 c 0,0.0278 0.0012,0.0552 0.0043,0.0822 0.0025,0.027 0.0068,0.0536 0.01209,0.0797 0.0056,0.0261 0.0119,0.0518 0.01965,0.0769 0.0078,0.0251 0.01674,0.0497 0.02684,0.0736 0.02021,0.048 0.04494,0.0935 0.07366,0.13611 0.02876,0.0426 0.06149,0.0823 0.09768,0.11851 0.0362,0.0362 0.07589,0.0689 0.118495,0.0977 0.04258,0.0288 0.08816,0.0534 0.136111,0.0737 0.02399,0.0101 0.04853,0.0191 0.07366,0.0269 0.0251,0.008 0.05083,0.0143 0.07695,0.0196 0.0261,0.006 0.05269,0.009 0.07971,0.0121 0.02702,0.002 0.05436,0.004 0.08211,0.004 h 3.144887 c 0.02771,0 0.0551,-10e-4 0.08212,-0.004 0.02702,-0.002 0.05362,-0.007 0.07971,-0.0121 0.0261,-0.006 0.05176,-0.0119 0.07687,-0.0196 0.0251,-0.008 0.04971,-0.0168 0.07366,-0.0269 0.04798,-0.0202 0.09351,-0.0449 0.136111,-0.0737 0.04258,-0.0288 0.0823,-0.0615 0.118502,-0.0977 0.0362,-0.0362 0.06894,-0.0759 0.09768,-0.11851 0.02876,-0.0426 0.05356,-0.0881 0.07375,-0.13611 0.0101,-0.024 0.01909,-0.0485 0.02684,-0.0736 0.0078,-0.0251 0.01432,-0.0508 0.01965,-0.0769 0.0056,-0.0261 0.0094,-0.0527 0.01209,-0.0797 0.0025,-0.027 0.0043,-0.0545 0.0043,-0.0822 v -0.91577 h 2.027078 c -0.02585,0 -0.05107,0.002 -0.07544,0.008 -0.02436,0.005 -0.04785,0.0123 -0.07018,0.0217 -0.02238,0.009 -0.04364,0.0209 -0.06352,0.0343 -0.0199,0.0134 -0.03837,0.0286 -0.05523,0.0456 -0.01686,0.0169 -0.03217,0.0354 -0.04556,0.0552 -0.01339,0.0199 -0.02492,0.0412 -0.03434,0.0635 -0.0094,0.0224 -0.01674,0.0458 -0.02169,0.0702 -0.005,0.0244 -0.0076,0.0496 -0.0076,0.0755 v 0.3047 c 0,0.0258 0.0025,0.0511 0.0076,0.0755 0.005,0.0244 0.01227,0.0478 0.02169,0.0702 0.0094,0.0224 0.02095,0.0436 0.03434,0.0634 0.01339,0.0199 0.0287,0.0384 0.04556,0.0552 0.01692,0.0169 0.03539,0.0322 0.05523,0.0456 0.01983,0.0134 0.04116,0.025 0.06352,0.0344 0.02238,0.009 0.04581,0.0167 0.07018,0.0217 0.02436,0.005 0.04959,0.008 0.07544,0.008 H 99.8566 c 0.0259,0 0.0511,-0.002 0.0754,-0.008 0.0244,-0.005 0.0478,-0.0123 0.0702,-0.0217 0.0224,-0.009 0.0436,-0.021 0.0635,-0.0344 0.0198,-0.0134 0.0384,-0.0286 0.0552,-0.0456 0.0169,-0.0169 0.0322,-0.0354 0.0456,-0.0552 0.0134,-0.0199 0.0249,-0.0411 0.0343,-0.0634 0.009,-0.0224 0.0167,-0.0458 0.0217,-0.0702 0.005,-0.0244 0.008,-0.0496 0.008,-0.0755 v -0.3047 c 0,-0.0258 -0.002,-0.0511 -0.008,-0.0755 -0.005,-0.0244 -0.0123,-0.0479 -0.0217,-0.0702 -0.009,-0.0224 -0.0209,-0.0436 -0.0343,-0.0635 -0.0134,-0.0199 -0.0287,-0.0384 -0.0456,-0.0552 -0.0169,-0.0169 -0.0354,-0.0322 -0.0552,-0.0456 -0.0199,-0.0134 -0.0412,-0.0249 -0.0635,-0.0343 -0.0224,-0.009 -0.0458,-0.0167 -0.0702,-0.0217 -0.0244,-0.005 -0.0496,-0.008 -0.0754,-0.008 h 0.47229 c 0.0277,0 0.0551,-10e-4 0.0821,-0.004 0.027,-0.002 0.0536,-0.007 0.0797,-0.0121 0.0261,-0.006 0.0518,-0.012 0.0769,-0.0198 0.0251,-0.008 0.0497,-0.0167 0.0737,-0.0268 0.048,-0.0202 0.0935,-0.0449 0.13611,-0.0736 0.0426,-0.0288 0.0823,-0.0615 0.1185,-0.0977 0.0362,-0.0362 0.0689,-0.0759 0.0976,-0.1185 0.0288,-0.0426 0.0536,-0.0882 0.0738,-0.13611 0.0101,-0.024 0.0191,-0.0485 0.0268,-0.0737 0.008,-0.0251 0.0143,-0.0508 0.0196,-0.0769 0.006,-0.0261 0.009,-0.0527 0.0121,-0.0797 0.002,-0.027 0.004,-0.0545 0.004,-0.0822 v -1.83154 c 0,-0.0278 -0.001,-0.0551 -0.004,-0.0821 -0.002,-0.027 -0.007,-0.0537 -0.0121,-0.0798 -0.006,-0.0261 -0.0119,-0.0517 -0.0196,-0.0769 -0.008,-0.0251 -0.0167,-0.0497 -0.0268,-0.0737 -0.0202,-0.048 -0.045,-0.0935 -0.0738,-0.13612 -0.0288,-0.0426 -0.0614,-0.0823 -0.0976,-0.11849 -0.0362,-0.0362 -0.0759,-0.069 -0.1185,-0.0977 -0.0426,-0.0288 -0.0881,-0.0534 -0.13611,-0.0737 -0.024,-0.0101 -0.0485,-0.0191 -0.0737,-0.0268 -0.0251,-0.008 -0.0508,-0.0143 -0.0769,-0.0196 -0.0261,-0.006 -0.0527,-0.009 -0.0797,-0.0121 -0.027,-0.002 -0.0544,-0.004 -0.0821,-0.004 H 99.8566 c 0.0259,0 0.0511,-0.002 0.0754,-0.008 0.0244,-0.005 0.0478,-0.0123 0.0702,-0.0217 0.0224,-0.009 0.0436,-0.0209 0.0635,-0.0343 0.0198,-0.0134 0.0384,-0.0286 0.0552,-0.0456 0.0169,-0.0169 0.0322,-0.0354 0.0456,-0.0552 0.0134,-0.0198 0.0249,-0.0412 0.0343,-0.0635 0.009,-0.0224 0.0167,-0.0458 0.0217,-0.0702 0.005,-0.0244 0.008,-0.0496 0.008,-0.0754 v -0.30478 c 0,-0.0258 -0.002,-0.0511 -0.008,-0.0754 -0.005,-0.0244 -0.0123,-0.0479 -0.0217,-0.0703 -0.009,-0.0224 -0.0209,-0.0436 -0.0343,-0.0634 -0.0134,-0.0199 -0.0287,-0.0384 -0.0456,-0.0552 -0.0169,-0.0169 -0.0354,-0.0322 -0.0552,-0.0456 -0.0199,-0.0134 -0.0412,-0.0249 -0.0635,-0.0343 -0.0224,-0.009 -0.0458,-0.0167 -0.0702,-0.0217 -0.0244,-0.005 -0.0496,-0.008 -0.0754,-0.008 h -1.356758 c -0.02585,0 -0.05107,0.002 -0.07544,0.008 -0.02436,0.005 -0.04785,0.0123 -0.07018,0.0217 -0.02238,0.009 -0.04364,0.021 -0.06352,0.0343 -0.0199,0.0134 -0.03837,0.0286 -0.05523,0.0456 -0.01686,0.0169 -0.03217,0.0354 -0.04556,0.0552 -0.01339,0.0198 -0.02492,0.041 -0.03434,0.0634 -0.0094,0.0224 -0.01674,0.0459 -0.02169,0.0703 -0.005,0.0244 -0.0076,0.0496 -0.0076,0.0754 v 0.30478 c 0,0.0258 0.0025,0.0511 0.0076,0.0754 0.005,0.0244 0.01227,0.0479 0.02169,0.0702 0.0094,0.0224 0.02095,0.0436 0.03434,0.0635 0.01339,0.0199 0.0287,0.0384 0.04556,0.0552 0.01692,0.0169 0.03539,0.0322 0.05523,0.0456 0.01983,0.0134 0.04116,0.0249 0.06352,0.0343 0.02238,0.009 0.04581,0.0167 0.07018,0.0217 0.02436,0.005 0.04959,0.008 0.07544,0.008 h -2.027078 v -0.91578 c 0,-0.0277 -0.0012,-0.0551 -0.0043,-0.0821 -0.0025,-0.027 -0.0068,-0.0536 -0.01209,-0.0797 -0.0056,-0.0261 -0.0119,-0.0518 -0.01965,-0.077 -0.0078,-0.0251 -0.01674,-0.0497 -0.02684,-0.0737 -0.02021,-0.048 -0.045,-0.0935 -0.07375,-0.13611 -0.02876,-0.0426 -0.06149,-0.0823 -0.09768,-0.11849 -0.0362,-0.0362 -0.07589,-0.0689 -0.118502,-0.0977 -0.04258,-0.0288 -0.08815,-0.0534 -0.136111,-0.0737 -0.02399,-0.0101 -0.04853,-0.0191 -0.07366,-0.0268 -0.0251,-0.008 -0.05076,-0.0143 -0.07687,-0.0196 -0.02609,-0.006 -0.05269,-0.009 -0.07971,-0.0121 -0.02702,-0.002 -0.05436,-0.004 -0.08212,-0.004 z"
- style="fill:#ffffff;stroke-width:0.0809643;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.7"
- id="path45" />
+ <text
+ xml:space="preserve"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15.5285px;line-height:125%;font-family:Lato;-inkscape-font-specification:'Lato, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.291159"
+ x="197.89519"
+ y="323.45108"
+ id="text8"><tspan
+ sodipodi:role="line"
+ style="font-style:normal;font-variant:normal;font-weight:300;font-stretch:normal;font-size:13.9756px;line-height:125%;font-family:Comfortaa;-inkscape-font-specification:'Comfortaa, Light';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke-width:0.291159"
+ x="197.89519"
+ y="323.45108"
+ id="tspan8">agriculture and ecosystems</tspan></text>
<g
- id="g69"
- transform="translate(-0.2788785,20.370519)"
- style="opacity:0.8">
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.163999px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 86.709765,255.58047 H 61.031144"
- id="path46"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.168265px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 87.030483,256.33192 H 60.279694"
- id="path47"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.172439px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 87.352286,257.08338 H 59.528233"
- id="path48"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.176244px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 87.65232,257.83483 H 58.776783"
- id="path49"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.181324px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 88.063064,258.58628 H 58.025333"
- id="path50"
- sodipodi:nodetypes="cc" />
- <path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.187044px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 88.539307,259.33773 H 57.273883"
- id="path51"
- sodipodi:nodetypes="cc" />
+ transform="matrix(-0.35530132,0,0,0.35530132,284.24852,180.91655)"
+ id="g10"
+ inkscape:label="Layer 1"
+ style="fill:#ffffff;fill-opacity:1">
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.191378px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 88.909928,260.08919 H 56.522422"
- id="path52"
- sodipodi:nodetypes="cc" />
+ inkscape:connector-curvature="0"
+ style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.138792;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="m 78.855469,77.976562 c -0.635598,-0.03015 -1.315188,0.03375 -2,0.230469 0.105322,0.306393 1.535179,0.170343 1.248047,0.197266 -2.295867,0.215278 0.19293,0.388768 -0.101563,0.513672 -2.513092,1.065873 -0.18984,0.571913 -0.595703,0.802734 -1.901667,1.08151 -2.473831,3.296241 -3.185547,5.132813 -0.220787,0.46224 -3.756505,1.54953 -3.871094,2.02539 -7.894114,4.666119 -5.334722,6.536016 -12.322265,10.416016 -3.553869,1.5158 -5.740615,2.392753 -2.384766,1.916016 1.142195,-0.162262 -3.933811,3.791972 -6.902344,6.179682 0,0 -0.07405,0.72416 0.775391,0.33985 0.763882,-0.34561 2.051683,-1.24132 2.154297,-1.16211 0.133971,0.10341 -1.332101,0.96452 -1.857422,1.36133 -0.217059,0.16396 -0.153692,0.50379 0.0332,0.38867 2.920756,-1.79904 0.278843,0.30001 0.371094,0.4082 0.200029,0.2346 3.146459,-1.6011 6.451172,-4.11718 4.546315,-2.700683 5.313164,-4.031834 10.373047,-3.17188 0.03454,0.0059 0.1497,0.50876 0.892578,0.99023 0.92652,0.6005 3.365669,1.62008 3.919922,2.97266 0,0 -1.048441,0.27539 -1.953125,0.58984 h 2.101562 c 0.13984,-0.0391 0.395356,-0.0939 0.492188,-0.125 0.115144,-0.037 0.06435,0.3651 1.433593,0.37891 1.193787,0.012 2.647691,0.87444 2.802735,0.75781 0.0035,-0.003 0.0013,-0.009 0.0039,-0.0117 1.194184,-0.43283 1.653161,1.27146 1.714844,1.21289 0.164943,-0.1566 -0.0032,-1.45566 -1.322266,-1.89453 -0.345965,-0.1151 0.460862,0.11119 0.626953,0.20703 0.472653,0.27276 0.939146,1.21657 1.251953,0.89063 0.606832,-0.63231 1.113541,0.2639 1.382813,1.24023 -0.01397,-1.56287 -0.124874,-1.47052 -1.576172,-2.18554 -0.368434,-0.18152 -0.14641,-0.31642 -0.550781,-0.60742 -0.323064,-0.2325 -0.800385,-0.002 -1.16211,-0.27149 -2.024542,-1.50955 -4.746992,-3.7812 -4.255859,-3.873046 5.210607,-0.974432 7.803945,-4.281449 8.931641,-7.28125 0.955157,-2.668658 1.506401,-3.736781 0.335937,-7.046875 -0.05994,-2.272971 3.920376,-3.116721 4.808594,-3.263671 0.351963,-0.05823 -0.203025,-0.726504 -0.585938,-0.857422 -4.513731,-0.926915 -1.939307,-0.744294 -4.865234,-2.542969 -0.618478,-0.380201 -1.553952,-0.689977 -2.613281,-0.740235 z m -9.236328,21.962891 c 0.434892,0.0031 2.737252,1.697147 4.626953,3.134767 -0.08369,-0.0253 -0.144989,-0.0299 -0.164063,0.002 0,0 -4.430714,-1.96398 -4.53125,-3.0664 -0.0043,-0.04744 0.01904,-0.07067 0.06836,-0.07032 z"
+ transform="matrix(-4.3230106,0,0,4.3230106,378.46884,-167.26742)"
+ id="path10" />
+ </g>
+ <path
+ id="rect12"
+ style="fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.794627;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:0.7"
+ d="m 92.127885,226.33231 c 6.524676,-5.08923 15.917095,-4.63017 21.924435,1.37719 v 0 l 43.69556,43.69555 c 6.50439,6.50438 6.50439,16.97718 0,23.48156 l -43.69556,43.69557 c -6.00733,6.00734 -15.399743,6.46641 -21.924443,1.37719" />
+ <g
+ id="g70"
+ transform="matrix(1.9865669,0,0,1.9865669,7.8965668,-214.98327)">
<path
- style="fill:#ffffff;stroke:#ffffff;stroke-width:0.195694px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
- d="M 89.270979,260.84064 H 55.770972"
- id="path53"
- sodipodi:nodetypes="cc" />
+ d="m 92.526265,274.16371 c -0.02771,0 -0.0551,0.001 -0.08211,0.004 -0.02696,0.002 -0.05355,0.007 -0.07971,0.0121 -0.02609,0.006 -0.05182,0.0119 -0.07695,0.0197 -0.0251,0.008 -0.04971,0.0168 -0.07366,0.0269 -0.04798,0.0202 -0.0935,0.0449 -0.136111,0.0737 -0.04258,0.0288 -0.0823,0.0615 -0.118495,0.0977 -0.0362,0.0362 -0.06894,0.0759 -0.09768,0.1185 -0.02876,0.0426 -0.05343,0.0881 -0.07366,0.13611 -0.0101,0.024 -0.01909,0.0485 -0.02684,0.0737 -0.0078,0.0251 -0.01432,0.0508 -0.01965,0.0769 -0.0056,0.0261 -0.0094,0.0527 -0.01209,0.0797 -0.0025,0.027 -0.0043,0.0544 -0.0043,0.0821 v 2.47474 h -2.175735 l -1.394122,-3.0271 c -0.02355,-0.051 -0.0569,-0.0969 -0.09812,-0.13504 -0.04128,-0.0382 -0.08963,-0.0678 -0.14234,-0.0873 -0.05269,-0.0194 -0.10872,-0.0283 -0.164847,-0.0261 -0.05609,0.002 -0.111255,0.0154 -0.162268,0.0389 -0.06822,0.0314 -0.126974,0.0802 -0.170357,0.14154 -0.04339,0.0613 -0.06986,0.13295 -0.07677,0.20773 -0.0069,0.0748 0.0062,0.15008 0.03738,0.21831 l 0.134771,0.29268 v 0.86231 c 1.9e-5,0.0228 0.0091,0.0447 0.02529,0.0609 0.01612,0.0161 0.03806,0.0252 0.06087,0.0252 0.02281,10e-6 0.04469,-0.009 0.06087,-0.0252 0.01612,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.48858 l 0.185307,0.40238 v 0.843 c 0,0.0228 0.0091,0.0447 0.02517,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02287,1e-5 0.04481,-0.009 0.06093,-0.0253 0.01612,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.46919 l 0.184955,0.40158 v 0.82449 c -7e-6,0.0228 0.009,0.0447 0.02517,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02281,-2e-5 0.04469,-0.009 0.06087,-0.0253 0.01618,-0.0161 0.02523,-0.038 0.02529,-0.0609 v -0.45068 l 0.185214,0.4022 v 0.80501 c 1.9e-5,0.0228 0.0091,0.0448 0.02529,0.0609 0.01612,0.0161 0.03806,0.0252 0.06087,0.0252 0.02281,0 0.04469,-0.009 0.06087,-0.0252 0.01611,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.43128 l 0.184954,0.40166 v 0.78651 c 1.9e-5,0.0228 0.0091,0.0447 0.02529,0.0609 0.01612,0.0161 0.03806,0.0252 0.06087,0.0252 0.02281,1e-5 0.04469,-0.009 0.06087,-0.0252 0.01612,-0.0161 0.02517,-0.038 0.02517,-0.0609 v -0.41278 l 0.185308,0.40237 v 0.76721 c -3.1e-5,0.0229 0.009,0.0448 0.02516,0.0609 0.01618,0.0161 0.03806,0.0252 0.06087,0.0252 0.02287,3e-5 0.04475,-0.009 0.06093,-0.0252 0.01612,-0.0162 0.02523,-0.0381 0.02517,-0.0609 V 279.316 l 0.184948,0.40157 v 0.74835 c 0,0.0228 0.0091,0.0447 0.02517,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02281,-2e-5 0.04469,-0.009 0.06087,-0.0253 0.01618,-0.0161 0.02523,-0.038 0.02529,-0.0609 v -0.37453 l 0.185221,0.4021 v 0.72931 c 1.8e-5,0.0228 0.0091,0.0448 0.02529,0.0609 0.01612,0.0162 0.038,0.0252 0.06087,0.0253 0.02281,-2e-5 0.04475,-0.009 0.06087,-0.0253 0.01612,-0.0161 0.02517,-0.0381 0.02517,-0.0609 v -0.39321 c 0.02616,0.0472 0.06099,0.0891 0.102664,0.12339 0.06136,0.0434 0.133073,0.0698 0.207901,0.0767 0.07483,0.007 0.150162,-0.006 0.218401,-0.0376 0.02262,-0.0104 0.04426,-0.0228 0.06467,-0.037 0.02045,-0.0142 0.03961,-0.0302 0.05727,-0.0477 0.01767,-0.0175 0.03384,-0.0366 0.04822,-0.057 0.01438,-0.0203 0.0269,-0.0419 0.03756,-0.0644 0.0106,-0.0225 0.01928,-0.0459 0.02579,-0.0699 0.0066,-0.024 0.01103,-0.0485 0.01333,-0.0733 0.0025,-0.0249 0.0025,-0.0498 3.66e-4,-0.0746 -0.0019,-0.0248 -0.0063,-0.0494 -0.01265,-0.0735 -0.0063,-0.0241 -0.01475,-0.0475 -0.02517,-0.0702 l -1.229189,-2.66893 h 2.030197 v 2.47464 c 0,0.0278 0.0012,0.0552 0.0043,0.0822 0.0025,0.027 0.0068,0.0536 0.01209,0.0797 0.0056,0.0261 0.0119,0.0518 0.01965,0.0769 0.0078,0.0251 0.01674,0.0497 0.02684,0.0736 0.02021,0.048 0.04494,0.0935 0.07366,0.13611 0.02876,0.0426 0.06149,0.0823 0.09768,0.11851 0.0362,0.0362 0.07589,0.0689 0.118495,0.0977 0.04258,0.0288 0.08816,0.0534 0.136111,0.0737 0.02399,0.0101 0.04853,0.0191 0.07366,0.0269 0.0251,0.008 0.05083,0.0143 0.07695,0.0196 0.0261,0.006 0.05269,0.009 0.07971,0.0121 0.02702,0.002 0.05436,0.004 0.08211,0.004 h 3.144887 c 0.02771,0 0.0551,-10e-4 0.08212,-0.004 0.02702,-0.002 0.05362,-0.007 0.07971,-0.0121 0.0261,-0.006 0.05176,-0.0119 0.07687,-0.0196 0.0251,-0.008 0.04971,-0.0168 0.07366,-0.0269 0.04798,-0.0202 0.09351,-0.0449 0.136111,-0.0737 0.04258,-0.0288 0.0823,-0.0615 0.118502,-0.0977 0.0362,-0.0362 0.06894,-0.0759 0.09768,-0.11851 0.02876,-0.0426 0.05356,-0.0881 0.07375,-0.13611 0.0101,-0.024 0.01909,-0.0485 0.02684,-0.0736 0.0078,-0.0251 0.01432,-0.0508 0.01965,-0.0769 0.0056,-0.0261 0.0094,-0.0527 0.01209,-0.0797 0.0025,-0.027 0.0043,-0.0545 0.0043,-0.0822 v -0.91577 h 2.027078 c -0.02585,0 -0.05107,0.002 -0.07544,0.008 -0.02436,0.005 -0.04785,0.0123 -0.07018,0.0217 -0.02238,0.009 -0.04364,0.0209 -0.06352,0.0343 -0.0199,0.0134 -0.03837,0.0286 -0.05523,0.0456 -0.01686,0.0169 -0.03217,0.0354 -0.04556,0.0552 -0.01339,0.0199 -0.02492,0.0412 -0.03434,0.0635 -0.0094,0.0224 -0.01674,0.0458 -0.02169,0.0702 -0.005,0.0244 -0.0076,0.0496 -0.0076,0.0755 v 0.3047 c 0,0.0258 0.0025,0.0511 0.0076,0.0755 0.005,0.0244 0.01227,0.0478 0.02169,0.0702 0.0094,0.0224 0.02095,0.0436 0.03434,0.0634 0.01339,0.0199 0.0287,0.0384 0.04556,0.0552 0.01692,0.0169 0.03539,0.0322 0.05523,0.0456 0.01983,0.0134 0.04116,0.025 0.06352,0.0344 0.02238,0.009 0.04581,0.0167 0.07018,0.0217 0.02436,0.005 0.04959,0.008 0.07544,0.008 H 99.8566 c 0.0259,0 0.0511,-0.002 0.0754,-0.008 0.0244,-0.005 0.0478,-0.0123 0.0702,-0.0217 0.0224,-0.009 0.0436,-0.021 0.0635,-0.0344 0.0198,-0.0134 0.0384,-0.0286 0.0552,-0.0456 0.0169,-0.0169 0.0322,-0.0354 0.0456,-0.0552 0.0134,-0.0199 0.0249,-0.0411 0.0343,-0.0634 0.009,-0.0224 0.0167,-0.0458 0.0217,-0.0702 0.005,-0.0244 0.008,-0.0496 0.008,-0.0755 v -0.3047 c 0,-0.0258 -0.002,-0.0511 -0.008,-0.0755 -0.005,-0.0244 -0.0123,-0.0479 -0.0217,-0.0702 -0.009,-0.0224 -0.0209,-0.0436 -0.0343,-0.0635 -0.0134,-0.0199 -0.0287,-0.0384 -0.0456,-0.0552 -0.0169,-0.0169 -0.0354,-0.0322 -0.0552,-0.0456 -0.0199,-0.0134 -0.0412,-0.0249 -0.0635,-0.0343 -0.0224,-0.009 -0.0458,-0.0167 -0.0702,-0.0217 -0.0244,-0.005 -0.0496,-0.008 -0.0754,-0.008 h 0.47229 c 0.0277,0 0.0551,-10e-4 0.0821,-0.004 0.027,-0.002 0.0536,-0.007 0.0797,-0.0121 0.0261,-0.006 0.0518,-0.012 0.0769,-0.0198 0.0251,-0.008 0.0497,-0.0167 0.0737,-0.0268 0.048,-0.0202 0.0935,-0.0449 0.13611,-0.0736 0.0426,-0.0288 0.0823,-0.0615 0.1185,-0.0977 0.0362,-0.0362 0.0689,-0.0759 0.0976,-0.1185 0.0288,-0.0426 0.0536,-0.0882 0.0738,-0.13611 0.0101,-0.024 0.0191,-0.0485 0.0268,-0.0737 0.008,-0.0251 0.0143,-0.0508 0.0196,-0.0769 0.006,-0.0261 0.009,-0.0527 0.0121,-0.0797 0.002,-0.027 0.004,-0.0545 0.004,-0.0822 v -1.83154 c 0,-0.0278 -0.001,-0.0551 -0.004,-0.0821 -0.002,-0.027 -0.007,-0.0537 -0.0121,-0.0798 -0.006,-0.0261 -0.0119,-0.0517 -0.0196,-0.0769 -0.008,-0.0251 -0.0167,-0.0497 -0.0268,-0.0737 -0.0202,-0.048 -0.045,-0.0935 -0.0738,-0.13612 -0.0288,-0.0426 -0.0614,-0.0823 -0.0976,-0.11849 -0.0362,-0.0362 -0.0759,-0.069 -0.1185,-0.0977 -0.0426,-0.0288 -0.0881,-0.0534 -0.13611,-0.0737 -0.024,-0.0101 -0.0485,-0.0191 -0.0737,-0.0268 -0.0251,-0.008 -0.0508,-0.0143 -0.0769,-0.0196 -0.0261,-0.006 -0.0527,-0.009 -0.0797,-0.0121 -0.027,-0.002 -0.0544,-0.004 -0.0821,-0.004 H 99.8566 c 0.0259,0 0.0511,-0.002 0.0754,-0.008 0.0244,-0.005 0.0478,-0.0123 0.0702,-0.0217 0.0224,-0.009 0.0436,-0.0209 0.0635,-0.0343 0.0198,-0.0134 0.0384,-0.0286 0.0552,-0.0456 0.0169,-0.0169 0.0322,-0.0354 0.0456,-0.0552 0.0134,-0.0198 0.0249,-0.0412 0.0343,-0.0635 0.009,-0.0224 0.0167,-0.0458 0.0217,-0.0702 0.005,-0.0244 0.008,-0.0496 0.008,-0.0754 v -0.30478 c 0,-0.0258 -0.002,-0.0511 -0.008,-0.0754 -0.005,-0.0244 -0.0123,-0.0479 -0.0217,-0.0703 -0.009,-0.0224 -0.0209,-0.0436 -0.0343,-0.0634 -0.0134,-0.0199 -0.0287,-0.0384 -0.0456,-0.0552 -0.0169,-0.0169 -0.0354,-0.0322 -0.0552,-0.0456 -0.0199,-0.0134 -0.0412,-0.0249 -0.0635,-0.0343 -0.0224,-0.009 -0.0458,-0.0167 -0.0702,-0.0217 -0.0244,-0.005 -0.0496,-0.008 -0.0754,-0.008 h -1.356758 c -0.02585,0 -0.05107,0.002 -0.07544,0.008 -0.02436,0.005 -0.04785,0.0123 -0.07018,0.0217 -0.02238,0.009 -0.04364,0.021 -0.06352,0.0343 -0.0199,0.0134 -0.03837,0.0286 -0.05523,0.0456 -0.01686,0.0169 -0.03217,0.0354 -0.04556,0.0552 -0.01339,0.0198 -0.02492,0.041 -0.03434,0.0634 -0.0094,0.0224 -0.01674,0.0459 -0.02169,0.0703 -0.005,0.0244 -0.0076,0.0496 -0.0076,0.0754 v 0.30478 c 0,0.0258 0.0025,0.0511 0.0076,0.0754 0.005,0.0244 0.01227,0.0479 0.02169,0.0702 0.0094,0.0224 0.02095,0.0436 0.03434,0.0635 0.01339,0.0199 0.0287,0.0384 0.04556,0.0552 0.01692,0.0169 0.03539,0.0322 0.05523,0.0456 0.01983,0.0134 0.04116,0.0249 0.06352,0.0343 0.02238,0.009 0.04581,0.0167 0.07018,0.0217 0.02436,0.005 0.04959,0.008 0.07544,0.008 h -2.027078 v -0.91578 c 0,-0.0277 -0.0012,-0.0551 -0.0043,-0.0821 -0.0025,-0.027 -0.0068,-0.0536 -0.01209,-0.0797 -0.0056,-0.0261 -0.0119,-0.0518 -0.01965,-0.077 -0.0078,-0.0251 -0.01674,-0.0497 -0.02684,-0.0737 -0.02021,-0.048 -0.045,-0.0935 -0.07375,-0.13611 -0.02876,-0.0426 -0.06149,-0.0823 -0.09768,-0.11849 -0.0362,-0.0362 -0.07589,-0.0689 -0.118502,-0.0977 -0.04258,-0.0288 -0.08815,-0.0534 -0.136111,-0.0737 -0.02399,-0.0101 -0.04853,-0.0191 -0.07366,-0.0268 -0.0251,-0.008 -0.05076,-0.0143 -0.07687,-0.0196 -0.02609,-0.006 -0.05269,-0.009 -0.07971,-0.0121 -0.02702,-0.002 -0.05436,-0.004 -0.08212,-0.004 z"
+ style="fill:#ffffff;stroke-width:0.0809643;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.7"
+ id="path45" />
+ <g
+ id="g69"
+ transform="translate(-0.2788785,20.370519)"
+ style="opacity:0.8">
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.163999px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 86.709765,255.58047 H 61.031144"
+ id="path46"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.168265px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 87.030483,256.33192 H 60.279694"
+ id="path47"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.172439px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 87.352286,257.08338 H 59.528233"
+ id="path48"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.176244px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 87.65232,257.83483 H 58.776783"
+ id="path49"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.181324px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 88.063064,258.58628 H 58.025333"
+ id="path50"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.187044px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 88.539307,259.33773 H 57.273883"
+ id="path51"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.191378px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 88.909928,260.08919 H 56.522422"
+ id="path52"
+ sodipodi:nodetypes="cc" />
+ <path
+ style="fill:#ffffff;stroke:#ffffff;stroke-width:0.195694px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+ d="M 89.270979,260.84064 H 55.770972"
+ id="path53"
+ sodipodi:nodetypes="cc" />
+ </g>
</g>
</g>
<g
diff --git a/src/Persefone.jl b/src/Persefone.jl
index be4ebffca53608ed39072fc72ca925d9124ff427..69ee02a3a51ad9dbf710d9b37b6c9b08bdf19773 100644
--- a/src/Persefone.jl
+++ b/src/Persefone.jl
@@ -16,6 +16,7 @@ module Persefone
using
Agents,
ArgParse,
+ CairoMakie, #XXX this is a very big dependency :-(
CSV,
Dates,
DataFrames,
@@ -26,7 +27,7 @@ using
GeoArrays, #XXX this is a big dependency - can we get rid of it?
Logging,
LoggingExtras,
- CairoMakie, #XXX this is a very big dependency :-(
+ #PrecompileTools, #TODO
Random,
Serialization,
StableRNGs,
@@ -114,4 +115,8 @@ include("nature/species/wyvern.jl")
include("core/simulation.jl") #this must be last
+#XXX precompile?
+# https://julialang.org/blog/2021/01/precompile_tutorial/
+# https://julialang.github.io/PrecompileTools.jl/stable/
+
end
diff --git a/src/analysis/makieplots.jl b/src/analysis/makieplots.jl
index 463a0f6c93cf13535ab3724d52cf95ba44f522aa..b914468a04f0b52e5704dde56b1fdb34ec6cb45f 100644
--- a/src/analysis/makieplots.jl
+++ b/src/analysis/makieplots.jl
@@ -4,30 +4,33 @@
###
"""
- visualisemap(model, date)
+ visualisemap(model, date, landcovermap)
-Draw the model's land cover map and plot all individuals as points on it at the
-specified date. If no date is passed, use the last date for which data are available.
+Draw the model's land cover map and plot all individuals as points on it at
+the specified date. If no date is passed, use the last date for which data
+are available. Optionally, you can pass a landcover map image (this is needed
+to reduce the frequency of disk I/O for Persefone Desktop).
Returns a Makie figure object.
"""
-function visualisemap(model::AgentBasedModel, date::Union{Date,Nothing}=nothing)
- # extract the data from the model and load the map
- inds = model.datatables["individuals"]
- isnothing(date) && (date = inds.Date[end])
- landcover = load(@param(world.landcovermap))
- # draw the map
+function visualisemap(model::AgentBasedModel,date=nothing,landcover=nothing)
+ # load and plot the map
+ isnothing(landcover) && (landcover = load(@param(world.landcovermap)))
f = Figure()
ax = Axis(f[1,1])
hidedecorations!(ax)
image!(f[1,1], rotr90(landcover))
ax.aspect = DataAspect()
- # plot individuals
+ # check if there are individuals and plot them
+ inds = model.datatables["individuals"]
+ iszero(size(inds)[1]) && return f
+ isnothing(date) && (date = inds.Date[end])
for s in unique(inds.Species)
- points = @select!(@subset(inds, :Species .== s, :Date .== date), :X, :Y)
+ points = @select!(@subset(inds, :Species .== s, :Date .== date),
+ :X, :Y)
# The origin in Makie is in the bottom-left rather than in the top-left as
# on the model map, so we have to invert the Y coordinates
@transform!(points, :Y = size(model.landscape)[2] .- :Y)
- scatter!(f[1,1], Matrix{Float32}(points), markersize=10)
+ scatter!(f[1,1], Matrix{Float32}(points), markersize=8)
end
f
end