fail silently on dataset load error in 3d (ref #153)

knreise · Oct 30, 2015 · 83c0421 · 83c0421
1 parent b7b1217
commit 83c0421
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 10 deletions.
diff --git a/common/js/CesiumMap.js b/common/js/CesiumMap.js
@@ -260,10 +260,12 @@ KR.CesiumMap = function (div, cesiumOptions, bounds) {
                 var dataSource = Cesium.GeoJsonDataSource.load(data);
                 callback(dataSource);
             });
+        }, function (err) {
+            callback();
         });
     }
 
-    function loadDataset2(dataset, bbox, api, extraProps, callback) {
+    function loadDataset2(dataset, bbox, api, extraProps) {
         api.getBbox(dataset, bbox, function (res) {
             _.each(res.features, function (feature) {
                 feature.properties = _.extend(feature.properties, extraProps);
@@ -284,6 +286,8 @@ KR.CesiumMap = function (div, cesiumOptions, bounds) {
 
                 addMarkers(markers);
             });
+        }, function (err) {
+            console.warn('could not load dataset', dataset);
         });
     }
 

diff --git a/common/js/SidebarContent.js b/common/js/SidebarContent.js
@@ -32,7 +32,7 @@ var KR = this.KR || {};
 
 
         function _showPosition() {
-            if (div && map.userPosition && feature) {
+            if (div && map && map.userPosition && feature) {
 
                 if (content) {
                     content.remove();

diff --git a/demonstratorer/trondheim.html b/demonstratorer/trondheim.html
@@ -6,7 +6,17 @@
 
         <title>KNReise - Trondheim</title>
 
-        <link href='../dist/style_external.css' rel='stylesheet' />
+
+        <link href='../bower_components/components-font-awesome/css/font-awesome.min.css' rel='stylesheet' />
+        <link href='../bower_components/leaflet/dist/leaflet.css' rel='stylesheet' />
+        <link href='../bower_components/bootstrap/dist/css/bootstrap.min.css' rel='stylesheet' />
+        <link href='../bower_components/leaflet-sidebar/src/L.Control.Sidebar.css' rel='stylesheet' />
+        <link href='../bower_components/leaflet.knreise-markers/dist/leaflet.knreise-markers.css' rel='stylesheet' />
+        <link href='../bower_components/leaflet.markercluster/dist/MarkerCluster.css' rel='stylesheet' />
+        <link href='../bower_components/leaflet.markercluster/dist/MarkerCluster.Default.css' rel='stylesheet' />
+        <link href='../bower_components/Leaflet.Photo/Leaflet.Photo.css' rel='stylesheet' />
+        <link href='../bower_components/video.js/dist/video-js/video-js.css' rel='stylesheet' />
+        <link href='../bower_components/cilogi-marker/dist/cilogi-marker.css' rel='stylesheet' />
         <link href='../dist/style.css' rel='stylesheet' />
 
         <meta name="apple-mobile-web-app-capable" content="yes">

diff --git a/dist/scripts.js b/dist/scripts.js
@@ -1608,7 +1608,7 @@ var KR = this.KR || {};
 
 
         function _showPosition() {
-            if (div && map.userPosition && feature) {
+            if (div && map && map.userPosition && feature) {
 
                 if (content) {
                     content.remove();

diff --git a/dist/scripts.min.js b/dist/scripts.min.js
diff --git a/dist/scripts3d.js b/dist/scripts3d.js
@@ -1456,10 +1456,12 @@ KR.CesiumMap = function (div, cesiumOptions, bounds) {
                 var dataSource = Cesium.GeoJsonDataSource.load(data);
                 callback(dataSource);
             });
+        }, function (err) {
+            callback();
         });
     }
 
-    function loadDataset2(dataset, bbox, api, extraProps, callback) {
+    function loadDataset2(dataset, bbox, api, extraProps) {
         api.getBbox(dataset, bbox, function (res) {
             _.each(res.features, function (feature) {
                 feature.properties = _.extend(feature.properties, extraProps);
@@ -1480,6 +1482,8 @@ KR.CesiumMap = function (div, cesiumOptions, bounds) {
 
                 addMarkers(markers);
             });
+        }, function (err) {
+            console.warn('could not load dataset', dataset);
         });
     }
 
@@ -1635,7 +1639,7 @@ var KR = this.KR || {};
 
 
         function _showPosition() {
-            if (div && map.userPosition && feature) {
+            if (div && map && map.userPosition && feature) {
 
                 if (content) {
                     content.remove();

diff --git a/dist/scripts3d.min.js b/dist/scripts3d.min.js