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

Merge branch 'develop' into feature/Resurect_3D

Browse Source 
# Conflicts:
#	angular.json
#	package-lock.json
#	package.json
#	projects/common-map/package.json
This commit is contained in:
Willem Dantuma 2020-09-26 12:17:58 +02:00
commit b93218e165
13 changed files with 5550 additions and 7591 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
browserslist → .browserslistrc
View File

1
.npmrc
View File

@ -1 +0,0 @@
@FarmMaps:registry=https://repository.akkerweb.nl/repository/npm-group/

15
angular.json
View File

@ -25,18 +25,18 @@
"assets": [
{
"glob": "**/*",
"input":"src/assets/images",
"output":"/images"
"input": "src/assets/images",
"output": "/images"
},
{
"glob": "silent-refresh.html",
"input":"src/assets",
"output":"/"
"input": "src/assets",
"output": "/"
},
{
"glob": "favicon.ico",
"input":"src/assets",
"output":"/"
"input": "src/assets",
"output": "/"
},
{
"glob": "**/*",
@ -53,8 +53,7 @@
"node_modules/cesium/Build/Cesium/Widgets/widgets.css",
"node_modules/ol/ol.css"
],
"scripts": [],
"es5BrowserSupport": true
"scripts": []
},
"configurations": {
"production": {

12919
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

72
package.json
View File

@ -11,28 +11,27 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~9.1.0",
"@angular/common": "~9.1.0",
"@angular/compiler": "~9.1.0",
"@angular/core": "~9.1.0",
"@angular/forms": "~9.1.0",
"@angular/platform-browser": "~9.1.0",
"@angular/platform-browser-dynamic": "~9.1.0",
"@angular/router": "~9.1.0",
"@farmmaps/common": ">=0.0.1-prerelease.398 <0.0.1",
"@farmmaps/common-map": "file:dist/common-map",
"@angular/animations": "~10.1.3",
"@angular/common": "~10.1.3",
"@angular/compiler": "~10.1.3",
"@angular/core": "~10.1.3",
"@angular/forms": "~10.1.3",
"@angular/platform-browser": "~10.1.3",
"@angular/platform-browser-dynamic": "~10.1.3",
"@angular/router": "~10.1.3",
"@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1",
"@farmmaps/common-map": ">=0.0.1-prerelease.420 <0.0.1",
"@microsoft/signalr": "^3.1.3",
"@ng-bootstrap/ng-bootstrap": "^6.0",
"@ngrx/effects": "^9.0",
"@ngrx/router-store": "^9.0",
"@ngrx/store": "^9.0",
"angular-oauth2-oidc": "^9.1",
"@ng-bootstrap/ng-bootstrap": "^7.0",
"@ngrx/effects": "^10.0",
"@ngrx/router-store": "^10.0",
"@ngrx/store": "^10.0",
"angular-oauth2-oidc": "^10.0.3",
"bootstrap": "^4.4.1",
"cesium": "^1.73.0",
"core-js": "^2.6.11",
"font-awesome": "^4.7.0",
"moment": "^2.27.0",
"ngrx-store-localstorage": "^9.0",
"ngrx-store-localstorage": "^10.0",
"ngx-bootstrap": "^5.6.1",
"ngx-openlayers": "1.0.0-next.13",
"ngx-uploadx": "^3.5.1",
@ -41,31 +40,32 @@
"resumablejs": "^1.1.0",
"rxjs": "^6.5.4",
"tassign": "^1.0.0",
"tslib": "^1.10.0",
"zone.js": "~0.10.2"
"tslib": "^2.0.0",
"zone.js": "~0.10.2",
"moment": "^2.27.0"
},
"devDependencies": {
"@angular-builders/custom-webpack": "9.1.0",
"@angular-devkit/build-angular": "~0.901.0",
"@angular-devkit/build-ng-packagr": "~0.901.0",
"@angular/cli": "^9.1.0",
"@angular/compiler-cli": "~9.1.0",
"@angular/language-service": "~9.1.0",
"@angular-devkit/build-angular": "^0.1001.3",
"@angular-devkit/build-ng-packagr": "~0.1001.3",
"@angular/cli": "^10.1.3",
"@angular/compiler-cli": "~10.1.3",
"@angular/language-service": "~10.1.3",
"@angular-builders/custom-webpack": "~10.0.1",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1",
"codelyzer": "^5.1.2",
"jasmine-core": "~2.99.1",
"jasmine-spec-reporter": "~4.2.1",
"karma": "^5.0.2",
"karma-chrome-launcher": "~2.2.0",
"karma-coverage-istanbul-reporter": "~2.0.1",
"karma-jasmine": "~1.1.2",
"karma-jasmine-html-reporter": "^0.2.2",
"ng-packagr": "^9.0.0",
"protractor": "^5.4.4",
"jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^10.1.0",
"protractor": "~7.0.0",
"ts-node": "^8.8.1",
"tslint": "~5.11.0",
"typescript": "~3.8.3"
"tslint": "~6.1.0",
"typescript": "~4.0.3"
}
}

10
projects/common-map/package-lock.json generated
View File

@ -1,5 +1,13 @@
{
"name": "@farmmaps/common-map",
"version": "0.0.1",
"lockfileVersion": 1
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"tslib": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz",
"integrity": "sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="
}
}
}

