From 96ae9beb06d26f52db213f73a523451a5b8c5ecc Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Thu, 18 Feb 2021 22:04:21 +0100
Subject: [PATCH 1/5] Add hover tooltip showing asset name.

---
 flexmeasures/ui/templates/views/dashboard.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flexmeasures/ui/templates/views/dashboard.html b/flexmeasures/ui/templates/views/dashboard.html
index e7d93e405..81944e2f3 100644
--- a/flexmeasures/ui/templates/views/dashboard.html
+++ b/flexmeasures/ui/templates/views/dashboard.html
@@ -250,6 +250,11 @@ <h4>{{ asset.display_name }}</h4>
                 next();
             });
         })
+        .bindTooltip("{{ asset.display_name }}",
+        {
+            permanent: false,
+            direction: 'right'
+        })
         .on('click', clickZoom)
         .on('click', lookForState);
     // .openPopup();

From c1b2c227f0b61f535b3c8d6e154d5b71d77e0acb Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Thu, 18 Feb 2021 22:05:21 +0100
Subject: [PATCH 2/5] Add empty marker to custom webfont. Overlay map icons on
 empty marker.

---
 flexmeasures/ui/static/css/flexmeasures.css   |  36 ++++++++++++------
 flexmeasures/ui/static/font/seita-webfont.eot | Bin 9492 -> 9632 bytes
 flexmeasures/ui/static/font/seita-webfont.svg |   4 +-
 flexmeasures/ui/static/font/seita-webfont.ttf | Bin 9304 -> 9444 bytes
 .../ui/static/font/seita-webfont.woff         | Bin 5932 -> 6024 bytes
 .../ui/static/font/seita-webfont.woff2        | Bin 4872 -> 4952 bytes
 .../ui/templates/views/dashboard.html         |   8 ++--
 7 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/flexmeasures/ui/static/css/flexmeasures.css b/flexmeasures/ui/static/css/flexmeasures.css
