Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/continent-open-science.module.ts
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/continent-open-science.module.ts	(revision 61515)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/continent-open-science.module.ts	(revision 61516)
@@ -23,7 +23,7 @@
     // ContinentOSPublicationsIndicatorsComponent,
     // ContinentOSDatasetsComponent,
     // ContinentOSSoftwareComponent,
-    ContinentOSORPComponent
+    // ContinentOSORPComponent
   ],
   providers: [
     DataService,
Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/continent-open-science-routing.module.ts
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/continent-open-science-routing.module.ts	(revision 61515)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/continent-open-science-routing.module.ts	(revision 61516)
@@ -34,7 +34,8 @@
       },
       {
         path: 'other-research-products',
-        component: ContinentOSORPComponent,
+        loadChildren: () => import('./other-research-products/continent-os-orp.module').then(m => m.ContinentOpenScienceORPModule),
+        // component: ContinentOSORPComponent,
       },
     ]
   },
Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-indicators.component.html
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-indicators.component.html	(nonexistent)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-indicators.component.html	(revision 61516)
@@ -0,0 +1,204 @@
+<div *ngIf="indicator && indicator=='pid'" class="pidIndicator">
+  <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
+
+    <div class="uk-grid-margin">
+      <div class="md-card chartCard">
+        <div class="md-card-content">
+          <iframe *ngIf="otherWithPIDTimeline" width="100%" height="550" [src]="otherWithPIDTimeline"></iframe>
+        </div>
+      </div>
+    </div>
+
+    <div class="uk-grid-margin">
+      <div class="md-card chartCard">
+        <div class="md-card-content">
+
+          <!--MOBILE & PAD PORTRAIT-->
+          <div class="uk-hidden@m">
+            <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
+              <label class="uk-margin-right">Show by: </label>
+              <select class="md-input" #selectPIDGroupBy (change)="getOtherWithPIDGroupByMobile(selectPIDGroupBy.value)" style="width: 230px; display: inline-block">
+                <option value="country">country</option>
+                <option value="datasource">datasource</option>
+                <option value="organization">organization</option>
+                <option value="funder">funder</option>
+              </select>
+            </div>
+
+            <iframe *ngIf="otherWithPIDGroupByView==='country' && otherWithPIDByCountryChartURLMobile"
+                    width="100%" height="550" [src]="otherWithPIDByCountryChartURLMobile"></iframe>
+            <iframe *ngIf="otherWithPIDGroupByView==='datasource' && otherWithPIDByDatasourceChartURLMobile"
+                    width="100%" height="550" [src]="otherWithPIDByDatasourceChartURLMobile"></iframe>
+            <iframe *ngIf="otherWithPIDGroupByView==='organization' && otherWithPIDByOrganizationChartURLMobile"
+                    width="100%" height="550" [src]="otherWithPIDByOrganizationChartURLMobile"></iframe>
+            <app-treemap-highchart *ngIf="otherWithPIDGroupByView==='funder' && otherWithPIDByFunderData"
+                                   [chartTitle]="'OA Other research products with PID by funder'"
+                                   [chartData]="otherWithPIDByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
+
+          </div>
+
+          <!--LAPTOP & PAD LANDSCAPE-->
+          <div class="uk-visible@m">
+            <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
+                data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
+              <li class="uk-active"><a (click)="getOtherWithPIDGroupBy('country')">Country</a></li>
+              <li><a (click)="getOtherWithPIDGroupBy('datasource')">Datasource</a></li>
+              <li><a (click)="getOtherWithPIDGroupBy('organization')">Organization</a></li>
+              <li><a (click)="getOtherWithPIDGroupBy('funder')">Funder</a></li>
+            </ul>
+
+            <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
+              <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
+                <iframe *ngIf="otherWithPIDByCountryChartURL"
+                        width="100%" height="350" [src]="otherWithPIDByCountryChartURL"></iframe>
+              </li>
+              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
+                <iframe *ngIf="otherWithPIDByDatasourceChartURL"
+                        width="100%" height="350" [src]="otherWithPIDByDatasourceChartURL"></iframe>
+              </li>
+              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
+                <iframe *ngIf="otherWithPIDByOrganizationChartURL"
+                        width="100%" height="350" [src]="otherWithPIDByOrganizationChartURL"></iframe>
+              </li>
+              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
+                <app-treemap-highchart *ngIf="otherWithPIDByFunderData"
+                                       [chartTitle]="'OA Other research products with PID by funder'"
+                                       [chartData]="otherWithPIDByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
+              </li>
+            </ul>
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
+<div *ngIf="indicator && indicator=='licence'" class="licenceIndicator">
+  <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
+
+    <div class="uk-grid-margin">
+      <div class="md-card chartCard">
+        <div class="md-card-content">
+          <iframe *ngIf="otherWithLicenceTimeline" width="100%" height="550" [src]="otherWithLicenceTimeline"></iframe>
+        </div>
+      </div>
+    </div>
+
+    <div class="uk-grid-margin">
+      <div class="md-card chartCard">
+        <div class="md-card-content">
+
+          <!--MOBILE & PAD PORTRAIT-->
+          <div class="uk-hidden@m">
+            <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
+              <label class="uk-margin-right">Show by: </label>
+              <select class="md-input" #selectLicenceGroupBy (change)="getOtherWithLicenceGroupByMobile(selectLicenceGroupBy.value)" style="width: 230px; display: inline-block">
+                <option value="country">country</option>
+                <option value="datasource">datasource</option>
+                <option value="organization">organization</option>
+                <option value="funder">funder</option>
+              </select>
+            </div>
+
+            <iframe *ngIf="otherWithLicenceGroupByView==='country' && otherWithLicenceByCountryChartURLMobile"
+                    width="100%" height="550" [src]="otherWithLicenceByCountryChartURLMobile"></iframe>
+            <iframe *ngIf="otherWithLicenceGroupByView==='datasource' && otherWithLicenceByDatasourceChartURLMobile"
+                    width="100%" height="550" [src]="otherWithLicenceByDatasourceChartURLMobile"></iframe>
+            <iframe *ngIf="otherWithLicenceGroupByView==='organization' && otherWithLicenceByOrganizationChartURLMobile"
+                    width="100%" height="550" [src]="otherWithLicenceByOrganizationChartURLMobile"></iframe>
+            <app-treemap-highchart *ngIf="otherWithLicenceGroupByView==='funder' && otherWithLicenceByFunderData"
+                                   [chartTitle]="'OA Other research products with licence by funder'"
+                                   [chartData]="otherWithLicenceByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
+
+          </div>
+
+          <!--LAPTOP & PAD LANDSCAPE-->
+          <div class="uk-visible@m">
+            <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
+                data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
+              <li class="uk-active"><a (click)="getOtherWithLicenceGroupBy('country')">Country</a></li>
+              <li><a (click)="getOtherWithLicenceGroupBy('datasource')">Datasource</a></li>
+              <li><a (click)="getOtherWithLicenceGroupBy('organization')">Organization</a></li>
+              <li><a (click)="getOtherWithLicenceGroupBy('funder')">Funder</a></li>
+            </ul>
+
+            <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
+              <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
+                <iframe *ngIf="otherWithLicenceByCountryChartURL"
+                        width="100%" height="350" [src]="otherWithLicenceByCountryChartURL"></iframe>
+              </li>
+              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
+                <iframe *ngIf="otherWithLicenceByDatasourceChartURL"
+                        width="100%" height="350" [src]="otherWithLicenceByDatasourceChartURL"></iframe>
+              </li>
+              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
+                <iframe *ngIf="otherWithLicenceByOrganizationChartURL"
+                        width="100%" height="350" [src]="otherWithLicenceByOrganizationChartURL"></iframe>
+              </li>
+              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
+                <app-treemap-highchart *ngIf="otherWithLicenceByFunderData"
+                                       [chartTitle]="'OA Other research products with licence by funder'"
+                                       [chartData]="otherWithLicenceByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
+              </li>
+            </ul>
+          </div>
+
+        </div>
+      </div>
+    </div>
+
+  </div>
+</div>
+<div *ngIf="indicator && indicator=='more-details'" class="indicatorsTable uk-visible@m uk-margin-large-top">
+
+  <h3 class="">More details for other research products</h3>
+
+  <div class="uk-margin-top uk-margin-bottom">
+    <label class="uk-margin-right">Show: </label>
+    <select class="md-input" #selectOtherContent (change)="getContent('other', selectOtherContent.value)" style="width: 230px; display: inline-block">
+      <option value="affiliated">affiliated</option>
+      <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
+      <option value="deposited">deposited</option>
+      <option value="deposited_peer_reviewed">deposited peer reviewed</option>
+    </select>
+    <!--<span class="md-input-bar"></span>-->
+  </div>
+
+  <div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m">
+    <div class="absoluteTable">
+      <div class="md-card chartCard">
+        <div class="md-card-content">
+
+          <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#other-indicators-content-a-fade', animation: 'fade'}">
+            <li aria-expanded="true" class="uk-active">
+              <a href="#">
+                <i class="fas fa-hashtag"></i>
+              </a>
+            </li>
+            <li aria-expanded="false" class="">
+              <a href="#">
+                <i class="fas fa-percentage"></i>
+              </a>
+            </li>
+          </ul>
+
+          <ul id="other-indicators-content-a-fade" class="uk-switcher uk-margin" >
+            <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
+              <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
+              <app-countries-table *ngIf="otherAbsoluteTableData" [isPercentage]="false" [countries]="otherAbsoluteTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
+            </li>
+            <li aria-hidden="true" style="animation-duration: 200ms;" class="">
+              <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
+              <app-countries-table *ngIf="otherPercentageTableData" [isPercentage]="true" [countries]="otherPercentageTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
+            </li>
+          </ul>
+
+        </div>
+      </div>
+
+    </div>
+
+  </div>
+
+</div>
Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-indicators.component.ts
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-indicators.component.ts	(nonexistent)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-indicators.component.ts	(revision 61516)
@@ -0,0 +1,184 @@
+import {Component, OnInit} from '@angular/core';
+import {environment} from '../../../../../environments/environment';
+import {
+  gradientStartColor,
+  otherResearchProductsColor, otherResearchProductsPalette,
+} from '../../../../chart-palettes';
+import {DataHandlerService} from '../../../../services/data-handler.service';
+import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
+import {DataService} from '../../../../services/data.service';
+import {ActivatedRoute} from '@angular/router';
+import {CountryTableData} from '../../../../domain/overview-map-data';
+import {TreemapHighchartsData} from '../../../../domain/treemap-highcharts-data';
+
+@Component({
+  selector: 'app-continent-os-orp-indicators',
+  templateUrl: './continent-os-orp-indicators.component.html',
+})
+
+export class ContinentOSORPIndicatorsComponent implements OnInit {
+
+  private chartsURL = environment.API_ENDPOINT + 'chart?json=';
+  private profileName = environment.profileName;
+
+  indicator: string;
+
+  private otherResearchProductsPalette = otherResearchProductsPalette;
+
+  otherResearchProductsColor = otherResearchProductsColor;
+  gradientStartColor = gradientStartColor;
+
+  otherWithLicenceTimeline: SafeResourceUrl;
+  otherWithPIDTimeline: SafeResourceUrl;
+
+  otherWithPIDGroupByView = 'country';
+  otherWithPIDByCountryChartURL: SafeResourceUrl;
+  otherWithPIDByDatasourceChartURL: SafeResourceUrl;
+  otherWithPIDByOrganizationChartURL: SafeResourceUrl;
+  otherWithPIDByCountryChartURLMobile: SafeResourceUrl;
+  otherWithPIDByDatasourceChartURLMobile: SafeResourceUrl;
+  otherWithPIDByOrganizationChartURLMobile: SafeResourceUrl;
+
+  otherWithLicenceGroupByView = 'country';
+  otherWithLicenceByCountryChartURL: SafeResourceUrl;
+  otherWithLicenceByDatasourceChartURL: SafeResourceUrl;
+  otherWithLicenceByOrganizationChartURL: SafeResourceUrl;
+  otherWithLicenceByCountryChartURLMobile: SafeResourceUrl;
+  otherWithLicenceByDatasourceChartURLMobile: SafeResourceUrl;
+  otherWithLicenceByOrganizationChartURLMobile: SafeResourceUrl;
+
+  otherWithPIDByFunderData: TreemapHighchartsData[];
+  otherWithLicenceByFunderData: TreemapHighchartsData[];
+
+  loadingOtherAbsoluteTable: boolean = true;
+  loadingOtherPercentageTable: boolean = true;
+  otherTableContentSelection: string = 'affiliated';
+  otherAbsoluteTableData: CountryTableData[];
+  otherPercentageTableData: CountryTableData[];
+
+  constructor(private dataService: DataService,
+              private dataHandlerService: DataHandlerService,
+              private route: ActivatedRoute,
+              private sanitizer: DomSanitizer) { }
+
+  ngOnInit(): void {
+
+    this.route.params.subscribe(params => {
+
+      this.indicator = params['indicator'];
+    });
+
+    // this.otherWithPIDTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.pid_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    this.otherWithPIDTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.pid_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    // this.otherWithLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.licence_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    this.otherWithLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.licence_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+
+    // // this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    // this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    // // this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    // this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    //
+    // // this.otherWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    // this.otherWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    // // this.otherWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    // this.otherWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    //
+    // // this.otherWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    // this.otherWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    // // this.otherWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
+    // this.otherWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+
+    this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    this.otherWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+
+    this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    this.otherWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+
+
+    this.dataService.getFundersResultsByTypeForPID('other').subscribe(
+      rawData => {
+        this.otherWithPIDByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
+      }, error => {
+        console.log(error);
+      }
+    );
+
+    this.dataService.getFundersResultsByTypeForLicence('other').subscribe(
+      rawData => {
+        this.otherWithLicenceByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
+      }, error => {
+        console.log(error);
+      }
+    );
+
+    this.getOtherTableData(this.otherTableContentSelection);
+  }
+
+  getOtherTableData(contentSelection: string) {
+    this.loadingOtherAbsoluteTable = true;
+    this.loadingOtherPercentageTable = true;
+    this.dataService.getIndicatorsTableData('other', contentSelection).subscribe(
+      rawData => {
+        this.otherAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
+        this.otherPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
+        this.loadingOtherAbsoluteTable = false;
+        this.loadingOtherPercentageTable = false;
+      }, error => {
+        console.log(error);
+        this.loadingOtherAbsoluteTable = false;
+        this.loadingOtherPercentageTable = false;
+      }
+    );
+  }
+
+  getContent(type: string, contentSelection: string): void {
+
+    this.otherTableContentSelection = contentSelection;
+    this.getOtherTableData(this.otherTableContentSelection);
+  }
+
+  getOtherWithPIDGroupBy(contentSelection: string): void {
+    this.otherWithPIDGroupByView = contentSelection;
+    if (contentSelection === 'country' && !this.otherWithPIDByCountryChartURL) {
+      this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'datasource' && !this.otherWithPIDByDatasourceChartURL) {
+      this.otherWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'organization' && !this.otherWithPIDByOrganizationChartURL) {
+      this.otherWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    }
+  }
+
+  getOtherWithPIDGroupByMobile(contentSelection: string): void {
+    this.otherWithPIDGroupByView = contentSelection;
+    if (contentSelection === 'country' && !this.otherWithPIDByCountryChartURLMobile) {
+      this.otherWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'datasource' && !this.otherWithPIDByDatasourceChartURLMobile) {
+      this.otherWithPIDByDatasourceChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'organization' && !this.otherWithPIDByOrganizationChartURLMobile) {
+      this.otherWithPIDByOrganizationChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    }
+  }
+
+  getOtherWithLicenceGroupBy(contentSelection: string): void {
+    this.otherWithLicenceGroupByView = contentSelection;
+    if (contentSelection === 'country' && !this.otherWithLicenceByCountryChartURL) {
+      this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'datasource' && !this.otherWithLicenceByDatasourceChartURL) {
+      this.otherWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'organization' && !this.otherWithLicenceByOrganizationChartURL) {
+      this.otherWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    }
+  }
+
+  getOtherWithLicenceGroupByMobile(contentSelection: string): void {
+    this.otherWithLicenceGroupByView = contentSelection;
+    if (contentSelection === 'country' && !this.otherWithLicenceByCountryChartURLMobile) {
+      this.otherWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'datasource' && !this.otherWithLicenceByDatasourceChartURLMobile) {
+      this.otherWithLicenceByDatasourceChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    } else if (contentSelection === 'organization' && !this.otherWithLicenceByOrganizationChartURLMobile) {
+      this.otherWithLicenceByOrganizationChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
+    }
+  }
+
+}
Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.component.html
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.component.html	(revision 61515)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.component.html	(revision 61516)
@@ -1,432 +1,11 @@
 <div>
 
   <ul uk-tab class="uk-tab-large">
