Преглед на файлове

🐛 fix region ID assignment

jmacura преди 4 години
родител
ревизия
9e705a4168
променени са 3 файла, в които са добавени 5 реда и са изтрити 9 реда
  1. 0 4
      src/adjuster/adjuster-presets.service.ts
  2. 5 5
      src/adjuster/adjuster.service.ts
  3. 0 0
      src/data/kenya+uganda_districts_10p_4326.topojson

+ 0 - 4
src/adjuster/adjuster-presets.service.ts

@@ -105,7 +105,6 @@ export class AdjusterPresetsService {
           )
         }
       });
-    console.log('Roles', this.roles);
     if (this.enabledRoleIds) {
       this.roles = this.roles.filter((role) => this.enabledRoleIds.includes(role.id));
     }
@@ -130,16 +129,13 @@ export class AdjusterPresetsService {
           )
         }
       });
-    console.log('Schemas', this.schemas)
     if (this.enabledSchemaIds) {
       this.schemas = this.schemas.filter((schema) => this.enabledSchemaIds.includes(schema.id));
     }
     this.activeSchema = this.schemas.find((schema) => schema.id == this.defaultSchemaId) ?? this.schemas[0];
     for (const group of this.activeSchema.groups) {
-      console.log(this.activeSchema.groups);
       const ds = this.ontology
       .find((subject) => subject['@id'] == group.id)["http://www.semanticweb.org/attractiveness/hasDataset"]
-      console.log(`Datasets of ${group.labels[0]['@value']}:`, ds)
     }
     this.schemaChanges.next(this.activeSchema);
   }

+ 5 - 5
src/adjuster/adjuster.service.ts

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

Файловите разлики са ограничени, защото са твърде много
+ 0 - 0
src/data/kenya+uganda_districts_10p_4326.topojson


Някои файлове не бяха показани, защото твърде много файлове са промени