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.

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

Increase GeoJSON precision #306

Merged
merged 1 commit into from
Jun 22, 2018
Merged

Increase GeoJSON precision #306

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
4 changes: 2 additions & 2 deletions src/js/Draw/L.PM.Draw.Cut.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Draw.Cut = Draw.Poly.extend({
// only layers with intersections
.filter((l) => {
try {
return !!intersect(layer.toGeoJSON(), l.toGeoJSON());
return !!intersect(layer.toGeoJSON(15), l.toGeoJSON(15));
} catch (e) {
console.error('You cant cut polygons with self-intersections');
return false;
Expand All @@ -37,7 +37,7 @@ Draw.Cut = Draw.Poly.extend({
// the resulting layers after the cut
const resultingLayers = [];
// find layer difference
const diff = difference(l.toGeoJSON(), layer.toGeoJSON());
const diff = difference(l.toGeoJSON(15), layer.toGeoJSON(15));

// add new layer to map
const newL = L.geoJSON(diff, l.options).addTo(this._map);
Expand Down
4 changes: 2 additions & 2 deletions src/js/Draw/L.PM.Draw.Line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ Draw.Line = Draw.extend({
},
hasSelfIntersection() {
// check for self intersection of the layer and return true/false
const selfIntersection = kinks(this._layer.toGeoJSON());
const selfIntersection = kinks(this._layer.toGeoJSON(15));
return selfIntersection.features.length > 0;
},
_syncHintLine() {
Expand Down Expand Up @@ -177,7 +177,7 @@ Draw.Line = Draw.extend({
clone.addLatLng(this._hintMarker.getLatLng());

// check the self intersection
const selfIntersection = kinks(clone.toGeoJSON());
const selfIntersection = kinks(clone.toGeoJSON(15));
this._doesSelfIntersect = selfIntersection.features.length > 0;

// change the style based on self intersection
Expand Down
4 changes: 2 additions & 2 deletions src/js/Edit/L.PM.Edit.Line.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Edit.Line = Edit.extend({

hasSelfIntersection() {
// check for self intersection of the layer and return true/false
const selfIntersection = kinks(this._layer.toGeoJSON());
const selfIntersection = kinks(this._layer.toGeoJSON(15));
return selfIntersection.features.length > 0;
},

Expand Down Expand Up @@ -151,7 +151,7 @@ Edit.Line = Edit.extend({

// fire intersect event
this._layer.fire('pm:intersect', {
intersection: kinks(this._layer.toGeoJSON()),
intersection: kinks(this._layer.toGeoJSON(15)),
});
} else {
// if not, reset the style to the default color
Expand Down
6 changes: 3 additions & 3 deletions src/js/Mixins/Overlap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var OverlapMixin = {
const mainPoly = this._poly;
const layers = this._layerGroup.getLayers();
let changed = false;
let resultingGeoJson = this._poly.toGeoJSON();
let resultingGeoJson = this._poly.toGeoJSON(15);

layers
.filter(layer => !Object.is(layer, mainPoly))
Expand All @@ -44,13 +44,13 @@ var OverlapMixin = {
// this needs to be in a try catch block because turf isn't reliable
// it throws self-intersection errors even if there are none
try {
intersect = turf.intersect(resultingGeoJson, layer.toGeoJSON());
intersect = turf.intersect(resultingGeoJson, layer.toGeoJSON(15));
} catch(e) {
console.warn('Turf Error.');
}

if(intersect) {
resultingGeoJson = turf.difference(resultingGeoJson, layer.toGeoJSON());
resultingGeoJson = turf.difference(resultingGeoJson, layer.toGeoJSON(15));

// if the resulting polygon is a MultiPolygon, don't handle it.
if(resultingGeoJson.geometry.type !== 'MultiPolygon') {
Expand Down