From bd1f850bf41571b9f71a64314faffbae9112647e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mika=C3=ABl=20Capelle?= Date: Tue, 27 Feb 2018 19:48:47 +0100 Subject: [PATCH] Update coastline fix --- .gitignore | 1 - inputs/bbox/bretagne.poly | 345 +++++++ inputs/bbox/haute-garonne.poly | 1497 ++++++++++++++++++++++++++++++ inputs/bbox/midi-pyrenees.bbox | 1 + inputs/bbox/morbihan.bbox | 2 +- inputs/bbox/morbihan.poly | 275 ++++++ inputs/bbox/morbihan_manual.bbox | 1 + inputs/coastline-fix.sh | 60 +- 8 files changed, 2157 insertions(+), 25 deletions(-) create mode 100644 inputs/bbox/bretagne.poly create mode 100644 inputs/bbox/haute-garonne.poly create mode 100644 inputs/bbox/midi-pyrenees.bbox create mode 100644 inputs/bbox/morbihan.poly create mode 100644 inputs/bbox/morbihan_manual.bbox diff --git a/.gitignore b/.gitignore index 75c5a00..8dc8177 100644 --- a/.gitignore +++ b/.gitignore @@ -6,5 +6,4 @@ inputs/land-polygons-split-4326 *.osm *.shx *.shp -*.poly *.dbf diff --git a/inputs/bbox/bretagne.poly b/inputs/bbox/bretagne.poly new file mode 100644 index 0000000..cd29619 --- /dev/null +++ b/inputs/bbox/bretagne.poly @@ -0,0 +1,345 @@ +none +1 + -4.963422E+00 4.709394E+01 + -5.597685E+00 4.798896E+01 + -5.883925E+00 4.884217E+01 + -3.363363E+00 4.919312E+01 + -1.801389E+00 4.879524E+01 + -1.570048E+00 4.862724E+01 + -1.564652E+00 4.862064E+01 + -1.563489E+00 4.861510E+01 + -1.543333E+00 4.860704E+01 + -1.542196E+00 4.860289E+01 + -1.536016E+00 4.859907E+01 + -1.542692E+00 4.858679E+01 + -1.541944E+00 4.858279E+01 + -1.539558E+00 4.858117E+01 + -1.531956E+00 4.858227E+01 + -1.527330E+00 4.857995E+01 + -1.525260E+00 4.857375E+01 + -1.517827E+00 4.856699E+01 + -1.524822E+00 4.855961E+01 + -1.525422E+00 4.855602E+01 + -1.529794E+00 4.855271E+01 + -1.530397E+00 4.854898E+01 + -1.526700E+00 4.854433E+01 + -1.520481E+00 4.854261E+01 + -1.514761E+00 4.853840E+01 + -1.515424E+00 4.853250E+01 + -1.494767E+00 4.850978E+01 + -1.492703E+00 4.850165E+01 + -1.487844E+00 4.849410E+01 + -1.474719E+00 4.848691E+01 + -1.466668E+00 4.848967E+01 + -1.459788E+00 4.848642E+01 + -1.455025E+00 4.848888E+01 + -1.450155E+00 4.848893E+01 + -1.441654E+00 4.848497E+01 + -1.433761E+00 4.847840E+01 + -1.436717E+00 4.847297E+01 + -1.435588E+00 4.846981E+01 + -1.426403E+00 4.846306E+01 + -1.422128E+00 4.846189E+01 + -1.414902E+00 4.846415E+01 + -1.409000E+00 4.846178E+01 + -1.397790E+00 4.846356E+01 + -1.381055E+00 4.845807E+01 + -1.370980E+00 4.846172E+01 + -1.364969E+00 4.846802E+01 + -1.354799E+00 4.846919E+01 + -1.348867E+00 4.847493E+01 + -1.350092E+00 4.848312E+01 + -1.340359E+00 4.849198E+01 + -1.333389E+00 4.849258E+01 + -1.327567E+00 4.849979E+01 + -1.321589E+00 4.850132E+01 + -1.316268E+00 4.849797E+01 + -1.301332E+00 4.850043E+01 + -1.288208E+00 4.851060E+01 + -1.280712E+00 4.851091E+01 + -1.278534E+00 4.851664E+01 + -1.271179E+00 4.852498E+01 + -1.270816E+00 4.852940E+01 + -1.273657E+00 4.853471E+01 + -1.263219E+00 4.854136E+01 + -1.252229E+00 4.854501E+01 + -1.248471E+00 4.854484E+01 + -1.246082E+00 4.854216E+01 + -1.238998E+00 4.853949E+01 + -1.230230E+00 4.853890E+01 + -1.218828E+00 4.853884E+01 + -1.206396E+00 4.854351E+01 + -1.202941E+00 4.854205E+01 + -1.194499E+00 4.853205E+01 + -1.183639E+00 4.853000E+01 + -1.170323E+00 4.853260E+01 + -1.162900E+00 4.852956E+01 + -1.153715E+00 4.852061E+01 + -1.144400E+00 4.851920E+01 + -1.133810E+00 4.852339E+01 + -1.117490E+00 4.852302E+01 + -1.113298E+00 4.851908E+01 + -1.103435E+00 4.851452E+01 + -1.092040E+00 4.851207E+01 + -1.081442E+00 4.851274E+01 + -1.076120E+00 4.851008E+01 + -1.069675E+00 4.850997E+01 + -1.067158E+00 4.850740E+01 + -1.066019E+00 4.850385E+01 + -1.073981E+00 4.849929E+01 + -1.075065E+00 4.849215E+01 + -1.068585E+00 4.848622E+01 + -1.072994E+00 4.847923E+01 + -1.072905E+00 4.847644E+01 + -1.062745E+00 4.846754E+01 + -1.065257E+00 4.846128E+01 + -1.064068E+00 4.845122E+01 + -1.078839E+00 4.844141E+01 + -1.080989E+00 4.843431E+01 + -1.076262E+00 4.842164E+01 + -1.077246E+00 4.841406E+01 + -1.069084E+00 4.840803E+01 + -1.062321E+00 4.839994E+01 + -1.060337E+00 4.839398E+01 + -1.052152E+00 4.838255E+01 + -1.052056E+00 4.838018E+01 + -1.058922E+00 4.837093E+01 + -1.054269E+00 4.836347E+01 + -1.058546E+00 4.835699E+01 + -1.058534E+00 4.835060E+01 + -1.053924E+00 4.834033E+01 + -1.043839E+00 4.832837E+01 + -1.060586E+00 4.831027E+01 + -1.081628E+00 4.829684E+01 + -1.082701E+00 4.829245E+01 + -1.088559E+00 4.828741E+01 + -1.091325E+00 4.828207E+01 + -1.091673E+00 4.827372E+01 + -1.096693E+00 4.826976E+01 + -1.099229E+00 4.826331E+01 + -1.097051E+00 4.824989E+01 + -1.089085E+00 4.823984E+01 + -1.088778E+00 4.823416E+01 + -1.085149E+00 4.823118E+01 + -1.082710E+00 4.822304E+01 + -1.079283E+00 4.821951E+01 + -1.082815E+00 4.821014E+01 + -1.072656E+00 4.820129E+01 + -1.076411E+00 4.818996E+01 + -1.077320E+00 4.817678E+01 + -1.074009E+00 4.817245E+01 + -1.070643E+00 4.816259E+01 + -1.063059E+00 4.816121E+01 + -1.059193E+00 4.815072E+01 + -1.059629E+00 4.813629E+01 + -1.057050E+00 4.813193E+01 + -1.057734E+00 4.812627E+01 + -1.052845E+00 4.811735E+01 + -1.053393E+00 4.811146E+01 + -1.049482E+00 4.810174E+01 + -1.048370E+00 4.809090E+01 + -1.039363E+00 4.807899E+01 + -1.020152E+00 4.806857E+01 + -1.026092E+00 4.806408E+01 + -1.027100E+00 4.805852E+01 + -1.031343E+00 4.805420E+01 + -1.030460E+00 4.805047E+01 + -1.025501E+00 4.804563E+01 + -1.025983E+00 4.803906E+01 + -1.030793E+00 4.803106E+01 + -1.017177E+00 4.801349E+01 + -1.014538E+00 4.800292E+01 + -1.021852E+00 4.799308E+01 + -1.037571E+00 4.798993E+01 + -1.048408E+00 4.798338E+01 + -1.064208E+00 4.798340E+01 + -1.071465E+00 4.798058E+01 + -1.091778E+00 4.798617E+01 + -1.114734E+00 4.798664E+01 + -1.122983E+00 4.798231E+01 + -1.124610E+00 4.797042E+01 + -1.133959E+00 4.796662E+01 + -1.147230E+00 4.796651E+01 + -1.154072E+00 4.796336E+01 + -1.159847E+00 4.795070E+01 + -1.158856E+00 4.793849E+01 + -1.164035E+00 4.793380E+01 + -1.162294E+00 4.792708E+01 + -1.166901E+00 4.791606E+01 + -1.174988E+00 4.790717E+01 + -1.174958E+00 4.789701E+01 + -1.179145E+00 4.789454E+01 + -1.181096E+00 4.789104E+01 + -1.189905E+00 4.789090E+01 + -1.195686E+00 4.788613E+01 + -1.196084E+00 4.788101E+01 + -1.188985E+00 4.787341E+01 + -1.188072E+00 4.786653E+01 + -1.196055E+00 4.786272E+01 + -1.202699E+00 4.785567E+01 + -1.206745E+00 4.785629E+01 + -1.215362E+00 4.785333E+01 + -1.212690E+00 4.784405E+01 + -1.214887E+00 4.783118E+01 + -1.219687E+00 4.782483E+01 + -1.218830E+00 4.782054E+01 + -1.222402E+00 4.781809E+01 + -1.230566E+00 4.781836E+01 + -1.237736E+00 4.780832E+01 + -1.238152E+00 4.780323E+01 + -1.235310E+00 4.779781E+01 + -1.239995E+00 4.779138E+01 + -1.245184E+00 4.777579E+01 + -1.311272E+00 4.778971E+01 + -1.365397E+00 4.779786E+01 + -1.365836E+00 4.780452E+01 + -1.378366E+00 4.780868E+01 + -1.382184E+00 4.782152E+01 + -1.391446E+00 4.782708E+01 + -1.397289E+00 4.782775E+01 + -1.405210E+00 4.782310E+01 + -1.411712E+00 4.782665E+01 + -1.418143E+00 4.782601E+01 + -1.424113E+00 4.783096E+01 + -1.439613E+00 4.782915E+01 + -1.448662E+00 4.783145E+01 + -1.456653E+00 4.782985E+01 + -1.463574E+00 4.783338E+01 + -1.472574E+00 4.783143E+01 + -1.474591E+00 4.782697E+01 + -1.465659E+00 4.780825E+01 + -1.470152E+00 4.780209E+01 + -1.490720E+00 4.779698E+01 + -1.506575E+00 4.779840E+01 + -1.519953E+00 4.779200E+01 + -1.529348E+00 4.778320E+01 + -1.549040E+00 4.778153E+01 + -1.555092E+00 4.778350E+01 + -1.566428E+00 4.777743E+01 + -1.586486E+00 4.777737E+01 + -1.592465E+00 4.777341E+01 + -1.593700E+00 4.776584E+01 + -1.604636E+00 4.776131E+01 + -1.611454E+00 4.776295E+01 + -1.617314E+00 4.776073E+01 + -1.623073E+00 4.776094E+01 + -1.635007E+00 4.774012E+01 + -1.638114E+00 4.772879E+01 + -1.637166E+00 4.772158E+01 + -1.647011E+00 4.771930E+01 + -1.652483E+00 4.771493E+01 + -1.653793E+00 4.771082E+01 + -1.656977E+00 4.770825E+01 + -1.660687E+00 4.770789E+01 + -1.668923E+00 4.771102E+01 + -1.681581E+00 4.771012E+01 + -1.689861E+00 4.771187E+01 + -1.694084E+00 4.770952E+01 + -1.708305E+00 4.770717E+01 + -1.710832E+00 4.769911E+01 + -1.722315E+00 4.769700E+01 + -1.729502E+00 4.769786E+01 + -1.736645E+00 4.770291E+01 + -1.750141E+00 4.770577E+01 + -1.771216E+00 4.769697E+01 + -1.784880E+00 4.769802E+01 + -1.789102E+00 4.770040E+01 + -1.802473E+00 4.770009E+01 + -1.815699E+00 4.770409E+01 + -1.820894E+00 4.770352E+01 + -1.827757E+00 4.770792E+01 + -1.840267E+00 4.770422E+01 + -1.857643E+00 4.770702E+01 + -1.862787E+00 4.770591E+01 + -1.865344E+00 4.770132E+01 + -1.877228E+00 4.769417E+01 + -1.896426E+00 4.769465E+01 + -1.936570E+00 4.768517E+01 + -1.952863E+00 4.767134E+01 + -1.957529E+00 4.766994E+01 + -1.965858E+00 4.767023E+01 + -1.970344E+00 4.767289E+01 + -1.970633E+00 4.768809E+01 + -1.975162E+00 4.769120E+01 + -1.978509E+00 4.768934E+01 + -1.981071E+00 4.768418E+01 + -1.993813E+00 4.767648E+01 + -2.007166E+00 4.767111E+01 + -2.011955E+00 4.766512E+01 + -2.037214E+00 4.766753E+01 + -2.044663E+00 4.766376E+01 + -2.046957E+00 4.766149E+01 + -2.050791E+00 4.764872E+01 + -2.067275E+00 4.764845E+01 + -2.074363E+00 4.765059E+01 + -2.081075E+00 4.764883E+01 + -2.088946E+00 4.764155E+01 + -2.092876E+00 4.763416E+01 + -2.092425E+00 4.763111E+01 + -2.086409E+00 4.762625E+01 + -2.082843E+00 4.762012E+01 + -2.084811E+00 4.760273E+01 + -2.100472E+00 4.759589E+01 + -2.102338E+00 4.759204E+01 + -2.095169E+00 4.757144E+01 + -2.097731E+00 4.756541E+01 + -2.097884E+00 4.755814E+01 + -2.102123E+00 4.754870E+01 + -2.101438E+00 4.754597E+01 + -2.095729E+00 4.754092E+01 + -2.097561E+00 4.753338E+01 + -2.114297E+00 4.752716E+01 + -2.127512E+00 4.752781E+01 + -2.132960E+00 4.752492E+01 + -2.144435E+00 4.752372E+01 + -2.152607E+00 4.752069E+01 + -2.154088E+00 4.751829E+01 + -2.151528E+00 4.751023E+01 + -2.153176E+00 4.749582E+01 + -2.163729E+00 4.748791E+01 + -2.173935E+00 4.749053E+01 + -2.182543E+00 4.748946E+01 + -2.190855E+00 4.749353E+01 + -2.193747E+00 4.749958E+01 + -2.187968E+00 4.750388E+01 + -2.188207E+00 4.750871E+01 + -2.190466E+00 4.751055E+01 + -2.212630E+00 4.750744E+01 + -2.229147E+00 4.749748E+01 + -2.244092E+00 4.749242E+01 + -2.266129E+00 4.750059E+01 + -2.265017E+00 4.750657E+01 + -2.267813E+00 4.750941E+01 + -2.274506E+00 4.751046E+01 + -2.281319E+00 4.750823E+01 + -2.288795E+00 4.751216E+01 + -2.291969E+00 4.751194E+01 + -2.295472E+00 4.750924E+01 + -2.303224E+00 4.749045E+01 + -2.311951E+00 4.748453E+01 + -2.312606E+00 4.747579E+01 + -2.310505E+00 4.746502E+01 + -2.316703E+00 4.746001E+01 + -2.326611E+00 4.745751E+01 + -2.335025E+00 4.745828E+01 + -2.347133E+00 4.745650E+01 + -2.353098E+00 4.745312E+01 + -2.370239E+00 4.746201E+01 + -2.379761E+00 4.746130E+01 + -2.389422E+00 4.745577E+01 + -2.399485E+00 4.745457E+01 + -2.417490E+00 4.745911E+01 + -2.419154E+00 4.746486E+01 + -2.423670E+00 4.746721E+01 + -2.426133E+00 4.747089E+01 + -2.428798E+00 4.747131E+01 + -2.432534E+00 4.747017E+01 + -2.436994E+00 4.746472E+01 + -2.450700E+00 4.746211E+01 + -2.457000E+00 4.744399E+01 + -2.476844E+00 4.742439E+01 + -2.606214E+00 4.736983E+01 + -2.644864E+00 4.721199E+01 + -4.963422E+00 4.709394E+01 +END +END diff --git a/inputs/bbox/haute-garonne.poly b/inputs/bbox/haute-garonne.poly new file mode 100644 index 0000000..fa924b4 --- /dev/null +++ b/inputs/bbox/haute-garonne.poly @@ -0,0 +1,1497 @@ +polygon +1 + 0.44 43.132 + 0.454 43.144 + 0.458 43.151 + 0.468 43.157 + 0.474 43.163 + 0.487 43.167 + 0.489 43.171 + 0.497 43.174 + 0.505 43.183 + 0.509 43.184 + 0.512 43.19 + 0.518 43.192 + 0.509 43.194 + 0.508 43.196 + 0.504 43.197 + 0.504 43.201 + 0.514 43.209 + 0.516 43.214 + 0.521 43.214 + 0.524 43.212 + 0.535 43.21 + 0.537 43.213 + 0.545 43.216 + 0.548 43.213 + 0.554 43.212 + 0.561 43.214 + 0.562 43.216 + 0.572 43.221 + 0.57 43.223 + 0.571 43.231 + 0.566 43.23 + 0.566 43.232 + 0.563 43.233 + 0.555 43.235 + 0.55 43.234 + 0.549 43.238 + 0.559 43.244 + 0.56 43.248 + 0.564 43.25 + 0.565 43.254 + 0.574 43.255 + 0.575 43.261 + 0.58 43.263 + 0.585 43.268 + 0.587 43.268 + 0.588 43.271 + 0.598 43.277 + 0.607 43.28 + 0.613 43.279 + 0.615 43.291 + 0.623 43.294 + 0.631 43.294 + 0.634 43.296 + 0.633 43.297 + 0.634 43.299 + 0.607 43.308 + 0.605 43.312 + 0.609 43.314 + 0.611 43.318 + 0.625 43.318 + 0.631 43.316 + 0.64 43.316 + 0.644 43.314 + 0.649 43.315 + 0.662 43.324 + 0.668 43.326 + 0.673 43.331 + 0.673 43.335 + 0.679 43.337 + 0.686 43.347 + 0.686 43.35 + 0.695 43.356 + 0.695 43.359 + 0.701 43.365 + 0.701 43.367 + 0.705 43.368 + 0.708 43.371 + 0.709 43.376 + 0.712 43.377 + 0.715 43.383 + 0.719 43.383 + 0.718 43.379 + 0.721 43.377 + 0.734 43.374 + 0.74 43.383 + 0.745 43.384 + 0.745 43.386 + 0.75 43.389 + 0.748 43.393 + 0.743 43.394 + 0.743 43.397 + 0.749 43.4 + 0.75 43.401 + 0.749 43.403 + 0.751 43.405 + 0.755 43.406 + 0.752 43.409 + 0.753 43.412 + 0.749 43.413 + 0.745 43.417 + 0.747 43.422 + 0.755 43.421 + 0.759 43.417 + 0.765 43.419 + 0.772 43.419 + 0.776 43.415 + 0.779 43.415 + 0.78 43.413 + 0.785 43.413 + 0.806 43.402 + 0.81 43.412 + 0.814 43.416 + 0.817 43.416 + 0.819 43.419 + 0.825 43.417 + 0.832 43.417 + 0.836 43.414 + 0.84 43.414 + 0.843 43.412 + 0.847 43.413 + 0.848 43.416 + 0.861 43.415 + 0.863 43.418 + 0.867 43.418 + 0.872 43.413 + 0.886 43.412 + 0.887 43.414 + 0.89 43.414 + 0.891 43.413 + 0.89 43.41 + 0.893 43.408 + 0.896 43.41 + 0.901 43.408 + 0.902 43.41 + 0.918 43.408 + 0.92 43.404 + 0.922 43.405 + 0.929 43.402 + 0.93 43.396 + 0.934 43.394 + 0.935 43.389 + 0.94 43.389 + 0.944 43.387 + 0.944 43.384 + 0.945 43.387 + 0.954 43.386 + 0.959 43.391 + 0.964 43.39 + 0.969 43.384 + 0.97 43.379 + 0.972 43.378 + 0.968 43.372 + 0.978 43.365 + 0.986 43.366 + 0.993 43.369 + 0.993 43.375 + 0.995 43.378 + 1.002 43.379 + 0.996 43.381 + 0.996 43.385 + 0.999 43.387 + 1 43.392 + 0.996 43.397 + 0.994 43.405 + 0.991 43.408 + 0.991 43.411 + 0.997 43.412 + 0.997 43.414 + 1.002 43.418 + 1.01 43.414 + 1.021 43.414 + 1.022 43.418 + 1.025 43.421 + 1.019 43.426 + 1.017 43.432 + 1.02 43.434 + 1.021 43.44 + 1.027 43.44 + 1.031 43.444 + 1.033 43.455 + 1.035 43.458 + 1.04 43.459 + 1.035 43.463 + 1.026 43.465 + 1.023 43.469 + 1.018 43.47 + 1.016 43.472 + 1.016 43.475 + 1.022 43.482 + 1.032 43.484 + 1.033 43.489 + 1.051 43.489 + 1.044 43.494 + 1.044 43.498 + 1.046 43.499 + 1.05 43.497 + 1.057 43.505 + 1.057 43.507 + 1.059 43.508 + 1.064 43.507 + 1.059 43.51 + 1.059 43.513 + 1.051 43.513 + 1.048 43.515 + 1.048 43.517 + 1.053 43.521 + 1.051 43.522 + 1.05 43.525 + 1.056 43.529 + 1.062 43.529 + 1.067 43.527 + 1.068 43.525 + 1.07 43.528 + 1.066 43.531 + 1.064 43.535 + 1.064 43.534 + 1.058 43.535 + 1.051 43.538 + 1.049 43.54 + 1.05 43.544 + 1.059 43.541 + 1.061 43.543 + 1.066 43.542 + 1.069 43.548 + 1.08 43.55 + 1.089 43.549 + 1.09 43.547 + 1.093 43.547 + 1.094 43.542 + 1.099 43.539 + 1.099 43.536 + 1.102 43.536 + 1.107 43.542 + 1.111 43.542 + 1.115 43.544 + 1.117 43.547 + 1.112 43.548 + 1.112 43.553 + 1.11 43.555 + 1.111 43.559 + 1.124 43.556 + 1.138 43.557 + 1.14 43.559 + 1.147 43.558 + 1.154 43.56 + 1.156 43.559 + 1.162 43.572 + 1.159 43.574 + 1.161 43.577 + 1.176 43.572 + 1.183 43.575 + 1.198 43.572 + 1.198 43.574 + 1.201 43.577 + 1.199 43.578 + 1.198 43.583 + 1.199 43.596 + 1.195 43.599 + 1.191 43.599 + 1.19 43.6 + 1.191 43.603 + 1.187 43.604 + 1.18 43.612 + 1.173 43.605 + 1.168 43.604 + 1.166 43.602 + 1.161 43.602 + 1.157 43.604 + 1.15 43.611 + 1.147 43.617 + 1.141 43.62 + 1.14 43.625 + 1.146 43.633 + 1.14 43.64 + 1.131 43.641 + 1.127 43.637 + 1.118 43.638 + 1.117 43.635 + 1.111 43.635 + 1.107 43.639 + 1.096 43.639 + 1.086 43.644 + 1.087 43.65 + 1.092 43.656 + 1.093 43.657 + 1.097 43.656 + 1.098 43.66 + 1.095 43.661 + 1.094 43.663 + 1.074 43.66 + 1.063 43.669 + 1.057 43.669 + 1.056 43.672 + 1.048 43.673 + 1.047 43.677 + 1.049 43.678 + 1.05 43.687 + 1.053 43.69 + 1.056 43.689 + 1.056 43.693 + 1.058 43.694 + 1.058 43.698 + 1.061 43.7 + 1.061 43.702 + 1.057 43.703 + 1.056 43.702 + 1.04 43.711 + 1.037 43.709 + 1.034 43.71 + 1.027 43.708 + 1.019 43.717 + 1.02 43.723 + 1.013 43.724 + 1.01 43.727 + 1.006 43.727 + 1.003 43.729 + 1.002 43.733 + 0.996 43.733 + 0.989 43.737 + 0.984 43.742 + 0.985 43.746 + 0.982 43.752 + 0.975 43.756 + 0.974 43.758 + 0.972 43.758 + 0.969 43.755 + 0.964 43.758 + 0.965 43.762 + 0.962 43.763 + 0.963 43.766 + 0.959 43.771 + 0.954 43.772 + 0.955 43.781 + 0.95 43.784 + 0.954 43.791 + 0.959 43.79 + 0.961 43.793 + 0.964 43.793 + 0.967 43.792 + 0.97 43.788 + 0.972 43.788 + 0.973 43.79 + 0.98 43.789 + 0.979 43.79 + 0.981 43.794 + 0.989 43.799 + 1.008 43.801 + 1.013 43.804 + 1.02 43.804 + 1.026 43.801 + 1.035 43.806 + 1.039 43.806 + 1.046 43.801 + 1.057 43.8 + 1.062 43.805 + 1.07 43.807 + 1.072 43.811 + 1.078 43.812 + 1.078 43.816 + 1.081 43.818 + 1.085 43.818 + 1.086 43.816 + 1.094 43.814 + 1.097 43.809 + 1.108 43.809 + 1.113 43.807 + 1.113 43.804 + 1.108 43.802 + 1.11 43.798 + 1.113 43.799 + 1.117 43.805 + 1.127 43.813 + 1.137 43.817 + 1.141 43.817 + 1.143 43.824 + 1.15 43.825 + 1.16 43.819 + 1.163 43.814 + 1.163 43.81 + 1.176 43.807 + 1.183 43.796 + 1.199 43.794 + 1.205 43.794 + 1.209 43.796 + 1.21 43.794 + 1.218 43.794 + 1.221 43.789 + 1.22 43.781 + 1.214 43.778 + 1.209 43.778 + 1.208 43.776 + 1.213 43.772 + 1.213 43.77 + 1.215 43.77 + 1.222 43.775 + 1.245 43.779 + 1.25 43.782 + 1.265 43.785 + 1.268 43.788 + 1.273 43.787 + 1.277 43.789 + 1.268 43.79 + 1.265 43.795 + 1.265 43.8 + 1.274 43.801 + 1.277 43.805 + 1.281 43.804 + 1.283 43.798 + 1.285 43.8 + 1.294 43.8 + 1.307 43.804 + 1.311 43.803 + 1.329 43.812 + 1.332 43.81 + 1.334 43.81 + 1.337 43.813 + 1.342 43.812 + 1.343 43.815 + 1.348 43.819 + 1.359 43.819 + 1.356 43.826 + 1.356 43.833 + 1.354 43.835 + 1.345 43.836 + 1.336 43.834 + 1.326 43.836 + 1.32 43.831 + 1.313 43.83 + 1.308 43.835 + 1.308 43.839 + 1.303 43.841 + 1.302 43.843 + 1.293 43.842 + 1.292 43.847 + 1.294 43.851 + 1.299 43.852 + 1.3 43.854 + 1.305 43.856 + 1.312 43.856 + 1.317 43.86 + 1.332 43.857 + 1.332 43.853 + 1.339 43.853 + 1.342 43.855 + 1.349 43.855 + 1.35 43.853 + 1.354 43.856 + 1.358 43.854 + 1.36 43.855 + 1.361 43.856 + 1.354 43.864 + 1.347 43.867 + 1.347 43.872 + 1.351 43.876 + 1.355 43.877 + 1.353 43.879 + 1.355 43.886 + 1.359 43.887 + 1.364 43.892 + 1.368 43.891 + 1.369 43.889 + 1.375 43.886 + 1.384 43.886 + 1.392 43.883 + 1.396 43.886 + 1.4 43.886 + 1.401 43.888 + 1.403 43.888 + 1.41 43.884 + 1.411 43.883 + 1.41 43.882 + 1.416 43.88 + 1.417 43.874 + 1.427 43.874 + 1.431 43.871 + 1.436 43.875 + 1.451 43.875 + 1.456 43.883 + 1.455 43.888 + 1.458 43.891 + 1.46 43.89 + 1.468 43.899 + 1.47 43.899 + 1.471 43.902 + 1.473 43.903 + 1.474 43.909 + 1.476 43.91 + 1.479 43.91 + 1.481 43.907 + 1.49 43.904 + 1.492 43.899 + 1.492 43.896 + 1.49 43.894 + 1.491 43.891 + 1.497 43.89 + 1.498 43.895 + 1.503 43.894 + 1.506 43.899 + 1.515 43.902 + 1.513 43.905 + 1.514 43.908 + 1.523 43.906 + 1.525 43.91 + 1.531 43.914 + 1.53 43.921 + 1.532 43.924 + 1.545 43.922 + 1.548 43.919 + 1.553 43.921 + 1.558 43.92 + 1.559 43.916 + 1.557 43.912 + 1.552 43.91 + 1.551 43.906 + 1.549 43.905 + 1.551 43.892 + 1.556 43.886 + 1.558 43.886 + 1.564 43.881 + 1.564 43.878 + 1.56 43.876 + 1.562 43.874 + 1.565 43.874 + 1.566 43.872 + 1.562 43.868 + 1.562 43.865 + 1.566 43.858 + 1.568 43.858 + 1.568 43.856 + 1.572 43.854 + 1.574 43.85 + 1.595 43.844 + 1.596 43.838 + 1.594 43.834 + 1.591 43.832 + 1.592 43.829 + 1.595 43.828 + 1.595 43.824 + 1.593 43.821 + 1.59 43.82 + 1.59 43.818 + 1.594 43.815 + 1.604 43.813 + 1.61 43.808 + 1.612 43.81 + 1.615 43.81 + 1.616 43.808 + 1.62 43.806 + 1.622 43.807 + 1.63 43.802 + 1.632 43.804 + 1.646 43.802 + 1.647 43.799 + 1.652 43.796 + 1.652 43.793 + 1.649 43.792 + 1.644 43.787 + 1.644 43.78 + 1.647 43.778 + 1.652 43.778 + 1.658 43.77 + 1.658 43.765 + 1.653 43.752 + 1.657 43.752 + 1.659 43.75 + 1.66 43.745 + 1.67 43.742 + 1.671 43.74 + 1.673 43.74 + 1.674 43.737 + 1.682 43.739 + 1.685 43.733 + 1.689 43.731 + 1.694 43.732 + 1.701 43.728 + 1.704 43.721 + 1.709 43.717 + 1.708 43.716 + 1.709 43.711 + 1.705 43.708 + 1.701 43.707 + 1.696 43.709 + 1.691 43.706 + 1.685 43.706 + 1.683 43.699 + 1.674 43.699 + 1.668 43.702 + 1.666 43.696 + 1.675 43.696 + 1.678 43.694 + 1.698 43.695 + 1.702 43.693 + 1.72 43.691 + 1.723 43.689 + 1.723 43.687 + 1.721 43.686 + 1.721 43.68 + 1.723 43.678 + 1.723 43.675 + 1.731 43.669 + 1.731 43.666 + 1.733 43.665 + 1.733 43.656 + 1.723 43.655 + 1.722 43.653 + 1.719 43.652 + 1.707 43.651 + 1.701 43.648 + 1.701 43.645 + 1.693 43.639 + 1.693 43.631 + 1.691 43.63 + 1.693 43.626 + 1.697 43.625 + 1.699 43.622 + 1.703 43.62 + 1.707 43.625 + 1.709 43.625 + 1.712 43.622 + 1.722 43.62 + 1.726 43.618 + 1.726 43.614 + 1.728 43.612 + 1.731 43.612 + 1.737 43.608 + 1.745 43.607 + 1.746 43.605 + 1.75 43.605 + 1.753 43.607 + 1.755 43.607 + 1.758 43.604 + 1.761 43.606 + 1.768 43.605 + 1.775 43.6 + 1.774 43.597 + 1.776 43.596 + 1.777 43.592 + 1.78 43.591 + 1.78 43.589 + 1.782 43.59 + 1.787 43.586 + 1.799 43.587 + 1.801 43.584 + 1.809 43.58 + 1.811 43.584 + 1.826 43.583 + 1.83 43.58 + 1.831 43.581 + 1.841 43.58 + 1.842 43.576 + 1.841 43.576 + 1.851 43.569 + 1.852 43.562 + 1.851 43.561 + 1.856 43.554 + 1.853 43.551 + 1.872 43.544 + 1.88 43.543 + 1.882 43.539 + 1.875 43.535 + 1.876 43.533 + 1.881 43.532 + 1.885 43.524 + 1.885 43.521 + 1.887 43.521 + 1.889 43.518 + 1.894 43.517 + 1.896 43.513 + 1.905 43.511 + 1.915 43.506 + 1.916 43.504 + 1.919 43.507 + 1.922 43.507 + 1.926 43.503 + 1.93 43.503 + 1.932 43.505 + 1.935 43.504 + 1.936 43.501 + 1.942 43.497 + 1.945 43.497 + 1.951 43.493 + 1.957 43.496 + 1.976 43.49 + 1.985 43.482 + 1.99 43.48 + 1.994 43.485 + 2.008 43.482 + 2.011 43.485 + 2.013 43.488 + 2.011 43.494 + 2.013 43.504 + 2.01 43.508 + 2.013 43.509 + 2.014 43.511 + 2.031 43.508 + 2.031 43.504 + 2.033 43.501 + 2.033 43.502 + 2.037 43.501 + 2.038 43.502 + 2.036 43.504 + 2.036 43.509 + 2.038 43.51 + 2.039 43.515 + 2.041 43.515 + 2.046 43.512 + 2.047 43.507 + 2.049 43.505 + 2.05 43.495 + 2.046 43.49 + 2.05 43.487 + 2.05 43.484 + 2.046 43.482 + 2.04 43.475 + 2.028 43.475 + 2.021 43.471 + 2.021 43.466 + 2.023 43.464 + 2.023 43.462 + 2.021 43.461 + 2.022 43.456 + 2.016 43.449 + 2.024 43.449 + 2.025 43.446 + 2.029 43.443 + 2.033 43.432 + 2.041 43.426 + 2.042 43.424 + 2.04 43.421 + 2.031 43.417 + 2.021 43.421 + 2.019 43.417 + 2.016 43.416 + 2.016 43.413 + 1.999 43.412 + 1.993 43.407 + 1.987 43.406 + 1.98 43.413 + 1.979 43.412 + 1.976 43.413 + 1.971 43.418 + 1.967 43.413 + 1.965 43.413 + 1.96 43.417 + 1.961 43.421 + 1.958 43.424 + 1.956 43.424 + 1.95 43.417 + 1.934 43.423 + 1.927 43.419 + 1.922 43.419 + 1.923 43.412 + 1.92 43.411 + 1.919 43.406 + 1.914 43.405 + 1.917 43.4 + 1.913 43.398 + 1.909 43.392 + 1.904 43.391 + 1.9 43.394 + 1.894 43.395 + 1.893 43.397 + 1.896 43.401 + 1.896 43.404 + 1.898 43.405 + 1.897 43.407 + 1.898 43.41 + 1.895 43.412 + 1.895 43.416 + 1.889 43.418 + 1.886 43.422 + 1.882 43.423 + 1.881 43.425 + 1.872 43.427 + 1.871 43.431 + 1.873 43.435 + 1.857 43.442 + 1.858 43.44 + 1.857 43.438 + 1.853 43.435 + 1.848 43.435 + 1.85 43.424 + 1.847 43.423 + 1.844 43.417 + 1.844 43.413 + 1.836 43.415 + 1.834 43.417 + 1.828 43.417 + 1.824 43.415 + 1.819 43.409 + 1.819 43.404 + 1.827 43.399 + 1.828 43.394 + 1.821 43.39 + 1.815 43.391 + 1.813 43.393 + 1.807 43.392 + 1.807 43.389 + 1.805 43.388 + 1.812 43.385 + 1.813 43.383 + 1.811 43.379 + 1.808 43.379 + 1.806 43.377 + 1.81 43.373 + 1.808 43.368 + 1.806 43.368 + 1.809 43.366 + 1.807 43.359 + 1.819 43.35 + 1.814 43.339 + 1.801 43.34 + 1.799 43.338 + 1.796 43.338 + 1.79 43.342 + 1.783 43.344 + 1.781 43.34 + 1.775 43.34 + 1.776 43.337 + 1.774 43.335 + 1.771 43.335 + 1.768 43.338 + 1.758 43.342 + 1.756 43.346 + 1.752 43.347 + 1.752 43.344 + 1.75 43.342 + 1.744 43.34 + 1.741 43.337 + 1.738 43.337 + 1.735 43.333 + 1.732 43.335 + 1.728 43.329 + 1.73 43.328 + 1.731 43.325 + 1.736 43.324 + 1.738 43.319 + 1.738 43.313 + 1.737 43.312 + 1.732 43.313 + 1.729 43.312 + 1.727 43.308 + 1.718 43.308 + 1.709 43.304 + 1.718 43.297 + 1.718 43.294 + 1.71 43.29 + 1.711 43.288 + 1.709 43.285 + 1.703 43.282 + 1.703 43.28 + 1.701 43.28 + 1.701 43.276 + 1.699 43.274 + 1.695 43.272 + 1.688 43.272 + 1.684 43.273 + 1.68 43.277 + 1.675 43.279 + 1.674 43.277 + 1.672 43.277 + 1.671 43.274 + 1.665 43.272 + 1.664 43.269 + 1.661 43.268 + 1.652 43.259 + 1.653 43.254 + 1.656 43.254 + 1.659 43.251 + 1.657 43.242 + 1.645 43.235 + 1.633 43.236 + 1.632 43.242 + 1.635 43.248 + 1.635 43.254 + 1.607 43.258 + 1.599 43.265 + 1.581 43.267 + 1.579 43.271 + 1.574 43.271 + 1.573 43.273 + 1.571 43.27 + 1.576 43.268 + 1.577 43.262 + 1.573 43.258 + 1.572 43.253 + 1.565 43.251 + 1.547 43.275 + 1.54 43.273 + 1.539 43.275 + 1.54 43.276 + 1.528 43.272 + 1.526 43.27 + 1.517 43.268 + 1.513 43.279 + 1.515 43.281 + 1.513 43.285 + 1.514 43.29 + 1.511 43.29 + 1.512 43.288 + 1.507 43.284 + 1.503 43.285 + 1.497 43.29 + 1.496 43.279 + 1.499 43.276 + 1.496 43.272 + 1.493 43.272 + 1.491 43.27 + 1.495 43.264 + 1.495 43.262 + 1.492 43.259 + 1.493 43.256 + 1.498 43.257 + 1.505 43.253 + 1.507 43.25 + 1.507 43.248 + 1.502 43.245 + 1.502 43.241 + 1.5 43.238 + 1.497 43.237 + 1.505 43.235 + 1.507 43.233 + 1.506 43.226 + 1.508 43.224 + 1.511 43.224 + 1.511 43.22 + 1.504 43.218 + 1.493 43.221 + 1.487 43.225 + 1.479 43.221 + 1.478 43.216 + 1.473 43.214 + 1.471 43.208 + 1.469 43.207 + 1.464 43.209 + 1.461 43.208 + 1.458 43.21 + 1.448 43.21 + 1.442 43.214 + 1.439 43.213 + 1.432 43.215 + 1.424 43.221 + 1.424 43.223 + 1.414 43.225 + 1.415 43.23 + 1.417 43.231 + 1.415 43.239 + 1.418 43.239 + 1.419 43.242 + 1.423 43.243 + 1.424 43.246 + 1.422 43.248 + 1.425 43.254 + 1.421 43.256 + 1.421 43.259 + 1.418 43.259 + 1.416 43.263 + 1.41 43.264 + 1.41 43.268 + 1.4 43.276 + 1.392 43.278 + 1.383 43.286 + 1.374 43.287 + 1.375 43.294 + 1.372 43.295 + 1.37 43.299 + 1.364 43.3 + 1.365 43.304 + 1.362 43.306 + 1.362 43.309 + 1.367 43.31 + 1.357 43.31 + 1.354 43.313 + 1.35 43.314 + 1.344 43.314 + 1.341 43.312 + 1.332 43.313 + 1.33 43.31 + 1.326 43.309 + 1.324 43.305 + 1.324 43.3 + 1.319 43.294 + 1.307 43.296 + 1.308 43.29 + 1.306 43.288 + 1.304 43.289 + 1.305 43.286 + 1.303 43.284 + 1.295 43.286 + 1.298 43.282 + 1.298 43.279 + 1.304 43.275 + 1.304 43.27 + 1.296 43.266 + 1.299 43.265 + 1.308 43.267 + 1.321 43.263 + 1.331 43.265 + 1.334 43.261 + 1.334 43.256 + 1.329 43.255 + 1.324 43.251 + 1.337 43.252 + 1.341 43.246 + 1.35 43.245 + 1.354 43.247 + 1.366 43.244 + 1.37 43.247 + 1.374 43.247 + 1.376 43.245 + 1.377 43.239 + 1.383 43.236 + 1.385 43.231 + 1.384 43.224 + 1.382 43.223 + 1.381 43.219 + 1.378 43.217 + 1.376 43.212 + 1.369 43.207 + 1.361 43.211 + 1.346 43.21 + 1.341 43.205 + 1.33 43.202 + 1.332 43.196 + 1.328 43.195 + 1.326 43.19 + 1.322 43.188 + 1.313 43.188 + 1.312 43.19 + 1.305 43.193 + 1.304 43.191 + 1.296 43.187 + 1.274 43.194 + 1.27 43.193 + 1.27 43.19 + 1.266 43.188 + 1.265 43.185 + 1.258 43.184 + 1.252 43.181 + 1.249 43.181 + 1.244 43.188 + 1.233 43.187 + 1.23 43.185 + 1.229 43.182 + 1.229 43.177 + 1.231 43.176 + 1.23 43.173 + 1.226 43.171 + 1.224 43.164 + 1.219 43.162 + 1.219 43.156 + 1.227 43.153 + 1.233 43.154 + 1.242 43.151 + 1.257 43.15 + 1.263 43.148 + 1.27 43.149 + 1.273 43.151 + 1.276 43.15 + 1.278 43.143 + 1.28 43.143 + 1.283 43.139 + 1.288 43.138 + 1.298 43.128 + 1.303 43.126 + 1.305 43.124 + 1.305 43.121 + 1.291 43.122 + 1.286 43.118 + 1.282 43.108 + 1.262 43.107 + 1.261 43.106 + 1.265 43.102 + 1.265 43.1 + 1.262 43.097 + 1.264 43.093 + 1.262 43.089 + 1.234 43.084 + 1.222 43.084 + 1.221 43.089 + 1.217 43.094 + 1.217 43.097 + 1.209 43.104 + 1.209 43.108 + 1.211 43.11 + 1.207 43.118 + 1.199 43.12 + 1.197 43.124 + 1.194 43.125 + 1.189 43.13 + 1.176 43.137 + 1.173 43.137 + 1.172 43.133 + 1.168 43.128 + 1.165 43.128 + 1.159 43.132 + 1.154 43.132 + 1.152 43.134 + 1.146 43.135 + 1.143 43.137 + 1.141 43.142 + 1.135 43.146 + 1.135 43.148 + 1.125 43.153 + 1.124 43.151 + 1.121 43.151 + 1.12 43.149 + 1.116 43.148 + 1.115 43.143 + 1.113 43.142 + 1.1 43.142 + 1.095 43.139 + 1.091 43.14 + 1.089 43.137 + 1.09 43.134 + 1.089 43.132 + 1.076 43.136 + 1.075 43.135 + 1.073 43.137 + 1.059 43.136 + 1.058 43.14 + 1.055 43.142 + 1.055 43.139 + 1.052 43.136 + 1.049 43.137 + 1.054 43.134 + 1.053 43.119 + 1.048 43.115 + 1.046 43.108 + 1.044 43.107 + 1.042 43.101 + 1.039 43.098 + 1.032 43.097 + 1.031 43.099 + 1.029 43.098 + 1.025 43.099 + 1.023 43.1 + 1.023 43.103 + 1.018 43.103 + 1.017 43.106 + 1.012 43.107 + 1.01 43.11 + 1.006 43.111 + 1.007 43.109 + 1.006 43.103 + 1.002 43.101 + 1.001 43.097 + 0.995 43.096 + 0.994 43.091 + 0.997 43.09 + 0.998 43.088 + 1.001 43.088 + 1.002 43.086 + 1.007 43.085 + 1.009 43.083 + 1.008 43.08 + 1.004 43.075 + 1.001 43.075 + 0.999 43.071 + 0.991 43.07 + 0.982 43.072 + 0.987 43.069 + 0.988 43.065 + 0.986 43.059 + 0.987 43.052 + 0.992 43.052 + 0.992 43.05 + 0.994 43.051 + 0.996 43.049 + 0.997 43.041 + 0.996 43.038 + 0.993 43.037 + 0.986 43.041 + 0.988 43.028 + 0.99 43.025 + 0.995 43.026 + 1.003 43.025 + 1.013 43.018 + 1.012 43.016 + 1.014 43.016 + 1.016 43.012 + 1.023 43.012 + 1.024 43.009 + 1.019 43.005 + 1.008 43.006 + 1.003 43.001 + 0.997 42.989 + 0.983 42.979 + 0.982 42.973 + 0.967 42.97 + 0.963 42.966 + 0.96 42.967 + 0.954 42.964 + 0.932 42.965 + 0.919 42.959 + 0.916 42.959 + 0.914 42.957 + 0.905 42.955 + 0.904 42.956 + 0.894 42.955 + 0.887 42.957 + 0.878 42.956 + 0.878 42.95 + 0.881 42.944 + 0.886 42.94 + 0.888 42.936 + 0.886 42.93 + 0.876 42.924 + 0.866 42.926 + 0.858 42.921 + 0.845 42.924 + 0.838 42.918 + 0.834 42.918 + 0.829 42.915 + 0.834 42.912 + 0.836 42.909 + 0.835 42.904 + 0.841 42.899 + 0.843 42.899 + 0.843 42.893 + 0.846 42.891 + 0.846 42.888 + 0.844 42.887 + 0.845 42.884 + 0.842 42.883 + 0.839 42.879 + 0.838 42.872 + 0.841 42.87 + 0.841 42.868 + 0.85 42.867 + 0.851 42.859 + 0.854 42.857 + 0.855 42.85 + 0.859 42.845 + 0.859 42.84 + 0.863 42.838 + 0.86 42.824 + 0.835 42.827 + 0.83 42.826 + 0.81 42.837 + 0.801 42.839 + 0.786 42.834 + 0.776 42.834 + 0.772 42.837 + 0.767 42.836 + 0.76 42.841 + 0.735 42.847 + 0.733 42.853 + 0.73 42.853 + 0.728 42.855 + 0.716 42.856 + 0.711 42.859 + 0.707 42.859 + 0.703 42.856 + 0.693 42.853 + 0.681 42.853 + 0.68 42.845 + 0.666 42.841 + 0.662 42.838 + 0.661 42.834 + 0.663 42.833 + 0.663 42.83 + 0.671 42.826 + 0.672 42.821 + 0.668 42.818 + 0.666 42.814 + 0.672 42.807 + 0.672 42.803 + 0.667 42.798 + 0.66 42.796 + 0.65 42.783 + 0.655 42.779 + 0.668 42.777 + 0.669 42.774 + 0.666 42.77 + 0.664 42.77 + 0.661 42.767 + 0.657 42.767 + 0.654 42.759 + 0.647 42.754 + 0.662 42.754 + 0.666 42.751 + 0.665 42.744 + 0.669 42.743 + 0.669 42.739 + 0.672 42.735 + 0.672 42.732 + 0.677 42.731 + 0.682 42.725 + 0.681 42.721 + 0.672 42.72 + 0.685 42.71 + 0.683 42.704 + 0.676 42.7 + 0.676 42.697 + 0.679 42.692 + 0.678 42.689 + 0.668 42.688 + 0.651 42.69 + 0.648 42.692 + 0.639 42.691 + 0.617 42.694 + 0.601 42.699 + 0.597 42.703 + 0.594 42.703 + 0.594 42.699 + 0.587 42.692 + 0.584 42.694 + 0.577 42.693 + 0.574 42.695 + 0.568 42.694 + 0.553 42.698 + 0.536 42.698 + 0.528 42.7 + 0.524 42.698 + 0.521 42.69 + 0.512 42.689 + 0.508 42.691 + 0.5 42.69 + 0.493 42.691 + 0.484 42.697 + 0.472 42.699 + 0.472 42.702 + 0.479 42.705 + 0.477 42.711 + 0.469 42.715 + 0.47 42.719 + 0.462 42.72 + 0.458 42.725 + 0.452 42.727 + 0.449 42.73 + 0.449 42.734 + 0.453 42.738 + 0.459 42.738 + 0.461 42.743 + 0.458 42.748 + 0.458 42.751 + 0.462 42.758 + 0.457 42.762 + 0.457 42.764 + 0.452 42.77 + 0.454 42.774 + 0.454 42.781 + 0.46 42.791 + 0.462 42.792 + 0.459 42.797 + 0.46 42.803 + 0.456 42.806 + 0.455 42.809 + 0.454 42.817 + 0.457 42.824 + 0.457 42.831 + 0.46 42.833 + 0.461 42.838 + 0.465 42.845 + 0.459 42.849 + 0.458 42.853 + 0.463 42.855 + 0.466 42.859 + 0.47 42.86 + 0.471 42.862 + 0.47 42.872 + 0.473 42.874 + 0.475 42.879 + 0.486 42.88 + 0.491 42.879 + 0.493 42.877 + 0.498 42.878 + 0.499 42.876 + 0.504 42.875 + 0.505 42.871 + 0.51 42.873 + 0.513 42.871 + 0.527 42.87 + 0.531 42.866 + 0.534 42.866 + 0.536 42.864 + 0.537 42.866 + 0.55 42.867 + 0.555 42.862 + 0.56 42.863 + 0.572 42.871 + 0.574 42.878 + 0.573 42.881 + 0.576 42.884 + 0.576 42.886 + 0.582 42.891 + 0.586 42.906 + 0.59 42.909 + 0.591 42.912 + 0.595 42.913 + 0.594 42.921 + 0.598 42.929 + 0.603 42.933 + 0.603 42.935 + 0.615 42.938 + 0.616 42.941 + 0.62 42.943 + 0.625 42.943 + 0.632 42.949 + 0.635 42.954 + 0.641 42.955 + 0.644 42.961 + 0.635 42.967 + 0.618 42.97 + 0.611 42.981 + 0.611 42.983 + 0.614 42.984 + 0.613 42.986 + 0.609 42.987 + 0.609 42.99 + 0.615 42.991 + 0.617 42.993 + 0.622 42.993 + 0.626 42.999 + 0.623 43.002 + 0.619 43.003 + 0.617 43.005 + 0.617 43.008 + 0.613 43.01 + 0.612 43.014 + 0.614 43.021 + 0.609 43.025 + 0.606 43.032 + 0.596 43.033 + 0.597 43.028 + 0.594 43.027 + 0.595 43.026 + 0.594 43.021 + 0.587 43.021 + 0.587 43.018 + 0.585 43.017 + 0.579 43.017 + 0.575 43.02 + 0.567 43.019 + 0.563 43.014 + 0.556 43.013 + 0.553 43.006 + 0.549 43.005 + 0.543 42.999 + 0.533 43 + 0.529 43.003 + 0.529 43.005 + 0.526 43.004 + 0.524 43.006 + 0.524 43.01 + 0.53 43.013 + 0.534 43.018 + 0.532 43.024 + 0.535 43.035 + 0.533 43.036 + 0.533 43.038 + 0.537 43.043 + 0.548 43.047 + 0.549 43.045 + 0.555 43.043 + 0.558 43.04 + 0.563 43.039 + 0.562 43.043 + 0.558 43.047 + 0.56 43.053 + 0.557 43.057 + 0.559 43.06 + 0.551 43.064 + 0.551 43.067 + 0.557 43.068 + 0.559 43.072 + 0.552 43.072 + 0.551 43.075 + 0.553 43.077 + 0.549 43.079 + 0.53 43.081 + 0.529 43.091 + 0.511 43.091 + 0.499 43.094 + 0.499 43.099 + 0.496 43.102 + 0.497 43.105 + 0.499 43.105 + 0.499 43.107 + 0.49 43.107 + 0.488 43.113 + 0.473 43.109 + 0.452 43.109 + 0.451 43.114 + 0.462 43.119 + 0.459 43.122 + 0.456 43.122 + 0.456 43.124 + 0.454 43.124 + 0.451 43.127 + 0.441 43.129 + 0.44 43.132 +END +END diff --git a/inputs/bbox/midi-pyrenees.bbox b/inputs/bbox/midi-pyrenees.bbox new file mode 100644 index 0000000..75fa945 --- /dev/null +++ b/inputs/bbox/midi-pyrenees.bbox @@ -0,0 +1 @@ +42.467000,-0.427537,45.147790,3.553264 diff --git a/inputs/bbox/morbihan.bbox b/inputs/bbox/morbihan.bbox index 3fde069..e535c57 100644 --- a/inputs/bbox/morbihan.bbox +++ b/inputs/bbox/morbihan.bbox @@ -1 +1 @@ -47.234,-3.598,47.997,-1.648 +47.160000,-3.855000,48.330000,-1.915000 diff --git a/inputs/bbox/morbihan.poly b/inputs/bbox/morbihan.poly new file mode 100644 index 0000000..bc61d97 --- /dev/null +++ b/inputs/bbox/morbihan.poly @@ -0,0 +1,275 @@ +polygon +1 + -3.755 48.115 + -3.73 48.16 + -3.705 48.17 + -3.67 48.17 + -3.62 48.195 + -3.595 48.195 + -3.585 48.205 + -3.43 48.205 + -3.4 48.185 + -3.4 48.175 + -3.38 48.185 + -3.325 48.19 + -3.31 48.175 + -3.28 48.175 + -3.275 48.165 + -3.26 48.165 + -3.225 48.17 + -3.2 48.185 + -3.175 48.18 + -3.155 48.19 + -3.14 48.22 + -3.115 48.23 + -3.03 48.225 + -3.02 48.215 + -3.01 48.22 + -2.995 48.205 + -2.995 48.19 + -2.985 48.185 + -2.92 48.19 + -2.885 48.185 + -2.85 48.16 + -2.795 48.165 + -2.77 48.135 + -2.71 48.135 + -2.675 48.155 + -2.65 48.15 + -2.63 48.12 + -2.63 48.09 + -2.645 48.06 + -2.63 48.055 + -2.605 48.07 + -2.59 48.09 + -2.575 48.09 + -2.575 48.105 + -2.54 48.13 + -2.555 48.145 + -2.555 48.165 + -2.535 48.18 + -2.415 48.195 + -2.395 48.185 + -2.355 48.145 + -2.335 48.145 + -2.325 48.155 + -2.28 48.155 + -2.235 48.12 + -2.235 48.1 + -2.18 48.105 + -2.15 48.09 + -2.15 48.055 + -2.16 48.045 + -2.19 48.03 + -2.21 48.035 + -2.245 48.03 + -2.255 48.02 + -2.2 48.015 + -2.17 48 + -2.14 48.005 + -2.115 47.98 + -2.095 47.975 + -2.06 47.925 + -2.065 47.895 + -2.085 47.88 + -2.075 47.875 + -2.06 47.89 + -2.04 47.885 + -2.03 47.85 + -2.015 47.84 + -2.02 47.815 + -2.035 47.8 + -2.045 47.8 + -2.065 47.77 + -2.04 47.76 + -2.04 47.725 + -2.1 47.715 + -2.1 47.695 + -2.085 47.685 + -2.085 47.66 + -2.065 47.63 + -2.065 47.6 + -2.08 47.585 + -2.08 47.525 + -2.1 47.51 + -2.135 47.505 + -2.14 47.48 + -2.155 47.47 + -2.19 47.47 + -2.205 47.485 + -2.255 47.475 + -2.285 47.49 + -2.3 47.445 + -2.345 47.435 + -2.405 47.435 + -2.44 47.445 + -2.445 47.43 + -2.46 47.43 + -2.485 47.415 + -2.515 47.43 + -2.525 47.455 + -2.525 47.505 + -2.545 47.49 + -2.59 47.5 + -2.595 47.49 + -2.64 47.485 + -2.655 47.495 + -2.655 47.485 + -2.675 47.47 + -2.705 47.485 + -2.73 47.485 + -2.755 47.475 + -2.77 47.48 + -2.785 47.465 + -2.82 47.465 + -2.86 47.48 + -2.88 47.515 + -2.925 47.52 + -2.935 47.51 + -2.96 47.51 + -2.97 47.53 + -3 47.535 + -3.005 47.545 + -3.03 47.545 + -3.04 47.555 + -3.08 47.545 + -3.11 47.55 + -3.1 47.51 + -3.085 47.505 + -3.07 47.485 + -3.055 47.485 + -3.05 47.475 + -3.045 47.48 + -3.025 47.465 + -3.025 47.45 + -3.04 47.435 + -3.06 47.445 + -3.145 47.455 + -3.165 47.475 + -3.165 47.49 + -3.2 47.55 + -3.195 47.565 + -3.17 47.575 + -3.165 47.585 + -3.18 47.595 + -3.21 47.59 + -3.22 47.605 + -3.22 47.625 + -3.26 47.645 + -3.265 47.655 + -3.315 47.675 + -3.34 47.675 + -3.35 47.665 + -3.37 47.665 + -3.38 47.685 + -3.46 47.675 + -3.49 47.7 + -3.5 47.7 + -3.525 47.735 + -3.55 47.755 + -3.56 47.845 + -3.53 47.87 + -3.51 47.87 + -3.5 47.85 + -3.47 47.855 + -3.47 47.87 + -3.455 47.885 + -3.43 47.89 + -3.44 47.91 + -3.42 47.93 + -3.42 47.945 + -3.445 47.94 + -3.46 47.925 + -3.475 47.925 + -3.495 47.935 + -3.505 47.955 + -3.525 47.955 + -3.555 47.97 + -3.6 47.97 + -3.615 47.96 + -3.65 47.965 + -3.665 47.995 + -3.68 48.005 + -3.69 48.035 + -3.7 48.045 + -3.715 48.045 + -3.73 48.06 + -3.73 48.075 + -3.75 48.085 + -3.755 48.115 +END +2 + -3.04 47.435 + -2.995 47.43 + -2.99 47.42 + -2.97 47.415 + -2.955 47.425 + -2.935 47.42 + -2.915 47.395 + -2.925 47.36 + -2.96 47.335 + -2.98 47.335 + -2.995 47.35 + -2.99 47.375 + -3.01 47.375 + -3.045 47.405 + -3.05 47.42 + -3.04 47.435 +END +3 + -2.91 47.345 + -2.9 47.365 + -2.86 47.37 + -2.845 47.36 + -2.84 47.345 + -2.825 47.345 + -2.815 47.335 + -2.815 47.315 + -2.825 47.305 + -2.85 47.305 + -2.855 47.315 + -2.9 47.315 + -2.91 47.345 +END +4 + -3.285 47.355 + -3.285 47.375 + -3.27 47.405 + -3.24 47.41 + -3.23 47.4 + -3.21 47.4 + -3.205 47.39 + -3.2 47.395 + -3.185 47.385 + -3.15 47.385 + -3.125 47.35 + -3.095 47.335 + -3.07 47.34 + -3.045 47.33 + -3.035 47.3 + -3.05 47.29 + -3.06 47.27 + -3.08 47.26 + -3.105 47.26 + -3.12 47.27 + -3.15 47.265 + -3.165 47.275 + -3.22 47.27 + -3.265 47.3 + -3.285 47.355 +END +5 + -3.445 47.605 + -3.47 47.6 + -3.48 47.61 + -3.515 47.62 + -3.535 47.64 + -3.53 47.665 + -3.485 47.675 + -3.415 47.66 + -3.395 47.64 + -3.4 47.615 + -3.415 47.6 + -3.445 47.605 +END +END diff --git a/inputs/bbox/morbihan_manual.bbox b/inputs/bbox/morbihan_manual.bbox new file mode 100644 index 0000000..3fde069 --- /dev/null +++ b/inputs/bbox/morbihan_manual.bbox @@ -0,0 +1 @@ +47.234,-3.598,47.997,-1.648 diff --git a/inputs/coastline-fix.sh b/inputs/coastline-fix.sh index 7171787..be9384c 100755 --- a/inputs/coastline-fix.sh +++ b/inputs/coastline-fix.sh @@ -8,21 +8,30 @@ OSMOSIS=$(pwd)/../bin/osmosis # Input folder INPUTS=$(pwd) -# Change to desired region -REGION=$1 +# Input PBF +inpbf=$1 -if [ -z "${REGION}" ]; then - echo "Usage: $0: REGION_NAME" +if [ -z "${inpbf}" ]; then + echo "Usage: $0: PBF_FILE" exit 1 fi -if [ ! -e "${REGION}/${REGION}-latest.osm.pbf" ]; then - echo "${REGION}/${REGION}-latest.pbf does not exist, you may want to download it from https://download.geofabrik.de/index.html." +region_dir=$(dirname $(realpath ${inpbf})) +region_name=$(basename ${inpbf} .pbf) +region_name=$(basename ${region_name} .osm) +poly_file=${region_dir}/${region_name}.poly + +if [ ! -e "${inpbf}" ]; then + echo "${inpbf} does not exist, you may want to download it from https://download.geofabrik.de/index.html." exit 1 fi -if [ ! -e "${REGION}/${REGION}.poly" ]; then - echo "${REGION}/${REGION}.poly does not exist, you may want to download it from https://download.geofabrik.de/index.html." +if [ ! -e "${poly_file}" ]; then + poly_file=${INPUTS}/bbox/${region_name}.poly +fi + +if [ ! -e "${poly_file}" ]; then + echo "Unable to find polygon file, you may want to download it from https://download.geofabrik.de/index.html." exit 1 fi @@ -33,43 +42,48 @@ fi # Bounds -cd mapsforge-creator +olddir=$(pwd) +cd ${INPUTS}/mapsforge-creator + +BBOX=$(perl poly2bb.pl "${poly_file}") +echo "$BBOX" > ${INPUTS}/bbox/${region_name}.bbox -BBOX=$(perl poly2bb.pl "$INPUTS/$REGION/$REGION.poly") BBOX=(${BBOX//,/ }) BOTTOM=${BBOX[0]} LEFT=${BBOX[1]} TOP=${BBOX[2]} RIGHT=${BBOX[3]} + # Start position -CENTER=$(perl poly2center.pl "$INPUTS/$REGION/$REGION.poly") +CENTER=$(perl poly2center.pl "${poly_file}") CENTER=(${CENTER//,/ }) LAT=${CENTER[0]} LON=${CENTER[1]} # Land -ogr2ogr -overwrite -progress -skipfailures -clipsrc $LEFT $BOTTOM $RIGHT $TOP "$INPUTS/$REGION/${REGION}_land.shp" "$INPUTS/land-polygons-split-4326/land_polygons.shp" -python shape2osm.py -l "$INPUTS/$REGION/${REGION}_land" "$INPUTS/$REGION/${REGION}_land.shp" +ogr2ogr -overwrite -progress -skipfailures -clipsrc $LEFT $BOTTOM $RIGHT $TOP "${region_dir}/${region_name}_land.shp" "$INPUTS/land-polygons-split-4326/land_polygons.shp" +python shape2osm.py -l "${region_dir}/${region_name}_land" "${region_dir}/${region_name}_land.shp" # Sea -cp sea.osm "$INPUTS/$REGION/" -sed -i "s/\$BOTTOM/$BOTTOM/g" "$INPUTS/$REGION/sea.osm" -sed -i "s/\$LEFT/$LEFT/g" "$INPUTS/$REGION/sea.osm" -sed -i "s/\$TOP/$TOP/g" "$INPUTS/$REGION/sea.osm" -sed -i "s/\$RIGHT/$RIGHT/g" "$INPUTS/$REGION/sea.osm" +sea_file="${region_dir}/${region_name}_sea.osm" +cp sea.osm "${sea_file}" +sed -i "s/\$BOTTOM/$BOTTOM/g" "${sea_file}" +sed -i "s/\$LEFT/$LEFT/g" "${sea_file}" +sed -i "s/\$TOP/$TOP/g" "${sea_file}" +sed -i "s/\$RIGHT/$RIGHT/g" "${sea_file}" -cd $INPUTS +cd ${olddir} -CMD="$OSMOSIS --rb file=$INPUTS/$REGION/$REGION-latest.osm.pbf \ - --rx file=$INPUTS/$REGION/sea.osm --s --m" -for f in $INPUTS/$REGION/${REGION}_land*.osm; do +CMD="$OSMOSIS --rb file=${inpbf} \ + --rx file=${sea_file} --s --m" +for f in ${region_dir}/${region_name}_land*.osm; do CMD="$CMD --rx file=$f --s --m" done -CMD="$CMD --wb file=$INPUTS/$REGION/${REGION}_merge.pbf omitmetadata=true" +CMD="$CMD --wb file=${region_dir}/${region_name}_merge.pbf omitmetadata=true" echo $CMD $CMD