merge master

knreise · Nov 12, 2015 · 8fdfdc6 · 8fdfdc6
2 parents f1d4e55 + 0db40e9
commit 8fdfdc6
Show file tree

Hide file tree

Showing 21 changed files with 321 additions and 42 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "kulturraadet-demonstratorer",
-  "version": "0.0.17",
+  "version": "0.0.18",
   "authors": [
     "Atle Frenvik Sveen <[email protected]>"
   ],

diff --git a/common/js/datasets.js b/common/js/datasets.js
@@ -94,6 +94,7 @@ KR.Config = KR.Config || {};
             'ark_hist': {
                 grouped: true,
                 name: 'Arkeologi og historie',
+                minZoom: 14,
                 datasets: [
                     {
                         name: 'MUSIT',
@@ -156,6 +157,7 @@ KR.Config = KR.Config || {};
             'arkeologi': {
                 grouped: true,
                 name: 'Arkeologi',
+                minZoom: 14,
                 style: {
                     fillcolor: '#436978',
                     circle: false,
@@ -196,6 +198,7 @@ KR.Config = KR.Config || {};
             'historie': {
                 grouped: true,
                 name: 'Historie',
+                minZoom: 14,
                 style: {
                     fillcolor: '#D252B9',
                     circle: false,

diff --git a/common/js/setupMap.js b/common/js/setupMap.js
@@ -18,22 +18,36 @@ var KR = this.KR || {};
 
     function _getFilter(buffer) {
         return function (featureCollection) {
+
             if (!featureCollection || !featureCollection.features.length) {
                 return featureCollection;
             }
-            if (featureCollection.features[0].geometry.type.indexOf('Polygon') === -1) {
-                return turf.within(featureCollection, buffer);
+
+            var type = featureCollection.features[0].geometry.type;
+
+            if (type.indexOf('Polygon') > -1) {
+                var intersects =  _.filter(featureCollection.features, function (feature) {
+                    var bbox = turf.extent(feature);
+                    var bboxPolygon = turf.bboxPolygon(bbox);
+                    return !!turf.intersect(bboxPolygon, buffer.features[0]);
+                });
+                return KR.Util.createFeatureCollection(intersects);
             }
-            var intersects =  _.filter(featureCollection.features, function (feature) {
-                var bbox = turf.extent(feature);
-                var bboxPolygon = turf.bboxPolygon(bbox);
-                return !!turf.intersect(bboxPolygon, buffer.features[0]);
-            });
-            return KR.Util.createFeatureCollection(intersects);
+
+            if (type.indexOf('MultiLineString') > -1) {
+                var intersects =  _.filter(featureCollection.features, function (feature) {
+                    var bbox = turf.extent(feature);
+                    var bboxPolygon = turf.bboxPolygon(bbox);
+                    return !!turf.intersect(bboxPolygon, buffer.features[0]);
+                });
+                return KR.Util.createFeatureCollection(intersects);
+            }
+
+            return turf.within(featureCollection, buffer);
+
         };
     }
 
-
     function _loadDatasets(api, datasets, fromUrl, komm, fylke) {
         if (fromUrl) {
             datasets = KR.Config.getDatasets(datasets, api, komm, fylke);
@@ -69,6 +83,7 @@ var KR = this.KR || {};
                 var layer = L.geoJson(geoJson);
 
                 var filter = _getFilter(geoJson);
+
                 callback(layer.getBounds(), datasets, filter, null, initPos);
             });
         } else {

diff --git a/dist/scripts.js b/dist/scripts.js
@@ -3274,7 +3274,6 @@ KR.Config = KR.Config || {};
                 fillOpacity: 0.4
             });
             if (_loadEnkeltminner) {
-                console.log("loadEnkeltminner")
                 _loadEnkeltminner(e.layer.feature);
             }
         }
@@ -3492,6 +3491,7 @@ KR.Config = KR.Config || {};
             'ark_hist': {
                 grouped: true,
                 name: 'Arkeologi og historie',
+                minZoom: 14,
                 datasets: [
                     {
                         name: 'MUSIT',
@@ -3554,6 +3554,7 @@ KR.Config = KR.Config || {};
             'arkeologi': {
                 grouped: true,
                 name: 'Arkeologi',
+                minZoom: 14,
                 style: {
                     fillcolor: '#436978',
                     circle: false,
@@ -3594,6 +3595,7 @@ KR.Config = KR.Config || {};
             'historie': {
                 grouped: true,
                 name: 'Historie',
+                minZoom: 14,
                 style: {
                     fillcolor: '#D252B9',
                     circle: false,
@@ -4216,22 +4218,36 @@ var KR = this.KR || {};
 
     function _getFilter(buffer) {
         return function (featureCollection) {
+
             if (!featureCollection || !featureCollection.features.length) {
                 return featureCollection;
             }
-            if (featureCollection.features[0].geometry.type.indexOf('Polygon') === -1) {
-                return turf.within(featureCollection, buffer);
+
+            var type = featureCollection.features[0].geometry.type;
+
+            if (type.indexOf('Polygon') > -1) {
+                var intersects =  _.filter(featureCollection.features, function (feature) {
+                    var bbox = turf.extent(feature);
+                    var bboxPolygon = turf.bboxPolygon(bbox);
+                    return !!turf.intersect(bboxPolygon, buffer.features[0]);
+                });
+                return KR.Util.createFeatureCollection(intersects);
             }
-            var intersects =  _.filter(featureCollection.features, function (feature) {
-                var bbox = turf.extent(feature);
-                var bboxPolygon = turf.bboxPolygon(bbox);
-                return !!turf.intersect(bboxPolygon, buffer.features[0]);
-            });
-            return KR.Util.createFeatureCollection(intersects);
+
+            if (type.indexOf('MultiLineString') > -1) {
+                var intersects =  _.filter(featureCollection.features, function (feature) {
+                    var bbox = turf.extent(feature);
+                    var bboxPolygon = turf.bboxPolygon(bbox);
+                    return !!turf.intersect(bboxPolygon, buffer.features[0]);
+                });
+                return KR.Util.createFeatureCollection(intersects);
+            }
+
+            return turf.within(featureCollection, buffer);
+
         };
     }
 
-
     function _loadDatasets(api, datasets, fromUrl, komm, fylke) {
         if (fromUrl) {
             datasets = KR.Config.getDatasets(datasets, api, komm, fylke);
@@ -4267,6 +4283,7 @@ var KR = this.KR || {};
                 var layer = L.geoJson(geoJson);
 
                 var filter = _getFilter(geoJson);
+
                 callback(layer.getBounds(), datasets, filter, null, initPos);
             });
         } else {

diff --git a/dist/scripts.min.js b/dist/scripts.min.js
diff --git a/dist/scripts3d.js b/dist/scripts3d.js
@@ -2606,7 +2606,6 @@ KR.Config = KR.Config || {};
                 fillOpacity: 0.4
             });
             if (_loadEnkeltminner) {
-                console.log("loadEnkeltminner")
                 _loadEnkeltminner(e.layer.feature);
             }
         }
@@ -2824,6 +2823,7 @@ KR.Config = KR.Config || {};
             'ark_hist': {
                 grouped: true,
                 name: 'Arkeologi og historie',
+                minZoom: 14,
                 datasets: [
                     {
                         name: 'MUSIT',
@@ -2886,6 +2886,7 @@ KR.Config = KR.Config || {};
             'arkeologi': {
                 grouped: true,
                 name: 'Arkeologi',
+                minZoom: 14,
                 style: {
                     fillcolor: '#436978',
                     circle: false,
@@ -2926,6 +2927,7 @@ KR.Config = KR.Config || {};
             'historie': {
                 grouped: true,
                 name: 'Historie',
+                minZoom: 14,
                 style: {
                     fillcolor: '#D252B9',
                     circle: false,

diff --git a/dist/scripts3d.min.js b/dist/scripts3d.min.js
diff --git a/experiments/api_example.html b/experiments/api_example.html
@@ -440,7 +440,7 @@ <h3><%= name %></h3>
     </tr>
 </table>
 
-<a class="sidebar-link" href="<%= url %>" target="_blank">
+<a class="sidebar-link" href="<%= link %>" target="_blank">
   <i class="fa fa-external-link-square"></i> Vis hos Kulturminnesøk
 </a>
 
@@ -490,11 +490,33 @@ <h3><%= title %></h3>
 
 <% if(!_.isUndefined(arguments[0].extra)) { %>
   <img class="fullwidth img-thumbnail" src="<%= extra.UrlTilBilde %>" />
+<<<<<<< HEAD
+  <table class="sidebar-table">
+    <tr>
+      <td>Tittel</td>
+      <td><%= extra.Tittel %></td>
+    </tr>
+    <tr>
+      <td>Registrert Av</td>
+      <td><%= extra.RegistrertAv %></td>
+    </tr>
+    <tr>
+      <td>Fotograf</td>
+      <td><%= extra.OpphavspersonFotograf %></td>
+    </tr>
+    <tr>
+      <td>Copyright</td>
+      <td><%= extra.Copyright %></td>
+    </tr>
+  </table>
+
+=======
   <p class="small sidebar-image-text grey">
   	<b><%= extra.Tittel %></b> - Foto: <%= extra.OpphavspersonFotograf %><br>
   	<%= extra.Copyright %>
   </p>
 
+>>>>>>> master
 <% } %>
 
 

diff --git a/experiments/cesium_base.html b/experiments/cesium_base.html
@@ -448,7 +448,7 @@ <h3><%= name %></h3>
     </tr>
 </table>
 
-<a class="sidebar-link" href="<%= url %>" target="_blank">
+<a class="sidebar-link" href="<%= link %>" target="_blank">
   <i class="fa fa-external-link-square"></i> Vis hos Kulturminnesøk
 </a>
 
@@ -498,11 +498,33 @@ <h3><%= title %></h3>
 
 <% if(!_.isUndefined(arguments[0].extra)) { %>
   <img class="fullwidth img-thumbnail" src="<%= extra.UrlTilBilde %>" />
+<<<<<<< HEAD
+  <table class="sidebar-table">
+    <tr>
+      <td>Tittel</td>
+      <td><%= extra.Tittel %></td>
+    </tr>
+    <tr>
+      <td>Registrert Av</td>
+      <td><%= extra.RegistrertAv %></td>
+    </tr>
+    <tr>
+      <td>Fotograf</td>
+      <td><%= extra.OpphavspersonFotograf %></td>
+    </tr>
+    <tr>
+      <td>Copyright</td>
+      <td><%= extra.Copyright %></td>
+    </tr>
+  </table>
+
+=======
   <p class="small sidebar-image-text grey">
   	<b><%= extra.Tittel %></b> - Foto: <%= extra.OpphavspersonFotograf %><br>
   	<%= extra.Copyright %>
   </p>
 
+>>>>>>> master
 <% } %>
 
 

diff --git a/experiments/cesium_folgefonna.html b/experiments/cesium_folgefonna.html
@@ -545,7 +545,7 @@ <h3><%= name %></h3>
     </tr>
 </table>
 
-<a class="sidebar-link" href="<%= url %>" target="_blank">
+<a class="sidebar-link" href="<%= link %>" target="_blank">
   <i class="fa fa-external-link-square"></i> Vis hos Kulturminnesøk
 </a>
 
@@ -595,11 +595,33 @@ <h3><%= title %></h3>
 
 <% if(!_.isUndefined(arguments[0].extra)) { %>
   <img class="fullwidth img-thumbnail" src="<%= extra.UrlTilBilde %>" />
+<<<<<<< HEAD
+  <table class="sidebar-table">
+    <tr>
+      <td>Tittel</td>
+      <td><%= extra.Tittel %></td>
+    </tr>
+    <tr>
+      <td>Registrert Av</td>
+      <td><%= extra.RegistrertAv %></td>
+    </tr>
+    <tr>
+      <td>Fotograf</td>
+      <td><%= extra.OpphavspersonFotograf %></td>
+    </tr>
+    <tr>
+      <td>Copyright</td>
+      <td><%= extra.Copyright %></td>
+    </tr>
+  </table>
+
+=======
   <p class="small sidebar-image-text grey">
   	<b><%= extra.Tittel %></b> - Foto: <%= extra.OpphavspersonFotograf %><br>
   	<%= extra.Copyright %>
   </p>
 
+>>>>>>> master
 <% } %>
 
 

diff --git a/experiments/cesium_terrain.html b/experiments/cesium_terrain.html
@@ -519,7 +519,7 @@ <h3><%= name %></h3>
     </tr>
 </table>
 
-<a class="sidebar-link" href="<%= url %>" target="_blank">
+<a class="sidebar-link" href="<%= link %>" target="_blank">
   <i class="fa fa-external-link-square"></i> Vis hos Kulturminnesøk
 </a>
 
@@ -569,11 +569,33 @@ <h3><%= title %></h3>
 
 <% if(!_.isUndefined(arguments[0].extra)) { %>
   <img class="fullwidth img-thumbnail" src="<%= extra.UrlTilBilde %>" />
+<<<<<<< HEAD
+  <table class="sidebar-table">
+    <tr>
+      <td>Tittel</td>
+      <td><%= extra.Tittel %></td>
+    </tr>
+    <tr>
+      <td>Registrert Av</td>
+      <td><%= extra.RegistrertAv %></td>
+    </tr>
+    <tr>
+      <td>Fotograf</td>
+      <td><%= extra.OpphavspersonFotograf %></td>
+    </tr>
+    <tr>
+      <td>Copyright</td>
+      <td><%= extra.Copyright %></td>
+    </tr>
+  </table>
+
+=======
   <p class="small sidebar-image-text grey">
   	<b><%= extra.Tittel %></b> - Foto: <%= extra.OpphavspersonFotograf %><br>
   	<%= extra.Copyright %>
   </p>
 
+>>>>>>> master
 <% } %>