|
@@ -233,7 +233,7 @@ export class AdjusterService {
|
|
|
* more memory consuming, but much faster then find() */
|
|
* more memory consuming, but much faster then find() */
|
|
|
const codeRecordRelations = {};
|
|
const codeRecordRelations = {};
|
|
|
clusterData.forEach((c) => {
|
|
clusterData.forEach((c) => {
|
|
|
- codeRecordRelations[c.lau2] = c;
|
|
|
|
|
|
|
+ codeRecordRelations[c.district_code] = c;
|
|
|
});
|
|
});
|
|
|
/*let sublayers = [];
|
|
/*let sublayers = [];
|
|
|
const oldSublayers = obceLayer.get('Layer');
|
|
const oldSublayers = obceLayer.get('Layer');
|
|
@@ -390,11 +390,11 @@ export class AdjusterService {
|
|
|
//let logs = 0;
|
|
//let logs = 0;
|
|
|
districts.forEachFeature((feature) => {
|
|
districts.forEachFeature((feature) => {
|
|
|
// Pair each feature with its attractivity data
|
|
// Pair each feature with its attractivity data
|
|
|
- const featureData = codeRecordRelations[feature.get('nationalCode')];
|
|
|
|
|
|
|
+ const featureData = codeRecordRelations[feature.get('admin_code')];
|
|
|
if (!featureData) {
|
|
if (!featureData) {
|
|
|
if (errs < 20) {
|
|
if (errs < 20) {
|
|
|
errs++;
|
|
errs++;
|
|
|
- console.warn(`No data for feature ${feature.get('nationalCode')}`);
|
|
|
|
|
|
|
+ console.warn(`No data for feature ${feature.get('admin_code')}`);
|
|
|
console.log(feature);
|
|
console.log(feature);
|
|
|
}
|
|
}
|
|
|
return;
|
|
return;
|
|
@@ -429,7 +429,7 @@ export class AdjusterService {
|
|
|
//let logs = 0;
|
|
//let logs = 0;
|
|
|
method.layer.getSource().forEachFeature((feature) => {
|
|
method.layer.getSource().forEachFeature((feature) => {
|
|
|
// Pair each feature with its clustering data
|
|
// Pair each feature with its clustering data
|
|
|
- const featureData = codeRecordRelations[feature.get('nationalCode')];
|
|
|
|
|
|
|
+ const featureData = codeRecordRelations[feature.get('admin_code')];
|
|
|
/*const featureData = clusterData.find(
|
|
/*const featureData = clusterData.find(
|
|
|
// NOTE: Do NOT add triple equal sign!
|
|
// NOTE: Do NOT add triple equal sign!
|
|
|
(item) => item['lau2'] == feature.get('nationalCode')
|
|
(item) => item['lau2'] == feature.get('nationalCode')
|
|
@@ -437,7 +437,7 @@ export class AdjusterService {
|
|
|
if (!featureData) {
|
|
if (!featureData) {
|
|
|
if (errs < 20) {
|
|
if (errs < 20) {
|
|
|
errs++;
|
|
errs++;
|
|
|
- console.warn(`No data for feature ${feature.get('nationalCode')}`);
|
|
|
|
|
|
|
+ console.warn(`No data for feature ${feature.get('admin_code')}`);
|
|
|
console.log(feature);
|
|
console.log(feature);
|
|
|
}
|
|
}
|
|
|
return;
|
|
return;
|