Skip to content

Commit 0c62fe2

Browse files
author
tomermoshe
committed
fixed server birds sending interval
fixed circle radius changing
1 parent dacc1b6 commit 0c62fe2

File tree

6 files changed

+79
-71
lines changed

6 files changed

+79
-71
lines changed

‎demo/app/components/dynamic-ellipse-layer/dynamic-ellipse-layer.component.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<ac-ellipse-desc props="{
33
position: ellipse.geometry.center,
44
semiMajorAxis:400000.0,
5-
semiMinorAxis:250000.0
5+
semiMinorAxis:250000.0,
6+
height: 0
67
}"></ac-ellipse-desc>
78
</ac-layer>

‎demo/server/src/simulative/sim-generator.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,11 @@ export class SimGenerator {
7171
this.client.simData = dataChunk;
7272
}
7373

74-
const chunk = this.client.numOfEntities > INTERVAL_DIVIDER ? this.getChunkPart(counter) : dataChunk;
74+
const chunk = this.client.numOfEntities > 100 ?
75+
this.getChunkPart(counter) : dataChunk;
7576
this.client.socket.emit('birds', chunk);
7677
counter++;
77-
}, this.client.intervalMs / INTERVAL_DIVIDER);
78+
}, this.client.numOfEntities <= 100 ? this.client.intervalMs : this.client.intervalMs / INTERVAL_DIVIDER);
7879
this.client.intervalId = id;
7980
return id;
8081
}

‎package.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-cesium",
3-
"version": "0.0.45",
3+
"version": "0.0.47",
44
"license": "MIT",
55
"description": "Angular library for working with Cesium.",
66
"repository": "https://github.com/TGFTech/angular-cesium",
@@ -32,25 +32,24 @@
3232
"gh-pages": "gh-pages -d docs -b gh-pages",
3333
"docs:push": "npm run compile-docs && npm run gh-pages && rimraf docs",
3434
"heroku-postbuild": "npm run build-demo",
35-
"prepublishOnly": "npm run bundle",
36-
"postpublish": "npm run docs:push"
35+
"prepublishOnly": "npm run bundle"
3736
},
3837
"peerDependencies": {
39-
"@angular/common": "^4.2.6 || ^5.0.0",
40-
"@angular/core": "^4.2.6 || ^5.0.0"
38+
"@angular/common": "^4.2.6",
39+
"@angular/core": "^4.2.6"
4140
},
4241
"devDependencies": {
43-
"@angular/animations": "5.1.0",
44-
"@angular/cdk": "5.0.1",
45-
"@angular/common": "5.1.0",
46-
"@angular/compiler": "5.1.0",
47-
"@angular/compiler-cli": "5.1.2",
48-
"@angular/core": "5.1.0",
49-
"@angular/forms": "5.1.0",
50-
"@angular/http": "5.1.0",
51-
"@angular/material": "5.0.1",
52-
"@angular/platform-browser": "5.1.0",
53-
"@angular/platform-browser-dynamic": "5.1.0",
42+
"@angular/animations": "^4.3.2",
43+
"@angular/cdk": "^2.0.0-beta.8",
44+
"@angular/common": "^4.3.2",
45+
"@angular/compiler": "^4.3.2",
46+
"@angular/compiler-cli": "^4.3.2",
47+
"@angular/core": "^4.3.2",
48+
"@angular/forms": "^4.3.2",
49+
"@angular/http": "^4.3.2",
50+
"@angular/material": "2.0.0-beta.12",
51+
"@angular/platform-browser": "^4.3.2",
52+
"@angular/platform-browser-dynamic": "^4.3.2",
5453
"@compodoc/compodoc": "^1.0.0-beta.14",
5554
"@types/body-parser": "^1.16.3",
5655
"@types/cors": "^2.8.3",
@@ -120,7 +119,7 @@
120119
"rollup-plugin-node-resolve": "^3.0.0",
121120
"rollup-plugin-uglify": "^1.0.1",
122121
"run-sequence": "^1.2.1",
123-
"rxjs": "^5.5.5",
122+
"rxjs": "^5.4.2",
124123
"script-loader": "^0.7.0",
125124
"socket.io": "^2.0.1",
126125
"socket.io-client": "^2.0.1",
@@ -129,12 +128,12 @@
129128
"ts-mockito": "^2.0.2",
130129
"ts-node": "^3.3.0",
131130
"tslint": "^5.5.0",
132-
"typescript": "2.5.1",
131+
"typescript": "^2.4.2",
133132
"webpack": "2.2.1",
134133
"webpack-dev-server": "2.4.1",
135134
"webpack-merge": "^3.0.0",
136135
"webpack-node-externals": "^1.5.4",
137-
"zone.js": "0.8.18"
136+
"zone.js": "^0.8.4"
138137
},
139138
"dependencies": {
140139
"@types/geodesy": "^1.1.2",
@@ -148,3 +147,4 @@
148147
"heatmap.js": "^2.0.5"
149148
}
150149
}
150+

