FarmMaps
/
FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: FarmMaps:da562ca96d218f2e48ca655d1ba75dfbc34598bc
Branches Tags
FarmMaps:master
FarmMaps:develop
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72
...
compare: FarmMaps:b7b168dffbfeceac6903fef5a72945b8fca64d83
Branches Tags
FarmMaps:master
FarmMaps:develop
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72

2 Commits
da562ca96d ... b7b168dffb

Author SHA1 Message Date
Willem Dantuma b7b168dffb Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop
FarmMaps.Develop/FarmMapsLib/pipeline/head This commit looks good Details
2021-02-03 17:28:42 +01:00
Willem Dantuma fb9c11fce6 Some fixes update libs 2021-02-03 17:28:35 +01:00
5 changed files with 19 additions and 18 deletions
Show Stats Expand all files Collapse all files

24
package-lock.json generated
View File

@ -1865,25 +1865,25 @@
}
},
"@farmmaps/common": {
"version": "0.0.1-prerelease.517",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.517.tgz",
"integrity": "sha512-Bxw+bDDwRAygl0SWdf077TtRa1xpAQAUlKNv/ysY8/rKugkMgaP1WAPnIN226uivTrdkhtPcKuGx/z5Yej1DwQ==",
"version": "0.0.1-prerelease.527",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.527.tgz",
"integrity": "sha512-BPMdV/YL4kSuhmbYmtV+WiCAdFVl8MOohxaVdESeJKLr4hUTtfymC6l33KNnJ28Z+OV+6VSMweZINlAdy6In1Q==",
"requires": {
"tslib": "^2.0.0"
}
},
"@farmmaps/common-map": {
"version": "0.0.1-prerelease.517",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.517.tgz",
"integrity": "sha512-lRweec2NrYnCoDgpAb3ZIPNSOO9sUcfs6qi0RvzoYsPV557UZozbidNiYUTwYiPV+9rwliAAM9zR7lpipur6og==",
"version": "0.0.1-prerelease.527",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.527.tgz",
"integrity": "sha512-j8OLh/ZQkUpgf3kCmtfa1JOIK+CWgWfimzGwKULP7Ls09b8R/0e8SX4BCnTwtY6NwRTh8AQZIDjM5R5k20w4QQ==",
"requires": {
"tslib": "^2.0.0"
}
},
"@farmmaps/common-map3d": {
"version": "0.0.1-prerelease.517",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.517.tgz",
"integrity": "sha512-xxxXWO3+9x9jGhepGamm1zqJqs2WaJHaOYNLCxreNrwK1mcQfVA+N65e2gI2YrMlMa1if1OYyXK48PXtdEtyoA==",
"version": "0.0.1-prerelease.527",
"resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.527.tgz",
"integrity": "sha512-/RniUbZjfefq6uxCxnPNvIpHWfzT/gymSUX+n0MsyGersr5mW2NhtEXDrLTputevyaZQ4XRuwr/vsX+HW3fmEg==",
"requires": {
"tslib": "^2.0.0"
}
@ -3572,9 +3572,9 @@
"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
},
"cesium": {
"version": "1.73.0",
"resolved": "https://registry.npmjs.org/cesium/-/cesium-1.73.0.tgz",
"integrity": "sha512-HqvxPbCEsE1Szdm5qPIrBNjHG2cJ9Xk5uYMELmG0GuBL/sYaQ/0IMton43LUBY4E/wblRivNo1Vz7tIQweraFw=="
"version": "1.78.0",
"resolved": "https://registry.npmjs.org/cesium/-/cesium-1.78.0.tgz",
"integrity": "sha512-ulEILDn0G2czV7CONX0IGMUqcaH3igBkZ/1pXBTQldANw9ntxaWjF3F6IzP1MOY2lZtvEdsroYB30ML9SDRSBg=="
},
"chalk": {
"version": "2.4.2",

6
package.json
View File

@ -19,9 +19,9 @@
"@angular/platform-browser": "~10.2.4",
"@angular/platform-browser-dynamic": "~10.2.4",
"@angular/router": "~10.2.4",
"@farmmaps/common": ">=0.0.1-prerelease.517 <0.0.1",
"@farmmaps/common-map": ">=0.0.1-prerelease.517 <0.0.1",
"@farmmaps/common-map3d": ">=0.0.1-prerelease.517 <0.0.1",
"@farmmaps/common": ">=0.0.1-prerelease.527 <0.0.1",
"@farmmaps/common-map": ">=0.0.1-prerelease.527 <0.0.1",
"@farmmaps/common-map3d": ">=0.0.1-prerelease.527 <0.0.1",
"@microsoft/signalr": "^3.1.3",
"@ng-bootstrap/ng-bootstrap": "^7.0",
"@ngrx/effects": "^10.0",

4
projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.html
View File

@ -6,8 +6,8 @@
<stop offset="100%" class="stop2" />
</linearGradient>
</defs>
<circle class="tolerance hidden" [class]="{'hidden':!showTolerance}" cx="500" cy="500" stroke="none" [attr.r]="locTolerancePixels" />
<path class="heading hidden" [class]="{'hidden': !showHeading }" stroke="none" [attr.d]="path" fill="url(#grad1)" [attr.transform]="rotate"></path>
<circle class="tolerance hidden" [ngClass]="{'hidden':!showTolerance}" cx="500" cy="500" stroke="none" [attr.r]="locTolerancePixels" />
<path class="heading hidden" [ngClass]="{'hidden': !showHeading }" stroke="none" [attr.d]="path" fill="url(#grad1)" [attr.transform]="rotate"></path>
<circle class="border" cx="500" cy="500" r="7" stroke="none" />
<circle class="center" cx="500" cy="500" r="6" stroke="none" />

2
projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.html
View File

@ -1 +1 @@
<div *fm-haspackage="'vnd.farmmaps.package.3d'" (click)="handleClick($event)" class="btn btn-outline-primary twotreed"><i class="fas fa-spinner fa-spin loading" [class]="{'loading':loading}"></i>{{label}}</div>
<div *fm-haspackage="'vnd.farmmaps.package.3d'" (click)="handleClick($event)" class="btn btn-outline-primary twotreed"><i class="fas fa-spinner fa-spin loading" [ngClass]="{'loading':loading}"></i>{{label}}</div>

1
projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts
View File

@ -32,6 +32,7 @@ export class Switch2D3DComponent {
this.loading=false;
return this.synchronizers;
}, stopOpenLayersEventsPropagation:true});
this.ol3d.warmUp(3000,5000);
}
synchronize() {