forked from MapComplete/MapComplete
UX: plantnet shows better error message if no plant is detected
This commit is contained in:
parent
ea640468e8
commit
875b3a3ea8
4 changed files with 47 additions and 979 deletions
|
|
@ -738,6 +738,7 @@
|
|||
},
|
||||
"loadingWikidata": "Loading information about {species}…",
|
||||
"matchPercentage": "{match}% match",
|
||||
"noPlantDetected": "No plants were detected in those images",
|
||||
"overviewIntro": "The AI on <a href='https://plantnet.org/' target='_blank'>plantnet.org</a> thinks the images show the species below.",
|
||||
"overviewTitle": "Automatically detected species",
|
||||
"overviewVerify": "Please verify that correct species and link it to the tree",
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ export default class PlantNet {
|
|||
public static baseUrl =
|
||||
"https://my-api.plantnet.org/v2/identify/all?api-key=2b10AAsjzwzJvucA5Ncm5qxe"
|
||||
|
||||
public static query(imageUrls: string[]): Promise<PlantNetResult> {
|
||||
public static async query(imageUrls: string[]): Promise<PlantNetResult | "no_plant_detected"> {
|
||||
if (imageUrls.length > 5) {
|
||||
throw "At most 5 images can be given to PlantNet.query"
|
||||
}
|
||||
|
|
@ -15,974 +15,24 @@ export default class PlantNet {
|
|||
for (const image of imageUrls) {
|
||||
url += "&images=" + encodeURIComponent(image)
|
||||
}
|
||||
return Utils.downloadJsonCached(url, 365 * 24 * 60 * 60 * 1000, undefined, true)
|
||||
|
||||
const result = await Utils.downloadJsonCachedAdvanced(url, 365 * 24 * 60 * 60 * 1000, undefined, true, 1)
|
||||
if (result["content"]) {
|
||||
return result["content"]
|
||||
}
|
||||
const errResult = <{
|
||||
"statusCode": 404,
|
||||
"error": "Not Found",
|
||||
"message": "Species not found" | string
|
||||
}>JSON.parse(result["errContent"])
|
||||
if (errResult.message === "Species not found") {
|
||||
return "no_plant_detected"
|
||||
}
|
||||
const err = result["error"]
|
||||
console.log("Get error result:", err, ">>>>", result["errContent"])
|
||||
throw err
|
||||
}
|
||||
|
||||
public static exampleResult: PlantNetResult = {
|
||||
query: {
|
||||
project: "all",
|
||||
images: [
|
||||
"https://my.plantnet.org/images/image_1.jpeg",
|
||||
"https://my.plantnet.org/images/image_2.jpeg",
|
||||
],
|
||||
organs: ["flower", "leaf"],
|
||||
includeRelatedImages: false,
|
||||
},
|
||||
language: "en",
|
||||
preferedReferential: "the-plant-list",
|
||||
bestMatch: "Hibiscus rosa-sinensis L.",
|
||||
results: [
|
||||
{
|
||||
score: 0.91806,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus rosa-sinensis",
|
||||
scientificNameAuthorship: "L.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Hawaiian hibiscus", "Hibiscus", "Chinese hibiscus"],
|
||||
scientificName: "Hibiscus rosa-sinensis L.",
|
||||
},
|
||||
gbif: { id: "3152559" },
|
||||
},
|
||||
{
|
||||
score: 0.00759,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus moscheutos",
|
||||
scientificNameAuthorship: "L.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Crimsoneyed rosemallow", "Mallow-rose", "Swamp rose-mallow"],
|
||||
scientificName: "Hibiscus moscheutos L.",
|
||||
},
|
||||
gbif: { id: "3152596" },
|
||||
},
|
||||
{
|
||||
score: 0.00676,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus schizopetalus",
|
||||
scientificNameAuthorship: "(Dyer) Hook.f.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Campanilla", "Chinese lantern", "Fringed rosemallow"],
|
||||
scientificName: "Hibiscus schizopetalus (Dyer) Hook.f.",
|
||||
},
|
||||
gbif: { id: "9064581" },
|
||||
},
|
||||
{
|
||||
score: 0.00544,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus palustris",
|
||||
scientificNameAuthorship: "L.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Swamp Rose Mallow", "Hardy Hidiscus", "Twisted Hibiscus"],
|
||||
scientificName: "Hibiscus palustris L.",
|
||||
},
|
||||
gbif: { id: "6377046" },
|
||||
},
|
||||
{
|
||||
score: 0.0047,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus sabdariffa",
|
||||
scientificNameAuthorship: "L.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Indian-sorrel", "Roselle", "Jamaica-sorrel"],
|
||||
scientificName: "Hibiscus sabdariffa L.",
|
||||
},
|
||||
gbif: { id: "3152582" },
|
||||
},
|
||||
{
|
||||
score: 0.0037,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Abelmoschus moschatus",
|
||||
scientificNameAuthorship: "Medik.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Abelmoschus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Abelmoschus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Musk okra", "Musk-mallow", "Tropical jewel-hibiscus"],
|
||||
scientificName: "Abelmoschus moschatus Medik.",
|
||||
},
|
||||
gbif: { id: "8312665" },
|
||||
},
|
||||
{
|
||||
score: 0.00278,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus grandiflorus",
|
||||
scientificNameAuthorship: "Michx.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Swamp rosemallow", "Swamp Rose-Mallow"],
|
||||
scientificName: "Hibiscus grandiflorus Michx.",
|
||||
},
|
||||
gbif: { id: "3152592" },
|
||||
},
|
||||
{
|
||||
score: 0.00265,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus acetosella",
|
||||
scientificNameAuthorship: "Welw. ex Hiern",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["False roselle", "Red-leaf hibiscus", "African rosemallow"],
|
||||
scientificName: "Hibiscus acetosella Welw. ex Hiern",
|
||||
},
|
||||
gbif: { id: "3152551" },
|
||||
},
|
||||
{
|
||||
score: 0.00253,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Bixa orellana",
|
||||
scientificNameAuthorship: "L.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Bixa",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Bixa",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Bixaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Bixaceae",
|
||||
},
|
||||
commonNames: ["Arnatto", "Lipsticktree", "Annatto"],
|
||||
scientificName: "Bixa orellana L.",
|
||||
},
|
||||
gbif: { id: "2874863" },
|
||||
},
|
||||
{
|
||||
score: 0.00179,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malvaviscus penduliflorus",
|
||||
scientificNameAuthorship: "Moc. & Sessé ex DC.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malvaviscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaviscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Mazapan"],
|
||||
scientificName: "Malvaviscus penduliflorus Moc. & Sessé ex DC.",
|
||||
},
|
||||
gbif: { id: "3152776" },
|
||||
},
|
||||
{
|
||||
score: 0.00145,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus diversifolius",
|
||||
scientificNameAuthorship: "Jacq.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: ["Cape hibiscus", "Swamp hibiscus", "Comfortroot"],
|
||||
scientificName: "Hibiscus diversifolius Jacq.",
|
||||
},
|
||||
gbif: { id: "7279239" },
|
||||
},
|
||||
{
|
||||
score: 0.00141,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hippeastrum reginae",
|
||||
scientificNameAuthorship: "(L.) Herb.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hippeastrum",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hippeastrum",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Amaryllidaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Amaryllidaceae",
|
||||
},
|
||||
commonNames: ["Amaryllis", "Cheryl's Treasure", "Easter lily"],
|
||||
scientificName: "Hippeastrum reginae (L.) Herb.",
|
||||
},
|
||||
gbif: { id: "2854474" },
|
||||
},
|
||||
{
|
||||
score: 0.00114,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus martianus",
|
||||
scientificNameAuthorship: "Zucc.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"Heartleaf rosemallow",
|
||||
"Mountain rosemallow",
|
||||
"Heartleaf rose-mallow",
|
||||
],
|
||||
scientificName: "Hibiscus martianus Zucc.",
|
||||
},
|
||||
gbif: { id: "3152578" },
|
||||
},
|
||||
{
|
||||
score: 0.00109,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Acalypha hispida",
|
||||
scientificNameAuthorship: "Burm.f.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Acalypha",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Acalypha",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Euphorbiaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Euphorbiaceae",
|
||||
},
|
||||
commonNames: ["Philippine-medusa", "Bristly copperleaf", "Chenilleplant"],
|
||||
scientificName: "Acalypha hispida Burm.f.",
|
||||
},
|
||||
gbif: { id: "3056375" },
|
||||
},
|
||||
{
|
||||
score: 0.00071,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Hibiscus arnottianus",
|
||||
scientificNameAuthorship: "A. Gray",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Hibiscus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Hibiscus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Malvaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malvaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"White rosemallow",
|
||||
"Native Hawaiian White Hibiscus",
|
||||
"Native White Rose-Mallow",
|
||||
],
|
||||
scientificName: "Hibiscus arnottianus A. Gray",
|
||||
},
|
||||
gbif: { id: "3152543" },
|
||||
},
|
||||
],
|
||||
version: "2022-06-14 (6.0)",
|
||||
remainingIdentificationRequests: 499,
|
||||
}
|
||||
public static exampleResultPrunus: PlantNetResult = {
|
||||
query: {
|
||||
project: "all",
|
||||
images: ["https://i.imgur.com/VJp1qG1.jpg"],
|
||||
organs: ["auto"],
|
||||
includeRelatedImages: false,
|
||||
},
|
||||
language: "en",
|
||||
preferedReferential: "the-plant-list",
|
||||
bestMatch: "Malus halliana Koehne",
|
||||
results: [
|
||||
{
|
||||
score: 0.23548,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus halliana",
|
||||
scientificNameAuthorship: "Koehne",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Hall crab apple", "Adirondack Crabapple", "Hall's crabapple"],
|
||||
scientificName: "Malus halliana Koehne",
|
||||
},
|
||||
gbif: { id: "3001220" },
|
||||
},
|
||||
{
|
||||
score: 0.1514,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus campanulata",
|
||||
scientificNameAuthorship: "Maxim.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Formosan cherry", "Bellflower cherry", "Taiwan cherry"],
|
||||
scientificName: "Prunus campanulata Maxim.",
|
||||
},
|
||||
gbif: { id: "3021408" },
|
||||
},
|
||||
{
|
||||
score: 0.14758,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus coronaria",
|
||||
scientificNameAuthorship: "(L.) Mill.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Sweet crab apple", "American crabapple", "Fragrant crabapple"],
|
||||
scientificName: "Malus coronaria (L.) Mill.",
|
||||
},
|
||||
gbif: { id: "3001166" },
|
||||
},
|
||||
{
|
||||
score: 0.13092,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus serrulata",
|
||||
scientificNameAuthorship: "Lindl.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"Japanese flowering cherry",
|
||||
"Japanese cherry",
|
||||
"Oriental cherry",
|
||||
],
|
||||
scientificName: "Prunus serrulata Lindl.",
|
||||
},
|
||||
gbif: { id: "3022609" },
|
||||
},
|
||||
{
|
||||
score: 0.10147,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus floribunda",
|
||||
scientificNameAuthorship: "Siebold ex Van Houtte",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"Japanese flowering Crabapple",
|
||||
"Japanese crab",
|
||||
"Japanese crab apple",
|
||||
],
|
||||
scientificName: "Malus floribunda Siebold ex Van Houtte",
|
||||
},
|
||||
gbif: { id: "3001365" },
|
||||
},
|
||||
{
|
||||
score: 0.05122,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus sargentii",
|
||||
scientificNameAuthorship: "Rehder",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"Sargent's cherry",
|
||||
"Northern Japanese hill cherry",
|
||||
"Sargent Cherry",
|
||||
],
|
||||
scientificName: "Prunus sargentii Rehder",
|
||||
},
|
||||
gbif: { id: "3020955" },
|
||||
},
|
||||
{
|
||||
score: 0.02576,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus × spectabilis",
|
||||
scientificNameAuthorship: "(Sol.) Borkh.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Asiatic apple", "Chinese crab", "Chinese flowering apple"],
|
||||
scientificName: "Malus × spectabilis (Sol.) Borkh.",
|
||||
},
|
||||
gbif: { id: "3001108" },
|
||||
},
|
||||
{
|
||||
score: 0.01802,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus triloba",
|
||||
scientificNameAuthorship: "Lindl.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Flowering almond", "Flowering plum"],
|
||||
scientificName: "Prunus triloba Lindl.",
|
||||
},
|
||||
gbif: { id: "3023130" },
|
||||
},
|
||||
{
|
||||
score: 0.01206,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus japonica",
|
||||
scientificNameAuthorship: "Thunb.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"Chinese bush cherry",
|
||||
"Japanese bush cherry",
|
||||
"Oriental bush cherry",
|
||||
],
|
||||
scientificName: "Prunus japonica Thunb.",
|
||||
},
|
||||
gbif: { id: "3020565" },
|
||||
},
|
||||
{
|
||||
score: 0.01161,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus × yedoensis",
|
||||
scientificNameAuthorship: "Matsum.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Yoshino cherry", "Potomac cherry", "Tokyo cherry"],
|
||||
scientificName: "Prunus × yedoensis Matsum.",
|
||||
},
|
||||
gbif: { id: "3021335" },
|
||||
},
|
||||
{
|
||||
score: 0.00914,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus mume",
|
||||
scientificNameAuthorship: "(Siebold) Siebold & Zucc.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Japanese apricot", "Ume", "Chinese Plum"],
|
||||
scientificName: "Prunus mume (Siebold) Siebold & Zucc.",
|
||||
},
|
||||
gbif: { id: "3021046" },
|
||||
},
|
||||
{
|
||||
score: 0.0088,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus niedzwetzkyana",
|
||||
scientificNameAuthorship: "Dieck ex Koehne",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Apple", "Paradise apple", "Kulturapfel"],
|
||||
scientificName: "Malus niedzwetzkyana Dieck ex Koehne",
|
||||
},
|
||||
gbif: { id: "3001327" },
|
||||
},
|
||||
{
|
||||
score: 0.00734,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus hupehensis",
|
||||
scientificNameAuthorship: "(Pamp.) Rehder",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Chinese crab apple", "Hupeh crab", "Tea crab apple"],
|
||||
scientificName: "Malus hupehensis (Pamp.) Rehder",
|
||||
},
|
||||
gbif: { id: "3001077" },
|
||||
},
|
||||
{
|
||||
score: 0.00688,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus angustifolia",
|
||||
scientificNameAuthorship: "(Aiton) Michx.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"Southern crab apple",
|
||||
"Narrow-leaved crabapple",
|
||||
"Southern crabapple",
|
||||
],
|
||||
scientificName: "Malus angustifolia (Aiton) Michx.",
|
||||
},
|
||||
gbif: { id: "3001548" },
|
||||
},
|
||||
{
|
||||
score: 0.00614,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus subhirtella",
|
||||
scientificNameAuthorship: "Miq.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Rosebud cherry", "Spring cherry", "Autumn cherry"],
|
||||
scientificName: "Prunus subhirtella Miq.",
|
||||
},
|
||||
gbif: { id: "3021229" },
|
||||
},
|
||||
{
|
||||
score: 0.00267,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Robinia viscosa",
|
||||
scientificNameAuthorship: "Vent.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Robinia",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Robinia",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Leguminosae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Leguminosae",
|
||||
},
|
||||
commonNames: ["Clammy locust", "Rose acacia", "Clammy-bark locust"],
|
||||
scientificName: "Robinia viscosa Vent.",
|
||||
},
|
||||
gbif: { id: "5352245" },
|
||||
},
|
||||
{
|
||||
score: 0.0026,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Handroanthus impetiginosus",
|
||||
scientificNameAuthorship: "(Mart. ex DC.) Mattos",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Handroanthus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Handroanthus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Bignoniaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Bignoniaceae",
|
||||
},
|
||||
commonNames: ["Pink trumpet-tree", "Taheebo", "Pink Trumpet Tree"],
|
||||
scientificName: "Handroanthus impetiginosus (Mart. ex DC.) Mattos",
|
||||
},
|
||||
gbif: { id: "4092242" },
|
||||
},
|
||||
{
|
||||
score: 0.00187,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus glandulosa",
|
||||
scientificNameAuthorship: "Thunb.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: [
|
||||
"Chinese bush cherry",
|
||||
"Dwarf flowering almond",
|
||||
"Flowering almond",
|
||||
],
|
||||
scientificName: "Prunus glandulosa Thunb.",
|
||||
},
|
||||
gbif: { id: "3022160" },
|
||||
},
|
||||
{
|
||||
score: 0.00162,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus persica",
|
||||
scientificNameAuthorship: "(L.) Batsch",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Peach", "هلو", "Peach tree"],
|
||||
scientificName: "Prunus persica (L.) Batsch",
|
||||
},
|
||||
gbif: { id: "3022511" },
|
||||
},
|
||||
{
|
||||
score: 0.00162,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus cerasifera",
|
||||
scientificNameAuthorship: "Ehrh.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Cherry plum, myrobalan", "Cherry plum", "Myrobalan plum"],
|
||||
scientificName: "Prunus cerasifera Ehrh.",
|
||||
},
|
||||
gbif: { id: "3021730" },
|
||||
},
|
||||
{
|
||||
score: 0.00159,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus prattii",
|
||||
scientificNameAuthorship: "(Hemsl.) C.K.Schneid.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Pratt apple", "Pratt's Crab Apple"],
|
||||
scientificName: "Malus prattii (Hemsl.) C.K.Schneid.",
|
||||
},
|
||||
gbif: { id: "3001504" },
|
||||
},
|
||||
{
|
||||
score: 0.00159,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus pedunculata",
|
||||
scientificNameAuthorship: "(Pall.) Maxim.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: [],
|
||||
scientificName: "Prunus pedunculata (Pall.) Maxim.",
|
||||
},
|
||||
gbif: { id: "3022277" },
|
||||
},
|
||||
{
|
||||
score: 0.00153,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Cercis siliquastrum",
|
||||
scientificNameAuthorship: "L.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Cercis",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Cercis",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Leguminosae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Leguminosae",
|
||||
},
|
||||
commonNames: ["Judastree", "Lovetree", "Judas-tree"],
|
||||
scientificName: "Cercis siliquastrum L.",
|
||||
},
|
||||
gbif: { id: "5353590" },
|
||||
},
|
||||
{
|
||||
score: 0.00128,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus sylvestris",
|
||||
scientificNameAuthorship: "(L.) Mill.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Crab apple", "European crab apple", "Lopâr"],
|
||||
scientificName: "Malus sylvestris (L.) Mill.",
|
||||
},
|
||||
gbif: { id: "3001509" },
|
||||
},
|
||||
{
|
||||
score: 0.0012,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Magnolia × soulangeana",
|
||||
scientificNameAuthorship: "Soul.-Bod.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Magnolia",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Magnolia",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Magnoliaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Magnoliaceae",
|
||||
},
|
||||
commonNames: ["Chinese magnolia", "Saucer magnolia"],
|
||||
scientificName: "Magnolia × soulangeana Soul.-Bod.",
|
||||
},
|
||||
gbif: { id: "7925303" },
|
||||
},
|
||||
{
|
||||
score: 0.00118,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Cercis canadensis",
|
||||
scientificNameAuthorship: "L.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Cercis",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Cercis",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Leguminosae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Leguminosae",
|
||||
},
|
||||
commonNames: ["Eastern redbud", "Judastree", "Redbud"],
|
||||
scientificName: "Cercis canadensis L.",
|
||||
},
|
||||
gbif: { id: "5353583" },
|
||||
},
|
||||
{
|
||||
score: 0.00114,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus × prunifolia",
|
||||
scientificNameAuthorship: "(Willd.) Borkh.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Plumleaf crab apple", "Chinese apple", "Crab apple"],
|
||||
scientificName: "Malus × prunifolia (Willd.) Borkh.",
|
||||
},
|
||||
gbif: { id: "3001157" },
|
||||
},
|
||||
{
|
||||
score: 0.00111,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Prunus serrula",
|
||||
scientificNameAuthorship: "Franch.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Prunus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Prunus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Birchbark cherry"],
|
||||
scientificName: "Prunus serrula Franch.",
|
||||
},
|
||||
gbif: { id: "3023582" },
|
||||
},
|
||||
{
|
||||
score: 0.00106,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Malus pumila",
|
||||
scientificNameAuthorship: "Mill.",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Malus",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Malus",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Rosaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Rosaceae",
|
||||
},
|
||||
commonNames: ["Apple", "Paradise apple", "Kulturapfel"],
|
||||
scientificName: "Malus pumila Mill.",
|
||||
},
|
||||
gbif: { id: "3001093" },
|
||||
},
|
||||
{
|
||||
score: 0.00101,
|
||||
species: {
|
||||
scientificNameWithoutAuthor: "Viburnum farreri",
|
||||
scientificNameAuthorship: "Stearn",
|
||||
genus: {
|
||||
scientificNameWithoutAuthor: "Viburnum",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Viburnum",
|
||||
},
|
||||
family: {
|
||||
scientificNameWithoutAuthor: "Adoxaceae",
|
||||
scientificNameAuthorship: "",
|
||||
scientificName: "Adoxaceae",
|
||||
},
|
||||
commonNames: ["Fragrant viburnum", "Culver's root", "Farrer's Viburnum"],
|
||||
scientificName: "Viburnum farreri Stearn",
|
||||
},
|
||||
gbif: { id: "6369599" },
|
||||
},
|
||||
],
|
||||
version: "2022-06-14 (6.0)",
|
||||
remainingIdentificationRequests: 498,
|
||||
}
|
||||
}
|
||||
|
||||
export interface PlantNetSpeciesMatch {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
import Tr from "../Base/Tr.svelte"
|
||||
import PlantNetSpeciesList from "./PlantNetSpeciesList.svelte"
|
||||
import { ImmutableStore, Store, UIEventSource } from "../../Logic/UIEventSource"
|
||||
import type { PlantNetSpeciesMatch } from "../../Logic/Web/PlantNet"
|
||||
import type { PlantNetResult, PlantNetSpeciesMatch } from "../../Logic/Web/PlantNet"
|
||||
import PlantNet from "../../Logic/Web/PlantNet"
|
||||
import { XCircleIcon } from "@babeard/svelte-heroicons/solid"
|
||||
import BackButton from "../Base/BackButton.svelte"
|
||||
|
|
@ -28,7 +28,7 @@
|
|||
undefined
|
||||
)
|
||||
|
||||
let error: string = undefined
|
||||
let error: string | "no_plant_detected" = undefined
|
||||
|
||||
/**
|
||||
* The Wikidata-id of the species to apply
|
||||
|
|
@ -47,7 +47,11 @@
|
|||
collapsedMode = false
|
||||
|
||||
try {
|
||||
const result = await PlantNet.query(imageUrls.data.slice(0, 5))
|
||||
const result: PlantNetResult | "no_plant_detected" = await PlantNet.query(imageUrls.data.slice(0, 5))
|
||||
if (result === "no_plant_detected") {
|
||||
error = "no_plant_detected"
|
||||
return
|
||||
}
|
||||
options.set(result.results.filter((r) => r.score > 0.005).slice(0, 8))
|
||||
} catch (e) {
|
||||
console.error("Caught", e)
|
||||
|
|
@ -61,6 +65,12 @@
|
|||
<button class="w-full" on:click={detectSpecies}>
|
||||
<Tr t={t.button} />
|
||||
</button>
|
||||
{:else if error === "no_plant_detected"}
|
||||
<Tr cls="alert" t={t.noPlantDetected} />
|
||||
<button on:click={() => detectSpecies()}>
|
||||
<ArrowPath class="h-6 w-6" />
|
||||
<Tr t={Translations.t.general.retry} />
|
||||
</button>
|
||||
{:else if error !== undefined}
|
||||
<Tr cls="alert" t={t.error.Subs({ error })} />
|
||||
<button on:click={() => detectSpecies()}>
|
||||
|
|
|
|||
25
src/Utils.ts
25
src/Utils.ts
|
|
@ -879,7 +879,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
|
|||
): Promise<
|
||||
| { content: string }
|
||||
| { redirect: string }
|
||||
| { error: string; url: string; statuscode?: number }
|
||||
| { error: string; url: string; statuscode?: number, errContent?: string }
|
||||
> {
|
||||
let result = undefined
|
||||
for (let i = 0; i < maxAttempts; i++) {
|
||||
|
|
@ -917,7 +917,7 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
|
|||
): Promise<
|
||||
| { content: string }
|
||||
| { redirect: string }
|
||||
| { error: string; url: string; statuscode?: number }
|
||||
| { error: string; url: string; statuscode?: number, errContent: string }
|
||||
> {
|
||||
if (this.externalDownloadFunction !== undefined) {
|
||||
return this.externalDownloadFunction(url, headers)
|
||||
|
|
@ -931,12 +931,13 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
|
|||
} else if (xhr.status === 302) {
|
||||
resolve({ redirect: xhr.getResponseHeader("location") })
|
||||
} else if (xhr.status === 509 || xhr.status === 429) {
|
||||
resolve({ error: "rate limited", url, statuscode: xhr.status })
|
||||
resolve({ error: "rate limited", url, statuscode: xhr.status, errContent: xhr.responseText })
|
||||
} else {
|
||||
resolve({
|
||||
error: "other error: " + xhr.statusText + ", " + xhr.responseText,
|
||||
url,
|
||||
statuscode: xhr.status,
|
||||
errContent: xhr.responseText
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -1010,8 +1011,9 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
|
|||
url: string,
|
||||
maxCacheTimeMs: number,
|
||||
headers?: Record<string, string>,
|
||||
dontCacheErrors = false
|
||||
): Promise<{ content: T } | { error: string; url: string; statuscode?: number }> {
|
||||
dontCacheErrors = false,
|
||||
maxAttempts = 3
|
||||
): Promise<{ content: T } | { error: string; url: string; statuscode?: number, errContent?: object }> {
|
||||
const cached = Utils._download_cache.get(url)
|
||||
if (cached !== undefined) {
|
||||
if (new Date().getTime() - cached.timestamp <= maxCacheTimeMs) {
|
||||
|
|
@ -1021,7 +1023,8 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
|
|||
const promise =
|
||||
/*NO AWAIT as we work with the promise directly */ Utils.downloadJsonAdvanced<T>(
|
||||
url,
|
||||
headers
|
||||
headers,
|
||||
maxAttempts
|
||||
)
|
||||
Utils._download_cache.set(url, { promise, timestamp: new Date().getTime() })
|
||||
try {
|
||||
|
|
@ -1060,15 +1063,19 @@ In the case that MapComplete is pointed to the testing grounds, the edit will be
|
|||
|
||||
public static async downloadJsonAdvanced<T = object | []>(
|
||||
url: string,
|
||||
headers?: Record<string, string>
|
||||
): Promise<{ content: T } | { error: string; url: string; statuscode?: number }> {
|
||||
headers?: Record<string, string>,
|
||||
maxAttempts = 3
|
||||
): Promise<{ content: T } | { error: string; url: string; statuscode?: number, errContent?: object }> {
|
||||
const injected = Utils.injectedDownloads[url]
|
||||
if (injected !== undefined) {
|
||||
return { content: injected }
|
||||
}
|
||||
const result = await Utils.downloadAdvanced(
|
||||
url,
|
||||
Utils.Merge({ accept: "application/json" }, headers ?? {})
|
||||
Utils.Merge({ accept: "application/json" }, headers ?? {}),
|
||||
"GET",
|
||||
undefined,
|
||||
maxAttempts
|
||||
)
|
||||
if (result["error"] !== undefined) {
|
||||
return <{ error: string; url: string; statuscode?: number }>result
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue