phillip/ingress-intel-total-conversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

convert polyline/polugon to geodesic

Browse Source
This commit is contained in:
Jon Atkins 2013-09-24 08:00:19 +01:00
parent 8d42cdea00
commit db918ad365
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
external/leaflet.draw.js vendored
View File

@ -179,7 +179,7 @@ L.Draw.Polyline = L.Draw.Feature.extend({
TYPE: 'polyline' TYPE: 'polyline'
}, },
Poly: L.Polyline, Poly: L.GeodesicPolyline,
options: { options: {
allowIntersection: true, allowIntersection: true,
@ -228,7 +228,7 @@ L.Draw.Polyline = L.Draw.Feature.extend({
this._markerGroup = new L.LayerGroup(); this._markerGroup = new L.LayerGroup();
this._map.addLayer(this._markerGroup); this._map.addLayer(this._markerGroup);
this._poly = new L.Polyline([], this.options.shapeOptions); this._poly = new L.GeodesicPolyline([], this.options.shapeOptions);
this._tooltip.updateContent(this._getTooltipText()); this._tooltip.updateContent(this._getTooltipText());
@ -564,7 +564,7 @@ L.Draw.Polygon = L.Draw.Polyline.extend({
TYPE: 'polygon' TYPE: 'polygon'
}, },
Poly: L.Polygon, Poly: L.GeodesicPolygon,
options: { options: {
showArea: false, showArea: false,
@ -997,7 +997,7 @@ L.Edit.Poly = L.Handler.extend({
} }
this._markers = []; this._markers = [];
var latlngs = this._poly._latlngs, var latlngs = this._poly.getLatLngs(),
i, j, len, marker; i, j, len, marker;
// TODO refactor holes implementation in Polygon to support it here // TODO refactor holes implementation in Polygon to support it here
@ -1012,7 +1012,7 @@ L.Edit.Poly = L.Handler.extend({
var markerLeft, markerRight; var markerLeft, markerRight;
for (i = 0, j = len - 1; i < len; j = i++) { for (i = 0, j = len - 1; i < len; j = i++) {
if (i === 0 && !(L.Polygon && (this._poly instanceof L.Polygon))) { if (i === 0 && !(L.GeodesicPolygon && (this._poly instanceof L.GeodesicPolygon))) {
continue; continue;
} }
@ -1077,7 +1077,7 @@ L.Edit.Poly = L.Handler.extend({
_onMarkerClick: function (e) { _onMarkerClick: function (e) {
// we want to remove the marker on click, but if latlng count < 3, polyline would be invalid // we want to remove the marker on click, but if latlng count < 3, polyline would be invalid
if (this._poly._latlngs.length < 3) { return; } if (this._poly.getLatLngs().length < 3) { return; }
var marker = e.target; var marker = e.target;
@ -2425,7 +2425,7 @@ L.EditToolbar.Edit = L.Handler.extend({
if (!this._uneditedLayerProps[id]) { if (!this._uneditedLayerProps[id]) {
// Polyline, Polygon or Rectangle // Polyline, Polygon or Rectangle
if (layer instanceof L.Polyline || layer instanceof L.Polygon || layer instanceof L.Rectangle) { if (layer instanceof L.GeodesicPolyline || layer instanceof L.GeodesicPolygon || layer instanceof L.Rectangle) {
this._uneditedLayerProps[id] = { this._uneditedLayerProps[id] = {
latlngs: L.LatLngUtil.cloneLatLngs(layer.getLatLngs()) latlngs: L.LatLngUtil.cloneLatLngs(layer.getLatLngs())
}; };
@ -2447,7 +2447,7 @@ L.EditToolbar.Edit = L.Handler.extend({
layer.edited = false; layer.edited = false;
if (this._uneditedLayerProps.hasOwnProperty(id)) { if (this._uneditedLayerProps.hasOwnProperty(id)) {
// Polyline, Polygon or Rectangle // Polyline, Polygon or Rectangle
if (layer instanceof L.Polyline || layer instanceof L.Polygon || layer instanceof L.Rectangle) { if (layer instanceof L.GeodesicPolyline || layer instanceof L.GeodesicPolygon || layer instanceof L.Rectangle) {
layer.setLatLngs(this._uneditedLayerProps[id].latlngs); layer.setLatLngs(this._uneditedLayerProps[id].latlngs);
} else if (layer instanceof L.Circle) { } else if (layer instanceof L.Circle) {
layer.setLatLng(this._uneditedLayerProps[id].latlng); layer.setLatLng(this._uneditedLayerProps[id].latlng);
@ -2514,7 +2514,7 @@ L.EditToolbar.Edit = L.Handler.extend({
layer.options.previousOptions = layer.options; layer.options.previousOptions = layer.options;
// Make sure that Polylines are not filled // Make sure that Polylines are not filled
if (!(layer instanceof L.Circle) && !(layer instanceof L.Polygon) && !(layer instanceof L.Rectangle)) { if (!(layer instanceof L.Circle) && !(layer instanceof L.GeodesicPolygon) && !(layer instanceof L.Rectangle)) {
pathOptions.fill = false; pathOptions.fill = false;
} }
@ -2678,4 +2678,4 @@ L.EditToolbar.Delete = L.Handler.extend({
}); });
}(this, document)); }(this, document));