93399 vulnerabilities fix

dist/angular-openlayers-directive.js

@@ -2,7 +2,8 @@
     if (typeof require === 'function' && typeof exports === 'object') {
         // CommonJS
         var ol = require('openlayers');
-        exports.angularOpenlayersDirective = factory(ol);
+        var ngSanitize = require('angular-sanitize');
+        module.exports = factory(ol);
     } else if (typeof define === 'function' && define.amd) {
         // AMD.
         define(['ol'], function (ol) {
@@ -1544,6 +1545,10 @@ angular.module('openlayers-directive').factory('olHelpers', ["$q", "$log", "$htt
                     wrapX: source.wrapX !== undefined ? source.wrapX : true
                 };
 
+                if (source.projection) {
+                    wmsConfiguration.projection = new ol.proj.get(source.projection);
+                }
+
                 if (source.serverType) {
                     wmsConfiguration.serverType = source.serverType;
                 }
@@ -1705,34 +1710,44 @@ angular.module('openlayers-directive').factory('olHelpers', ["$q", "$log", "$htt
 
                     oSource.addFeatures(features);
                 }
-
                 break;
-
             case 'WKT':
-                if (!(source.wkt) && !(source.wkt.data)) {
+                if (!(source.wkt || source.url)) {
                     $log.error('[AngularJS - Openlayers] - You need a WKT ' +
-                               'property to add a WKT format vector layer.');
+                                'property to add a GeoJSON layer.');
                     return;
                 }
-
-                oSource = new ol.source.Vector();
-                var wktFormatter = new ol.format.WKT();
-                var wktProjection; // Projection of wkt data
-                if (isDefined(source.wkt.projection)) {
-                    wktProjection = new ol.proj.get(source.wkt.projection);
+                if (isDefined(source.url)) {
+                    oSource = new ol.source.Vector({
+                        format: new ol.format.WKT(),
+                        url: source.url,
+                        wrapX: source.wrapX !== undefined ? source.wrapX : true
+                    });
                 } else {
-                    wktProjection = projection; // If not defined, features will not be reprojected.
-                }
+                    oSource = new ol.source.Vector();
+                    var featureProjection =  projection;
+                    var wktProjection;
+                    if (isDefined(source.wkt.projection)) {
+                        wktProjection = new ol.proj.get(source.wkt.projection);
+                    } else {
+                        wktProjection = projection;
+                    }
 
-                var wktFeatures = wktFormatter.readFeatures(
-                    source.wkt.data, {
-                        featureProjection: projection.getCode(),
-                        dataProjection: wktProjection.getCode()
-                    });
+                    var wktFormat = new ol.format.WKT();
+                    var wktFeatures = [];
+                    for (var k = 0; k < source.wkt.object.length; k++) {
+                        var feature = wktFormat.readFeature(
+                        source.wkt.object[k].data, {dataProjection: wktProjection.getCode() ,
+                                                    featureProjection: featureProjection.getCode() });
+                        if (source.wkt.object[k].properties) {
+                            feature.properties = source.wkt.object[k].properties;
+                        }
+                        wktFeatures.push(feature);
+                    }
+                    oSource.addFeatures(wktFeatures);
+                }
 
-                oSource.addFeatures(wktFeatures);
                 break;
-
             case 'JSONP':
                 if (!(source.url)) {
                     $log.error('[AngularJS - Openlayers] - You need an url properly configured to add a JSONP layer.');
@@ -2579,5 +2594,5 @@ angular.module('openlayers-directive').factory('olMapDefaults', ["$q", "olHelper
         }
     };
 }]);
-
+return angular.module('openlayers-directive');
 }));

dist/angular-openlayers-directive.pre.js

