diff --git a/src/main/java/eu/simstadt/regionchooser/RegionExtractor.java b/src/main/java/eu/simstadt/regionchooser/RegionExtractor.java index e7889390f205cad30504e088edfb636cc8222621..39a1ec5d150ef98f6dd3196ae52708e502e146e7 100644 --- a/src/main/java/eu/simstadt/regionchooser/RegionExtractor.java +++ b/src/main/java/eu/simstadt/regionchooser/RegionExtractor.java @@ -48,6 +48,9 @@ static StringBuilder selectRegionDirectlyFromCityGML(String wktPolygon, String srsName, Path... citygmlPaths) throws ParseException, XPathParseException, NavException, IOException { + //TODO: Should actually write directly to a bufferedwriter + //TODO: Should return the number of found buildings. + int buildingsCount = 0; int foundBuildingsCount = 0; StringBuilder sb = new StringBuilder(); @@ -75,13 +78,16 @@ static StringBuilder selectRegionDirectlyFromCityGML(String wktPolygon, String s LOGGER.info("1000 buildings parsed"); } } - } if (citygml == null) { throw new IllegalArgumentException("There should be at least one citygml"); } + if (foundBuildingsCount == 0) { + LOGGER.warning("No building found in the selected region."); + } + LOGGER.info("Buildings found in selected region " + foundBuildingsCount); sb.append(citygml.getFooter()); return sb; diff --git a/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js b/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js index b2e77dadcee60a6059b2475338fb7699262b8508..2ffc45710def0e9e71016aa00212d8d1bfd742f8 100644 --- a/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js +++ b/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js @@ -69,7 +69,7 @@ var regionChooser = (function(){ dataPanel.append('.'); srsName = feature.get("srsName"); if (proj4.defs(srsName) === undefined){ - console.warning(srsName + " isn't defined by Proj4js!") + console.warn(srsName + " isn't defined by Proj4js!") } }; @@ -246,7 +246,7 @@ var regionChooser = (function(){ fxapp.downloadRegionFromCityGMLs(sketchAsWKT(srsName), project, citygmlNames.join(";"), srsName); dataPanel.prepend("<h2 class='ok'>Done!</h2><br/>\n"); } catch (e) { - console.warning("ERROR : " + e); + console.warn("ERROR : " + e); dataPanel.prepend("<h2 class='error'>Some problem occured!</h2><br/>\n"); } var end = new Date().getTime(); @@ -327,7 +327,7 @@ var regionChooser = (function(){ fxapp.log(message); } - console.warning = function(message){ + console.warn = function(message){ fxapp.warning(message); } } @@ -411,7 +411,7 @@ var regionChooser = (function(){ return; } catch (ex) { - console.warning("Copy to clipboard failed.", ex); + console.warn("Copy to clipboard failed.", ex); return prompt("Copy to clipboard: Ctrl+C, Enter", text); } finally {