Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Locateby xy fix #167

Closed
wants to merge 2 commits into from
Closed

Locateby xy fix #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b020ac
Adding a pin point on locatebyXY from searchBar
Jun 11, 2018
6ea4f84
Adding pinpoint on locateXY and getting zoom level from map for locateXY
Jun 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/lib/map/shared/map.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ export class IgoMap {
this.overlayDataSource.ol.addFeature(feature);
}

removeOverlayByID(id) {
if (this.overlayDataSource.ol.getFeatureById(id)) {
this.overlayDataSource.ol.removeFeature(this.overlayDataSource.ol.getFeatureById(id))
}
}

clearOverlay() {
if (this.overlayDataSource && this.overlayDataSource.ol) {
this.overlayDataSource.ol.clear();
Expand Down
30 changes: 28 additions & 2 deletions src/lib/search/search-bar/search-bar.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import { distinctUntilChanged } from 'rxjs/operators/distinctUntilChanged';

import { FeatureService, SourceFeatureType, FeatureType, Feature } from '../../feature';
import { SearchService } from '../shared';
import { MapService, IgoMap } from '../../map';
import * as ol from 'openlayers';

@Component({
selector: 'igo-search-bar',
Expand Down Expand Up @@ -74,6 +76,7 @@ export class SearchBarComponent implements OnInit, OnDestroy {
this._searchIcon = value;
}
private _searchIcon: boolean = false;
private locateID: string = 'locateXY'

private readonly invalidKeys = ['Control', 'Shift', 'Alt'];
private stream$ = new Subject<string>();
Expand All @@ -84,7 +87,12 @@ export class SearchBarComponent implements OnInit, OnDestroy {

@ViewChild('input') input: ElementRef;

get map(): IgoMap {
return this.mapService.getMap();
};

constructor(
private mapService: MapService,
private searchService: SearchService,
private featureService: FeatureService,
private changeDetectorRef: ChangeDetectorRef
Expand Down Expand Up @@ -138,13 +146,30 @@ export class SearchBarComponent implements OnInit, OnDestroy {
return this.invalidKeys.find(value => value === key) === undefined;
}

private addOverlay(coordinates: [number, number]) {

const geometry = new ol.geom.Point(
ol.proj.transform(coordinates, 'EPSG:4326', this.map.projection));
const extent = geometry.getExtent();
const feature = new ol.Feature({geometry: geometry});
feature.setId(this.locateID);
// TODO: SETTING A NEW COLOR AND TEXT BASED ON PR 166
// feature.setStyle([this.map.setPointOverlayStyleWithParams('yellow', coordinates)]);
// https://github.com/infra-geo-ouverte/igo2-lib/
// blob/6d0e9a2a5d3fd2290339c123b674aca7ca9e7102/src/lib/map/shared/map.ts#L135
this.map.removeOverlayByID(this.locateID)
this.map.moveToExtent(extent);
this.map.addOverlay(feature);
}

private handleTermChanged(term: string) {
if (term !== undefined || term !== '') {
this.map.removeOverlayByID(this.locateID)
this.featureService.clear()
this.search.emit(term);
// tslint:disable-next-line:max-line-length
if (/^([-+]?)([\d]{1,15})(((\.)?(\d+)?(,)))(\s*)(([-+]?)([\d]{1,15})((\.)?(\d+)?(;[\d]{4,5})?))$/g.test(term)) {
let xy
let xy;
if (/(;[\d]{4,5})$/g.test(term)) {
const xyTerm = term.split(';');
// TODO Reproject coordinates
Expand All @@ -155,7 +180,8 @@ export class SearchBarComponent implements OnInit, OnDestroy {
}
xy = JSON.parse('[' + term + ']');
}
const r = this.searchService.locate(xy);
this.addOverlay(xy);
const r = this.searchService.locate(xy, this.map.getZoom());
if (r) {
r.filter(res => res !== undefined)
.map(res => res.subscribe(
Expand Down