‎src/angular-cesium/components/ac-circle-desc/ac-circle-desc.component.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ export class AcCircleDescComponent extends BasicDesc {
4444

4545
cesiumProps.semiMajorAxis = cesiumProps.radius;
4646
cesiumProps.semiMinorAxis = cesiumProps.radius;
47+
delete cesiumProps.radius;
4748

4849
return cesiumProps;
4950
}
51+
52+
protected _getPropsAssigner(): (cesiumObject: Object, desc: Object) => Object {
53+
return (cesiumObject: Object, desc: Object) => Object.assign(cesiumObject, desc)
54+
}
5055
}

‎src/angular-cesium/services/drawers/ellipse-drawer/ellipse-drawer.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ export class EllipseDrawerService extends EntitiesDrawerService {
1111
constructor(cesiumService: CesiumService) {
1212
super(cesiumService, GraphicsType.ellipse, {
1313
collectionsNumber: 10,
14-
collectionMaxSize: 1000,
15-
collectionSuspensionTime: 10
14+
collectionMaxSize: 450,
15+
collectionSuspensionTime: 100
1616
});
1717
}
1818
}

‎yarn.lock

Lines changed: 48 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -6,75 +6,80 @@
66
version "0.3.8"
77
resolved "https://registry.yarnpkg.com/8fold-marked/-/8fold-marked-0.3.8.tgz#c529a89bb90d3559fcab3ba4f7d4fa31c80fbb13"
88

9-
"@angular/animations@5.1.0":
10-
version "5.1.0"
11-
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-5.1.0.tgz#439135ed56355ec779791bf3ea7de1c711cd2185"
9+
"@angular/animations@^4.3.2":
10+
version "4.4.6"
11+
resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-4.4.6.tgz#fa661899a8a4e38cb7c583c7a5c97ce65d592a35"
1212
dependencies:
1313
tslib "^1.7.1"
1414

15-
"@angular/cdk@5.0.1":
16-
version "5.0.1"
17-
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-5.0.1.tgz#c85e662fe2e1c58abde1dea0f0f18cdfcffc2066"
15+
"@angular/cdk@^2.0.0-beta.8":
16+
version "2.0.0-beta.12"
17+
resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-2.0.0-beta.12.tgz#3a243cb62b93f4e039120ba70f900dc9e235622e"
1818
dependencies:
1919
tslib "^1.7.1"
2020

21-
"@angular/common@5.1.0":
22-
version "5.1.0"
23-
resolved "https://registry.yarnpkg.com/@angular/common/-/common-5.1.0.tgz#88b586e0aff6a93b8de08cce1e14c0e65fde5a56"
21+
"@angular/common@^4.3.2":
22+
version "4.4.6"
23+
resolved "https://registry.yarnpkg.com/@angular/common/-/common-4.4.6.tgz#4b81420724e0828a0e839b95a55eb1a7e83918f2"
2424
dependencies:
2525
tslib "^1.7.1"
2626

