diff --git a/assets/amenities-btn.svg b/assets/amenities-btn.svg index 3ee8e70..69a848a 100644 --- a/assets/amenities-btn.svg +++ b/assets/amenities-btn.svg @@ -9,12 +9,13 @@ id="svg1" xml:space="preserve" inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - sodipodi:docname="amenities-btn.svg" + sodipodi:docname="mockup.svg" inkscape:export-filename="assets/neon-border-image-corner.svg" inkscape:export-xdpi="96" inkscape:export-ydpi="96" 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" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">Piscine++++++++++++Piscine de l'AntenneAu centre de la pelouse d'entree sur le site, a cote des jeux pour enfantGrand atelier de nage libre, tous cyborg accepteEVENEMENTS A VENIRNage libre3 Juil17:00-19:00 - - - - - - - - - - - - - - - - 0 - 0 - - - - - false - - - - diff --git a/couches/zones-interdite.geojson b/couches/zones-interdite.geojson index 06c87a8..3bfb63a 100644 --- a/couches/zones-interdite.geojson +++ b/couches/zones-interdite.geojson @@ -9,7 +9,6 @@ { "type": "Feature", "properties": { "name": "escalieretetage", "zone-interdite": true, "zone-humide": false }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.092214891374372, 47.541842633905581 ], [ -2.092222027584651, 47.541815430264649 ], [ -2.092135973284223, 47.541808629352204 ], [ -2.092128837073943, 47.541835832996675 ], [ -2.092214891374372, 47.541842633905581 ] ] ] } }, { "type": "Feature", "properties": { "name": "rdcaileouest", "zone-interdite": true, "zone-humide": false }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.092100887537982, 47.541833120872255 ], [ -2.092109484544007, 47.541793657576086 ], [ -2.092178260592207, 47.541799461003862 ], [ -2.092183418795822, 47.541769670067808 ], [ -2.091970786180136, 47.54175342045918 ], [ -2.091959896639171, 47.541821514023539 ], [ -2.092100887537982, 47.541833120872255 ] ] ] } }, { "type": "Feature", "properties": { "name": "foret-jardin", "zone-interdite": true, "zone-humide": false }, "geometry": null }, -{ "type": "Feature", "properties": { "name": "regie", "zone-interdite": true, "zone-humide": false }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091848786453545, 47.541780421811545 ], [ -2.091791585532498, 47.541776446880021 ], [ -2.091797754259278, 47.54174029391752 ], [ -2.091854955180325, 47.541743890286639 ], [ -2.091848786453545, 47.541780421811545 ] ] ] } }, -{ "type": "Feature", "properties": { "name": "Poneys", "zone-interdite": true, "zone-humide": false, "description-interdiction": "Les poneys aiment bien les humain·es main peut être pas dans leurs locaux." }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.09130796946351, 47.541215044631478 ], [ -2.090904404913283, 47.541193015958591 ], [ -2.090968295444696, 47.540785975570813 ], [ -2.091407854320396, 47.540814932479726 ], [ -2.091381827801083, 47.541018984385808 ], [ -2.091380663640096, 47.541026971436914 ], [ -2.091335921860846, 47.541025925818701 ], [ -2.091331098267611, 47.541059927745806 ], [ -2.091374895217403, 47.541061723024505 ], [ -2.091352951793027, 47.541208001276409 ], [ -2.09130908009991, 47.541205726360758 ], [ -2.09130796946351, 47.541215044631478 ] ] ] } } +{ "type": "Feature", "properties": { "name": "regie", "zone-interdite": true, "zone-humide": false }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091848786453545, 47.541780421811545 ], [ -2.091791585532498, 47.541776446880021 ], [ -2.091797754259278, 47.54174029391752 ], [ -2.091854955180325, 47.541743890286639 ], [ -2.091848786453545, 47.541780421811545 ] ] ] } } ] } diff --git a/couches/zones-protegees.geojson b/couches/zones-protegees.geojson index 8f1ebf9..3ddcd39 100644 --- a/couches/zones-protegees.geojson +++ b/couches/zones-protegees.geojson @@ -3,7 +3,7 @@ "name": "zones-protegees", "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } }, "features": [ -{ "type": "Feature", "properties": { "name": "Forêt-jardin", "autorisee": false, "id": "foret-jardin" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091246158056328, 47.542215942324461 ], [ -2.091100048491368, 47.542202643788848 ], [ -2.090764928523822, 47.542098748540582 ], [ -2.090821483890411, 47.541798807958898 ], [ -2.091332079222496, 47.541838409301668 ], [ -2.091246158056328, 47.542215942324461 ] ] ] } }, +{ "type": "Feature", "properties": { "name": "Forêt-jardin", "autorisee": false, "id": "foret-jardin" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.091246158056328, 47.542215942324461 ], [ -2.091100048491368, 47.542202643788848 ], [ -2.090764928523822, 47.542098748540582 ], [ -2.090834714667705, 47.541702801219969 ], [ -2.091283825571846, 47.541733010704526 ], [ -2.091339265613396, 47.541810153367649 ], [ -2.091246158056328, 47.542215942324461 ] ] ] } }, { "type": "Feature", "properties": { "name": "Prairie biodiversité", "autorisee": false, "id": "prairie-biodiversite", "description-interdiction": "La prairie est un espace où se développe un espece de plante endemique (uniquement présente dans la région) en danger de disparition. Les personne de l'antenne essayent de la conserver pour qu'elle ne disparaisse pas. Veuillez ne pas circuler dans cette zone pour éviter d'abimer la biodiversité qui sý développe. Merci" }, "geometry": { "type": "Polygon", "coordinates": [ [ [ -2.09222214969687, 47.541614161422828 ], [ -2.091608783825783, 47.541560138092635 ], [ -2.091582759813864, 47.541505353848656 ], [ -2.091691756447549, 47.540836132642191 ], [ -2.092101791402842, 47.540857155427858 ], [ -2.092327570144048, 47.540851899732232 ], [ -2.09222214969687, 47.541614161422828 ] ] ] } } ] } diff --git a/css/style.css b/css/style.css index 8d2f47f..63b8494 100644 --- a/css/style.css +++ b/css/style.css @@ -136,14 +136,6 @@ body > hr { margin-top: 1ex; } -#map .highlight-point-icon.point-feature img ~ h3 { - opacity: clamp(0, calc( var(--zoom-level) - 20 ), 1) ; -} - -#map .highlight-point-icon img { - opacity: clamp(0, calc( var(--zoom-level) - 17 ), 1) ; -} - #map .highlight-point-icon:not(.active) { opacity: 0; @@ -415,18 +407,6 @@ camp-feature .feature-widgets > * { margin-bottom: 2em; } -camp-feature .feature-widgets > p:first-child { - margin-top: 0; -} - -camp-feature .feature-widgets > p + p { - margin-top: -1em; -} - -camp-feature .feature-widgets .author-widget { - text-align: right; -} - camp-feature .widget > :first-child { margin-top: 0; } diff --git a/data/camping acrobranche.gpx b/data/camping acrobranche.gpx deleted file mode 100644 index b65b682..0000000 --- a/data/camping acrobranche.gpx +++ /dev/null @@ -1,9118 +0,0 @@ - - - - camping acrobranche - - - - - 61.1 - - 3.9 - - - 61 - - 3.9 - - - 61.2 - - 3.9 - - - 61.2 - - 3.8 - - - 61.3 - - 3.8 - - - 61.3 - - 4.2 - - - 61.2 - - 4.3 - - - 61.2 - - 4.3 - - - 61 - - 4.1 - - - 60.7 - - 3.8 - - - 60.3 - - 3.9 - - - 60.8 - - 3.8 - - - 59.6 - - 4 - - - 58.8 - - 4.1 - - - 59.3 - - 4.2 - - - 59.6 - - 4.1 - - - 60 - - 4.2 - - - 60.2 - - 4.2 - - - 60 - - 4.1 - - - 59.5 - - 4.1 - - - 58.9 - - 4 - - - 59.3 - - 3.9 - - - 59.7 - - 3.8 - - - 59.9 - - 3.9 - - - 59.8 - - 4 - - - 59.6 - - 4.3 - - - 59.6 - - 4.5 - - - 59.5 - - 4.1 - - - 59.4 - - 3.9 - - - 59.4 - - 3.8 - - - 59.4 - - 3.8 - - - 59.4 - - 3.8 - - - 59.5 - - 3.8 - - - 59.5 - - 3.8 - - - 59.5 - - 3.9 - - - 59.5 - - 4.1 - - - 59.5 - - 4 - - - 59.5 - - 3.9 - - - 59.5 - - 3.8 - - - 59.4 - - 3.8 - - - 59.4 - - 9.9 - - - 59.4 - - 10 - - - 59.5 - - 10.2 - - 0.4 - - - - 58.3 - - 10.3 - - 1.1 - - - - 58 - - 10.3 - - 0.4 - - - - 58.8 - - 10.3 - - 0.4 - - - - 59 - - 10.2 - - - 59.4 - - 10.1 - - - 59.2 - - 9.9 - - - 58.8 - - 9.9 - - - 58.8 - - 9.9 - - - 58.9 - - 9.9 - - - 58.6 - - 9.9 - - - 57.8 - - 9.9 - - - 56.8 - - 9.9 - - - 56.9 - - 9.9 - - - 56.8 - - 9.9 - - - 57 - - 9.9 - - - 56.9 - - 9.9 - - - 56.9 - - 9.9 - - - 56.9 - - 9.9 - - - 57 - - 9.9 - - - 56.1 - - 10 - - 2.5 - - - - 55 - - 9.9 - - 0.8 - - - - 56.9 - - 9.9 - - 0.9 - - - - 57.1 - - 9.9 - - 1.2 - - - - 56.4 - - 9.9 - - 0.8 - - - - 56.2 - - 9.9 - - 0.6 - - - - 57.1 - - 9.9 - - 0.5 - - - - 55.3 - - 9.9 - - 0.4 - - - - 54.2 - - 9.9 - - 0.9 - - - - 54.1 - - 9.9 - - 1.1 - - - - 55.8 - - 9.9 - - 1.1 - - - - 57 - - 9.9 - - 0.9 - - - - 57.4 - - 9.9 - - 0.9 - - - - 57.5 - - 9.9 - - 0.9 - - - - 56.8 - - 9.9 - - 0.9 - - - - 57.3 - - 9.9 - - 1 - - - - 57.5 - - 9.9 - - 0.9 - - - - 57.1 - - 9.9 - - 0.9 - - - - 56.5 - - 9.9 - - 0.9 - - - - 56 - - 9.9 - - 0.9 - - - - 54.9 - - 9.9 - - 0.9 - - - - 55 - - 9.9 - - 0.9 - - - - 54 - - 9.9 - - 0.9 - - - - 54.1 - - 9.9 - - 0.9 - - - - 53.4 - - 9.9 - - 1 - - - - 52.3 - - 9.9 - - 1 - - - - 52.5 - - 9.9 - - 1 - - - - 52.4 - - 9.9 - - 1 - - - - 52.5 - - 9.9 - - 1 - - - - 52.8 - - 9.9 - - 1.1 - - - - 52.5 - - 9.9 - - 1 - - - - 52.9 - - 9.9 - - 1 - - - - 53 - - 9.9 - - 1 - - - - 53.9 - - 9.9 - - 1 - - - - 53.7 - - 9.9 - - 1 - - - - 53.5 - - 9.9 - - 1 - - - - 53.9 - - 9.9 - - 1.1 - - - - 53.5 - - 9.9 - - 1.1 - - - - 54.3 - - 9.9 - - 1.1 - - - - 55.3 - - 9.9 - - 1.1 - - - - 54.7 - - 9.9 - - 1.1 - - - - 54.8 - - 9.9 - - 1.1 - - - - 54.2 - - 9.9 - - 1.2 - - - - 53.4 - - 9.9 - - 1.2 - - - - 54 - - 9.9 - - 1.1 - - - - 54.1 - - 9.9 - - 1.2 - - - - 52.7 - - 9.9 - - 1.1 - - - - 52.3 - - 9.9 - - 1.3 - - - - 51.3 - - 9.9 - - 1.1 - - - - 51.9 - - 9.9 - - 1.1 - - - - 50.2 - - 9.9 - - 0.9 - - - - 50.5 - - 9.9 - - 1.1 - - - - 51.1 - - 9.9 - - 1 - - - - 51.2 - - 9.9 - - 0.9 - - - - 51.4 - - 9.9 - - 1 - - - - 50.9 - - 9.9 - - 1 - - - - 50.7 - - 9.9 - - 1 - - - - 50.7 - - 9.9 - - 1 - - - - 51.5 - - 9.9 - - 1.1 - - - - 51.9 - - 9.9 - - 1.1 - - - - 52.9 - - 9.9 - - 1 - - - - 51.9 - - 9.9 - - 1.2 - - - - 52.2 - - 9.9 - - 1.1 - - - - 51 - - 9.9 - - 1 - - - - 51.5 - - 9.9 - - 1 - - - - 51.5 - - 9.9 - - 1.1 - - - - 51.1 - - 9.9 - - 1 - - - - 51.1 - - 9.9 - - 1 - - - - 51.2 - - 9.9 - - 1 - - - - 50.7 - - 9.9 - - 1 - - - - 51.5 - - 9.9 - - 1 - - - - 51.7 - - 9.9 - - 1 - - - - 52 - - 9.9 - - 1 - - - - 51.9 - - 9.9 - - 1 - - - - 52.4 - - 9.9 - - 0.9 - - - - 51.5 - - 9.9 - - 1 - - - - 51.5 - - 9.9 - - 1 - - - - 52.4 - - 9.9 - - 1.1 - - - - 51.6 - - 9.9 - - 1.6 - - - - 51.2 - - 9.9 - - 1 - - - - 51.5 - - 9.9 - - 1 - - - - 51.3 - - 9.9 - - 1 - - - - 50.3 - - 9.9 - - 1 - - - - 50.1 - - 9.9 - - 1 - - - - 50.3 - - 9.9 - - 1 - - - - 51.3 - - 9.9 - - 0.9 - - - - 51.5 - - 9.9 - - 1 - - - - 50.8 - - 9.9 - - 0.9 - - - - 50.5 - - 9.9 - - 1 - - - - 50.5 - - 9.9 - - 0.9 - - - - 50.2 - - 9.9 - - 0.9 - - - - 50.1 - - 9.9 - - 1 - - - - 50.9 - - 9.9 - - 1 - - - - 51.2 - - 9.9 - - 1 - - - - 51.3 - - 9.9 - - 1 - - - - 51.3 - - 9.9 - - 1 - - - - 52.4 - - 9.9 - - 0.9 - - - - 53.2 - - 9.9 - - 1 - - - - 53.6 - - 9.9 - - 1 - - - - 52.9 - - 9.9 - - 1.2 - - - - 52.6 - - 9.9 - - 0.9 - - - - 52.6 - - 9.9 - - 0.9 - - - - 53 - - 9.9 - - 1 - - - - 52.9 - - 9.9 - - 1.1 - - - - 52.2 - - 9.9 - - 0.9 - - - - 52.8 - - 9.9 - - 0.9 - - - - 52.7 - - 9.9 - - 0.9 - - - - 52.4 - - 9.9 - - 0.9 - - - - 50.3 - - 9.9 - - 0.9 - - - - 49.1 - - 9.9 - - 0.9 - - - - 50.1 - - 9.9 - - 1 - - - - 49.6 - - 9.9 - - 1 - - - - 49.6 - - 9.9 - - 1 - - - - 51.1 - - 9.9 - - 1 - - - - 51.2 - - 9.9 - - 1 - - - - 50.9 - - 9.9 - - 0.9 - - - - 50.5 - - 9.9 - - 1 - - - - 50.7 - - 9.9 - - 1 - - - - 50.1 - - 9.9 - - 1 - - - - 50 - - 9.9 - - 1 - - - - 49.9 - - 9.9 - - 0.9 - - - - 49.7 - - 9.9 - - 0.9 - - - - 49.3 - - 9.9 - - 0.8 - - - - 49.9 - - 9.9 - - 0.9 - - - - 50.4 - - 9.9 - - 1 - - - - 51.4 - - 9.9 - - 1.1 - - - - 51.6 - - 9.9 - - 1 - - - - 52.9 - - 9.9 - - 1.3 - - - - 52.6 - - 9.9 - - 1 - - - - 52.4 - - 9.9 - - 1 - - - - 52.4 - - 9.9 - - 1 - - - - 53.1 - - 9.9 - - 1.1 - - - - 53.1 - - 9.9 - - 0.9 - - - - 52.6 - - 9.9 - - 1 - - - - 53.1 - - 9.9 - - 1 - - - - 53.6 - - 9.9 - - 0.9 - - - - 53.8 - - 9.9 - - 1 - - - - 53.6 - - 9.9 - - 0.9 - - - - 53.6 - - 9.9 - - 1 - - - - 53.4 - - 9.9 - - 0.9 - - - - 52.7 - - 9.9 - - 1 - - - - 52.7 - - 9.9 - - 0.9 - - - - 53 - - 9.9 - - 0.9 - - - - 53.1 - - 9.9 - - 0.9 - - - - 53.9 - - 9.9 - - 0.9 - - - - 53.9 - - 9.9 - - 1 - - - - 54.7 - - 9.9 - - 1 - - - - 54.3 - - 9.9 - - 0.9 - - - - 54.4 - - 9.9 - - 1 - - - - 52.5 - - 9.9 - - 1.1 - - - - 51.7 - - 9.9 - - 1.1 - - - - 51.9 - - 9.9 - - 1 - - - - 52.2 - - 9.9 - - 1.1 - - - - 52.2 - - 9.9 - - 1 - - - - 52.1 - - 9.9 - - 1.1 - - - - 52.8 - - 9.9 - - 1.1 - - - - 52.9 - - 9.9 - - 1.2 - - - - 52.7 - - 9.9 - - 1.1 - - - - 52.3 - - 9.9 - - 1.1 - - - - 53.2 - - 9.9 - - 1.1 - - - - 53 - - 9.9 - - 1 - - - - 53.5 - - 9.9 - - 1 - - - - 53 - - 9.9 - - 1.1 - - - - 52.6 - - 9.9 - - 1.3 - - - - 52.4 - - 9.9 - - 1.1 - - - - 52.5 - - 9.9 - - 1.3 - - - - 51.8 - - 9.9 - - 1.2 - - - - 52.1 - - 9.9 - - 1.1 - - - - 52.5 - - 9.9 - - 1.2 - - - - 51.8 - - 9.9 - - 1.4 - - - - 51.5 - - 9.9 - - 1.1 - - - - 51.6 - - 9.9 - - 1 - - - - 50.9 - - 9.9 - - 1.2 - - - - 50.3 - - 9.9 - - 0.8 - - - - 50.8 - - 9.9 - - 1 - - - - 50.6 - - 9.9 - - 1 - - - - 50.2 - - 9.9 - - 0.9 - - - - 50.9 - - 9.9 - - 1 - - - - 50.9 - - 9.9 - - 1.2 - - - - 51.7 - - 9.9 - - 0.9 - - - - 51.5 - - 9.9 - - 0.9 - - - - 51.2 - - 9.9 - - 0.9 - - - - 51.5 - - 9.9 - - 1.2 - - - - 51.1 - - 9.9 - - 0.9 - - - - 50.5 - - 9.9 - - 0.9 - - - - 50.5 - - 9.9 - - 0.9 - - - - 51.2 - - 9.9 - - 0.9 - - - - 50.4 - - 9.9 - - 0.7 - - - - 51.2 - - 9.9 - - - 51 - - 9.9 - - 1 - - - - 51.2 - - 9.9 - - 1.1 - - - - 57.3 - - 8.8 - - 3 - - - - 54.8 - - 8.7 - - 2.6 - - - - 55 - - 8.2 - - 1.7 - - - - 56.3 - - 7.3 - - 0.8 - - - - 57.2 - - 7 - - 0.2 - - - - 57.7 - - 6.1 - - - 58.8 - - 6 - - - 60.1 - - 5.5 - - - 59.8 - - 5 - - - 60 - - 4.9 - - - 60.5 - - 4.7 - - - 61.6 - - 4.4 - - - 61.6 - - 4.2 - - - 61.7 - - 4 - - - 61.2 - - 3.9 - - - 61.6 - - 4 - - 0.8 - - - - 61.4 - - 3.8 - - - 61.8 - - 3.9 - - - 61 - - 3.8 - - 0.2 - - - - 61.6 - - 3.8 - - - 61.5 - - 3.8 - - - 60.9 - - 3.8 - - - 61.2 - - 3.8 - - - 61.3 - - 3.8 - - - 61.2 - - 3.8 - - - 60.9 - - 3.8 - - - 60.8 - - 3.8 - - - 60.5 - - 3.8 - - - 60.4 - - 3.8 - - - 60.8 - - 3.8 - - - 60.6 - - 3.8 - - - 60.5 - - 3.8 - - - 60.5 - - 3.8 - - - 60.6 - - 3.8 - - - 60.5 - - 3.8 - - - 60.6 - - 3.8 - - - 60.5 - - 3.8 - - - 59.7 - - 3.8 - - 0.9 - - - - 60.5 - - 3.8 - - 1.1 - - - - 58.7 - - 3.8 - - 0.4 - - - - 56.9 - - 3.8 - - 0.9 - - - - 56.1 - - 3.8 - - 1.4 - - - - 55.6 - - 3.8 - - 0.9 - - - - 55.3 - - 3.8 - - 0.6 - - - - 54.5 - - 3.8 - - 0.7 - - - - 55.3 - - 3.8 - - 1.1 - - - - 55.5 - - 3.8 - - 0.8 - - - - 57.1 - - 3.8 - - 0.4 - - - - 58.1 - - 3.8 - - 0.9 - - - - 59.4 - - 3.8 - - 0.9 - - - - 60 - - 3.8 - - 1 - - - - 60.8 - - 3.8 - - 1.1 - - - - 59.3 - - 3.8 - - 1 - - - - 58 - - 3.8 - - 1 - - - - 58.6 - - 3.8 - - 1 - - - - 57.5 - - 3.8 - - 1 - - - - 57.1 - - 3.8 - - 1 - - - - 57.7 - - 3.8 - - 1.1 - - - - 57 - - 3.8 - - 1.3 - - - - 56.4 - - 3.8 - - 1 - - - - 56.8 - - 3.8 - - 1 - - - - 56.2 - - 9.9 - - 1 - - - - 55.4 - - 9.9 - - 0.9 - - - - 54.8 - - 9.9 - - 1 - - - - 54 - - 9.9 - - 1.3 - - - - 54.1 - - 9.9 - - 0.9 - - - - 53.6 - - 9.9 - - 0.9 - - - - 53.7 - - 9.9 - - 0.8 - - - - 53.3 - - 9.9 - - 0.8 - - - - 53.6 - - 9.9 - - 0.8 - - - - 54 - - 9.9 - - 0.8 - - - - 54.4 - - 9.9 - - 0.8 - - - - 55.4 - - 9.9 - - 0.8 - - - - 56.3 - - 9.9 - - 0.8 - - - - 56.4 - - 9.9 - - 0.8 - - - - 56.3 - - 9.9 - - 0.8 - - - - 54.8 - - 9.9 - - 1.2 - - - - 54.5 - - 9.9 - - 0.9 - - - - 55.5 - - 9.9 - - 0.8 - - - - 55.6 - - 9.9 - - 0.8 - - - - 55.6 - - 9.9 - - 0.8 - - - - 56 - - 9.9 - - 0.9 - - - - 55.8 - - 9.9 - - 1.3 - - - - 55.4 - - 9.9 - - 0.9 - - - - 55 - - 9.9 - - 0.8 - - - - 54.5 - - 9.9 - - 0.9 - - - - 54.6 - - 9.9 - - 0.9 - - - - 54 - - 9.9 - - 1 - - - - 54.3 - - 9.9 - - 1 - - - - 54.7 - - 9.9 - - 0.9 - - - - 55.2 - - 9.9 - - 0.9 - - - - 55.8 - - 9.9 - - 1 - - - - 56 - - 9.9 - - 0.9 - - - - 56.5 - - 9.9 - - 1 - - - - 56.3 - - 9.9 - - 1.1 - - - - 55.6 - - 9.9 - - 1.2 - - - - 56 - - 9.9 - - 1.1 - - - - 56.1 - - 9.9 - - 1.1 - - - - 56.5 - - 9.9 - - 1.2 - - - - 56.9 - - 9.9 - - 1.1 - - - - 57 - - 9.9 - - 1.1 - - - - 56.7 - - 9.9 - - 1.2 - - - - 56.7 - - 9.9 - - 1.2 - - - - 57.2 - - 9.9 - - 1.1 - - - - 57 - - 9.9 - - 1.2 - - - - 56.9 - - 9.9 - - 1.4 - - - - 56.6 - - 9.9 - - 1.2 - - - - 57.2 - - 9.9 - - 1.3 - - - - 57.1 - - 9.9 - - 1.2 - - - - 58 - - 9.9 - - 1.3 - - - - 57.9 - - 9.9 - - 1.2 - - - - 58.5 - - 9.9 - - 1.2 - - - - 58.8 - - 9.9 - - 1.2 - - - - 58.8 - - 9.9 - - 1.4 - - - - 57.5 - - 9.9 - - 1.3 - - - - 57.1 - - 9.9 - - 1.2 - - - - 57.1 - - 9.9 - - 1.3 - - - - 57.2 - - 9.9 - - 1.3 - - - - 57.1 - - 9.9 - - 1.3 - - - - 57.1 - - 9.9 - - 1.3 - - - - 56.9 - - 9.9 - - 1 - - - - 57.5 - - 9.9 - - 1 - - - - 57.2 - - 9.9 - - 1 - - - - 57.3 - - 9.9 - - 1.2 - - - - 55.4 - - 9.9 - - 0.2 - - - - 53.9 - - 9.9 - - 1.1 - - - - 55.9 - - 9.9 - - 1.5 - - - - 56.6 - - 9.9 - - 1.7 - - - - 57.4 - - 9.9 - - 1.4 - - - - 57 - - 9.9 - - 1.5 - - - - 57.2 - - 9.9 - - 1.7 - - - - 58 - - 9.9 - - 0.5 - - - - 58 - - 9.9 - - 0.6 - - - - 58.2 - - 9.9 - - 0.7 - - - - 58.3 - - 9.9 - - 0.6 - - - - 58.7 - - 9.9 - - 0.5 - - - - 58.6 - - 9.9 - - 0.7 - - - - 57.8 - - 9.9 - - 1.2 - - - - 57 - - 9.9 - - 0.8 - - - - 57.8 - - 9.9 - - 0.8 - - - - 57.3 - - 9.9 - - 0.7 - - - - 57.9 - - 9.9 - - 0.8 - - - - 57.9 - - 9.9 - - 1.1 - - - - 59.3 - - 9.9 - - 1.2 - - - - 60.6 - - 9.9 - - 1.1 - - - - 61.2 - - 9.9 - - 1.5 - - - - 61.6 - - 9.9 - - 1.5 - - - - 61.2 - - 9.9 - - 1 - - - - 61.3 - - 9.9 - - 1.2 - - - - 61.9 - - 9.9 - - 1.1 - - - - 62 - - 9.9 - - 0.8 - - - - 62.3 - - 9.9 - - 1 - - - - 61.9 - - 9.9 - - 1 - - - - 62.6 - - 9.9 - - 1.2 - - - - 63 - - 9.9 - - 1.2 - - - - 62.1 - - 9.9 - - 1.1 - - - - 62.8 - - 9.9 - - 1.3 - - - - 63.2 - - 9.9 - - 1.3 - - - - 64.1 - - 9.9 - - 1.3 - - - - 63.2 - - 9.9 - - 0.9 - - - - 63.8 - - 9.9 - - 1 - - - - 63.9 - - 9.9 - - 1.1 - - - - 64.4 - - 9.9 - - 1 - - - - 63.9 - - 9.9 - - 1 - - - - 63.9 - - 9.9 - - 1 - - - - 64 - - 10.2 - - 1 - - - - 64.3 - - 10.6 - - 1 - - - - 62.9 - - 10.5 - - 1.1 - - - - 61.3 - - 10.1 - - 1 - - - - 59.9 - - 10 - - 1 - - - - 58.9 - - 9.9 - - 0.8 - - - - 58.8 - - 9.9 - - 1.1 - - - - 59 - - 9.9 - - 0.9 - - - - 59.9 - - 9.9 - - 0.9 - - - - 59 - - 9.9 - - 0.9 - - - - 59.5 - - 9.9 - - 0.9 - - - - 58.9 - - 9.9 - - 1 - - - - 58.5 - - 9.9 - - 0.9 - - - - 58.6 - - 9.9 - - 0.9 - - - - 59.9 - - 9.9 - - 0.9 - - - - 60.3 - - 9.9 - - 1.1 - - - - 60.1 - - 9.9 - - 0.7 - - - - 59 - - 9.9 - - 0.7 - - - - 58.3 - - 9.9 - - 0.7 - - - - 58.7 - - 9.9 - - 0.4 - - - - 58.8 - - 10 - - 1 - - - - 58.8 - - 9.9 - - 0.7 - - - - 59.2 - - 9.9 - - 0.7 - - - - 59.4 - - 9.9 - - 1 - - - - 58.7 - - 9.9 - - 0.6 - - - - 57.5 - - 9.9 - - 0.6 - - - - 57 - - 9.9 - - 0.9 - - - - 57 - - 9.9 - - 0.8 - - - - 57.4 - - 9.9 - - 0.9 - - - - 57.7 - - 10 - - 1 - - - - 57.7 - - 9.9 - - 0.8 - - - - 57.9 - - 9.9 - - 0.7 - - - - 58 - - 9.9 - - 0.7 - - - - 57.9 - - 9.9 - - 0.7 - - - - 58.6 - - 9.9 - - 0.7 - - - - 58.3 - - 9.9 - - 1 - - - - 60.2 - - 9.9 - - 0.4 - - - - 60.6 - - 9.9 - - 0.9 - - - - 60.9 - - 9.9 - - 0.8 - - - - 61.9 - - 9.9 - - 0.9 - - - - 61.5 - - 9.9 - - 0.8 - - - - 62.7 - - 9.9 - - 0.7 - - - - 62.3 - - 9.9 - - 0.7 - - - - 62.7 - - 9.9 - - 0.6 - - - - 60.1 - - 9.9 - - - 61.7 - - 9.9 - - 0.7 - - - - 61.9 - - 9.9 - - 0.7 - - - - 61.5 - - 9.9 - - 0.7 - - - - 61.6 - - 9.9 - - 0.8 - - - - 61.8 - - 9.9 - - 0.8 - - - - 61 - - 9.9 - - 0.9 - - - - 60.9 - - 9.9 - - 0.7 - - - - 61.1 - - 9.9 - - 0.9 - - - - 59.9 - - 9.9 - - 0.7 - - - - 59.9 - - 9.9 - - 1.3 - - - - 59.8 - - 9.9 - - 0.9 - - - - 60.9 - - 9.9 - - 0.9 - - - - 60.6 - - 9.9 - - 0.7 - - - - 61.1 - - 9.9 - - 0.7 - - - - 61.2 - - 9.9 - - 0.8 - - - - 60.5 - - 9.9 - - 0.7 - - - - 59.8 - - 9.9 - - 0.8 - - - - 59.3 - - 9.9 - - 0.7 - - - - 59.1 - - 9.9 - - 0.6 - - - - 59.2 - - 9.9 - - 0.7 - - - - 59.2 - - 9.9 - - 0.7 - - - - 59.7 - - 9.9 - - 0.8 - - - - 59.3 - - 9.9 - - 0.7 - - - - 59 - - 9.9 - - 0.7 - - - - 59.3 - - 9.9 - - 1.2 - - - - 60.1 - - 9.9 - - 0.7 - - - - 61.6 - - 9.9 - - 0.9 - - - - 60.9 - - 9.9 - - 0.4 - - - - 61.1 - - 9.9 - - 0.2 - - - - 62.2 - - 9.9 - - 0.5 - - - - 62.2 - - 9.9 - - 0.5 - - - - 62.4 - - 10 - - 0.7 - - - - 62.6 - - 10 - - 0.5 - - - - 62.6 - - 10 - - 2.2 - - - - 62.4 - - 10 - - 1.5 - - - - 61.8 - - 10 - - 1.3 - - - - 61.9 - - 9.9 - - 1.2 - - - - 62 - - 9.9 - - 1.3 - - - - 61.5 - - 9.9 - - 1 - - - - 61.4 - - 9.9 - - 1.1 - - - - 61.5 - - 9.9 - - 1.1 - - - - 60.6 - - 9.9 - - 1.2 - - - - 60.3 - - 9.9 - - 0.9 - - - - 60.4 - - 9.9 - - 0.9 - - - - 60.7 - - 9.9 - - 1 - - - - 60.2 - - 9.9 - - 0.9 - - - - 60.3 - - 9.9 - - 0.8 - - - - 58.6 - - 9.9 - - 0.7 - - - - 56.7 - - 9.9 - - 0.9 - - - - 56.2 - - 9.9 - - 0.9 - - - - 56.7 - - 9.9 - - 0.7 - - - - 57.4 - - 9.9 - - 0.8 - - - - 57.6 - - 9.9 - - 1.1 - - - - 58 - - 10 - - 1 - - - - 58.3 - - 9.9 - - 0.6 - - - - 58.7 - - 9.9 - - 0.7 - - - - 59.1 - - 9.9 - - 1 - - - - 60.8 - - 9.9 - - 0.8 - - - - 60.8 - - 9.9 - - 0.8 - - - - 60.5 - - 9.9 - - 0.7 - - - - 59.9 - - 9.9 - - 0.8 - - - - 60 - - 9.9 - - 0.8 - - - - 60.4 - - 9.9 - - 1.9 - - - - 59.7 - - 9.9 - - 0.7 - - - - 59.5 - - 9.9 - - 0.7 - - - - 60.2 - - 9.9 - - 0.7 - - - - 60.3 - - 9.9 - - 0.7 - - - - 60.4 - - 9.9 - - 0.7 - - - - 60.6 - - 9.9 - - 0.6 - - - - 61.6 - - 9.9 - - 0.7 - - - - 60.4 - - 9.9 - - 0.7 - - - - 62 - - 9.9 - - 0.8 - - - - 61 - - 9.9 - - 0.6 - - - - 61.7 - - 9.9 - - 0.6 - - - - 60.9 - - 9.9 - - 0.8 - - - - 60.7 - - 9.9 - - 0.6 - - - - 60.1 - - 9.9 - - - 60.2 - - 9.9 - - - 60.2 - - 9.9 - - - 60.2 - - 9.9 - - - 60.4 - - 9.9 - - - 61.6 - - 9.9 - - 3.4 - - - - 61 - - 9.9 - - - 61.9 - - 9.9 - - 3 - - - - 62.2 - - 9.9 - - - 62.2 - - 9.9 - - - 62.2 - - 9.9 - - - 62.6 - - 9.9 - - 0.2 - - - - 62.5 - - 9.9 - - 0.4 - - - - 62 - - 9.9 - - 0.4 - - - - 60 - - 9.9 - - 3 - - - - 60 - - 9.9 - - 2 - - - - 61.2 - - 9.9 - - 1 - - - - 61.8 - - 9.9 - - 0.9 - - - - 63 - - 9.9 - - 0.9 - - - - 63.7 - - 9.9 - - 0.9 - - - - 65.5 - - 9.9 - - 1.2 - - - - 65.6 - - 9.9 - - 1 - - - - 66.3 - - 9.9 - - 0.9 - - - - 66 - - 9.9 - - 0.9 - - - - 64.8 - - 9.9 - - 1 - - - - 63.5 - - 9.9 - - 0.9 - - - - 62.2 - - 9.9 - - 3.5 - - - - 61.2 - - 9.9 - - 2.1 - - - - 61 - - 9.9 - - 0.8 - - - - 58.9 - - 9.9 - - 0.3 - - - - 58.9 - - 9.9 - - 0.6 - - - - 57.6 - - 9.9 - - 0.8 - - - - 58.1 - - 9.9 - - - 57.8 - - 9.9 - - 0.3 - - - - 57.4 - - 9.9 - - 2.6 - - - - 56.8 - - 9.9 - - 3 - - - - 57.1 - - 9.9 - - 1.9 - - - - 57.9 - - 9.9 - - 0.8 - - - - 57.9 - - 9.9 - - 2.5 - - - - 59.4 - - 9.9 - - 2 - - - - 59.6 - - 9.9 - - 0.8 - - - - 60 - - 9.9 - - 1.2 - - - - 60.5 - - 9.9 - - 0.8 - - - - 60.5 - - 9.9 - - 0.9 - - - - 61.2 - - 9.9 - - 0.9 - - - - 59.4 - - 9.9 - - 0.9 - - - - 60.1 - - 9.9 - - 0.8 - - - - 60.1 - - 9.9 - - 0.8 - - - - 60.2 - - 9.9 - - 0.8 - - - - 59.2 - - 9.9 - - 0.7 - - - - 60 - - 9.9 - - 0.7 - - - - 60.3 - - 9.9 - - 0.8 - - - - 59.4 - - 9.9 - - 0.8 - - - - 58.6 - - 9.9 - - 0.9 - - - - 59.3 - - 9.9 - - 0.9 - - - - 59.9 - - 9.9 - - 1 - - - - 60.9 - - 9.9 - - 0.9 - - - - 61.7 - - 9.9 - - 0.9 - - - - 62.7 - - 9.9 - - 1.5 - - - - 61.6 - - 9.9 - - 1.1 - - - - 61.5 - - 9.9 - - 1.2 - - - - 60.9 - - 9.9 - - 0.9 - - - - 61.7 - - 9.9 - - 1 - - - - 61.4 - - 9.9 - - 1 - - - - 61.7 - - 9.9 - - 1 - - - - 61.9 - - 9.9 - - 1 - - - - 60.5 - - 9.9 - - 1 - - - - 60.6 - - 9.9 - - 0.9 - - - - 60 - - 9.9 - - 0.9 - - - - 59.1 - - 9.9 - - 0.9 - - - - 59 - - 9.9 - - 0.9 - - - - 59.3 - - 9.9 - - 1 - - - - 59 - - 9.9 - - 1.1 - - - - 58.9 - - 9.9 - - 1.1 - - - - 58.8 - - 9.9 - - 1.1 - - - - 59.3 - - 9.9 - - 1.5 - - - - 59 - - 9.9 - - 1 - - - - 58.9 - - 9.9 - - 1 - - - - 59.7 - - 9.9 - - 0.7 - - - - 58.3 - - 9.9 - - 0.7 - - - - 59.6 - - 9.9 - - 0.7 - - - - 61 - - 9.9 - - 0.7 - - - - 60.4 - - 9.9 - - 0.7 - - - - 61.1 - - 9.9 - - 0.7 - - - - 61.2 - - 9.9 - - 0.8 - - - - 60.9 - - 9.9 - - - 61.6 - - 9.9 - - 0.9 - - - - 58.4 - - 10.3 - - 0.2 - - - - 56.3 - - 10.3 - - 1.2 - - - - 54.3 - - 10.1 - - 0.9 - - - - 54 - - 9.9 - - 0.9 - - - - 53.8 - - 9.9 - - 1 - - - - 52.2 - - 10 - - 0.9 - - - - 53.2 - - 10 - - 1.1 - - - - 55 - - 10 - - 1.2 - - - - 55.8 - - 10 - - 1.2 - - - - 56 - - 10.1 - - 1.2 - - - - 56.5 - - 10.3 - - 1.3 - - - - 56.7 - - 10.5 - - 1.4 - - - - 56.8 - - 10.1 - - 1.2 - - - - 58.1 - - 10.1 - - 1 - - - - 58.4 - - 10 - - 1 - - - - 58.8 - - 10.2 - - 0.9 - - - - 60.3 - - 10.3 - - 1 - - - - 58.6 - - 10.1 - - 0.8 - - - - 58 - - 10.2 - - 1 - - - - 59.3 - - 10.2 - - 0.9 - - - - 59 - - 10.2 - - 0.8 - - - - 57.8 - - 10.2 - - 0.9 - - - - 57.4 - - 10.2 - - 0.7 - - - - 56.7 - - 10.3 - - 0.8 - - - - 57.2 - - 10.3 - - 0.8 - - - - 57.5 - - 10.4 - - 0.9 - - - - 57 - - 10.3 - - 1 - - - - 56.5 - - 10.3 - - 0.7 - - - - 56.4 - - 10.4 - - 0.6 - - - - 55.2 - - 10.4 - - 0.7 - - - - 56 - - 10.3 - - 0.7 - - - - 55.2 - - 10.1 - - 0.9 - - - - 53.8 - - 10.2 - - 0.7 - - - - 53.7 - - 10.1 - - 0.6 - - - - 53.5 - - 10.2 - - 0.6 - - - - 51.7 - - 10.1 - - 0.6 - - - - 53.5 - - 10.1 - - 0.6 - - - - 53.5 - - 10.1 - - 0.8 - - - - 53.5 - - 10 - - 0.6 - - - - 54.9 - - 9.9 - - 0.5 - - - - 54.9 - - 10 - - 0.5 - - - - 56.1 - - 9.9 - - 0.6 - - - - 57.7 - - 9.9 - - 0.2 - - - - 57.2 - - 9.9 - - 0.5 - - - - 58.4 - - 9.9 - - 0.6 - - - - 58.5 - - 9.9 - - 0.6 - - - - 59.4 - - 9.9 - - 0.7 - - - - 59.9 - - 10 - - 0.6 - - - - 60 - - 10.4 - - 0.2 - - - - 58.1 - - 10.1 - - 0.6 - - - - 58 - - 10.1 - - 0.4 - - - - 58.3 - - 10 - - 0.8 - - - - 59.1 - - 10 - - 0.6 - - - - 60.2 - - 10.2 - - 0.8 - - - - 59.9 - - 10 - - 0.5 - - - - 60.1 - - 9.9 - - 0.5 - - - - 59.5 - - 9.9 - - 0.7 - - - - 59.8 - - 9.9 - - 0.2 - - - - 60.7 - - 9.9 - - - 60.9 - - 9.9 - - - 61 - - 9.9 - - - 60.3 - - 9.9 - - 0.6 - - - - 59.9 - - 9.9 - - 0.2 - - - - 59.2 - - 9.9 - - 0.5 - - - - 58.5 - - 9.9 - - - 58.4 - - 9.9 - - - 58.4 - - 9.9 - - - 58.4 - - 9.9 - - - 58.5 - - 9.9 - - - 59 - - 9.9 - - - 58.9 - - 9.9 - - 0.3 - - - - 59 - - 9.9 - - 0.3 - - - - 59 - - 9.9 - - - 59.3 - - 9.9 - - 0.5 - - - - 58.8 - - 10.2 - - 0.7 - - - - 58.5 - - 10.2 - - 0.8 - - - - 58.5 - - 10.2 - - 0.5 - - - - 57.7 - - 10.2 - - 1 - - - - 57 - - 10.1 - - 0.7 - - - - 56.5 - - 10.2 - - 0.8 - - - - 57.5 - - 10.2 - - 0.7 - - - - 57.2 - - 10.2 - - 0.4 - - - - 57 - - 10.2 - - 0.2 - - - - 56 - - 10.2 - - 0.6 - - - - 55.5 - - 10.2 - - 0.8 - - - - 55.9 - - 10.2 - - 0.6 - - - - 56.1 - - 10.2 - - 0.8 - - - - 56.4 - - 10.2 - - 1.1 - - - - 57.5 - - 10.1 - - 1.1 - - - - 57.1 - - 10.1 - - 1.4 - - - - 57.8 - - 10.1 - - 1 - - - - 57.6 - - 10.1 - - 0.6 - - - - 58.2 - - 10.1 - - 0.6 - - - - 58.2 - - 10.3 - - 0.6 - - - - 58 - - 10.4 - - 0.5 - - - - 58.3 - - 10.3 - - 0.6 - - - - 58.7 - - 10.4 - - 0.8 - - - - 58.9 - - 10.4 - - 0.3 - - - - 59 - - 10.6 - - 0.3 - - - - 59 - - 10.8 - - 0.9 - - - - 58.8 - - 10.8 - - 0.7 - - - - 58.7 - - 10.8 - - 1 - - - - 58.5 - - 10.9 - - 0.7 - - - - 58.5 - - 11 - - 0.8 - - - - 57.9 - - 11.1 - - 0.8 - - - - 57.5 - - 11.5 - - 0.8 - - - - 58.3 - - 11.2 - - - 58.6 - - 12.5 - - 0.7 - - - - 59.3 - - 12 - - 0.5 - - - - 57.2 - - 11.7 - - 0.7 - - - - 57.8 - - 11.6 - - 0.7 - - - - 57.6 - - 11.6 - - 0.9 - - - - 57.6 - - 11.5 - - 0.6 - - - - 57.5 - - 11.5 - - 1 - - - - 57.8 - - 11.6 - - 0.9 - - - - 58.2 - - 11.7 - - 0.9 - - - - 58.8 - - 11.5 - - 1.5 - - - - 58.4 - - 11.6 - - 1.3 - - - - 60.3 - - 11.4 - - 0.7 - - - - 61.4 - - 11.2 - - 1.4 - - - - 59.1 - - 11.2 - - 1.2 - - - - 59 - - 11.4 - - 1.2 - - - - 58.6 - - 11.2 - - 0.5 - - - - 58.9 - - 11.3 - - 1 - - - - 60.7 - - 11.2 - - 0.7 - - - - 61.8 - - 11.3 - - 1.2 - - - - 62.5 - - 11.5 - - 1.1 - - - - 62.3 - - 11.7 - - 1.1 - - - - 62 - - 11.5 - - 0.9 - - - - 64 - - 11.3 - - 0.9 - - - - 63.7 - - 11.3 - - 0.7 - - - - 65.3 - - 11 - - 0.4 - - - - 64.8 - - 10.9 - - - 67.4 - - 11 - - 0.9 - - - - 65.6 - - 11.2 - - 1.1 - - - - 64.8 - - 11 - - 1.4 - - - - 65 - - 11.4 - - 1.7 - - - - 64.8 - - 11.7 - - 1.8 - - - - 64.3 - - 11.8 - - 2.7 - - - - 65.6 - - 12.1 - - 2.5 - - - - 65 - - 12.3 - - 1.4 - - - - 65 - - 12.4 - - 1 - - - - 66.1 - - 11.7 - - 1.8 - - - - 66.1 - - 11.7 - - 1.4 - - - - 66.2 - - 11.8 - - 1.7 - - - - 65.3 - - 11.4 - - 0.9 - - - - 63.7 - - 11.3 - - 0.9 - - - - 63.1 - - 11.3 - - 2 - - - - 63.4 - - 11.1 - - 1.9 - - - - 60 - - 11.2 - - 2.2 - - - - 60 - - 11 - - 1.7 - - - - 58.5 - - 10.8 - - 2 - - - - 59 - - 10.7 - - 2 - - - - 58.7 - - 10.5 - - 2 - - - - 57.8 - - 10.3 - - 1.9 - - - - 58.2 - - 10.2 - - 1.7 - - - - 56.4 - - 10.2 - - 1.6 - - - - 55.8 - - 10.1 - - 1.5 - - - - 56.1 - - 10.1 - - 1.6 - - - - 57.1 - - 10 - - 1.7 - - - - 57.8 - - 10 - - 1.8 - - - - 59.2 - - 10 - - 1.7 - - - - 60.3 - - 10 - - 1.6 - - - - 58.1 - - 10.1 - - 1.2 - - - - 58.5 - - 9.9 - - 0.8 - - - - 60.8 - - 9.9 - - 1.8 - - - - 61.2 - - 9.9 - - 1.5 - - - - 62 - - 9.9 - - 1.3 - - - - 61.8 - - 10 - - 1.3 - - - - 62.5 - - 10 - - 1.3 - - - - 61.4 - - 10.3 - - 1.3 - - - - 61.1 - - 10.1 - - 1.1 - - - - 61.7 - - 10.2 - - 1.2 - - - - 62.6 - - 10.2 - - 1.2 - - - - 62.9 - - 10.2 - - 1.2 - - - - 62.7 - - 10.2 - - 1.2 - - - - 64.2 - - 10.2 - - 1.2 - - - - 63.6 - - 10.2 - - 1.3 - - - - 61.6 - - 10 - - 1.2 - - - - 62.2 - - 9.9 - - 1.2 - - - - 61.2 - - 9.9 - - 1.1 - - - - 62 - - 9.9 - - 1.1 - - - - 61.1 - - 9.9 - - 1.3 - - - - 60.8 - - 9.9 - - 1 - - - - 60.1 - - 9.9 - - 0.9 - - - - 59.5 - - 9.9 - - 0.8 - - - - 58.6 - - 9.9 - - 0.8 - - - - 58.9 - - 9.9 - - 0.9 - - - - 58.2 - - 9.9 - - 1 - - - - 58.5 - - 9.9 - - 1.4 - - - - 57.3 - - 9.9 - - 1.2 - - - - 57.3 - - 9.9 - - 0.8 - - - - 55.9 - - 9.9 - - 0.7 - - - - 55.2 - - 9.9 - - 0.7 - - - - 54.6 - - 9.9 - - 0.9 - - - - 55.7 - - 9.9 - - 1.1 - - - - 55.6 - - 9.9 - - 1.4 - - - - 54.4 - - 9.9 - - 1.4 - - - - 53.9 - - 9.9 - - 1.5 - - - - 54.2 - - 9.9 - - 1.3 - - - - 54.8 - - 9.9 - - 1.3 - - - - 54.7 - - 9.9 - - 1 - - - - 56.5 - - 9.9 - - 1 - - - - 56.3 - - 9.9 - - 1 - - - - 55.6 - - 9.9 - - 1 - - - - 55.7 - - 9.9 - - 1.1 - - - - 56.6 - - 9.9 - - 1.1 - - - - 56.5 - - 9.9 - - 1 - - - - 55.4 - - 9.9 - - 1.1 - - - - 54.2 - - 9.9 - - 1.3 - - - - 53.5 - - 9.9 - - 2 - - - - 52.6 - - 9.9 - - 1.6 - - - - 51.6 - - 9.9 - - 0.9 - - - - 53 - - 9.9 - - 1 - - - - 54.5 - - 9.9 - - 1 - - - - 54.8 - - 9.9 - - 1 - - - - 55 - - 9.9 - - 1 - - - - 55 - - 9.9 - - 1 - - - - 55.8 - - 9.9 - - 0.9 - - - - 55.5 - - 9.9 - - - 57.1 - - 9.9 - - - 57 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 57.7 - - 9.9 - - - 59 - - 9.9 - - - 58.9 - - 9.9 - - - 58.9 - - 9.9 - - - 59.4 - - 9.9 - - - 59.4 - - 9.9 - - - 59.6 - - 9.9 - - - 59.9 - - 9.9 - - 0.2 - - - - 58.5 - - 9.9 - - - 59.6 - - 9.9 - - - 59.9 - - 9.9 - - - 59.9 - - 9.9 - - - 59.8 - - 9.9 - - - 59.9 - - 9.9 - - - 59.2 - - 9.9 - - - 59.2 - - 9.9 - - - 59.2 - - 9.9 - - - 59.2 - - 9.9 - - - 59.2 - - 9.9 - - - 59.2 - - 9.9 - - - 59.5 - - 9.9 - - 0.2 - - - - 59.2 - - 9.9 - - 0.5 - - - - 59.2 - - 9.9 - - 0.8 - - - - 59.1 - - 9.9 - - - 59.2 - - 9.9 - - - 59.2 - - 9.9 - - - 59.2 - - 9.9 - - - 58.9 - - 9.9 - - - 59.9 - - 9.9 - - 0.2 - - - - 58.3 - - 9.9 - - 0.4 - - - - 58 - - 9.9 - - - 57.8 - - 9.9 - - - 57.5 - - 9.9 - - - 58 - - 9.9 - - 0.2 - - - - 58.5 - - 9.9 - - - 58.7 - - 9.9 - - - 58.7 - - 9.9 - - - 59 - - 9.9 - - - 58.5 - - 9.9 - - - 58.7 - - 9.9 - - 0.2 - - - - 59.2 - - 9.9 - - 0.2 - - - - 58.6 - - 9.9 - - 1.2 - - - - 58.7 - - 9.9 - - - 58.8 - - 9.9 - - - 58.1 - - 9.9 - - 1.5 - - - - 58.4 - - 9.9 - - 0.3 - - - - 58.2 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 58.1 - - 9.9 - - - 57.7 - - 9.9 - - - 56.7 - - 9.9 - - - 56.2 - - 9.9 - - - 56.2 - - 9.9 - - - 56.2 - - 9.9 - - - 56.2 - - 9.9 - - - 56.2 - - 9.9 - - - 56.3 - - 9.9 - - 0.3 - - - - 56.1 - - 9.9 - - 0.7 - - - - 55.6 - - 9.9 - - 1.2 - - - - 55.1 - - 9.9 - - 1.1 - - - - 55.1 - - 9.9 - - 1.1 - - - - 55 - - 9.9 - - 0.9 - - - - 54.9 - - 9.9 - - 1.2 - - - - 54.3 - - 9.9 - - 1.1 - - - - 54 - - 9.9 - - 1 - - - - 54.5 - - 9.9 - - 1 - - - - 54.8 - - 9.9 - - 1.5 - - - - 54 - - 9.9 - - 1.5 - - - - 53.2 - - 9.9 - - 1 - - - - 51.9 - - 9.9 - - 1 - - - - 52.4 - - 9.9 - - 1 - - - - 53.9 - - 9.9 - - 1 - - - - 54.1 - - 9.9 - - 0.9 - - - - 53.4 - - 9.9 - - 0.9 - - - - 53.1 - - 9.9 - - 0.9 - - - - 53 - - 9.9 - - 1 - - - - 52.3 - - 9.9 - - 1 - - - - 52 - - 9.9 - - 0.9 - - - - 50.7 - - 9.9 - - 1 - - - - 50.4 - - 9.9 - - 1 - - - - 51.3 - - 9.9 - - 1 - - - - 51.8 - - 9.9 - - 1 - - - - 53.1 - - 9.9 - - 1 - - - - 53.2 - - 9.9 - - 1 - - - - 54.7 - - 9.9 - - 1 - - - - 55.5 - - 9.9 - - 1.1 - - - - 55.9 - - 9.9 - - 1.1 - - - - 56.3 - - 9.9 - - 1.1 - - - - 55.7 - - 9.9 - - 1.1 - - - - 56 - - 9.9 - - 1.1 - - - - 55.4 - - 9.9 - - 1.2 - - - - 54.7 - - 9.9 - - 1.2 - - - - 53.4 - - 9.9 - - 1.1 - - - - 51.6 - - 9.9 - - 1.2 - - - - 51.5 - - 9.9 - - 1.2 - - - - 52.2 - - 9.9 - - 1.3 - - - - 52.6 - - 9.9 - - 1.3 - - - - 52 - - 9.9 - - 1.3 - - - - 52.1 - - 9.9 - - 1.1 - - - - 52.3 - - 9.9 - - 1.2 - - - - 54 - - 9.9 - - 1.2 - - - - 53.6 - - 9.9 - - 1.2 - - - - 54.6 - - 9.9 - - 1.2 - - - - 54.7 - - 9.9 - - 1.2 - - - - 54.2 - - 9.9 - - 1.4 - - - - 52.6 - - 9.9 - - 1.1 - - - - 53.7 - - 9.9 - - 1.2 - - - - 52.9 - - 9.9 - - 1.2 - - - - 54 - - 9.9 - - 1.2 - - - - 54.4 - - 9.9 - - 1.2 - - - - 54.7 - - 9.9 - - 1.3 - - - - 54.4 - - 9.9 - - 1.2 - - - - 54.5 - - 9.9 - - 1.2 - - - - 53.7 - - 9.9 - - 1.3 - - - - 53.1 - - 9.9 - - 1.2 - - - - 53.6 - - 9.9 - - 1.2 - - - - 53.8 - - 9.9 - - 1.4 - - - - 53.3 - - 9.9 - - 1.2 - - - - 52.8 - - 9.9 - - 1.2 - - - - 53.1 - - 9.9 - - 1.3 - - - - 53.7 - - 9.9 - - 1.3 - - - - 52.9 - - 9.9 - - 1.2 - - - - 51.8 - - 9.9 - - 1.1 - - - - 52.9 - - 10 - - 0.9 - - - - 53.4 - - 10.1 - - 1.2 - - - - 54.3 - - 9.9 - - 0.8 - - - - 54.2 - - 9.9 - - 0.9 - - - - 54.3 - - 9.9 - - 1.1 - - - - 54.7 - - 9.9 - - 1 - - - - 55.4 - - 9.9 - - 1 - - - - 55 - - 9.9 - - 1 - - - - 55.5 - - 9.9 - - 0.9 - - - - 55 - - 9.9 - - 1 - - - - 55.3 - - 9.9 - - 0.9 - - - - 55.5 - - 9.9 - - 1.3 - - - - 55.5 - - 9.9 - - 0.9 - - - - 55.4 - - 9.9 - - 0.9 - - - - 56.3 - - 9.9 - - 0.9 - - - - 56.5 - - 9.9 - - 0.6 - - - - 56.3 - - 10 - - 0.8 - - - - 55.6 - - 9.9 - - 0.9 - - - - 56.3 - - 9.9 - - 0.7 - - - - 56.5 - - 9.9 - - 1 - - - - 57.2 - - 9.9 - - 0.5 - - - - 57 - - 9.9 - - 1.3 - - - - 56.9 - - 9.9 - - 0.8 - - - - 56.5 - - 9.9 - - 1.4 - - - - 56.4 - - 9.9 - - 1.4 - - - - 55.9 - - 9.9 - - 1.1 - - - - 55.4 - - 9.9 - - 1.3 - - - - 55.5 - - 9.9 - - 1.4 - - - - 56.1 - - 9.9 - - 1.5 - - - - 57.2 - - 9.9 - - 1.5 - - - - 57.1 - - 9.9 - - 1.5 - - - - 56.8 - - 9.9 - - 1.1 - - - - 57 - - 9.9 - - 1.2 - - - - 57 - - 9.9 - - 1.1 - - - - 57 - - 9.9 - - 1.2 - - - - 56.7 - - 9.9 - - 1.1 - - - - 55.9 - - 9.9 - - 1.1 - - - - 55.8 - - 9.9 - - 1.1 - - - - 55.2 - - 9.9 - - 1.1 - - - - 54.7 - - 9.9 - - 1.1 - - - - 55.2 - - 9.9 - - 1 - - - - 55.5 - - 9.9 - - 1 - - - - 55.8 - - 9.9 - - 1.1 - - - - 56.9 - - 9.9 - - 1.1 - - - - 57.2 - - 9.9 - - 1.1 - - - - 57.8 - - 9.9 - - 1.1 - - - - 56.7 - - 9.9 - - 1.1 - - - - 56.8 - - 9.9 - - 1.3 - - - - 56.2 - - 9.9 - - 1.1 - - - - 55.5 - - 9.9 - - 1.4 - - - - 55.5 - - 9.9 - - 0.9 - - - - 55.3 - - 9.9 - - 0.9 - - - - 54.6 - - 9.9 - - 1 - - - - 54.7 - - 9.9 - - 0.9 - - - - 54.3 - - 9.9 - - 1 - - - - 54.6 - - 9.9 - - 0.8 - - - - 54 - - 9.9 - - 0.8 - - - - 54 - - 9.9 - - 0.8 - - - - 54 - - 9.9 - - 0.7 - - - - 54.6 - - 9.9 - - 0.7 - - - - 55.8 - - 9.9 - - 0.7 - - - - 54.9 - - 9.9 - - 0.8 - - - - 54 - - 9.9 - - 0.8 - - - - 54.9 - - 9.9 - - 0.8 - - - - 55.3 - - 9.9 - - 0.9 - - - - 55.7 - - 9.9 - - 1.1 - - - - 56.4 - - 9.9 - - 1 - - - - 56.8 - - 9.9 - - 1 - - - - 56.9 - - 9.9 - - 1 - - - - 57.3 - - 9.9 - - 1 - - - - 57 - - 9.9 - - 1 - - - - 57.1 - - 9.9 - - 1 - - - - 57.5 - - 9.9 - - 1 - - - - 59.1 - - 9.9 - - 1 - - - - 59.6 - - 9.9 - - 1 - - - - 59.9 - - 9.9 - - 1 - - - - 60.1 - - 9.9 - - 1 - - - - 60.5 - - 9.9 - - 1 - - - - 60.1 - - 10.5 - - 1.1 - - - - 60.5 - - 10.7 - - 1.4 - - - - 60.6 - - 9.9 - - - 60.5 - - 9.9 - - - 60.6 - - 9.9 - - - 60.6 - - 9.9 - - - 60.2 - - 9.9 - - - 59.7 - - 9.9 - - - 59.6 - - 10.2 - - - 59.3 - - 10.2 - - - 59.1 - - 9.9 - - - 59.4 - - 9.9 - - 1.7 - - - - 59.8 - - 10 - - 1 - - - - 59.4 - - 9.9 - - 1.3 - - - - 58.8 - - 10 - - 0.8 - - - - 58 - - 9.9 - - 0.7 - - - - 57.6 - - 10.1 - - 1 - - - - 58.6 - - 10 - - 0.7 - - - - 59.2 - - 9.9 - - 1.2 - - - - 60.1 - - 10 - - 1 - - - - 60 - - 10 - - 1.1 - - - - 59.9 - - 9.9 - - 1.1 - - - - 59.6 - - 9.9 - - 0.8 - - - - 58.5 - - 9.9 - - 0.8 - - - - 58.3 - - 9.9 - - 0.9 - - - - 59.3 - - 9.9 - - 0.9 - - - - 59.4 - - 9.9 - - 0.9 - - - - 58.4 - - 9.9 - - 0.9 - - - - 57 - - 9.9 - - 0.9 - - - - 55.6 - - 9.9 - - 0.9 - - - - 55.8 - - 9.9 - - 1.2 - - - - 55.3 - - 9.9 - - 0.8 - - - - 56.5 - - 9.9 - - 1 - - - - 56 - - 9.9 - - 0.8 - - - - 56.3 - - 9.9 - - 0.9 - - - - 56.3 - - 9.9 - - 0.9 - - - - 55.6 - - 9.9 - - 0.9 - - - - 55.1 - - 9.9 - - 1 - - - - 55.4 - - 9.9 - - 1 - - - - 54.8 - - 9.9 - - 1 - - - - 54.4 - - 9.9 - - 0.9 - - - - 54.4 - - 9.9 - - 1.1 - - - - 55 - - 9.9 - - 0.9 - - - - 54.7 - - 9.9 - - 1 - - - - 54.8 - - 9.9 - - 1 - - - - 54.9 - - 9.9 - - 0.9 - - - - 54.9 - - 9.9 - - 0.9 - - - - 54.1 - - 9.9 - - 1 - - - - 53.5 - - 9.9 - - 1.2 - - - - 53.4 - - 9.9 - - 0.9 - - - - 52.7 - - 9.9 - - 0.8 - - - - 52 - - 9.9 - - 0.9 - - - - 51.3 - - 9.9 - - 0.9 - - - - 51.9 - - 9.9 - - 0.9 - - - - 53.7 - - 9.9 - - 1 - - - - 53.1 - - 9.9 - - 0.9 - - - - 52.9 - - 9.9 - - 1.6 - - - - 53.6 - - 9.9 - - 0.9 - - - - 53.6 - - 9.9 - - 0.9 - - - - 53.6 - - 9.9 - - 1 - - - - 54.6 - - 9.9 - - 1.3 - - - - 54.5 - - 9.9 - - 1 - - - - 54 - - 9.9 - - 1 - - - - 53.9 - - 9.9 - - 1 - - - - 54.9 - - 9.9 - - 1 - - - - 54.8 - - 9.9 - - 0.9 - - - - 55.1 - - 9.9 - - 1.4 - - - - 55.2 - - 9.9 - - 1 - - - - 54.5 - - 9.9 - - 0.9 - - - - 54.7 - - 9.9 - - 1 - - - - 54.6 - - 9.9 - - 0.9 - - - - 54.9 - - 9.9 - - 0.9 - - - - 54.5 - - 9.9 - - 0.9 - - - - 54.5 - - 9.9 - - 1 - - - - 54.6 - - 9.9 - - 1 - - - - 54.6 - - 9.9 - - 1 - - - - 54.9 - - 9.9 - - 1 - - - - 54.1 - - 9.9 - - 1.1 - - - - 54.3 - - 9.9 - - 1.3 - - - - 55.4 - - 9.9 - - 0.9 - - - - 55.9 - - 9.9 - - 1 - - - - 56.3 - - 9.9 - - 1.4 - - - - 56.8 - - 9.9 - - 1 - - - - 56.5 - - 9.9 - - 1 - - - - 56.4 - - 9.9 - - 1.3 - - - - 56.3 - - 9.9 - - 1 - - - - 56.7 - - 9.9 - - 1 - - - - 56.6 - - 9.9 - - 1.1 - - - - 56.7 - - 9.9 - - 1.1 - - - - 57.5 - - 9.9 - - 1 - - - - 57.1 - - 9.9 - - 1.2 - - - - 56.2 - - 9.9 - - 1.1 - - - - 56 - - 9.9 - - 1.1 - - - - 56.1 - - 9.9 - - 1.2 - - - - 56.6 - - 9.9 - - 1 - - - - 56.1 - - 9.9 - - 1 - - - - 56.2 - - 9.9 - - 1 - - - - 56.2 - - 9.9 - - 1 - - - - 55.8 - - 9.9 - - 1 - - - - 55.7 - - 9.9 - - 1 - - - - 54.3 - - 9.9 - - 1 - - - - 54.6 - - 9.9 - - 1 - - - - 55.8 - - 9.9 - - 1 - - - - 55.3 - - 9.9 - - 1 - - - - 55.2 - - 9.9 - - 1 - - - - 54.3 - - 9.9 - - 1 - - - - 54.2 - - 9.9 - - 1 - - - - 53.8 - - 9.9 - - 1 - - - - 54 - - 9.9 - - 1 - - - - 54.1 - - 9.9 - - 1.2 - - - - 54.4 - - 9.9 - - 0.9 - - - - 55.5 - - 9.9 - - 1 - - - - 55.2 - - 9.9 - - 0.9 - - - - 54.3 - - 9.9 - - 0.9 - - - - 53.7 - - 9.9 - - 0.9 - - - - 53.1 - - 9.9 - - 0.9 - - - - 53.4 - - 9.9 - - 0.9 - - - - 53.8 - - 9.9 - - 1 - - - - 53.2 - - 9.9 - - 1 - - - - 52.3 - - 9.9 - - 1.1 - - - - 51.7 - - 9.9 - - 1 - - - - 51 - - 9.9 - - 1 - - - - 51.2 - - 9.9 - - 1 - - - - 51.9 - - 9.9 - - 1 - - - - 52 - - 9.9 - - 1 - - - - 52 - - 9.9 - - 1 - - - - 51.9 - - 9.9 - - 1 - - - - 51 - - 9.9 - - 1.1 - - - - 51.3 - - 9.9 - - 1 - - - - 51.7 - - 9.9 - - 1.1 - - - - 51.7 - - 9.9 - - 1 - - - - 52.5 - - 9.9 - - 1.3 - - - - 52.6 - - 9.9 - - 1.2 - - - - 52.7 - - 9.9 - - 1 - - - - 52.6 - - 9.9 - - 1.1 - - - - 53.3 - - 9.9 - - 0.9 - - - - 53.4 - - 9.9 - - 0.8 - - - - 53 - - 9.9 - - 1.5 - - - - 51.8 - - 9.9 - - - 51.3 - - 9.9 - - - 51.3 - - 9.9 - - - 51.3 - - 9.9 - - - 51.9 - - 9.9 - - - 51.9 - - 9.9 - - - - - false - true - 0.0 - no_split - none - none - top - 1.0 - 1000.0 - #00FFFF - - solid - - \ No newline at end of file diff --git a/icons/care.svg b/icons/care.svg deleted file mode 100644 index 903c016..0000000 --- a/icons/care.svg +++ /dev/null @@ -1,65 +0,0 @@ - - - - diff --git a/icons/drinks.svg b/icons/drinks.svg deleted file mode 100644 index 4771c73..0000000 --- a/icons/drinks.svg +++ /dev/null @@ -1,66 +0,0 @@ - - - - diff --git a/icons/fire.svg b/icons/fire.svg index 154305e..dd0906a 100644 --- a/icons/fire.svg +++ b/icons/fire.svg @@ -23,9 +23,9 @@ inkscape:pagecheckerboard="1" inkscape:deskcolor="#505050" inkscape:document-units="px" - inkscape:zoom="14.327643" - inkscape:cx="18.705101" - inkscape:cy="17.378993" + inkscape:zoom="7.8848409" + inkscape:cx="22.067661" + inkscape:cy="15.345903" inkscape:window-width="1714" inkscape:window-height="1081" inkscape:window-x="0" @@ -48,13 +48,13 @@ height="24.975895" x="2.2888184e-05" y="3.470149" /> - - - diff --git a/icons/search.svg b/icons/search.svg index 254d935..535d2ef 100644 --- a/icons/search.svg +++ b/icons/search.svg @@ -9,9 +9,10 @@ id="svg1" xml:space="preserve" inkscape:version="1.4 (e7c3feb100, 2024-10-09)" - sodipodi:docname="search.svg" + sodipodi:docname="mockup.svg" 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" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + id="g16-5" + inkscape:label="Ecran recherche" + transform="translate(756.64896)" + inkscape:export-filename="/home/epickiwi/Downloads/mockup-screen/screen-4.png" + inkscape:export-xdpi="200" + inkscape:export-ydpi="200">Piscine++++++Piscine de l'AntenneAu centre de la pelouse d'entree sur le site, a cote des jeux pour enfantGrand atelier de nage libre, tous cyborg accepteEVENEMENTS A VENIRNage libre3 Juil17:00-19:00 diff --git a/icons/signaletik.svg b/icons/signaletik.svg deleted file mode 100644 index 7e497ab..0000000 --- a/icons/signaletik.svg +++ /dev/null @@ -1,74 +0,0 @@ - - - - diff --git a/index.html b/index.html index f3b1c38..3301234 100644 --- a/index.html +++ b/index.html @@ -37,8 +37,7 @@ - - + diff --git a/js/feature-widgets/author.js b/js/feature-widgets/author.js deleted file mode 100644 index c5ad8c1..0000000 --- a/js/feature-widgets/author.js +++ /dev/null @@ -1,13 +0,0 @@ -export function authorWidget(feature){ - if(feature.properties["village"] && feature.properties["author"]){ - let content = document.createElement("p") - content.classList.add("widget") - content.classList.add("author-widget") - - let em = document.createElement("em") - em.textContent = "— " + feature.properties["author"] - - content.append(em) - return content - } -} \ No newline at end of file diff --git a/js/feature-widgets/description.js b/js/feature-widgets/description.js deleted file mode 100644 index 4c48f75..0000000 --- a/js/feature-widgets/description.js +++ /dev/null @@ -1,17 +0,0 @@ -export function descriptionWiget(feature){ - if(feature.properties["description"]){ - let content = document.createElement("p") - content.classList.add("widget") - content.classList.add("description-widget") - - let lines = feature.properties["description"].split(/\r?\n/) - .flatMap((it, i, arr) => i < arr.length-1 ? - [document.createTextNode(it), document.createElement("br")] : - [document.createTextNode(it)] - ); - - content.replaceChildren(...lines) - - return content - } -} \ No newline at end of file diff --git a/js/feature-widgets/feature-widgets.js b/js/feature-widgets/feature-widgets.js index 3c47501..4de408d 100644 --- a/js/feature-widgets/feature-widgets.js +++ b/js/feature-widgets/feature-widgets.js @@ -1,10 +1,8 @@ -import { authorWidget } from "./author.js" import { campingCarsWidget } from "./camping-cars.js" import { capaciteDortoirWidget } from "./capacite-dortoir.js" import { capaciteEspaceWidget } from "./capacite-espace.js" import { capaciteParkingWidget } from "./capacite-parking.js" import { deposeMinuteWidget } from "./depose-minute.js" -import { descriptionWiget } from "./description.js" import { mixiteChoisieWidget } from "./mixite-choisie.js" import { upcomingTalksWidget } from "./upcoming-talks.js" import { zoneInterditeWidget } from "./zone-interdite.js" @@ -13,9 +11,6 @@ export const FEATURE_WIDGETS = [ // Boxes mixiteChoisieWidget, zoneInterditeWidget, - // Description - descriptionWiget, - authorWidget, // Other deposeMinuteWidget, campingCarsWidget, diff --git a/js/feature-widgets/mixite-choisie.js b/js/feature-widgets/mixite-choisie.js index 797000c..a8ab513 100644 --- a/js/feature-widgets/mixite-choisie.js +++ b/js/feature-widgets/mixite-choisie.js @@ -1,5 +1,5 @@ export function mixiteChoisieWidget(feature){ - if(feature.properties["mixite-choisie"] || feature.properties["non-mixte"]){ + if(feature.properties["mixite-choisie"]){ let content = document.createElement("div") content.classList.add("mixite-choisie-widget") content.classList.add("widget") @@ -15,7 +15,7 @@ export function mixiteChoisieWidget(feature){ content.append(description) } else { let p = document.createElement("p") - p.textContent = `Cet espace est en mixité choisie sans homme cisgenre` + p.textContent = `Cet espace est en mixité choisie sans mecs cis` content.append(p) } diff --git a/js/index.js b/js/index.js index aa21708..b7009d8 100644 --- a/js/index.js +++ b/js/index.js @@ -214,7 +214,6 @@ document.getElementById("explore-toggle-btn").addEventListener("click", () => { function bindButtonToCategory(button, category){ button.addEventListener("click", e => { e.preventDefault() - document.querySelector("#explore > details").open = false openFeature(...places.featuresByCategory[category]); }) } @@ -224,7 +223,6 @@ bindButtonToCategory(document.getElementById("explore-on-schedule"), "on-schedul bindButtonToCategory(document.getElementById("explore-dodo"), "dodo") bindButtonToCategory(document.getElementById("explore-bin"), "bin") bindButtonToCategory(document.getElementById("explore-toilets"), "toilets") -bindButtonToCategory(document.getElementById("explore-care"), "care") document.getElementById("logo").addEventListener("click", e => { openFeature() diff --git a/js/map.js b/js/map.js index a6afaac..906e1df 100644 --- a/js/map.js +++ b/js/map.js @@ -92,7 +92,7 @@ export async function init(){ // Parametrage de la carte initiale //map.setMaxBounds(map_bounds) - map.setView(map_center, 20, { + map.setView(map_center, 19, { animate: false, }) } @@ -135,15 +135,9 @@ export async function init_places(places_db){ contentEl.append(nameEl) } - let classlist = ["highlight-point-icon"] - - if((!feature.parentFeature && feature.geometry.type == "Point") || feature.parentFeature?.geometry.type == "Point"){ - classlist.push("point-feature") - } - return L.marker(latlng, { icon: L.divIcon({ - className: classlist.join(" "), + className: "highlight-point-icon", html: contentEl, iconSize: [0, 0] }) diff --git a/js/places.js b/js/places.js index c587c14..031406c 100644 --- a/js/places.js +++ b/js/places.js @@ -12,9 +12,8 @@ const CATEGORIES = { "drinking-water": (feature) => feature.properties["eau potable"] || feature.properties["douches"] || feature.properties["toilettes"], "bin": (feature) => feature.properties["poubelle"], "dodo": (feature) => feature.properties["n couchage"] > 0 || feature.properties["camping"], - "on-schedule": (feature) => feature.properties["pretalx-room-id"] || feature.properties["pretalx-room-id"] == 0 || feature.properties["village"], - "toilets": (feature) => feature.properties["toilettes"] || feature.properties["douches"], - "care": (feature) => feature.properties["medic"] || feature.properties["care"] + "on-schedule": (feature) => feature.properties["pretalx-room-id"] || feature.properties["pretalx-room-id"] == 0, + "toilets": (feature) => feature.properties["toilettes"] || feature.properties["douches"] } /** @@ -263,24 +262,21 @@ export class PlaceDatabase extends EventTarget { default_database.loadGeojson(new URL("../couches/autogestion.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/bac-a-sable.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/batiments.geojson", import.meta.url), {batch: true}), - //default_database.loadGeojson(new URL("../couches/badmington.geojson", import.meta.url), {batch: true}), + default_database.loadGeojson(new URL("../couches/badmington.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/braseros.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/camping.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/dons.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/eau-potable.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/espace-camp.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/espacemiam.geojson", import.meta.url), {batch: true}), - default_database.loadGeojson(new URL("../couches/installations-permanentes.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/marabouts.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/medic.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/parkings.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/pieces-batiments.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/piscine.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/poubelles.geojson", import.meta.url), {batch: true}), - default_database.loadGeojson(new URL("../couches/restauration.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/scenes.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/terrain-de-basket.geojson", import.meta.url), {batch: true}), - default_database.loadGeojson(new URL("../couches/toilettes-temporaires.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/wifi.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/zones-interdite.geojson", import.meta.url), {batch: true}), default_database.loadGeojson(new URL("../couches/zones-protegees.geojson", import.meta.url), {batch: true}), diff --git a/js/symbols.js b/js/symbols.js index e20b9c1..87a8765 100644 --- a/js/symbols.js +++ b/js/symbols.js @@ -76,30 +76,10 @@ function getBaseSymbolForFeature(feature){ return STAGE_SYMBOL } - if(feature.properties["village"]){ - return VILLAGE_SYMBOL - } - - if(feature.properties["bar"]){ - return DRINKS_SYMBOL; - } - - if(feature.properties["care"]){ - return SOINSOIN_SYMBOL; - } - - if(feature.properties["signaletique"]){ - return SIGNALETIQUE_SYMBOL; - } - if(feature.properties["autogestion"] == "shifts"){ return SHIFTS_SYMBOL } - if(feature.properties["autogestion"] == "radio"){ - return RADIO_SYMBOL - } - if(feature.properties["dons"]){ return MONEY_SYMBOL } @@ -259,7 +239,6 @@ export const BADMINGTON_SYMBOL = new MapSymbol() export const MEDIC_SYMBOL = new MapSymbol() { MEDIC_SYMBOL.markerUrl = new URL("../icons/medic.svg", import.meta.url) - MEDIC_SYMBOL.genericName = "Médic" MEDIC_SYMBOL.borderColor = "white" MEDIC_SYMBOL.indexSynonyms = [ "medic", @@ -450,17 +429,6 @@ export const SHIFTS_SYMBOL = new MapSymbol() ] } -export const RADIO_SYMBOL = new MapSymbol() -{ - RADIO_SYMBOL.genericName = "Radio" - RADIO_SYMBOL.markerUrl = new URL("../icons/radio.svg", import.meta.url) - RADIO_SYMBOL.indexSynonyms = [ - "radio", - "fm", - "91.8", - ] -} - export const SCHEDULE_SYMBOL = new MapSymbol() { SCHEDULE_SYMBOL.genericName = "Programmation" @@ -482,60 +450,4 @@ export const BRAZERO_SYMBOL = new MapSymbol() "brazero", "flamme" ] -} - -export const SOINSOIN_SYMBOL = new MapSymbol() -{ - SOINSOIN_SYMBOL.genericName = "Soin²" - SOINSOIN_SYMBOL.markerUrl = new URL("../icons/care.svg", import.meta.url) - SOINSOIN_SYMBOL.indexSynonyms = [ - "care", - "awareness", - "soin", - "soin sécu", - "soin secu", - "soin-sécu", - "soin-secu" - ] -} - -export const SIGNALETIQUE_SYMBOL = new MapSymbol() -{ - SIGNALETIQUE_SYMBOL.genericName = "Signalétique" - SIGNALETIQUE_SYMBOL.markerUrl = new URL("../icons/signaletik.svg", import.meta.url) - SIGNALETIQUE_SYMBOL.indexSynonyms = [ - "paneau", - "gaffer", - "scotch", - "posca", - "peinture", - "signaletik", - "signaletique" - ] -} - -export const DRINKS_SYMBOL = new MapSymbol() -{ - DRINKS_SYMBOL.genericName = "Boissons" - DRINKS_SYMBOL.markerUrl = new URL("../icons/drinks.svg", import.meta.url) - DRINKS_SYMBOL.indexSynonyms = [ - "tireuses", - "boissons", - "bière", - "softs", - "kefir", - "maté" - ] -} - -export const VILLAGE_SYMBOL = new MapSymbol() -{ - VILLAGE_SYMBOL.genericName = "Installation permanente" - VILLAGE_SYMBOL.markerUrl = new URL("../icons/default-marker.svg", import.meta.url) - VILLAGE_SYMBOL.backgroundColor = "white" - VILLAGE_SYMBOL.borderColor = "white" - VILLAGE_SYMBOL.indexSynonyms = [ - "village", - "installation" - ] } \ No newline at end of file diff --git a/map-light.qgz b/map-light.qgz index 1230263..3c8f6da 100644 Binary files a/map-light.qgz and b/map-light.qgz differ diff --git a/map-print-wc.qgz b/map-print-wc.qgz deleted file mode 100644 index f000276..0000000 Binary files a/map-print-wc.qgz and /dev/null differ diff --git a/package-prod.sh b/package-prod.sh index 8de7b71..5348796 100755 --- a/package-prod.sh +++ b/package-prod.sh @@ -8,29 +8,29 @@ mkdir -p "$OUT" echo "Copie des fichiers source" -cp -a -v index.html "$OUT" -cp -a -v about.html "$OUT" -cp -a -v logo.png "$OUT" -cp -a -v manifest.json "$OUT" -cp -a -v -r ./js "$OUT" -cp -a -v -r ./css "$OUT" -cp -a -v -r ./icons "$OUT" +cp -v index.html "$OUT" +cp -v about.html "$OUT" +cp -v logo.png "$OUT" +cp -v manifest.json "$OUT" +cp -v -r ./js "$OUT" +cp -v -r ./css "$OUT" +cp -v -r ./icons "$OUT" mkdir "$OUT/assets" -cp -a -v ./assets/amenities-btn.svg "$OUT/assets" -cp -a -v ./assets/button-stepped-border-image.svg "$OUT/assets" -cp -a -v ./assets/neon-border-image.svg "$OUT/assets" -cp -a -v ./assets/neon-border-image-corner.svg "$OUT/assets" -cp -a -v ./assets/favicon.svg "$OUT/assets" -cp -a -v ./assets/favicon@192.png "$OUT/assets" -cp -a -v ./assets/favicon@512.png "$OUT/assets" +cp -v ./assets/amenities-btn.svg "$OUT/assets" +cp -v ./assets/button-stepped-border-image.svg "$OUT/assets" +cp -v ./assets/neon-border-image.svg "$OUT/assets" +cp -v ./assets/neon-border-image-corner.svg "$OUT/assets" +cp -v ./assets/favicon.svg "$OUT/assets" +cp -v ./assets/favicon@192.png "$OUT/assets" +cp -v ./assets/favicon@512.png "$OUT/assets" echo "Copie des données" mkdir "$OUT/couches" -cp -a -v ./couches/*.geojson "$OUT/couches" +cp -v ./couches/*.geojson "$OUT/couches" echo "Copie des tuiles" -cp -a -r ./tuiles "$OUT/tuiles" +cp -r ./tuiles "$OUT/tuiles" echo "Creation de l'archive du code source" git ls-tree -r HEAD --name-only -z | tar -cvz -f "$OUT/carte-camp-code-source.tar.gz" --null -T -