From e7966d490f56d3fed35146015fb7eee02be36409 Mon Sep 17 00:00:00 2001 From: 7734485917411998476 Date: Mon, 10 May 2021 20:20:02 +0200 Subject: [PATCH 1/4] Add files via upload --- src/img/green-marker.png | Bin 0 -> 1814 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/img/green-marker.png diff --git a/src/img/green-marker.png b/src/img/green-marker.png new file mode 100644 index 0000000000000000000000000000000000000000..c85ff55931da1d9a2715b33fe9d7dee8563610e2 GIT binary patch literal 1814 zcmV+x2kH2UP)P001cn1^@s6z>|W`00001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TI8R5sp zjZ`UiZ*QHCAv%6XS2k~5on7Abu5&vxgk!T9Y24PDz_13q9K6))^^!~?Pf=c1$u!L* zF5AHePps%VZBLW|jO=zUC(*dAO~SAlyd@q3vh5ccB&JE4bD3c$f%vhRoh1^eg z^gfJT7@wVlaCC~1J=@xN_pPz2_|lq4f&`BTJ637T7$b|!@kI_~(MtiT%DzsIrm1fz znaAbpFm%{{=s>hAizc}7lhy>rU$Oh8wTW6%MV*GUK^ieeNrM3$0&dR3IL~Lm(W)rj zS$kI?9H=@}cWm+7m@Z;GzyLhp5FJWHs~@b6SJQ|-L|G{3-QS9N1A|(MynZjuiN#pm zUKpz53x)_EY{I(D(QvFT9*^4wbW1BLakC^yWuG&rAt$0Z=GM%WaNAn#!%{S~X5X@F)}tQ7jg#fle+S4i~Hty&R23 z!=gt-f=68bvN@1s_r_m8Z-|#x~@Z%fW~!isbkE zIb2UjybVPzuw?&@jF8&I7z`!kpAlblP=yoPjiE}Q^HqG*VEUi{n}w_zOak@wILFG5?WBEC?kMmDL`Yr z88QuXlhF3a$Mo6O@9KO(?}_kzaZ2IDx)BkB(z#{!VcfL+`IAak?bNabihB}xGFgggGfM;d07)?~1@Dhhbm1Hd zFNl+`Hb^-!NBvq~$$AE7Cx;DT*v9uTf>`qv-mba9Jc(t>nR{6Z%BC`RY4c-enb7*r6l$_k*0*A0j_r5_aKCXQ- zua?Dqv!inwrX}9Zcqca-@PLYc&7`NK*oQ%igitnzOtAxT+Hit*K>t6n@N4znTeomk!)Vqa`w$j{0lK7W(^lJ zLeV1j8YxS&C?tez;~w-j9>s3Mz4xKJBln9GnmCN|>5?_uNK!1mJ}|-V&%TEUkdo?OAaNyKk3LxJg^5ao@quD?w#B zaR{ks64(pmqWG)=6o2O`!MaaZoEApt07m}Ptq?^214IzN4#0(JmjD0&07*qoM6N<$ Eg6-y9p8x;= literal 0 HcmV?d00001 From b2cd8eb16cae91e3666b8e1b4fce83acc35546fb Mon Sep 17 00:00:00 2001 From: 7734485917411998476 Date: Mon, 10 May 2021 20:22:45 +0200 Subject: [PATCH 2/4] Add files via upload --- src/img/Online.png | Bin 0 -> 2752 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/img/Online.png diff --git a/src/img/Online.png b/src/img/Online.png new file mode 100644 index 0000000000000000000000000000000000000000..66f2c3726ca7bdaa0dfdfed4f07dc0bc0b33ec0e GIT binary patch literal 2752 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 Date: Mon, 10 May 2021 20:24:10 +0200 Subject: [PATCH 3/4] aanpassing aan de JS: groene pinnen voor online bibs --- src/js/map.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/js/map.js b/src/js/map.js index ea4c634..52d3aeb 100644 --- a/src/js/map.js +++ b/src/js/map.js @@ -24,11 +24,17 @@ $(document).ready(function() { iconUrl: "img/grey-marker.png" } }); + var GreenIcon = L.Icon.Default.extend({ + options: { + iconUrl: "img/green-marker.png" + } + }); var blueIcon = new BlueIcon(); var redIcon = new RedIcon(); var christmasIcon = new ChristmasIcon(); var greyIcon = new GreyIcon(); + var greenIcon = new GreenIcon(); var now = new Date(); var christmasSeason = @@ -37,6 +43,8 @@ $(document).ready(function() { function onEachFeature(feature, layer) { if (feature.properties) { + var prop = feature.properties; + prop["online"] = feature.properties.address.substring(0,5)==="https"; layer.bindPopup(popuptemplate(feature.properties), { showOnMouseOver: true }); @@ -60,6 +68,10 @@ $(document).ready(function() { icon = blueIcon; iconDescription = "blue"; } + if (feature.properties.address.substring(0,5)==="https") { + icon = greenIcon; + iconDescription = "green"; + } } return new HoverMarker(latlng, { icon: icon, riseOnHover: true}); } From 4690583c57aede892448c9e8c4fcecbf1db16cf4 Mon Sep 17 00:00:00 2001 From: 7734485917411998476 Date: Mon, 10 May 2021 20:24:47 +0200 Subject: [PATCH 4/4] Aangepaste popup voor online bibs --- src/index.html | 47 +++++++++++++++++++++++++++++------------------ 1 file changed, 29 insertions(+), 18 deletions(-) diff --git a/src/index.html b/src/index.html index b183544..81dc53b 100644 --- a/src/index.html +++ b/src/index.html @@ -36,16 +36,18 @@

