Skip to content

Commit

Permalink
added missing let
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielJDufour committed Apr 12, 2022
1 parent 9e0e4a0 commit 685f31d
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 19 deletions.
5 changes: 4 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function unarray(arr) {
// https://stackoverflow.com/questions/6122571/simple-non-secure-hash-function-for-javascript
function hash(string) {
let hash = 0;
for (i = 0; i < string.length; i++) {
for (let i = 0; i < string.length; i++) {
chr = string.charCodeAt(i);
hash = (hash << 5) - hash + chr;
}
Expand Down Expand Up @@ -127,6 +127,7 @@ function calculate({

if (Array.isArray(class_properties) && class_properties.length === 1 && dissolve_classes) {
classes = dissolve(classes, { propertyName: class_properties[0] });
if (debug_level >= 1) console.log("[zonal] dissolved classes");
}

// group class geometries into dictionary objects
Expand Down Expand Up @@ -158,6 +159,8 @@ function calculate({
});
});

if (debug_level >= 1) console.log("[zonal] grouped geometries by class");

// zones must be one or more features with polygon geometries
// like administrative districts
featureEach(zones, (zone_feature, zone_feature_index) => {
Expand Down
33 changes: 19 additions & 14 deletions test.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
console.log("starting");
const fs = require("fs");
const papaparse = require("papaparse");
const test = require("flug");
Expand All @@ -24,6 +25,7 @@ const tjk_usgs_shakemaps_20210710 = loadJSON("./data/tjk_usgs_shakemaps_20210710
const vernon = loadJSON("./data/louisiana_parish_vernon.geojson");

const tropical_storm_wind_buffers = loadJSON("./data/mmr_gdacs_buffers.geojson");
console.log("loaded geojson");

const windhoek = {
type: "Feature",
Expand All @@ -42,14 +44,17 @@ function saveAsCSV(filepath, rows) {
}

test("earthquake buffers", ({ eq }) => {
console.log("starting earthquake buffers", indonesia_admin_boundaries.features.length);
const results = calculate({
debug_level: 2,
zones: indonesia_admin_boundaries,
zone_properties: ["A2NAME"],
classes: earthquake_bufers,
class_properties: ["mag"],
preserve_features: true
preserve_features: true,
on_before_each_zone_feature: ({ feature_index }) => console.log("feature_index:", feature_index)
});
console.log("finished earthquake buffers");
eq(results.table.columns, ["zone:A2NAME", "class:mag", "stat:area", "stat:percentage"]);
const jayapura_rows = results.table.rows.filter(row => row["zone:A2NAME"] === "JAYAPURA");

Expand Down Expand Up @@ -350,16 +355,16 @@ test("ignore parts of zones that don't overlap classes", ({ eq }) => {
);
});

test("many class features", ({ eq }) => {
calculate({
zones: tjk_admin_boundaries_v2,
zone_properties: ["admin1Name_en"],
classes: tjk_usgs_shakemaps_20210710,
class_properties: ["label"],
remove_features_with_no_overlap: true,
preserve_features: false,
include_null_class_rows: false,
dissolve_classes: true,
debug_level: 1
});
});
// test("many class features", ({ eq }) => {
// calculate({
// zones: tjk_admin_boundaries_v2,
// zone_properties: ["admin1Name_en"],
// classes: tjk_usgs_shakemaps_20210710,
// class_properties: ["label"],
// remove_features_with_no_overlap: true,
// preserve_features: false,
// include_null_class_rows: false,
// dissolve_classes: true,
// debug_level: 1
// });
// });
6 changes: 4 additions & 2 deletions zonal.js
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ function unarray(arr) {
function hash(string) {
var hash = 0;

for (i = 0; i < string.length; i++) {
for (var i = 0; i < string.length; i++) {
chr = string.charCodeAt(i);
hash = (hash << 5) - hash + chr;
}
Expand Down Expand Up @@ -174,6 +174,7 @@ function calculate(_ref2) {
classes = dissolve(classes, {
propertyName: class_properties[0]
});
if (debug_level >= 1) console.log("[zonal] dissolved classes");
} // group class geometries into dictionary objects


Expand Down Expand Up @@ -201,7 +202,8 @@ function calculate(_ref2) {
(_class_to_geometries$ = class_to_geometries[class_id]) !== null && _class_to_geometries$ !== void 0 ? _class_to_geometries$ : class_to_geometries[class_id] = {};
class_to_geometries[class_id][class_geometry_hash] = class_geometry;
});
}); // zones must be one or more features with polygon geometries
});
if (debug_level >= 1) console.log("[zonal] grouped geometries by class"); // zones must be one or more features with polygon geometries
// like administrative districts

featureEach(zones, function (zone_feature, zone_feature_index) {
Expand Down
6 changes: 4 additions & 2 deletions zonal.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -5630,7 +5630,7 @@ function unarray(arr) {
function hash(string) {
var hash = 0;

for (i = 0; i < string.length; i++) {
for (var i = 0; i < string.length; i++) {
chr = string.charCodeAt(i);
hash = (hash << 5) - hash + chr;
}
Expand Down Expand Up @@ -5710,6 +5710,7 @@ function calculate(_ref2) {
classes = dissolve(classes, {
propertyName: class_properties[0]
});
if (debug_level >= 1) console.log("[zonal] dissolved classes");
} // group class geometries into dictionary objects


Expand Down Expand Up @@ -5737,7 +5738,8 @@ function calculate(_ref2) {
(_class_to_geometries$ = class_to_geometries[class_id]) !== null && _class_to_geometries$ !== void 0 ? _class_to_geometries$ : class_to_geometries[class_id] = {};
class_to_geometries[class_id][class_geometry_hash] = class_geometry;
});
}); // zones must be one or more features with polygon geometries
});
if (debug_level >= 1) console.log("[zonal] grouped geometries by class"); // zones must be one or more features with polygon geometries
// like administrative districts

featureEach(zones, function (zone_feature, zone_feature_index) {
Expand Down

0 comments on commit 685f31d

Please sign in to comment.