Updates

stevage · Mar 16, 2020 · 403061c · 403061c
1 parent 4448516
commit 403061c
Show file tree

Hide file tree

Showing 6 changed files with 1,344 additions and 53 deletions.
diff --git a/src/components/About.vue b/src/components/About.vue
@@ -13,7 +13,7 @@
         li To guide their choices of what to plant next.
         li To manage risk of branches falling.
         li To manage pruning, watering and inspection schedules.
-        li To plan ahead, so lots of old trees don't die at the same time.
+        li To plan for continuous canopy coverage as trees age.
     h4 There's a tree missing!
     p Every tree database is incomplete and out of date. A source might be missing a tree because:
         ul

diff --git a/src/components/FeatureInfo.vue b/src/components/FeatureInfo.vue
@@ -19,7 +19,7 @@ div
                 tr(v-if="p.genus")
                     th Genus/species
                     td {{ p.genus }} {{ p.species }}
-                //- tr(v-if="p.species")
+                //- tr(v-if="p.species")d
                 //-     th Species
                 //-     td {{ p.species }}
             tr(v-if="p.common")
@@ -73,9 +73,9 @@ div
         p.f7.gray.mh2.i.mv0 Source: 
             a(href="#" @click="clickSource") {{ sourceName }}
             span(v-if="p.updated")  ({{ p.updated }})
-            span(v-if="p.license")
+            span(v-if="license")
                 |  (
-                a(:href="`https://spdx.org/licenses/${p.license}`" target="_blank") {{ p.license }}
+                a(:href="`https://spdx.org/licenses/${license}`" target="_blank") {{ license }}
                 | )
 
         p.f7.mh2.gray.i.mv0 See on 
@@ -102,12 +102,15 @@ export default {
             if (!r.scientific && r.genus) {
                 r.scientific = r.genus + (r.species ? ` ${r.species}`:'');
             }
-            r.license="CC-BY-2.0"
             return r;
         },
         imageUrl() {
             return this.p && this.p.image_url
         },
+        license() {
+            const source = this.p.source && sources.find(s => s.id === this.p.source);
+            return source && source.license;
+        },
         showExtra() {
             return window.location.hash.match(/debug/);
         },

diff --git a/src/components/Map.vue b/src/components/Map.vue
@@ -57,7 +57,7 @@ export default {
                     type: 'Feature',
                     properties: {
                         ...source,
-                        topTree: (source.speciesCounts.length ? source.speciesCounts[0][0] : '')
+                        topTree: (source.speciesCounts && source.speciesCounts.length ? source.speciesCounts[0][0] : '')
                     },
                     geometry: {
                         type: 'Point',