aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2015-02-02 16:35:10 +1300
committerAnton Tananaev <anton.tananaev@gmail.com>2015-02-02 16:35:10 +1300
commitb79c04d23c386198a5b62a9dc0f874f9c2d05d02 (patch)
treeca4d8a38446b35ed1049b01dcaee9403af66ca8c
parent902059bc467536ff11647af1cf2a61f776213841 (diff)
downloadtraccar-server-b79c04d23c386198a5b62a9dc0f874f9c2d05d02.tar.gz
traccar-server-b79c04d23c386198a5b62a9dc0f874f9c2d05d02.tar.bz2
traccar-server-b79c04d23c386198a5b62a9dc0f874f9c2d05d02.zip
Add Bing Maps init code
-rw-r--r--web/MapView.js13
-rw-r--r--web/index.html18
2 files changed, 18 insertions, 13 deletions
diff --git a/web/MapView.js b/web/MapView.js
index c248f02eb..4cc809860 100644
--- a/web/MapView.js
+++ b/web/MapView.js
@@ -23,9 +23,14 @@ Ext.define('MapView', {
listeners: {
afterrender: function() {
- var osm = new ol.layer.Tile({
- source: new ol.source.OSM({})
- });
+
+ /*var layer = new ol.layer.Tile({source: new ol.source.BingMaps({
+ key: 'AseEs0DLJhLlTNoxbNXu7DGsnnH4UoWuGue7-irwKkE3fffaClwc9q_Mr6AyHY8F',
+ imagerySet: 'Road'
+ })});*/
+
+ var layer = new ol.layer.Tile({source: new ol.source.OSM({
+ })});
var view = new ol.View({
center: ol.proj.transform(styles.map_center, 'EPSG:4326', 'EPSG:3857'),
@@ -35,7 +40,7 @@ Ext.define('MapView', {
this.map = new ol.Map({
target: this.body.dom.id,
- layers: [ osm ],
+ layers: [ layer ],
view: view
});
},
diff --git a/web/index.html b/web/index.html
index 2fa9304c5..ef4900bfb 100644
--- a/web/index.html
+++ b/web/index.html
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html>
<head>
- <title>Traccar</title>
- <link rel="stylesheet" type="text/css" href="//cdn.sencha.com/ext/gpl/5.1.0/build/packages/ext-theme-neptune/build/resources/ext-theme-neptune-all.css">
- <link rel="stylesheet" type="text/css" href="//openlayers.org/en/v3.1.1/css/ol.css">
- <script type="text/javascript" src="//cdn.sencha.com/ext/gpl/5.1.0/build/ext-all.js"></script>
- <script type="text/javascript" src="//cdn.sencha.com/ext/gpl/5.1.0/build/packages/ext-theme-neptune/build/ext-theme-neptune.js"></script>
- <script type="text/javascript" src="http://openlayers.org/en/v3.1.1/build/ol.js"></script>
- <script type ="text/javascript" src="Strings.js"></script>
- <script type ="text/javascript" src="Styles.js"></script>
- <script type ="text/javascript" src="Application.js"></script>
+<title>Traccar</title>
+<link rel="stylesheet" type="text/css" href="//cdn.sencha.com/ext/gpl/5.1.0/build/packages/ext-theme-neptune/build/resources/ext-theme-neptune-all.css">
+<link rel="stylesheet" type="text/css" href="//openlayers.org/en/v3.1.1/css/ol.css">
+<script type="text/javascript" src="//cdn.sencha.com/ext/gpl/5.1.0/build/ext-all.js"></script>
+<script type="text/javascript" src="//cdn.sencha.com/ext/gpl/5.1.0/build/packages/ext-theme-neptune/build/ext-theme-neptune.js"></script>
+<script type="text/javascript" src="//openlayers.org/en/v3.1.1/build/ol.js"></script>
+<script type ="text/javascript" src="Strings.js"></script>
+<script type ="text/javascript" src="Styles.js"></script>
+<script type ="text/javascript" src="Application.js"></script>
</head>
<body>
</body>