From 90ce8410078958504edd709abcbcaca57356d8b5 Mon Sep 17 00:00:00 2001 From: djes Date: Mon, 25 Jul 2016 12:30:33 +0200 Subject: [PATCH] Cleaning and add --- Roller.gpx | 9706 ++++++++++++++++++++++++++++++++++++++++++++++++++++ osm.pb | 228 +- 2 files changed, 9821 insertions(+), 113 deletions(-) create mode 100644 Roller.gpx diff --git a/Roller.gpx b/Roller.gpx new file mode 100644 index 0000000..d286dad --- /dev/null +++ b/Roller.gpx @@ -0,0 +1,9706 @@ + + + + Haaaaaaaa une bonne grosse montée après une petite pluie puis le reste de la rando sous une bonne pluie. Mais tip top! + + 2016 + http://www.runtastic.com + + + runtastic + + + + + + Cliquez sur ce lien pour voir cette activité sur Runtastic.com + + + + 91.0 + + + + 91.0 + + + + 89.0 + + + + 88.0 + + + + 88.0 + + + + 86.0 + + + + 86.0 + + + + 86.0 + + + + 87.0 + + + + 88.0 + + + + 88.0 + + + + 88.0 + + + + 86.0 + + + + 86.0 + + + + 87.0 + + + + 87.0 + + + + 85.0 + + + + 85.0 + + + + 84.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 87.0 + + + + 85.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 81.0 + + + + 82.0 + + + + 83.0 + + + + 85.0 + + + + 85.0 + + + + 86.0 + + + + 86.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 86.0 + + + + 84.0 + + + + 85.0 + + + + 86.0 + + + + 85.0 + + + + 85.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 81.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 83.0 + + + + 83.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 82.0 + + + + 83.0 + + + + 82.0 + + + + 83.0 + + + + 82.0 + + + + 81.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 80.0 + + + + 78.0 + + + + 78.0 + + + + 79.0 + + + + 78.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 78.0 + + + + 78.0 + + + + 77.0 + + + + 77.0 + + + + 79.0 + + + + 78.0 + + + + 78.0 + + + + 78.0 + + + + 79.0 + + + + 80.0 + + + + 79.0 + + + + 80.0 + + + + 80.0 + + + + 79.0 + + + + 80.0 + + + + 79.0 + + + + 78.0 + + + + 77.0 + + + + 78.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 80.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 80.0 + + + + 80.0 + + + + 81.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 78.0 + + + + 79.0 + + + + 77.0 + + + + 78.0 + + + + 78.0 + + + + 79.0 + + + + 78.0 + + + + 77.0 + + + + 79.0 + + + + 78.0 + + + + 77.0 + + + + 77.0 + + + + 76.0 + + + + 75.0 + + + + 73.0 + + + + 71.0 + + + + 71.0 + + + + 71.0 + + + + 70.0 + + + + 71.0 + + + + 70.0 + + + + 70.0 + + + + 69.0 + + + + 68.0 + + + + 68.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 66.0 + + + + 65.0 + + + + 64.0 + + + + 64.0 + + + + 63.0 + + + + 61.0 + + + + 61.0 + + + + 62.0 + + + + 62.0 + + + + 61.0 + + + + 61.0 + + + + 62.0 + + + + 63.0 + + + + 65.0 + + + + 66.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 70.0 + + + + 69.0 + + + + 71.0 + + + + 70.0 + + + + 69.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 69.0 + + + + 70.0 + + + + 70.0 + + + + 70.0 + + + + 73.0 + + + + 71.0 + + + + 70.0 + + + + 70.0 + + + + 69.0 + + + + 68.0 + + + + 68.0 + + + + 68.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 68.0 + + + + 67.0 + + + + 68.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 68.0 + + + + 69.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 65.0 + + + + 63.0 + + + + 62.0 + + + + 62.0 + + + + 62.0 + + + + 61.0 + + + + 59.0 + + + + 59.0 + + + + 60.0 + + + + 61.0 + + + + 64.0 + + + + 65.0 + + + + 66.0 + + + + 67.0 + + + + 68.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 69.0 + + + + 67.0 + + + + 65.0 + + + + 64.0 + + + + 64.0 + + + + 62.0 + + + + 63.0 + + + + 64.0 + + + + 64.0 + + + + 67.0 + + + + 69.0 + + + + 70.0 + + + + 70.0 + + + + 72.0 + + + + 72.0 + + + + 72.0 + + + + 70.0 + + + + 70.0 + + + + 68.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 69.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 67.0 + + + + 68.0 + + + + 69.0 + + + + 70.0 + + + + 70.0 + + + + 70.0 + + + + 70.0 + + + + 70.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 68.0 + + + + 68.0 + + + + 69.0 + + + + 70.0 + + + + 69.0 + + + + 69.0 + + + + 71.0 + + + + 71.0 + + + + 71.0 + + + + 71.0 + + + + 71.0 + + + + 71.0 + + + + 70.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 68.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 67.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 69.0 + + + + 70.0 + + + + 70.0 + + + + 69.0 + + + + 69.0 + + + + 70.0 + + + + 70.0 + + + + 70.0 + + + + 71.0 + + + + 71.0 + + + + 70.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 65.0 + + + + 65.0 + + + + 65.0 + + + + 65.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 69.0 + + + + 70.0 + + + + 70.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 68.0 + + + + 68.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 68.0 + + + + 66.0 + + + + 68.0 + + + + 67.0 + + + + 68.0 + + + + 67.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 67.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 66.0 + + + + 65.0 + + + + 66.0 + + + + 68.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 67.0 + + + + 66.0 + + + + 65.0 + + + + 66.0 + + + + 66.0 + + + + 67.0 + + + + 65.0 + + + + 64.0 + + + + 63.0 + + + + 65.0 + + + + 65.0 + + + + 66.0 + + + + 66.0 + + + + 67.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 68.0 + + + + 67.0 + + + + 67.0 + + + + 66.0 + + + + 68.0 + + + + 68.0 + + + + 66.0 + + + + 68.0 + + + + 68.0 + + + + 66.0 + + + + 67.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 68.0 + + + + 68.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 67.0 + + + + 66.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 67.0 + + + + 68.0 + + + + 67.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 64.0 + + + + 64.0 + + + + 61.0 + + + + 61.0 + + + + 60.0 + + + + 61.0 + + + + 62.0 + + + + 61.0 + + + + 60.0 + + + + 60.0 + + + + 58.0 + + + + 56.0 + + + + 55.0 + + + + 55.0 + + + + 55.0 + + + + 56.0 + + + + 56.0 + + + + 56.0 + + + + 56.0 + + + + 56.0 + + + + 58.0 + + + + 58.0 + + + + 57.0 + + + + 57.0 + + + + 57.0 + + + + 57.0 + + + + 57.0 + + + + 57.0 + + + + 58.0 + + + + 61.0 + + + + 61.0 + + + + 60.0 + + + + 63.0 + + + + 65.0 + + + + 67.0 + + + + 68.0 + + + + 68.0 + + + + 69.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 66.0 + + + + 65.0 + + + + 65.0 + + + + 65.0 + + + + 65.0 + + + + 66.0 + + + + 67.0 + + + + 67.0 + + + + 68.0 + + + + 69.0 + + + + 70.0 + + + + 71.0 + + + + 72.0 + + + + 71.0 + + + + 72.0 + + + + 71.0 + + + + 71.0 + + + + 69.0 + + + + 69.0 + + + + 68.0 + + + + 67.0 + + + + 66.0 + + + + 65.0 + + + + 65.0 + + + + 66.0 + + + + 67.0 + + + + 69.0 + + + + 70.0 + + + + 71.0 + + + + 71.0 + + + + 72.0 + + + + 72.0 + + + + 73.0 + + + + 74.0 + + + + 74.0 + + + + 76.0 + + + + 74.0 + + + + 76.0 + + + + 77.0 + + + + 77.0 + + + + 75.0 + + + + 74.0 + + + + 73.0 + + + + 73.0 + + + + 75.0 + + + + 76.0 + + + + 77.0 + + + + 77.0 + + + + 80.0 + + + + 80.0 + + + + 80.0 + + + + 80.0 + + + + 80.0 + + + + 81.0 + + + + 81.0 + + + + 81.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 81.0 + + + + 81.0 + + + + 81.0 + + + + 79.0 + + + + 80.0 + + + + 79.0 + + + + 78.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 77.0 + + + + 77.0 + + + + 76.0 + + + + 76.0 + + + + 75.0 + + + + 75.0 + + + + 75.0 + + + + 75.0 + + + + 73.0 + + + + 75.0 + + + + 75.0 + + + + 75.0 + + + + 74.0 + + + + 74.0 + + + + 74.0 + + + + 75.0 + + + + 75.0 + + + + 76.0 + + + + 75.0 + + + + 73.0 + + + + 72.0 + + + + 73.0 + + + + 75.0 + + + + 76.0 + + + + 75.0 + + + + 72.0 + + + + 73.0 + + + + 75.0 + + + + 77.0 + + + + 78.0 + + + + 78.0 + + + + 79.0 + + + + 79.0 + + + + 78.0 + + + + 77.0 + + + + 78.0 + + + + 77.0 + + + + 78.0 + + + + 75.0 + + + + 73.0 + + + + 72.0 + + + + 75.0 + + + + 74.0 + + + + 70.0 + + + + 69.0 + + + + 69.0 + + + + 70.0 + + + + 70.0 + + + + 71.0 + + + + 70.0 + + + + 70.0 + + + + 69.0 + + + + 67.0 + + + + 67.0 + + + + 70.0 + + + + 68.0 + + + + 66.0 + + + + 66.0 + + + + 65.0 + + + + 66.0 + + + + 68.0 + + + + 70.0 + + + + 70.0 + + + + 72.0 + + + + 71.0 + + + + 71.0 + + + + 71.0 + + + + 73.0 + + + + 75.0 + + + + 75.0 + + + + 75.0 + + + + 77.0 + + + + 79.0 + + + + 79.0 + + + + 78.0 + + + + 76.0 + + + + 76.0 + + + + 77.0 + + + + 78.0 + + + + 77.0 + + + + 77.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 83.0 + + + + 82.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 83.0 + + + + 85.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 83.0 + + + + 82.0 + + + + 82.0 + + + + 81.0 + + + + 81.0 + + + + 81.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 81.0 + + + + 81.0 + + + + 80.0 + + + + 83.0 + + + + 83.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 84.0 + + + + 84.0 + + + + 85.0 + + + + 86.0 + + + + 86.0 + + + + 83.0 + + + + 83.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 80.0 + + + + 80.0 + + + + 79.0 + + + + 80.0 + + + + 79.0 + + + + 80.0 + + + + 81.0 + + + + 82.0 + + + + 81.0 + + + + 82.0 + + + + 81.0 + + + + 81.0 + + + + 80.0 + + + + 79.0 + + + + 79.0 + + + + 78.0 + + + + 78.0 + + + + 77.0 + + + + 77.0 + + + + 76.0 + + + + 75.0 + + + + 77.0 + + + + 77.0 + + + + 76.0 + + + + 77.0 + + + + 79.0 + + + + 78.0 + + + + 77.0 + + + + 78.0 + + + + 78.0 + + + + 78.0 + + + + 79.0 + + + + 79.0 + + + + 78.0 + + + + 77.0 + + + + 79.0 + + + + 79.0 + + + + 78.0 + + + + 79.0 + + + + 77.0 + + + + 77.0 + + + + 76.0 + + + + 78.0 + + + + 76.0 + + + + 75.0 + + + + 74.0 + + + + 74.0 + + + + 73.0 + + + + 74.0 + + + + 73.0 + + + + 74.0 + + + + 75.0 + + + + 75.0 + + + + 75.0 + + + + 76.0 + + + + 74.0 + + + + 76.0 + + + + 76.0 + + + + 75.0 + + + + 72.0 + + + + 75.0 + + + + 75.0 + + + + 76.0 + + + + 77.0 + + + + 77.0 + + + + 76.0 + + + + 77.0 + + + + 77.0 + + + + 75.0 + + + + 77.0 + + + + 77.0 + + + + 77.0 + + + + 80.0 + + + + 80.0 + + + + 79.0 + + + + 79.0 + + + + 79.0 + + + + 77.0 + + + + 77.0 + + + + 76.0 + + + + 75.0 + + + + 76.0 + + + + 76.0 + + + + 77.0 + + + + 76.0 + + + + 76.0 + + + + 76.0 + + + + 77.0 + + + + 77.0 + + + + 78.0 + + + + 78.0 + + + + 78.0 + + + + 78.0 + + + + 78.0 + + + + 78.0 + + + + 77.0 + + + + 79.0 + + + + 80.0 + + + + 80.0 + + + + 80.0 + + + + 80.0 + + + + 85.0 + + + + 83.0 + + + + 82.0 + + + + 81.0 + + + + 81.0 + + + + 80.0 + + + + 80.0 + + + + 80.0 + + + + 79.0 + + + + 78.0 + + + + 81.0 + + + + 80.0 + + + + 81.0 + + + + 81.0 + + + + 80.0 + + + + 80.0 + + + + 80.0 + + + + 81.0 + + + + 81.0 + + + + 81.0 + + + + 82.0 + + + + 83.0 + + + + 84.0 + + + + 83.0 + + + + 84.0 + + + + 85.0 + + + + 85.0 + + + + 87.0 + + + + 86.0 + + + + 85.0 + + + + 88.0 + + + + 87.0 + + + + 87.0 + + + + 88.0 + + + + 89.0 + + + + 90.0 + + + + 90.0 + + + + 91.0 + + + + 93.0 + + + + 93.0 + + + + 93.0 + + + + 90.0 + + + + 91.0 + + + + 92.0 + + + + 93.0 + + + + 91.0 + + + + 91.0 + + + + 89.0 + + + + 90.0 + + + + 90.0 + + + + 89.0 + + + + 89.0 + + + + 90.0 + + + + 90.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 92.0 + + + + 94.0 + + + + 96.0 + + + + 98.0 + + + + 98.0 + + + + 100.0 + + + + 98.0 + + + + 98.0 + + + + 96.0 + + + + 94.0 + + + + 89.0 + + + + 89.0 + + + + 88.0 + + + + 88.0 + + + + 86.0 + + + + 88.0 + + + + 88.0 + + + + 90.0 + + + + 90.0 + + + + 89.0 + + + + 89.0 + + + + 88.0 + + + + 88.0 + + + + 86.0 + + + + 87.0 + + + + 88.0 + + + + 88.0 + + + + 88.0 + + + + 88.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 85.0 + + + + 87.0 + + + + 87.0 + + + + 88.0 + + + + 89.0 + + + + 89.0 + + + + 89.0 + + + + 90.0 + + + + 90.0 + + + + 91.0 + + + + 90.0 + + + + 90.0 + + + + 90.0 + + + + 90.0 + + + + 90.0 + + + + 92.0 + + + + 90.0 + + + + 88.0 + + + + 89.0 + + + + 88.0 + + + + 87.0 + + + + 87.0 + + + + 85.0 + + + + 83.0 + + + + 83.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 82.0 + + + + 82.0 + + + + 86.0 + + + + 86.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 83.0 + + + + 83.0 + + + + 83.0 + + + + 83.0 + + + + 84.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 84.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 85.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 85.0 + + + + 85.0 + + + + 86.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 84.0 + + + + 86.0 + + + + 85.0 + + + + 86.0 + + + + 86.0 + + + + 86.0 + + + + 86.0 + + + + 88.0 + + + + 87.0 + + + + 87.0 + + + + 89.0 + + + + 89.0 + + + + 89.0 + + + + 89.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 93.0 + + + + 93.0 + + + + 94.0 + + + + 94.0 + + + + 95.0 + + + + 95.0 + + + + 98.0 + + + + 98.0 + + + + 96.0 + + + + 95.0 + + + + 94.0 + + + + 94.0 + + + + 95.0 + + + + 95.0 + + + + 96.0 + + + + 96.0 + + + + 96.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 96.0 + + + + 96.0 + + + + 96.0 + + + + 97.0 + + + + 97.0 + + + + 97.0 + + + + 97.0 + + + + 97.0 + + + + 98.0 + + + + 97.0 + + + + 97.0 + + + + 97.0 + + + + 97.0 + + + + 96.0 + + + + 96.0 + + + + 95.0 + + + + 96.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 94.0 + + + + 94.0 + + + + 94.0 + + + + 94.0 + + + + 94.0 + + + + 93.0 + + + + 91.0 + + + + 90.0 + + + + 90.0 + + + + 88.0 + + + + 88.0 + + + + 88.0 + + + + 89.0 + + + + 89.0 + + + + 90.0 + + + + 91.0 + + + + 90.0 + + + + 90.0 + + + + 89.0 + + + + 88.0 + + + + 89.0 + + + + 89.0 + + + + 89.0 + + + + 90.0 + + + + 90.0 + + + + 90.0 + + + + 89.0 + + + + 88.0 + + + + 88.0 + + + + 89.0 + + + + 89.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 91.0 + + + + 90.0 + + + + 89.0 + + + + 87.0 + + + + 88.0 + + + + 87.0 + + + + 87.0 + + + + 86.0 + + + + 87.0 + + + + 87.0 + + + + 86.0 + + + + 84.0 + + + + 82.0 + + + + 81.0 + + + + 82.0 + + + + 83.0 + + + + 82.0 + + + + 82.0 + + + + 83.0 + + + + 84.0 + + + + 83.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 81.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 83.0 + + + + 82.0 + + + + 83.0 + + + + 83.0 + + + + 82.0 + + + + 82.0 + + + + 80.0 + + + + 81.0 + + + + 82.0 + + + + 81.0 + + + + 82.0 + + + + 82.0 + + + + 82.0 + + + + 83.0 + + + + 84.0 + + + + 83.0 + + + + 83.0 + + + + 83.0 + + + + 84.0 + + + + 86.0 + + + + 86.0 + + + + 87.0 + + + + 87.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 85.0 + + + + 89.0 + + + + 89.0 + + + + 89.0 + + + + 89.0 + + + + 90.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 86.0 + + + + 86.0 + + + + 86.0 + + + + 87.0 + + + + 87.0 + + + + 87.0 + + + + 86.0 + + + + 87.0 + + + + 89.0 + + + + 90.0 + + + + 90.0 + + + + 91.0 + + + + 92.0 + + + + 94.0 + + + + 94.0 + + + + 93.0 + + + + 89.0 + + + + 89.0 + + + + 89.0 + + + + 88.0 + + + + 88.0 + + + + 85.0 + + + + 83.0 + + + + 84.0 + + + + 85.0 + + + + 84.0 + + + + 86.0 + + + + 86.0 + + + + 86.0 + + + + 86.0 + + + + 85.0 + + + + 85.0 + + + + 84.0 + + + + 84.0 + + + + 84.0 + + + + 82.0 + + + + 83.0 + + + + 84.0 + + + + 83.0 + + + + 83.0 + + + + 83.0 + + + + 83.0 + + + + 83.0 + + + + 83.0 + + + + 84.0 + + + + 84.0 + + + + 85.0 + + + + 86.0 + + + + 87.0 + + + + 87.0 + + + + 89.0 + + + + 89.0 + + + + 90.0 + + + + 90.0 + + + + 91.0 + + + + 92.0 + + + + 92.0 + + + + 95.0 + + + + 95.0 + + + + 98.0 + + + + 98.0 + + + + 97.0 + + + + 97.0 + + + + 96.0 + + + + 96.0 + + + + 98.0 + + + + 98.0 + + + + 98.0 + + + + 98.0 + + + + 100.0 + + + + 102.0 + + + + 102.0 + + + + 103.0 + + + + 104.0 + + + + 105.0 + + + + 105.0 + + + + 106.0 + + + + 106.0 + + + + 106.0 + + + + 111.0 + + + + 110.0 + + + + 110.0 + + + + 111.0 + + + + 111.0 + + + + 112.0 + + + + 112.0 + + + + 114.0 + + + + 114.0 + + + + 114.0 + + + + 114.0 + + + + 112.0 + + + + 112.0 + + + + 113.0 + + + + 113.0 + + + + 112.0 + + + + 113.0 + + + + 113.0 + + + + 114.0 + + + + 114.0 + + + + 115.0 + + + + 117.0 + + + + 117.0 + + + + 117.0 + + + + 117.0 + + + + 119.0 + + + + 119.0 + + + + 117.0 + + + + 117.0 + + + + 117.0 + + + + 117.0 + + + + 122.0 + + + + 122.0 + + + + 120.0 + + + + 121.0 + + + + 120.0 + + + + 120.0 + + + + 122.0 + + + + 122.0 + + + + 124.0 + + + + 125.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 125.0 + + + + 126.0 + + + + 127.0 + + + + 127.0 + + + + 126.0 + + + + 125.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 128.0 + + + + 128.0 + + + + 129.0 + + + + 129.0 + + + + 131.0 + + + + 131.0 + + + + 132.0 + + + + 132.0 + + + + 131.0 + + + + 131.0 + + + + 130.0 + + + + 130.0 + + + + 129.0 + + + + 128.0 + + + + 128.0 + + + + 127.0 + + + + 127.0 + + + + 127.0 + + + + 126.0 + + + + 125.0 + + + + 123.0 + + + + 122.0 + + + + 120.0 + + + + 120.0 + + + + 120.0 + + + + 120.0 + + + + 119.0 + + + + 119.0 + + + + 119.0 + + + + 117.0 + + + + 116.0 + + + + 116.0 + + + + 115.0 + + + + 115.0 + + + + 114.0 + + + + 114.0 + + + + 113.0 + + + + 112.0 + + + + 112.0 + + + + 111.0 + + + + 111.0 + + + + 112.0 + + + + 112.0 + + + + 111.0 + + + + 110.0 + + + + 109.0 + + + + 108.0 + + + + 108.0 + + + + 108.0 + + + + 108.0 + + + + 109.0 + + + + 110.0 + + + + 109.0 + + + + 110.0 + + + + 111.0 + + + + 112.0 + + + + 111.0 + + + + 112.0 + + + + 112.0 + + + + 111.0 + + + + 111.0 + + + + 111.0 + + + + 111.0 + + + + 113.0 + + + + 113.0 + + + + 114.0 + + + + 114.0 + + + + 115.0 + + + + 114.0 + + + + 116.0 + + + + 118.0 + + + + 120.0 + + + + 120.0 + + + + 120.0 + + + + 121.0 + + + + 121.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 121.0 + + + + 122.0 + + + + 123.0 + + + + 123.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 126.0 + + + + 126.0 + + + + 125.0 + + + + 124.0 + + + + 125.0 + + + + 126.0 + + + + 125.0 + + + + 125.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 128.0 + + + + 127.0 + + + + 126.0 + + + + 125.0 + + + + 126.0 + + + + 126.0 + + + + 125.0 + + + + 126.0 + + + + 126.0 + + + + 127.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 126.0 + + + + 125.0 + + + + 125.0 + + + + 126.0 + + + + 127.0 + + + + 127.0 + + + + 129.0 + + + + 129.0 + + + + 130.0 + + + + 130.0 + + + + 130.0 + + + + 130.0 + + + + 130.0 + + + + 131.0 + + + + 132.0 + + + + 132.0 + + + + 130.0 + + + + 130.0 + + + + 131.0 + + + + 131.0 + + + + 131.0 + + + + 131.0 + + + + 131.0 + + + + 131.0 + + + + 131.0 + + + + 131.0 + + + + 132.0 + + + + 132.0 + + + + 133.0 + + + + 133.0 + + + + 132.0 + + + + 133.0 + + + + 133.0 + + + + 134.0 + + + + 134.0 + + + + 134.0 + + + + 134.0 + + + + 135.0 + + + + 135.0 + + + + 134.0 + + + + 134.0 + + + + 133.0 + + + + 133.0 + + + + 133.0 + + + + 133.0 + + + + 133.0 + + + + 133.0 + + + + 133.0 + + + + 134.0 + + + + 135.0 + + + + 136.0 + + + + 136.0 + + + + 136.0 + + + + 136.0 + + + + 135.0 + + + + 135.0 + + + + 135.0 + + + + 135.0 + + + + 136.0 + + + + 136.0 + + + + 135.0 + + + + 135.0 + + + + 136.0 + + + + 135.0 + + + + 136.0 + + + + 136.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 136.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 138.0 + + + + 140.0 + + + + 141.0 + + + + 141.0 + + + + 140.0 + + + + 140.0 + + + + 139.0 + + + + 138.0 + + + + 139.0 + + + + 139.0 + + + + 140.0 + + + + 140.0 + + + + 139.0 + + + + 138.0 + + + + 138.0 + + + + 137.0 + + + + 138.0 + + + + 137.0 + + + + 137.0 + + + + 136.0 + + + + 136.0 + + + + 135.0 + + + + 136.0 + + + + 137.0 + + + + 136.0 + + + + 136.0 + + + + 135.0 + + + + 135.0 + + + + 135.0 + + + + 135.0 + + + + 135.0 + + + + 136.0 + + + + 136.0 + + + + 136.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 138.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 138.0 + + + + 138.0 + + + + 138.0 + + + + 137.0 + + + + 137.0 + + + + 138.0 + + + + 138.0 + + + + 138.0 + + + + 137.0 + + + + 138.0 + + + + 138.0 + + + + 138.0 + + + + 139.0 + + + + 139.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 139.0 + + + + 138.0 + + + + 138.0 + + + + 138.0 + + + + 138.0 + + + + 138.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 138.0 + + + + 139.0 + + + + 139.0 + + + + 138.0 + + + + 138.0 + + + + 137.0 + + + + 137.0 + + + + 138.0 + + + + 137.0 + + + + 137.0 + + + + 138.0 + + + + 139.0 + + + + 138.0 + + + + 138.0 + + + + 139.0 + + + + 140.0 + + + + 139.0 + + + + 140.0 + + + + 139.0 + + + + 141.0 + + + + 142.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 141.0 + + + + 140.0 + + + + 143.0 + + + + 142.0 + + + + 143.0 + + + + 142.0 + + + + 143.0 + + + + 143.0 + + + + 144.0 + + + + 144.0 + + + + 143.0 + + + + 142.0 + + + + 144.0 + + + + 143.0 + + + + 143.0 + + + + 142.0 + + + + 145.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 146.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 144.0 + + + + 144.0 + + + + 143.0 + + + + 143.0 + + + + 142.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 142.0 + + + + 142.0 + + + + 141.0 + + + + 142.0 + + + + 142.0 + + + + 143.0 + + + + 143.0 + + + + 144.0 + + + + 145.0 + + + + 145.0 + + + + 144.0 + + + + 144.0 + + + + 143.0 + + + + 143.0 + + + + 144.0 + + + + 144.0 + + + + 144.0 + + + + 144.0 + + + + 144.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 148.0 + + + + 148.0 + + + + 151.0 + + + + 153.0 + + + + 153.0 + + + + 152.0 + + + + 152.0 + + + + 149.0 + + + + 147.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 150.0 + + + + 150.0 + + + + 150.0 + + + + 150.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 147.0 + + + + 146.0 + + + + 146.0 + + + + 144.0 + + + + 143.0 + + + + 152.0 + + + + 154.0 + + + + 154.0 + + + + 150.0 + + + + 150.0 + + + + 148.0 + + + + 148.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 148.0 + + + + 148.0 + + + + 149.0 + + + + 150.0 + + + + 150.0 + + + + 151.0 + + + + 150.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 150.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 148.0 + + + + 148.0 + + + + 149.0 + + + + 148.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 148.0 + + + + 148.0 + + + + 147.0 + + + + 146.0 + + + + 148.0 + + + + 149.0 + + + + 145.0 + + + + 146.0 + + + + 146.0 + + + + 148.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 150.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 149.0 + + + + 148.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 148.0 + + + + 148.0 + + + + 147.0 + + + + 146.0 + + + + 147.0 + + + + 147.0 + + + + 149.0 + + + + 149.0 + + + + 148.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 148.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 145.0 + + + + 145.0 + + + + 144.0 + + + + 149.0 + + + + 149.0 + + + + 150.0 + + + + 150.0 + + + + 151.0 + + + + 151.0 + + + + 150.0 + + + + 149.0 + + + + 150.0 + + + + 150.0 + + + + 149.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 148.0 + + + + 148.0 + + + + 149.0 + + + + 149.0 + + + + 151.0 + + + + 150.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 149.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 149.0 + + + + 150.0 + + + + 151.0 + + + + 152.0 + + + + 151.0 + + + + 151.0 + + + + 152.0 + + + + 152.0 + + + + 151.0 + + + + 152.0 + + + + 152.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 152.0 + + + + 152.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 151.0 + + + + 150.0 + + + + 152.0 + + + + 151.0 + + + + 153.0 + + + + 153.0 + + + + 154.0 + + + + 155.0 + + + + 154.0 + + + + 154.0 + + + + 154.0 + + + + 154.0 + + + + 154.0 + + + + 155.0 + + + + 155.0 + + + + 155.0 + + + + 155.0 + + + + 155.0 + + + + 155.0 + + + + 156.0 + + + + 157.0 + + + + 157.0 + + + + 157.0 + + + + 154.0 + + + + 155.0 + + + + 157.0 + + + + 157.0 + + + + 157.0 + + + + 159.0 + + + + 160.0 + + + + 164.0 + + + + 164.0 + + + + 163.0 + + + + 164.0 + + + + 163.0 + + + + 163.0 + + + + 164.0 + + + + 159.0 + + + + 161.0 + + + + 161.0 + + + + 162.0 + + + + 162.0 + + + + 161.0 + + + + 161.0 + + + + 160.0 + + + + 154.0 + + + + 155.0 + + + + 155.0 + + + + 154.0 + + + + 155.0 + + + + 150.0 + + + + 150.0 + + + + 149.0 + + + + 149.0 + + + + 150.0 + + + + 150.0 + + + + 151.0 + + + + 150.0 + + + + 150.0 + + + + 149.0 + + + + 146.0 + + + + 153.0 + + + + 152.0 + + + + 148.0 + + + + 149.0 + + + + 147.0 + + + + 144.0 + + + + 141.0 + + + + 142.0 + + + + 143.0 + + + + 144.0 + + + + 153.0 + + + + 153.0 + + + + 149.0 + + + + 145.0 + + + + 144.0 + + + + 143.0 + + + + 143.0 + + + + 145.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 144.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 147.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 146.0 + + + + 146.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 144.0 + + + + 144.0 + + + + 144.0 + + + + 143.0 + + + + 142.0 + + + + 141.0 + + + + 142.0 + + + + 144.0 + + + + 144.0 + + + + 146.0 + + + + 148.0 + + + + 148.0 + + + + 149.0 + + + + 149.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 147.0 + + + + 148.0 + + + + 148.0 + + + + 148.0 + + + + 147.0 + + + + 147.0 + + + + 146.0 + + + + 146.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 146.0 + + + + 145.0 + + + + 145.0 + + + + 141.0 + + + + 140.0 + + + + 140.0 + + + + 142.0 + + + + 143.0 + + + + 144.0 + + + + 145.0 + + + + 144.0 + + + + 146.0 + + + + 146.0 + + + + 144.0 + + + + 145.0 + + + + 145.0 + + + + 146.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 144.0 + + + + 145.0 + + + + 145.0 + + + + 145.0 + + + + 143.0 + + + + 142.0 + + + + 142.0 + + + + 142.0 + + + + 142.0 + + + + 143.0 + + + + 143.0 + + + + 144.0 + + + + 144.0 + + + + 144.0 + + + + 144.0 + + + + 146.0 + + + + 146.0 + + + + 146.0 + + + + 145.0 + + + + 144.0 + + + + 144.0 + + + + 144.0 + + + + 145.0 + + + + 144.0 + + + + 144.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 144.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 142.0 + + + + 142.0 + + + + 142.0 + + + + 140.0 + + + + 140.0 + + + + 139.0 + + + + 139.0 + + + + 141.0 + + + + 141.0 + + + + 142.0 + + + + 141.0 + + + + 141.0 + + + + 141.0 + + + + 139.0 + + + + 140.0 + + + + 140.0 + + + + 138.0 + + + + 139.0 + + + + 140.0 + + + + 139.0 + + + + 140.0 + + + + 139.0 + + + + 140.0 + + + + 140.0 + + + + 141.0 + + + + 140.0 + + + + 140.0 + + + + 139.0 + + + + 139.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 139.0 + + + + 142.0 + + + + 141.0 + + + + 139.0 + + + + 139.0 + + + + 139.0 + + + + 140.0 + + + + 139.0 + + + + 139.0 + + + + 139.0 + + + + 140.0 + + + + 140.0 + + + + 141.0 + + + + 139.0 + + + + 139.0 + + + + 139.0 + + + + 139.0 + + + + 139.0 + + + + 140.0 + + + + 138.0 + + + + 139.0 + + + + 140.0 + + + + 140.0 + + + + 140.0 + + + + 144.0 + + + + 144.0 + + + + 142.0 + + + + 142.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 143.0 + + + + 142.0 + + + + 142.0 + + + + 142.0 + + + + 142.0 + + + + 142.0 + + + + 142.0 + + + + 141.0 + + + + 141.0 + + + + 141.0 + + + + 141.0 + + + + 139.0 + + + + 139.0 + + + + 141.0 + + + + 141.0 + + + + 142.0 + + + + 141.0 + + + + 140.0 + + + + 140.0 + + + + 139.0 + + + + 139.0 + + + + 139.0 + + + + 139.0 + + + + 141.0 + + + + 142.0 + + + + 141.0 + + + + 140.0 + + + + 139.0 + + + + 135.0 + + + + 134.0 + + + + 134.0 + + + + 135.0 + + + + 135.0 + + + + 136.0 + + + + 136.0 + + + + 138.0 + + + + 136.0 + + + + 136.0 + + + + 135.0 + + + + 135.0 + + + + 134.0 + + + + 136.0 + + + + 135.0 + + + + 135.0 + + + + 134.0 + + + + 134.0 + + + + 134.0 + + + + 133.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 133.0 + + + + 133.0 + + + + 133.0 + + + + 132.0 + + + + 133.0 + + + + 133.0 + + + + 132.0 + + + + 133.0 + + + + 133.0 + + + + 133.0 + + + + 132.0 + + + + 131.0 + + + + 132.0 + + + + 132.0 + + + + 131.0 + + + + 133.0 + + + + 132.0 + + + + 132.0 + + + + 132.0 + + + + 133.0 + + + + 133.0 + + + + 134.0 + + + + 137.0 + + + + 137.0 + + + + 137.0 + + + + 136.0 + + + + 136.0 + + + + 136.0 + + + + 135.0 + + + + 135.0 + + + + 136.0 + + + + 136.0 + + + + 136.0 + + + + 133.0 + + + + 132.0 + + + + 129.0 + + + + 129.0 + + + + 129.0 + + + + 130.0 + + + + 130.0 + + + + 130.0 + + + + 129.0 + + + + 130.0 + + + + 130.0 + + + + 130.0 + + + + 129.0 + + + + 129.0 + + + + 128.0 + + + + 128.0 + + + + 126.0 + + + + 125.0 + + + + 126.0 + + + + 125.0 + + + + 125.0 + + + + 125.0 + + + + 123.0 + + + + 123.0 + + + + 123.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 121.0 + + + + 121.0 + + + + 121.0 + + + + 121.0 + + + + 120.0 + + + + 120.0 + + + + 120.0 + + + + 120.0 + + + + 120.0 + + + + 119.0 + + + + 119.0 + + + + 120.0 + + + + 119.0 + + + + 120.0 + + + + 121.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 123.0 + + + + 121.0 + + + + 121.0 + + + + 121.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 122.0 + + + + 120.0 + + + + 118.0 + + + + 117.0 + + + + 120.0 + + + + 119.0 + + + + 119.0 + + + + 117.0 + + + + 117.0 + + + + 119.0 + + + + 118.0 + + + + 119.0 + + + + 118.0 + + + + 119.0 + + + + 118.0 + + + + 118.0 + + + + 118.0 + + + + 119.0 + + + + 115.0 + + + + 118.0 + + + + 118.0 + + + + 118.0 + + + + 116.0 + + + + 113.0 + + + + 114.0 + + + + 114.0 + + + + 113.0 + + + + 112.0 + + + + 111.0 + + + + 111.0 + + + + 111.0 + + + + 111.0 + + + + 111.0 + + + + 111.0 + + + + 110.0 + + + + 111.0 + + + + 110.0 + + + + 109.0 + + + + 108.0 + + + + 109.0 + + + + 108.0 + + + + 108.0 + + + + 108.0 + + + + 108.0 + + + + 109.0 + + + + 108.0 + + + + 109.0 + + + + 107.0 + + + + 106.0 + + + + 107.0 + + + + 107.0 + + + + 106.0 + + + + 103.0 + + + + 103.0 + + + + 103.0 + + + + 103.0 + + + + 104.0 + + + + 102.0 + + + + 104.0 + + + + 104.0 + + + + 104.0 + + + + 104.0 + + + + 104.0 + + + + 104.0 + + + + 104.0 + + + + 104.0 + + + + 104.0 + + + + 105.0 + + + + 105.0 + + + + 104.0 + + + + 104.0 + + + + 103.0 + + + + 103.0 + + + + 103.0 + + + + 103.0 + + + + 102.0 + + + + 101.0 + + + + 101.0 + + + + 100.0 + + + + 100.0 + + + + 100.0 + + + + 99.0 + + + + 100.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 100.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 102.0 + + + + 99.0 + + + + 97.0 + + + + 97.0 + + + + 96.0 + + + + 96.0 + + + + 96.0 + + + + 95.0 + + + + 94.0 + + + + 94.0 + + + + 94.0 + + + + 95.0 + + + + 96.0 + + + + 95.0 + + + + 96.0 + + + + 96.0 + + + + 96.0 + + + + 96.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 96.0 + + + + 97.0 + + + + 97.0 + + + + 99.0 + + + + 97.0 + + + + 97.0 + + + + 98.0 + + + + 97.0 + + + + 98.0 + + + + 97.0 + + + + 99.0 + + + + 100.0 + + + + 99.0 + + + + 99.0 + + + + 100.0 + + + + 100.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 98.0 + + + + 97.0 + + + + 97.0 + + + + 97.0 + + + + 96.0 + + + + 95.0 + + + + 95.0 + + + + 94.0 + + + + 94.0 + + + + 94.0 + + + + 96.0 + + + + 95.0 + + + + 94.0 + + + + 93.0 + + + + 92.0 + + + + 94.0 + + + + 93.0 + + + + 93.0 + + + + 92.0 + + + + 91.0 + + + + 91.0 + + + + 92.0 + + + + 92.0 + + + + 90.0 + + + + 101.0 + + + + 102.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 99.0 + + + + 94.0 + + + + 94.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 95.0 + + + + 96.0 + + + + 98.0 + + + + 100.0 + + + + 99.0 + + + + 98.0 + + + + 98.0 + + + + 98.0 + + + + 98.0 + + + + 98.0 + + + + 98.0 + + + + 103.0 + + + + 104.0 + + + + 103.0 + + + + 103.0 + + + + 104.0 + + + + 104.0 + + + + 102.0 + + + + 102.0 + + + + 102.0 + + + + 102.0 + + + + 105.0 + + + + 105.0 + + + + 106.0 + + + + 109.0 + + + + 108.0 + + + + 106.0 + + + + 106.0 + + + + 106.0 + + + + + diff --git a/osm.pb b/osm.pb index 67914e6..7ff071a 100644 --- a/osm.pb +++ b/osm.pb @@ -90,12 +90,12 @@ Module OSM Gadget.i ; Canvas Gadget Id TargetLocation.Location ; Latitude and Longitude from focus point - *Drawing.DrawingParameters ; Focus Tile coord + *Drawing.DrawingParameters ; Drawing parameters based on focus point CallBackLocation.i ; @Procedure(latitude.d,lontitude.d) Position.Pixel ; Actual focus Point coords in pixels - MoveStartingPoint.Pixel ; Start mouse position coords when dragging the map + MoveStartingPoint.Pixel ; Start mouse position coords when dragging the map ServerURL.s ; Web URL ex: http://tile.openstreetmap.org/ ZoomMin.i ; Min Zoom supported by server @@ -123,7 +123,7 @@ Module OSM Global OSM.OSM, Null.i - ;- *** CURL specific *** + ;- *** CURL specific *** Global *ReceiveHTTPToMemoryBuffer, ReceiveHTTPToMemoryBufferPtr.i, ReceivedData.s IncludeFile "libcurl.pbi" ; https://github.com/deseven/pbsamples/tree/master/crossplatform/libcurl @@ -222,7 +222,7 @@ Module OSM EndProcedure ;- *** - + Procedure InitOSM() Protected Result.i @@ -245,17 +245,17 @@ Module OSM Global Proxy = #True -;- => Use this to customise your preferences -; Result = CreatePreferences(GetHomeDirectory() + "OSM.prefs") -; If Proxy -; PreferenceGroup("PROXY") -; WritePreferenceString("ProxyURL", "myproxy.fr") -; WritePreferenceString("ProxyPort", "myproxyport") -; WritePreferenceString("ProxyUser", "myproxyname") -; EndIf -; If Result -; ClosePreferences() -; EndIf + ;- => Use this to customise your preferences + ; Result = CreatePreferences(GetHomeDirectory() + "OSM.prefs") + ; If Proxy + ; PreferenceGroup("PROXY") + ; WritePreferenceString("ProxyURL", "myproxy.fr") + ; WritePreferenceString("ProxyPort", "myproxyport") + ; WritePreferenceString("ProxyUser", "myproxyname") + ; EndIf + ; If Result + ; ClosePreferences() + ; EndIf Result = OpenPreferences(GetHomeDirectory() + "OSM.prefs") If Proxy @@ -498,10 +498,10 @@ Module OSM If OSM\EmergencyQuit = 0 ;Quit before drawing StartVectorDrawing(CanvasVectorOutput(OSM\Gadget)) If IsImage(*Tile\nImage) - MovePathCursor(x,y) - DrawVectorImage(ImageID(*Tile\nImage)) - MovePathCursor(x,y) - DrawVectorText(Str(x) + ", " + Str(y)) + MovePathCursor(x,y) + DrawVectorImage(ImageID(*Tile\nImage)) + MovePathCursor(x,y) + DrawVectorText(Str(x) + ", " + Str(y)) Else Debug "Image missing" OSM\Dirty = #True ;Signal that this image is missing so we should have to redraw @@ -512,7 +512,7 @@ Module OSM EndProcedure - Procedure DrawTiles() + Procedure DrawTiles(*Drawing.DrawingParameters) Protected x.i, y.i @@ -538,22 +538,25 @@ Module OSM If *NewTile With *NewTile + ;Keep a track of tiles (especially to free memory) AddElement(OSM\TilesThreads()) OSM\TilesThreads()\Tile = *NewTile + + ;New tile parameters \x = CenterX + x * OSM\TileSize \y = CenterY + y * OSM\TileSize \OSMTileX = tx + x \OSMTileY = ty + y \OSMZoom = OSM\Zoom - ;Check if the image exists, if not, load it in the background + ;Check if the image exists \nImage = GetTileFromMem(\OSMZoom, \OSMTileX, \OSMTileY) If \nImage = -1 + ;If not, load it in the background \GetImageThread = CreateThread(@GetImageThread(), *NewTile) - OSM\TilesThreads()\GetImageThread = \GetImageThread + Debug " Creating get image thread nb " + Str(\GetImageThread) EndIf - Debug " Creating get image thread nb " + Str(\GetImageThread) DrawTile(*NewTile) EndWith @@ -565,6 +568,8 @@ Module OSM Next Next + ;Free tile memory when the loading thread has finished + ;TODO : exit this proc from drawtiles in a special "free ressources" task ForEach OSM\TilesThreads() If IsThread(OSM\TilesThreads()\GetImageThread) = 0 FreeMemory(OSM\TilesThreads()\Tile) @@ -574,10 +579,10 @@ Module OSM EndProcedure - Procedure DrawTrack() - Protected Pixel.Pixel - Protected Location.Location - If ListSize(OSM\track())>0 + Procedure DrawTrack() + Protected Pixel.Pixel + Protected Location.Location + If ListSize(OSM\track())>0 ForEach OSM\track() If @OSM\TargetLocation\Latitude<>0 And @OSM\TargetLocation\Longitude<>0 @@ -587,14 +592,14 @@ Module OSM Else AddPathLine(Pixel\X,Pixel\Y) EndIf - + EndIf Next - VectorSourceColor(RGBA(0, 255, 0, 150)) - StrokePath(10, #PB_Path_RoundEnd|#PB_Path_RoundCorner) - - EndIf + VectorSourceColor(RGBA(0, 255, 0, 150)) + StrokePath(10, #PB_Path_RoundEnd|#PB_Path_RoundCorner) + + EndIf EndProcedure Procedure Pointer(x.l,y.l,color.l=#Red) @@ -621,7 +626,7 @@ Module OSM Protected CenterX = GadgetWidth(OSM\Gadget) / 2 Protected CenterY = GadgetHeight(OSM\Gadget) / 2 - DrawTiles() + DrawTiles(*Drawing) LockMutex(OSM\DrawingMutex) StartVectorDrawing(CanvasVectorOutput(OSM\Gadget)) @@ -634,7 +639,7 @@ Module OSM ;- Redraw ;If something was not correctly drawn, redraw after a while - If OSM\Dirty + If OSM\Dirty And OSM\EmergencyQuit = #False Debug "Something was dirty ! We try again to redraw" ;Delay(250) @@ -770,91 +775,88 @@ EndModule ;Demonstration CompilerIf #PB_Compiler_IsMainFile -Enumeration - #Window_0 - #Map - #Button_0 - #Button_1 - #Button_2 - #Button_3 - #Button_4 - #Button_5 - #Combo_0 - #Text_0 - #Text_1 - #Text_2 - #Text_3 - #Text_4 - #String_0 - #String_1 - #Gdt_LoadGpx -EndEnumeration - + Enumeration + #Window_0 + #Map + #Button_0 + #Button_1 + #Button_2 + #Button_3 + #Button_4 + #Button_5 + #Combo_0 + #Text_0 + #Text_1 + #Text_2 + #Text_3 + #Text_4 + #String_0 + #String_1 + #Gdt_LoadGpx + EndEnumeration + Structure Location Longitude.d Latitude.d EndStructure - -Procedure UpdateLocation(*Location.Location) - SetGadgetText(#String_0,StrD(*Location\Latitude)) - SetGadgetText(#String_1,StrD(*Location\Longitude)) - ProcedureReturn 0 -EndProcedure -;- Main -If OpenWindow(#Window_0, 260, 225, 700, 571, "OpenStreetMap", #PB_Window_SystemMenu | #PB_Window_MinimizeGadget | #PB_Window_TitleBar | #PB_Window_ScreenCentered ) - OSM::InitOSM() - LoadFont(0, "Wingdings", 12) - LoadFont(1, "Arial", 12, #PB_Font_Bold) - - OSM::OSMGadget(#Map, 10, 10, 512, 512) - - TextGadget(#Text_1, 530, 50, 60, 15, "Movements : ") - ButtonGadget(#Button_0, 550, 100, 30, 30, Chr($E7)) : SetGadgetFont(#Button_0, FontID(0)) - ButtonGadget(#Button_1, 610, 100, 30, 30, Chr($E8)) : SetGadgetFont(#Button_1, FontID(0)) - ButtonGadget(#Button_2, 580, 070, 30, 30, Chr($E9)) : SetGadgetFont(#Button_2, FontID(0)) - ButtonGadget(#Button_3, 580, 130, 30, 30, Chr($EA)) : SetGadgetFont(#Button_3, FontID(0)) - TextGadget(#Text_2, 530, 160, 60, 15, "Zoom : ") - ButtonGadget(#Button_4, 550, 180, 50, 30, " + ") : SetGadgetFont(#Button_4, FontID(1)) - ButtonGadget(#Button_5, 600, 180, 50, 30, " - ") : SetGadgetFont(#Button_5, FontID(1)) - TextGadget(#Text_3, 530, 230, 60, 15, "Latitude : ") - StringGadget(#String_0, 600, 230, 90, 20, "") - TextGadget(#Text_4, 530, 250, 60, 15, "Longitude : ") - StringGadget(#String_1, 600, 250, 90, 20, "") - ButtonGadget(#Gdt_LoadGpx, 530, 280, 150, 30, "Load GPX") - - Define Event.i, Gadget.i, Quit.b = #False - Define pfValue.d - OSM::SetLocation(49.04599, 2.03347, 17) - OSM::SetCallBackLocation(@UpdateLocation()) - - Repeat - Event = WaitWindowEvent() + Procedure UpdateLocation(*Location.Location) + SetGadgetText(#String_0,StrD(*Location\Latitude)) + SetGadgetText(#String_1,StrD(*Location\Longitude)) + ProcedureReturn 0 + EndProcedure + ;- Main + If OpenWindow(#Window_0, 260, 225, 700, 571, "OpenStreetMap", #PB_Window_SystemMenu | #PB_Window_MinimizeGadget | #PB_Window_TitleBar | #PB_Window_ScreenCentered ) - OSM::Event(Event) - Select Event - Case #PB_Event_CloseWindow : Quit = 1 - Case #PB_Event_Gadget ;{ - Gadget = EventGadget() - Select Gadget - Case #Button_4 - OSM::SetZoom(1) - Case #Button_5 - OSM::SetZoom( - 1) - Case #Gdt_LoadGpx - OSM::LoadGpxFile(OpenFileRequester("Choisissez un fichier à charger", "", "*.gpx", 0)) - EndSelect - EndSelect - Until Quit = #True -EndIf -<<<<<<< HEAD -======= + OSM::InitOSM() + LoadFont(0, "Wingdings", 12) + LoadFont(1, "Arial", 12, #PB_Font_Bold) + + OSM::OSMGadget(#Map, 10, 10, 512, 512) + + TextGadget(#Text_1, 530, 50, 60, 15, "Movements : ") + ButtonGadget(#Button_0, 550, 100, 30, 30, Chr($E7)) : SetGadgetFont(#Button_0, FontID(0)) + ButtonGadget(#Button_1, 610, 100, 30, 30, Chr($E8)) : SetGadgetFont(#Button_1, FontID(0)) + ButtonGadget(#Button_2, 580, 070, 30, 30, Chr($E9)) : SetGadgetFont(#Button_2, FontID(0)) + ButtonGadget(#Button_3, 580, 130, 30, 30, Chr($EA)) : SetGadgetFont(#Button_3, FontID(0)) + TextGadget(#Text_2, 530, 160, 60, 15, "Zoom : ") + ButtonGadget(#Button_4, 550, 180, 50, 30, " + ") : SetGadgetFont(#Button_4, FontID(1)) + ButtonGadget(#Button_5, 600, 180, 50, 30, " - ") : SetGadgetFont(#Button_5, FontID(1)) + TextGadget(#Text_3, 530, 230, 60, 15, "Latitude : ") + StringGadget(#String_0, 600, 230, 90, 20, "") + TextGadget(#Text_4, 530, 250, 60, 15, "Longitude : ") + StringGadget(#String_1, 600, 250, 90, 20, "") + ButtonGadget(#Gdt_LoadGpx, 530, 280, 150, 30, "Load GPX") + + Define Event.i, Gadget.i, Quit.b = #False + Define pfValue.d + OSM::SetLocation(49.04599, 2.03347, 17) + OSM::SetCallBackLocation(@UpdateLocation()) + + Repeat + Event = WaitWindowEvent() + + OSM::Event(Event) + Select Event + Case #PB_Event_CloseWindow : Quit = 1 + Case #PB_Event_Gadget ;{ + Gadget = EventGadget() + Select Gadget + Case #Button_4 + OSM::SetZoom(1) + Case #Button_5 + OSM::SetZoom( - 1) + Case #Gdt_LoadGpx + OSM::LoadGpxFile(OpenFileRequester("Choisissez un fichier à charger", "", "*.gpx", 0)) + EndSelect + EndSelect + Until Quit = #True + EndIf CompilerEndIf -; IDE Options = PureBasic 5.42 LTS (Windows - x86) -; CursorPosition = 726 -; FirstLine = 683 + +; IDE Options = PureBasic 5.42 LTS (Windows - x64) +; CursorPosition = 831 +; FirstLine = 803 ; Folding = ----- ; EnableUnicode -; EnableThread -; EnableXP ->>>>>>> refs/remotes/origin/master +; EnableXP \ No newline at end of file