From d57ebc2ad8e93d185549ff8e8c9781eab17e9034 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Mon, 4 Nov 2019 13:34:00 +0100 Subject: [PATCH] Prefixed map-common --- projects/common-map/package-lock.json | 12 +++---- projects/common-map/package.json | 2 +- .../file-drop-target.component.ts | 2 +- .../gps-location/gps-location.component.ts | 2 +- .../item-features-source.component.ts | 2 +- .../aol/item-layers/item-layers.component.ts | 2 +- .../item-vector-source.component.ts | 2 +- .../aol/layer-list/layer-list.component.html | 2 +- .../aol/layer-list/layer-list.component.ts | 2 +- .../layer-vector-image.component.ts | 2 +- .../rotation-reset.component.ts | 2 +- .../aol/switch2d3d/switch2d3d.component.ts | 2 +- .../zoom-to-extent.component.ts | 2 +- .../feature-list-container.component.html | 2 +- .../feature-list-container.component.ts | 2 +- .../feature-list-cropfield.component.html | 2 +- .../feature-list-cropfield.component.ts | 2 +- ...feature-list-croppingscheme.component.html | 2 +- .../feature-list-croppingscheme.component.ts | 2 +- ...eature-list-feature-container.component.ts | 4 +-- ...eature-list-feature-cropfield.component.ts | 2 +- ...e-list-feature-croppingscheme.component.ts | 2 +- .../feature-list-feature.component.ts | 2 +- .../feature-list/feature-list.component.html | 2 +- .../feature-list/feature-list.component.ts | 2 +- .../item-list-item-bofek.component.ts | 2 +- .../item-list-item-container.component.ts | 4 +-- .../item-list-item-height.component.ts | 2 +- .../item-list-item-shadow.component.ts | 2 +- .../item-list-item-temporal.component.ts | 2 +- .../item-list-item-tipstar.component.ts | 2 +- .../item-list-item-watbal.component.html | 2 +- .../item-list-item-watbal.component.ts | 2 +- .../item-list-item.component.ts | 2 +- .../item-list/item-list.component.html | 2 +- .../item-list/item-list.component.ts | 2 +- .../item-widget-list.component.ts | 2 +- .../item-widget-weather.component.ts | 2 +- .../lib/components/legend/legend.component.ts | 2 +- .../map-search/map-search.component.html | 2 +- .../map-search/map-search.component.ts | 2 +- .../src/lib/components/map/map.component.html | 35 ++++++++++--------- .../src/lib/components/map/map.component.ts | 2 +- .../meta-data-modal.component.ts | 2 +- .../select-period-modal.component.ts | 2 +- .../selected-item-container.component.html | 2 +- .../selected-item-container.component.ts | 2 +- .../selected-item-cropfield.component.html | 4 +-- .../selected-item-cropfield.component.ts | 2 +- .../selected-item-geotiff.component.html | 2 +- .../selected-item-geotiff.component.ts | 2 +- .../selected-item-shape.component.html | 2 +- .../selected-item-shape.component.ts | 2 +- .../selected-item/selected-item.component.ts | 2 +- .../widget-host/widget-host.directive.ts | 2 +- .../widget-status/widget-status.component.ts | 2 +- 56 files changed, 81 insertions(+), 80 deletions(-) diff --git a/projects/common-map/package-lock.json b/projects/common-map/package-lock.json index 1214e0c..4a71f1e 100644 --- a/projects/common-map/package-lock.json +++ b/projects/common-map/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@farmmaps/common": { - "version": "0.0.1-prerelease.43", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.43.tgz", - "integrity": "sha512-tV42SIpXAremVLolUEW0ESdYRdyllunbIZgHB3ObsqPJMrI0vgnkIr8LdtSaaYokAGXA3L8n6q3Zi78/hiBgQg==", + "version": "0.0.1-prerelease.51", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.51.tgz", + "integrity": "sha512-1E7BDQVQ34N+dFiipHHUj9X50fpU3c8UqTLqwb9UpE+PpfLp+njN4rg2MXYwglbB8chlz/glaPPurYwjzDadxQ==", "requires": { "angular-oauth2-oidc": "^5.0.2", "ngx-uploadx": "^3.1.3", @@ -42,9 +42,9 @@ } }, "ngx-uploadx": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/ngx-uploadx/-/ngx-uploadx-3.3.1.tgz", - "integrity": "sha512-2WsE2BgA1RlrCuJ2Arcl6vObfL+dJzZFdFnnOOjbsW0ib+MmC+6dEL7QXgTs+sRCOzs2wC+F1sQ27nMPjhvpjg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/ngx-uploadx/-/ngx-uploadx-3.3.2.tgz", + "integrity": "sha512-gRdXXq2cRU9HE6dj65qay9GV8NRC7n8y5LtMzJWqsfu2k3CHMQxo2TqZwA9/l/PqJ76RoO7sTPy1OenFQ+krkQ==", "requires": { "tslib": "^1.9.0" } diff --git a/projects/common-map/package.json b/projects/common-map/package.json index 56dba52..4270006 100644 --- a/projects/common-map/package.json +++ b/projects/common-map/package.json @@ -5,7 +5,7 @@ "registry": "https://repository.akkerweb.nl/repository/npm-hosted/" }, "dependencies": { - "@farmmaps/common": "0.0.1-prerelease.43", + "@farmmaps/common": "0.0.1-prerelease.51", "ngx-openlayers": "1.0.0-next.9", "ol": "^5.3.3" }, diff --git a/projects/common-map/src/lib/components/aol/file-drop-target/file-drop-target.component.ts b/projects/common-map/src/lib/components/aol/file-drop-target/file-drop-target.component.ts index 9912416..ab9273a 100644 --- a/projects/common-map/src/lib/components/aol/file-drop-target/file-drop-target.component.ts +++ b/projects/common-map/src/lib/components/aol/file-drop-target/file-drop-target.component.ts @@ -14,7 +14,7 @@ export interface IDroppedFile { } @Component({ - selector: 'file-drop-target', + selector: 'fm-map-file-drop-target', template: '' }) export class FileDropTargetComponent implements OnInit, OnDestroy { diff --git a/projects/common-map/src/lib/components/aol/gps-location/gps-location.component.ts b/projects/common-map/src/lib/components/aol/gps-location/gps-location.component.ts index 9b09203..7b8a9d8 100644 --- a/projects/common-map/src/lib/components/aol/gps-location/gps-location.component.ts +++ b/projects/common-map/src/lib/components/aol/gps-location/gps-location.component.ts @@ -5,7 +5,7 @@ import { fromLonLat, toLonLat } from 'ol/proj'; @Component({ - selector: 'gps-location', + selector: 'fm-map-gps-location', templateUrl: './gps-location.component.html', styleUrls: ['./gps-location.component.scss'] }) diff --git a/projects/common-map/src/lib/components/aol/item-features-source/item-features-source.component.ts b/projects/common-map/src/lib/components/aol/item-features-source/item-features-source.component.ts index 43a73d8..05839c8 100644 --- a/projects/common-map/src/lib/components/aol/item-features-source/item-features-source.component.ts +++ b/projects/common-map/src/lib/components/aol/item-features-source/item-features-source.component.ts @@ -16,7 +16,7 @@ import * as loadingstrategy from 'ol/loadingstrategy'; import {GeoJSON} from 'ol/format'; @Component({ - selector: 'item-features-source', + selector: 'fm-map-item-features-source', template: ``, providers: [ { provide: SourceVectorComponent, useExisting: forwardRef(() => ItemFeaturesSourceComponent) } diff --git a/projects/common-map/src/lib/components/aol/item-layers/item-layers.component.ts b/projects/common-map/src/lib/components/aol/item-layers/item-layers.component.ts index bbcde72..d753420 100644 --- a/projects/common-map/src/lib/components/aol/item-layers/item-layers.component.ts +++ b/projects/common-map/src/lib/components/aol/item-layers/item-layers.component.ts @@ -20,7 +20,7 @@ import {GeoJSON,MVT} from 'ol/format'; import { from } from 'rxjs'; @Component({ - selector: 'item-layers', + selector: 'fm-map-item-layers', template: ``, providers: [ { provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) } diff --git a/projects/common-map/src/lib/components/aol/item-vector-source/item-vector-source.component.ts b/projects/common-map/src/lib/components/aol/item-vector-source/item-vector-source.component.ts index 290d6c0..4c43acb 100644 --- a/projects/common-map/src/lib/components/aol/item-vector-source/item-vector-source.component.ts +++ b/projects/common-map/src/lib/components/aol/item-vector-source/item-vector-source.component.ts @@ -16,7 +16,7 @@ import {GeoJSON} from 'ol/format'; import {Select} from 'ol/interaction'; @Component({ - selector: 'item-source-vector', + selector: 'fm-map-item-source-vector', template: ``, providers: [ { provide: SourceVectorComponent , useExisting: forwardRef(() => ItemVectorSourceComponent) } diff --git a/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.html b/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.html index 50d9448..22b1508 100644 --- a/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.html +++ b/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.html @@ -16,7 +16,7 @@
- +
diff --git a/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.ts b/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.ts index 23cc860..181cf0e 100644 --- a/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.ts +++ b/projects/common-map/src/lib/components/aol/layer-list/layer-list.component.ts @@ -2,7 +2,7 @@ import { Component,Input,Output,EventEmitter } from '@angular/core'; import { IItemLayer } from '../../../models'; @Component({ - selector: 'layer-list', + selector: 'fm-map-layer-list', templateUrl: './layer-list.component.html', styleUrls: ['./layer-list.component.scss'] }) diff --git a/projects/common-map/src/lib/components/aol/layer-vector-image/layer-vector-image.component.ts b/projects/common-map/src/lib/components/aol/layer-vector-image/layer-vector-image.component.ts index b777bd6..2fc6306 100644 --- a/projects/common-map/src/lib/components/aol/layer-vector-image/layer-vector-image.component.ts +++ b/projects/common-map/src/lib/components/aol/layer-vector-image/layer-vector-image.component.ts @@ -6,7 +6,7 @@ import { LayerVectorComponent, LayerGroupComponent, MapComponent } from 'ngx-ope import { RenderType } from 'ol/layer/Vector'; @Component({ - selector: 'aol-layer-vector-image', + selector: 'fm-map-aol-layer-vector-image', template: ` `, diff --git a/projects/common-map/src/lib/components/aol/rotation-reset/rotation-reset.component.ts b/projects/common-map/src/lib/components/aol/rotation-reset/rotation-reset.component.ts index 366f6bc..927ccd1 100644 --- a/projects/common-map/src/lib/components/aol/rotation-reset/rotation-reset.component.ts +++ b/projects/common-map/src/lib/components/aol/rotation-reset/rotation-reset.component.ts @@ -6,7 +6,7 @@ import {View} from 'ol'; @Component({ - selector: 'rotation-reset', + selector: 'fm-map-rotation-reset', template: `
`, styles: [`.compass { width:2.5em; diff --git a/projects/common-map/src/lib/components/aol/switch2d3d/switch2d3d.component.ts b/projects/common-map/src/lib/components/aol/switch2d3d/switch2d3d.component.ts index a041af8..5e1c22a 100644 --- a/projects/common-map/src/lib/components/aol/switch2d3d/switch2d3d.component.ts +++ b/projects/common-map/src/lib/components/aol/switch2d3d/switch2d3d.component.ts @@ -4,7 +4,7 @@ // @Component({ -// selector: 'switch2d3d', +// selector: 'fm-map-switch2d3d', // template: '
{{label}}
', // styles: [`.twotreed { // width:2.5em; diff --git a/projects/common-map/src/lib/components/aol/zoom-to-extent/zoom-to-extent.component.ts b/projects/common-map/src/lib/components/aol/zoom-to-extent/zoom-to-extent.component.ts index 06bb0c8..7c984ca 100644 --- a/projects/common-map/src/lib/components/aol/zoom-to-extent/zoom-to-extent.component.ts +++ b/projects/common-map/src/lib/components/aol/zoom-to-extent/zoom-to-extent.component.ts @@ -3,7 +3,7 @@ import { ViewComponent, MapComponent } from 'ngx-openlayers'; @Component({ - selector: 'zoom-to-extent', + selector: 'fm-map-zoom-to-extent', template: `` }) export class ZoomToExtentComponent implements OnChanges { diff --git a/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.html b/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.html index 37a17dc..dbbcc97 100644 --- a/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.html +++ b/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.html @@ -1,3 +1,3 @@
- +
diff --git a/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.ts b/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.ts index e0602cb..b8694c0 100644 --- a/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.ts +++ b/projects/common-map/src/lib/components/feature-list-container/feature-list-container.component.ts @@ -9,7 +9,7 @@ import { Store } from '@ngrx/store'; @Component({ - selector: 'feature-list-container', + selector: 'fm-map-feature-list-container', templateUrl: './feature-list-container.component.html', styleUrls: ['./feature-list-container.component.scss'] }) diff --git a/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.html b/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.html index aa39bec..cd9cdde 100644 --- a/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.html +++ b/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.html @@ -6,7 +6,7 @@

{{schemeItem.name}}

- +
diff --git a/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.ts b/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.ts index d79208b..8f9c3ff 100644 --- a/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.ts +++ b/projects/common-map/src/lib/components/feature-list-cropfield/feature-list-cropfield.component.ts @@ -12,7 +12,7 @@ import { Observable } from 'rxjs'; @ForItemType("vnd.farmmaps.itemtype.cropfield") @Injectable() @Component({ - selector: 'feature-list-cropfield', + selector: 'fm-map-feature-list-cropfield', templateUrl: './feature-list-cropfield.component.html', styleUrls: ['./feature-list-cropfield.component.scss'] }) diff --git a/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html b/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html index 4abcfce..a9ac2eb 100644 --- a/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html +++ b/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html @@ -5,7 +5,7 @@

Farms

- +
diff --git a/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts b/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts index 775a96a..f9bafb5 100644 --- a/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts +++ b/projects/common-map/src/lib/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts @@ -12,7 +12,7 @@ import { Router } from '@angular/router'; @ForItemType("vnd.farmmaps.itemtype.croppingscheme") @Injectable() @Component({ - selector: 'feature-list-croppingscheme', + selector: 'fm-map-feature-list-croppingscheme', templateUrl: './feature-list-croppingscheme.component.html', styleUrls: ['./feature-list-croppingscheme.component.scss'] }) diff --git a/projects/common-map/src/lib/components/feature-list-feature-container/feature-list-feature-container.component.ts b/projects/common-map/src/lib/components/feature-list-feature-container/feature-list-feature-container.component.ts index c0f870e..be410e0 100644 --- a/projects/common-map/src/lib/components/feature-list-feature-container/feature-list-feature-container.component.ts +++ b/projects/common-map/src/lib/components/feature-list-feature-container/feature-list-feature-container.component.ts @@ -5,10 +5,10 @@ import { WidgetHostDirective } from '../widget-host/widget-host.directive'; @Component({ - selector: 'feature-list-feature-container', + selector: 'fm-map-feature-list-feature-container', template: `
- +
` }) diff --git a/projects/common-map/src/lib/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts b/projects/common-map/src/lib/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts index b8290eb..43169f6 100644 --- a/projects/common-map/src/lib/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts +++ b/projects/common-map/src/lib/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts @@ -10,7 +10,7 @@ import { ForItemType } from '../for-item/for-itemtype.decorator'; @ForItemType("vnd.farmmaps.itemtype.cropfield") @Injectable() @Component({ - selector: 'feature-list-feature-cropfield', + selector: 'fm-map-feature-list-feature-cropfield', templateUrl: './feature-list-feature-cropfield.component.html', styleUrls: ['./feature-list-feature-cropfield.component.scss'] }) diff --git a/projects/common-map/src/lib/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.ts b/projects/common-map/src/lib/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.ts index cfc40d9..1ff3c64 100644 --- a/projects/common-map/src/lib/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.ts +++ b/projects/common-map/src/lib/components/feature-list-feature-croppingscheme/feature-list-feature-croppingscheme.component.ts @@ -10,7 +10,7 @@ import { ForItemType } from '../for-item/for-itemtype.decorator'; @ForItemType("vnd.farmmaps.itemtype.croppingscheme") @Injectable() @Component({ - selector: 'feature-list-feature-croppingscheme', + selector: 'fm-map-feature-list-feature-croppingscheme', templateUrl: './feature-list-feature-croppingscheme.component.html', styleUrls: ['./feature-list-feature-croppingscheme.component.scss'] }) diff --git a/projects/common-map/src/lib/components/feature-list-feature/feature-list-feature.component.ts b/projects/common-map/src/lib/components/feature-list-feature/feature-list-feature.component.ts index d8576ff..a681da6 100644 --- a/projects/common-map/src/lib/components/feature-list-feature/feature-list-feature.component.ts +++ b/projects/common-map/src/lib/components/feature-list-feature/feature-list-feature.component.ts @@ -16,7 +16,7 @@ export abstract class AbstractFeatureListFeatureComponent { @Injectable() @Component({ - selector: 'feature-list-feature', + selector: 'fm-map-feature-list-feature', templateUrl: './feature-list-feature.component.html', styleUrls: ['./feature-list-feature.component.scss'] }) diff --git a/projects/common-map/src/lib/components/feature-list/feature-list.component.html b/projects/common-map/src/lib/components/feature-list/feature-list.component.html index f68d527..893c5b2 100644 --- a/projects/common-map/src/lib/components/feature-list/feature-list.component.html +++ b/projects/common-map/src/lib/components/feature-list/feature-list.component.html @@ -1,6 +1,6 @@
Go back
- +
diff --git a/projects/common-map/src/lib/components/feature-list/feature-list.component.ts b/projects/common-map/src/lib/components/feature-list/feature-list.component.ts index 2ae3886..0088ca2 100644 --- a/projects/common-map/src/lib/components/feature-list/feature-list.component.ts +++ b/projects/common-map/src/lib/components/feature-list/feature-list.component.ts @@ -40,7 +40,7 @@ export abstract class AbstractFeatureListComponent { @Injectable() @Component({ - selector: 'feature-list', + selector: 'fm-map-feature-list', templateUrl: './feature-list.component.html', styleUrls: ['./feature-list.component.scss'] }) diff --git a/projects/common-map/src/lib/components/item-list-item-bofek/item-list-item-bofek.component.ts b/projects/common-map/src/lib/components/item-list-item-bofek/item-list-item-bofek.component.ts index cadb62f..71cfea4 100644 --- a/projects/common-map/src/lib/components/item-list-item-bofek/item-list-item-bofek.component.ts +++ b/projects/common-map/src/lib/components/item-list-item-bofek/item-list-item-bofek.component.ts @@ -11,7 +11,7 @@ import { ForSourceTask } from '../for-item/for-sourcetask.decorator'; @ForSourceTask("vnd.farmmaps.task.bofek") @Injectable() @Component({ - selector: 'item-list-item-bofek', + selector: 'fm-map-item-list-item-bofek', templateUrl: './item-list-item-bofek.component.html', styleUrls: ['./item-list-item-bofek.component.css'] }) diff --git a/projects/common-map/src/lib/components/item-list-item-container/item-list-item-container.component.ts b/projects/common-map/src/lib/components/item-list-item-container/item-list-item-container.component.ts index ca88ff3..e9d3abe 100644 --- a/projects/common-map/src/lib/components/item-list-item-container/item-list-item-container.component.ts +++ b/projects/common-map/src/lib/components/item-list-item-container/item-list-item-container.component.ts @@ -5,10 +5,10 @@ import { IItem, IListItem } from '@farmmaps/common'; @Component({ - selector: 'item-list-item-container', + selector: 'fm-map-item-list-item-container', template: `
- +
` }) diff --git a/projects/common-map/src/lib/components/item-list-item-height/item-list-item-height.component.ts b/projects/common-map/src/lib/components/item-list-item-height/item-list-item-height.component.ts index 7578e67..e2e89d4 100644 --- a/projects/common-map/src/lib/components/item-list-item-height/item-list-item-height.component.ts +++ b/projects/common-map/src/lib/components/item-list-item-height/item-list-item-height.component.ts @@ -15,7 +15,7 @@ import { ControlScaleLineComponent } from 'ngx-openlayers'; @ForSourceTask("vnd.farmmaps.task.ahn") @Injectable() @Component({ - selector: 'item-list-item-height', + selector: 'fm-map-item-list-item-height', templateUrl: './item-list-item-height.component.html', styleUrls: ['./item-list-item-height.component.css'] }) diff --git a/projects/common-map/src/lib/components/item-list-item-shadow/item-list-item-shadow.component.ts b/projects/common-map/src/lib/components/item-list-item-shadow/item-list-item-shadow.component.ts index a4f7512..f3fb334 100644 --- a/projects/common-map/src/lib/components/item-list-item-shadow/item-list-item-shadow.component.ts +++ b/projects/common-map/src/lib/components/item-list-item-shadow/item-list-item-shadow.component.ts @@ -12,7 +12,7 @@ import {map} from "rxjs/operators"; @ForSourceTask("vnd.farmmaps.task.shadow") @Injectable() @Component({ - selector: 'item-list-item-shadow', + selector: 'fm-map-item-list-item-shadow', templateUrl: './item-list-item-shadow.component.html', styleUrls: ['./item-list-item-shadow.component.scss'] }) diff --git a/projects/common-map/src/lib/components/item-list-item-temporal/item-list-item-temporal.component.ts b/projects/common-map/src/lib/components/item-list-item-temporal/item-list-item-temporal.component.ts index e264b57..e7ddf86 100644 --- a/projects/common-map/src/lib/components/item-list-item-temporal/item-list-item-temporal.component.ts +++ b/projects/common-map/src/lib/components/item-list-item-temporal/item-list-item-temporal.component.ts @@ -14,7 +14,7 @@ import {Router} from "@angular/router"; @ForSourceTask("vnd.farmmaps.task.vandersat") @Injectable() @Component({ - selector: 'item-list-item-temporal', + selector: 'fm-map-item-list-item-temporal', templateUrl: './item-list-item-temporal.component.html', styleUrls: ['./item-list-item-temporal.component.css'] }) diff --git a/projects/common-map/src/lib/components/item-list-item-tipstar/item-list-item-tipstar.component.ts b/projects/common-map/src/lib/components/item-list-item-tipstar/item-list-item-tipstar.component.ts index 0179fef..2af42c1 100644 --- a/projects/common-map/src/lib/components/item-list-item-tipstar/item-list-item-tipstar.component.ts +++ b/projects/common-map/src/lib/components/item-list-item-tipstar/item-list-item-tipstar.component.ts @@ -12,7 +12,7 @@ import {Router} from "@angular/router"; @ForSourceTask("vnd.farmmaps.task.tipstar") @Injectable() @Component({ - selector: 'item-list-item-tipstar', + selector: 'fm-map-item-list-item-tipstar', templateUrl: './item-list-item-tipstar.component.html', styleUrls: ['./item-list-item-tipstar.component.scss'] }) diff --git a/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.html b/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.html index d68353d..4d80809 100644 --- a/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.html +++ b/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.html @@ -8,6 +8,6 @@ GewichtGroDro:{{TPVOCMET?.GewichtGroDro | number:'0.1-2'}} GewichtGroNat:{{TPVOCMET?.GewichtGroNat | number:'0.1-2'}} - + diff --git a/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.ts b/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.ts index 0fd1d06..5a37373 100644 --- a/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.ts +++ b/projects/common-map/src/lib/components/item-list-item-watbal/item-list-item-watbal.component.ts @@ -13,7 +13,7 @@ import { Stage } from '../widget-status/widget-status.component'; @ForSourceTask("vnd.farmmaps.task.watbal") @Injectable() @Component({ - selector: 'item-list-item-watbal', + selector: 'fm-map-item-list-item-watbal', templateUrl: './item-list-item-watbal.component.html', styleUrls: ['./item-list-item-watbal.component.css'] }) diff --git a/projects/common-map/src/lib/components/item-list-item/item-list-item.component.ts b/projects/common-map/src/lib/components/item-list-item/item-list-item.component.ts index 973846a..3271dcb 100644 --- a/projects/common-map/src/lib/components/item-list-item/item-list-item.component.ts +++ b/projects/common-map/src/lib/components/item-list-item/item-list-item.component.ts @@ -23,7 +23,7 @@ export abstract class AbstractItemWidgetComponent { @Injectable() @Component({ - selector: 'item-list-item', + selector: 'fm-map-item-list-item', templateUrl: './item-list-item.component.html', styleUrls: ['./item-list-item.component.scss'] }) diff --git a/projects/common-map/src/lib/components/item-list/item-list.component.html b/projects/common-map/src/lib/components/item-list/item-list.component.html index 741e4bc..c95f403 100644 --- a/projects/common-map/src/lib/components/item-list/item-list.component.html +++ b/projects/common-map/src/lib/components/item-list/item-list.component.html @@ -1,7 +1,7 @@
- +
diff --git a/projects/common-map/src/lib/components/item-list/item-list.component.ts b/projects/common-map/src/lib/components/item-list/item-list.component.ts index da9f43f..c9bd520 100644 --- a/projects/common-map/src/lib/components/item-list/item-list.component.ts +++ b/projects/common-map/src/lib/components/item-list/item-list.component.ts @@ -31,7 +31,7 @@ export abstract class AbstractItemListComponent { @Injectable() @Component({ - selector: 'item-list', + selector: 'fm-map-item-list', templateUrl: './item-list.component.html', styleUrls: ['./item-list.component.scss'] }) diff --git a/projects/common-map/src/lib/components/item-widget-list/item-widget-list.component.ts b/projects/common-map/src/lib/components/item-widget-list/item-widget-list.component.ts index 01ef171..bdda476 100644 --- a/projects/common-map/src/lib/components/item-widget-list/item-widget-list.component.ts +++ b/projects/common-map/src/lib/components/item-widget-list/item-widget-list.component.ts @@ -8,7 +8,7 @@ import { AbstractItemWidgetComponent } from '../item-list-item/item-list-item.co @Injectable() @Component({ - selector: 'item-widget-list', + selector: 'fm-map-item-widget-list', templateUrl: './item-widget-list.component.html', styleUrls: ['./item-widget-list.component.scss'] }) diff --git a/projects/common-map/src/lib/components/item-widget-weather/item-widget-weather.component.ts b/projects/common-map/src/lib/components/item-widget-weather/item-widget-weather.component.ts index 191e3c2..9d0b562 100644 --- a/projects/common-map/src/lib/components/item-widget-weather/item-widget-weather.component.ts +++ b/projects/common-map/src/lib/components/item-widget-weather/item-widget-weather.component.ts @@ -12,7 +12,7 @@ import { getCenter, Extent, createEmpty, extend } from 'ol/extent'; @Injectable() @Component({ - selector: 'item-widget-weather', + selector: 'fm-map-item-widget-weather', templateUrl: './item-widget-weather.component.html', styleUrls: ['./item-widget-weather.component.scss'] }) diff --git a/projects/common-map/src/lib/components/legend/legend.component.ts b/projects/common-map/src/lib/components/legend/legend.component.ts index f90c2cc..793dce3 100644 --- a/projects/common-map/src/lib/components/legend/legend.component.ts +++ b/projects/common-map/src/lib/components/legend/legend.component.ts @@ -3,7 +3,7 @@ import { IColorMap, IColor, IColorEntry,ILayer } from '../../models'; @Component({ - selector: 'layer-legend', + selector: 'fm-map-layer-legend', templateUrl: './legend.component.html', styleUrls: ['./legend.component.scss'] }) diff --git a/projects/common-map/src/lib/components/map-search/map-search.component.html b/projects/common-map/src/lib/components/map-search/map-search.component.html index 4096301..22090bb 100644 --- a/projects/common-map/src/lib/components/map-search/map-search.component.html +++ b/projects/common-map/src/lib/components/map-search/map-search.component.html @@ -30,4 +30,4 @@ - + diff --git a/projects/common-map/src/lib/components/map-search/map-search.component.ts b/projects/common-map/src/lib/components/map-search/map-search.component.ts index aac3a2f..23ccea5 100644 --- a/projects/common-map/src/lib/components/map-search/map-search.component.ts +++ b/projects/common-map/src/lib/components/map-search/map-search.component.ts @@ -7,7 +7,7 @@ import { fillProperties } from '@angular/core/src/util/property'; import { tassign } from 'tassign'; @Component({ - selector: 'map-search', + selector: 'fm-map-map-search', templateUrl: './map-search.component.html', styleUrls: ['./map-search.component.scss'] }) diff --git a/projects/common-map/src/lib/components/map/map.component.html b/projects/common-map/src/lib/components/map/map.component.html index 2a0e68b..859283f 100644 --- a/projects/common-map/src/lib/components/map/map.component.html +++ b/projects/common-map/src/lib/components/map/map.component.html @@ -5,37 +5,37 @@ - + - - - + + + - + - +
- +
- + - - + +
- +
- +
Cannot find {{(queryState|async)?.query}}
@@ -43,14 +43,15 @@
- - + +
+
@@ -74,13 +75,13 @@
  • Base maps
    - +
  • Overlays
    - +
    • @@ -93,5 +94,5 @@
    -->
    - + diff --git a/projects/common-map/src/lib/components/map/map.component.ts b/projects/common-map/src/lib/components/map/map.component.ts index 34eb53b..986a960 100644 --- a/projects/common-map/src/lib/components/map/map.component.ts +++ b/projects/common-map/src/lib/components/map/map.component.ts @@ -29,7 +29,7 @@ import { tassign } from 'tassign'; @Component({ - selector: 'map', + selector: 'fm-map-map', templateUrl: './map.component.html', styleUrls: ['./map.component.scss'] }) diff --git a/projects/common-map/src/lib/components/meta-data-modal/meta-data-modal.component.ts b/projects/common-map/src/lib/components/meta-data-modal/meta-data-modal.component.ts index 7423614..3f599ca 100644 --- a/projects/common-map/src/lib/components/meta-data-modal/meta-data-modal.component.ts +++ b/projects/common-map/src/lib/components/meta-data-modal/meta-data-modal.component.ts @@ -10,7 +10,7 @@ export interface IMetaData { } @Component({ - selector: 'meta-data-modal', + selector: 'fm-map-meta-data-modal', templateUrl: 'meta-data-modal.component.html' }) export class MetaDataModalComponent { diff --git a/projects/common-map/src/lib/components/select-period-modal/select-period-modal.component.ts b/projects/common-map/src/lib/components/select-period-modal/select-period-modal.component.ts index b5cc00b..4ad1ca3 100644 --- a/projects/common-map/src/lib/components/select-period-modal/select-period-modal.component.ts +++ b/projects/common-map/src/lib/components/select-period-modal/select-period-modal.component.ts @@ -16,7 +16,7 @@ const after = (one: NgbDateStruct, two: NgbDateStruct) => ? false : one.day > two.day : one.month > two.month : one.year > two.year; @Component({ - selector: 'select-period-modal', + selector: 'fm-map-select-period-modal', templateUrl: 'select-period-modal.component.html', styleUrls: ['select-period-modal.component.scss'] }) diff --git a/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.html b/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.html index a49f860..6647459 100644 --- a/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.html +++ b/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.html @@ -1,3 +1,3 @@
    - +
    diff --git a/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.ts b/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.ts index a8747d7..8f3be8a 100644 --- a/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.ts +++ b/projects/common-map/src/lib/components/selected-item-container/selected-item-container.component.ts @@ -5,7 +5,7 @@ import { WidgetHostDirective } from '../widget-host/widget-host.directive'; @Component({ - selector: 'selected-item-container', + selector: 'fm-map-selected-item-container', templateUrl: './selected-item-container.component.html', styleUrls: ['./selected-item-container.component.scss'] }) diff --git a/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.html b/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.html index 0c255aa..31b3b12 100644 --- a/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.html +++ b/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.html @@ -9,7 +9,7 @@
    {{item.data.startDate|date}} - {{item.data.endDate|date}}
    Edit
    - - + +
    diff --git a/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.ts b/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.ts index 770468c..e814a49 100644 --- a/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.ts +++ b/projects/common-map/src/lib/components/selected-item-cropfield/selected-item-cropfield.component.ts @@ -13,7 +13,7 @@ import { Observable } from 'rxjs'; @ForItemType("vnd.farmmaps.itemtype.cropfield") @Injectable() @Component({ - selector: 'selected-item-cropfield', + selector: 'fm-map-selected-item-cropfield', templateUrl: './selected-item-cropfield.component.html', styleUrls: ['./selected-item-cropfield.component.scss'] }) diff --git a/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.html b/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.html index f3f2194..d5d5185 100644 --- a/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.html +++ b/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.html @@ -10,7 +10,7 @@ --> - +
      diff --git a/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.ts b/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.ts index fe2e7cb..81a785a 100644 --- a/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.ts +++ b/projects/common-map/src/lib/components/selected-item-geotiff/selected-item-geotiff.component.ts @@ -13,7 +13,7 @@ import { Observable } from 'rxjs'; @ForItemType("vnd.farmmaps.itemtype.geotiff.processed") @Injectable() @Component({ - selector: 'selected-item-geotiff', + selector: 'fm-map-selected-item-geotiff', templateUrl: './selected-item-geotiff.component.html', styleUrls: ['./selected-item-geotiff.component.scss'] }) diff --git a/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.html b/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.html index e568793..098843c 100644 --- a/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.html +++ b/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.html @@ -10,7 +10,7 @@ - +
        diff --git a/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.ts b/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.ts index 17fdc9d..1a0a445 100644 --- a/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.ts +++ b/projects/common-map/src/lib/components/selected-item-shape/selected-item-shape.component.ts @@ -14,7 +14,7 @@ import { Observable } from 'rxjs'; @ForItemType("vnd.farmmaps.itemtype.shape.processed") @Injectable() @Component({ - selector: 'selected-item-shape', + selector: 'fm-map-selected-item-shape', templateUrl: './selected-item-shape.component.html', styleUrls: ['./selected-item-shape.component.scss'] }) diff --git a/projects/common-map/src/lib/components/selected-item/selected-item.component.ts b/projects/common-map/src/lib/components/selected-item/selected-item.component.ts index 4d8003d..22255e5 100644 --- a/projects/common-map/src/lib/components/selected-item/selected-item.component.ts +++ b/projects/common-map/src/lib/components/selected-item/selected-item.component.ts @@ -44,7 +44,7 @@ export abstract class AbstractSelectedItemComponent { @Injectable() @Component({ - selector: 'selected-item', + selector: 'fm-map-selected-item', templateUrl: './selected-item.component.html', styleUrls: ['./selected-item.component.scss'] }) diff --git a/projects/common-map/src/lib/components/widget-host/widget-host.directive.ts b/projects/common-map/src/lib/components/widget-host/widget-host.directive.ts index 455a135..caff9c5 100644 --- a/projects/common-map/src/lib/components/widget-host/widget-host.directive.ts +++ b/projects/common-map/src/lib/components/widget-host/widget-host.directive.ts @@ -1,7 +1,7 @@ import { Directive, ViewContainerRef } from '@angular/core'; @Directive({ - selector: '[widget-host]', + selector: '[fm-map-widget-host]', }) export class WidgetHostDirective { constructor(public viewContainerRef: ViewContainerRef) { } diff --git a/projects/common-map/src/lib/components/widget-status/widget-status.component.ts b/projects/common-map/src/lib/components/widget-status/widget-status.component.ts index b15f029..37370c4 100644 --- a/projects/common-map/src/lib/components/widget-status/widget-status.component.ts +++ b/projects/common-map/src/lib/components/widget-status/widget-status.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Input } from '@angular/core'; @Component({ - selector: 'widget-status', + selector: 'fm-map-widget-status', templateUrl: './widget-status.component.html', styleUrls: ['./widget-status.component.css'] })