@larsgw/formica 0.8.2 → 0.8.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,12 @@
|
|
|
1
|
+
## [0.8.3](https://github.com/identification-resources/formica/compare/v0.8.2...v0.8.3) (2025-07-15)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* **catalog:** add catalog field key_characteristics ([6529cfa](https://github.com/identification-resources/formica/commit/6529cfab81f759f926b81bdd9d5a36e84b526284))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
1
10
|
## [0.8.2](https://github.com/identification-resources/formica/compare/v0.8.1...v0.8.2) (2025-06-26)
|
|
2
11
|
|
|
3
12
|
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
"use strict";
|
|
3
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
4
|
+
if (k2 === undefined) k2 = k;
|
|
5
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
+
}
|
|
9
|
+
Object.defineProperty(o, k2, desc);
|
|
10
|
+
}) : (function(o, m, k, k2) {
|
|
11
|
+
if (k2 === undefined) k2 = k;
|
|
12
|
+
o[k2] = m[k];
|
|
13
|
+
}));
|
|
14
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
15
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
16
|
+
}) : function(o, v) {
|
|
17
|
+
o["default"] = v;
|
|
18
|
+
});
|
|
19
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
20
|
+
var ownKeys = function(o) {
|
|
21
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
22
|
+
var ar = [];
|
|
23
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
24
|
+
return ar;
|
|
25
|
+
};
|
|
26
|
+
return ownKeys(o);
|
|
27
|
+
};
|
|
28
|
+
return function (mod) {
|
|
29
|
+
if (mod && mod.__esModule) return mod;
|
|
30
|
+
var result = {};
|
|
31
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
32
|
+
__setModuleDefault(result, mod);
|
|
33
|
+
return result;
|
|
34
|
+
};
|
|
35
|
+
})();
|
|
36
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
37
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
38
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
39
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
40
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
41
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
42
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
46
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
47
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
48
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
49
|
+
function step(op) {
|
|
50
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
51
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
52
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
53
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
54
|
+
switch (op[0]) {
|
|
55
|
+
case 0: case 1: t = op; break;
|
|
56
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
57
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
58
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
59
|
+
default:
|
|
60
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
61
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
62
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
63
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
64
|
+
if (t[2]) _.ops.pop();
|
|
65
|
+
_.trys.pop(); continue;
|
|
66
|
+
}
|
|
67
|
+
op = body.call(thisArg, _);
|
|
68
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
69
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
73
|
+
var fs_1 = require("fs");
|
|
74
|
+
var path = __importStar(require("path"));
|
|
75
|
+
var index_1 = require("../index");
|
|
76
|
+
function loadPlaces(directory) {
|
|
77
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
78
|
+
var filePath, file;
|
|
79
|
+
return __generator(this, function (_a) {
|
|
80
|
+
switch (_a.label) {
|
|
81
|
+
case 0:
|
|
82
|
+
filePath = path.join(path.resolve(directory), 'places.csv');
|
|
83
|
+
return [4 /*yield*/, fs_1.promises.readFile(filePath, 'utf8')];
|
|
84
|
+
case 1:
|
|
85
|
+
file = _a.sent();
|
|
86
|
+
return [2 /*return*/, index_1.catalog.loadData(file, path.basename(filePath, '.csv'))];
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
function getInatIds(places) {
|
|
92
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
93
|
+
var values, query, url, response, data;
|
|
94
|
+
return __generator(this, function (_a) {
|
|
95
|
+
switch (_a.label) {
|
|
96
|
+
case 0:
|
|
97
|
+
values = places.entities
|
|
98
|
+
.filter(function (place) { return place.has('qid'); })
|
|
99
|
+
.map(function (place) { return "(wd:".concat(place.get('qid'), " \"").concat(place.get('id'), "\")"); })
|
|
100
|
+
.join(' ');
|
|
101
|
+
query = "SELECT ?name ?id WHERE {\n VALUES (?qid ?name) { ".concat(values, " }\n ?qid wdt:P7471 ?id .\n}");
|
|
102
|
+
url = "https://query.wikidata.org/sparql?query=".concat(encodeURIComponent(query));
|
|
103
|
+
return [4 /*yield*/, fetch(url, { headers: { accept: 'application/json', 'user-agent': 'Formica (https://github.com/identification-resources/formica)' } })];
|
|
104
|
+
case 1:
|
|
105
|
+
response = _a.sent();
|
|
106
|
+
if (response.status >= 400) {
|
|
107
|
+
throw new Error("Fetching iNaturalist IDs for places: ".concat(response.status));
|
|
108
|
+
}
|
|
109
|
+
return [4 /*yield*/, response.json()];
|
|
110
|
+
case 2:
|
|
111
|
+
data = _a.sent();
|
|
112
|
+
return [2 /*return*/, data.results.bindings];
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
}
|
|
117
|
+
function getInatShapes(places) {
|
|
118
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
119
|
+
var values, url, response, data;
|
|
120
|
+
return __generator(this, function (_a) {
|
|
121
|
+
switch (_a.label) {
|
|
122
|
+
case 0:
|
|
123
|
+
values = Object.keys(places).join(',');
|
|
124
|
+
url = "https://api.inaturalist.org/v1/places/".concat(values);
|
|
125
|
+
return [4 /*yield*/, fetch(url, { headers: { accept: 'application/json' } })];
|
|
126
|
+
case 1:
|
|
127
|
+
response = _a.sent();
|
|
128
|
+
if (response.status >= 400) {
|
|
129
|
+
throw new Error("Fetching iNaturalist data for places: ".concat(response.status));
|
|
130
|
+
}
|
|
131
|
+
return [4 /*yield*/, response.json()];
|
|
132
|
+
case 2:
|
|
133
|
+
data = _a.sent();
|
|
134
|
+
return [2 /*return*/, data.results];
|
|
135
|
+
}
|
|
136
|
+
});
|
|
137
|
+
});
|
|
138
|
+
}
|
|
139
|
+
function main(args) {
|
|
140
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
141
|
+
var directory, places, inatMap, _i, _a, _b, name_1, id, _c, _d, _e, inatId, geometry_geojson, id;
|
|
142
|
+
return __generator(this, function (_f) {
|
|
143
|
+
switch (_f.label) {
|
|
144
|
+
case 0:
|
|
145
|
+
directory = path.resolve(args[0]);
|
|
146
|
+
return [4 /*yield*/, loadPlaces(directory)];
|
|
147
|
+
case 1:
|
|
148
|
+
places = _f.sent();
|
|
149
|
+
inatMap = {};
|
|
150
|
+
_i = 0;
|
|
151
|
+
return [4 /*yield*/, getInatIds(places)];
|
|
152
|
+
case 2:
|
|
153
|
+
_a = _f.sent();
|
|
154
|
+
_f.label = 3;
|
|
155
|
+
case 3:
|
|
156
|
+
if (!(_i < _a.length)) return [3 /*break*/, 5];
|
|
157
|
+
_b = _a[_i], name_1 = _b.name, id = _b.id;
|
|
158
|
+
inatMap[id.value] = places.get(name_1.value);
|
|
159
|
+
_f.label = 4;
|
|
160
|
+
case 4:
|
|
161
|
+
_i++;
|
|
162
|
+
return [3 /*break*/, 3];
|
|
163
|
+
case 5:
|
|
164
|
+
_c = 0;
|
|
165
|
+
return [4 /*yield*/, getInatShapes(inatMap)];
|
|
166
|
+
case 6:
|
|
167
|
+
_d = _f.sent();
|
|
168
|
+
_f.label = 7;
|
|
169
|
+
case 7:
|
|
170
|
+
if (!(_c < _d.length)) return [3 /*break*/, 10];
|
|
171
|
+
_e = _d[_c], inatId = _e.id, geometry_geojson = _e.geometry_geojson;
|
|
172
|
+
id = inatMap[inatId].get('id');
|
|
173
|
+
return [4 /*yield*/, fs_1.promises.writeFile(path.join(directory, 'maps', id + '.json'), JSON.stringify(geometry_geojson))];
|
|
174
|
+
case 8:
|
|
175
|
+
_f.sent();
|
|
176
|
+
_f.label = 9;
|
|
177
|
+
case 9:
|
|
178
|
+
_c++;
|
|
179
|
+
return [3 /*break*/, 7];
|
|
180
|
+
case 10: return [2 /*return*/];
|
|
181
|
+
}
|
|
182
|
+
});
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
main(process.argv.slice(2)).catch(function (error) {
|
|
186
|
+
console.error(error);
|
|
187
|
+
process.exit(1);
|
|
188
|
+
});
|
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
"use strict";
|
|
3
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
4
|
+
if (k2 === undefined) k2 = k;
|
|
5
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
+
}
|
|
9
|
+
Object.defineProperty(o, k2, desc);
|
|
10
|
+
}) : (function(o, m, k, k2) {
|
|
11
|
+
if (k2 === undefined) k2 = k;
|
|
12
|
+
o[k2] = m[k];
|
|
13
|
+
}));
|
|
14
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
15
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
16
|
+
}) : function(o, v) {
|
|
17
|
+
o["default"] = v;
|
|
18
|
+
});
|
|
19
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
20
|
+
var ownKeys = function(o) {
|
|
21
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
22
|
+
var ar = [];
|
|
23
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
24
|
+
return ar;
|
|
25
|
+
};
|
|
26
|
+
return ownKeys(o);
|
|
27
|
+
};
|
|
28
|
+
return function (mod) {
|
|
29
|
+
if (mod && mod.__esModule) return mod;
|
|
30
|
+
var result = {};
|
|
31
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
32
|
+
__setModuleDefault(result, mod);
|
|
33
|
+
return result;
|
|
34
|
+
};
|
|
35
|
+
})();
|
|
36
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
37
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
38
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
39
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
40
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
41
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
42
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
46
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
47
|
+
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
48
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
49
|
+
function step(op) {
|
|
50
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
51
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
52
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
53
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
54
|
+
switch (op[0]) {
|
|
55
|
+
case 0: case 1: t = op; break;
|
|
56
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
57
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
58
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
59
|
+
default:
|
|
60
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
61
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
62
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
63
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
64
|
+
if (t[2]) _.ops.pop();
|
|
65
|
+
_.trys.pop(); continue;
|
|
66
|
+
}
|
|
67
|
+
op = body.call(thisArg, _);
|
|
68
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
69
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
70
|
+
}
|
|
71
|
+
};
|
|
72
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
73
|
+
var fs_1 = require("fs");
|
|
74
|
+
var path = __importStar(require("path"));
|
|
75
|
+
function main(args) {
|
|
76
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
77
|
+
var rootDirectory, directory, files, index, _i, files_1, file, id, json;
|
|
78
|
+
return __generator(this, function (_a) {
|
|
79
|
+
switch (_a.label) {
|
|
80
|
+
case 0:
|
|
81
|
+
rootDirectory = path.resolve(args[0]);
|
|
82
|
+
directory = path.join(rootDirectory, 'maps');
|
|
83
|
+
return [4 /*yield*/, fs_1.promises.readdir(directory)];
|
|
84
|
+
case 1:
|
|
85
|
+
files = _a.sent();
|
|
86
|
+
index = {};
|
|
87
|
+
_i = 0, files_1 = files;
|
|
88
|
+
_a.label = 2;
|
|
89
|
+
case 2:
|
|
90
|
+
if (!(_i < files_1.length)) return [3 /*break*/, 5];
|
|
91
|
+
file = files_1[_i];
|
|
92
|
+
id = path.basename(file, '.json');
|
|
93
|
+
if (!id.match(/^G[1-9][0-9]*$/)) {
|
|
94
|
+
return [3 /*break*/, 4];
|
|
95
|
+
}
|
|
96
|
+
return [4 /*yield*/, fs_1.promises.readFile(path.join(directory, file), 'utf8')];
|
|
97
|
+
case 3:
|
|
98
|
+
json = _a.sent();
|
|
99
|
+
index[id] = JSON.parse(json);
|
|
100
|
+
_a.label = 4;
|
|
101
|
+
case 4:
|
|
102
|
+
_i++;
|
|
103
|
+
return [3 /*break*/, 2];
|
|
104
|
+
case 5: return [4 /*yield*/, fs_1.promises.writeFile(path.join(directory, 'index.json'), JSON.stringify(index))];
|
|
105
|
+
case 6:
|
|
106
|
+
_a.sent();
|
|
107
|
+
return [2 /*return*/];
|
|
108
|
+
}
|
|
109
|
+
});
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
main(process.argv.slice(2)).catch(function (error) {
|
|
113
|
+
console.error(error);
|
|
114
|
+
process.exit(1);
|
|
115
|
+
});
|
|
@@ -48,6 +48,7 @@ var Work = /** @class */ (function (_super) {
|
|
|
48
48
|
scope: { required: false, multiple: true },
|
|
49
49
|
region: { required: true, multiple: true },
|
|
50
50
|
complete: { required: false, multiple: false, format: value_1.FORMATS.COMPLETE },
|
|
51
|
+
key_characteristics: { required: false, multiple: true },
|
|
51
52
|
target_taxa: { required: false, multiple: true },
|
|
52
53
|
listed_in: { required: false, multiple: true, format: value_1.FORMATS.WORK_ID },
|
|
53
54
|
part_of: { required: false, multiple: true, format: value_1.FORMATS.WORK_ID },
|
package/package.json
CHANGED
|
@@ -30,6 +30,7 @@ export class Work extends Entity {
|
|
|
30
30
|
scope: { required: false, multiple: true },
|
|
31
31
|
region: { required: true, multiple: true },
|
|
32
32
|
complete: { required: false, multiple: false, format: FORMATS.COMPLETE },
|
|
33
|
+
key_characteristics: { required: false, multiple: true },
|
|
33
34
|
target_taxa: { required: false, multiple: true },
|
|
34
35
|
listed_in: { required: false, multiple: true, format: FORMATS.WORK_ID },
|
|
35
36
|
part_of: { required: false, multiple: true, format: FORMATS.WORK_ID },
|