You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by om...@apache.org on 2016/06/16 10:09:41 UTC
[1/2] climate git commit: Implementing a multilingual map in ocw UI
Repository: climate
Updated Branches:
refs/heads/master 6b9fae9d5 -> de573a5ca
Implementing a multilingual map in ocw UI
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/dd2985d2
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/dd2985d2
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/dd2985d2
Branch: refs/heads/master
Commit: dd2985d24e4f518ae09740afb03d9f6865318ade
Parents: 6b9fae9
Author: Omkar20895 <om...@gmail.com>
Authored: Wed Jun 15 18:03:51 2016 +0530
Committer: Omkar20895 <om...@gmail.com>
Committed: Wed Jun 15 18:03:51 2016 +0530
----------------------------------------------------------------------
ocw-ui/frontend/app/scripts/directives/leafletmap.js | 5 ++++-
ocw-ui/frontend/app/scripts/directives/previewmap.js | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/dd2985d2/ocw-ui/frontend/app/scripts/directives/leafletmap.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/scripts/directives/leafletmap.js b/ocw-ui/frontend/app/scripts/directives/leafletmap.js
index 9b0a6eb..859a93e 100644
--- a/ocw-ui/frontend/app/scripts/directives/leafletmap.js
+++ b/ocw-ui/frontend/app/scripts/directives/leafletmap.js
@@ -40,7 +40,10 @@ angular.module('ocwUiApp')
worldCopyJump: true,
});
- L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {}).addTo($rootScope.map);
+ L.tileLayer('http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png', {
+ attribution: '© <a href="http://www.thunderforest.com/">Thunderforest</a>, © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
+ maxZoom: 19
+ }).addTo($rootScope.map);
}
};
});
http://git-wip-us.apache.org/repos/asf/climate/blob/dd2985d2/ocw-ui/frontend/app/scripts/directives/previewmap.js
----------------------------------------------------------------------
diff --git a/ocw-ui/frontend/app/scripts/directives/previewmap.js b/ocw-ui/frontend/app/scripts/directives/previewmap.js
index 78aae8c..600d2f2 100644
--- a/ocw-ui/frontend/app/scripts/directives/previewmap.js
+++ b/ocw-ui/frontend/app/scripts/directives/previewmap.js
@@ -47,7 +47,10 @@ angular.module('ocwUiApp')
worldCopyJump: true,
});
- L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {}).addTo(map);
+ L.tileLayer('http://{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png', {
+ attribution: '© <a href="http://www.thunderforest.com/">Thunderforest</a>, © <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a>',
+ maxZoom: 19
+ }).addTo(map);
// Zoom the map to the dataset bound regions (or at least try our best to do so)
var datasetBounds = [[scope.dataset.latlonVals.latMax, scope.dataset.latlonVals.lonMin],
[2/2] climate git commit: Implementing a multilingual map in ocw UI
this closes #356
Posted by om...@apache.org.
Implementing a multilingual map in ocw UI this closes #356
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/de573a5c
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/de573a5c
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/de573a5c
Branch: refs/heads/master
Commit: de573a5ca140cfe279a55c8ce7082b0245de4915
Parents: 6b9fae9 dd2985d
Author: Omkar20895 <om...@gmail.com>
Authored: Thu Jun 16 15:39:29 2016 +0530
Committer: Omkar20895 <om...@gmail.com>
Committed: Thu Jun 16 15:39:29 2016 +0530
----------------------------------------------------------------------
ocw-ui/frontend/app/scripts/directives/leafletmap.js | 5 ++++-
ocw-ui/frontend/app/scripts/directives/previewmap.js | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------