-    <li><a href="#">PID</a></li>
-    <li><a href="#">Licence</a></li>
-    <li class="uk-visible@m"><a href="#">More Details</a></li>
+    <li [routerLinkActive]="['uk-active']"><a [routerLink]="['./pid']">PID</a></li>
+    <li [routerLinkActive]="['uk-active']"><a [routerLink]="['./licence']">Licence</a></li>
+    <li [routerLinkActive]="['uk-active']" class="uk-visible@m"><a [routerLink]="['./more-details']">More Details</a></li>
   </ul>
 
-  <ul class="uk-switcher uk-margin">
-    <li>
-      <div class="pidIndicator">
-        <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
+  <router-outlet></router-outlet>
 
-          <div class="uk-grid-margin">
-            <div class="md-card chartCard">
-              <div class="md-card-content">
-                <iframe *ngIf="otherWithPIDTimeline" width="100%" height="550" [src]="otherWithPIDTimeline"></iframe>
-              </div>
-            </div>
-          </div>
-
-          <div class="uk-grid-margin">
-            <div class="md-card chartCard">
-              <div class="md-card-content">
-
-                <!--MOBILE & PAD PORTRAIT-->
-                <div class="uk-hidden@m">
-                  <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
-                    <label class="uk-margin-right">Show by: </label>
-                    <select class="md-input" #selectPIDGroupBy (change)="getOtherWithPIDGroupByMobile(selectPIDGroupBy.value)" style="width: 230px; display: inline-block">
-                      <option value="country">country</option>
-                      <option value="datasource">datasource</option>
-                      <option value="organization">organization</option>
-                      <option value="funder">funder</option>
-                    </select>
-                  </div>
-
-                  <iframe *ngIf="otherWithPIDGroupByView==='country' && otherWithPIDByCountryChartURLMobile"
-                          width="100%" height="550" [src]="otherWithPIDByCountryChartURLMobile"></iframe>
-                  <iframe *ngIf="otherWithPIDGroupByView==='datasource' && otherWithPIDByDatasourceChartURLMobile"
-                          width="100%" height="550" [src]="otherWithPIDByDatasourceChartURLMobile"></iframe>
-                  <iframe *ngIf="otherWithPIDGroupByView==='organization' && otherWithPIDByOrganizationChartURLMobile"
-                          width="100%" height="550" [src]="otherWithPIDByOrganizationChartURLMobile"></iframe>
-                  <app-treemap-highchart *ngIf="otherWithPIDGroupByView==='funder' && otherWithPIDByFunderData"
-                                         [chartTitle]="'OA Other research products with PID by funder'"
-                                         [chartData]="otherWithPIDByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-
-                </div>
-
-                <!--LAPTOP & PAD LANDSCAPE-->
-                <div class="uk-visible@m">
-                  <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
-                      data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
-                    <li class="uk-active"><a (click)="getOtherWithPIDGroupBy('country')">Country</a></li>
-                    <li><a (click)="getOtherWithPIDGroupBy('datasource')">Datasource</a></li>
-                    <li><a (click)="getOtherWithPIDGroupBy('organization')">Organization</a></li>
-                    <li><a (click)="getOtherWithPIDGroupBy('funder')">Funder</a></li>
-                  </ul>
-
-                  <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
-                    <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                      <iframe *ngIf="otherWithPIDByCountryChartURL"
-                              width="100%" height="350" [src]="otherWithPIDByCountryChartURL"></iframe>
-                    </li>
-                    <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                      <iframe *ngIf="otherWithPIDByDatasourceChartURL"
-                              width="100%" height="350" [src]="otherWithPIDByDatasourceChartURL"></iframe>
-                    </li>
-                    <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                      <iframe *ngIf="otherWithPIDByOrganizationChartURL"
-                              width="100%" height="350" [src]="otherWithPIDByOrganizationChartURL"></iframe>
-                    </li>
-                    <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                      <app-treemap-highchart *ngIf="otherWithPIDByFunderData"
-                                             [chartTitle]="'OA Other research products with PID by funder'"
-                                             [chartData]="otherWithPIDByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-                    </li>
-                  </ul>
-                </div>
-
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </li>
-    <li>
-      <div class="licenceIndicator">
-        <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
-
-          <div class="uk-grid-margin">
-            <div class="md-card chartCard">
-              <div class="md-card-content">
-                <iframe *ngIf="otherWithLicenceTimeline" width="100%" height="550" [src]="otherWithLicenceTimeline"></iframe>
-              </div>
-            </div>
-          </div>
-
-          <div class="uk-grid-margin">
-            <div class="md-card chartCard">
-              <div class="md-card-content">
-
-                <!--MOBILE & PAD PORTRAIT-->
-                <div class="uk-hidden@m">
-                  <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
-                    <label class="uk-margin-right">Show by: </label>
-                    <select class="md-input" #selectLicenceGroupBy (change)="getOtherWithLicenceGroupByMobile(selectLicenceGroupBy.value)" style="width: 230px; display: inline-block">
-                      <option value="country">country</option>
-                      <option value="datasource">datasource</option>
-                      <option value="organization">organization</option>
-                      <option value="funder">funder</option>
-                    </select>
-                  </div>
-
-                  <iframe *ngIf="otherWithLicenceGroupByView==='country' && otherWithLicenceByCountryChartURLMobile"
-                          width="100%" height="550" [src]="otherWithLicenceByCountryChartURLMobile"></iframe>
-                  <iframe *ngIf="otherWithLicenceGroupByView==='datasource' && otherWithLicenceByDatasourceChartURLMobile"
-                          width="100%" height="550" [src]="otherWithLicenceByDatasourceChartURLMobile"></iframe>
-                  <iframe *ngIf="otherWithLicenceGroupByView==='organization' && otherWithLicenceByOrganizationChartURLMobile"
-                          width="100%" height="550" [src]="otherWithLicenceByOrganizationChartURLMobile"></iframe>
-                  <app-treemap-highchart *ngIf="otherWithLicenceGroupByView==='funder' && otherWithLicenceByFunderData"
-                                         [chartTitle]="'OA Other research products with licence by funder'"
-                                         [chartData]="otherWithLicenceByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-
-                </div>
-
-                <!--LAPTOP & PAD LANDSCAPE-->
-                <div class="uk-visible@m">
-                  <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
-                      data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
-                    <li class="uk-active"><a (click)="getOtherWithLicenceGroupBy('country')">Country</a></li>
-                    <li><a (click)="getOtherWithLicenceGroupBy('datasource')">Datasource</a></li>
-                    <li><a (click)="getOtherWithLicenceGroupBy('organization')">Organization</a></li>
-                    <li><a (click)="getOtherWithLicenceGroupBy('funder')">Funder</a></li>
-                  </ul>
-
-                  <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
-                    <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                      <iframe *ngIf="otherWithLicenceByCountryChartURL"
-                              width="100%" height="350" [src]="otherWithLicenceByCountryChartURL"></iframe>
-                    </li>
-                    <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                      <iframe *ngIf="otherWithLicenceByDatasourceChartURL"
-                              width="100%" height="350" [src]="otherWithLicenceByDatasourceChartURL"></iframe>
-                    </li>
-                    <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                      <iframe *ngIf="otherWithLicenceByOrganizationChartURL"
-                              width="100%" height="350" [src]="otherWithLicenceByOrganizationChartURL"></iframe>
-                    </li>
-                    <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                      <app-treemap-highchart *ngIf="otherWithLicenceByFunderData"
-                                             [chartTitle]="'OA Other research products with licence by funder'"
-                                             [chartData]="otherWithLicenceByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-                    </li>
-                  </ul>
-                </div>
-
-              </div>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </li>
-    <li>
-      <div class="indicatorsTable uk-visible@m uk-margin-large-top">
-
-        <h3 class="">More details for other research products</h3>
-
-        <div class="uk-margin-top uk-margin-bottom">
-          <label class="uk-margin-right">Show: </label>
-          <select class="md-input" #selectOtherContent (change)="getContent('other', selectOtherContent.value)" style="width: 230px; display: inline-block">
-            <option value="affiliated">affiliated</option>
-            <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
-            <option value="deposited">deposited</option>
-            <option value="deposited_peer_reviewed">deposited peer reviewed</option>
-          </select>
-          <!--<span class="md-input-bar"></span>-->
-        </div>
-
-        <div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m">
-          <div class="absoluteTable">
-            <div class="md-card chartCard">
-              <div class="md-card-content">
-
-                <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#other-indicators-content-a-fade', animation: 'fade'}">
-                  <li aria-expanded="true" class="uk-active">
-                    <a href="#">
-                      <i class="fas fa-hashtag"></i>
-                    </a>
-                  </li>
-                  <li aria-expanded="false" class="">
-                    <a href="#">
-                      <i class="fas fa-percentage"></i>
-                    </a>
-                  </li>
-                </ul>
-
-                <ul id="other-indicators-content-a-fade" class="uk-switcher uk-margin" >
-                  <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                    <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
-                    <app-countries-table *ngIf="otherAbsoluteTableData" [isPercentage]="false" [countries]="otherAbsoluteTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
-                  </li>
-                  <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                    <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
-                    <app-countries-table *ngIf="otherPercentageTableData" [isPercentage]="true" [countries]="otherPercentageTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
-                  </li>
-                </ul>
-
-              </div>
-            </div>
-
-          </div>
-
-        </div>
-
-      </div>
-    </li>
-  </ul>
-
-  <!--<div class="pidIndicator">
-    <h3 class="uk-margin-remove">PID</h3>
-    <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
-
-      <div class="uk-grid-margin">
-        <div class="md-card chartCard">
-          <div class="md-card-content">
-            <iframe *ngIf="otherWithPIDTimeline" width="100%" height="550" [src]="otherWithPIDTimeline"></iframe>
-          </div>
-        </div>
-      </div>
-
-      <div class="uk-grid-margin">
-        <div class="md-card chartCard">
-          <div class="md-card-content">
-
-            &lt;!&ndash;MOBILE & PAD PORTRAIT&ndash;&gt;
-            <div class="uk-hidden@m">
-              <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
-                <label class="uk-margin-right">Show by: </label>
-                <select class="md-input" #selectPIDGroupBy (change)="getOtherWithPIDGroupByMobile(selectPIDGroupBy.value)" style="width: 230px; display: inline-block">
-                  <option value="country">country</option>
-                  <option value="datasource">datasource</option>
-                  <option value="organization">organization</option>
-                  <option value="funder">funder</option>
-                </select>
-              </div>
-
-              <iframe *ngIf="otherWithPIDGroupByView==='country' && otherWithPIDByCountryChartURLMobile"
-                      width="100%" height="550" [src]="otherWithPIDByCountryChartURLMobile"></iframe>
-              <iframe *ngIf="otherWithPIDGroupByView==='datasource' && otherWithPIDByDatasourceChartURLMobile"
-                      width="100%" height="550" [src]="otherWithPIDByDatasourceChartURLMobile"></iframe>
-              <iframe *ngIf="otherWithPIDGroupByView==='organization' && otherWithPIDByOrganizationChartURLMobile"
-                      width="100%" height="550" [src]="otherWithPIDByOrganizationChartURLMobile"></iframe>
-              <app-treemap-highchart *ngIf="otherWithPIDGroupByView==='funder' && otherWithPIDByFunderData"
-                                     [chartTitle]="'OA Other research products with PID by funder'"
-                                     [chartData]="otherWithPIDByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-
-            </div>
-
-            &lt;!&ndash;LAPTOP & PAD LANDSCAPE&ndash;&gt;
-            <div class="uk-visible@m">
-              <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
-                  data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
-                <li class="uk-active"><a (click)="getOtherWithPIDGroupBy('country')">Country</a></li>
-                <li><a (click)="getOtherWithPIDGroupBy('datasource')">Datasource</a></li>
-                <li><a (click)="getOtherWithPIDGroupBy('organization')">Organization</a></li>
-                <li><a (click)="getOtherWithPIDGroupBy('funder')">Funder</a></li>
-              </ul>
-
-              <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
-                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                  <iframe *ngIf="otherWithPIDByCountryChartURL"
-                          width="100%" height="350" [src]="otherWithPIDByCountryChartURL"></iframe>
-                </li>
-                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                  <iframe *ngIf="otherWithPIDByDatasourceChartURL"
-                          width="100%" height="350" [src]="otherWithPIDByDatasourceChartURL"></iframe>
-                </li>
-                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                  <iframe *ngIf="otherWithPIDByOrganizationChartURL"
-                          width="100%" height="350" [src]="otherWithPIDByOrganizationChartURL"></iframe>
-                </li>
-                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                  <app-treemap-highchart *ngIf="otherWithPIDByFunderData"
-                                         [chartTitle]="'OA Other research products with PID by funder'"
-                                         [chartData]="otherWithPIDByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-                </li>
-              </ul>
-            </div>
-
-          </div>
-        </div>
-      </div>
-
-    </div>
-  </div>
-
-  <div class="licenceIndicator uk-margin-large-top">
-    <h3 class="uk-margin-remove">Licence</h3>
-    <div class="uk-grid uk-child-width-1-2@m uk-child-width-1-2@l uk-child-width-1-1@s">
-
-      <div class="uk-grid-margin">
-        <div class="md-card chartCard">
-          <div class="md-card-content">
-            <iframe *ngIf="otherWithLicenceTimeline" width="100%" height="550" [src]="otherWithLicenceTimeline"></iframe>
-          </div>
-        </div>
-      </div>
-
-      <div class="uk-grid-margin">
-        <div class="md-card chartCard">
-          <div class="md-card-content">
-
-            &lt;!&ndash;MOBILE & PAD PORTRAIT&ndash;&gt;
-            <div class="uk-hidden@m">
-              <div class="uk-flex uk-flex-right uk-flex-middle uk-margin-bottom">
-                <label class="uk-margin-right">Show by: </label>
-                <select class="md-input" #selectLicenceGroupBy (change)="getOtherWithLicenceGroupByMobile(selectLicenceGroupBy.value)" style="width: 230px; display: inline-block">
-                  <option value="country">country</option>
-                  <option value="datasource">datasource</option>
-                  <option value="organization">organization</option>
-                  <option value="funder">funder</option>
-                </select>
-              </div>
-
-              <iframe *ngIf="otherWithLicenceGroupByView==='country' && otherWithLicenceByCountryChartURLMobile"
-                      width="100%" height="550" [src]="otherWithLicenceByCountryChartURLMobile"></iframe>
-              <iframe *ngIf="otherWithLicenceGroupByView==='datasource' && otherWithLicenceByDatasourceChartURLMobile"
-                      width="100%" height="550" [src]="otherWithLicenceByDatasourceChartURLMobile"></iframe>
-              <iframe *ngIf="otherWithLicenceGroupByView==='organization' && otherWithLicenceByOrganizationChartURLMobile"
-                      width="100%" height="550" [src]="otherWithLicenceByOrganizationChartURLMobile"></iframe>
-              <app-treemap-highchart *ngIf="otherWithLicenceGroupByView==='funder' && otherWithLicenceByFunderData"
-                                     [chartTitle]="'OA Other research products with licence by funder'"
-                                     [chartData]="otherWithLicenceByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-
-            </div>
-
-            &lt;!&ndash;LAPTOP & PAD LANDSCAPE&ndash;&gt;
-            <div class="uk-visible@m">
-              <ul class="uk-subnav uk-subnav-pill uk-flex uk-flex-right uk-flex-middle uk-margin-bottom" uk-margin
-                  data-uk-switcher="{connect:'#switcher-content-a-fade-publications', animation: 'fade'}">
-                <li class="uk-active"><a (click)="getOtherWithLicenceGroupBy('country')">Country</a></li>
-                <li><a (click)="getOtherWithLicenceGroupBy('datasource')">Datasource</a></li>
-                <li><a (click)="getOtherWithLicenceGroupBy('organization')">Organization</a></li>
-                <li><a (click)="getOtherWithLicenceGroupBy('funder')">Funder</a></li>
-              </ul>
-
-              <ul id="switcher-content-a-fade-publications" class="uk-switcher uk-margin">
-                <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                  <iframe *ngIf="otherWithLicenceByCountryChartURL"
-                          width="100%" height="350" [src]="otherWithLicenceByCountryChartURL"></iframe>
-                </li>
-                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                  <iframe *ngIf="otherWithLicenceByDatasourceChartURL"
-                          width="100%" height="350" [src]="otherWithLicenceByDatasourceChartURL"></iframe>
-                </li>
-                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                  <iframe *ngIf="otherWithLicenceByOrganizationChartURL"
-                          width="100%" height="350" [src]="otherWithLicenceByOrganizationChartURL"></iframe>
-                </li>
-                <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                  <app-treemap-highchart *ngIf="otherWithLicenceByFunderData"
-                                         [chartTitle]="'OA Other research products with licence by funder'"
-                                         [chartData]="otherWithLicenceByFunderData" [color]="otherResearchProductsColor"></app-treemap-highchart>
-                </li>
-              </ul>
-            </div>
-
-          </div>
-        </div>
-      </div>
-
-    </div>
-  </div>-->
-
-  <!--<div class="indicatorsTable uk-visible@m uk-margin-large-top">
-
-    <h3 class="">More details for other research products</h3>
-
-    <div class="uk-margin-top uk-margin-bottom">
-      <label class="uk-margin-right">Show: </label>
-      <select class="md-input" #selectOtherContent (change)="getContent('other', selectOtherContent.value)" style="width: 230px; display: inline-block">
-        <option value="affiliated">affiliated</option>
-        <option value="affiliated_peer_reviewed">affiliated peer reviewed</option>
-        <option value="deposited">deposited</option>
-        <option value="deposited_peer_reviewed">deposited peer reviewed</option>
-      </select>
-      &lt;!&ndash;<span class="md-input-bar"></span>&ndash;&gt;
-    </div>
-
-    <div class="uk-grid uk-child-width-1-2@l uk-child-width-1-2@m">
-      <div class="absoluteTable">
-        <div class="md-card chartCard">
-          <div class="md-card-content">
-
-            <ul class="uk-subnav uk-subnav-pill dataView uk-flex uk-flex-center" data-uk-switcher="{connect:'#other-indicators-content-a-fade', animation: 'fade'}">
-              <li aria-expanded="true" class="uk-active">
-                <a href="#">
-                  <i class="fas fa-hashtag"></i>
-                </a>
-              </li>
-              <li aria-expanded="false" class="">
-                <a href="#">
-                  <i class="fas fa-percentage"></i>
-                </a>
-              </li>
-            </ul>
-
-            <ul id="other-indicators-content-a-fade" class="uk-switcher uk-margin" >
-              <li aria-hidden="false" class="uk-active" style="animation-duration: 200ms;">
-                <div *ngIf="loadingPublicationsAbsoluteTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
-                <app-countries-table *ngIf="otherAbsoluteTableData" [isPercentage]="false" [countries]="otherAbsoluteTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
-              </li>
-              <li aria-hidden="true" style="animation-duration: 200ms;" class="">
-                <div *ngIf="loadingPublicationsPercentageTable" class="whiteFilm"><i class="fa fa-spinner fa-spin fa-2x loader" aria-hidden="true"></i></div>
-                <app-countries-table *ngIf="otherPercentageTableData" [isPercentage]="true" [countries]="otherPercentageTableData" [view]="'openScience'" [entity]="'other'"></app-countries-table>
-              </li>
-            </ul>
-
-          </div>
-        </div>
-
-      </div>
-
-    </div>
-
-
-  </div>-->
-
 </div>
Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.component.ts
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.component.ts	(revision 61515)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.component.ts	(revision 61516)
@@ -1,15 +1,4 @@
-import {Component, OnInit} from '@angular/core';
-import {environment} from '../../../../../environments/environment';
-import {
-  gradientStartColor,
-  otherResearchProductsColor, otherResearchProductsPalette,
-} from '../../../../chart-palettes';
-import {DataHandlerService} from '../../../../services/data-handler.service';
-import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
-import {DataService} from '../../../../services/data.service';
-import {ActivatedRoute} from '@angular/router';
-import {CountryTableData} from '../../../../domain/overview-map-data';
-import {TreemapHighchartsData} from '../../../../domain/treemap-highcharts-data';
+import {Component} from '@angular/core';
 
 @Component({
   selector: 'app-continent-os-orp',
@@ -16,162 +5,4 @@
   templateUrl: './continent-os-orp.component.html',
 })
 