@@ -2,7 +2,8 @@
     if (typeof require === 'function' && typeof exports === 'object') {
         // CommonJS
         var ol = require('openlayers');
-        exports.angularOpenlayersDirective = factory(ol);
+        var ngSanitize = require('angular-sanitize');
+        module.exports = factory(ol);
     } else if (typeof define === 'function' && define.amd) {
         // AMD.
         define(['ol'], function (ol) {
@@ -1544,6 +1545,10 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
                     wrapX: source.wrapX !== undefined ? source.wrapX : true
                 };
 
+                if (source.projection) {
+                    wmsConfiguration.projection = new ol.proj.get(source.projection);
+                }
+
                 if (source.serverType) {
                     wmsConfiguration.serverType = source.serverType;
                 }
@@ -1705,34 +1710,44 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
 
                     oSource.addFeatures(features);
                 }
-
                 break;
-
             case 'WKT':
-                if (!(source.wkt) && !(source.wkt.data)) {
+                if (!(source.wkt || source.url)) {
                     $log.error('[AngularJS - Openlayers] - You need a WKT ' +
-                               'property to add a WKT format vector layer.');
+                                'property to add a GeoJSON layer.');
                     return;
                 }
-
-                oSource = new ol.source.Vector();
-                var wktFormatter = new ol.format.WKT();
-                var wktProjection; // Projection of wkt data
-                if (isDefined(source.wkt.projection)) {
-                    wktProjection = new ol.proj.get(source.wkt.projection);
+                if (isDefined(source.url)) {
+                    oSource = new ol.source.Vector({
+                        format: new ol.format.WKT(),
+                        url: source.url,
+                        wrapX: source.wrapX !== undefined ? source.wrapX : true
+                    });
                 } else {
-                    wktProjection = projection; // If not defined, features will not be reprojected.
-                }
+                    oSource = new ol.source.Vector();
+                    var featureProjection =  projection;
+                    var wktProjection;
+                    if (isDefined(source.wkt.projection)) {
+                        wktProjection = new ol.proj.get(source.wkt.projection);
+                    } else {
+                        wktProjection = projection;
+                    }
 
-                var wktFeatures = wktFormatter.readFeatures(
-                    source.wkt.data, {
-                        featureProjection: projection.getCode(),
-                        dataProjection: wktProjection.getCode()
-                    });
+                    var wktFormat = new ol.format.WKT();
+                    var wktFeatures = [];
+                    for (var k = 0; k < source.wkt.object.length; k++) {
+                        var feature = wktFormat.readFeature(
+                        source.wkt.object[k].data, {dataProjection: wktProjection.getCode() ,
+                                                    featureProjection: featureProjection.getCode() });
+                        if (source.wkt.object[k].properties) {
+                            feature.properties = source.wkt.object[k].properties;
+                        }
+                        wktFeatures.push(feature);
+                    }
+                    oSource.addFeatures(wktFeatures);
+                }
 
-                oSource.addFeatures(wktFeatures);
                 break;
-
             case 'JSONP':
                 if (!(source.url)) {
                     $log.error('[AngularJS - Openlayers] - You need an url properly configured to add a JSONP layer.');
@@ -2579,5 +2594,5 @@ angular.module('openlayers-directive').factory('olMapDefaults', function($q, olH
         }
     };
 });
-
+return angular.module('openlayers-directive');
 }));

grunt/concat.js

@@ -4,7 +4,8 @@ var banner = '(function (root, factory) {\n' +
              '    if (typeof require === \'function\' && typeof exports === \'object\') {\n' +
              '        // CommonJS\n' +
              '        var ol = require(\'openlayers\');\n' +
-             '        exports.angularOpenlayersDirective = factory(ol);\n' +
+             '        var ngSanitize = require(\'angular-sanitize\');\n' +             
+             '        module.exports = factory(ol);\n' +
              '    } else if (typeof define === \'function\' && define.amd) {\n' +
              '        // AMD.\n' +
              '        define([\'ol\'], function (ol) {\n' +
@@ -16,12 +17,15 @@ var banner = '(function (root, factory) {\n' +
              '    }\n' +
              '}(this, function (ol) {\n';
 
