Skip to content

Commit 371945b

Browse files
author
matafokka
committed
Now Polygon Layer and Polyline Layer can load initial geometry from zipped shapefile or GeoJSON
Other minor changes in this commit: - Changed style in some locale entries. - Now polygon size limit by path's count is precalculated. - Reduced maximum number of paths in Polygon Layer to 50. - Once again reduced geodesic segments number to 500. I'm not sure what value to keep, gotta think about it.
1 parent 03a64e2 commit 371945b

12 files changed

+212
-84
lines changed

‎SynthGeometryBaseWizard.js

+139
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
const shp = require("shpjs");
2+
3+
L.ALS.SynthGeometryBaseWizard = L.ALS.Wizard.extend({
4+
5+
fileLabel: "geometryFileLabel",
6+
7+
initialize: function () {
8+
9+
L.ALS.Wizard.prototype.initialize.call(this);
10+
if (!window.FileReader) {
11+
this.addWidget(new L.ALS.Widgets.SimpleLabel("lbl", "geometryBrowserNotSupported", "center", "error"));
12+
return;
13+
}
14+
15+
this.addWidget(
16+
new L.ALS.Widgets.File("file", this.fileLabel)
17+
);
18+
},
19+
20+
statics: {
21+
/**
22+
* Callback to pass to {@link L.ALS.SynthGeometryBaseWizard.getGeoJSON}.
23+
*
24+
* @callback getGeoJSONCallback
25+
* @param {Object|"NoFileSelected"|"NoFeatures"|"InvalidFileType"} geoJson GeoJSON or an error message
26+
* @param {string|undefined} [fileName=undefined] Name of the loaded file
27+
*/
28+
29+
/**
30+
* Reads GeoJSON or ShapeFile and calls a callback with the content as GeoJSON and filename.
31+
*
32+
* If an error occurred, the first argument will be an error text, and filename will be `undefined`.
33+
*
34+
* @param wizardResults Wizard results
35+
* @param callback {getGeoJSONCallback}
36+
*/
37+
getGeoJSON: function (wizardResults, callback) {
38+
let file = wizardResults["file"][0],
39+
fileReader = new FileReader();
40+
41+
if (!file) {
42+
callback("NoFileSelected");
43+
return;
44+
}
45+
46+
// Try to read as shapefile
47+
fileReader.addEventListener("load", (event) => {
48+
shp(event.target.result).then((geoJson) => {
49+
if (geoJson.features.length === 0) {
50+
callback("NoFeatures");
51+
return;
52+
}
53+
54+
callback(geoJson, file.name);
55+
56+
}).catch((reason) => {
57+
console.log(reason);
58+
59+
// If reading as shapefile fails, try to read as GeoJSON.
60+
// We won't check bounds because we assume GeoJSON being in WGS84.
61+
let fileReader2 = new FileReader();
62+
fileReader2.addEventListener("load", (event) => {
63+
let json;
64+
65+
try {
66+
json = JSON.parse(event.target.result);
67+
} catch (e) {
68+
console.log(e);
69+
callback("InvalidFileType");
70+
return;
71+
}
72+
73+
callback(json, file.name);
74+
});
75+
fileReader2.readAsText(file);
76+
});
77+
});
78+
79+
try {fileReader.readAsArrayBuffer(file);}
80+
catch (e) {}
81+
},
82+
83+
/**
84+
* Adds initial shapefile or GeoJSON file to the {@link L.ALS.SynthPolygonLayer} or {@link L.ALS.SynthLineLayer} and updates layer parameters
85+
*
86+
* @param synthLayer {L.ALS.SynthPolygonLayer|L.ALS.SynthLineLayer} Pass `this` here
87+
* @param wizardResults Wizard results
88+
*/
89+
initializePolygonOrPolylineLayer: function (synthLayer, wizardResults) {
90+
let groupToAdd, layerType, CastTo,
91+
finishLoading = () => {
92+
synthLayer.calculateParameters();
93+
synthLayer.isAfterDeserialization = false;
94+
}
95+
96+
if (synthLayer instanceof L.ALS.SynthPolygonLayer) {
97+
groupToAdd = synthLayer.polygonGroup;
98+
layerType = L.Polygon;
99+
CastTo = L.Polygon;
100+
} else {
101+
groupToAdd = synthLayer.drawingGroup;
102+
layerType = L.Polyline;
103+
CastTo = L.Geodesic;
104+
}
105+
106+
this.getGeoJSON(wizardResults, geoJson => {
107+
switch (geoJson) {
108+
case "NoFileSelected":
109+
finishLoading();
110+
return;
111+
case "NoFeatures":
112+
window.alert(L.ALS.locale.geometryNoFeatures);
113+
finishLoading();
114+
return;
115+
case "InvalidFileType":
116+
window.alert(L.ALS.locale.geometryInvalidFile);
117+
finishLoading();
118+
return;
119+
}
120+
121+
let layersAdded = false;
122+
L.geoJson(geoJson, {
123+
onEachFeature: (feature, layer) => {
124+
if (!(layer instanceof layerType))
125+
return;
126+
127+
groupToAdd.addLayer(new CastTo(layer.getLatLngs()));
128+
layersAdded = true;
129+
}
130+
});
131+
132+
if (!layersAdded)
133+
window.alert(L.ALS.locale.initialFeaturesNoFeatures);
134+
135+
finishLoading();
136+
});
137+
}
138+
}
139+
})