-export class ContinentOSORPComponent implements OnInit {
-
-  private chartsURL = environment.API_ENDPOINT + 'chart?json=';
-  private profileName = environment.profileName;
-
-  private otherResearchProductsPalette = otherResearchProductsPalette;
-
-  otherResearchProductsColor = otherResearchProductsColor;
-  gradientStartColor = gradientStartColor;
-
-  otherWithLicenceTimeline: SafeResourceUrl;
-  otherWithPIDTimeline: SafeResourceUrl;
-
-  otherWithPIDGroupByView = 'country';
-  otherWithPIDByCountryChartURL: SafeResourceUrl;
-  otherWithPIDByDatasourceChartURL: SafeResourceUrl;
-  otherWithPIDByOrganizationChartURL: SafeResourceUrl;
-  otherWithPIDByCountryChartURLMobile: SafeResourceUrl;
-  otherWithPIDByDatasourceChartURLMobile: SafeResourceUrl;
-  otherWithPIDByOrganizationChartURLMobile: SafeResourceUrl;
-
-  otherWithLicenceGroupByView = 'country';
-  otherWithLicenceByCountryChartURL: SafeResourceUrl;
-  otherWithLicenceByDatasourceChartURL: SafeResourceUrl;
-  otherWithLicenceByOrganizationChartURL: SafeResourceUrl;
-  otherWithLicenceByCountryChartURLMobile: SafeResourceUrl;
-  otherWithLicenceByDatasourceChartURLMobile: SafeResourceUrl;
-  otherWithLicenceByOrganizationChartURLMobile: SafeResourceUrl;
-
-  otherWithPIDByFunderData: TreemapHighchartsData[];
-  otherWithLicenceByFunderData: TreemapHighchartsData[];
-
-  loadingOtherAbsoluteTable: boolean = true;
-  loadingOtherPercentageTable: boolean = true;
-  otherTableContentSelection: string = 'affiliated';
-  otherAbsoluteTableData: CountryTableData[];
-  otherPercentageTableData: CountryTableData[];
-
-  constructor(private dataService: DataService,
-              private dataHandlerService: DataHandlerService,
-              private route: ActivatedRoute,
-              private sanitizer: DomSanitizer) { }
-
-  ngOnInit(): void {
-
-    // this.otherWithPIDTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.pid_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    this.otherWithPIDTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.pid_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    // this.otherWithLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.licence_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    this.otherWithLicenceTimeline = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"OA publications","type":"column","query":{"name":"oso.results.licence_timeline.affiliated","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-
-    // // this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    // this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    // // this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    // this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    //
-    // // this.otherWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    // this.otherWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    // // this.otherWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    // this.otherWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    //
-    // // this.otherWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    // this.otherWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    // // this.otherWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false},"colors":[\"${this.otherResearchProductsPalette.join('","')}\"]}}`));
-    // this.otherWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-
-    this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    this.otherWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-
-    this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    this.otherWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-
-
-    this.dataService.getFundersResultsByTypeForPID('other').subscribe(
-      rawData => {
-        this.otherWithPIDByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
-      }, error => {
-        console.log(error);
-      }
-    );
-
-    this.dataService.getFundersResultsByTypeForLicence('other').subscribe(
-      rawData => {
-        this.otherWithLicenceByFunderData = this.dataHandlerService.convertRawDataToTreemapHighchartsData(rawData);
-      }, error => {
-        console.log(error);
-      }
-    );
-
-    this.getOtherTableData(this.otherTableContentSelection);
-  }
-
-  getOtherTableData(contentSelection: string) {
-    this.loadingOtherAbsoluteTable = true;
-    this.loadingOtherPercentageTable = true;
-    this.dataService.getIndicatorsTableData('other', contentSelection).subscribe(
-      rawData => {
-        this.otherAbsoluteTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
-        this.otherPercentageTableData = this.dataHandlerService.convertRawDataToIndicatorsTableData(rawData);
-        this.loadingOtherAbsoluteTable = false;
-        this.loadingOtherPercentageTable = false;
-      }, error => {
-        console.log(error);
-        this.loadingOtherAbsoluteTable = false;
-        this.loadingOtherPercentageTable = false;
-      }
-    );
-  }
-
-  getContent(type: string, contentSelection: string): void {
-
-    this.otherTableContentSelection = contentSelection;
-    this.getOtherTableData(this.otherTableContentSelection);
-  }
-
-  getOtherWithPIDGroupBy(contentSelection: string): void {
-    this.otherWithPIDGroupByView = contentSelection;
-    if (contentSelection === 'country' && !this.otherWithPIDByCountryChartURL) {
-      this.otherWithPIDByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'datasource' && !this.otherWithPIDByDatasourceChartURL) {
-      this.otherWithPIDByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'organization' && !this.otherWithPIDByOrganizationChartURL) {
-      this.otherWithPIDByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    }
-  }
-
-  getOtherWithPIDGroupByMobile(contentSelection: string): void {
-    this.otherWithPIDGroupByView = contentSelection;
-    if (contentSelection === 'country' && !this.otherWithPIDByCountryChartURLMobile) {
-      this.otherWithPIDByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.pid.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'datasource' && !this.otherWithPIDByDatasourceChartURLMobile) {
-      this.otherWithPIDByDatasourceChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'organization' && !this.otherWithPIDByOrganizationChartURLMobile) {
-      this.otherWithPIDByOrganizationChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.pid.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with PID","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    }
-  }
-
-  getOtherWithLicenceGroupBy(contentSelection: string): void {
-    this.otherWithLicenceGroupByView = contentSelection;
-    if (contentSelection === 'country' && !this.otherWithLicenceByCountryChartURL) {
-      this.otherWithLicenceByCountryChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'datasource' && !this.otherWithLicenceByDatasourceChartURL) {
-      this.otherWithLicenceByDatasourceChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'organization' && !this.otherWithLicenceByOrganizationChartURL) {
-      this.otherWithLicenceByOrganizationChartURL = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    }
-  }
-
-  getOtherWithLicenceGroupByMobile(contentSelection: string): void {
-    this.otherWithLicenceGroupByView = contentSelection;
-    if (contentSelection === 'country' && !this.otherWithLicenceByCountryChartURLMobile) {
-      this.otherWithLicenceByCountryChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"Data","type":"bar","query":{"name":"oso.results.licence.affiliated.bycountry","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by country","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'datasource' && !this.otherWithLicenceByDatasourceChartURLMobile) {
-      this.otherWithLicenceByDatasourceChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.bydatasource","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by datasource","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    } else if (contentSelection === 'organization' && !this.otherWithLicenceByOrganizationChartURLMobile) {
-      this.otherWithLicenceByOrganizationChartURLMobile = this.sanitizer.bypassSecurityTrustResourceUrl(this.chartsURL + encodeURIComponent(`{"library":"HighCharts","chartDescription":{"queries":[{"name":"publications","type":"bar","query":{"name":"oso.results.licence.affiliated.byorganization","parameters":["other"],"profile":"${this.profileName}"}}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"OA Other research products with licence","align":"left","margin":50},"subtitle":{"text":"by organization","align":"left"},"yAxis":{"title":{"text":""}},"xAxis":{"title":{"text":""}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":true},"plotOptions":{"series":{"dataLabels":{"enabled":false},"color":{"linearGradient":{"x1":0,"y1":0,"x2":0,"y2":1},"stops":[[0,"${this.otherResearchProductsColor}"],[1,"${this.gradientStartColor}"]]}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":false}}}`));
-    }
-  }
-
-}
+export class ContinentOSORPComponent {}
Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.module.ts
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.module.ts	(nonexistent)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp.module.ts	(revision 61516)
@@ -0,0 +1,27 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ContinentOpenScienceORPRoutingModule } from './continent-os-orp-routing.module';
+import { ReusableComponentsModule } from '../../../../shared/reusablecomponents/reusable-components.module';
+import { ContinentOSORPComponent } from './continent-os-orp.component';
+import { ContinentOSORPIndicatorsComponent } from './continent-os-orp-indicators.component';
+import { DataService } from '../../../../services/data.service';
+import { DataHandlerService } from '../../../../services/data-handler.service';
+
+
+@NgModule ({
+  imports: [
+    CommonModule,
+    ContinentOpenScienceORPRoutingModule,
+    ReusableComponentsModule,
+  ],
+  declarations: [
+    ContinentOSORPComponent,
+    ContinentOSORPIndicatorsComponent,
+  ],
+  providers: [
+    DataService,
+    DataHandlerService
+  ],
+})
+
+export class ContinentOpenScienceORPModule {}
Index: modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-routing.module.ts
===================================================================
--- modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-routing.module.ts	(nonexistent)
+++ modules/open-science-observatory-ui/branches/groupings-for-graphs/src/app/pages/continent/open-science/other-research-products/continent-os-orp-routing.module.ts	(revision 61516)
@@ -0,0 +1,29 @@
+import { RouterModule, Routes } from '@angular/router';
+import { NgModule } from '@angular/core';
+import { ContinentOSORPComponent } from './continent-os-orp.component';
+import { ContinentOSORPIndicatorsComponent } from './continent-os-orp-indicators.component';
+
+const continentOpenScienceORPRoutes: Routes = [
+  {
+    path: '',
+    component: ContinentOSORPComponent,
+    children : [
+      {
+        path: '',
+        redirectTo: 'pid',
+        pathMatch: 'full',
+      },
+      {
+        path: ':indicator',
+        component: ContinentOSORPIndicatorsComponent,
+      }
+    ]
+  },
+];
+
+@NgModule ({
+  imports: [RouterModule.forChild(continentOpenScienceORPRoutes)],
+  exports: [RouterModule]
+})
+
+export class ContinentOpenScienceORPRoutingModule {}