27-
"@angular/compiler-cli@5.1.2":
28-
version "5.1.2"
29-
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-5.1.2.tgz#70addc11b6528f087abe809f94acedecdfc9c8f6"
27+
"@angular/compiler-cli@^4.3.2":
28+
version "4.4.6"
29+
resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-4.4.6.tgz#bafd3d1e260e99087eb9a8cf7532dbd603abb9b1"
3030
dependencies:
31-
chokidar "^1.4.2"
31+
"@angular/tsc-wrapped" "4.4.6"
3232
minimist "^1.2.0"
3333
reflect-metadata "^0.1.2"
34-
tsickle "^0.25.5"
3534

36-
"@angular/compiler@5.1.0":
37-
version "5.1.0"
38-
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-5.1.0.tgz#23fe2914061487fcc909616b4dc5c24c5a8d47a1"
35+
"@angular/compiler@^4.3.2":
36+
version "4.4.6"
37+
resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-4.4.6.tgz#2ee1faf25b757e1d128979074be7fae529b3bc20"
3938
dependencies:
4039
tslib "^1.7.1"
4140

42-
"@angular/core@5.1.0":
43-
version "5.1.0"
44-
resolved "https://registry.yarnpkg.com/@angular/core/-/core-5.1.0.tgz#6f7596ad780418cecac527ae0508cfc1a36383a0"
41+
"@angular/core@^4.3.2":
42+
version "4.4.6"
43+
resolved "https://registry.yarnpkg.com/@angular/core/-/core-4.4.6.tgz#13031fd10dcfe438875419b38f21120958bc2354"
4544
dependencies:
4645
tslib "^1.7.1"
4746

48-
"@angular/forms@5.1.0":
49-
version "5.1.0"
50-
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-5.1.0.tgz#8699c7117a348607d4c7a1deee9caa5ca460c2cb"
47+
"@angular/forms@^4.3.2":
48+
version "4.4.6"
49+
resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-4.4.6.tgz#fe64ace42435c1b80f49034b7c41ce8caf14a44a"
5150
dependencies:
5251
tslib "^1.7.1"
5352

54-
"@angular/http@5.1.0":
55-
version "5.1.0"
56-
resolved "https://registry.yarnpkg.com/@angular/http/-/http-5.1.0.tgz#59d47c1878896f25e64b9abc700017cff7836710"
53+
"@angular/http@^4.3.2":
54+
version "4.4.6"
55+
resolved "https://registry.yarnpkg.com/@angular/http/-/http-4.4.6.tgz#0af680c6710bdc026d940e225cfd0f6a5c005d0c"
5756
dependencies:
5857
tslib "^1.7.1"
5958

60-
"@angular/material@5.0.1":
61-
version "5.0.1"
62-
resolved "https://registry.yarnpkg.com/@angular/material/-/material-5.0.1.tgz#73ff8af76daf7c7ec56092a613637b21deb5d00e"
59+
"@angular/material@2.0.0-beta.12":
60+
version "2.0.0-beta.12"
61+
resolved "https://registry.yarnpkg.com/@angular/material/-/material-2.0.0-beta.12.tgz#71b6d0b7b021891e5d0e3688c1d4bd78c7457f58"
6362
dependencies:
6463
tslib "^1.7.1"
6564

66-
"@angular/platform-browser-dynamic@5.1.0":
67-
version "5.1.0"
68-
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-5.1.0.tgz#60566728dd949c442e064bf8247aa51672411f2b"
65+
"@angular/platform-browser-dynamic@^4.3.2":
66+
version "4.4.6"
67+
resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.4.6.tgz#4d3d9a6a7bf2cf3de4058a615ae059eff641fa36"
6968
dependencies:
7069
tslib "^1.7.1"
7170

