feat: add style & onEachFeature function for geojson in geolocation controller #21322
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
b852fcc to
30441d2
Compare
|
works blissfully in tandem with #21419 : setup(frm) {
df = frm.get_docfield("map");
df["fieldtype"] = "GeolocationVRP";
frm.layout.replace_field("map", df);
},
refresh(frm) {
fld = frm.fields_dict["map"];
fld.refresh(); // not sure why necessary, may be rather a bug in ControlGeolocation
}And a custom controller: frappe.ui.form.ControlGeolocationVRP = class ControlGeolocationVRP extends (
frappe.ui.form.ControlGeolocation
) {
point_to_layer(geoJsonPoint, latlng) {
// Custom rules for how geojson data is rendered on the map
if (geoJsonPoint.properties.point_type == "circle") {
return L.circle(latlng, { radius: geoJsonPoint.properties.radius });
} else if (geoJsonPoint.properties.point_type == "circlemarker") {
return L.circleMarker(latlng, {
radius: geoJsonPoint.properties.radius,
});
} else {
// return L.marker(latlng);
const homeIcon = L.divIcon({ className: "fa fa-home --blue" });
return L.marker(latlng, { icon: homeIcon });
}
}
setStyle(geoJsonFeature) {
if (geoJsonFeature.geometry.type === "LineString") {
return {
color: geoJsonFeature.properties.stroke,
weight: geoJsonFeature.properties["stroke-width"],
};
}
return {};
}
}; |
30441d2 to
411bbf7
Compare
Merged
This no-op function can be overriden / inherited in custom controllers to craft richer map experiences
411bbf7 to
c821554
Compare
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #21322 +/- ##
===========================================
+ Coverage 63.88% 63.91% +0.03%
===========================================
Files 765 765
Lines 69364 69368 +4
Branches 6274 6276 +2
===========================================
+ Hits 44314 44339 +25
- Misses 21444 21478 +34
+ Partials 3606 3551 -55
Flags with carried forward coverage won't be shown. Click here to find out more. |
|
looks fine to me from a glance. ref: https://leafletjs.com/examples/geojson/ |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This no-op function can be overriden / inherited in custom controllers
to craft richer map experiences
Motivation: https://discuss.frappe.io/t/vrp-vehicle-routing-problem-chatgpt-augmented/105143