v1.7.0

tombatossals · Jan 11, 2016 · f31e2a0 · f31e2a0
2 parents 0c8a038 + 3d056ae
commit f31e2a0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git a/dist/angular-openlayers-directive.js b/dist/angular-openlayers-directive.js
@@ -1688,14 +1688,16 @@ angular.module('openlayers-directive').factory('olHelpers', ["$q", "$log", "$htt
                 });
                 break;
             case 'XYZ':
-                if (!source.url) {
-                    $log.error('[AngularJS - Openlayers] - XYZ Layer needs valid url and params properties');
+                if (!source.url && !source.tileUrlFunction) {
+                    $log.error('[AngularJS - Openlayers] - XYZ Layer needs valid url or tileUrlFunction properties');
                 }
                 oSource = new ol.source.XYZ({
                     url: source.url,
                     attributions: createAttribution(source),
                     minZoom: source.minZoom,
-                    maxZoom: source.maxZoom
+                    maxZoom: source.maxZoom,
+                    projection: source.projection,
+                    tileUrlFunction: source.tileUrlFunction
                 });
                 break;
         }

diff --git a/dist/angular-openlayers-directive.min.js b/dist/angular-openlayers-directive.min.js
diff --git a/dist/angular-openlayers-directive.min.no-header.js b/dist/angular-openlayers-directive.min.no-header.js
diff --git a/dist/angular-openlayers-directive.pre.js b/dist/angular-openlayers-directive.pre.js
@@ -1688,14 +1688,16 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
                 });
                 break;
             case 'XYZ':
-                if (!source.url) {
-                    $log.error('[AngularJS - Openlayers] - XYZ Layer needs valid url and params properties');
+                if (!source.url && !source.tileUrlFunction) {
+                    $log.error('[AngularJS - Openlayers] - XYZ Layer needs valid url or tileUrlFunction properties');
                 }
                 oSource = new ol.source.XYZ({
                     url: source.url,
                     attributions: createAttribution(source),
                     minZoom: source.minZoom,
-                    maxZoom: source.maxZoom
+                    maxZoom: source.maxZoom,
+                    projection: source.projection,
+                    tileUrlFunction: source.tileUrlFunction
                 });
                 break;
         }

diff --git a/package.json b/package.json
@@ -61,5 +61,5 @@
     "semantic-release": "semantic-release pre && npm publish && semantic-release post"
   },
   "main": "dist/angular-openlayers-directive",
-  "version": "1.6.0"
+  "version": "1.7.0"
 }
diff --git a/src/services/olHelpers.js b/src/services/olHelpers.js
@@ -514,14 +514,16 @@ angular.module('openlayers-directive').factory('olHelpers', function($q, $log, $
                 });
                 break;
             case 'XYZ':
-                if (!source.url) {
-                    $log.error('[AngularJS - Openlayers] - XYZ Layer needs valid url and params properties');
+                if (!source.url && !source.tileUrlFunction) {
+                    $log.error('[AngularJS - Openlayers] - XYZ Layer needs valid url or tileUrlFunction properties');
                 }
                 oSource = new ol.source.XYZ({
                     url: source.url,
                     attributions: createAttribution(source),
                     minZoom: source.minZoom,
-                    maxZoom: source.maxZoom
+                    maxZoom: source.maxZoom,
+                    projection: source.projection,
+                    tileUrlFunction: source.tileUrlFunction
                 });
                 break;
         }