72-
"@angular/platform-browser@5.1.0":
73-
version "5.1.0"
74-
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-5.1.0.tgz#b5373232403d73c355b971cfae8b03191c4f58a2"
71+
"@angular/platform-browser@^4.3.2":
72+
version "4.4.6"
73+
resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-4.4.6.tgz#a9839c547e1b654fa1d24a89780c8ba6ab8dcce0"
7574
dependencies:
7675
tslib "^1.7.1"
7776

77+
"@angular/[email protected]":
78+
version "4.4.6"
79+
resolved "https://registry.yarnpkg.com/@angular/tsc-wrapped/-/tsc-wrapped-4.4.6.tgz#16787cbbf50bdc7e738123b19c32527f244e178d"
80+
dependencies:
81+
tsickle "^0.21.0"
82+
7883
"@compodoc/compodoc@^1.0.0-beta.14":
7984
version "1.0.4"
8085
resolved "https://registry.yarnpkg.com/@compodoc/compodoc/-/compodoc-1.0.4.tgz#67a00d764b69033831881b04487925d2223812e6"
@@ -1560,7 +1565,7 @@ cheerio@^1.0.0-rc.2:
15601565
lodash "^4.15.0"
15611566
parse5 "^3.0.1"
15621567

1563-
chokidar@^1.4.1, chokidar@^1.4.2, chokidar@^1.6.0, chokidar@^1.7.0:
1568+
chokidar@^1.4.1, chokidar@^1.6.0, chokidar@^1.7.0:
15641569
version "1.7.0"
15651570
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
15661571
dependencies:
@@ -6152,7 +6157,7 @@ [email protected]:
61526157
version "2.3.24"
61536158
resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.24.tgz#14f950a4217d7e35daa71bbcbe58eff68ea4b2b7"
61546159

6155-
rxjs@^5.5.5:
6160+
rxjs@^5.4.2:
61566161
version "5.5.6"
61576162
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.6.tgz#e31fb96d6fd2ff1fd84bcea8ae9c02d007179c02"
61586163
dependencies:
@@ -7024,9 +7029,9 @@ tsconfig@^6.0.0:
70247029
strip-bom "^3.0.0"
70257030
strip-json-comments "^2.0.0"
70267031

7027-
tsickle@^0.25.5:
7028-
version "0.25.6"
7029-
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.6.tgz#b595db16b236721824eeeda8bb262365b47ef334"
7032+
tsickle@^0.21.0:
7033+
version "0.21.6"
7034+
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.21.6.tgz#53b01b979c5c13fdb13afb3fb958177e5991588d"
70307035
dependencies:
70317036
minimist "^1.2.0"
70327037
mkdirp "^0.5.1"
@@ -7096,10 +7101,6 @@ typedarray@^0.0.6, typedarray@~0.0.5:
70967101
version "0.0.6"
70977102
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
70987103

7099-
[email protected]:
7100-
version "2.5.1"
7101-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.5.1.tgz#ce7cc93ada3de19475cc9d17e3adea7aee1832aa"
7102-
71037104
[email protected], typescript@^2.4.2:
71047105
version "2.6.1"
71057106
resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.1.tgz#ef39cdea27abac0b500242d6726ab90e0c846631"
@@ -7642,6 +7643,6 @@ zen-observable-ts@^0.4.4:
76427643
version "0.4.4"
76437644
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.4.4.tgz#c244c71eaebef79a985ccf9895bc90307a6e9712"
76447645

7645-
[email protected].18:
7646-
version "0.8.18"
7647-
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.18.tgz#8cecb3977fcd1b3090562ff4570e2847e752b48d"
7646+
zone.js@^0.8.4:
7647+
version "0.8.20"
7648+
resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.20.tgz#a218c48db09464b19ff6fc8f0d4bb5b1046e185d"

0 commit comments

Comments
 (0)