nakarte

commit 2be83846917df8002739f99395c47d4f6d40184b
parent 345cfcf0f14acef179d58514f60438d66c956e24
Author: Sergej Orlov <wladimirych@gmail.com>
Date:   Wed, 23 Nov 2016 00:52:23 +0300

[westra passes] timeout 10 s for jsons

Diffstat:
M
src/lib/leaflet.layer.westraPasses/westraPasses.js
 | 
6
++++--
M
src/lib/leaflet.layer.westraPasses/westraPassesMarkers.js
 | 
1
+

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/lib/leaflet.layer.westraPasses/westraPasses.js b/src/lib/leaflet.layer.westraPasses/westraPasses.js
@@ -15,12 +15,14 @@ L.Layer.WestraPasses = L.Layer.extend({
             this.markers = new westraPasesMarkers(baseUrl, {pane: 'rasterMarker'});
             this.regions1 = new L.Layer.GeoJSONAjax(baseUrl + this.options.fileRegions1, {
                     className: 'westra-region-polygon',
-                    onEachFeature: this._setRegionLabel.bind(this, 'regions1')
+                    onEachFeature: this._setRegionLabel.bind(this, 'regions1'),
+                    requestTimeout: 10000
                 }
             );
             this.regions2 = new L.Layer.GeoJSONAjax(baseUrl + this.options.fileRegions2, {
                     className: 'westra-region-polygon',
-                    onEachFeature: this._setRegionLabel.bind(this, 'regions2')
+                    onEachFeature: this._setRegionLabel.bind(this, 'regions2'),
+                    requestTimeout: 10000
                 }
             );
         },
diff --git a/src/lib/leaflet.layer.westraPasses/westraPassesMarkers.js b/src/lib/leaflet.layer.westraPasses/westraPassesMarkers.js
@@ -16,6 +16,7 @@ const westraPasesMarkers = L.Layer.CanvasMarkers.extend({
         initialize: function(baseUrl, options) {
             L.Layer.CanvasMarkers.prototype.initialize.call(this, null, options);
             this.on('markerclick', this.showPassDescription, this);
+            // TODO: обработка ошибок, повторные запросы
             const {send, promise} = prepareXMLHttpRequestPromise(baseUrl + this.options.filePasses,
                 {responseType: 'json', timeout: 30000}
             );