From b424e8f5d9f4c4b7a583ca308afbbb92c0a299c7 Mon Sep 17 00:00:00 2001 From: pjdufour Date: Tue, 7 Apr 2015 22:28:09 -0400 Subject: [PATCH 1/2] Sync with changes in https://github.com/openlayers/ol3/commit/ba035abb1fd68546506c91198f09b672319f70f8. Coordinate is now array. --- src/common/map/MapService.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/map/MapService.js b/src/common/map/MapService.js index 78ac2574..09fef3e1 100644 --- a/src/common/map/MapService.js +++ b/src/common/map/MapService.js @@ -706,9 +706,9 @@ if (coordinate == null) { return ''; } - var z = coordinate.z; - var x = coordinate.x; - var y = (1 << z) - coordinate.y - 1; + var z = coordinate[0]; + var x = coordinate[1]; + var y = (1 << z) - coordinate[2] - 1; return '/proxy/?url=' + url + minimalConfig.name + '/' + z + '/' + x + '/' + y + '.png'; } }) From 904dab1e4e886ce607a4560181c052ef193544cc Mon Sep 17 00:00:00 2001 From: Patrick Dufour Date: Tue, 14 Apr 2015 13:43:23 -0400 Subject: [PATCH 2/2] Sync with changes in https://github.com/openlayers/ol3/commit/4525276c6e5894080dc8554bc1621c7b6fcc22e2. Sync with changes in https://github.com/openlayers/ol3/commit/4525276c6e5894080dc8554bc1621c7b6fcc22e2. Renamed ol.Collection#getAt to ol.Collection#item --- src/common/layers/LayersDirective.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/layers/LayersDirective.js b/src/common/layers/LayersDirective.js index 4c37e6a4..a211d642 100644 --- a/src/common/layers/LayersDirective.js +++ b/src/common/layers/LayersDirective.js @@ -45,7 +45,7 @@ scope.reorderLayer = function(startIndex, endIndex) { var length = mapService.map.getLayers().getArray().length - 1; - var layer = mapService.map.removeLayer(mapService.map.getLayers().getAt(length - startIndex)); + var layer = mapService.map.removeLayer(mapService.map.getLayers().item(length - startIndex)); mapService.map.getLayers().insertAt(length - endIndex, layer); };