Merge pull request #4 from bogdanvaduva/master

OL3 v3.7.0 problems
schivei · Jul 16, 2015 · 944c61a · 944c61a
2 parents a23619e + 3c5ef57
commit 944c61a
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -64,6 +64,7 @@ Options
 | `layer`       | string | `map`     | `map`, `terrain`, `terrain+`, `hybrid` and `satellite` | Here you can choose the type of base map |
 | `resolutions` | array  | `[28..1]` | n array positions                                      | Some image resolutions                   |
 | `origin`      | array  | `[0,0]`   | `[x,y]`                                                | The center map origin                    |
+| `ol_version`      | string  | `v3.7.0+`   | ``                                                | OL3 version                    |
 
 ###Returns `ol.source.XYZ`
 

diff --git a/ol-source-gmaps-tms.coffee b/ol-source-gmaps-tms.coffee
@@ -5,6 +5,7 @@ ol.source.GMapsTMS = (options) ->
     layer: 'map'
     resolutions: resolutions
     origin: origin
+  ol_version = 'v3.7.0+'
 
   if typeof options is 'undefined' or !options
     options = defaults
@@ -18,6 +19,9 @@ ol.source.GMapsTMS = (options) ->
   if typeof options.origin is 'undefined' or !options.origin
     options.origin = origin
 
+  if typeof options.ol_version is 'undefined' or !options.ol_version
+    options.ol_version = ol_version
+
   type = 'm'
 
   switch options.layer
@@ -28,6 +32,10 @@ ol.source.GMapsTMS = (options) ->
     when 'hybrid' then type = 'y'
     else options.layer = 'map'
 
+  if options.ol_version == 'v3.7.0+' then
+  return new ol.source.XYZ
+	url: 'http://mt.google.com/vt/lyrs=' + type + '&x={x}&y={y}&z={z}'
+  else
   return new ol.source.XYZ
     crossOrigin     : null
     tileUrlFunction : (coord) ->

diff --git a/ol-source-gmaps-tms.js b/ol-source-gmaps-tms.js
@@ -1,6 +1,6 @@
 (function() {
   ol.source.GMapsTMS = function(options) {
-    var defaults, origin, resolutions, type, _i, _results;
+    var defaults, origin, resolutions, type, _i, _results,ol_version;
     resolutions = (function() {
       _results = [];
       for (_i = 28; _i >= 1; _i--){ _results.push(_i); }
@@ -12,6 +12,7 @@
       resolutions: resolutions,
       origin: origin
     };
+    ol_version =  'v3.7.0+';
     if (typeof options === 'undefined' || !options) {
       options = defaults;
     }
@@ -24,6 +25,9 @@
     if (typeof options.origin === 'undefined' || !options.origin) {
       options.origin = origin;
     }
+    if (typeof options.ol_version === 'undefined' || !options.ol_version) {
+      options.ol_version = ol_version;
+    }
     type = 'm';
     switch (options.layer) {
       case 'map':
@@ -44,23 +48,29 @@
       default:
         options.layer = 'map';
     }
-    return new ol.source.XYZ({
-      crossOrigin: null,
-      tileUrlFunction: function(coord) {
-        var x, y, z;
-        if (!coord) {
-          return '';
-        }
-        z = coord[0];
-        x = coord[1];
-        y = coord[2];
-        return "http://mt.google.com/vt/lyrs=" + type + "&x=" + x + "&y=" + y + "&z=" + z;
-      },
-      tileGrid: new ol.tilegrid.TileGrid({
-        origin: options.origin,
-        resolutions: options.resolutions
-      })
-    });
+    if (options.ol_version === 'v3.7.0+') {
+	return new ol.source.XYZ({
+		url: 'http://mt.google.com/vt/lyrs=' + type + '&x={x}&y={y}&z={z}'
+	});
+    } else {
+	return new ol.source.XYZ({
+	      crossOrigin: null,
+	      tileUrlFunction: function(coord) {
+	        var x, y, z;
+	        if (!coord) {
+	          return '';
+	        }
+	        z = coord[0];
+	        x = coord[1];
+	        y = coord[2];
+	        return "http://mt.google.com/vt/lyrs=" + type + "&x=" + x + "&y=" + y + "&z=" + z;
+	      },
+	      tileGrid: new ol.tilegrid.TileGrid({
+	        origin: options.origin,
+	        resolutions: options.resolutions
+	      })
+	    });
+    }
   };
 
 }).call(this);