15
projects/common-map/package.json
View File

@ -4,14 +4,17 @@
"publishConfig": {
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
},
"dependencies": {
"tslib": "^2.0.0"
},
"peerDependencies": {
"@angular/core": "^9.1.0",
"ngrx-store-localstorage": "^9.0",
"@ngrx/effects": "^9.0",
"@ngrx/router-store": "^9.0",
"@ngrx/store": "^9.0",
"@angular/core": "^10.1.3",
"ngrx-store-localstorage": "^10.0",
"@ngrx/effects": "^10.0",
"@ngrx/router-store": "^10.0",
"@ngrx/store": "^10.0",
"tassign": "^1.0.0",
"@farmmaps/common": ">=0.0.1-prerelease.398 <0.0.1",
"@farmmaps/common": ">=0.0.1-prerelease.420 <0.0.1",
"ngx-openlayers": "1.0.0-next.13",
"ol": "6.1.1"
}

10
projects/common/package-lock.json generated
View File

@ -1,13 +1,5 @@
{
"name": "@farmmaps/common",
"version": "0.0.1",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"moment": {
"version": "2.27.0",
"resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
"integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
}
}
"lockfileVersion": 1
}

18
projects/common/package.json
View File

@ -5,19 +5,19 @@
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
},
"peerDependencies": {
"@ng-bootstrap/ng-bootstrap": "^6.0",
"@angular/common": "~9.1.0",
"@angular/core": "~9.1.0",
"@angular/forms": "~9.1.0",
"@ngrx/effects": "^9.0",
"@ngrx/router-store": "^9.0",
"@ngrx/store": "^9.0",
"@ng-bootstrap/ng-bootstrap": "^7.0",
"@angular/common": "~10.1.3",
"@angular/core": "~10.1.3",
"@angular/forms": "~10.1.3",
"@ngrx/effects": "^10.0",
"@ngrx/router-store": "^10.0",
"@ngrx/store": "^10.0",
"tassign": "^1.0.0",
"bootstrap": "^4.4.1",
"@aspnet/signalr": "^1.1.4",
"@microsoft/signalr": "^3.1.3",
"font-awesome": "^4.7.0",
"ngx-uploadx": "^3.3.4",
"angular-oauth2-oidc": "^9.1",
"angular-oauth2-oidc": "^10.0.3",
"moment": "^2.27.0"
}
}

6
projects/common/src/fm/services/item.service.ts
View File

@ -55,6 +55,12 @@ export class ItemService {
return this.httpClient.get<IItem>(`${this.ApiEndpoint()}/api/v1/items/${code}`);
}
getItemData(code: string,limit?:number): Observable<ArrayBuffer> {
var params = new HttpParams();
if(limit) params=params.append("limit", limit.toString());
return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${code}/data`,{ params: params,responseType: 'arraybuffer' });
}
getItemByCodeAndType(code: string, itemType: string): Observable<IItem> {
return this.httpClient.get<IItem>(`${this.ApiEndpoint()}/api/v1/items/${code}/${itemType}`);
}

6
src/app/app.module.ts
View File

@ -82,11 +82,7 @@ export const metaReducers: MetaReducer<any>[] = [debug];
EffectsModule.forRoot([])
],
providers: [
AuthConfigFactory,
{
provide:OAuthStorage,
useClass:SecureOAuthStorage
},
AuthConfigFactory,
{
provide:AuthConfigFactory,
useClass:Id4AuthconfigFactory

2
tsconfig.json
View File

@ -6,7 +6,7 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"module": "esnext",
"module": "es2020",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,

67
tslint.json
View File

@ -4,17 +4,32 @@
"codelyzer"
],
"rules": {
"align": {
"options": [
"parameters",
"statements"
]
},
"array-type": false,
"arrow-parens": false,
"arrow-return-shorthand": true,
"deprecation": {
"severity": "warn"
},
"curly": true,
"import-blacklist": [
true,
"rxjs/Rx"
],
"interface-name": false,
"eofline": true,
"max-classes-per-file": false,
"import-spacing": true,
"indent": {
"options": [
"spaces"
]
},
"max-line-length": [
true,
140
@ -48,7 +63,6 @@
"no-non-null-assertion": true,
"no-redundant-jsdoc": true,
"no-switch-case-fall-through": true,
"no-use-before-declare": true,
"no-var-requires": false,
"object-literal-key-quotes": [
true,
@ -68,8 +82,57 @@
"no-input-rename": true,
"no-output-rename": true,
"use-lifecycle-interface": true,
"semicolon": {
"options": [
"always"
]
},
"space-before-function-paren": {
"options": {
"anonymous": "never",
"asyncArrow": "always",
"constructor": "never",
"method": "never",
"named": "never"
}
},
"use-pipe-transform-interface": true,
"typedef-whitespace": {
"options": [
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
},
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
}
]
},
"component-class-suffix": true,
"directive-class-suffix": true
"directive-class-suffix": true,
"variable-name": {
"options": [
"ban-keywords",
"check-format",
"allow-pascal-case"
]
},
"whitespace": {
"options": [
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type",
"check-typecast"
]
}
}
}