‎SynthGeometryLayer/SynthGeometryLayer.js

+27-45
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
require("./SynthGeometryWizard.js");
22
require("./SynthGeometrySettings.js");
3-
const shp = require("shpjs");
43

54
/**
65
* Layer with geometry from shapefile or GeoJSON
@@ -25,52 +24,25 @@ L.ALS.SynthGeometryLayer = L.ALS.Layer.extend( /** @lends L.ALS.SynthGeometryLay
2524
return;
2625
}
2726

28-
let file = wizardResults["geometryFileLabel"][0], fileReader = new FileReader();
29-
30-
if (!file) {
31-
this._deleteInvalidLayer(L.ALS.locale.geometryNoFileSelected);
32-
return;
33-
}
34-
35-
this.setName(file.name);
36-
37-
// Try to read as shapefile
38-
fileReader.addEventListener("load", (event) => {
39-
this.isShapefile = true; // Will hide unneeded widgets using this
40-
shp(event.target.result).then((geoJson) => {
41-
if (geoJson.features.length === 0) {
42-
this._deleteInvalidLayer(L.ALS.locale.geometryNoFeatures);
43-
return;
44-
}
27+
L.ALS.SynthGeometryBaseWizard.getGeoJSON(wizardResults, (geoJson, name) => this._displayFile(geoJson, name));
28+
},
4529

46-
this._displayFile(geoJson);
47-
// Check if bounds are valid
48-
let bounds = this._layer.getBounds();
49-
if (bounds._northEast.lng > 180 || bounds._northEast.lat > 90 || bounds._southWest.lng < -180 || bounds._southWest.lat < -90)
50-
window.alert(L.ALS.locale.geometryOutOfBounds);
51-
52-
}).catch((reason) => {
53-
console.log(reason);
54-
55-
// If reading as shapefile fails, try to read as GeoJSON.
56-
// We won't check bounds because we assume GeoJSON being in WGS84.
57-
let fileReader2 = new FileReader();
58-
fileReader2.addEventListener("load", (event) => {
59-
try {this._displayFile(JSON.parse(event.target.result));}
60-
catch (e) {
61-
console.log(e);
62-
this._deleteInvalidLayer();
63-
}
64-
});
65-
fileReader2.readAsText(file);
66-
});
67-
});
30+
_displayFile: function (geoJson, fileName) {
31+
if (fileName)
32+
this.setName(fileName);
6833

69-
try {fileReader.readAsArrayBuffer(file);}
70-
catch (e) {}
71-
},
34+
switch (geoJson) {
35+
case "NoFileSelected":
36+
this._deleteInvalidLayer(L.ALS.locale.geometryNoFileSelected);
37+
return;
38+
case "NoFeatures":
39+
this._deleteInvalidLayer(L.ALS.locale.geometryNoFeatures);
40+
return;
41+
case "InvalidFileType":
42+
this._deleteInvalidLayer(L.ALS.locale.geometryInvalidFile);
43+
return;
44+
}
7245

73-
_displayFile: function (geoJson) {
7446
let borderColor = new L.ALS.Widgets.Color("borderColor", "geometryBorderColor", this, "setColor").setValue(this.borderColor),
7547
fillColor = new L.ALS.Widgets.Color("fillColor", "geometryFillColor", this, "setColor").setValue(this.fillColor),
7648
menu = [borderColor, fillColor],
@@ -130,14 +102,24 @@ L.ALS.SynthGeometryLayer = L.ALS.Layer.extend( /** @lends L.ALS.SynthGeometryLay
130102
}
131103
});
132104

105+
// Check if bounds are valid
106+
let bounds = this._layer.getBounds();
107+
if (
108+
bounds._northEast.lng > 180 ||
109+
bounds._northEast.lat > 90 ||
110+
bounds._southWest.lng < -180 ||
111+
bounds._southWest.lat < -90
112+
)
113+
window.alert(L.ALS.locale.geometryOutOfBounds);
114+
133115
if (L.ALS.searchWindow)
134116
L.ALS.searchWindow.addToSearch(this.id, docs, fields); // Add GeoJSON to search
135117
this.addLayers(this._layer);
136118
this._setLayerColors();
137119
this.writeToHistory();
138120
},
139121

140-
_deleteInvalidLayer: function (message = L.ALS.locale.geometryInvalidFile) {
122+
_deleteInvalidLayer: function (message) {
141123
window.alert(message);
142124
this.deleteLayer();
143125
},

‎SynthGeometryLayer/SynthGeometryWizard.js

+5-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
/**
2-
* Wizard for SynthShapefileLayer
2+
* Wizard for SynthGeometryLayer
33
* @class
44
* @extends L.ALS.Wizard
55
*/
6-
L.ALS.SynthGeometryWizard = L.ALS.Wizard.extend( /** @lends L.ALS.SynthGeometryWizard.prototype */ {
6+
L.ALS.SynthGeometryWizard = L.ALS.SynthGeometryBaseWizard.extend( /** @lends L.ALS.SynthGeometryWizard.prototype */ {
77

88
displayName: "geometryDisplayName",
99

1010
initialize: function () {
11-
L.ALS.Wizard.prototype.initialize.call(this);
12-
if (!window.FileReader) {
13-
this.addWidget(new L.ALS.Widgets.SimpleLabel("lbl", "geometryBrowserNotSupported", "center", "error"));
14-
return;
15-
}
16-
this.addWidgets(
17-
new L.ALS.Widgets.File("geometryFileLabel", "geometryFileLabel"),
11+
L.ALS.SynthGeometryBaseWizard.prototype.initialize.call(this);
12+
13+
this.addWidget(
1814
new L.ALS.Widgets.SimpleLabel("geometryNotification", "geometryNotification", "center", "message")
1915
);
2016
}

‎SynthLineLayer/SynthLineLayer.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ L.ALS.SynthLineLayer = L.ALS.SynthBaseLayer.extend(/** @lends L.ALS.SynthLineLay
4343
this.addBaseParametersOutputSection();
4444

4545
this.pointsGroup = L.featureGroup();
46-
this.calculateParameters();
47-
48-
this.isAfterDeserialization = false;
46+
L.ALS.SynthGeometryBaseWizard.initializePolygonOrPolylineLayer(this, wizardResults);
4947
},
5048

5149
_hideCapturePoints: function (widget) {

‎SynthLineLayer/SynthLineWizard.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
L.ALS.SynthLineWizard = L.ALS.EmptyWizard.extend({
1+
L.ALS.SynthLineWizard = L.ALS.SynthGeometryBaseWizard.extend({
22
displayName: "lineLayerName",
3+
fileLabel: "initialFeaturesFileLabelLine",
34
});

‎SynthPolygonLayer/SynthPolygonLayer.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,8 @@ L.ALS.SynthPolygonLayer = L.ALS.SynthPolygonBaseLayer.extend({
5252

5353
this.calculateThreshold(settings); // Update hiding threshold
5454
this.onEditEndDebounced = debounce(() => this.onEditEnd(), 300); // Math operations are too slow for immediate update
55-
this.calculateParameters();
5655

57-
this.isAfterDeserialization = false;
56+
L.ALS.SynthGeometryBaseWizard.initializePolygonOrPolylineLayer(this, wizardResults);
5857
},
5958

6059
onEditEnd: function () {
@@ -149,19 +148,20 @@ L.ALS.SynthPolygonLayer = L.ALS.SynthPolygonBaseLayer.extend({
149148
currentPath = [], currentConnections = [], currentLength = 0, currentPoints = [],
150149
shouldSwapPoints = false, lineAfterPolygonAdded = false;
151150

151+
// Precalculate paths' count and invalidate layer if this count is too high
152+
if (MathTools.distanceBetweenPoints(...directionalLine) / this.By > 50) {
153+
layersWereInvalidated = true;
154+
this.invalidatePolygon(layer);
155+
return;
156+
}
157+
152158
// Move along the line by By until we reach the end of the polygon and add an additional line
153159
// or exceed the limit of 300 paths
154160
let deltaBy = 0;
155161
while (true) {
156162
if (lineAfterPolygonAdded)
157163
break;
158164

159-
if (deltaBy / this.By > 300) {
160-
layersWereInvalidated = true;
161-
this.invalidatePolygon(layer);
162-
return;
163-
}
164-
165165
// Scale the directional line, so endpoints of scaled line will be the start and end points of the
166166
// line that we'll build a perpendicular (a path) to. The distance between these points is By.
167167
let p1 = this.scaleLine(directionalLine, deltaBy)[1],
@@ -265,7 +265,7 @@ L.ALS.SynthPolygonLayer = L.ALS.SynthPolygonBaseLayer.extend({
265265
...lineOptions, dashArray: this.dashedLine
266266
}));
267267

268-
let number = 0;
268+
let number = 1;
269269
for (let path of shortestPath) {
270270
this.pathGroup.addLayer(path);
271271

‎SynthPolygonLayer/SynthPolygonWizard.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
L.ALS.SynthPolygonWizard = L.ALS.EmptyWizard.extend({
2-
displayName: "polygonLayerName"
1+
L.ALS.SynthPolygonWizard = L.ALS.SynthGeometryBaseWizard.extend({
2+
displayName: "polygonLayerName",
3+
fileLabel: "initialFeaturesFileLabelPolygon",
34
});

‎locales/English.js

+8-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ L.ALS.Locales.addLocaleProperties("English", {
3131
gridStandardScales: "Grid scale:",
3232
gridLngDistance: "Distance between parallels:",
3333
gridLatDistance: "Distance between meridians:",
34-
gridShouldMergeCells: "Merge couples of adjacent cells when latitude exceeds 60° and merge again when it exceeds 76° (except 1:1 000 000 and 1:2 000 scales when cells above 76° triple-merged instead of quadruple-merged)",
34+
gridShouldMergeCells: "Merge adjacent cells when latitude exceeds 60°",
3535

3636
// SynthGridLayer
3737

@@ -131,8 +131,8 @@ L.ALS.Locales.addLocaleProperties("English", {
131131
// SynthGeometryLayer
132132

133133
geometryOutOfBounds: "Features in selected file are out of visible area. Please, check projection and/or add .prj file to the archive.",
134-
geometryInvalidFile: "This file is not valid zipped shapefile or GeoJSON file",
135-
geometryNoFeatures: "This file doesn't contain any features, so it won't be added",
134+
geometryInvalidFile: "Selected file is not valid zipped shapefile or GeoJSON file",
135+
geometryNoFeatures: "Selected file doesn't contain any features, so it won't be added",
136136
geometryBorderColor: "Border color:",
137137
geometryFillColor: "Fill color:",
138138
geometryBrowserNotSupported: "Your browser doesn't support adding this layer. You still can open projects with this layer though.",
@@ -149,6 +149,11 @@ L.ALS.Locales.addLocaleProperties("English", {
149149
polygonHidePaths: "Hide paths",
150150
polygonLayersSkipped: "One or more polygons has been skipped because they're too big. These polygons have red color.",
151151

152+
// GeoJSON initial features
153+
initialFeaturesFileLabelPolygon: "Load initial polygons from zipped shapefile or GeoJSON (non-polygon features will be skipped):",
154+
initialFeaturesFileLabelLine: "Load initial polylines from zipped shapefile or GeoJSON (non-polyline features will be skipped):",
155+
initialFeaturesNoFeatures: "Selected file doesn't contain any features supported by the added layer",
156+
152157
// Search
153158
searchButtonTitle: "Search Geometry Layers or OSM",
154159
searchPlaceholder: "Type to search...",

0 commit comments

Comments
 (0)