Skip to content
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.

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

Update to Leaflet 1.0.1 #169

Merged
merged 4 commits into from
Jan 27, 2017
Merged

Update to Leaflet 1.0.1 #169

merged 4 commits into from
Jan 27, 2017

Conversation

sikmir
Copy link
Contributor

@sikmir sikmir commented Oct 17, 2016

Issue #166.

@leplatrem
Copy link
Collaborator

Leaflet draw might have to be updated as well no? (0.4 for 1.0 comptability)

@sikmir
Copy link
Contributor Author

sikmir commented Oct 18, 2016

Proj4Leaflet is not 1.0 compatible yet:

For compatibility with Leaflet 1.0-beta1 use the leaflet-proj-refactor branch.

@hairychris
Copy link

kartena/Proj4Leaflet#126

Probably worth waiting for things to be resolved over there before creating a new release here.

@sikmir
Copy link
Contributor Author

sikmir commented Jan 26, 2017

Proj4Leaflet 1.0.0 is out.

@leplatrem
Copy link
Collaborator

Can someone please try out and approve the changes of this branch?

@leplatrem
Copy link
Collaborator

You know what. I'll merge, 'cause I'm feeling lucky :)

@leplatrem leplatrem merged commit 2c17b8c into makinacorpus:master Jan 27, 2017
@sikmir
Copy link
Contributor Author

sikmir commented Jan 27, 2017

I have not tested it carefully yet, so it'd be worth if someone would try it out.

@leplatrem
Copy link
Collaborator

I released version 0.20 with the upgrade. Issues will be opened if there are bugs... «Release early» they say :)

@thrownblown
Copy link

i'm getting a bunch of bugs with leafletforms.js and leaflet.draw.js regarding mulitpolygons that i didn;t have with version 0.7 (eg these templates used to work.....):

original error regarding multipolygon:

image

i hacked that with L.multiPolygon = L.polygon which led me to this issue with leaflet.draw.js and some featureGroup inheritance bananas:

image

@leplatrem
Copy link
Collaborator

I'm not surprised that bugs were introduced. Don't hesitate to open a pull-request with some fixes, we'll release.

We're looking for maintainers! ...currently overlooking patches, merging and releasing is the only thing I can do, at a very low frequency

@thrownblown
Copy link

it has something to do with the widget (obviously). there seems to be some incompatibility with the L.GeometryField class and leaflet 1.0. is this a dependency that needs to be updated too?

I've dug back to here:

https://github.com/makinacorpus/django-leaflet/blob/master/leaflet/templates/leaflet/widget.html#L20

that's the line in the widget template, and here's how its rendering:

<script type="text/javascript">
    var geodjango_id_zone_polygon = {};
    geodjango_id_zone_polygon.fieldid = 'id_zone_polygon';
    geodjango_id_zone_polygon.modifiable = true;
    geodjango_id_zone_polygon.geom_type = 'MultiPolygon';
    geodjango_id_zone_polygon.srid = 4326;
    
    function id_zone_polygon_map_callback(map, options) {
        geodjango_id_zone_polygon.store_class = L.FieldStore;
        (new L.GeometryField(geodjango_id_zone_polygon)).addTo(map);
        
    };
</script>

I haven't dug through too much of the nuts and bolts of django-leaflet since it always worked so well! when I get it fixed i'll make pr

@sikmir sikmir deleted the leaflet-1.0.1 branch July 20, 2017 20:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants