Merge pull request #48 from AurisAudentis/cleanup

Legend issues

src/css/map.css

@@ -121,7 +121,6 @@ a.img-and-text-link:hover span {
 }
 
 .holiday-legend {
-    height: 72px;
     width: 145px;
     background-color: #fff;
     box-shadow: 0 1px 5px rgba(0,0,0,0.65);

src/index.html

@@ -116,11 +116,11 @@
       </div>
       <div style="width: 125px; height: 18px; padding-top: 5px; padding-left: 5px;">
         <div style="height: 10px; width: 10px; background: rgb(120,120,120); margin-top: 1px; margin-left: 5px;"></div>
-        <span style="position: absolute; left: 25px; top: 55px;">Opent binnenkort</span>
+        <span style="position: absolute; left: 25px; top: 52px;">Opent binnenkort</span>
       </div>
       <div style="width: 140px; height: 18px; padding-top: 5px; padding-left: 5px;" class="holiday">
         <div style="height: 10px; width: 10px; background: rgb(121, 230, 121); margin-top: 0px; margin-left: 5px;"></div>
-        <span style="position: absolute; left: 25px; top: 80px;">Tijdens kerstvakantie</span>
+        <span style="position: absolute; left: 25px; top: 75px;">Tijdens kerstvakantie</span>
       </div>
     </div>
   </script>

src/js/map.js

@@ -56,7 +56,7 @@ $(document).ready(function() {
             } else if (feature.properties.holidays && christmasSeason) {
                 icon = christmasIcon;
                 iconDescription = "christmas";
-            } else if (!feature.properties.hours.saturday && !feature.properties.hours.sunday) {
+            } else if ((!feature.properties.hours.saturday && !feature.properties.hours.sunday)||(feature.properties.hours.saturday.toLowerCase()==="gesloten"&&feature.properties.hours.sunday.toLowerCase()==="gesloten")) {
                 icon = blueIcon;
                 iconDescription = "blue";
             }
@@ -72,7 +72,7 @@ $(document).ready(function() {
         // account name = zeuswpi, details are in password manager
         // token has a restriction to only work with our domains and localhost
         accessToken: 'pk.eyJ1IjoiemV1c3dwaSIsImEiOiJja2QzMDZ1NmcwMjBtMnlxbXV2bXVpaXhuIn0.-ViXZUT9SqRI3IvB8209LQ',
-        attribution: 'Achtergrondkaart © <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>-bijdragers, <span lang="en">Imagery © <a href="https://www.mapbox.com/">Mapbox</a></span>. | <span lang="en">Made with ❤ by <a href="https://zeus.gent/">Zeus WPI</a></span> | <a href="https://zeus.gent/about/privacy/">Privacybeleid</a>',
+        attribution: '<span>Achtergrondkaart © <a href="https://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>-bijdragers </span>, <span lang="en">Imagery © <a href="https://www.mapbox.com/">Mapbox</a></span>. | <span lang="en">Made with ❤ by <a href="https://zeus.gent/">Zeus WPI</a></span> | <a href="https://zeus.gent/about/privacy/">Privacybeleid</a>',
         maxZoom: 18
     }).addTo(map);
 
@@ -182,9 +182,5 @@ $(document).ready(function() {
         position: "bottomright"
     }).addTo(map);
 
-    var notice = new SimpleControl("#notice-template", "notice", {
-        position: "bottomleft"
-    }).addTo(map);
-
     L.control.zoom().addTo(map);
 });