Merge pull request #34 from opencdms/wmdr_import_fix

Import of data from oscar fixed.

Author: david-i-berry

src/web-components/data-table.vue

@@ -150,8 +150,8 @@ export default defineComponent({
         {title: "Host", value: "host_id", key: "host_id", sortable: false},
         {title: "Observed property", value: "observed_property_id", key: "observed_property_id", sortable: false},
         {title: "Result value", value: "result_value", key: "result_value", sortable: false},
-        {title: "Result units", value: "result_uom", key: "result_uom", sortable: false},
-        {title: "Result quality", value: "result_quality", key: "result_quality", sortable: false}
+        {title: "Result units", value: "result_uom", key: "result_uom", sortable: false}
+        //{title: "Result quality", value: "result_quality", key: "result_quality", sortable: false}
       ];
       console.log(items.value)
       console.log("Fetch complete")

src/web-components/maps/feature-map.vue

@@ -49,7 +49,11 @@ export default defineComponent({
           markerLayer.value = L.geoJSON(props.geom).addTo(map.value);
           map.value.fitBounds(markerLayer.value.getBounds());
           map.value.setZoom(6);
-          console.log("invalid geom");
+        }else{
+          console.log("invalid geom"); // data race ToDo fix
+          markerLayer.value = L.geoJSON(props.geom).addTo(map.value);
+          map.value.fitBounds(markerLayer.value.getBounds());
+          map.value.setZoom(6);
         }
       }else{
         console.log("No geometry");

src/web-components/station-import.vue

@@ -63,10 +63,11 @@
         });
 
         if(response.ok){
-          // reload host
-          await loadData(process.env.API + '/collections/stations/items?limit=1000&f=json', true)
-            .then( (result) => flatten_geojson(result.features) ).then( (result) => { useRepo(Host).save(result) });
-          var station_url = '#/station/' + wigos_identifier.value;
+          // load new host and navigate to details
+          var station_id = wigos_identifier.value
+          var new_host = await loadData(process.env.API + '/collections/stations/items/'+station_id + "?f=json", true)
+                              .then( (result) => flatten_geojson(result.features ? result.features : [result]) )
+                              .then( (result) => { useRepo(Host).save(result) });
           router.push('/station/'+wigos_identifier.value);
         }else{
           console.log(response);

src/web-components/station.vue

@@ -20,7 +20,7 @@
         </v-card>
       </v-col>
       <v-col :cols="6" align-self="center">
-        <feature-map :geom="geom" style="height: 500px;"/>
+        <feature-map :geom="geom" id="map" style="height: 500px;"/>
       </v-col>
     </v-row>
     <v-row>