index 5c30c8c9b..9007dde01 100644
--- a/flexmeasures/ui/static/css/flexmeasures.css
+++ b/flexmeasures/ui/static/css/flexmeasures.css
@@ -318,16 +318,22 @@ i.center-icon:after, i.center-icon:before {
 
 /* map icons */
 .map-icon {
+    color: #ffffff;
     display: flex;
-    flex-wrap: nowrap;
     align-items: center;
     justify-content: center;
     font-size: 24px;
 }
+.map-icon > i.overlay:before, .map-icon > i.overlay:after {
+    font-size: 20px;
+    z-index: 9;
+    right: -5px;
+    top: -40px;
+}
 .map-icon > i:before, .map-icon > i:after {
     position: absolute;
-    top: -22px;
-    left: -16.5px;
+    right: -25px;
+    top: -50px;
 }
 .map-icon.opportunity {
     color: #c21431;
@@ -335,9 +341,16 @@ i.center-icon:after, i.center-icon:before {
 .leaflet-marker-popup {
     min-width: 240px;
 }
+.icon-empty-marker {
+    color: #000000;
+    opacity: 0.7;
+}
 
 
 /* rotating icons, because why not? */
+.map-icon > i.icon-wind:before, .map-icon > i.icon-wind:after {
+    right: -8px !important;
+}
 i.icon-wind:hover:before {
     transform: rotate(720deg);
     transform-origin: 37.4% 40.2%;
@@ -377,12 +390,12 @@ i.icon-wind:hover:before {
 
 @font-face {
   font-family: 'seita-webfont';
-  src: url('../font/seita-webfont.eot?93228496');
-  src: url('../font/seita-webfont.eot?93228496#iefix') format('embedded-opentype'),
-       url('../font/seita-webfont.woff2?93228496') format('woff2'),
-       url('../font/seita-webfont.woff?93228496') format('woff'),
-       url('../font/seita-webfont.ttf?93228496') format('truetype'),
-       url('../font/seita-webfont.svg?93228496#seita-webfont') format('svg');
+  src: url('../font/seita-webfont.eot?7470033');
+  src: url('../font/seita-webfont.eot?7470033#iefix') format('embedded-opentype'),
+       url('../font/seita-webfont.woff2?7470033') format('woff2'),
+       url('../font/seita-webfont.woff?7470033') format('woff'),
+       url('../font/seita-webfont.ttf?7470033') format('truetype'),
+       url('../font/seita-webfont.svg?7470033#seita-webfont') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -392,7 +405,7 @@ i.icon-wind:hover:before {
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'seita-webfont';
-    src: url('../font/seita-webfont.svg?93228496#seita-webfont') format('svg');
+    src: url('../font/seita-webfont.svg?7470033#seita-webfont') format('svg');
   }
 }
 */
@@ -401,7 +414,7 @@ i.icon-wind:hover:before {
   font-family: "seita-webfont";
   font-style: normal;
   font-weight: normal;
-  speak: none;
+  speak: never;
 
   display: inline-block;
   text-decoration: inherit;
@@ -452,6 +465,7 @@ i.icon-wind:hover:before {
 .icon-seita:before { content: '\e80d'; } /* '' */
 .icon-wind-blades:before { content: '\e80e'; } /* '' */
 .icon-wind-tower:before { content: '\e80f'; } /* '' */
+.icon-empty-marker:before { content: '\e810'; } /* '' */
 
 .icon-batteries:before { content: '\e801'; } /* '' */
 .icon-buildings:before { content: '\e803'; } /* '' */
diff --git a/flexmeasures/ui/static/font/seita-webfont.eot b/flexmeasures/ui/static/font/seita-webfont.eot
index c85aa94ca9792b4d4b23fb55e772226013ad9a12..9fa03a85b42fe50baaaeddddbd2663b86b3cbc87 100644
GIT binary patch
delta 520
zcmbQ@wZNNofhq&TlZmY6EG$bG=1+8(SMR0Gz`)qUz`zieoSRtia_YWc3=B*<Kpc>s
zQ<=8#>GVPd29_lZ3^Fbmsfj5vp8K~0)jj}XvkagB`*jv&AbSrGt7PPsRCp}={~c)F
z6CmFsCqFsS&dqWQP=5`Oua=uwQNS3)JQFA{0pu&>CFZ8?kiMk25XgSPz`)E|kY8M~
z{HxJv1_tFXKn3q6S1>B83NbJO*+87Xa4AbXzs*+$Zf2lr28KH!cHA&}@&QIkMxn{K
z7z-IWC;Kp2vmSWC@Iqj64^zbC2TbCcC15ic81fjH!7Lph%>^{Hgn@;@31|ij5CUxg
z>QG=dWE9*Sz|70Yc?V=T5C~3AV>!h2LI5NW=4!C2u<$7{Fl_c=y(?W0)b~G=IgUAq
zK@Mo55<43^o2ZDm7z7%bn?azdiMpD)8snFw&>#atV@(eedvy^m87>iZdlL^$V?%?W
zQ05>InG{+ao8#xNFUHL+rtj~U6I%=v0%`#{M2O)Y)E^8Cra(R@To@)hC|+YSGMp@-
sbb{H4!Ep0qr6NXPNQ9{<F)<2Hu27jN$dj5|P*SOzn^=^cS_IMp0JPM2J^%m!

delta 370
zcmZ4BJ;jSvM3sRdVj`<K%j>NZt0y|ltM^>Pz`)qUz`zieoSRtiYW3S(1_mY#Aa+X6
zsZ4wC<e106z%qe>LHbTcYGR6r+g4+s+6O>vmH`xCzs{lrWbXlDm5khy3YUHVzXQ#C
z0_3~o<R>Q@s90_R>dyhm=O$JZFa|Qu1j<VQ`3iZ7xvATwFKMg<vVjViIScZOOWw^0
z+sVM7Tme*Ye{uz*vZ^2hBajWm)f2bAj_0@e%D~P10w}_8BWTA-7(Mv_qa>r?<Xen|
zjNFrbn5<bHUNF4ipWMR~G5H0Pux1h13<icA24*lz2S{@P4J~3|VQ>JN!2*Op8-O}g
zm<@qS*d`}3|CwCC%+AjPvVq|Om}FoOn4H6MXtD*X%H{;tyV8@FD!yehw46Le=>)SO
YgXQLU<swF)BQB{ZP5!1blNqQ70IDxv8~^|S

diff --git a/flexmeasures/ui/static/font/seita-webfont.svg b/flexmeasures/ui/static/font/seita-webfont.svg
index 0fa11412a..29431c076 100644
--- a/flexmeasures/ui/static/font/seita-webfont.svg
+++ b/flexmeasures/ui/static/font/seita-webfont.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2019 by original authors @ fontello.com</metadata>
+<metadata>Copyright (C) 2021 by original authors @ fontello.com</metadata>
 <defs>
 <font id="seita-webfont" horiz-adv-x="1000" >
 <font-face font-family="seita-webfont" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
@@ -37,6 +37,8 @@
 <glyph glyph-name="wind-blades" unicode="&#xe80e;" d="M416 395c48-34 197-127 335-115l0 1c-85 110-253 156-311 169 0-2 0-4 0-6 0-20-9-38-24-49z m0 0m-75 1c-17 13-25 35-22 56-58-11-229-50-318-156l0-1c138-17 290 70 340 101z m0 0m38 109c11 0 21-3 30-8 11 58 37 231-29 353l-2 0c-66-122-40-295-29-353 9 5 20 8 30 8z m0 0" horiz-adv-x="1000" />
 
 <glyph glyph-name="wind-tower" unicode="&#xe80f;" d="M306-78l147 0-55 485c20 10 28 35 18 55-10 21-35 29-55 19-20-11-28-36-18-56 4-8 10-14 18-18z m0 0m-9-73l164 0-5 45-154 0z m0 0" horiz-adv-x="1000" />
+
+<glyph glyph-name="empty-marker" unicode="&#xe810;" d="M500 850c-200 0-362-162-362-362 0-248 324-612 338-627 13-15 35-15 48 0 14 15 338 379 338 627 0 200-162 362-362 362z" horiz-adv-x="1000" />
 </font>
 </defs>
 </svg>
\ No newline at end of file
diff --git a/flexmeasures/ui/static/font/seita-webfont.ttf b/flexmeasures/ui/static/font/seita-webfont.ttf
index b8b514e4e14e90894474a0561d1b8fd0f1592394..71562bf7e3cfe7be07acb0bb369da8cbe9bbc2bc 100644
GIT binary patch
delta 512
zcmccN@x*h2QoWZp0|R3Z0|P@?a&BV5%c=W*F)%Rc0C7NiPG#D{r_&1=7+97tFvz%M
zq$Z}wc<$d0RQmvk%`$)j?AKY8f$Tj%tdfyiQsJ@e|97ByPk?-noc!cOJ2%TMK>am9
zzFKZ#MFC?F^Gu+;1dy+gmzbNnL;8~9LLmDE0|PT>L4I+`@~=jx85oqm02REOxJTJu
zh=CEv1mgUKOIhOiZN4&aGXoVfFx&~T<A%}y|Nc*BX=M%t@;MloK%zhZ(kC=oj<JxD
zbMgd6Yt{oV7+wfWzQ7nUS%pblvji;9z>vql3})#7X)d6q5(X9qC!kIiAOxBK)RDqu
z$SMewVVk^=>DS~9Oq~2YAmbVCfJp`h!O5$b4{^N^04W9v2~N&oQDNazVqn-jf#t4r
z8qkpcnapv_K@4(0LzLLr*x5uy#Kj=c$lMG9O-<C*)YTZjB!vbU7#eGOnAod}aLI6q
zsN0)(Xc`+D1cfpOfykuL;@BKNe|<4-ZZUm-zns`&pb${Y<ZOlaOh$&2V-!y?8!;Ge
nR#z%wWE7e_OIeADQF!tm<(Yy!sksFumAbi!McJuEAg2QWJ(zg8

delta 388
zcmaFjdBbCZQoZLI1_s6+1_p+(<lMx9SF7LVGB7Y{0I^egPG#DAC&xSn29^m74AOTp
zQWH}|+_oA6)jj}XvkagB`*jv2AbSrGt7PPsRJiQ>{~c)F6CmFuCqFsSK*e$kP=5|c
zJ~y$VfH9DHCQx1i$XCcq%uU@ceMw^_kPTG8%vq3MT=H&4*iHrp<qDvJ`xEyl+Y2%<
z0+~QuJ#p*ncz&C&4BX5wfFcYxf_9vQ(f|McPiJXm4h8Z#7??n!KmgJwI9ZOdkdb@x
z1V(FChZhVl_$OarjIaSpumUkN5bFRj3s7wlSUCej4p0=NQ3ptKfyG%E9KdQ=K;l3H
zGMEg3O4t@JWMUKoO7H+N1H%O{$-p2mc?0vI$u%r0o0qWMm7e@k;VqM)<>VWRCzuTx
XEH^J!Dq>_5oGhlIG}%gJCdhgK`O#ZA

diff --git a/flexmeasures/ui/static/font/seita-webfont.woff b/flexmeasures/ui/static/font/seita-webfont.woff
index 2a78964a715f6693af7015cabc627960c6842b6d..f38b016eae167d895152ee7544ec882b92e31cd4 100644
GIT binary patch
delta 5811
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

delta 5760
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

diff --git a/flexmeasures/ui/static/font/seita-webfont.woff2 b/flexmeasures/ui/static/font/seita-webfont.woff2
index 94867702b60f308c3dc5f9d9a4e09ebb2b12a576..b637d9570f9cc8228c701320654f57faac97f802 100644
GIT binary patch
literal 4952
zcmV-e6Q}HVPew8T0RR91025dM3jhEB03_r9022rR0RR9100000000000000000000
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
Whzk0(54PlVzBHU22X+Af6$b`OYj2+b

literal 4872
zcmV+j6Zh<QPew8T0RR91022rR3jhEB03=ud01~(W0RR9100000000000000000000
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

diff --git a/flexmeasures/ui/templates/views/dashboard.html b/flexmeasures/ui/templates/views/dashboard.html
index 81944e2f3..7fe0ca043 100644
--- a/flexmeasures/ui/templates/views/dashboard.html
+++ b/flexmeasures/ui/templates/views/dashboard.html
@@ -171,10 +171,10 @@ <h3>
 
     var {{ asset_groups[asset_group].parameterized_name }}_icon = new L.DivIcon({
         className: 'map-icon',
-        html: '<i class="{{ asset_groups[asset_group].unique_asset_types[0].name | asset_icon }}"></i>',
-        iconSize: [24, 24], // size of the icon
-        iconAnchor: [12, 12], // point of the icon which will correspond to marker's location
-        popupAnchor: [0, -12] // point from which the popup should open relative to the iconAnchor
+        html: '<i class="icon-empty-marker center-icon supersize"></i><i class="overlay center-icon {{ asset_groups[asset_group].unique_asset_types[0].name | asset_icon }}"></i>',
+        iconSize: [100, 100], // size of the icon
+        iconAnchor: [50, 50], // point of the icon which will correspond to marker's location
+        popupAnchor: [0, -50] // point from which the popup should open relative to the iconAnchor
     });
 
     var {{ asset_groups[asset_group].parameterized_name }}_opportunity_icon = new L.DivIcon({

From 61f3c7665138185037c9c0d01299562fc5392a6d Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Fri, 19 Feb 2021 11:09:52 +0100
Subject: [PATCH 3/5] Pan on click such that the asset lies just below map
 center.

---
 flexmeasures/ui/static/js/map-init.js          | 9 +++++++--
 flexmeasures/ui/templates/views/dashboard.html | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/flexmeasures/ui/static/js/map-init.js b/flexmeasures/ui/static/js/map-init.js
index 4d8552409..a7c836855 100644
--- a/flexmeasures/ui/static/js/map-init.js
+++ b/flexmeasures/ui/static/js/map-init.js
@@ -16,6 +16,11 @@ function addTileLayer(leafletMap, mapboxAccessToken) {
 }
 
 
-function clickZoom(e) {
-    assetMap.setView(e.target.getLatLng());
+function clickPan(e, data) {
+    // set view such that the target asset lies slightly below the center of the map
+    targetLatLng = e.target.getLatLng()
+    targetZoom = assetMap.getZoom()
+    targetPoint = assetMap.project(targetLatLng, targetZoom).subtract([0, 50]),
+    targetLatLng = assetMap.unproject(targetPoint, targetZoom);
+    assetMap.setView(targetLatLng, targetZoom);
 }
diff --git a/flexmeasures/ui/templates/views/dashboard.html b/flexmeasures/ui/templates/views/dashboard.html
index 7fe0ca043..06ea75467 100644
--- a/flexmeasures/ui/templates/views/dashboard.html
+++ b/flexmeasures/ui/templates/views/dashboard.html
@@ -255,7 +255,7 @@ <h4>{{ asset.display_name }}</h4>
             permanent: false,
             direction: 'right'
         })
-        .on('click', clickZoom)
+        .on('click', clickPan)
         .on('click', lookForState);
     // .openPopup();
     {{ asset_groups[asset_group].parameterized_name }}_markers.push(marker_for_{{ (asset.name | parameterize) }});

From 61686aa168d0425e28889b924ae9171dd0452276 Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Fri, 19 Feb 2021 11:19:09 +0100
Subject: [PATCH 4/5] Fix icon alignment on map markers.

---
 flexmeasures/ui/static/css/flexmeasures.css | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/flexmeasures/ui/static/css/flexmeasures.css b/flexmeasures/ui/static/css/flexmeasures.css
index 9007dde01..1f8677512 100644
--- a/flexmeasures/ui/static/css/flexmeasures.css
+++ b/flexmeasures/ui/static/css/flexmeasures.css
@@ -327,12 +327,12 @@ i.center-icon:after, i.center-icon:before {
 .map-icon > i.overlay:before, .map-icon > i.overlay:after {
     font-size: 20px;
     z-index: 9;
-    right: -5px;
+    right: -13px;
     top: -40px;
 }
 .map-icon > i:before, .map-icon > i:after {
     position: absolute;
-    right: -25px;
+    right: -33px;
     top: -50px;
 }
 .map-icon.opportunity {
@@ -346,11 +346,21 @@ i.center-icon:after, i.center-icon:before {
     opacity: 0.7;
 }
 
-
-/* rotating icons, because why not? */
+/* map icon alignment */
 .map-icon > i.icon-wind:before, .map-icon > i.icon-wind:after {
-    right: -8px !important;
+    right: -16px !important;
+}
+.map-icon > i.icon-solar:before, .map-icon > i.icon-solar:after {
+    right: -14.5px !important;
+}
+.map-icon > i.icon-charging_station:before, .map-icon > i.icon-solar:after {
+    right: -15.5px !important;
 }
+.map-icon > i.icon-building:before, .map-icon > i.icon-solar:after {
+    right: -13px !important;
+}
+
+/* rotating icons, because why not? */
 i.icon-wind:hover:before {
     transform: rotate(720deg);
     transform-origin: 37.4% 40.2%;

From a856db53434e744cdf073effbe85d38bc0e16979 Mon Sep 17 00:00:00 2001
From: "F.N. Claessen" <felix@seita.nl>
Date: Mon, 22 Feb 2021 15:02:23 +0100
Subject: [PATCH 5/5] Use new marker in asset.html

---
 flexmeasures/ui/templates/crud/asset.html     | 8 ++++----
 flexmeasures/ui/templates/crud/asset_new.html | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flexmeasures/ui/templates/crud/asset.html b/flexmeasures/ui/templates/crud/asset.html
index a4d7be970..3e461fd16 100644
--- a/flexmeasures/ui/templates/crud/asset.html
+++ b/flexmeasures/ui/templates/crud/asset.html
@@ -209,10 +209,10 @@ <h3>Location</h3>
     // create marker
     var {{ asset.asset_type_name | parameterize }}_icon = new L.DivIcon({
         className: 'map-icon',
-        html: '<i class="{{ asset.asset_type_name | asset_icon }}"></i>',
-        iconSize: [24, 24], // size of the icon
-        iconAnchor: [12, 12], // point of the icon which will correspond to marker's location
-        popupAnchor: [0, -12] // point from which the popup should open relative to the iconAnchor
+        html: '<i class="icon-empty-marker center-icon supersize"></i><i class="overlay center-icon {{ asset.asset_type_name | asset_icon }}"></i>',
+        iconSize: [100, 100], // size of the icon
+        iconAnchor: [50, 50], // point of the icon which will correspond to marker's location
+        popupAnchor: [0, -50] // point from which the popup should open relative to the iconAnchor
     });
     var marker = L
         .marker(
diff --git a/flexmeasures/ui/templates/crud/asset_new.html b/flexmeasures/ui/templates/crud/asset_new.html
index 74b455c96..4cc1b6d5b 100644
--- a/flexmeasures/ui/templates/crud/asset_new.html
+++ b/flexmeasures/ui/templates/crud/asset_new.html
@@ -178,10 +178,10 @@ <h3>Location</h3>
 
     var location_icon = new L.DivIcon({
         className: 'map-icon',
-        html: '<i class="icon-attribution"></i>',
-        iconSize: [24, 24], // size of the icon
-        iconAnchor: [12, 12], // point of the icon which will correspond to marker's location
-        popupAnchor: [0, -12] // point from which the popup should open relative to the iconAnchor
+        html: '<i class="icon-empty-marker center-icon supersize"></i>',
+        iconSize: [100, 100], // size of the icon
+        iconAnchor: [50, 50], // point of the icon which will correspond to marker's location
+        popupAnchor: [0, -50] // point from which the popup should open relative to the iconAnchor
     });
 
     // dummy location somewhere else