+var footer = 'return angular.module(\'openlayers-directive\');' +
+			 '\n}));';             
+
 module.exports = function (grunt, options) {
     return {
         dist: {
             options: {
                 banner: banner,
-                footer: '\n}));'
+                footer: footer
             },
             src: [
                 'src/directives/openlayers.js',

package.json

@@ -18,7 +18,7 @@
   "license": "MIT",
   "dependencies": {
     "angular": "~1.4.8",
-    "angular-sanitize": "~1.4.8",
+    "angular-sanitize": "1.7.9",
     "openlayers": "4.3.4"
   },
   "devDependencies": {
@@ -55,7 +55,9 @@
     "phantomjs": "^2.1.0",
     "protractor": "~2.5.0",
     "publish-latest": "^1.1.2",
-    "semantic-release": "^4.3.5"
+    "semantic-release": "^4.3.5",
+    "bower": "^1.8.8",
+    "requirejs": "^2.3.6"
   },
   "scripts": {
     "test": "grunt build && grunt karma:unit",
@@ -67,4 +69,4 @@
   },
   "main": "dist/angular-openlayers-directive",
   "version": "2.1.0"
-}
+}

src/services/olHelpers.js

@@ -51,8 +51,7 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
 
     var esriBaseLayers = ['World_Imagery', 'World_Street_Map', 'World_Topo_Map',
                           'World_Physical_Map', 'World_Terrain_Base',
-                          'Ocean_Basemap', 'NatGeo_World_Map',
-                          'World_Light_Gray_Base', 'World_Dark_Gray_Base'];
+                          'Ocean_Basemap', 'NatGeo_World_Map'];
 
     var styleMap = {
         'style': ol.style.Style,
@@ -287,6 +286,10 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
                     wrapX: source.wrapX !== undefined ? source.wrapX : true
                 };
 
+                if (source.projection) {
+                    wmsConfiguration.projection = new ol.proj.get(source.projection);
+                }
+
                 if (source.serverType) {
                     wmsConfiguration.serverType = source.serverType;
                 }
@@ -448,34 +451,44 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
 
                     oSource.addFeatures(features);
                 }
-
                 break;
-
             case 'WKT':
-                if (!(source.wkt) && !(source.wkt.data)) {
+                if (!(source.wkt || source.url)) {
                     $log.error('[AngularJS - Openlayers] - You need a WKT ' +
-                               'property to add a WKT format vector layer.');
+                                'property to add a GeoJSON layer.');
                     return;
                 }
-
-                oSource = new ol.source.Vector();
-                var wktFormatter = new ol.format.WKT();
-                var wktProjection; // Projection of wkt data
-                if (isDefined(source.wkt.projection)) {
-                    wktProjection = new ol.proj.get(source.wkt.projection);
+                if (isDefined(source.url)) {
+                    oSource = new ol.source.Vector({
+                        format: new ol.format.WKT(),
+                        url: source.url,
+                        wrapX: source.wrapX !== undefined ? source.wrapX : true
+                    });
                 } else {
-                    wktProjection = projection; // If not defined, features will not be reprojected.
-                }
+                    oSource = new ol.source.Vector();
+                    var featureProjection =  projection;
+                    var wktProjection;
+                    if (isDefined(source.wkt.projection)) {
+                        wktProjection = new ol.proj.get(source.wkt.projection);
+                    } else {
+                        wktProjection = projection;
+                    }
 
-                var wktFeatures = wktFormatter.readFeatures(
-                    source.wkt.data, {
-                        featureProjection: projection.getCode(),
-                        dataProjection: wktProjection.getCode()
-                    });
+                    var wktFormat = new ol.format.WKT();
+                    var wktFeatures = [];
+                    for (var k = 0; k < source.wkt.object.length; k++) {
+                        var feature = wktFormat.readFeature(
+                        source.wkt.object[k].data, {dataProjection: wktProjection.getCode() ,
+                                                    featureProjection: featureProjection.getCode() });
+                        if (source.wkt.object[k].properties) {
+                            feature.properties = source.wkt.object[k].properties;
+                        }
+                        wktFeatures.push(feature);
+                    }
+                    oSource.addFeatures(wktFeatures);
+                }
 
-                oSource.addFeatures(wktFeatures);
                 break;
-
             case 'JSONP':
                 if (!(source.url)) {
                     $log.error('[AngularJS - Openlayers] - You need an url properly configured to add a JSONP layer.');
@@ -601,10 +614,9 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
                 var extractStyles = source.extractStyles || false;
                 oSource = new ol.source.Vector({
                     url: source.url,
-                    format: new ol.format.KML({
-                        extractStyles: extractStyles
-                    }),
-                    radius: source.radius
+                    format: new ol.format.KML(),
+                    radius: source.radius,
+                    extractStyles: extractStyles
                 });
                 break;
             case 'Stamen':