ztimson/map-alliance
ztimson/map-alliance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 1 Activity

Made measuring better

Browse Source
This commit is contained in:
Zakary Timson 2019-08-24 12:32:34 -04:00
parent 236e9b033e
commit ab8fc7dd3b
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/app/views/map/map.component.ts
View File

@ -6,6 +6,7 @@ import {CalibrateComponent} from "../../components/calibrate/calibrate.component
import {ToolbarItem} from "../../models/toolbarItem"; import {ToolbarItem} from "../../models/toolbarItem";
import {flyInRight, flyOutRight} from "../../animations"; import {flyInRight, flyOutRight} from "../../animations";
import {ARROW, MapLayers, MapService, WeatherLayers} from "../../services/map.service"; import {ARROW, MapLayers, MapService, WeatherLayers} from "../../services/map.service";
import {Subscription} from "rxjs";
declare const L; declare const L;
@ -23,11 +24,13 @@ export class MapComponent implements OnInit {
position; position;
positionMarker = {arrow: null, circle: null}; positionMarker = {arrow: null, circle: null};
showPalette = false; showPalette = false;
lastMeasuringPoint;
measuringSubscription: Subscription;
menu: ToolbarItem[] = [ menu: ToolbarItem[] = [
{name: 'Marker', icon: 'room', toggle: true, click: () => { this.addMarker(); }}, {name: 'Marker', icon: 'room', toggle: true, click: () => { this.addMarker(); }},
{name: 'Draw', icon: 'create', toggle: true, onEnabled: () => this.startDrawing(), onDisabled: () => this.endDrawing()}, {name: 'Draw', icon: 'create', toggle: true, onEnabled: () => this.startDrawing(), onDisabled: () => this.endDrawing()},
{name: 'Measure', icon: 'straighten', toggle: true, click: () => this.measure()}, {name: 'Measure', icon: 'straighten', toggle: true, onEnabled: () => this.startMeasuring(), onDisabled: () => this.stopMeasuring()},
{name: 'Delete', icon: 'delete', toggle: true, onEnabled: () => this.map.deleteMode = true, onDisabled: () => this.map.deleteMode = false}, {name: 'Delete', icon: 'delete', toggle: true, onEnabled: () => this.map.deleteMode = true, onDisabled: () => this.map.deleteMode = false},
{name: 'Map Style', icon: 'terrain', subMenu: [ {name: 'Map Style', icon: 'terrain', subMenu: [
{name: 'ESRI:Topographic', toggle: true, click: () => this.map.setMapLayer(MapLayers.ESRI_TOPOGRAPHIC)}, {name: 'ESRI:Topographic', toggle: true, click: () => this.map.setMapLayer(MapLayers.ESRI_TOPOGRAPHIC)},
@ -85,19 +88,27 @@ export class MapComponent implements OnInit {
this.markers.forEach(marker => this.map.newMarker(marker)); this.markers.forEach(marker => this.map.newMarker(marker));
} }
measure() { startMeasuring() {
let firstPoint; this.measuringSubscription = this.map.click.pipe(skip(1)).subscribe(latlng => {
this.map.click.pipe(skip(1), take(2)).subscribe(latlng => { if(this.lastMeasuringPoint) {
if(!firstPoint) { this.map.newMeasurement(this.lastMeasuringPoint.getLatLng(), latlng);
firstPoint = this.map.newMarker(latlng); this.map.delete(this.lastMeasuringPoint);
} else {
this.menu[3].enabled = false;
this.map.newMeasurement(firstPoint.getLatLng(), latlng);
this.map.delete(firstPoint);
} }
this.lastMeasuringPoint = this.map.newMarker(latlng);
}) })
} }
stopMeasuring() {
if(this.measuringSubscription) {
this.measuringSubscription.unsubscribe();
this.measuringSubscription = null;
}
if(this.lastMeasuringPoint) {
this.map.delete(this.lastMeasuringPoint);
this.lastMeasuringPoint = null;
}
}
calibrate() { calibrate() {
this.bottomSheet.open(CalibrateComponent, { this.bottomSheet.open(CalibrateComponent, {
hasBackdrop: false, hasBackdrop: false,