Feature/multiple maps support #245

tomermoshe · 2018-11-18T00:19:55Z

Checklist:

If this PR is a new feature, please reference an issue where a consensus about the design was reached (not necessary for small changes)
Make sure all changes are documented in CHANGESLOG.md and README.md

added setRotation function to CameraService fixed ac-layer onDestroy fixed ac-map onDestroy added mutiple maps camera binidng function to MapsManagerService

added support for cesium callback property updated shape editors to work with callback properties

Added ellipse editor

added circle - ellipse transformation to ellipse editor

minor fix to EllipseEditOptions

typings fix

updated tsconfigs

…onal

tomermoshe · 2018-11-20T15:23:41Z

fix #243 #230 #212

eitanfr · 2018-11-20T15:41:46Z

CHANGELOG.md

+* Fixed `ac-layer` onDestroy.
+* Fixed `ac-map` onDestroy.
+* Fixed `CircleEditorService` shape dragging.
+* Fixed `ac-model-desc` docs [#243](https://github.com/TGFTech/angular-cesium/issues/243).


add plonter fix

eitanfr · 2018-11-20T15:43:37Z

demo/app/app.component.ts

@@ -44,7 +51,7 @@ export class AppComponent implements AfterViewInit {
  ngAfterViewInit(): void {
    // example for getting the viewer by Id outside of the ac-map hierarchy
    const map = this.mapsManagerService.getMap('main-map');
-    const viewer = map.getCesiumViewer();
+    // this.mapsManagerService.bind2DMapsCameras(['main-map', 'sub-map']);


for demo purposes

eitanfr · 2018-11-20T15:44:34Z

demo/app/components/demo-map/demo-map.component.html

-    <!--<html-layer></html-layer>-->
-    <!--<track-entity-layer></track-entity-layer>-->
+<ac-map *ngFor="let map of maps; trackBy: mapsTrackBy" [sceneMode]="map.sceneMode" [mapId]="map.id" [containerId]="map.containerId">
+  <!-- <ac-map-layer-provider


why in comment

I think we dont need it in the demo by default. The default map looks much better IMO

eitanfr · 2018-11-20T15:46:02Z

demo/app/components/demo-map/demo-map.component.ts

+    this.appSettingsService.showTracksLayer = true;
+
+    // setTimeout(() => this.showLayer = false, 5000);
+    // setTimeout(() => this.showMap = false, 5000);


remove, im not going to be your lint... check where there is unwanted comments

For demo purposes

eitanfr · 2018-11-20T15:49:22Z

demo/app/components/demo-map/demo-map.component.ts

+  sceneMode = SceneMode.SCENE3D;
+  showLayer = true;
+  showMap = true;
+  maps = [


why there is an array here? its confusing
If we want an example for multi ac-map lets create a new component for it... after all multi map is used that often... and the demo has enough code without it...

eitanfr · 2018-11-20T15:53:20Z

package.json

@@ -40,21 +40,22 @@
    "postpublish": "npm run docs:push"
  },
  "peerDependencies": {
-    "@angular/common": "^4.2.6 || ^5.0.0 || ^6.0.0",
-    "@angular/core": "^4.2.6 || ^5.0.0 || ^6.0.0"
+    "@angular/common": "^4.2.6 || ^5.0.0 || ^6.0.0 || ^7.0.0",


I guess we need to do the same for angular-parse...
angular 7 was tested with aot build on external project?

eitanfr · 2018-11-20T15:56:07Z

src/angular-cesium-widgets/models/editable-circle.ts

 import { PointProps, PolylineProps } from './polyline-edit-options';
 import { defaultLabelProps, LabelProps } from './label-props';
+import { EllipseProps } from './ellipse-edit-options';

 export class EditableCircle extends AcEntity {


shouldnt it extend EditableEllipse?

eitanfr · 2018-11-20T15:56:37Z

src/angular-cesium-widgets/models/editable-ellipse.ts

+      this._majorRadius = 0;
+    }
+    // } else if (this._center && this._majorRadiusPoint && this._minorRadius === undefined) {
+    // const newRadius = GeoUtilsService.distance(this.center.getPosition(), position);


eitanfr · 2018-11-20T15:57:14Z

src/angular-cesium-widgets/models/editable-polygon.ts

  }

  endMovePolygon() {
    this.lastDraggedToPosition = undefined;
-    this.positions.forEach(point => this.updatePointsLayer(true, point));
-    this.updatePolygonsLayer();
+    // this.positions.forEach(point => this.updatePointsLayer(true, point));


eitanfr · 2018-11-20T15:59:17Z

src/angular-cesium-widgets/services/zoom-to-rectangle.service.ts

+
+  activate(
+    options: {
+      onStart?: (acMap?: AcMapComponent) => any;


why the acMap is passed here?

Because the service can be used without being provided and initialized by ac-map. In this case, this a way for the user to know in which map the zooming is taking place.

eitanfr · 2018-11-20T16:03:19Z

src/angular-cesium-widgets/services/zoom-to-rectangle.service.ts

+    };
+    let borderElement: HTMLElement | undefined;
+
+    container.onmousedown = e => {


shouldnt the event be configurable? like if i want zoom with right click.

I think we can leave it like that for now. If we decide it needs modefing will do it in a new PR

eitanfr · 2018-11-20T16:03:33Z

src/angular-cesium-widgets/services/zoom-to-rectangle.service.ts

+    };
+    let borderElement: HTMLElement | undefined;
+
+    container.onmousedown = e => {


do you unregister this events?

No. Instead the container is removed from the DOM and later gets picked by the garbage collector

eitanfr · 2018-11-20T16:04:44Z

src/angular-cesium-widgets/services/zoom-to-rectangle.service.ts

+    }
+    this.disable(mapId);
+    const container = document.createElement('div');
+    mapContainer.style.position = 'relative';


isnt it a bit dangerous changing the uesrs map css??
why dont use fixed position?

The map container is created by us and not the user so I think its fine

We have something similar in ac-map

eitanfr · 2018-11-20T16:09:00Z

src/angular-cesium/services/cesium/cesium.service.ts


-  init(mapContainer: HTMLElement) {
+  init(mapContainer: HTMLElement, map: AcMapComponent) {
+    this.map = map;
    this.ngZone.runOutsideAngular(() => {
      const options = this.viewerConfiguration ? this.viewerConfiguration.viewerOptions : undefined;


what about ViewerConfiguration how is it supports multi maps?

added support through array

eitanfr · 2018-11-20T16:11:07Z

src/angular-cesium/services/geo-utils/geo-utils.service.ts

+      if (resultDistance > meterDistance) {
+        distanceFactorRangeMax = distanceFactorRangeMin + (distanceFactorRangeMax - distanceFactorRangeMin) / 2;
+      } else {
+        distanceFactorRangeMin = distanceFactorRangeMin + (distanceFactorRangeMax - distanceFactorRangeMin) / 2;


what about turf?

It had the same issues as our original code

eitanfr · 2018-11-20T16:13:21Z

ac-layer onDestory?? doesnt need changes?

eitanfr · 2018-11-20T16:13:49Z

all data source and Z index code can be deleted??

eitanfr · 2018-11-20T16:14:56Z

add to README:

maps manager - supports multi map better explanation about the api , and slave cameras
all new services (ellipse,zoom...)

eitanfr · 2018-11-20T16:15:16Z

add resolved issues

updated demo app fixed a bug in maps-manager.service sync2dMapsCameras func fixed toolbar positiong bug

tomermoshe added 18 commits November 9, 2018 17:58

added support for multiple ac-maps

103ce8a

added setRotation function to CameraService fixed ac-layer onDestroy fixed ac-map onDestroy added mutiple maps camera binidng function to MapsManagerService

added zoom to rectangle service

89f37d0

added support for cesium callback property updated shape editors to work with callback properties

updated doces and changelog

abff43a

zoom to rectangle minor fix

ae2497d

demo map update

3b4571f

reverted toolbar changes

42db2c8

Improved pointByLocationDistanceAndAzimuth accuracy

4fce4e3

Added ellipse editor

minor fix ot maps manager

c8fe76c

fixed editable circle shape drag

1f1c4cd

added circle - ellipse transformation to ellipse editor

updated changelog and readme

1bb0fd3

minor fix to EllipseEditOptions

minor typings fix

a4972ee

cosmetic update to zoom to rectangel tool

5dd6638

updated cesium and angular

a47c8ce

typings fix

minor demo map fix

b7b4929

fixed a bug in zoom-to-rectangle.serviec

de1bca8

updated tsconfigs

minor rename

3cfa11e

changed cirlce to ellipse trasformation in ellipses editor to be opti…

c6e9656

…onal

fix for issue 243 - docs issue

be9b136

This was referenced Nov 20, 2018

Docs: wrong documentation in ac-model-desc #243

Closed

NgIf structural directive with angular-cesium #230

Closed

fixed entities drawing directly to map - without ac-layer

b7fac1d

tomermoshe mentioned this pull request Nov 20, 2018

Exception on #212

Closed

tomermoshe added 2 commits November 20, 2018 14:20

added multi map support for ac-html

fa828d8

fixed ac-html and ac-html-desc bugs when using multiple maps

8ccccac

eitanfr reviewed Nov 20, 2018

View reviewed changes

tomermoshe added 6 commits November 20, 2018 19:23

fixes from PR

fa3d6e1

updated changelog

f0bcef5

updated readme

ef823dc

updated demo app fixed a bug in maps-manager.service sync2dMapsCameras func fixed toolbar positiong bug

updated editors to use templates instead of templateUrls

86ac7d4

updated viewer-configuration.service to support multiple maps

02973c5

fixed tests

b918928

eitanfr merged commit 85b7a51 into master Nov 21, 2018

Feature/multiple maps support #245

Feature/multiple maps support #245

Conversation

tomermoshe commented Nov 18, 2018 • edited Loading

Checklist:

tomermoshe commented Nov 20, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tomermoshe Nov 20, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

eitanfr commented Nov 20, 2018

eitanfr commented Nov 20, 2018

eitanfr commented Nov 20, 2018

eitanfr commented Nov 20, 2018

tomermoshe commented Nov 18, 2018 •

edited

Loading

tomermoshe Nov 20, 2018 •

edited

Loading