{{name}} ({{capacity}} pl.)

{{#if wheelchair}}{{/if}} {{#if wifi}}{{/if}} + {{#if online}}{{/if}} -
Locatie: {{address}}
-
{{#if period.start}} - Periode: {{date period.start}} tot {{date period.end}} - {{else}} - Open gedurende het hele jaar. - {{/if}} +
{{#if online}}Link: {{address}}{{else}}Locatie: {{address}}{{/if}}
+ {{#if online}} + {{else}} +
{{#if period.start}} + Periode: {{date period.start}} tot {{date period.end}} + {{else}} + Open gedurende het hele jaar. + {{/if}}
-

Openingsuren

- +
@@ -55,15 +57,18 @@

Openingsuren

- - - - - - - - + + + + + + + +
Maandag Dinsdag Zaterdag Zondag
{{#if hours.monday}}{{hours.monday}}{{else}}Gesloten{{/if}}{{#if hours.tuesday}}{{hours.tuesday}}{{else}}Gesloten{{/if}}{{#if hours.wednesday}}{{hours.wednesday}}{{else}}Gesloten{{/if}}{{#if hours.thursday}}{{hours.thursday}}{{else}}Gesloten{{/if}}{{#if hours.friday}}{{hours.friday}}{{else}}Gesloten{{/if}}{{#if hours.saturday}}{{hours.saturday}}{{else}}Gesloten{{/if}}{{#if hours.sunday}}{{hours.sunday}}{{else}}Gesloten{{/if}}
{{#if hours.monday}}{{hours.monday}}{{else}}Gesloten{{/if}}{{#if hours.tuesday}}{{hours.tuesday}}{{else}}Gesloten{{/if}}{{#if hours.wednesday}}{{hours.wednesday}}{{else}}Gesloten{{/if}}{{#if hours.thursday}}{{hours.thursday}}{{else}}Gesloten{{/if}}{{#if hours.friday}}{{hours.friday}}{{else}}Gesloten{{/if}}{{#if hours.saturday}}{{hours.saturday}}{{else}}Gesloten{{/if}}{{#if hours.sunday}}{{hours.sunday}}{{else}}Gesloten{{/if}}
+ +

Openingsuren

+ @@ -88,8 +93,10 @@

Openingsuren

Maandag {{#if hours.sunday}}{{hours.sunday}}{{else}}Gesloten{{/if}}
+ {{/if}} {{#if extra}}{{{extra}}}{{/if}}
+