Skip to content

Support radius property #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jindraivanek merged 1 commit into from
Jan 17, 2026
Merged

Support radius property #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions src/Client/Client.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ type PropertyDef =
| VectorProperty of CircleProps

let grey = "#848484"
let propertiesDef = Map.ofSeq [
"edgeColorGrey", EdgeProperty (PolylineProps.Color grey)
"nodeColorGrey", VectorProperty (CircleProps.Color grey)
]
let mkProperties = List.choose (fun (s: string) -> s.Split '=' |> Array.toList |> function
| ["edgeColorGrey"; ""] -> EdgeProperty (PolylineProps.Color grey) |> Some
| ["nodeColorGrey"; ""] -> VectorProperty (CircleProps.Color grey) |> Some
| ["radius"; r] -> VectorProperty (CircleProps.Radius (float r)) |> Some
| _ -> None)


let nl = System.Environment.NewLine
let tryInt (s: string) = let (r,x) = System.Int32.TryParse s in if r then Some x else None
Expand Down Expand Up @@ -268,17 +270,18 @@ let view model dispatch =
|> Seq.map (fun x ->
let extraProps =
x.Properties
|> List.choose (fun p -> Map.tryFind p propertiesDef)
|> mkProperties
|> List.choose (function | VectorProperty p -> Some p | _ -> None)
ReactLeaflet.circle ([
ReactLeaflet.circle (extraProps @ [
CircleProps.Custom ("center", (!^ (x.Longitude, x.Latitude):Leaflet.LatLngExpression))
CircleProps.Radius (zoomDynSize (onScaleSqrt 200. 800. (getNumberOfLinesFactor x)))
if extraProps |> Seq.exists (function | CircleProps.Radius _ -> true | _ -> false) |> not then
CircleProps.Radius (zoomDynSize (onScaleSqrt 200. 800. (getNumberOfLinesFactor x)))
CircleProps.Color (getColor x.Weight)
CircleProps.Opacity (opacity x)
// MarkerProps.Title x.Title
//CircleProps.OnMouseOver (fun _ -> printfn "hover %s" x.Title)
//CircleProps.OnMouseOut (fun _ -> printfn "hover off %s" x.Title)
] @ extraProps) [ ReactLeaflet.popup [] [getTitle x.Title]; ReactLeaflet.tooltip [TooltipProps.Sticky true] [getTitle x.Title] ]
]) [ ReactLeaflet.popup [] [getTitle x.Title]; ReactLeaflet.tooltip [TooltipProps.Sticky true] [getTitle x.Title] ]
)
let edges =
let opacity (x,y) = (opacity x + opacity y) / 2.
Expand All @@ -288,7 +291,7 @@ let view model dispatch =
let opacity = PolylineProps.Opacity (opacity (x,y))
let extraProps =
x.Properties @ y.Properties
|> List.choose (fun p -> Map.tryFind p propertiesDef)
|> mkProperties
|> List.choose (function | EdgeProperty p -> Some p | _ -> None)
let line =
ReactLeaflet.polyline ([
Expand Down Expand Up @@ -359,7 +362,7 @@ let view model dispatch =
let loadDataView() =
Columns.columns [] [
Column.column [] [
str "Data format (delimeter TAB): location | GPS(lat,lng) | year | name | note | type"
str "Data format (delimeter TAB): location | GPS(lat,lng) | year | name | note | type | properties"
textarea [
DefaultValue model.RawData
OnChange (fun ev -> (!!ev.target?value) |> SetRawData |> dispatch)
Expand Down
2 changes: 1 addition & 1 deletion src/Client/Data.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module MarkersData
let data = "Jarov 49.946944, 14.0675 1882 Vojtěch Skopový narození
let data = "Jarov 49.946944, 14.0675 1882 Vojtěch Skopový narození radius=1000
Vosůvek 49.85, 14.091389 1841 Vojtěch Skopový narození edgeColorGrey
Vosov 49.85, 14.083333 1841 Vojtěch Skopový o
Vosůvek 49.85, 14.091389 1817 Josef Skopový narození
Expand Down