-
-
Notifications
You must be signed in to change notification settings - Fork 487
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added support for WPS complex data & new version of Jsonix
- Loading branch information
Showing
17 changed files
with
7,829 additions
and
815 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
216 changes: 216 additions & 0 deletions
216
web-ui/src/main/resources/catalog/components/viewer/geometry/GeometryDirective.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,216 @@ | ||
| /* | ||
| * Copyright (C) 2001-2016 Food and Agriculture Organization of the | ||
| * United Nations (FAO-UN), United Nations World Food Programme (WFP) | ||
| * and United Nations Environment Programme (UNEP) | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| * | ||
| * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, | ||
| * Rome - Italy. email: geonetwork@osgeo.org | ||
| */ | ||
|
|
||
| (function() { | ||
| goog.provide('gn_geometry_directive'); | ||
|
|
||
|
|
||
| var module = angular.module('gn_geometry_directive', []); | ||
|
|
||
| /** | ||
| * @ngdoc directive | ||
| * @name gn_viewer.directive:gnGeometryTool | ||
| * | ||
| * @description | ||
| * This directive adds behavior to an interactive element (link, button). | ||
| * When clicked, the provided map will enter draw mode for the specified type | ||
| * of geometry, and update the linked output object. | ||
| * Possible output formats are: 'object' (ol.Geometry reference), 'gml', | ||
| * 'geojson', 'wkt'; default if undefined is 'object' | ||
| * If 'outputAsFeatures' is true, a FeatureCollection object will be output | ||
| * instead of a single feature | ||
| */ | ||
| module.directive('gnGeometryTool', [ | ||
| function() { | ||
| return { | ||
| restrict: 'E', | ||
| scope: { | ||
| map: '<', | ||
| geometryType: '<', | ||
| output: '=', | ||
| outputFormat: '<', | ||
| allowReset: '@', | ||
| allowModify: '@', | ||
| outputAsFeatures: '@' | ||
| }, | ||
| templateUrl: '../../catalog/components/viewer/geometry/' + | ||
| 'partials/geometrytool.html', | ||
| controller: ['$scope', 'ngeoDecorateInteraction', | ||
| function GeometryToolController($scope, ngeoDecorateInteraction) { | ||
| // internal vars | ||
| var source = new ol.source.Vector({ | ||
| useSpatialIndex: false | ||
| }); | ||
| var layer = new ol.layer.Vector({ | ||
| source: source, | ||
| style: [ | ||
| new ol.style.Style({ // this is the default editing style | ||
| fill: new ol.style.Fill({ | ||
| color: 'rgba(255, 255, 255, 0.5)' | ||
| }), | ||
| stroke: new ol.style.Stroke({ | ||
| color: 'white', | ||
| width: 5 | ||
| }) | ||
| }), | ||
| new ol.style.Style({ | ||
| stroke: new ol.style.Stroke({ | ||
| color: 'rgba(0, 153, 255, 1)', | ||
| width: 3 | ||
| }), | ||
| image: new ol.style.Circle({ | ||
| radius: 6, | ||
| fill: new ol.style.Fill({ | ||
| color: 'rgba(0, 153, 255, 1)' | ||
| }), | ||
| stroke: new ol.style.Stroke({ | ||
| color: 'white', | ||
| width: 1.5 | ||
| }) | ||
| }) | ||
| }) | ||
| ] | ||
| }); | ||
| $scope.drawInteraction = new ol.interaction.Draw({ | ||
| type: $scope.geometryType, | ||
| source: source | ||
| }); | ||
| $scope.modifyInteraction = new ol.interaction.Modify({ | ||
| features: source.getFeaturesCollection() | ||
| }); | ||
|
|
||
| // add our layer&interactions to the map | ||
| $scope.map.addLayer(layer); | ||
| $scope.map.addInteraction($scope.drawInteraction); | ||
| $scope.map.addInteraction($scope.modifyInteraction); | ||
| $scope.drawInteraction.setActive(false); | ||
| $scope.modifyInteraction.setActive(false); | ||
| ngeoDecorateInteraction($scope.drawInteraction); | ||
| ngeoDecorateInteraction($scope.modifyInteraction); | ||
|
|
||
| // cleanup when scope is destroyed | ||
| // FIXME: this event is not triggered! | ||
| // (when switching form, the DOM is simply cleared with jQuery) | ||
| $scope.$on('$destroy', function () { | ||
| $scope.map.removeLayer(layer); | ||
| $scope.map.removeInteraction($scope.drawInteraction); | ||
| $scope.map.removeInteraction($scope.modifyInteraction); | ||
| }); | ||
|
|
||
| // modifies the output value | ||
| var updateOutput = function (feature) { | ||
| if (!feature) { | ||
| $scope.output = null; | ||
| return; | ||
| } | ||
|
|
||
| // set id on feature | ||
| feature.setId('geometry-tool-output'); | ||
|
|
||
| var formatLabel = ($scope.outputFormat || '').toLowerCase(); | ||
| var format; | ||
| var outputValue; | ||
| switch (formatLabel) { | ||
| case 'json': | ||
| case 'geojson': | ||
| format = new ol.format.GeoJSON(); | ||
| if ($scope.outputAsFeatures) { | ||
| outputValue = format.writeFeatures([feature]); | ||
| } else { | ||
| outputValue = format.writeGeometry(feature.getGeometry()); | ||
| } | ||
| break; | ||
|
|
||
| case 'wkt': | ||
| format = new ol.format.WKT(); | ||
| if ($scope.outputAsFeatures) { | ||
| outputValue = format.writeFeatures([feature]); | ||
| } else { | ||
| outputValue = format.writeGeometry(feature.getGeometry()); | ||
| } | ||
| break; | ||
|
|
||
| case 'gml': | ||
| format = new ol.format.GML({ | ||
| featureNS: 'http://mapserver.gis.umn.edu/mapserver', | ||
| featureType: 'features' | ||
| // srsName: $scope.map.getView().getProjection().getCode() | ||
| }); | ||
|
|
||
| // TODO: refactor this: first clone geom & transform, then if necessary create a new feature with this geom | ||
| var feature2 = new ol.Feature({ | ||
| id: 'geometry-tool-output', | ||
| geometry: feature.getGeometry().clone() | ||
| }) | ||
| feature2.getGeometry().transform($scope.map.getView().getProjection(), 'EPSG:4326'); | ||
|
|
||
| if ($scope.outputAsFeatures) { | ||
| outputValue = '<wfs:FeatureCollection xmlns:wfs="http://www.opengis.net/wfs">' + | ||
| format.writeFeatures([feature2]) + | ||
| '</wfs:FeatureCollection>'; | ||
| } else { | ||
| outputValue = format.writeGeometryNode(feature2.getGeometry()) | ||
| .innerHTML; | ||
| } | ||
| break; | ||
|
|
||
| // no valid format specified: output as object + give warning | ||
| default: | ||
| console.warn('No valid output format specified for '+ | ||
| 'gn-geometry-tool (value=' + $scope.outputFormat + '); ' + | ||
| 'outputting geometry as object'); | ||
|
|
||
| case 'object': | ||
| if ($scope.outputAsFeatures) { | ||
| outputValue = [feature]; | ||
| } else { | ||
| outputValue = feature.getGeometry().clone(); | ||
| } | ||
| break; | ||
| } | ||
|
|
||
| $scope.output = outputValue; | ||
| } | ||
|
|
||
| // clear existing features on draw end | ||
| $scope.drawInteraction.on('drawend', function (event) { | ||
| source.clear(); | ||
| updateOutput(event.feature); | ||
| $scope.drawInteraction.setActive(false); | ||
| }); | ||
|
|
||
| // update output on modify end | ||
| $scope.modifyInteraction.on('modifyend', function (event) { | ||
| updateOutput(event.feature); | ||
| }) | ||
|
|
||
| // reset drawing | ||
| $scope.reset = function () { | ||
| source.clear(); | ||
| updateOutput(); | ||
| } | ||
| } | ||
| ] | ||
| }; | ||
| }]); | ||
| })(); |
35 changes: 35 additions & 0 deletions
35
web-ui/src/main/resources/catalog/components/viewer/geometry/GeometryModule.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright (C) 2001-2016 Food and Agriculture Organization of the | ||
| * United Nations (FAO-UN), United Nations World Food Programme (WFP) | ||
| * and United Nations Environment Programme (UNEP) | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2 of the License, or (at | ||
| * your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; if not, write to the Free Software | ||
| * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA | ||
| * | ||
| * Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2, | ||
| * Rome - Italy. email: geonetwork@osgeo.org | ||
| */ | ||
|
|
||
| (function() { | ||
| goog.provide('gn_geometry'); | ||
|
|
||
|
|
||
| goog.require('gn_geometry_service'); | ||
| goog.require('gn_geometry_directive'); | ||
|
|
||
| var module = angular.module('gn_geometry', [ | ||
| 'gn_geometry_service', | ||
| 'gn_geometry_directive' | ||
| ]); | ||
| })(); |
Oops, something went wrong.