diff --git a/package-lock.json b/package-lock.json index ea6b588..dd1474d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "axios": "^1.2.2", "class-transformer": "^0.5.1", "dayjs": "^1.10.7", - "leaflet": "^1.7.1", + "leaflet": "^1.9.4", "qs": "^6.10.1", "rxjs": "^7.5.5", "vue": "^3.2.47", diff --git a/package.json b/package.json index de5f0e1..9c2e95f 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "axios": "^1.2.2", "class-transformer": "^0.5.1", "dayjs": "^1.10.7", - "leaflet": "^1.7.1", + "leaflet": "^1.9.4", "qs": "^6.10.1", "rxjs": "^7.5.5", "vue": "^3.2.47", diff --git a/src/App.vue b/src/App.vue index 9b042da..ed37f71 100644 --- a/src/App.vue +++ b/src/App.vue @@ -166,6 +166,7 @@ export default App; \ No newline at end of file diff --git a/src/constants.ts b/src/constants.ts index acd7381..f689273 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,19 +1,13 @@ -// declare const POINT_URL: string; -// declare const EDGE_URL: string; declare const APP_URL: string; declare const VUE_API: string; declare const SOLR_HOST: string; declare const SOLR_CORE: string; -// const _EDGE_URL = EDGE_URL; -// const _POINT_URL = POINT_URL; const _APP_URL = APP_URL; const _VUE_API = VUE_API; const _SOLR_HOST = SOLR_HOST; const _SOLR_CORE = SOLR_CORE; -// export { _EDGE_URL as EDGE_URL }; -// export { _POINT_URL as POINT_URL }; export { _APP_URL as APP_URL }; export { _VUE_API as VUE_API }; export { _SOLR_HOST as SOLR_HOST }; diff --git a/src/models/dataset.ts b/src/models/dataset.ts index c3de319..0ec4832 100644 --- a/src/models/dataset.ts +++ b/src/models/dataset.ts @@ -264,6 +264,19 @@ export class DbDataset { return ""; } } + + /* Provides the bounds of the publication for the Leaflet minimap */ + public get Bounds(): L.LatLngBoundsLiteral | string { + if (this.coverage != undefined) { + return [ + [Number(this.coverage.y_min), Number(this.coverage.x_min)], // Southwest corner + [Number(this.coverage.y_max), Number(this.coverage.x_max)] // Northeast corner + ]; + } else { + return ""; + } + } + } type Nullable = T | undefined; diff --git a/src/search_page.html b/src/search_page.html deleted file mode 100644 index 0941616..0000000 --- a/src/search_page.html +++ /dev/null @@ -1,698 +0,0 @@ - - - - - - - - - It appears that your Javascript is disabled. To view results on - this page, you will need to enable it. You might want to visit our - lite results. - - 60% - - - - - - - - - - It looks like you're not logged in right now. you will need to - login to Pro or become a - Coil Member - to access the results. - - - - Login - - - Learn more about - Infinity Pro - - - Learn more about - Coil - - - - - - - - - - - Current Tabs - - - web - - - - - - - - - - images - - - - - - - - - - - videos - - - - - - - - - - - homepages - - - - - - - - - - - food - - - - - - - - - - - books - - - - - - - - - - - movies - - - - - - - - - - - - Add New Tabs - - - - - - Web - - - Images - - - Videos - - - Homepages - - - General - - - Food - - - Books - - - Movies - - - Music - - - Infinity - - Edu - Pdf - Qa - - Reddit - - - Fandom - - Coil - - No Javascript - - - Decentralized - - - - - - - Add - - - - - - - - Reset - - - - - - - - - - - - - - - - - - - - Wikipedia Results - - - - - - - - - - - - - - - DuckDuckGo Results - - - - - - - - - - - - - - - Google Results - - - - - - - - - - - - - - - Youtube Results - - - - - - - - - - - - - - - Amazon Results - - - - - - - - - - - - - - - Twitter Results - - - - - - - - - - - - - - - Reddit Results - - - - - - - - - - - - - - - GitHub Results - - - - - - - - - - - - - - - Reuters Results - - - - - - - - - - - - - - - - - - | - - - - - - | - - - - - - - - - - - - - - - - - Add - - - Cancel - - - - - Reset - - - - - - - - \ No newline at end of file diff --git a/src/views/dataset-detail.component/dataset-detail.component.ts b/src/views/dataset-detail.component/dataset-detail.component.ts index af8a4e9..279089e 100644 --- a/src/views/dataset-detail.component/dataset-detail.component.ts +++ b/src/views/dataset-detail.component/dataset-detail.component.ts @@ -1,3 +1,4 @@ +// detail-dataset.component.ts import { Component, Vue, Prop } from "vue-facing-decorator"; import { DbDataset } from "@/models/dataset"; import DatasetService from "../../services/dataset.service"; @@ -9,11 +10,14 @@ import { Suggestion } from "@/models/dataset"; import { VUE_API } from "@/constants"; // import DataMetricsBadge from "data-metrics-badge/dist/data-metrics-badge.js"; // import DataMetricsBadge from "@/components/datacite/DataMetricsBadge.vue"; +import Minimap from '@/components/minimap/Minimap.vue'; +import * as L from 'leaflet'; @Component({ name: "DatasetDetailComponent", components: { VsInput, + Minimap, // DataMetricsBadge, }, }) @@ -172,4 +176,6 @@ export default class DatasetDetailComponent extends Vue { citation += ", Wien"; return citation; } + + } diff --git a/src/views/dataset-detail.component/dataset-detail.component.vue b/src/views/dataset-detail.component/dataset-detail.component.vue index 0a94183..c8a3e9e 100644 --- a/src/views/dataset-detail.component/dataset-detail.component.vue +++ b/src/views/dataset-detail.component/dataset-detail.component.vue @@ -1,3 +1,4 @@ + - - @@ -186,6 +158,12 @@ + + + + + + Beitragende/Contributor @@ -322,11 +300,13 @@
Current Tabs
Add New Tabs
- - - - Wikipedia Results - - -
- - - - DuckDuckGo Results - - -
- - - - Google Results - - -
- - - - Youtube Results - - -
- - - - Amazon Results - - -
- - - - Twitter Results - - -
- - - - Reddit Results - - -
- - - - GitHub Results - - -
- - - - Reuters Results - - -