diff --git a/config.template.js b/config.template.js index bedbc30..a3520b2 100644 --- a/config.template.js +++ b/config.template.js @@ -11,7 +11,7 @@ // TODO not included in permalink (better replace permalink with hash plugin) //BR.conf.transit = params.has('transit') && (params.get('transit') === 'true'); - if (hostname === 'brouter.de' ) { + if (hostname === 'brouter.de') { // online service (brouter.de) configuration BR.conf.profiles = [ diff --git a/index.html b/index.html index 2539e3e..779a1c1 100644 --- a/index.html +++ b/index.html @@ -457,7 +457,11 @@
- +
@@ -478,10 +482,11 @@ @@ -495,26 +500,28 @@

@@ -528,6 +535,7 @@ name="nogoBuffer" id="nogoBuffer" value="0" + min="0" />

diff --git a/js/index.js b/js/index.js index 805968d..a2caf53 100644 --- a/js/index.js +++ b/js/index.js @@ -409,109 +409,6 @@ $(this).collapse('show'); } }); - - $('#submitNogos').on('click', function() { - var geoJSONPromise; - var nogoURL = $('#nogoURL').val(); - var nogoFile = $('#nogoFile')[0].files[0]; - if (nogoURL) { - // TODO: Handle {{bbox}} - geoJSONPromise = fetch(nogoURL).then(function(response) { - response.json(); - }); - } else if (nogoFile) { - geoJSONPromise = new Promise(function(resolve, reject) { - var reader = new FileReader(); - reader.onload = function() { - resolve(reader.result); - }; - reader.readAsText(nogoFile); - }).then(function(response) { - return JSON.parse(response); - }); - } else { - $('#nogoError').text('Error: Missing file or URL.'); - $('#nogoError').css('display', 'block'); - return false; - } - var nogoWeight = parseFloat($('#nogoWeight').val()); - if (isNaN(nogoWeight)) { - $('#nogoError').text('Error: Missing default nogo weight.'); - $('#nogoError').css('display', 'block'); - return false; - } - var nogoRadius = parseFloat($('#nogoRadius').val()); - if (isNaN(nogoRadius) || nogoRadius < 0) { - $('#nogoError').text('Error: Invalid default nogo radius.'); - $('#nogoError').css('display', 'block'); - return false; - } - var nogoBuffer = parseFloat($('#nogoBuffer').val()); - if (isNaN(nogoBuffer)) { - $('#nogoError').text('Error: Invalid nogo buffering radius.'); - $('#nogoError').css('display', 'block'); - return false; - } - - geoJSONPromise.then(function(response) { - // Iterate on features in order to discard features without geometry - var cleanedGeoJSONFeatures = []; - turf.featureEach(response, function(feature) { - if (turf.getGeom(feature)) { - var maybeBufferedFeature = feature; - // Eventually buffer GeoJSON - if (nogoBuffer != 0) { - maybeBufferedFeature = turf.buffer( - maybeBufferedFeature, - nogoBuffer, - { units: 'meters' } - ); - } - cleanedGeoJSONFeatures.push(maybeBufferedFeature); - } - }); - - var geoJSON = L.geoJson( - turf.featureCollection(cleanedGeoJSONFeatures), - { - onEachFeature: function(feature, layer) { - layer.options.nogoWeight = - feature.properties.nogoWeight || nogoWeight; - } - } - ); - var nogosPoints = geoJSON.getLayers().filter(function(e) { - return e.feature.geometry.type === 'Point'; - }); - nogosPoints = nogosPoints.map(function(item) { - var radius = item.feature.properties.radius || nogoRadius; - if (radius > 0) { - return L.circle(item.getLatLng(), { radius: radius }); - } - return null; - }); - nogosPoints = nogosPoints.filter(function(e) { - return e; - }); - nogos.setOptions({ - nogos: nogosPoints, - polygons: geoJSON.getLayers().filter(function(e) { - return e.feature.geometry.type === 'Polygon'; - }), - polylines: geoJSON.getLayers().filter(function(e) { - return e.feature.geometry.type === 'LineString'; - }) - }); - updateRoute({ - options: nogos.getOptions() - }); - urlHash.onMapMove(); - $('#nogoError').text(''); - $('#nogoError').css('display', 'none'); - $('#loadNogos').modal('hide'); - }); - return false; - }); } i18next diff --git a/js/plugin/NogoAreas.js b/js/plugin/NogoAreas.js index 00084d6..531f0fc 100644 --- a/js/plugin/NogoAreas.js +++ b/js/plugin/NogoAreas.js @@ -33,6 +33,8 @@ BR.NogoAreas = L.Control.extend({ onAdd: function(map) { var self = this; + $('#submitNogos').on('click', L.bind(this.uploadNogos, this)); + this.drawnItems = new L.FeatureGroup().addTo(map); this.drawnItems.on('click', function(e) { L.DomEvent.stop(e); @@ -118,6 +120,125 @@ BR.NogoAreas = L.Control.extend({ return L.DomUtil.create('div'); }, + displayUploadError: function(message) { + $('#nogoError').text(message ? message : ''); + $('#nogoError').css('display', message ? 'block' : 'none'); + }, + + uploadNogos: function() { + var self = this; + + var geoJSONPromise; + var nogoURL = $('#nogoURL').val(); + var nogoFile = $('#nogoFile')[0].files[0]; + if (nogoURL) { + // TODO: Handle {{bbox}} + geoJSONPromise = fetch(nogoURL).then(function(response) { + response.json(); + }); + } else if (nogoFile) { + geoJSONPromise = new Promise(function(resolve, reject) { + var reader = new FileReader(); + reader.onload = function() { + resolve(reader.result); + }; + reader.onerror = function() { + self.displayUploadError( + 'Could not load file: ' + reader.error.message + ); + }; + + reader.readAsText(nogoFile); + }).then(function(response) { + return JSON.parse(response); + }); + } else { + // FIXME: use form validator instead + self.displayUploadError('Missing file or URL.'); + return false; + } + var nogoWeight = parseFloat($('#nogoWeight').val()); + if (isNaN(nogoWeight)) { + // FIXME: use form validator instead + self.displayUploadError('Missing default nogo weight.'); + return false; + } + var nogoRadius = parseFloat($('#nogoRadius').val()); + if (isNaN(nogoRadius) || nogoRadius < 0) { + // FIXME: use form validator instead + self.displayUploadError('Invalid default nogo radius.'); + return false; + } + var nogoBuffer = parseFloat($('#nogoBuffer').val()); + if (isNaN(nogoBuffer)) { + // FIXME: use form validator instead + self.displayUploadError('Invalid nogo buffering radius.'); + return false; + } + + geoJSONPromise.then(function(response) { + // Iterate on features in order to discard features without geometry + var cleanedGeoJSONFeatures = []; + turf.flattenEach(response, function(feature) { + if (turf.getGeom(feature)) { + var maybeBufferedFeature = feature; + // Eventually buffer GeoJSON + if (nogoBuffer !== 0) { + maybeBufferedFeature = turf.buffer( + maybeBufferedFeature, + nogoBuffer, + { units: 'meters' } + ); + } + cleanedGeoJSONFeatures.push(maybeBufferedFeature); + } + }); + + if (cleanedGeoJSONFeatures.length === 0) { + self.displayUploadError( + 'No valid area found in provided input.' + ); + return false; + } + + var geoJSON = L.geoJson( + turf.featureCollection(cleanedGeoJSONFeatures), + { + onEachFeature: function(feature, layer) { + layer.options.nogoWeight = + feature.properties.nogoWeight || nogoWeight; + } + } + ); + var nogosPoints = geoJSON.getLayers().filter(function(e) { + return e.feature.geometry.type === 'Point'; + }); + nogosPoints = nogosPoints.map(function(item) { + var radius = item.feature.properties.radius || nogoRadius; + if (radius > 0) { + return L.circle(item.getLatLng(), { radius: radius }); + } + return null; + }); + nogosPoints = nogosPoints.filter(function(e) { + return e; + }); + self.setOptions({ + nogos: nogosPoints, + polygons: geoJSON.getLayers().filter(function(e) { + return e.feature.geometry.type === 'Polygon'; + }), + polylines: geoJSON.getLayers().filter(function(e) { + return e.feature.geometry.type === 'LineString'; + }) + }); + self._fireUpdate(); + self.displayUploadError(undefined); + $('#loadNogos').modal('hide'); + }); + return false; + }, + // prevent route waypoint added after circle create (map click after up) preventRoutePointOnCreate: function(routing) { this.editTools.on( diff --git a/js/router/brouterCgi.js b/js/router/brouterCgi.js index 62d3155..53d9168 100644 --- a/js/router/brouterCgi.js +++ b/js/router/brouterCgi.js @@ -3,7 +3,9 @@ var brouterCgi = (function() { // http://brouter.de/cgi-bin/brouter.sh?coords=13.404681_52.520185_13.340278_52.512356_trekking_0 //var URL_TEMPLATE = '/cgi-bin/proxy.cgi?url=' + 'http://brouter.de/cgi-bin/brouter.sh?coords={fromLng}_{fromLat}_{toLng}_{toLat}_{profile}_{alt}'; - var URL_TEMPLATE = '/proxy.php?url=' + 'cgi-bin/brouter.sh?coords={fromLng}_{fromLat}_{toLng}_{toLat}_{profile}_{alt}'; + var URL_TEMPLATE = + '/proxy.php?url=' + + 'cgi-bin/brouter.sh?coords={fromLng}_{fromLat}_{toLng}_{toLat}_{profile}_{alt}'; var PRECISION = 6; function getUrl(polyline) { diff --git a/locales/en.json b/locales/en.json index e391b6e..5f50b54 100644 --- a/locales/en.json +++ b/locales/en.json @@ -61,11 +61,11 @@ }, "loadNogos": { "defaultProperties": "Default properties", - "file": "File: ", + "file": "File (.geojson): ", "load": "Load", "nogoBuffer": "Buffer no-go areas (in meters): ", - "nogoRadius": "No-go radius (for points): ", - "nogoWeight": "No-go weight: ", + "nogoRadius": "No-go radius for points (in meters): ", + "nogoWeight": "No-go weight (-1 means impassable): ", "source": "Source", "title": "Load no-go areas", "url": "URL: "