fix dependencies (#16)

AnSyn · Apr 30, 2019 · a8717e4 · a8717e4
1 parent 264b24d
commit a8717e4
Show file tree

Hide file tree

Showing 6 changed files with 82 additions and 361 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 ## Installation
 
 ```shell
-npm install @ansyn/ansyn @ansyn/assets @ansyn/core @ngrx/core @ngrx/store @ngrx/effects @ngrx/entity ngx-treeview ol cesium d3 @angular/cdk @angular/material
+npm install @ansyn/ansyn @ansyn/imagery @ansyn/map-facade @ansyn/ol @ansyn/menu @ngrx/core @ngrx/store @ngrx/effects @ngrx/entity ngx-treeview ol cesium d3 @angular/cdk @angular/material
 ```
 or
 ```shell
@@ -21,7 +21,7 @@ add ansyn to your assets / styles on `angular.json` file,  under yourProject/arc
              "assets": [
                 {
                   "glob": "**/*",
-                  "input": "./node_modules/@ansyn/assets",
+                  "input": "./node_modules/@ansyn/ansyn/assets",
                   "output": "/assets"
                 },
                 {
@@ -31,7 +31,7 @@ add ansyn to your assets / styles on `angular.json` file,  under yourProject/arc
                 }
              ],
              "styles": [
-               "node_modules/@ansyn/assets/styles/styles.css"
+               "node_modules/@ansyn/ansyn/assets/styles/styles.css"
              ],
              "scripts": [
                "node_modules/cesium/Build/Cesium/Cesium.js"

diff --git a/angular.json b/angular.json
@@ -26,7 +26,7 @@
             "assets": [
               {
                 "glob": "**/*",
-                "input": "./node_modules/@ansyn/assets",
+                "input": "./node_modules/@ansyn/ansyn/assets",
                 "output": "/assets"
               },
               {
@@ -39,7 +39,7 @@
             ],
             "styles": [
               "src/styles.css",
-              "node_modules/@ansyn/assets/styles/styles.css"
+              "node_modules/@ansyn/ansyn/assets/styles/styles.css"
             ],
             "scripts": [
               "node_modules/cesium/Build/Cesium/Cesium.js"

diff --git a/package.json b/package.json
@@ -25,9 +25,12 @@
     "@angular/platform-browser": "^7.2.4",
     "@angular/platform-browser-dynamic": "^7.2.4",
     "@angular/router": "^7.2.4",
-    "@ansyn/ansyn": "^0.3.22",
-    "@ansyn/assets": "^0.3.22",
-    "@ansyn/core": "^0.3.22",
+    "@ansyn/ansyn": "^0.3.27",
+    "@ansyn/event-drops": "^0.2.8-1.9",
+    "@ansyn/imagery": "^0.3.27",
+    "@ansyn/map-facade": "^0.3.27",
+    "@ansyn/menu": "^0.3.27",
+    "@ansyn/ol": "^0.3.27",
     "@ngrx/core": "^1.2.0",
     "@ngrx/effects": "^7.3.0",
     "@ngrx/entity": "^7.3.0",

diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -1,11 +1,12 @@
-import {Component} from '@angular/core';
-import {AnsynApi} from '@ansyn/ansyn';
-import {LayoutKey, layoutOptions, IOverlay, GeoRegisteration} from '@ansyn/core';
-import {FeatureCollection} from 'geojson';
-import {HttpClient} from '@angular/common/http';
-import {Observable} from 'rxjs';
+import { HttpClient } from '@angular/common/http';
+import { Component } from '@angular/core';
+import { AnsynApi, GeoRegisteration, IOverlay } from '@ansyn/ansyn';
+import { FeatureCollection } from 'geojson';
 import * as momentNs from 'moment';
-import {take, tap} from 'rxjs/operators';
+import { Observable } from 'rxjs';
+import { take, tap } from 'rxjs/operators';
+import { layoutOptions } from '@ansyn/map-facade';
+import { LayoutKey } from '@ansyn/map-facade';
 
 const moment = momentNs;
 
@@ -104,7 +105,7 @@ export class AppComponent {
   }
 
   setPositionWithRadius() {
-    this.ansynApi.setMapPositionByRadius({type: 'Point', coordinates: [-117.914, 33.8117]}, 100, true);
+    this.ansynApi.setMapPositionByRadius({ type: 'Point', coordinates: [-117.914, 33.8117] }, 100, true);
   }
 
   setOverlays() {

diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -2,6 +2,8 @@ import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 import { AppComponent } from './app.component';
 import { AnsynModule } from '@ansyn/ansyn';
+import { OL_CONFIG, OL_PLUGINS_CONFIG, OpenLayersMap, AnnotationsVisualizer, OpenLayerBingSourceProvider } from '@ansyn/ol';
+import { ImageryModule } from '@ansyn/imagery';
 
 @NgModule({
   declarations: [
@@ -11,7 +13,18 @@ import { AnsynModule } from '@ansyn/ansyn';
     BrowserModule,
     AnsynModule.component()
   ],
-  providers: [],
+  providers: [
+    {
+      provide: OL_CONFIG,
+      useValue: {}
+    },
+    {
+      provide: OL_PLUGINS_CONFIG,
+      useValue: {
+        Annotations: {}
+      }
+    },
+  ],
   bootstrap: [AppComponent]
 })
 export class AppModule { }