fix(*): Replace olx with ol.olx (#130)

infra-geo-ouverte · Apr 9, 2018 · 3f56799 · 3f56799
1 parent 2cc11aa
commit 3f56799
Show file tree

Hide file tree

Showing 35 changed files with 46 additions and 23 deletions.
diff --git a/src/lib/context/shared/context.service.ts b/src/lib/context/shared/context.service.ts
@@ -21,6 +21,7 @@ import { ToolService } from '../../tool/shared';
 import { TypePermission } from './context.enum';
 import { ContextsList, ContextServiceOptions, Context, DetailedContext,
   ContextMapView, ContextPermission } from './context.interface';
+import ol = require('openlayers');
 
 @Injectable()
 export class ContextService {

diff --git a/src/lib/datasource/shared/capabilities.service.ts b/src/lib/datasource/shared/capabilities.service.ts
@@ -6,6 +6,7 @@ import { ObjectUtils } from '../../utils';
 import { TimeFilterOptions } from '../../filter';
 
 import { WMTSDataSourceOptions, WMSDataSourceOptions } from './datasources';
+import ol = require('openlayers');
 
 @Injectable()
 export class CapabilitiesService {

diff --git a/src/lib/datasource/shared/datasources/datasource.interface.ts b/src/lib/datasource/shared/datasources/datasource.interface.ts
@@ -11,7 +11,7 @@ export interface DataSourceOptions {
   legend?: DataSourceLegendOptions;
   metadata?: MetadataOptions;
   download?: DownloadOptions;
-  view?: olx.layer.ImageOptions;
+  view?: ol.olx.layer.ImageOptions;
 }
 
 export interface DataSourceContext extends DataSourceOptions {
@@ -43,7 +43,7 @@ export interface QueryableDataSource extends DataSource {
 }
 
 export interface TimeFilterableDataSourceOptions extends DataSourceOptions,
-    olx.source.ImageWMSOptions {
+    ol.olx.source.ImageWMSOptions {
 
   timeFilterable?: boolean;
   timeFilter?: TimeFilterOptions;
@@ -55,7 +55,7 @@ export interface TimeFilterableDataSource extends DataSource {
 }
 
 export interface OgcFilterableDataSourceOptions extends DataSourceOptions,
-    olx.source.VectorOptions {
+    ol.olx.source.VectorOptions {
 
   ogcFilterable?: boolean;
   filters?: IgoOgcFilterObject;

diff --git a/src/lib/datasource/shared/datasources/feature-datasource.interface.ts b/src/lib/datasource/shared/datasources/feature-datasource.interface.ts
@@ -1,6 +1,6 @@
 import { DataSourceOptions, DataSourceContext } from './datasource.interface';
 
-export interface FeatureDataSourceOptions extends DataSourceOptions, olx.source.VectorOptions {
+export interface FeatureDataSourceOptions extends DataSourceOptions, ol.olx.source.VectorOptions {
   formatType?: string;
   formatOptions?: any;
 }

diff --git a/src/lib/datasource/shared/datasources/feature-datasource.ts b/src/lib/datasource/shared/datasources/feature-datasource.ts
@@ -2,6 +2,7 @@ import { Md5 } from 'ts-md5/dist/md5';
 import { uuid } from '../../../utils';
 import { DataSource } from './datasource';
 import { FeatureDataSourceOptions } from './feature-datasource.interface';
+import ol = require('openlayers');
 
 
 export class FeatureDataSource extends DataSource {

diff --git a/src/lib/datasource/shared/datasources/osm-datasource.interface.ts b/src/lib/datasource/shared/datasources/osm-datasource.interface.ts
@@ -1,5 +1,5 @@
 import { DataSourceOptions, DataSourceContext } from './datasource.interface';
 
-export interface OSMDataSourceOptions extends DataSourceOptions, olx.source.OSMOptions {}
+export interface OSMDataSourceOptions extends DataSourceOptions, ol.olx.source.OSMOptions {}
 
 export interface OSMDataSourceContext extends DataSourceContext {}
diff --git a/src/lib/datasource/shared/datasources/osm-datasource.ts b/src/lib/datasource/shared/datasources/osm-datasource.ts
@@ -1,5 +1,6 @@
 import { DataSource } from './datasource';
 import { OSMDataSourceOptions } from './osm-datasource.interface';
+import ol = require('openlayers');
 
 export class OSMDataSource extends DataSource {
 

diff --git a/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts b/src/lib/datasource/shared/datasources/wfs-datasource.interface.ts
@@ -3,7 +3,7 @@ import { IgoOgcFilterObject } from '../../../filter';
 import { DataSourceOptions, DataSourceContext } from './datasource.interface';
 
 
-export interface WFSDataSourceOptions extends DataSourceOptions, olx.source.VectorOptions {
+export interface WFSDataSourceOptions extends DataSourceOptions, ol.olx.source.VectorOptions {
     version?: string;
     url: string;
     featureTypes: string;

diff --git a/src/lib/datasource/shared/datasources/wfs-datasource.ts b/src/lib/datasource/shared/datasources/wfs-datasource.ts
@@ -6,6 +6,7 @@ import { IgoOgcFilterObject, OgcFilter, WFSWriteGetFeatureOptions,
 import { DataSource } from './datasource';
 import { OgcFilterableDataSource } from './datasource.interface';
 import { WFSDataSourceOptions } from './wfs-datasource.interface';
+import ol = require('openlayers');
 
 
 export class WFSDataSource extends DataSource implements OgcFilterableDataSource {

diff --git a/src/lib/datasource/shared/datasources/wms-datasource.interface.ts b/src/lib/datasource/shared/datasources/wms-datasource.interface.ts
@@ -2,7 +2,7 @@ import { DataSourceContext,
          TimeFilterableDataSourceOptions,
          QueryableDataSourceOptions } from './datasource.interface';
 
-export interface WMSDataSourceOptions extends olx.source.ImageWMSOptions,
+export interface WMSDataSourceOptions extends ol.olx.source.ImageWMSOptions,
     TimeFilterableDataSourceOptions, QueryableDataSourceOptions {
 
   optionsFromCapabilities?: boolean;

diff --git a/src/lib/datasource/shared/datasources/wms-datasource.ts b/src/lib/datasource/shared/datasources/wms-datasource.ts
@@ -6,6 +6,7 @@ import { DataSource } from './datasource';
 import { DataSourceLegendOptions, TimeFilterableDataSource,
          QueryableDataSource } from './datasource.interface';
 import { WMSDataSourceOptions } from './wms-datasource.interface';
+import ol = require('openlayers');
 
 export class WMSDataSource
   extends DataSource implements QueryableDataSource, TimeFilterableDataSource {

diff --git a/src/lib/datasource/shared/datasources/wmts-datasource.interface.ts b/src/lib/datasource/shared/datasources/wmts-datasource.interface.ts
@@ -1,6 +1,6 @@
 import { DataSourceOptions, DataSourceContext } from './datasource.interface';
 
-export interface WMTSDataSourceOptions extends DataSourceOptions, olx.source.WMTSOptions {
+export interface WMTSDataSourceOptions extends DataSourceOptions, ol.olx.source.WMTSOptions {
   optionsFromCapabilities?: boolean;
 }
 

diff --git a/src/lib/datasource/shared/datasources/wmts-datasource.ts b/src/lib/datasource/shared/datasources/wmts-datasource.ts
@@ -3,6 +3,7 @@ import { Md5 } from 'ts-md5/dist/md5';
 import { createDefaultTileGrid } from '../../../utils/tilegrid';
 import { DataSource } from './datasource';
 import { WMTSDataSourceOptions } from './wmts-datasource.interface';
+import ol = require('openlayers');
 
 export class WMTSDataSource extends DataSource {
 

diff --git a/src/lib/datasource/shared/datasources/xyz-datasource.interface.ts b/src/lib/datasource/shared/datasources/xyz-datasource.interface.ts
@@ -1,5 +1,5 @@
 import { DataSourceOptions, DataSourceContext } from './datasource.interface';
 
-export interface XYZDataSourceOptions extends DataSourceOptions, olx.source.XYZOptions {}
+export interface XYZDataSourceOptions extends DataSourceOptions, ol.olx.source.XYZOptions {}
 
 export interface XYZDataSourceContext extends DataSourceContext {}
diff --git a/src/lib/datasource/shared/datasources/xyz-datasource.ts b/src/lib/datasource/shared/datasources/xyz-datasource.ts
@@ -2,6 +2,7 @@ import { Md5 } from 'ts-md5/dist/md5';
 
 import { DataSource } from './datasource';
 import { XYZDataSourceOptions } from './xyz-datasource.interface';
+import ol = require('openlayers');
 
 export class XYZDataSource extends DataSource {
 

diff --git a/src/lib/download/shared/download.service.ts b/src/lib/download/shared/download.service.ts
@@ -2,6 +2,7 @@ import { Injectable } from '@angular/core';
 import { MessageService, LanguageService } from '../../core';
 import { Layer } from '../../layer/shared';
 import { OgcFilterWriter } from '../../filter/shared';
+import ol = require('openlayers');
 
 @Injectable()
 export class DownloadService {

diff --git a/src/lib/filter/shared/ogc-filter.interface.ts b/src/lib/filter/shared/ogc-filter.interface.ts
@@ -1,7 +1,7 @@
 
 export interface OgcFilter extends ol.format.filter.Filter {}
 
-export interface WFSWriteGetFeatureOptions extends olx.format.WFSWriteGetFeatureOptions {}
+export interface WFSWriteGetFeatureOptions extends ol.olx.format.WFSWriteGetFeatureOptions {}
 
 
 export type AnyBaseOgcFilterOptions =

diff --git a/src/lib/filter/shared/ogc-filter.ts b/src/lib/filter/shared/ogc-filter.ts
@@ -2,6 +2,7 @@ import {
   OgcFilter, IgoOgcFilterObject, WFSWriteGetFeatureOptions,
   AnyBaseOgcFilterOptions
 } from './ogc-filter.interface';
+import ol = require('openlayers');
 
 
 export class OgcFilterWriter {

diff --git a/src/lib/form/fields/map-field/map-field.component.ts b/src/lib/form/fields/map-field/map-field.component.ts
@@ -4,6 +4,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
 import { IgoMap, MapViewOptions } from '../../../map';
 import { Layer } from '../../../layer';
+import ol = require('openlayers');
 
 
 @Component({

diff --git a/src/lib/import-export/shared/import-export.service.ts b/src/lib/import-export/shared/import-export.service.ts
@@ -7,6 +7,7 @@ import { VectorLayer } from '../../layer/shared/layers';
 import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource';
 
 import { ExportOptions } from './import-export.interface';
+import ol = require('openlayers');
 
 @Injectable()
 export class ImportExportService {

diff --git a/src/lib/layer/layer-item/layer-item.component.ts b/src/lib/layer/layer-item/layer-item.component.ts
@@ -7,6 +7,7 @@ import { FeatureService } from '../../feature';
 import { MetadataService, MetadataOptions } from '../../metadata';
 import { DownloadService} from '../../download';
 import { Layer, VectorLayer } from '../shared/layers';
+import ol = require('openlayers');
 
 @Component({
   selector: 'igo-layer-item',

diff --git a/src/lib/layer/shared/layers/image-layer.interface.ts b/src/lib/layer/shared/layers/image-layer.interface.ts
@@ -1,11 +1,11 @@
 import { LayerOptions, LayerContext } from './layer.interface';
 
 export interface ImageLayerOptions extends LayerOptions {
-  view?: olx.layer.ImageOptions;
+  view?: ol.olx.layer.ImageOptions;
   token?: string;
 }
 
 export interface ImageLayerContext extends LayerContext {
-  view?: olx.layer.ImageOptions;
+  view?: ol.olx.layer.ImageOptions;
   token?: string;
 }
diff --git a/src/lib/layer/shared/layers/image-layer.ts b/src/lib/layer/shared/layers/image-layer.ts
@@ -5,6 +5,7 @@ import { IgoMap } from '../../../map';
 
 import { Layer } from './layer';
 import { ImageLayerOptions } from './image-layer.interface';
+import ol = require('openlayers');
 
 
 export class ImageLayer extends Layer {

diff --git a/src/lib/layer/shared/layers/layer.interface.ts b/src/lib/layer/shared/layers/layer.interface.ts
@@ -1,8 +1,8 @@
-export interface LayerOptions extends olx.layer.BaseOptions {
+export interface LayerOptions extends ol.olx.layer.BaseOptions {
   title?: string;
   zIndex?: number;
   visible?: boolean;
-  view?: olx.layer.BaseOptions;
+  view?: ol.olx.layer.BaseOptions;
   baseLayer?: boolean;
   id?: string;
   minScaleDenom?: number;

diff --git a/src/lib/layer/shared/layers/tile-layer.interface.ts b/src/lib/layer/shared/layers/tile-layer.interface.ts
@@ -1,9 +1,9 @@
 import { LayerOptions, LayerContext } from './layer.interface';
 
 export interface TileLayerOptions extends LayerOptions {
-  view?: olx.layer.TileOptions;
+  view?: ol.olx.layer.TileOptions;
 }
 
 export interface TileLayerContext extends LayerContext {
-  view?: olx.layer.TileOptions;
+  view?: ol.olx.layer.TileOptions;
 }
diff --git a/src/lib/layer/shared/layers/tile-layer.ts b/src/lib/layer/shared/layers/tile-layer.ts
@@ -5,6 +5,7 @@ import { IgoMap } from '../../../map';
 
 import { Layer } from './layer';
 import { TileLayerOptions } from './tile-layer.interface';
+import ol = require('openlayers');
 
 export class TileLayer extends Layer {
 

diff --git a/src/lib/layer/shared/layers/vector-layer.interface.ts b/src/lib/layer/shared/layers/vector-layer.interface.ts
@@ -1,11 +1,11 @@
 import { LayerOptions, LayerContext } from './layer.interface';
 
 export interface VectorLayerOptions extends LayerOptions {
-  view?: olx.layer.VectorOptions;
+  view?: ol.olx.layer.VectorOptions;
   style?: ol.style.Style;
 }
 
 export interface VectorLayerContext extends LayerContext {
-  view?: olx.layer.VectorOptions;
+  view?: ol.olx.layer.VectorOptions;
   style?: {[key: string]: any};
 }
diff --git a/src/lib/layer/shared/layers/vector-layer.ts b/src/lib/layer/shared/layers/vector-layer.ts
@@ -2,6 +2,7 @@ import { DataSource } from '../../../datasource';
 
 import { Layer } from './layer';
 import { VectorLayerOptions } from './vector-layer.interface';
+import ol = require('openlayers');
 
 
 export class VectorLayer extends Layer {

diff --git a/src/lib/layer/shared/style.service.ts b/src/lib/layer/shared/style.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+import ol = require('openlayers');
 
 
 @Injectable()

diff --git a/src/lib/map/poi-button/poi-button.component.ts b/src/lib/map/poi-button/poi-button.component.ts
@@ -7,6 +7,7 @@ import { ConfirmDialogService } from '../../shared';
 import { AuthService, PoiService, Poi } from '../../auth';
 import { IgoMap } from '../shared';
 import { PoiDialogComponent } from './poi-dialog.component';
+import ol = require('openlayers');
 
 @Component({
   selector: 'igo-poi-button',

diff --git a/src/lib/map/shared/map.interface.ts b/src/lib/map/shared/map.interface.ts
@@ -1,13 +1,13 @@
-export interface MapViewOptions extends olx.ViewOptions {
+export interface MapViewOptions extends ol.olx.ViewOptions {
   projection?: string;
   center?: [number, number];
   geolocate?: boolean;
 }
 
 
 export interface ControlsMapOptions {
-  attribution?: boolean | olx.control.AttributionOptions;
-  scaleLine?: boolean | olx.control.ScaleLineOptions;
+  attribution?: boolean | ol.olx.control.AttributionOptions;
+  scaleLine?: boolean | ol.olx.control.ScaleLineOptions;
 }
 
 export interface MapOptions {

diff --git a/src/lib/map/shared/map.ts b/src/lib/map/shared/map.ts
@@ -8,6 +8,7 @@ import { Layer, VectorLayer } from '../../layer/shared/layers';
 import { FeatureDataSource } from '../../datasource/shared/datasources/feature-datasource';
 
 import { MapViewOptions, MapOptions } from './map.interface';
+import * as ol from 'openlayers';
 
 
 export class IgoMap {
@@ -54,12 +55,12 @@ export class IgoMap {
     if (this.options.controls) {
       if (this.options.controls.attribution) {
         const attributionOpt = (this.options.controls.attribution === true ?
-          {} : this.options.controls.attribution) as olx.control.AttributionOptions;
+          {} : this.options.controls.attribution) as ol.olx.control.AttributionOptions;
         controls.push(new ol.control.Attribution(attributionOpt));
       }
       if (this.options.controls.scaleLine) {
         const scaleLineOpt = (this.options.controls.scaleLine === true ?
-          {} : this.options.controls.scaleLine) as olx.control.ScaleLineOptions;
+          {} : this.options.controls.scaleLine) as ol.olx.control.ScaleLineOptions;
         controls.push(new ol.control.ScaleLine(scaleLineOpt));
       }
     }

diff --git a/src/lib/overlay/shared/overlay.directive.ts b/src/lib/overlay/shared/overlay.directive.ts
@@ -6,6 +6,7 @@ import { Feature } from '../../feature';
 
 import { OverlayService } from '../shared/overlay.service';
 import { OverlayAction } from '../shared/overlay.interface';
+import ol = require('openlayers');
 
 
 @Directive({

diff --git a/src/lib/query/shared/query.service.ts b/src/lib/query/shared/query.service.ts
@@ -11,6 +11,7 @@ import { Layer } from '../../layer';
 
 import { QueryFormat } from './query.enum';
 import { QueryOptions } from './query.interface';
+import ol = require('openlayers');
 
 
 @Injectable()

diff --git a/src/lib/utils/tilegrid.ts b/src/lib/utils/tilegrid.ts
@@ -1,3 +1,5 @@
+import ol = require('openlayers');
+
 export function createDefaultTileGrid(epsg?: string): ol.tilegrid.WMTS {
   const projection = epsg ? ol.proj.get(epsg) : ol.proj.get('EPSG:3857');
   const projectionExtent = projection.getExtent();