diff --git a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js index f24d99561c72f914d66f275be17f98188e52ff5b..ad41b7900aea88b76012f370596e26a5d6cd497b 100644 --- a/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js +++ b/src/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js @@ -125,10 +125,8 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 kml_source.forEachFeature(function(feature) { feature["geoJSON"] = geoJsonFormat.writeFeatureObject(feature); feature["area"] = feature.getGeometry().getArea(); - var project = feature.get("project"); - var name = feature.get("name"); - feature["project"] = project; - feature["name"] = name; + feature["project"] = feature.get("project"); + feature["name"] = feature.get("name"); feature["source"] = "CityGML"; }); } @@ -156,6 +154,7 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 }); featureOverlay.setMap(map); + //TODO: Rename to Javascript naming convention (CamelCase). var selected_features = featureOverlay.getFeatures(); selected_features.on('add', function(event) { var feature = event.element; @@ -218,7 +217,6 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 } } - //TODO: Use Javascript names (intersection_found => intersectionFound) function findIntersections() { var polygon = geoJsonFormat.writeFeatureObject(sketch); var polygonArea = sketch.getGeometry().getArea(); @@ -228,12 +226,12 @@ proj4.defs("EPSG:28992", "+proj=sterea +lat_0=52.15616055555555 +lon_0=5.3876388 features_by_project["NovaFactory"] = novafactory_vectors.getFeatures(); - Object.keys(features_by_project).forEach(function(project) { + Object.keys(features_by_project).sort().forEach(function(project) { features = features_by_project[project]; features_and_intersections = features.map(f=> [f, findIntersection(f,polygon)]).filter(l => l[1] !== undefined); if (features_and_intersections.length > 0){ intersection_found = true; - dataPanel.append("