Skip to content

Commit

Permalink
Try using leaflet-ellipse to draw the circles, #486.
Browse files Browse the repository at this point in the history
  • Loading branch information
philderbeast committed Nov 24, 2020
1 parent d6e4e5d commit 869d645
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lang-haskell/app-view/comp-view/FlareTiming/Map/Leaflet.hs
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ foreign import javascript unsafe
markerPopup_ :: JSVal -> JSString -> IO ()

foreign import javascript unsafe
"L['circle']([$1, $2], {radius: $3, color: $4, opacity: 0.6, weight: 1, stroke: $5, fill: $6})"
"L['ellipse']([$1, $2], [$3, $3], 90, {color: $4, opacity: 0.6, weight: 1, stroke: $5, fill: $6})"
circle_ :: Double -> Double -> Double -> JSString -> Bool -> Bool -> IO JSVal

foreign import javascript unsafe
Expand Down
1 change: 1 addition & 0 deletions lang-haskell/app-view/comp-view/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import './site.sass'
import L from 'leaflet'
import 'leaflet-defaulticon-compatibility'
import 'leaflet-semicircle'
import 'leaflet-ellipse'
import 'leaflet-draw'
import 'leaflet.measurecontrol'
import 'leaflet-geometryutil'
1 change: 1 addition & 0 deletions lang-haskell/app-view/comp-view/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"leaflet": "1.6.0",
"leaflet-defaulticon-compatibility": "^0.1.1",
"leaflet-draw": "^1.0.4",
"leaflet-ellipse": "^0.9.1",
"leaflet-geometryutil": "^0.9.3",
"leaflet-semicircle": "2.0.4",
"leaflet.measurecontrol": "^1.1.0"
Expand Down
5 changes: 5 additions & 0 deletions lang-haskell/app-view/comp-view/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2540,6 +2540,11 @@ leaflet-draw@^1.0.4:
resolved "https://registry.yarnpkg.com/leaflet-draw/-/leaflet-draw-1.0.4.tgz#45be92f378ed253e7202fdeda1fcc71885198d46"
integrity sha512-rsQ6saQO5ST5Aj6XRFylr5zvarWgzWnrg46zQ1MEOEIHsppdC/8hnN8qMoFvACsPvTioAuysya/TVtog15tyAQ==

leaflet-ellipse@^0.9.1:
version "0.9.1"
resolved "https://registry.yarnpkg.com/leaflet-ellipse/-/leaflet-ellipse-0.9.1.tgz#abef7447dd0cfc69fd1f3bec07f0e3d59a7ecfa2"
integrity sha512-WaTh+/7dwtn8h+WsUebxl2KS4diZ9Cpci5dBlzp92pSLNeWGLlmFz0/WTzeyVwxrYwojZHZvYfVmT2Xv9u5TCA==

leaflet-geometryutil@^0.9.3:
version "0.9.3"
resolved "https://registry.yarnpkg.com/leaflet-geometryutil/-/leaflet-geometryutil-0.9.3.tgz#e10fa302d99d4b1d3c6365a1f39298635a2704cd"
Expand Down

0 comments on commit 869d645

Please sign in to comment.